[0-9a-z]+)$'
- def report_extraction(self, video_id):
- self._downloader.to_screen(u'[%s] %s: Extracting information' % (self.IE_NAME, video_id))
-
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
if mobj is None:
@@ -3715,14 +3661,7 @@ class TweetReelIE(InfoExtractor):
return
video_id = mobj.group('id')
- self.report_extraction(video_id)
- try:
- urlh = compat_urllib_request.urlopen(url)
- webpage_bytes = urlh.read()
- webpage = webpage_bytes.decode('utf-8', 'ignore')
- except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
- self._downloader.trouble(u'ERROR: unable to download webpage: %s' % compat_str(err))
- return
+ webpage = self._download_webpage(url, video_id)
m = re.search(r'', webpage)
if not m:
@@ -3771,35 +3710,23 @@ class SteamIE(InfoExtractor):
def suitable(self, url):
"""Receives a URL and returns True if suitable for this IE."""
return re.match(self._VALID_URL, url, re.VERBOSE) is not None
-
- def report_download_video_page(self, game_id):
- self._downloader.to_screen(u'[%s] %s: Downloading video page' % (self.IE_NAME, game_id))
-
+
def _real_extract(self, url):
m = re.match(self._VALID_URL, url, re.VERBOSE)
urlRE = r"'movie_(?P\d+)': \{\s*FILENAME: \"(?P[\w:/\.\?=]+)\"(,\s*MOVIE_NAME: \"(?P[\w:/\.\?=\+-]+)\")?\s*\},"
gameID = m.group('gameID')
videourl = 'http://store.steampowered.com/video/%s/' % gameID
- try:
- self.report_download_video_page(gameID)
- urlh = compat_urllib_request.urlopen(videourl)
- webpage_bytes = urlh.read()
- webpage = webpage_bytes.decode('utf-8', 'ignore')
- except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
- self._downloader.trouble(u'ERROR: unable to download webpage: %s' % compat_str(err))
- return
+ webpage = self._download_webpage(videourl, gameID)
mweb = re.finditer(urlRE, webpage)
namesRE = r'(?P[\w:/\.\?=\+\s-]+)'
titles = list(re.finditer(namesRE, webpage))
videos = []
- i = 0
- for vid in mweb:
+ for vid,vtitle in zip(mweb,titles):
video_id = vid.group('videoID')
- title = titles[i].group('videoName')
- video_url=vid.group('videoURL')
+ title = vtitle.group('videoName')
+ video_url = vid.group('videoURL')
if not video_url:
self._downloader.trouble(u'ERROR: Cannot find video url for %s' % video_id)
- i += 1
info = {
'id':video_id,
'url':video_url,