Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2024-11-22 18:53:21 +01:00
Code Issues Releases Wiki Activity

[ytdl] transfer YoutubeDL objects to downloader (#1680)

Browse Source 
allows specifying downloader-specific options per subcategory
but overwrites all downloader.ytdl settings
This commit is contained in:
Mike Fährmann 2021-07-16 03:42:13 +02:00
parent 06e69ea79a
commit f5b097165e
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
2 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gallery_dl/downloader/ytdl.py
View File

@ -53,23 +53,27 @@ class YoutubeDLDownloader(DownloaderBase):
self.ytdl = module.YoutubeDL(options)
def download(self, url, pathfmt):
kwdict = pathfmt.kwdict
ytdl = kwdict.pop("_ytdl_instance", None)
if not ytdl:
ytdl = self.ytdl
if self.forward_cookies:
set_cookie = self.ytdl.cookiejar.set_cookie
set_cookie = ytdl.cookiejar.set_cookie
for cookie in self.session.cookies:
set_cookie(cookie)
kwdict = pathfmt.kwdict
info_dict = kwdict.pop("_ytdl_info_dict", None)
if not info_dict:
try:
info_dict = self.ytdl.extract_info(url[5:], download=False)
info_dict = ytdl.extract_info(url[5:], download=False)
except Exception:
return False
if "entries" in info_dict:
index = kwdict.get("_ytdl_index")
if index is None:
return self._download_playlist(pathfmt, info_dict)
return self._download_playlist(ytdl, pathfmt, info_dict)
else:
info_dict = info_dict["entries"][index]
@ -77,9 +81,9 @@ class YoutubeDLDownloader(DownloaderBase):
if extra:
info_dict.update(extra)
return self._download_video(pathfmt, info_dict)
return self._download_video(ytdl, pathfmt, info_dict)
def _download_video(self, pathfmt, info_dict):
def _download_video(self, ytdl, pathfmt, info_dict):
if "url" in info_dict:
text.nameext_from_url(info_dict["url"], pathfmt.kwdict)
@ -88,8 +92,8 @@ class YoutubeDLDownloader(DownloaderBase):
info_dict["ext"] = "mkv"
if self.outtmpl:
self._set_outtmpl(self.outtmpl)
pathfmt.filename = filename = self.ytdl.prepare_filename(info_dict)
self._set_outtmpl(ytdl, self.outtmpl)
pathfmt.filename = filename = ytdl.prepare_filename(info_dict)
pathfmt.extension = info_dict["ext"]
pathfmt.path = pathfmt.directory + filename
pathfmt.realpath = pathfmt.temppath = (
@ -104,29 +108,30 @@ class YoutubeDLDownloader(DownloaderBase):
pathfmt.temppath = os.path.join(
self.partdir, pathfmt.filename)
self._set_outtmpl(pathfmt.temppath.replace("%", "%%"))
self._set_outtmpl(ytdl, pathfmt.temppath.replace("%", "%%"))
self.out.start(pathfmt.path)
try:
self.ytdl.process_info(info_dict)
ytdl.process_info(info_dict)
except Exception:
self.log.debug("Traceback", exc_info=True)
return False
return True
def _download_playlist(self, pathfmt, info_dict):
def _download_playlist(self, ytdl, pathfmt, info_dict):
pathfmt.set_extension("%(playlist_index)s.%(ext)s")
self._set_outtmpl(pathfmt.realpath)
self._set_outtmpl(ytdl, pathfmt.realpath)
for entry in info_dict["entries"]:
self.ytdl.process_info(entry)
ytdl.process_info(entry)
return True
def _set_outtmpl(self, outtmpl):
@staticmethod
def _set_outtmpl(ytdl, outtmpl):
try:
self.ytdl.outtmpl_dict["default"] = outtmpl
ytdl.outtmpl_dict["default"] = outtmpl
except AttributeError:
self.ytdl.params["outtmpl"] = outtmpl
ytdl.params["outtmpl"] = outtmpl
def compatible_formats(formats):

20
gallery_dl/extractor/ytdl.py
View File

@ -9,7 +9,7 @@
"""Extractors for sites supported by youtube-dl"""
from .common import Extractor, Message
from .. import config, exception
from .. import text, config, exception
class YoutubeDLExtractor(Extractor):
@ -55,11 +55,20 @@ class YoutubeDLExtractor(Extractor):
# construct YoutubeDL object
options = {
"format": self.config("format"),
"socket_timeout": self._timeout,
"nocheckcertificate": not self._verify,
"proxy": self.session.proxies.get("http"),
"format" : self.config("format"),
"retries" : self._retries,
"socket_timeout" : self._timeout,
"nocheckcertificate" : not self._verify,
"proxy" : self.session.proxies.get("http"),
"force_generic_extractor": self.force_generic_extractor,
"nopart" : not self.config("part", True),
"updatetime" : self.config("mtime", True),
"ratelimit" : text.parse_bytes(
self.config("rate"), None),
"min_filesize" : text.parse_bytes(
self.config("filesize-min"), None),
"max_filesize" : text.parse_bytes(
self.config("filesize-max"), None),
}
raw_options = self.config("raw-options")
@ -98,6 +107,7 @@ class YoutubeDLExtractor(Extractor):
for info_dict in results:
info_dict["extension"] = None
info_dict["_ytdl_info_dict"] = info_dict
info_dict["_ytdl_instance"] = ytdl
url = "ytdl:" + (info_dict.get("url") or
info_dict.get("webpage_url") or