Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-01-23 20:15:34 +08:00
Code Issues Releases Wiki Activity

Add files via upload

Browse Source
This commit is contained in:
vayalil 2018-02-17 11:42:10 +11:00 committed by GitHub
parent 785ff4196b
commit 03ba06e3cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
youtube_dl/postprocessor/metadatafromuser.py
View File

@ -1,7 +1,7 @@
"""
Created on Fri Feb 9 16:23:16 2018
"""
from __future__ import unicode_literals from __future__ import unicode_literals
# Created on Fri Feb 9 16:23:16 2018
from .common import PostProcessor from .common import PostProcessor
import re import re
@ -10,7 +10,6 @@ class MetadataFromUserPP(PostProcessor):
def __init__(self, downloader, metadata): def __init__(self, downloader, metadata):
super(MetadataFromUserPP, self).__init__(downloader) super(MetadataFromUserPP, self).__init__(downloader)
self._metadata = metadata self._metadata = metadata
def run(self, info): def run(self, info):
lastpos = 0 lastpos = 0
@ -22,19 +21,18 @@ class MetadataFromUserPP(PostProcessor):
value = self._metadata[lastpos:match.start()].strip() value = self._metadata[lastpos:match.start()].strip()
self._downloader.to_screen( self._downloader.to_screen(
'[fromuser] %s: %s' '[fromuser] %s: %s'
%(attribute, value if value else 'NA')) % (attribute, value if value else 'NA'))
info[attribute] = value info[attribute] = value
attribute = match.group(1) attribute = match.group(1)
lastpos = match.end() lastpos = match.end()
if attribute is None: if attribute is None:
# No attributes is given user, default assume the text as album name # No attributes is given user, default assume the text as album name
attribute = 'album' attribute = 'album'
# Add the last key # Add the last key
value = self._metadata[lastpos:].strip() value = self._metadata[lastpos:].strip()
self._downloader.to_screen( self._downloader.to_screen(
'[fromuser] %s: %s' '[fromuser] %s: %s' % (attribute, value if value else 'NA'))
%(attribute, value if value else 'NA'))
info[attribute] = value info[attribute] = value
# If nothing specified for artist, extract from comments/description # If nothing specified for artist, extract from comments/description
@ -42,9 +40,8 @@ class MetadataFromUserPP(PostProcessor):
artist = re.findall('music(?![ia]).*$', info['description'], re.MULTILINE | re.IGNORECASE) artist = re.findall('music(?![ia]).*$', info['description'], re.MULTILINE | re.IGNORECASE)
artist = artist + re.findall('sing.*$', info['description'], re.MULTILINE | re.IGNORECASE) artist = artist + re.findall('sing.*$', info['description'], re.MULTILINE | re.IGNORECASE)
artist = ', '.join(artist).title().strip() artist = ', '.join(artist).title().strip()
self._downloader.to_screen( self._downloader.to_screen(
'[artist] : %s : parsed from description' %(artist if artist else 'NA')) '[artist] : %s : parsed from description' % (artist if artist else 'NA'))
info['artist'] = artist info['artist'] = artist
return [], info return [], info