From 2ef2407203819e76b7c6da8c61e5e97cced78c92 Mon Sep 17 00:00:00 2001 From: k4yt3x Date: Tue, 4 Dec 2018 02:54:25 -0500 Subject: [PATCH] fixed config generation bug, issue by @gmonteir --- config_generator.py | 9 ++++++++- video2x_setup.py | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/config_generator.py b/config_generator.py index 74f3750..58d4466 100755 --- a/config_generator.py +++ b/config_generator.py @@ -33,7 +33,14 @@ def enroll_settings(): settings['waifu2x_path'] = get_path('waifu2x-caffe-cui.exe path: ') settings['ffmpeg_path'] = get_path('ffmpeg binaries directory: ') - settings['ffmpeg_arguments'] = Avalon.gets('Extra arguments passed to ffmpeg: ') + + settings['ffmpeg_arguments'] = [] + while True: + argument = Avalon.gets('Extra arguments passed to ffmpeg (empty when done): ') + if argument: + settings['ffmpeg_arguments'].append(argument) + else: + break settings['ffmpeg_hwaccel'] = Avalon.gets('ffmpeg hardware acceleration method (cuda): ') if settings['ffmpeg_hwaccel'] == '': diff --git a/video2x_setup.py b/video2x_setup.py index fcd745f..d88b4ca 100644 --- a/video2x_setup.py +++ b/video2x_setup.py @@ -113,7 +113,7 @@ class Video2xSetup: settings['waifu2x_path'] = '{}\\video2x\\waifu2x-caffe\\waifu2x-caffe-cui.exe'.format(os.getenv('localappdata')) settings['ffmpeg_path'] = '{}\\video2x\\ffmpeg-4.1-win64-static\\bin'.format(os.getenv('localappdata')) - settings['ffmpeg_arguments'] = '' + settings['ffmpeg_arguments'] = [] settings['ffmpeg_hwaccel'] = 'cuda' with open('video2x.json', 'w') as config: