forktown/Av1an
1
0
Fork 0
mirror of https://github.com/master-of-zen/Av1an.git synced 2024-11-25 10:40:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #163 from n9Mtq4/fix/svtvp9error

Browse source 
Fix English & run validate params after encoder is set up
This commit is contained in:
Zen 2020-10-04 16:16:23 +03:00 committed by GitHub
commit ade65f57b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Startup/setup.py
View file

@ -49,8 +49,6 @@ def check_exes(args: Args):
print('No ffmpeg')
terminate()
validate_inputs(args)
if args.chunk_method == 'vs_ffms2' and (not find_executable('vspipe')):
print('vspipe executable not found')
terminate()
@ -74,7 +72,9 @@ def setup_encoder(args: Args):
args.passes = encoder.default_passes
args.video_params = encoder.default_args if args.video_params is None \
else shlex.split(args.video_params)
else shlex.split(args.video_params)
validate_inputs(args)
def startup_check(args: Args):

16
Startup/validate_commands.py
View file

@ -1,13 +1,12 @@
import re
import subprocess
import shlex
import sys
from subprocess import PIPE
from Encoders import ENCODERS
from typing import List, Union
from fuzzywuzzy import fuzz
from fuzzywuzzy import process
def run_command(command: List) -> str:
r = subprocess.run(command, stdout=PIPE, stderr=PIPE)
return r.stderr.decode("utf-8") + r.stdout.decode("utf-8")
@ -16,7 +15,7 @@ def run_command(command: List) -> str:
def sort_params(params: List) -> List:
"""
Sort arguments to 2 list based on -/--
Return 2 lists of argumens
Return 2 lists of arguments
"""
# Sort Params
one_params = []
@ -59,19 +58,18 @@ def get_encoder_args(args):
def validate_inputs(args):
video_params = args.video_params.split() if args.video_params \
else ENCODERS[args.encoder].default_args
video_params = args.video_params
video_params = [x.split('=')[0] for x in video_params if not x.isdigit()]
parameters = get_encoder_args(args)
suggested = [( x, suggest_fix(x, parameters)) for x in match_commands(video_params, parameters)]
suggested = [(x, suggest_fix(x, parameters)) for x in match_commands(video_params, parameters)]
if len(suggested) > 0:
print('Invalid commands:')
print('WARNING: Invalid params:')
for cmd in suggested:
print(f"{cmd[0]} suggest: {cmd[1][0]}")
print('If you sure in validity of your commands: use --force')
print(f"'{cmd[0]}' isn't a valid param for {args.encoder}. Did you mean '{cmd[1][0]}'?")
if not args.force:
print('To continue anyway, run Av1an with --force')
sys.exit(0)