]> jfr.im git - yt-dlp.git/commitdiff
Fix typecasting when pre-checking archive (Closes #26)
authorpukkandan <redacted>
Thu, 21 Jan 2021 12:06:42 +0000 (17:36 +0530)
committerpukkandan <redacted>
Thu, 21 Jan 2021 12:06:42 +0000 (17:36 +0530)
youtube_dlc/YoutubeDL.py

index fc39cbbc9d6d95f4e956e9b953e6db0475012272..867f3a61a4dbc635eee288bd3ff420927f1e7977 100644 (file)
@@ -885,7 +885,9 @@ def extract_info(self, url, download=True, ie_key=None, info_dict=None, extra_in
                                     'and will probably not work.')
 
             try:
-                temp_id = ie.extract_id(url) if callable(getattr(ie, 'extract_id', None)) else ie._match_id(url)
+                temp_id = str_or_none(
+                  ie.extract_id(url) if callable(getattr(ie, 'extract_id', None))
+                  else ie._match_id(url))
             except (AssertionError, IndexError, AttributeError):
                 temp_id = None
             if temp_id is not None and self.in_download_archive({'id': temp_id, 'ie_key': ie_key}):
@@ -2364,7 +2366,7 @@ def _make_archive_id(self, info_dict):
                     break
             else:
                 return
-        return extractor.lower() + ' ' + video_id
+        return '%s %s' % (extractor.lower(), video_id)
 
     def in_download_archive(self, info_dict):
         fn = self.params.get('download_archive')