浏览代码

[pornhub:playlistbase] Do not include videos not from playlist

Sergey M․ 9 年之前
父节点
当前提交
3a23bae9cc
共有 1 个文件被更改,包括 6 次插入3 次删除
  1. 6 3
      youtube_dl/extractor/pornhub.py

+ 6 - 3
youtube_dl/extractor/pornhub.py

@@ -150,9 +150,12 @@ class PornHubIE(InfoExtractor):
 class PornHubPlaylistBaseIE(InfoExtractor):
     def _extract_entries(self, webpage):
         return [
-            self.url_result('http://www.pornhub.com/%s' % video_url, PornHubIE.ie_key())
-            for video_url in orderedSet(re.findall(
-                r'href="/?(view_video\.php\?.*\bviewkey=[\da-z]+[^"]*)"', webpage))
+            self.url_result(
+                'http://www.pornhub.com/%s' % video_url,
+                PornHubIE.ie_key(), video_title=title)
+            for video_url, title in orderedSet(re.findall(
+                r'href="/?(view_video\.php\?.*\bviewkey=[\da-z]+[^"]*)"[^>]*\s+title="([^"]+)"',
+                webpage))
         ]
 
     def _real_extract(self, url):