X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fmacgamestore.py;h=43db9929ca805fa7917824cf1bfd466f5721509e;hb=70d35d166c1cfb14af20fb6d45ed820b6249f941;hp=4541f6d66e63300006078fc10143ffe8b3bade8c;hpb=cc14dfb8ecb73be9905f5adab2d7f1f92d435e2f;p=youtube-dl

diff --git a/youtube_dl/extractor/macgamestore.py b/youtube_dl/extractor/macgamestore.py
index 4541f6d66..43db9929c 100644
--- a/youtube_dl/extractor/macgamestore.py
+++ b/youtube_dl/extractor/macgamestore.py
@@ -1,40 +1,42 @@
-import re
+from __future__ import unicode_literals
 
 from .common import InfoExtractor
 from ..utils import ExtractorError
 
 
 class MacGameStoreIE(InfoExtractor):
-    IE_NAME = u'macgamestore'
-    IE_DESC = u'MacGameStore trailers'
-    _VALID_URL = r'https?://www\.macgamestore\.com/mediaviewer\.php\?trailer=(?P<id>\d+)'
+    IE_NAME = 'macgamestore'
+    IE_DESC = 'MacGameStore trailers'
+    _VALID_URL = r'https?://(?:www\.)?macgamestore\.com/mediaviewer\.php\?trailer=(?P<id>\d+)'
 
     _TEST = {
-        u'url': u'http://www.macgamestore.com/mediaviewer.php?trailer=2450',
-        u'file': u'2450.m4v',
-        u'md5': u'8649b8ea684b6666b4c5be736ecddc61',
-        u'info_dict': {
-            u'title': u'Crow',
+        'url': 'http://www.macgamestore.com/mediaviewer.php?trailer=2450',
+        'md5': '8649b8ea684b6666b4c5be736ecddc61',
+        'info_dict': {
+            'id': '2450',
+            'ext': 'm4v',
+            '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, u'Downloading trailer page')
-        
-        if re.search(r'>Missing Media<', webpage) is not None:
-            raise ExtractorError(u'Trailer %s does not exist' % video_id, expected=True)
-        
-        mobj = re.search(r'<title>MacGameStore: (?P<title>.*?) Trailer</title>', webpage)
-        video_title = mobj.group('title')
-        
-        mobj = re.search(r'(?s)<div\s+id="video-player".*?href="(?P<video>[^"]+)"\s*>', webpage)
-        video_url = mobj.group('video')
-        
+        video_id = self._match_id(url)
+        webpage = self._download_webpage(
+            url, video_id, 'Downloading trailer page')
+
+        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_url = self._html_search_regex(
+            r'(?s)<div\s+id="video-player".*?href="([^"]+)"\s*>',
+            webpage, 'video URL')
+
         return {
             'id': video_id,
             'url': video_url,
             'title': video_title
-        }
\ No newline at end of file
+        }