updated for 2.5.0

This commit is contained in:
k4yt3x 2019-03-04 19:33:27 -05:00
parent e092094742
commit 35e41d0098
2 changed files with 11 additions and 16 deletions

View File

@ -4,7 +4,7 @@
Name: Video2x Config Generator Name: Video2x Config Generator
Author: K4YT3X Author: K4YT3X
Date Created: October 23, 2018 Date Created: October 23, 2018
Last Modified: February 26, 2019 Last Modified: March 4, 2019
Licensed under the GNU General Public License Version 3 (GNU GPL v3), Licensed under the GNU General Public License Version 3 (GNU GPL v3),
available at: https://www.gnu.org/licenses/gpl-3.0.txt available at: https://www.gnu.org/licenses/gpl-3.0.txt
@ -15,7 +15,7 @@ from avalon_framework import Avalon
import json import json
import os import os
VERSION = '1.0.2' VERSION = '1.0.3'
def get_path(text): def get_path(text):
@ -25,7 +25,7 @@ def get_path(text):
path = Avalon.gets(text) path = Avalon.gets(text)
if os.path.isdir(path): if os.path.isdir(path):
return path return path
Avalon.error('{} id not a directory / folder'.format(path)) Avalon.error('{} id not a directory/folder'.format(path))
def enroll_settings(): def enroll_settings():
@ -36,23 +36,19 @@ def enroll_settings():
settings['ffmpeg_arguments'] = [] settings['ffmpeg_arguments'] = []
while True: while True:
argument = Avalon.gets('Extra arguments passed to ffmpeg (empty when done): ') argument = Avalon.gets('Extra arguments passed to ffmpeg (empty=none): ')
if argument: if argument:
settings['ffmpeg_arguments'].append(argument) settings['ffmpeg_arguments'].append(argument)
else: else:
break break
settings['ffmpeg_hwaccel'] = Avalon.gets('ffmpeg hardware acceleration method (auto): ') settings['ffmpeg_hwaccel'] = Avalon.gets('ffmpeg hardware acceleration method (empty=auto): ')
if settings['ffmpeg_hwaccel'] == '': if settings['ffmpeg_hwaccel'] == '':
settings['ffmpeg_hwaccel'] = 'auto' settings['ffmpeg_hwaccel'] = 'auto'
settings['extracted_frames'] = Avalon.gets('Temporary directory for extracted frames (empty for mkdtemp): ') settings['video2x_cache_folder'] = Avalon.gets('Video2X cache folder (empty=system default): ')
if settings['extracted_frames'] == '': if settings['video2x_cache_folder'] == '':
settings['extracted_frames'] = False settings['video2x_cache_folder'] = False
settings['upscaled_frames'] = Avalon.gets('Temporary directory for upscaled frames (empty for mkdtemp): ')
if settings['upscaled_frames'] == '':
settings['upscaled_frames'] = False
settings['preserve_frames'] = Avalon.ask('Preserve extracted or upscaled frames') settings['preserve_frames'] = Avalon.ask('Preserve extracted or upscaled frames')

View File

@ -4,7 +4,7 @@
Name: Video2X Setup Script Name: Video2X Setup Script
Author: K4YT3X Author: K4YT3X
Date Created: November 28, 2018 Date Created: November 28, 2018
Last Modified: February 26, 2019 Last Modified: March 4, 2019
Licensed under the GNU General Public License Version 3 (GNU GPL v3), Licensed under the GNU General Public License Version 3 (GNU GPL v3),
available at: https://www.gnu.org/licenses/gpl-3.0.txt available at: https://www.gnu.org/licenses/gpl-3.0.txt
@ -31,7 +31,7 @@ import zipfile
# later in the script. # later in the script.
# import requests # import requests
VERSION = '1.0.2' VERSION = '1.0.3'
class Video2xSetup: class Video2xSetup:
@ -115,8 +115,7 @@ class Video2xSetup:
settings['ffmpeg_path'] = '{}\\video2x\\ffmpeg-4.1-win64-static\\bin'.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'] = 'auto' settings['ffmpeg_hwaccel'] = 'auto'
settings['extracted_frames'] = False settings['video2x_cache_folder'] = False
settings['upscaled_frames'] = False
settings['preserve_frames'] = False settings['preserve_frames'] = False
with open('video2x.json', 'w') as config: with open('video2x.json', 'w') as config: