Update upstream source from tag 'upstream/2019.09.28'

[youtubedl] / youtube_dl / postprocessor / metadatafromtitle.py

diff --git a/youtube_dl/postprocessor/metadatafromtitle.py b/youtube_dl/postprocessor/metadatafromtitle.py
index 42377fa0f0bde0d3fa6ae578c6eaa0fe4a73474d..f5c14d974f4b44c9a5c014a536a0b2f72c65b2db 100644 (file)
--- a/youtube_dl/postprocessor/metadatafromtitle.py
+++ b/youtube_dl/postprocessor/metadatafromtitle.py
@@ -3,21 +3,18 @@ from __future__ import unicode_literals
 import re
 
 from .common import PostProcessor
 import re
 
 from .common import PostProcessor

-from ..utils import PostProcessingError
-
-
-class MetadataFromTitlePPError(PostProcessingError):
-    pass

 
 
 class MetadataFromTitlePP(PostProcessor):
     def __init__(self, downloader, titleformat):
         super(MetadataFromTitlePP, self).__init__(downloader)
         self._titleformat = titleformat
 
 
 class MetadataFromTitlePP(PostProcessor):
     def __init__(self, downloader, titleformat):
         super(MetadataFromTitlePP, self).__init__(downloader)
         self._titleformat = titleformat

-        self._titleregex = self.format_to_regex(titleformat)
+        self._titleregex = (self.format_to_regex(titleformat)
+                            if re.search(r'%\(\w+\)s', titleformat)
+                            else titleformat)

 
     def format_to_regex(self, fmt):
 
     def format_to_regex(self, fmt):

-        """
+        r"""

         Converts a string like
            '%(title)s - %(artist)s'
         to a regex like
         Converts a string like
            '%(title)s - %(artist)s'
         to a regex like


@@ -31,17 +28,21 @@ class MetadataFromTitlePP(PostProcessor):
             regex += r'(?P<' + match.group(1) + '>.+)'
             lastpos = match.end()
         if lastpos < len(fmt):
             regex += r'(?P<' + match.group(1) + '>.+)'
             lastpos = match.end()
         if lastpos < len(fmt):

-            regex += re.escape(fmt[lastpos:len(fmt)])
+            regex += re.escape(fmt[lastpos:])

         return regex
 
     def run(self, info):
         title = info['title']
         match = re.match(self._titleregex, title)
         if match is None:
         return regex
 
     def run(self, info):
         title = info['title']
         match = re.match(self._titleregex, title)
         if match is None:

-            raise MetadataFromTitlePPError('Could not interpret title of video as "%s"' % self._titleformat)
+            self._downloader.to_screen(
+                '[fromtitle] Could not interpret title of video as "%s"'
+                % self._titleformat)
+            return [], info

         for attribute, value in match.groupdict().items():
         for attribute, value in match.groupdict().items():

-            value = match.group(attribute)

             info[attribute] = value
             info[attribute] = value

-            self._downloader.to_screen('[fromtitle] parsed ' + attribute + ': ' + value)
+            self._downloader.to_screen(
+                '[fromtitle] parsed %s: %s'
+                % (attribute, value if value is not None else 'NA'))

 
         return [], info
 
         return [], info