Mirroring
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl
1
0
Fork 0
Code Issues Releases Wiki Activity

Clean duplicate method report_extraction in InfoExtractors

Browse Source 
A lot of IEs had implemented the method in the same way.
pull/797/head
Jaime Marquínez Ferrándiz 12 years ago
parent f17ce13a92
commit 41a6eb949a
1 changed files with 4 additions and 90 deletions
Show Stats Download Patch File Download Diff File

94
youtube_dl/InfoExtractors.py
Unescape Escape View File

@ -148,6 +148,10 @@ class InfoExtractor(object):
"""Print msg to screen, prefixing it with '[ie_name]'""" """Print msg to screen, prefixing it with '[ie_name]'"""
self._downloader.to_screen(u'[%s] %s' % (self.IE_NAME, msg)) self._downloader.to_screen(u'[%s] %s' % (self.IE_NAME, msg))
def report_extraction(self, id_or_name):
"""Report information extraction."""
self.to_screen(u'%s: Extracting information' % id_or_name)
#Methods for following #608 #Methods for following #608
#They set the correct value of the '_type' key #They set the correct value of the '_type' key
def video_result(self, video_info): def video_result(self, video_info):
@ -694,10 +698,6 @@ class MetacafeIE(InfoExtractor):
"""Report webpage download.""" """Report webpage download."""
self.to_screen(u'%s: Downloading webpage' % video_id) self.to_screen(u'%s: Downloading webpage' % video_id)
def report_extraction(self, video_id):
"""Report information extraction."""
self.to_screen(u'%s: Extracting information' % video_id)
def _real_initialize(self): def _real_initialize(self):
# Retrieve disclaimer # Retrieve disclaimer
request = compat_urllib_request.Request(self._DISCLAIMER) request = compat_urllib_request.Request(self._DISCLAIMER)
@ -801,10 +801,6 @@ class DailymotionIE(InfoExtractor):
def __init__(self, downloader=None): def __init__(self, downloader=None):
InfoExtractor.__init__(self, downloader) InfoExtractor.__init__(self, downloader)
def report_extraction(self, video_id):
"""Report information extraction."""
self.to_screen(u'%s: Extracting information' % video_id)
def _real_extract(self, url): def _real_extract(self, url):
# Extract id and simplified title from URL # Extract id and simplified title from URL
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
@ -893,10 +889,6 @@ class PhotobucketIE(InfoExtractor):
"""Report webpage download.""" """Report webpage download."""
self.to_screen(u'%s: Downloading webpage' % video_id) self.to_screen(u'%s: Downloading webpage' % video_id)
def report_extraction(self, video_id):
"""Report information extraction."""
self.to_screen(u'%s: Extracting information' % video_id)
def _real_extract(self, url): def _real_extract(self, url):
# Extract id from URL # Extract id from URL
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
@ -962,10 +954,6 @@ class YahooIE(InfoExtractor):
"""Report webpage download.""" """Report webpage download."""
self.to_screen(u'%s: Downloading webpage' % video_id) self.to_screen(u'%s: Downloading webpage' % video_id)
def report_extraction(self, video_id):
"""Report information extraction."""
self.to_screen(u'%s: Extracting information' % video_id)
def _real_extract(self, url, new_video=True): def _real_extract(self, url, new_video=True):
# Extract ID from URL # Extract ID from URL
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
@ -1102,10 +1090,6 @@ class VimeoIE(InfoExtractor):
"""Report webpage download.""" """Report webpage download."""
self.to_screen(u'%s: Downloading webpage' % video_id) self.to_screen(u'%s: Downloading webpage' % video_id)
def report_extraction(self, video_id):
"""Report information extraction."""
self.to_screen(u'%s: Extracting information' % video_id)
def _real_extract(self, url, new_video=True): def _real_extract(self, url, new_video=True):
# Extract ID from URL # Extract ID from URL
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
@ -1223,10 +1207,6 @@ class ArteTvIE(InfoExtractor):
"""Report webpage download.""" """Report webpage download."""
self.to_screen(u'%s: Downloading webpage' % video_id) self.to_screen(u'%s: Downloading webpage' % video_id)
def report_extraction(self, video_id):
"""Report information extraction."""
self.to_screen(u'%s: Extracting information' % video_id)
def fetch_webpage(self, url): def fetch_webpage(self, url):
request = compat_urllib_request.Request(url) request = compat_urllib_request.Request(url)
try: try:
@ -1359,10 +1339,6 @@ class GenericIE(InfoExtractor):
self._downloader.report_warning(u'Falling back on generic information extractor.') self._downloader.report_warning(u'Falling back on generic information extractor.')
self.to_screen(u'%s: Downloading webpage' % video_id) self.to_screen(u'%s: Downloading webpage' % video_id)
def report_extraction(self, video_id):
"""Report information extraction."""
self.to_screen(u'%s: Extracting information' % 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(u'[redirect] Following redirect to %s' % new_url)
@ -2051,10 +2027,6 @@ class DepositFilesIE(InfoExtractor):
"""Report webpage download.""" """Report webpage download."""
self.to_screen(u'%s: Downloading webpage' % file_id) self.to_screen(u'%s: Downloading webpage' % file_id)
def report_extraction(self, file_id):
"""Report information extraction."""
self.to_screen(u'%s: Extracting information' % file_id)
def _real_extract(self, url): def _real_extract(self, url):
file_id = url.split('/')[-1] file_id = url.split('/')[-1]
# Rebuild url in english locale # Rebuild url in english locale
@ -2208,10 +2180,6 @@ class BlipTVIE(InfoExtractor):
_URL_EXT = r'^.*\.([a-z0-9]+)$' _URL_EXT = r'^.*\.([a-z0-9]+)$'
IE_NAME = u'blip.tv' IE_NAME = u'blip.tv'
def report_extraction(self, file_id):
"""Report information extraction."""
self.to_screen(u'%s: Extracting information' % file_id)
def report_direct_download(self, title): def report_direct_download(self, title):
"""Report information extraction.""" """Report information extraction."""
self.to_screen(u'%s: Direct download detected' % title) self.to_screen(u'%s: Direct download detected' % title)
@ -2312,10 +2280,6 @@ class MyVideoIE(InfoExtractor):
def __init__(self, downloader=None): def __init__(self, downloader=None):
InfoExtractor.__init__(self, downloader) InfoExtractor.__init__(self, downloader)
def report_extraction(self, video_id):
"""Report information extraction."""
self.to_screen(u'%s: Extracting information' % video_id)
def _real_extract(self,url): def _real_extract(self,url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
if mobj is None: if mobj is None:
@ -2393,9 +2357,6 @@ class ComedyCentralIE(InfoExtractor):
"""Receives a URL and returns True if suitable for this IE.""" """Receives a URL and returns True if suitable for this IE."""
return re.match(cls._VALID_URL, url, re.VERBOSE) is not None return re.match(cls._VALID_URL, url, re.VERBOSE) is not None
def report_extraction(self, episode_id):
self.to_screen(u'%s: Extracting information' % episode_id)
def report_config_download(self, episode_id, media_id): def report_config_download(self, episode_id, media_id):
self.to_screen(u'%s: Downloading configuration for %s' % (episode_id, media_id)) self.to_screen(u'%s: Downloading configuration for %s' % (episode_id, media_id))
@ -2554,9 +2515,6 @@ class EscapistIE(InfoExtractor):
_VALID_URL = r'^(https?://)?(www\.)?escapistmagazine\.com/videos/view/(?P<showname>[^/]+)/(?P<episode>[^/?]+)[/?]?.*$' _VALID_URL = r'^(https?://)?(www\.)?escapistmagazine\.com/videos/view/(?P<showname>[^/]+)/(?P<episode>[^/?]+)[/?]?.*$'
IE_NAME = u'escapist' IE_NAME = u'escapist'
def report_extraction(self, showName):
self.to_screen(u'%s: Extracting information' % showName)
def report_config_download(self, showName): def report_config_download(self, showName):
self.to_screen(u'%s: Downloading configuration' % showName) self.to_screen(u'%s: Downloading configuration' % showName)
@ -2633,10 +2591,6 @@ class CollegeHumorIE(InfoExtractor):
"""Report information extraction.""" """Report information extraction."""
self.to_screen(u'%s: Downloading XML manifest' % video_id) self.to_screen(u'%s: Downloading XML manifest' % video_id)
def report_extraction(self, video_id):
"""Report information extraction."""
self.to_screen(u'%s: Extracting information' % video_id)
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
if mobj is None: if mobj is None:
@ -2700,10 +2654,6 @@ class XVideosIE(InfoExtractor):
_VALID_URL = r'^(?:https?://)?(?:www\.)?xvideos\.com/video([0-9]+)(?:.*)' _VALID_URL = r'^(?:https?://)?(?:www\.)?xvideos\.com/video([0-9]+)(?:.*)'
IE_NAME = u'xvideos' IE_NAME = u'xvideos'
def report_extraction(self, video_id):
"""Report information extraction."""
self.to_screen(u'%s: Extracting information' % video_id)
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
if mobj is None: if mobj is None:
@ -2772,10 +2722,6 @@ class SoundcloudIE(InfoExtractor):
"""Report information extraction.""" """Report information extraction."""
self.to_screen(u'%s: Resolving id' % video_id) self.to_screen(u'%s: Resolving id' % video_id)
def report_extraction(self, video_id):
"""Report information extraction."""
self.to_screen(u'%s: Retrieving stream' % video_id)
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
if mobj is None: if mobj is None:
@ -2845,10 +2791,6 @@ class SoundcloudSetIE(InfoExtractor):
"""Report information extraction.""" """Report information extraction."""
self.to_screen(u'%s: Resolving id' % video_id) self.to_screen(u'%s: Resolving id' % video_id)
def report_extraction(self, video_id):
"""Report information extraction."""
self.to_screen(u'%s: Retrieving stream' % video_id)
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
if mobj is None: if mobj is None:
@ -2912,10 +2854,6 @@ class InfoQIE(InfoExtractor):
"""Information extractor for infoq.com""" """Information extractor for infoq.com"""
_VALID_URL = r'^(?:https?://)?(?:www\.)?infoq\.com/[^/]+/[^/]+$' _VALID_URL = r'^(?:https?://)?(?:www\.)?infoq\.com/[^/]+/[^/]+$'
def report_extraction(self, video_id):
"""Report information extraction."""
self.to_screen(u'%s: Extracting information' % video_id)
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
if mobj is None: if mobj is None:
@ -2976,10 +2914,6 @@ class MixcloudIE(InfoExtractor):
"""Report JSON download.""" """Report JSON download."""
self.to_screen(u'Downloading json') self.to_screen(u'Downloading json')
def report_extraction(self, file_id):
"""Report information extraction."""
self.to_screen(u'%s: Extracting information' % file_id)
def get_urls(self, jsonData, fmt, bitrate='best'): def get_urls(self, jsonData, fmt, bitrate='best'):
"""Get urls from 'audio_formats' section in json""" """Get urls from 'audio_formats' section in json"""
file_url = None file_url = None
@ -3087,10 +3021,6 @@ class StanfordOpenClassroomIE(InfoExtractor):
"""Report information extraction.""" """Report information extraction."""
self.to_screen(u'%s: Downloading webpage' % objid) self.to_screen(u'%s: Downloading webpage' % objid)
def report_extraction(self, video_id):
"""Report information extraction."""
self.to_screen(u'%s: Extracting information' % video_id)
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
if mobj is None: if mobj is None:
@ -3195,10 +3125,6 @@ class MTVIE(InfoExtractor):
_VALID_URL = r'^(?P<proto>https?://)?(?:www\.)?mtv\.com/videos/[^/]+/(?P<videoid>[0-9]+)/[^/]+$' _VALID_URL = r'^(?P<proto>https?://)?(?:www\.)?mtv\.com/videos/[^/]+/(?P<videoid>[0-9]+)/[^/]+$'
IE_NAME = u'mtv' IE_NAME = u'mtv'
def report_extraction(self, video_id):
"""Report information extraction."""
self.to_screen(u'%s: Extracting information' % video_id)
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
if mobj is None: if mobj is None:
@ -3277,10 +3203,6 @@ class YoukuIE(InfoExtractor):
"""Report webpage download.""" """Report webpage download."""
self.to_screen(u'%s: Downloading webpage' % file_id) self.to_screen(u'%s: Downloading webpage' % file_id)
def report_extraction(self, file_id):
"""Report information extraction."""
self.to_screen(u'%s: Extracting information' % file_id)
def _gen_sid(self): def _gen_sid(self):
nowTime = int(time.time() * 1000) nowTime = int(time.time() * 1000)
random1 = random.randint(1000,1998) random1 = random.randint(1000,1998)
@ -3394,10 +3316,6 @@ class XNXXIE(InfoExtractor):
"""Report information extraction""" """Report information extraction"""
self.to_screen(u'%s: Downloading webpage' % video_id) self.to_screen(u'%s: Downloading webpage' % video_id)
def report_extraction(self, video_id):
"""Report information extraction"""
self.to_screen(u'%s: Extracting information' % video_id)
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) mobj = re.match(self._VALID_URL, url)
if mobj is None: if mobj is None:
@ -3616,10 +3534,6 @@ class JustinTVIE(InfoExtractor):
_JUSTIN_PAGE_LIMIT = 100 _JUSTIN_PAGE_LIMIT = 100
IE_NAME = u'justin.tv' IE_NAME = u'justin.tv'
def report_extraction(self, file_id):
"""Report information extraction."""
self.to_screen(u'%s: Extracting information' % file_id)
def report_download_page(self, channel, offset): def report_download_page(self, channel, offset):
"""Report attempt to download a single page of videos.""" """Report attempt to download a single page of videos."""
self.to_screen(u'%s: Downloading video information from %d to %d' % self.to_screen(u'%s: Downloading video information from %d to %d' %

Write Preview
Loading…
Cancel
Save