diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2019-11-10 22:14:10 -0500 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2019-11-10 22:14:10 -0500 |
| commit | 0c73e982fa596da07f23b377621ab894a9e64884 (patch) | |
| tree | 96f6a40a5656c15a2ec7217a8a1efcff5827bcbb /gallery_dl/downloader | |
| parent | 40f5fe6edef268632d3bc484e85e5b37bad67bff (diff) | |
New upstream version 1.11.1upstream/1.11.1
Diffstat (limited to 'gallery_dl/downloader')
| -rw-r--r-- | gallery_dl/downloader/http.py | 2 | ||||
| -rw-r--r-- | gallery_dl/downloader/ytdl.py | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gallery_dl/downloader/http.py b/gallery_dl/downloader/http.py index bb45de2..1c78cfb 100644 --- a/gallery_dl/downloader/http.py +++ b/gallery_dl/downloader/http.py @@ -107,7 +107,7 @@ class HttpDownloader(DownloaderBase): elif code == 416 and filesize: # Requested Range Not Satisfiable break else: - msg = "{}: {} for url: {}".format(code, response.reason, url) + msg = "'{} {}' for '{}'".format(code, response.reason, url) if code == 429 or 500 <= code < 600: # Server Error continue self.log.warning("%s", msg) diff --git a/gallery_dl/downloader/ytdl.py b/gallery_dl/downloader/ytdl.py index ce921e3..fe6c4bc 100644 --- a/gallery_dl/downloader/ytdl.py +++ b/gallery_dl/downloader/ytdl.py @@ -29,6 +29,7 @@ class YoutubeDLDownloader(DownloaderBase): "nocheckcertificate": not self.config("verify", extractor._verify), "nopart": not self.part, "updatetime": self.config("mtime", True), + "proxy": extractor.session.proxies.get("http"), } options.update(self.config("raw-options") or {}) @@ -58,6 +59,11 @@ class YoutubeDLDownloader(DownloaderBase): return self._download_playlist(pathfmt, info_dict) else: info_dict = info_dict["entries"][index] + + extra = pathfmt.kwdict.get("_ytdl_extra") + if extra: + info_dict.update(extra) + return self._download_video(pathfmt, info_dict) def _download_video(self, pathfmt, info_dict): |