]> jfr.im git - yt-dlp.git/commitdiff
Show name of downloader in verbose log
authorpukkandan <redacted>
Wed, 11 May 2022 01:06:29 +0000 (06:36 +0530)
committerpukkandan <redacted>
Wed, 11 May 2022 01:50:54 +0000 (07:20 +0530)
Closes #3703

yt_dlp/YoutubeDL.py
yt_dlp/downloader/common.py
yt_dlp/downloader/f4m.py
yt_dlp/downloader/ism.py
yt_dlp/downloader/mhtml.py
yt_dlp/downloader/niconico.py
yt_dlp/downloader/youtube_live_chat.py

index 38ecd276f1c10d8a6195796759797c1ee3899afc..83210f6c8940a569666e75ccacc2e4ee2dd519c8 100644 (file)
@@ -2833,7 +2833,7 @@ def dl(self, name, info, subtitle=False, test=False):
             urls = '", "'.join(
                 (f['url'].split(',')[0] + ',<data>' if f['url'].startswith('data:') else f['url'])
                 for f in info.get('requested_formats', []) or [info])
-            self.write_debug('Invoking downloader on "%s"' % urls)
+            self.write_debug(f'Invoking {fd.FD_NAME} downloader on "{urls}"')
 
         # Note: Ideally info should be a deep-copied so that hooks cannot modify it.
         # But it may contain objects that are not deep-copyable
index d798633009db02a325e8285cf5ebaebdfe61d9ee..1f14ebb3a08bd75ed195056fcb583888e8422831 100644 (file)
@@ -98,6 +98,10 @@ def _set_ydl(self, ydl):
     def to_screen(self, *args, **kargs):
         self.ydl.to_screen(*args, quiet=self.params.get('quiet'), **kargs)
 
+    @property
+    def FD_NAME(self):
+        return re.sub(r'(?<!^)(?=[A-Z])', '_', type(self).__name__[:-2]).lower()
+
     @staticmethod
     def format_seconds(seconds):
         time = timetuple_from_msec(seconds * 1000)
index 7b6665167bed2402c46fbe3cbfb343429bb541dc..3629d63f526b1f28363146b695137228698cd70a 100644 (file)
@@ -256,8 +256,6 @@ class F4mFD(FragmentFD):
     A downloader for f4m manifests or AdobeHDS.
     """
 
-    FD_NAME = 'f4m'
-
     def _get_unencrypted_media(self, doc):
         media = doc.findall(_add_ns('media'))
         if not media:
index 0aaba8c153b75bf8eb9a6e74381822f56b92383a..9efc5e4d9a5a080f56cdbb49b93231cdf940479c 100644 (file)
@@ -230,8 +230,6 @@ class IsmFD(FragmentFD):
     Download segments in a ISM manifest
     """
 
-    FD_NAME = 'ism'
-
     def real_download(self, filename, info_dict):
         segments = info_dict['fragments'][:1] if self.params.get(
             'test', False) else info_dict['fragments']
index f999fca78152eb167260805da4aa6e4af13c43fd..ce2d399470540c8f4467b9e7c71d3a14ae0c303b 100644 (file)
@@ -9,8 +9,6 @@
 
 
 class MhtmlFD(FragmentFD):
-    FD_NAME = 'mhtml'
-
     _STYLESHEET = """\
 html, body {
     margin: 0;
index 5947446b1409f5272b4eb489d9e1e688c5d6886c..5e9dda03d5008e780230b667ac1f5d3ea9926e7e 100644 (file)
@@ -9,8 +9,6 @@
 class NiconicoDmcFD(FileDownloader):
     """ Downloading niconico douga from DMC with heartbeat """
 
-    FD_NAME = 'niconico_dmc'
-
     def real_download(self, filename, info_dict):
         self.to_screen('[%s] Downloading from DMC' % self.FD_NAME)
 
index 4486607255745b1c36d032775d33008b6c72679b..cc528029dbb4f4d4a7f0269e8c8de569a80bced8 100644 (file)
@@ -10,8 +10,6 @@
 class YoutubeLiveChatFD(FragmentFD):
     """ Downloads YouTube live chats fragment by fragment """
 
-    FD_NAME = 'youtube_live_chat'
-
     def real_download(self, filename, info_dict):
         video_id = info_dict['video_id']
         self.to_screen('[%s] Downloading live chat' % self.FD_NAME)