Mirrors
/
yt-dlp
mirror of https://github.com/yt-dlp/yt-dlp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[generic] Use unicode_literals instead of duplicating the u'

This commit is contained in:
Philipp Hagemeister 2014-01-06 01:47:52 +01:00
parent fc9713a1d2
commit 796495886e
1 changed files with 60 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
youtube_dl/extractor/generic.py
View File

@ -1,5 +1,7 @@
# encoding: utf-8 # encoding: utf-8
from __future__ import unicode_literals
import os import os
import re import re
@ -23,78 +25,78 @@ from .ooyala import OoyalaIE
class GenericIE(InfoExtractor): class GenericIE(InfoExtractor):
IE_DESC = u'Generic downloader that works on some sites' IE_DESC = 'Generic downloader that works on some sites'
_VALID_URL = r'.*' _VALID_URL = r'.*'
IE_NAME = u'generic' IE_NAME = 'generic'
_TESTS = [ _TESTS = [
{ {
u'url': u'http://www.hodiho.fr/2013/02/regis-plante-sa-jeep.html', 'url': 'http://www.hodiho.fr/2013/02/regis-plante-sa-jeep.html',
u'file': u'13601338388002.mp4', 'file': '13601338388002.mp4',
u'md5': u'6e15c93721d7ec9e9ca3fdbf07982cfd', 'md5': '6e15c93721d7ec9e9ca3fdbf07982cfd',
u'info_dict': { 'info_dict': {
u"uploader": u"www.hodiho.fr", 'uploader': 'www.hodiho.fr',
u"title": u"R\u00e9gis plante sa Jeep" 'title': 'R\u00e9gis plante sa Jeep',
} }
}, },
# embedded vimeo video # embedded vimeo video
{ {
u'add_ie': ['Vimeo'], 'add_ie': ['Vimeo'],
u'url': u'http://skillsmatter.com/podcast/home/move-semanticsperfect-forwarding-and-rvalue-references', 'url': 'http://skillsmatter.com/podcast/home/move-semanticsperfect-forwarding-and-rvalue-references',
u'file': u'22444065.mp4', 'file': '22444065.mp4',
u'md5': u'2903896e23df39722c33f015af0666e2', 'md5': '2903896e23df39722c33f015af0666e2',
u'info_dict': { 'info_dict': {
u'title': u'ACCU 2011: Move Semantics,Perfect Forwarding, and Rvalue references- Scott Meyers- 13/04/2011', 'title': 'ACCU 2011: Move Semantics,Perfect Forwarding, and Rvalue references- Scott Meyers- 13/04/2011',
u"uploader_id": u"skillsmatter", 'uploader_id': 'skillsmatter',
u"uploader": u"Skills Matter", 'uploader': 'Skills Matter',
} }
}, },
# bandcamp page with custom domain # bandcamp page with custom domain
{ {
u'add_ie': ['Bandcamp'], 'add_ie': ['Bandcamp'],
u'url': u'http://bronyrock.com/track/the-pony-mash', 'url': 'http://bronyrock.com/track/the-pony-mash',
u'file': u'3235767654.mp3', 'file': '3235767654.mp3',
u'info_dict': { 'info_dict': {
u'title': u'The Pony Mash', 'title': 'The Pony Mash',
u'uploader': u'M_Pallante', 'uploader': 'M_Pallante',
}, },
u'skip': u'There is a limit of 200 free downloads / month for the test song', 'skip': 'There is a limit of 200 free downloads / month for the test song',
}, },
# embedded brightcove video # embedded brightcove video
# it also tests brightcove videos that need to set the 'Referer' in the # it also tests brightcove videos that need to set the 'Referer' in the
# http requests # http requests
{ {
u'add_ie': ['Brightcove'], 'add_ie': ['Brightcove'],
u'url': u'http://www.bfmtv.com/video/bfmbusiness/cours-bourse/cours-bourse-l-analyse-technique-154522/', 'url': 'http://www.bfmtv.com/video/bfmbusiness/cours-bourse/cours-bourse-l-analyse-technique-154522/',
u'info_dict': { 'info_dict': {
u'id': u'2765128793001', 'id': '2765128793001',
u'ext': u'mp4', 'ext': 'mp4',
u'title': u'Le cours de bourse : l’analyse technique', 'title': 'Le cours de bourse : l’analyse technique',
u'description': u'md5:7e9ad046e968cb2d1114004aba466fd9', 'description': 'md5:7e9ad046e968cb2d1114004aba466fd9',
u'uploader': u'BFM BUSINESS', 'uploader': 'BFM BUSINESS',
}, },
u'params': { 'params': {
u'skip_download': True, 'skip_download': True,
}, },
}, },
# Direct link to a video # Direct link to a video
{ {
u'url': u'http://media.w3.org/2010/05/sintel/trailer.mp4', 'url': 'http://media.w3.org/2010/05/sintel/trailer.mp4',
u'file': u'trailer.mp4', 'file': 'trailer.mp4',
u'md5': u'67d406c2bcb6af27fa886f31aa934bbe', 'md5': '67d406c2bcb6af27fa886f31aa934bbe',
u'info_dict': { 'info_dict': {
u'id': u'trailer', 'id': 'trailer',
u'title': u'trailer', 'title': 'trailer',
u'upload_date': u'20100513', 'upload_date': '20100513',
} }
}, },
# ooyala video # ooyala video
{ {
u'url': u'http://www.rollingstone.com/music/videos/norwegian-dj-cashmere-cat-goes-spartan-on-with-me-premiere-20131219', 'url': 'http://www.rollingstone.com/music/videos/norwegian-dj-cashmere-cat-goes-spartan-on-with-me-premiere-20131219',
u'md5': u'5644c6ca5d5782c1d0d350dad9bd840c', 'md5': '5644c6ca5d5782c1d0d350dad9bd840c',
u'info_dict': { 'info_dict': {
u'id': u'BwY2RxaTrTkslxOfcan0UCf0YqyvWysJ', 'id': 'BwY2RxaTrTkslxOfcan0UCf0YqyvWysJ',
u'ext': u'mp4', 'ext': 'mp4',
u'title': u'2cc213299525360.mov', #that's what we get 'title': '2cc213299525360.mov', #that's what we get
}, },
}, },
] ]
@ -102,12 +104,12 @@ class GenericIE(InfoExtractor):
def report_download_webpage(self, video_id): def report_download_webpage(self, video_id):
"""Report webpage download.""" """Report webpage download."""
if not self._downloader.params.get('test', False): if not self._downloader.params.get('test', False):
self._downloader.report_warning(u'Falling back on generic information extractor.') self._downloader.report_warning('Falling back on generic information extractor.')
super(GenericIE, self).report_download_webpage(video_id) super(GenericIE, self).report_download_webpage(video_id)
def report_following_redirect(self, new_url): def report_following_redirect(self, new_url):
"""Report information extraction.""" """Report information extraction."""
self._downloader.to_screen(u'[redirect] Following redirect to %s' % new_url) self._downloader.to_screen('[redirect] Following redirect to %s' % new_url)
def _send_head(self, url): def _send_head(self, url):
"""Check if it is a redirect, like url shorteners, in case return the new url.""" """Check if it is a redirect, like url shorteners, in case return the new url."""
@ -153,7 +155,7 @@ class GenericIE(InfoExtractor):
response = opener.open(HEADRequest(url)) response = opener.open(HEADRequest(url))
if response is None: if response is None:
raise ExtractorError(u'Invalid URL protocol') raise ExtractorError('Invalid URL protocol')
return response return response
def _real_extract(self, url): def _real_extract(self, url):
@ -163,7 +165,7 @@ class GenericIE(InfoExtractor):
return self.url_result('http://' + url) return self.url_result('http://' + url)
video_id = os.path.splitext(url.split('/')[-1])[0] video_id = os.path.splitext(url.split('/')[-1])[0]
self.to_screen(u'%s: Requesting header' % video_id) self.to_screen('%s: Requesting header' % video_id)
try: try:
response = self._send_head(url) response = self._send_head(url)
@ -187,7 +189,7 @@ class GenericIE(InfoExtractor):
'formats': [{ 'formats': [{
'format_id': m.group('format_id'), 'format_id': m.group('format_id'),
'url': url, 'url': url,
'vcodec': u'none' if m.group('type') == 'audio' else None 'vcodec': 'none' if m.group('type') == 'audio' else None
}], }],
'upload_date': upload_date, 'upload_date': upload_date,
} }
@ -201,7 +203,7 @@ class GenericIE(InfoExtractor):
except ValueError: except ValueError:
# since this is the last-resort InfoExtractor, if # since this is the last-resort InfoExtractor, if
# this error is thrown, it'll be thrown here # this error is thrown, it'll be thrown here
raise ExtractorError(u'Failed to download URL: %s' % url) raise ExtractorError('Failed to download URL: %s' % url)
self.report_extraction(video_id) self.report_extraction(video_id)
@ -212,17 +214,17 @@ class GenericIE(InfoExtractor):
# Video Title - Tagline | Site Name # Video Title - Tagline | Site Name
# and so on and so forth; it's just not practical # and so on and so forth; it's just not practical
video_title = self._html_search_regex( video_title = self._html_search_regex(
r'(?s)<title>(.*?)</title>', webpage, u'video title', r'(?s)<title>(.*?)</title>', webpage, 'video title',
default=u'video') default='video')
# video uploader is domain name # video uploader is domain name
video_uploader = self._search_regex( video_uploader = self._search_regex(
r'^(?:https?://)?([^/]*)/.*', url, u'video uploader') r'^(?:https?://)?([^/]*)/.*', url, 'video uploader')
# Look for BrightCove: # Look for BrightCove:
bc_url = BrightcoveIE._extract_brightcove_url(webpage) bc_url = BrightcoveIE._extract_brightcove_url(webpage)
if bc_url is not None: if bc_url is not None:
self.to_screen(u'Brightcove video detected.') self.to_screen('Brightcove video detected.')
return self.url_result(bc_url, 'Brightcove') return self.url_result(bc_url, 'Brightcove')
# Look for embedded (iframe) Vimeo player # Look for embedded (iframe) Vimeo player
@ -329,12 +331,12 @@ class GenericIE(InfoExtractor):
# HTML5 video # HTML5 video
mobj = re.search(r'<video[^<]*(?:>.*?<source.*?)? src="([^"]+)"', webpage, flags=re.DOTALL) mobj = re.search(r'<video[^<]*(?:>.*?<source.*?)? src="([^"]+)"', webpage, flags=re.DOTALL)
if mobj is None: if mobj is None:
raise ExtractorError(u'Unsupported URL: %s' % url) raise ExtractorError('Unsupported URL: %s' % url)
# It's possible that one of the regexes # It's possible that one of the regexes
# matched, but returned an empty group: # matched, but returned an empty group:
if mobj.group(1) is None: if mobj.group(1) is None:
raise ExtractorError(u'Did not find a valid video URL at %s' % url) raise ExtractorError('Did not find a valid video URL at %s' % url)
video_url = mobj.group(1) video_url = mobj.group(1)
video_url = compat_urlparse.urljoin(url, video_url) video_url = compat_urlparse.urljoin(url, video_url)