projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c4e817c
)
[macgamestore] Modernize
author
Philipp Hagemeister
<phihag@phihag.de>
Sun, 1 Feb 2015 14:08:33 +0000
(15:08 +0100)
committer
Philipp Hagemeister
<phihag@phihag.de>
Sun, 1 Feb 2015 14:08:33 +0000
(15:08 +0100)
youtube_dl/extractor/macgamestore.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/macgamestore.py
b/youtube_dl/extractor/macgamestore.py
index b818cf50c85c79865b5afc09090d6261e81d08c6..3cd4a3a192ce3f6b611f6b3f4f3d928b75c9bba0 100644
(file)
--- a/
youtube_dl/extractor/macgamestore.py
+++ b/
youtube_dl/extractor/macgamestore.py
@@
-1,7
+1,5
@@
from __future__ import unicode_literals
from __future__ import unicode_literals
-import re
-
from .common import InfoExtractor
from ..utils import ExtractorError
from .common import InfoExtractor
from ..utils import ExtractorError
@@
-13,21
+11,22
@@
class MacGameStoreIE(InfoExtractor):
_TEST = {
'url': 'http://www.macgamestore.com/mediaviewer.php?trailer=2450',
_TEST = {
'url': 'http://www.macgamestore.com/mediaviewer.php?trailer=2450',
- 'file': '2450.m4v',
'md5': '8649b8ea684b6666b4c5be736ecddc61',
'info_dict': {
'md5': '8649b8ea684b6666b4c5be736ecddc61',
'info_dict': {
+ 'id': '2450',
+ 'ext': 'm4v',
'title': 'Crow',
}
}
def _real_extract(self, url):
'title': 'Crow',
}
}
def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- video_id = mobj.group('id')
-
- webpage = self._download_webpage(url, video_id, 'Downloading trailer page')
+ video_id = self._match_id(url)
+ webpage = self._download_webpage(
+ url, video_id, 'Downloading trailer page')
- if re.search(r'>Missing Media<', webpage) is not None:
- raise ExtractorError('Trailer %s does not exist' % video_id, expected=True)
+ if '>Missing Media<' in webpage:
+ raise ExtractorError(
+ 'Trailer %s does not exist' % video_id, expected=True)
video_title = self._html_search_regex(
r'<title>MacGameStore: (.*?) Trailer</title>', webpage, 'title')
video_title = self._html_search_regex(
r'<title>MacGameStore: (.*?) Trailer</title>', webpage, 'title')