mirrors/metube
1
0
Fork 0
mirror of https://github.com/alexta69/metube.git synced 2025-04-05 05:07:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

simplified format handling

Browse source
This commit is contained in:
Alex Shnitman 2021-11-20 10:12:08 +02:00
parent 829cc8e5b0
commit f52bea74d3
2 changed files with 19 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

54
app/dl_formats.py
View file

@ -12,14 +12,27 @@ def get_format(format: str, quality: str) -> str:
Returns: Returns:
dl_format: Formatted download string dl_format: Formatted download string
""" """
final_fmt = "" format = format or "best"
if format.startswith("custom:"): if format.startswith("custom:"):
final_fmt = format[7:] return format[7:]
else:
final_fmt = _get_final_fmt(format, quality)
return final_fmt if format == "mp3":
# Audio quality needs to be set post-download, set in opts
return "bestaudio/best"
if format in ("mp4", "any"):
if quality == "audio":
return "bestaudio/best"
# video {res} {vfmt} + audio {afmt} {res} {vfmt}
vfmt, afmt = ("[ext=mp4]", "[ext=m4a]") if format == "mp4" else ("", "")
vres = f"[height<={quality}]" if quality != "best" else ""
vcombo = vres + vfmt
return f"bestvideo{vcombo}+bestaudio{afmt}/best{vcombo}"
raise Exception(f"Unkown format {format}")
def get_opts(format: str, quality: str, ytdl_opts: dict) -> dict: def get_opts(format: str, quality: str, ytdl_opts: dict) -> dict:
@ -47,34 +60,3 @@ def get_opts(format: str, quality: str, ytdl_opts: dict) -> dict:
) )
return ytdl_opts return ytdl_opts
def _get_final_fmt(format: str, quality: str) -> str:
vfmt, afmt, vres = "", "", ""
if format in ("mp4", "any"):
# video {res} {vfmt} + audio {afmt} {res} {vfmt}
if format == "mp4":
vfmt, afmt = "[ext=mp4]", "[ext=m4a]"
if quality == "audio":
final_fmt = "bestaudio/best"
else:
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
final_fmt = f"bestvideo{combo}+bestaudio{afmt}/best{combo}"
elif format == "mp3":
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:
raise Exception(f"Unkown format {format}")
return final_fmt

2
app/ytdl.py
View file

@ -159,7 +159,7 @@ class DownloadQueue:
elif etype == 'video' or etype.startswith('url') and 'id' in entry and 'title' in entry: elif etype == 'video' or etype.startswith('url') and 'id' in entry and 'title' in entry:
if entry['id'] not in self.queue: if entry['id'] not in self.queue:
dl = DownloadInfo(entry['id'], entry['title'], entry.get('webpage_url') or entry['url'], quality, format) dl = DownloadInfo(entry['id'], entry['title'], entry.get('webpage_url') or entry['url'], quality, format)
dldirectory = self.config.DOWNLOAD_DIR if quality != 'audio' else self.config.AUDIO_DOWNLOAD_DIR dldirectory = self.config.DOWNLOAD_DIR if (quality != 'audio' and format != 'mp3') else self.config.AUDIO_DOWNLOAD_DIR
self.queue[entry['id']] = Download(dldirectory, self.config.OUTPUT_TEMPLATE, quality, format, self.config.YTDL_OPTIONS, dl) self.queue[entry['id']] = Download(dldirectory, self.config.OUTPUT_TEMPLATE, quality, format, self.config.YTDL_OPTIONS, dl)
self.event.set() self.event.set()
await self.notifier.added(dl) await self.notifier.added(dl)