-# encoding: utf-8
+# coding: utf-8
from __future__ import unicode_literals
import re
import uuid
from .common import InfoExtractor
-from ..compat import (
- compat_urllib_parse,
- compat_urllib_request,
-)
from ..utils import (
ExtractorError,
int_or_none,
+ sanitized_Request,
unified_strdate,
+ urlencode_postdata,
+ xpath_text,
)
class SmotriIE(InfoExtractor):
IE_DESC = 'Smotri.com'
IE_NAME = 'smotri'
- _VALID_URL = r'^https?://(?:www\.)?(?:smotri\.com/video/view/\?id=|pics\.smotri\.com/(?:player|scrubber_custom8)\.swf\?file=)(?P<id>v(?P<realvideoid>[0-9]+)[a-z0-9]{4})'
+ _VALID_URL = r'https?://(?:www\.)?(?:smotri\.com/video/view/\?id=|pics\.smotri\.com/(?:player|scrubber_custom8)\.swf\?file=)(?P<id>v(?P<realvideoid>[0-9]+)[a-z0-9]{4})'
_NETRC_MACHINE = 'smotri'
_TESTS = [
# real video id 2610366
{
'url': 'http://smotri.com/video/view/?id=v261036632ab',
- 'md5': '2a7b08249e6f5636557579c368040eb9',
+ 'md5': '02c0dfab2102984e9c5bb585cc7cc321',
'info_dict': {
'id': 'v261036632ab',
'ext': 'mp4',
'uploader': 'psavari1',
'uploader_id': 'psavari1',
'upload_date': '20081103',
- 'thumbnail': 're:^https?://.*\.jpg$',
+ 'thumbnail': r're:^https?://.*\.jpg$',
},
'params': {
'videopassword': '223322',
'uploader': 'вАся',
'uploader_id': 'asya_prosto',
'upload_date': '20081218',
- 'thumbnail': 're:^https?://.*\.jpg$',
+ 'thumbnail': r're:^https?://.*\.jpg$',
'age_limit': 18,
},
'params': {
'getvideoinfo': '1',
}
- video_password = self._downloader.params.get('videopassword', None)
+ video_password = self._downloader.params.get('videopassword')
if video_password:
video_form['pass'] = hashlib.md5(video_password.encode('utf-8')).hexdigest()
- request = compat_urllib_request.Request(
- 'http://smotri.com/video/view/url/bot/', compat_urllib_parse.urlencode(video_form))
- request.add_header('Content-Type', 'application/x-www-form-urlencoded')
-
- video = self._download_json(request, video_id, 'Downloading video JSON')
+ video = self._download_json(
+ 'http://smotri.com/video/view/url/bot/',
+ video_id, 'Downloading video JSON',
+ data=urlencode_postdata(video_form),
+ headers={'Content-Type': 'application/x-www-form-urlencoded'})
video_url = video.get('_vidURL') or video.get('_vidURL_mp4')
raise ExtractorError(msg, expected=True)
title = video['title']
- thumbnail = video['_imgURL']
- upload_date = unified_strdate(video['added'])
- uploader = video['userNick']
- uploader_id = video['userLogin']
- duration = int_or_none(video['duration'])
+ thumbnail = video.get('_imgURL')
+ upload_date = unified_strdate(video.get('added'))
+ uploader = video.get('userNick')
+ uploader_id = video.get('userLogin')
+ duration = int_or_none(video.get('duration'))
# Video JSON does not provide enough meta data
# We will extract some from the video web page instead
# Warning if video is unavailable
warning = self._html_search_regex(
- r'<div class="videoUnModer">(.*?)</div>', webpage,
+ r'<div[^>]+class="videoUnModer"[^>]*>(.+?)</div>', webpage,
'warning message', default=None)
if warning is not None:
self._downloader.report_warning(
(video_id, warning))
# Adult content
- if re.search('EroConfirmText">', webpage) is not None:
+ if 'EroConfirmText">' in webpage:
self.report_age_confirmation()
confirm_string = self._html_search_regex(
- r'<a href="/video/view/\?id=%s&confirm=([^"]+)" title="[^"]+">' % video_id,
+ r'<a[^>]+href="/video/view/\?id=%s&confirm=([^"]+)"' % video_id,
webpage, 'confirm string')
confirm_url = webpage_url + '&confirm=%s' % confirm_string
- webpage = self._download_webpage(confirm_url, video_id, 'Downloading video page (age confirmed)')
+ webpage = self._download_webpage(
+ confirm_url, video_id,
+ 'Downloading video page (age confirmed)')
adult_content = True
else:
adult_content = False
view_count = self._html_search_regex(
- 'Общее количество просмотров.*?<span class="Number">(\\d+)</span>',
- webpage, 'view count', fatal=False, flags=re.MULTILINE | re.DOTALL)
+ r'(?s)Общее количество просмотров.*?<span class="Number">(\d+)</span>',
+ webpage, 'view count', fatal=False)
return {
'id': video_id,
class SmotriCommunityIE(InfoExtractor):
IE_DESC = 'Smotri.com community videos'
IE_NAME = 'smotri:community'
- _VALID_URL = r'^https?://(?:www\.)?smotri\.com/community/video/(?P<communityid>[0-9A-Za-z_\'-]+)'
+ _VALID_URL = r'https?://(?:www\.)?smotri\.com/community/video/(?P<id>[0-9A-Za-z_\'-]+)'
_TEST = {
'url': 'http://smotri.com/community/video/kommuna',
'info_dict': {
'id': 'kommuna',
- 'title': 'КПРФ',
},
'playlist_mincount': 4,
}
def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- community_id = mobj.group('communityid')
+ community_id = self._match_id(url)
- url = 'http://smotri.com/export/rss/video/by/community/-/%s/video.xml' % community_id
- rss = self._download_xml(url, community_id, 'Downloading community RSS')
-
- entries = [self.url_result(video_url.text, 'Smotri')
- for video_url in rss.findall('./channel/item/link')]
+ rss = self._download_xml(
+ 'http://smotri.com/export/rss/video/by/community/-/%s/video.xml' % community_id,
+ community_id, 'Downloading community RSS')
- description_text = rss.find('./channel/description').text
- community_title = self._html_search_regex(
- '^Видео сообщества "([^"]+)"$', description_text, 'community title')
+ entries = [
+ self.url_result(video_url.text, SmotriIE.ie_key())
+ for video_url in rss.findall('./channel/item/link')]
- return self.playlist_result(entries, community_id, community_title)
+ return self.playlist_result(entries, community_id)
class SmotriUserIE(InfoExtractor):
IE_DESC = 'Smotri.com user videos'
IE_NAME = 'smotri:user'
- _VALID_URL = r'^https?://(?:www\.)?smotri\.com/user/(?P<userid>[0-9A-Za-z_\'-]+)'
+ _VALID_URL = r'https?://(?:www\.)?smotri\.com/user/(?P<id>[0-9A-Za-z_\'-]+)'
_TESTS = [{
'url': 'http://smotri.com/user/inspector',
'info_dict': {
}]
def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- user_id = mobj.group('userid')
+ user_id = self._match_id(url)
- url = 'http://smotri.com/export/rss/user/video/-/%s/video.xml' % user_id
- rss = self._download_xml(url, user_id, 'Downloading user RSS')
+ rss = self._download_xml(
+ 'http://smotri.com/export/rss/user/video/-/%s/video.xml' % user_id,
+ user_id, 'Downloading user RSS')
entries = [self.url_result(video_url.text, 'Smotri')
for video_url in rss.findall('./channel/item/link')]
- description_text = rss.find('./channel/description').text
- user_nickname = self._html_search_regex(
- '^Видео режиссера (.*)$', description_text,
- 'user nickname')
+ description_text = xpath_text(rss, './channel/description') or ''
+ user_nickname = self._search_regex(
+ '^Видео режиссера (.+)$', description_text,
+ 'user nickname', fatal=False)
return self.playlist_result(entries, user_id, user_nickname)
class SmotriBroadcastIE(InfoExtractor):
IE_DESC = 'Smotri.com broadcasts'
IE_NAME = 'smotri:broadcast'
- _VALID_URL = r'^https?://(?:www\.)?(?P<url>smotri\.com/live/(?P<broadcastid>[^/]+))/?.*'
+ _VALID_URL = r'https?://(?:www\.)?(?P<url>smotri\.com/live/(?P<id>[^/]+))/?.*'
+ _NETRC_MACHINE = 'smotri'
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
- broadcast_id = mobj.group('broadcastid')
+ broadcast_id = mobj.group('id')
broadcast_url = 'http://' + mobj.group('url')
broadcast_page = self._download_webpage(broadcast_url, broadcast_id, 'Downloading broadcast page')
(username, password) = self._get_login_info()
if username is None:
- raise ExtractorError(
- 'Erotic broadcasts allowed only for registered users, '
- 'use --username and --password options to provide account credentials.',
- expected=True)
+ self.raise_login_required(
+ 'Erotic broadcasts allowed only for registered users')
login_form = {
'login-hint53': '1',
'password': password,
}
- request = compat_urllib_request.Request(
- broadcast_url + '/?no_redirect=1', compat_urllib_parse.urlencode(login_form))
+ request = sanitized_Request(
+ broadcast_url + '/?no_redirect=1', urlencode_postdata(login_form))
request.add_header('Content-Type', 'application/x-www-form-urlencoded')
broadcast_page = self._download_webpage(
request, broadcast_id, 'Logging in and confirming age')
- if re.search('>Неверный логин или пароль<', broadcast_page) is not None:
- raise ExtractorError('Unable to log in: bad username or password', expected=True)
+ if '>Неверный логин или пароль<' in broadcast_page:
+ raise ExtractorError(
+ 'Unable to log in: bad username or password', expected=True)
adult_content = True
else:
adult_content = False
ticket = self._html_search_regex(
- r"window\.broadcast_control\.addFlashVar\('file'\s*,\s*'([^']+)'\)",
- broadcast_page, 'broadcast ticket')
+ (r'data-user-file=(["\'])(?P<ticket>(?!\1).+)\1',
+ r"window\.broadcast_control\.addFlashVar\('file'\s*,\s*'(?P<ticket>[^']+)'\)"),
+ broadcast_page, 'broadcast ticket', group='ticket')
- url = 'http://smotri.com/broadcast/view/url/?ticket=%s' % ticket
+ broadcast_url = 'http://smotri.com/broadcast/view/url/?ticket=%s' % ticket
- broadcast_password = self._downloader.params.get('videopassword', None)
+ broadcast_password = self._downloader.params.get('videopassword')
if broadcast_password:
- url += '&pass=%s' % hashlib.md5(broadcast_password.encode('utf-8')).hexdigest()
+ broadcast_url += '&pass=%s' % hashlib.md5(broadcast_password.encode('utf-8')).hexdigest()
broadcast_json_page = self._download_webpage(
- url, broadcast_id, 'Downloading broadcast JSON')
+ broadcast_url, broadcast_id, 'Downloading broadcast JSON')
try:
broadcast_json = json.loads(broadcast_json_page)
broadcast_playpath = broadcast_json['_streamName']
broadcast_app = '%s/%s' % (mobj.group('app'), broadcast_json['_vidURL'])
- broadcast_thumbnail = broadcast_json['_imgURL']
+ broadcast_thumbnail = broadcast_json.get('_imgURL')
broadcast_title = self._live_title(broadcast_json['title'])
- broadcast_description = broadcast_json['description']
- broadcaster_nick = broadcast_json['nick']
- broadcaster_login = broadcast_json['login']
+ broadcast_description = broadcast_json.get('description')
+ broadcaster_nick = broadcast_json.get('nick')
+ broadcaster_login = broadcast_json.get('login')
rtmp_conn = 'S:%s' % uuid.uuid4().hex
except KeyError:
if protected_broadcast:
Rapsys Git / youtubedl / blobdiff