xorbitlab
/
metube
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dl_formats options are now inline

This commit is contained in:
asuyou 2021-11-19 20:37:55 +00:00
parent 99c366e5c2
commit 69746826f8
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/dl_formats.py
View File

@ -49,27 +49,6 @@ def get_opts(format: str, quality: str, ytdl_opts: dict) -> dict:
return ytdl_opts return ytdl_opts
def _get_audio_fmt(quality: str) -> str:
if quality == "best" or quality in ("128", "192", "320"):
audio_fmt = "bestaudio/best"
# Audio quality needs to be set post-download, set in opts
else:
raise Exception(f"Unknown quality {quality}")
return audio_fmt
def _get_video_res(quality: str) -> str:
if quality in ("best", "audio"):
video_fmt = ""
elif quality in ("1440", "1080", "720", "480"):
video_fmt = f"[height<={quality}]"
else:
raise Exception(f"Unknown quality {quality}")
return video_fmt
def _get_final_fmt(format: str, quality: str) -> str: def _get_final_fmt(format: str, quality: str) -> str:
vfmt, afmt, vres = "", "", "" vfmt, afmt, vres = "", "", ""
@ -81,11 +60,20 @@ def _get_final_fmt(format: str, quality: str) -> str:
if quality == "audio": if quality == "audio":
final_fmt = "bestaudio/best" final_fmt = "bestaudio/best"
else: else:
vres = _get_video_res(quality) if quality in ("best", "audio"):
vres = ""
elif quality in ("1440", "1080", "720", "480"):
vres = f"[height<={quality}]"
else:
raise Exception(f"Unknown quality {quality}")
combo = vres + vfmt combo = vres + vfmt
final_fmt = f"bestvideo{combo}+bestaudio{afmt}/best{combo}" final_fmt = f"bestvideo{combo}+bestaudio{afmt}/best{combo}"
elif format == "mp3": elif format == "mp3":
final_fmt = _get_audio_fmt(quality) if quality == "best" or quality in ("128", "192", "320"):
final_fmt = "bestaudio/best"
# Audio quality needs to be set post-download, set in opts
else:
raise Exception(f"Unknown quality {quality}")
else: else:
raise Exception(f"Unkown format {format}") raise Exception(f"Unkown format {format}")