X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=youtube_dl%2Fextractor%2Fxtube.py;h=bea9b87ad4123f90bcf554d7115cfd35d431afe6;hb=6d923aab35f186ca5c4c7fce6b7c43145aa192db;hp=f9d98b83fb47aef2f927c21c102ced7943c11e53;hpb=d5524947b560c1d0e1dfa2ef7f1969efe07866fa;p=youtube-dl
diff --git a/youtube_dl/extractor/xtube.py b/youtube_dl/extractor/xtube.py
index f9d98b83f..bea9b87ad 100644
--- a/youtube_dl/extractor/xtube.py
+++ b/youtube_dl/extractor/xtube.py
@@ -1,124 +1,177 @@
from __future__ import unicode_literals
+import itertools
import re
-import json
from .common import InfoExtractor
-from ..compat import (
- compat_urllib_request,
-)
from ..utils import (
+ int_or_none,
+ js_to_json,
+ orderedSet,
parse_duration,
+ sanitized_Request,
str_to_int,
)
class XTubeIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?(?P ([^<]+)', webpage, 'title')
- video_uploader = self._html_search_regex(
- r'so_s\.addVariable\("owner_u", "([^"]+)', webpage, 'uploader', fatal=False)
- video_description = self._html_search_regex(
- r' ([^<]+)', webpage, 'description', fatal=False)
- duration = parse_duration(self._html_search_regex(
- r'Runtime: ([^<]+)
([^<]+)', webpage, 'description', fatal=False)
+ uploader = self._search_regex(
+ (r']+name="contentOwnerId"[^>]+value="([^"]+)"',
+ r']+class="nickname"[^>]*>([^<]+)'),
+ webpage, 'uploader', fatal=False)
+ duration = parse_duration(self._search_regex(
+ r'