浏览代码

[hentaistigma] Modernize

Sergey M․ 10 年之前
父节点
当前提交
cf386750c9
共有 1 个文件被更改,包括 4 次插入7 次删除
  1. 4 7
      youtube_dl/extractor/hentaistigma.py

+ 4 - 7
youtube_dl/extractor/hentaistigma.py

@@ -1,7 +1,5 @@
 from __future__ import unicode_literals
 from __future__ import unicode_literals
 
 
-import re
-
 from .common import InfoExtractor
 from .common import InfoExtractor
 
 
 
 
@@ -19,20 +17,19 @@ class HentaiStigmaIE(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(
         title = self._html_search_regex(
-            r'<h2 class="posttitle"><a[^>]*>([^<]+)</a>',
+            r'<h2[^>]+class="posttitle"[^>]*><a[^>]*>([^<]+)</a>',
             webpage, 'title')
             webpage, 'title')
         wrap_url = self._html_search_regex(
         wrap_url = self._html_search_regex(
-            r'<iframe src="([^"]+mp4)"', webpage, 'wrapper url')
+            r'<iframe[^>]+src="([^"]+mp4)"', webpage, 'wrapper url')
         wrap_webpage = self._download_webpage(wrap_url, video_id)
         wrap_webpage = self._download_webpage(wrap_url, video_id)
 
 
         video_url = self._html_search_regex(
         video_url = self._html_search_regex(
-            r'file:"([^"]+)"', wrap_webpage, 'video url')
+            r'file\s*:\s*"([^"]+)"', wrap_webpage, 'video url')
 
 
         return {
         return {
             'id': video_id,
             'id': video_id,