projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[xvideos] Extract og:duration (closes #12828)
[youtube-dl]
/
youtube_dl
/
postprocessor
/
metadatafromtitle.py
diff --git
a/youtube_dl/postprocessor/metadatafromtitle.py
b/youtube_dl/postprocessor/metadatafromtitle.py
index 42377fa0f0bde0d3fa6ae578c6eaa0fe4a73474d..a7d637a3c84f16ba8024b618ea30549fdcf109a6 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):
@@
-17,7
+12,7
@@
class MetadataFromTitlePP(PostProcessor):
self._titleregex = self.format_to_regex(titleformat)
def format_to_regex(self, fmt):
self._titleregex = self.format_to_regex(titleformat)
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,14
+26,15
@@
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():
value = match.group(attribute)
info[attribute] = value
for attribute, value in match.groupdict().items():
value = match.group(attribute)
info[attribute] = value