R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

regex group names from dict

Browse Source
This commit is contained in:
phiresky 2015-03-10 19:35:36 +01:00
parent b15128a953
commit 6a0a6bbb6e
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/postprocessor/metadatafromtitle.py
View File

@ -13,7 +13,7 @@ class MetadataFromTitlePPError(PostProcessingError):
class MetadataFromTitlePP(PostProcessor): class MetadataFromTitlePP(PostProcessor):
def __init__(self, downloader, titleformat): def __init__(self, downloader, titleformat):
self._titleformat = titleformat self._titleformat = titleformat
self._titleregex, self._attributes = self.fmtToRegex(titleformat) self._titleregex = self.fmtToRegex(titleformat)
def fmtToRegex(self, fmt): def fmtToRegex(self, fmt):
""" """
@ -29,20 +29,18 @@ class MetadataFromTitlePP(PostProcessor):
# replace %(..)s with regex group and escape other string parts # replace %(..)s with regex group and escape other string parts
for match in re.finditer(r'%\((\w+)\)s', fmt): for match in re.finditer(r'%\((\w+)\)s', fmt):
regex += re.escape(fmt[lastpos:match.start()]) regex += re.escape(fmt[lastpos:match.start()])
groupname = match.group(1) regex += r'(?P<' + match.group(1) + '>.+)'
groups.append(groupname)
regex += r'(?P<' + groupname + '>.+)'
lastpos = match.end() lastpos = match.end()
if lastpos < len(fmt): if lastpos < len(fmt):
regex += re.escape(fmt[lastpos:len(fmt)]) regex += re.escape(fmt[lastpos:len(fmt)])
return regex, groups return regex
def run(self, info): def run(self, info):
title = info['title'] title = info['title']
match = re.match(self._titleregex, title) match = re.match(self._titleregex, title)
if match is None: if match is None:
raise MetadataFromTitlePPError('Could not interpret title of video as "%s"' % self._titleformat) raise MetadataFromTitlePPError('Could not interpret title of video as "%s"' % self._titleformat)
for attribute in self._attributes: for attribute, value in match.groupdict().items():
value = match.group(attribute) value = match.group(attribute)
info[attribute] = value info[attribute] = value
self._downloader.to_screen('[fromtitle] parsed ' + attribute + ': ' + value) self._downloader.to_screen('[fromtitle] parsed ' + attribute + ': ' + value)