continued refactor-streak

This commit is contained in:
Kjistóf 2017-02-05 17:39:46 +01:00
parent bb680ad5b7
commit abc7d96b04

View File

@ -107,6 +107,11 @@ def cleanup(file_dict, outputs):
pass pass
def get_length(file):
data = get_duration(get_command_stderr(('ffprobe', file))).split(':')
return timedelta(hours=float(data[0]), minutes=float(data[1]), seconds=float(data[2]))
def yes_no_question(question, default): def yes_no_question(question, default):
valid = {"yes": True, "y": True, "ye": True, valid = {"yes": True, "y": True, "ye": True,
"no": False, "n": False} "no": False, "n": False}
@ -176,11 +181,8 @@ download_video_stream(URL, FILES)
read_extensions(FILES) read_extensions(FILES)
# get stream lengths via ffprobe # get stream lengths via ffprobe
audioData= get_duration(get_command_stderr(('ffprobe', FILES[Stream.AUDIO]))).split(':') audioLen = get_length(FILES[Stream.AUDIO])
videoData = get_duration(get_command_stderr(('ffprobe', FILES[Stream.VIDEO]))).split(':') videoLen = get_length(FILES[Stream.VIDEO])
audioLen = timedelta(hours=float(audioData[0]), minutes=float(audioData[1]), seconds=float(audioData[2]))
videoLen = timedelta(hours=float(videoData[0]), minutes=float(videoData[1]), seconds=float(videoData[2]))
# decide which stream needs some looping # decide which stream needs some looping
longer = audioLen if audioLen > videoLen else videoLen longer = audioLen if audioLen > videoLen else videoLen