New upstream version 1.25.0.upstream/1.25.0

2 files changed, 8 insertions, 11 deletions

diff --git a/gallery_dl/downloader/http.py b/gallery_dl/downloader/http.py
index 6043443..e977320 100644
--- a/gallery_dl/downloader/http.py
+++ b/gallery_dl/downloader/http.py
@@ -100,13 +100,6 @@ class HttpDownloader(DownloaderBase):
         adjust_extension = kwdict.get(
             "_http_adjust_extension", self.adjust_extension)
 
-        codes = kwdict.get("_http_retry_codes")
-        if codes:
-            retry_codes = list(self.retry_codes)
-            retry_codes += codes
-        else:
-            retry_codes = self.retry_codes
-
         if self.part and not metadata:
             pathfmt.part_enable(self.partdir)
 
@@ -167,7 +160,10 @@ class HttpDownloader(DownloaderBase):
                 break
             else:
                 msg = "'{} {}' for '{}'".format(code, response.reason, url)
-                if code in retry_codes or 500 <= code < 600:
+                if code in self.retry_codes or 500 <= code < 600:
+                    continue
+                retry = kwdict.get("_http_retry")
+                if retry and retry(response):
                     continue
                 self.log.warning(msg)
                 return False
@@ -296,11 +292,10 @@ class HttpDownloader(DownloaderBase):
         progress = self.progress
 
         bytes_downloaded = 0
-        time_start = time.time()
+        time_start = time.monotonic()
 
         for data in content:
-            time_current = time.time()
-            time_elapsed = time_current - time_start
+            time_elapsed = time.monotonic() - time_start
             bytes_downloaded += len(data)
 
             write(data)
diff --git a/gallery_dl/downloader/ytdl.py b/gallery_dl/downloader/ytdl.py
index c44ea0a..adada75 100644
--- a/gallery_dl/downloader/ytdl.py
+++ b/gallery_dl/downloader/ytdl.py
@@ -64,6 +64,8 @@ class YoutubeDLDownloader(DownloaderBase):
             try:
                 info_dict = ytdl_instance.extract_info(url[5:], download=False)
             except Exception:
+                pass
+            if not info_dict:
                 return False
 
         if "entries" in info_dict: