Browse Source

[sunporno] Modernize

Sergey M․ 10 years ago
parent
commit
31424c126f
1 changed files with 11 additions and 7 deletions
  1. 11 7
      youtube_dl/extractor/sunporno.py

+ 11 - 7
youtube_dl/extractor/sunporno.py

@@ -28,23 +28,27 @@ class SunPornoIE(InfoExtractor):
     }
     }
 
 
     def _real_extract(self, url):
     def _real_extract(self, url):
-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
+        video_id = self._match_id(url)
 
 
         webpage = self._download_webpage(url, video_id)
         webpage = self._download_webpage(url, video_id)
 
 
-        title = self._html_search_regex(r'<title>([^<]+)</title>', webpage, 'title')
-        description = self._html_search_meta('description', webpage, 'description')
+        title = self._html_search_regex(
+            r'<title>([^<]+)</title>', webpage, 'title')
+        description = self._html_search_meta(
+            'description', webpage, 'description')
         thumbnail = self._html_search_regex(
         thumbnail = self._html_search_regex(
             r'poster="([^"]+)"', webpage, 'thumbnail', fatal=False)
             r'poster="([^"]+)"', webpage, 'thumbnail', fatal=False)
 
 
         duration = parse_duration(self._search_regex(
         duration = parse_duration(self._search_regex(
-            r'Duration:[^\d]+(\d+:\d+)\s*<', webpage, 'duration', fatal=False))
+            r'itemprop="duration">\s*(\d+:\d+)\s*<',
+            webpage, 'duration', fatal=False))
 
 
         view_count = int_or_none(self._html_search_regex(
         view_count = int_or_none(self._html_search_regex(
-            r'class="views">\s*(\d+)\s*<', webpage, 'view count', fatal=False))
+            r'class="views">\s*(\d+)\s*<',
+            webpage, 'view count', fatal=False))
         comment_count = int_or_none(self._html_search_regex(
         comment_count = int_or_none(self._html_search_regex(
-            r'(\d+)</b> Comments?', webpage, 'comment count', fatal=False))
+            r'(\d+)</b> Comments?',
+            webpage, 'comment count', fatal=False))
 
 
         formats = []
         formats = []
         quality = qualities(['mp4', 'flv'])
         quality = qualities(['mp4', 'flv'])