Tidy up cleanup rule and keep lintian happy.

[youtubedl] / youtube_dl / postprocessor / metadatafromtitle.py

diff --git a/youtube_dl/postprocessor/metadatafromtitle.py b/youtube_dl/postprocessor/metadatafromtitle.py
index a56077f206b5133f2fae3fadbcad10523353ed5a..920573da9d8f472b8fdd8681cab0be1c6331afb7 100644 (file)
--- a/youtube_dl/postprocessor/metadatafromtitle.py
+++ b/youtube_dl/postprocessor/metadatafromtitle.py
@@ -3,11 +3,6 @@ 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):
 
 
 class MetadataFromTitlePP(PostProcessor):


@@ -24,7 +19,7 @@ class MetadataFromTitlePP(PostProcessor):
            '(?P<title>.+)\ \-\ (?P<artist>.+)'
         """
         lastpos = 0
            '(?P<title>.+)\ \-\ (?P<artist>.+)'
         """
         lastpos = 0

-        regex = ""
+        regex = ''

         # replace %(..)s with regex group and escape other string parts
         for match in re.finditer(r'%\((\w+)\)s', fmt):
             regex += re.escape(fmt[lastpos:match.start()])
         # replace %(..)s with regex group and escape other string parts
         for match in re.finditer(r'%\((\w+)\)s', fmt):
             regex += re.escape(fmt[lastpos:match.start()])


@@ -38,7 +33,8 @@ class MetadataFromTitlePP(PostProcessor):
         title = info['title']
         match = re.match(self._titleregex, title)
         if match is None:
         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():
             value = match.group(attribute)
             info[attribute] = value
         for attribute, value in match.groupdict().items():
             value = match.group(attribute)
             info[attribute] = value