WeebDataHoarder/Av1an
WeebDataHoarder/Av1an
1
0
Fork 0
Code Issues Pull requests Releases Activity

Simplify process_input cognitive complexity, move extra steps from arg_parsing to main_thread so arg_parsing only handles args

Browse source 
Signed-off-by: Luis Garcia <luigi311.lg@gmail.com>
This commit is contained in:
Luis Garcia 2020-05-06 10:41:29 -06:00
parent a0bfecdc1a
commit 10ea5f766a
1 changed files with 31 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
av1an.py
View file

@ -75,25 +75,22 @@ class Av1an:
def process_inputs(self):
# Check input file for being valid
if self.d.get('mode') == 2:
if self.d.get('input'):
print("Server mode, input file ignored")
elif self.d.get('input'):
inputs = self.d.get('input')
valid = np.array([i.exists() for i in inputs])
if not all(valid):
print(f'File(s) do not exist: {", ".join([str(inputs[i]) for i in np.where(valid == False)[0]])}')
sys.exit()
if len(inputs) > 1:
self.d['queue'] = inputs
else:
self.d['input'] = inputs[0]
else:
if not self.d.get('input'):
print('No input file')
sys.exit()
inputs = self.d.get('input')
valid = np.array([i.exists() for i in inputs])
if not all(valid):
print(f'File(s) do not exist: {", ".join([str(inputs[i]) for i in np.where(valid == False)[0]])}')
sys.exit()
if len(inputs) > 1:
self.d['queue'] = inputs
else:
self.d['input'] = inputs[0]
def read_config(self):
"""Creation and reading of config files with saved settings"""
cfg = self.d.get('config')
@ -167,19 +164,6 @@ class Av1an:
# Store all vars in dictionary
self.d = vars(parser.parse_args())
self.read_config()
self.check_executables()
self.process_inputs()
# Changing pixel format, bit format
self.d['pix_format'] = f' -strict -1 -pix_fmt {self.d.get("pix_format")}'
self.d['ffmpeg_pipe'] = f' {self.d.get("ffmpeg")} {self.d.get("pix_format")} -f yuv4mpegpipe - |'
if self.d.get('vmaf_steps') < 5:
print('Target vmaf require more than 4 probes/steps')
sys.exit()
def outputs_filenames(self):
if self.d.get('output_file'):
self.d['output_file'] = self.d.get('output_file').with_suffix('.mkv')
@ -965,6 +949,24 @@ class Av1an:
# Parse initial arguments
self.arg_parsing()
self.read_config()
self.check_executables()
if self.d.get('mode') == 2:
if self.d.get('input'):
print("Server mode, input file ignored")
else:
self.process_inputs()
# Changing pixel format, bit format
self.d['pix_format'] = f' -strict -1 -pix_fmt {self.d.get("pix_format")}'
self.d['ffmpeg_pipe'] = f' {self.d.get("ffmpeg")} {self.d.get("pix_format")} -f yuv4mpegpipe - |'
if self.d.get('vmaf_steps') < 5:
print('Target vmaf require more than 4 probes/steps')
sys.exit()
# Video Mode. Encoding on local machine
if self.d.get('mode') == 0:
# Batch processing