X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Ffourtube.py;h=9776c8422228f1f44b5b0a3bf0c40a125e1fa50a;hb=68c22c4c15a608a7067f658f5facc1ad8334c03a;hp=cd7668f18006fbffff41234d9cbbc1e47c909e58;hpb=c677e49bd11c3dfada05de9fc1d4de04a577d70e;p=youtube-dl.git
diff --git a/youtube_dl/extractor/fourtube.py b/youtube_dl/extractor/fourtube.py
index cd7668f18..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'',
+ r'',
webpage, 'uploader id', fatal=False)
uploader = self._html_search_regex(
- r'',
+ 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,26 +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))
- player_js = self._download_webpage(
- self._search_regex(
- r'