MarcoBuster/youtube-dl
1
1
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-27 23:56:51 +01:00
Code Issues Releases Wiki Activity

[xtube:user] Fix extraction (Closes #8224)

Browse Source
This commit is contained in:
Sergey M․ 2016-01-15 21:35:20 +06:00
parent b3f502cdb9
commit 34dd81c03a
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
youtube_dl/extractor/xtube.py
View File

@ -1,10 +1,12 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import itertools
import re import re
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import compat_urllib_parse_unquote from ..compat import compat_urllib_parse_unquote
from ..utils import ( from ..utils import (
int_or_none,
parse_duration, parse_duration,
sanitized_Request, sanitized_Request,
str_to_int, str_to_int,
@ -88,45 +90,43 @@ class XTubeIE(InfoExtractor):
class XTubeUserIE(InfoExtractor): class XTubeUserIE(InfoExtractor):
IE_DESC = 'XTube user profile' IE_DESC = 'XTube user profile'
_VALID_URL = r'https?://(?:www\.)?xtube\.com/community/profile\.php\?(.*?)user=(?P<username>[^&#]+)(?:$|[&#])' _VALID_URL = r'https?://(?:www\.)?xtube\.com/profile/(?P<id>[^/]+-\d+)'
_TEST = { _TEST = {
'url': 'http://www.xtube.com/community/profile.php?user=greenshowers', 'url': 'http://www.xtube.com/profile/greenshowers-4056496',
'info_dict': { 'info_dict': {
'id': 'greenshowers', 'id': 'greenshowers-4056496',
'age_limit': 18, 'age_limit': 18,
}, },
'playlist_mincount': 155, 'playlist_mincount': 155,
} }
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) user_id = self._match_id(url)
username = mobj.group('username')
profile_page = self._download_webpage( entries = []
url, username, note='Retrieving profile page') for pagenum in itertools.count(1):
request = sanitized_Request(
'http://www.xtube.com/profile/%s/videos/%d' % (user_id, pagenum),
headers={
'Cookie': 'popunder=4',
'X-Requested-With': 'XMLHttpRequest',
'Referer': url,
})
video_count = int(self._search_regex( page = self._download_json(
r'<strong>%s\'s Videos \(([0-9]+)\)</strong>' % username, profile_page, request, user_id, 'Downloading videos JSON page %d' % pagenum)
'video count'))
PAGE_SIZE = 25 html = page.get('html')
urls = [] if not html:
page_count = (video_count + PAGE_SIZE + 1) // PAGE_SIZE break
for n in range(1, page_count + 1):
lpage_url = 'http://www.xtube.com/user_videos.php?page=%d&u=%s' % (n, username)
lpage = self._download_webpage(
lpage_url, username,
note='Downloading page %d/%d' % (n, page_count))
urls.extend(
re.findall(r'addthis:url="([^"]+)"', lpage))
return { for _, video_id in re.findall(r'data-plid=(["\'])(.+?)\1', html):
'_type': 'playlist', entries.append(self.url_result('xtube:%s' % video_id, XTubeIE.ie_key()))
'id': username,
'age_limit': 18, page_count = int_or_none(page.get('pageCount'))
'entries': [{ if not page_count or pagenum == page_count:
'_type': 'url', break
'url': eurl,
'ie_key': 'XTube', playlist = self.playlist_result(entries, user_id)
} for eurl in urls] playlist['age_limit'] = 18
} return playlist