lopar/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-16 22:37:35 +00:00
Code Releases Activity

[BitChute] Back-port from yt-dlp and upgrade

Browse Source 
BitChute
* extract timestamp instead of upload date
* improve title and description extraction
BitChuteChannel
* fix listing entries
Throughout
* relax regexes
This commit is contained in:
dirkf 2022-06-09 23:42:06 +01:00
parent 530f4582d0
commit 79819f441b
1 changed files with 67 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
youtube_dl/extractor/bitchute.py
View File

@ -6,8 +6,15 @@ import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
clean_html,
ExtractorError,
GeoRestrictedError,
get_element_by_class,
get_element_by_id,
orderedSet, orderedSet,
strip_or_none,
unified_strdate, unified_strdate,
unified_timestamp,
urlencode_postdata, urlencode_postdata,
) )
@ -15,16 +22,17 @@ from ..utils import (
class BitChuteIE(InfoExtractor): class BitChuteIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?bitchute\.com/(?:video|embed|torrent/[^/]+)/(?P<id>[^/?#&]+)' _VALID_URL = r'https?://(?:www\.)?bitchute\.com/(?:video|embed|torrent/[^/]+)/(?P<id>[^/?#&]+)'
_TESTS = [{ _TESTS = [{
'url': 'https://www.bitchute.com/video/szoMrox2JEI/', 'url': 'https://www.bitchute.com/video/UGlrF9o9b-Q/',
'md5': '66c4a70e6bfc40dcb6be3eb1d74939eb', 'md5': '7e427d7ed7af5a75b5855705ec750e2b',
'info_dict': { 'info_dict': {
'id': 'szoMrox2JEI', 'id': 'UGlrF9o9b-Q',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Fuck bitches get money', 'title': 'This is the first video on #BitChute !',
'description': 'md5:3f21f6fb5b1d17c3dee9cf6b5fe60b3a', 'timestamp': 1483425420,
'upload_date': '20170103',
'description': 'md5:a0337e7b1fe39e32336974af8173a034',
'thumbnail': r're:^https?://.*\.jpg$', 'thumbnail': r're:^https?://.*\.jpg$',
'uploader': 'Victoria X Rave', 'uploader': 'BitChute',
'upload_date': '20170813',
}, },
}, { }, {
'url': 'https://www.bitchute.com/embed/lbb5G1hjPhw/', 'url': 'https://www.bitchute.com/embed/lbb5G1hjPhw/',
@ -34,6 +42,13 @@ class BitChuteIE(InfoExtractor):
'only_matching': True, 'only_matching': True,
}] }]
@staticmethod
def _extract_urls(webpage):
urls = re.finditer(
r'''<(?:script|iframe)\b[^>]+\bsrc\s*=\s*(["'])(?P<url>%s)''' % (BitChuteIE._VALID_URL, ),
webpage)
return (mobj.group('url') for mobj in urls)
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
@ -42,43 +57,55 @@ class BitChuteIE(InfoExtractor):
'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.57 Safari/537.36', 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.57 Safari/537.36',
}) })
title = self._html_search_regex( title = (
(r'<[^>]+\bid=["\']video-title[^>]+>([^<]+)', r'<title>([^<]+)'), self._og_search_title(webpage, default=None)
webpage, 'title', default=None) or self._html_search_meta( or strip_or_none(clean_html(get_element_by_id('video-title', webpage)))
'description', webpage, 'title', or self._html_search_regex(r'(?s)<title\b[^>]*>.*?</title', webpage, 'title'))
default=None) or self._og_search_description(webpage)
format_urls = [] format_urls = [
for mobj in re.finditer( mobj.group('url')
r'addWebSeed\s*\(\s*(["\'])(?P<url>(?:(?!\1).)+)\1', webpage): for mobj in re.finditer(
format_urls.append(mobj.group('url')) r'''\baddWebSeed\s*\(\s*(["'])(?P<url>(?:(?!\1).)+)\1''', webpage)]
format_urls.extend(re.findall(r'as=(https?://[^&"\']+)', webpage)) format_urls.extend(re.findall(r'''as=(https?://[^&"']+)''', webpage))
formats = [ formats = [
{'url': format_url} {'url': format_url}
for format_url in orderedSet(format_urls)] for format_url in orderedSet(format_urls)]
if not formats: if not formats:
formats = self._parse_html5_media_entries( entries = self._parse_html5_media_entries(
url, webpage, video_id)[0]['formats'] url, webpage, video_id)
if not entries:
error = strip_or_none(clean_html(self.get_element_by_id('video-title'))) or 'Cannot find video'
if error == 'Video Unavailable':
raise GeoRestrictedError(error)
raise ExtractorError(error)
formats = entries[0]['formats']
self._check_formats(formats, video_id) self._check_formats(formats, video_id)
self._sort_formats(formats) self._sort_formats(formats)
description = self._html_search_regex( description = (
r'(?s)<div\b[^>]+\bclass=["\']full hidden[^>]+>(.+?)</div>', self._og_search_description(webpage)
webpage, 'description', fatal=False) or clean_html(get_element_by_id('video-description', webpage))
thumbnail = self._og_search_thumbnail( or self._html_search_regex(
webpage, default=None) or self._html_search_meta( r'(?s)<div\b[^>]+\bclass=["\']full hidden[^>]+>(.+?)</div>',
'twitter:image:src', webpage, 'thumbnail') webpage, 'description', fatal=False))
thumbnail = self._html_search_meta(
('og:image', 'twitter:image:src'), webpage, 'thumbnail', fatal=False)
uploader = self._html_search_regex( uploader = self._html_search_regex(
(r'(?s)<div class=["\']channel-banner.*?<p\b[^>]+\bclass=["\']name[^>]+>(.+?)</p>', (r'''(?s)<div\b[^>]+?\bclass\s*=\s*["']channel-banner.*?<p\b[^>]+\bclass\s*=\s*["']name\b[^>]+>(.+?)</p>''',
r'(?s)<p\b[^>]+\bclass=["\']video-author[^>]+>(.+?)</p>'), r'''(?s)<p\b[^>]+\bclass\s*=\s*["']video-author\b[^>]+>(.+?)</p>'''),
webpage, 'uploader', fatal=False) webpage, 'uploader', fatal=False)
upload_date = unified_strdate(self._search_regex( def more_unified_timestamp(x):
r'class=["\']video-publish-date[^>]+>[^<]+ at \d+:\d+ UTC on (.+?)\.', # ... at hh:mm TZ on month nth.
webpage, 'upload date', fatal=False)) y = re.split(r'\s+at\s+', x or '')[-1]
y = re.sub(r'(?:^\s+|\s+$|\.+$|(?<=\d)(?:st|nd|rd|th))', '', y)
y = ' '.join(reversed(re.split(r'\s+on\s+', y, 1)))
return unified_timestamp(y) or unified_timestamp(x)
timestamp = more_unified_timestamp(get_element_by_class('video-publish-date', webpage))
return { return {
'id': video_id, 'id': video_id,
@ -86,7 +113,7 @@ class BitChuteIE(InfoExtractor):
'description': description, 'description': description,
'thumbnail': thumbnail, 'thumbnail': thumbnail,
'uploader': uploader, 'uploader': uploader,
'upload_date': upload_date, 'timestamp': timestamp,
'formats': formats, 'formats': formats,
} }
@ -94,22 +121,22 @@ class BitChuteIE(InfoExtractor):
class BitChuteChannelIE(InfoExtractor): class BitChuteChannelIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?bitchute\.com/channel/(?P<id>[^/?#&]+)' _VALID_URL = r'https?://(?:www\.)?bitchute\.com/channel/(?P<id>[^/?#&]+)'
_TEST = { _TEST = {
'url': 'https://www.bitchute.com/channel/victoriaxrave/', 'url': 'https://www.bitchute.com/channel/livesonnet/',
'playlist_mincount': 185, 'playlist_mincount': 135,
'info_dict': { 'info_dict': {
'id': 'victoriaxrave', 'id': 'livesonnet',
}, },
} }
_TOKEN = 'zyG6tQcGPE5swyAEFLqKUwMuMMuF6IO2DZ6ZDQjGfsL0e4dcTLwqkTTul05Jdve7' _TOKEN = 'zyG6tQcGPE5swyAEFLqKUwMuMMuF6IO2DZ6ZDQjGfsL0e4dcTLwqkTTul05Jdve7'
def _entries(self, channel_id): def _entries(self, channel_id):
channel_url = 'https://www.bitchute.com/channel/%s/' % channel_id channel_url = 'https://www.bitchute.com/channel/%s' % (channel_id, )
offset = 0 offset = 0
for page_num in itertools.count(1): for page_num in itertools.count(1):
data = self._download_json( data = self._download_json(
'%sextend/' % channel_url, channel_id, channel_url + '/extend/', channel_id,
'Downloading channel page %d' % page_num, 'Downloading channel page %d' % (page_num, ),
data=urlencode_postdata({ data=urlencode_postdata({
'csrfmiddlewaretoken': self._TOKEN, 'csrfmiddlewaretoken': self._TOKEN,
'name': '', 'name': '',
@ -118,7 +145,7 @@ class BitChuteChannelIE(InfoExtractor):
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8', 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
'Referer': channel_url, 'Referer': channel_url,
'X-Requested-With': 'XMLHttpRequest', 'X-Requested-With': 'XMLHttpRequest',
'Cookie': 'csrftoken=%s' % self._TOKEN, 'Cookie': 'csrftoken=' + self._TOKEN,
}) })
if data.get('success') is False: if data.get('success') is False:
break break
@ -126,14 +153,14 @@ class BitChuteChannelIE(InfoExtractor):
if not html: if not html:
break break
video_ids = re.findall( video_ids = re.findall(
r'class=["\']channel-videos-image-container[^>]+>\s*<a\b[^>]+\bhref=["\']/video/([^"\'/]+)', r'''class\s*=\s*["']channel-videos-image-container[^>]+>\s*<a\b[^>]+\bhref\s*=\s*["']/video/([^"'/]+)''',
html) html)
if not video_ids: if not video_ids:
break break
offset += len(video_ids) offset += len(video_ids)
for video_id in video_ids: for video_id in video_ids:
yield self.url_result( yield self.url_result(
'https://www.bitchute.com/video/%s' % video_id, 'https://www.bitchute.com/video/' + video_id,
ie=BitChuteIE.ie_key(), video_id=video_id) ie=BitChuteIE.ie_key(), video_id=video_id)
def _real_extract(self, url): def _real_extract(self, url):