Upstream/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-03 08:19:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

[openrec] Refactor extractors (#2941)

Browse Source 
Authored by: Lesmiscore
This commit is contained in:
Lesmiscore (Naoya Ozaki) 2022-03-09 21:08:09 +09:00 committed by GitHub
parent e491d06d34
commit 6e6beffd04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
yt_dlp/extractor/openrec.py
View File

@ -4,10 +4,11 @@
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
ExtractorError, ExtractorError,
get_first,
int_or_none, int_or_none,
traverse_obj, traverse_obj,
unified_strdate, unified_strdate,
unified_timestamp unified_timestamp,
) )
from ..compat import compat_str from ..compat import compat_str
@ -19,42 +20,34 @@ def _extract_pagestore(self, webpage, video_id):
def _extract_movie(self, webpage, video_id, name, is_live): def _extract_movie(self, webpage, video_id, name, is_live):
window_stores = self._extract_pagestore(webpage, video_id) window_stores = self._extract_pagestore(webpage, video_id)
movie_store = traverse_obj( movie_stores = [
window_stores, # extract all three important data (most of data are duplicated each other, but slightly different!)
('v8', 'state', 'movie'), traverse_obj(window_stores, ('v8', 'state', 'movie'), expected_type=dict),
('v8', 'movie'), traverse_obj(window_stores, ('v8', 'movie'), expected_type=dict),
expected_type=dict) traverse_obj(window_stores, 'movieStore', expected_type=dict),
if not movie_store: ]
if not any(movie_stores):
raise ExtractorError(f'Failed to extract {name} info') raise ExtractorError(f'Failed to extract {name} info')
title = movie_store.get('title') m3u8_playlists = get_first(movie_stores, 'media') or {}
description = movie_store.get('introduction')
thumbnail = movie_store.get('thumbnailUrl')
uploader = traverse_obj(movie_store, ('channel', 'user', 'name'), expected_type=compat_str)
uploader_id = traverse_obj(movie_store, ('channel', 'user', 'id'), expected_type=compat_str)
timestamp = int_or_none(traverse_obj(movie_store, ('publishedAt', 'time')), scale=1000)
m3u8_playlists = movie_store.get('media') or {}
formats = [] formats = []
for name, m3u8_url in m3u8_playlists.items(): for name, m3u8_url in m3u8_playlists.items():
if not m3u8_url: if not m3u8_url:
continue continue
formats.extend(self._extract_m3u8_formats( formats.extend(self._extract_m3u8_formats(
m3u8_url, video_id, ext='mp4', live=is_live, m3u8_id='hls-%s' % name)) m3u8_url, video_id, ext='mp4', live=is_live, m3u8_id=name))
self._sort_formats(formats) self._sort_formats(formats)
return { return {
'id': video_id, 'id': video_id,
'title': title, 'title': get_first(movie_stores, 'title'),
'description': description, 'description': get_first(movie_stores, 'introduction'),
'thumbnail': thumbnail, 'thumbnail': get_first(movie_stores, 'thumbnailUrl'),
'formats': formats, 'formats': formats,
'uploader': uploader, 'uploader': get_first(movie_stores, ('channel', 'user', 'name')),
'uploader_id': uploader_id, 'uploader_id': get_first(movie_stores, ('channel', 'user', 'id')),
'timestamp': timestamp, 'timestamp': int_or_none(get_first(movie_stores, ['publishedAt', 'time']), scale=1000) or unified_timestamp(get_first(movie_stores, 'publishedAt')),
'is_live': is_live, 'is_live': is_live,
} }
@ -72,7 +65,7 @@ class OpenRecIE(OpenRecBaseIE):
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
webpage = self._download_webpage('https://www.openrec.tv/live/%s' % video_id, video_id) webpage = self._download_webpage(f'https://www.openrec.tv/live/{video_id}', video_id)
return self._extract_movie(webpage, video_id, 'live', True) return self._extract_movie(webpage, video_id, 'live', True)
@ -96,7 +89,7 @@ class OpenRecCaptureIE(OpenRecBaseIE):
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
webpage = self._download_webpage('https://www.openrec.tv/capture/%s' % video_id, video_id) webpage = self._download_webpage(f'https://www.openrec.tv/capture/{video_id}', video_id)
window_stores = self._extract_pagestore(webpage, video_id) window_stores = self._extract_pagestore(webpage, video_id)
movie_store = window_stores.get('movie') movie_store = window_stores.get('movie')
@ -104,15 +97,6 @@ def _real_extract(self, url):
capture_data = window_stores.get('capture') capture_data = window_stores.get('capture')
if not capture_data: if not capture_data:
raise ExtractorError('Cannot extract title') raise ExtractorError('Cannot extract title')
title = capture_data.get('title')
thumbnail = capture_data.get('thumbnailUrl')
upload_date = unified_strdate(capture_data.get('createdAt'))
uploader = traverse_obj(movie_store, ('channel', 'name'), expected_type=compat_str)
uploader_id = traverse_obj(movie_store, ('channel', 'id'), expected_type=compat_str)
timestamp = traverse_obj(movie_store, 'createdAt', expected_type=compat_str)
timestamp = unified_timestamp(timestamp)
formats = self._extract_m3u8_formats( formats = self._extract_m3u8_formats(
capture_data.get('source'), video_id, ext='mp4') capture_data.get('source'), video_id, ext='mp4')
@ -120,13 +104,13 @@ def _real_extract(self, url):
return { return {
'id': video_id, 'id': video_id,
'title': title, 'title': capture_data.get('title'),
'thumbnail': thumbnail, 'thumbnail': capture_data.get('thumbnailUrl'),
'formats': formats, 'formats': formats,
'timestamp': timestamp, 'timestamp': unified_timestamp(traverse_obj(movie_store, 'createdAt', expected_type=compat_str)),
'uploader': uploader, 'uploader': traverse_obj(movie_store, ('channel', 'name'), expected_type=compat_str),
'uploader_id': uploader_id, 'uploader_id': traverse_obj(movie_store, ('channel', 'id'), expected_type=compat_str),
'upload_date': upload_date, 'upload_date': unified_strdate(capture_data.get('createdAt')),
} }
@ -148,6 +132,6 @@ class OpenRecMovieIE(OpenRecBaseIE):
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
webpage = self._download_webpage('https://www.openrec.tv/movie/%s' % video_id, video_id) webpage = self._download_webpage(f'https://www.openrec.tv/movie/{video_id}', video_id)
return self._extract_movie(webpage, video_id, 'movie', False) return self._extract_movie(webpage, video_id, 'movie', False)