X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Ffourtube.py;h=9776c8422228f1f44b5b0a3bf0c40a125e1fa50a;hb=0a439c5c4c1a6a2ee54465c5ad893ffb768539d3;hp=3bb4f6239aceccd86dbb1dd4e9eafeace7ddad88;hpb=2ec7b7b79b50e0a05d6f7b4ebf839ff10d063a14;p=youtube-dl
diff --git a/youtube_dl/extractor/fourtube.py b/youtube_dl/extractor/fourtube.py
index 3bb4f6239..9776c8422 100644
--- a/youtube_dl/extractor/fourtube.py
+++ b/youtube_dl/extractor/fourtube.py
@@ -3,12 +3,10 @@ from __future__ import unicode_literals
import re
from .common import InfoExtractor
-from ..compat import (
- compat_urllib_request,
-)
from ..utils import (
parse_duration,
parse_iso8601,
+ sanitized_Request,
str_to_int,
)
@@ -45,14 +43,14 @@ class FourTubeIE(InfoExtractor):
'uploadDate', webpage))
thumbnail = self._html_search_meta('thumbnailUrl', webpage)
uploader_id = self._html_search_regex(
- r'',
- webpage, 'uploader id')
+ r'',
+ webpage, 'uploader id', fatal=False)
uploader = self._html_search_regex(
- r'',
- webpage, 'uploader')
+ r'',
+ webpage, 'uploader', fatal=False)
categories_html = self._search_regex(
- r'(?s)>\s*Categories / Tags\s*.*?',
+ r'(?s)>\s*Categories / Tags\s*.*?',
webpage, 'categories', fatal=False)
categories = None
if categories_html:
@@ -61,20 +59,31 @@ class FourTubeIE(InfoExtractor):
r'(?s)(.*?)', categories_html)]
view_count = str_to_int(self._search_regex(
- r'',
+ r']+itemprop="interactionCount"[^>]+content="UserPlays:([0-9,]+)">',
webpage, 'view count', fatal=False))
like_count = str_to_int(self._search_regex(
- r'',
+ r']+itemprop="interactionCount"[^>]+content="UserLikes:([0-9,]+)">',
webpage, 'like count', fatal=False))
duration = parse_duration(self._html_search_meta('duration', webpage))
- params_js = self._search_regex(
- r'\$\.ajax\(url,\ opts\);\s*\}\s*\}\)\(([0-9,\[\] ]+)\)',
- webpage, 'initialization parameters'
- )
- params = self._parse_json('[%s]' % params_js, video_id)
- media_id = params[0]
- sources = ['%s' % p for p in params[2]]
+ media_id = self._search_regex(
+ r'