[macgamestore] Minor fixes (#2044)
This commit is contained in:
parent
cc14dfb8ec
commit
85689a531f
1 changed files with 22 additions and 19 deletions
|
@ -1,3 +1,5 @@
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
|
@ -5,16 +7,16 @@ from ..utils import ExtractorError
|
||||||
|
|
||||||
|
|
||||||
class MacGameStoreIE(InfoExtractor):
|
class MacGameStoreIE(InfoExtractor):
|
||||||
IE_NAME = u'macgamestore'
|
IE_NAME = 'macgamestore'
|
||||||
IE_DESC = u'MacGameStore trailers'
|
IE_DESC = 'MacGameStore trailers'
|
||||||
_VALID_URL = r'https?://www\.macgamestore\.com/mediaviewer\.php\?trailer=(?P<id>\d+)'
|
_VALID_URL = r'https?://www\.macgamestore\.com/mediaviewer\.php\?trailer=(?P<id>\d+)'
|
||||||
|
|
||||||
_TEST = {
|
_TEST = {
|
||||||
u'url': u'http://www.macgamestore.com/mediaviewer.php?trailer=2450',
|
'url': 'http://www.macgamestore.com/mediaviewer.php?trailer=2450',
|
||||||
u'file': u'2450.m4v',
|
'file': '2450.m4v',
|
||||||
u'md5': u'8649b8ea684b6666b4c5be736ecddc61',
|
'md5': '8649b8ea684b6666b4c5be736ecddc61',
|
||||||
u'info_dict': {
|
'info_dict': {
|
||||||
u'title': u'Crow',
|
'title': 'Crow',
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -22,16 +24,17 @@ class MacGameStoreIE(InfoExtractor):
|
||||||
mobj = re.match(self._VALID_URL, url)
|
mobj = re.match(self._VALID_URL, url)
|
||||||
video_id = mobj.group('id')
|
video_id = mobj.group('id')
|
||||||
|
|
||||||
webpage = self._download_webpage(url, video_id, u'Downloading trailer page')
|
webpage = self._download_webpage(url, video_id, 'Downloading trailer page')
|
||||||
|
|
||||||
if re.search(r'>Missing Media<', webpage) is not None:
|
if re.search(r'>Missing Media<', webpage) is not None:
|
||||||
raise ExtractorError(u'Trailer %s does not exist' % video_id, expected=True)
|
raise ExtractorError('Trailer %s does not exist' % video_id, expected=True)
|
||||||
|
|
||||||
mobj = re.search(r'<title>MacGameStore: (?P<title>.*?) Trailer</title>', webpage)
|
video_title = self._html_search_regex(
|
||||||
video_title = mobj.group('title')
|
r'<title>MacGameStore: (.*?) Trailer</title>', webpage, 'title')
|
||||||
|
|
||||||
mobj = re.search(r'(?s)<div\s+id="video-player".*?href="(?P<video>[^"]+)"\s*>', webpage)
|
video_url = self._html_search_regex(
|
||||||
video_url = mobj.group('video')
|
r'(?s)<div\s+id="video-player".*?href="([^"]+)"\s*>',
|
||||||
|
webpage, 'video URL')
|
||||||
|
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
|
|
Loading…
Reference in a new issue