|
|
@ -7,7 +7,7 @@ from ..compat import compat_str
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class MetadataFromFieldPP(PostProcessor):
|
|
|
|
class MetadataFromFieldPP(PostProcessor):
|
|
|
|
regex = r'(?P<in>.+):(?P<out>.+)$'
|
|
|
|
regex = r'(?P<in>.*?)(?<!\\):(?P<out>.+)$'
|
|
|
|
|
|
|
|
|
|
|
|
def __init__(self, downloader, formats):
|
|
|
|
def __init__(self, downloader, formats):
|
|
|
|
PostProcessor.__init__(self, downloader)
|
|
|
|
PostProcessor.__init__(self, downloader)
|
|
|
@ -17,10 +17,11 @@ class MetadataFromFieldPP(PostProcessor):
|
|
|
|
assert isinstance(f, compat_str)
|
|
|
|
assert isinstance(f, compat_str)
|
|
|
|
match = re.match(self.regex, f)
|
|
|
|
match = re.match(self.regex, f)
|
|
|
|
assert match is not None
|
|
|
|
assert match is not None
|
|
|
|
|
|
|
|
inp = match.group('in').replace('\\:', ':')
|
|
|
|
self._data.append({
|
|
|
|
self._data.append({
|
|
|
|
'in': match.group('in'),
|
|
|
|
'in': inp,
|
|
|
|
'out': match.group('out'),
|
|
|
|
'out': match.group('out'),
|
|
|
|
'tmpl': self.field_to_template(match.group('in')),
|
|
|
|
'tmpl': self.field_to_template(inp),
|
|
|
|
'regex': self.format_to_regex(match.group('out')),
|
|
|
|
'regex': self.format_to_regex(match.group('out')),
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
|
@ -68,6 +69,6 @@ class MetadataFromFieldPP(PostProcessor):
|
|
|
|
|
|
|
|
|
|
|
|
class MetadataFromTitlePP(MetadataFromFieldPP): # for backward compatibility
|
|
|
|
class MetadataFromTitlePP(MetadataFromFieldPP): # for backward compatibility
|
|
|
|
def __init__(self, downloader, titleformat):
|
|
|
|
def __init__(self, downloader, titleformat):
|
|
|
|
super(MetadataFromTitlePP, self).__init__(downloader, ['title:%s' % titleformat])
|
|
|
|
super(MetadataFromTitlePP, self).__init__(downloader, ['%%(title)s:%s' % titleformat])
|
|
|
|
self._titleformat = titleformat
|
|
|
|
self._titleformat = titleformat
|
|
|
|
self._titleregex = self._data[0]['regex']
|
|
|
|
self._titleregex = self._data[0]['regex']
|
|
|
|