Annotate changelog with bug closed.

[youtubedl] / youtube_dl / extractor / xtube.py

diff --git a/youtube_dl/extractor/xtube.py b/youtube_dl/extractor/xtube.py
index 38448e7c0fbfe3641cc364a2707a97910ab16cf8..a1fe24050003273f736d605fa662318e4dc6e17d 100644 (file)
--- a/youtube_dl/extractor/xtube.py
+++ b/youtube_dl/extractor/xtube.py
@@ -1,18 +1,18 @@
 from __future__ import unicode_literals
 
 import re
 from __future__ import unicode_literals
 
 import re

-import json

 
 from .common import InfoExtractor
 
 from .common import InfoExtractor

+from ..compat import compat_urllib_parse_unquote

 from ..utils import (
 from ..utils import (

-    compat_urllib_request,

     parse_duration,
     parse_duration,

+    sanitized_Request,

     str_to_int,
 )
 
 
 class XTubeIE(InfoExtractor):
     str_to_int,
 )
 
 
 class XTubeIE(InfoExtractor):

-    _VALID_URL = r'https?://(?:www\.)?(?P<url>xtube\.com/watch\.php\?v=(?P<videoid>[^/?&]+))'
+    _VALID_URL = r'https?://(?:www\.)?(?P<url>xtube\.com/watch\.php\?v=(?P<id>[^/?&#]+))'

     _TEST = {
         'url': 'http://www.xtube.com/watch.php?v=kVTUy_G222_',
         'md5': '092fbdd3cbe292c920ef6fc6a8a9cdab',
     _TEST = {
         'url': 'http://www.xtube.com/watch.php?v=kVTUy_G222_',
         'md5': '092fbdd3cbe292c920ef6fc6a8a9cdab',


@@ -20,7 +20,7 @@ class XTubeIE(InfoExtractor):
             'id': 'kVTUy_G222_',
             'ext': 'mp4',
             'title': 'strange erotica',
             'id': 'kVTUy_G222_',
             'ext': 'mp4',
             'title': 'strange erotica',

-            'description': 'http://www.xtube.com an ET kind of thing',
+            'description': 'contains:an ET kind of thing',

             'uploader': 'greenshowers',
             'duration': 450,
             'age_limit': 18,
             'uploader': 'greenshowers',
             'duration': 450,
             'age_limit': 18,


@@ -28,41 +28,49 @@ class XTubeIE(InfoExtractor):
     }
 
     def _real_extract(self, url):
     }
 
     def _real_extract(self, url):

-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('videoid')
-        url = 'http://www.' + mobj.group('url')
+        video_id = self._match_id(url)

 
 

-        req = compat_urllib_request.Request(url)
+        req = sanitized_Request(url)

         req.add_header('Cookie', 'age_verified=1')
         webpage = self._download_webpage(req, video_id)
 
         req.add_header('Cookie', 'age_verified=1')
         webpage = self._download_webpage(req, video_id)
 

-        video_title = self._html_search_regex(r'<p class="title">([^<]+)', webpage, 'title')
+        video_title = self._html_search_regex(
+            r'<p class="title">([^<]+)', webpage, 'title')

         video_uploader = self._html_search_regex(
         video_uploader = self._html_search_regex(

-            r'so_s\.addVariable\("owner_u", "([^"]+)', webpage, 'uploader', fatal=False)
+            [r"var\s+contentOwnerId\s*=\s*'([^']+)",
+             r'By:\s*<a href="/community/profile\.php\?user=([^"]+)'],
+            webpage, 'uploader', fatal=False)

         video_description = self._html_search_regex(
         video_description = self._html_search_regex(

-            r'<p class="fieldsDesc">([^<]+)', webpage, 'description', fatal=False)
+            r'<p class="fieldsDesc">([^<]+)',
+            webpage, 'description', fatal=False)

         duration = parse_duration(self._html_search_regex(
         duration = parse_duration(self._html_search_regex(

-            r'<span class="bold">Runtime:</span> ([^<]+)</p>', webpage, 'duration', fatal=False))
-        view_count = self._html_search_regex(
-            r'<span class="bold">Views:</span> ([\d,\.]+)</p>', webpage, 'view count', fatal=False)
-        if view_count:
-            view_count = str_to_int(view_count)
-        comment_count = self._html_search_regex(
-            r'<div id="commentBar">([\d,\.]+) Comments</div>', webpage, 'comment count', fatal=False)
-        if comment_count:
-            comment_count = str_to_int(comment_count)
-
-        player_quality_option = json.loads(self._html_search_regex(
-            r'playerQualityOption = ({.+?});', webpage, 'player quality option'))
-
-        QUALITIES = ['3gp', 'mp4_normal', 'mp4_high', 'flv', 'mp4_ultra', 'mp4_720', 'mp4_1080']
-        formats = [
-            {
-                'url': furl,
+            r'<span class="bold">Runtime:</span> ([^<]+)</p>',
+            webpage, 'duration', fatal=False))
+        view_count = str_to_int(self._html_search_regex(
+            r'<span class="bold">Views:</span> ([\d,\.]+)</p>',
+            webpage, 'view count', fatal=False))
+        comment_count = str_to_int(self._html_search_regex(
+            r'<div id="commentBar">([\d,\.]+) Comments</div>',
+            webpage, 'comment count', fatal=False))
+
+        formats = []
+        for format_id, video_url in re.findall(
+                r'flashvars\.quality_(.+?)\s*=\s*"([^"]+)"', webpage):
+            fmt = {
+                'url': compat_urllib_parse_unquote(video_url),

                 'format_id': format_id,
                 'format_id': format_id,

-                'preference': QUALITIES.index(format_id) if format_id in QUALITIES else -1,
-            } for format_id, furl in player_quality_option.items()
-        ]
+            }
+            m = re.search(r'^(?P<height>\d+)[pP]', format_id)
+            if m:
+                fmt['height'] = int(m.group('height'))
+            formats.append(fmt)
+
+        if not formats:
+            video_url = compat_urllib_parse_unquote(self._search_regex(
+                r'flashvars\.video_url\s*=\s*"([^"]+)"',
+                webpage, 'video URL'))
+            formats.append({'url': video_url})
+

         self._sort_formats(formats)
 
         return {
         self._sort_formats(formats)
 
         return {


@@ -85,6 +93,7 @@ class XTubeUserIE(InfoExtractor):
         'url': 'http://www.xtube.com/community/profile.php?user=greenshowers',
         'info_dict': {
             'id': 'greenshowers',
         'url': 'http://www.xtube.com/community/profile.php?user=greenshowers',
         'info_dict': {
             'id': 'greenshowers',

+            'age_limit': 18,

         },
         'playlist_mincount': 155,
     }
         },
         'playlist_mincount': 155,
     }


@@ -114,6 +123,7 @@ class XTubeUserIE(InfoExtractor):
         return {
             '_type': 'playlist',
             'id': username,
         return {
             '_type': 'playlist',
             'id': username,

+            'age_limit': 18,

             'entries': [{
                 '_type': 'url',
                 'url': eurl,
             'entries': [{
                 '_type': 'url',
                 'url': eurl,