mirrors/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-07-05 21:08:33 +00:00
Code Issues Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
c-basalt 2024-07-22 19:17:44 -04:00
parent 258ae23244
commit 048b6b403e
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yt_dlp/extractor/_extractors.py
View File

@ -1727,9 +1727,9 @@
RozhlasVltavaIE, RozhlasVltavaIE,
) )
from .rplay import ( from .rplay import (
RPlayVideoIE,
RPlayUserIE,
RPlayLiveIE, RPlayLiveIE,
RPlayUserIE,
RPlayVideoIE,
) )
from .rte import ( from .rte import (
RteIE, RteIE,

56
yt_dlp/extractor/rplay.py
View File

@ -1,20 +1,20 @@
import time
import re
import random import random
from .common import ( import re
InfoExtractor, import time
)
from ..utils import (
ExtractorError,
encode_data_uri,
float_or_none,
traverse_obj,
parse_iso8601,
url_or_none,
)
from playwright.sync_api import sync_playwright from playwright.sync_api import sync_playwright
from .common import InfoExtractor
from ..utils import (
ExtractorError,
UserNotLive,
encode_data_uri,
float_or_none,
parse_iso8601,
traverse_obj,
url_or_none,
)
class RPlayBaseIE(InfoExtractor): class RPlayBaseIE(InfoExtractor):
_TOKEN_CACHE = {} _TOKEN_CACHE = {}
@ -69,15 +69,12 @@ def _playwrite_eval(self, jscode, goto=None):
page = browser.new_page() page = browser.new_page()
if goto: if goto:
page.goto(goto) page.goto(goto)
value = page.evaluate(''' page.evaluate('''
const proxy = new Proxy(window.navigator, {get(target, prop, receiver) { const proxy = new Proxy(window.navigator, {get(target, prop, receiver) {
if (prop == "webdriver") return false; if (prop == "webdriver") return false;
throw new Error(prop);
return target[prop]; return target[prop];
}}); }});
Object.defineProperty(window, "navigator", {get: ()=> proxy}); Object.defineProperty(window, "navigator", {get: ()=> proxy});''')
window.navigator.webdriver;
''')
value = page.evaluate(jscode) value = page.evaluate(jscode)
browser.close() browser.close()
return value return value
@ -93,7 +90,7 @@ def _get_butter_token(self):
__wbg_init_memory(t); __wbg_init_memory(t);
const {module, instance} = await WebAssembly.instantiate(Uint8Array.from(%s), t); const {module, instance} = await WebAssembly.instantiate(Uint8Array.from(%s), t);
__wbg_finalize_init(instance, module); __wbg_finalize_init(instance, module);
};''' % butter_wasm_array };''' % butter_wasm_array # noqa: UP031
butter_js += '__new_init().then(() => (new ButterFactory()).generate_butter())' butter_js += '__new_init().then(() => (new ButterFactory()).generate_butter())'
return self._playwrite_eval(butter_js, goto='https://rplay.live/') return self._playwrite_eval(butter_js, goto='https://rplay.live/')
@ -122,8 +119,8 @@ class RPlayVideoIE(RPlayBaseIE):
'thumbnail': r're:https://[\w\d]+.cloudfront.net/.*', 'thumbnail': r're:https://[\w\d]+.cloudfront.net/.*',
'uploader': '杏都める', 'uploader': '杏都める',
'uploader_id': '667adc9e9aa7f739a2158ff3', 'uploader_id': '667adc9e9aa7f739a2158ff3',
'tags': ["杏都める", "めいどるーちぇ", "無料", "耳舐め", "ASMR"], 'tags': ['杏都める', 'めいどるーちぇ', '無料', '耳舐め', 'ASMR'],
} },
}] }]
def _real_extract(self, url): def _real_extract(self, url):
@ -172,7 +169,7 @@ def _real_extract(self, url):
'creatorOid': metainfo.get('uploader_id'), 'creatorOid': metainfo.get('uploader_id'),
**({ **({
'requestorOid': self.user_id, 'requestorOid': self.user_id,
'loginType': self.login_type 'loginType': self.login_type,
} if self.user_id else {}), } if self.user_id else {}),
}, fatal=False)) }, fatal=False))
@ -206,7 +203,7 @@ class RPlayUserIE(RPlayBaseIE):
'id': '667adc9e9aa7f739a2158ff3', 'id': '667adc9e9aa7f739a2158ff3',
'title': '杏都める', 'title': '杏都める',
}, },
'playlist_mincount': 33, 'playlist_mincount': 34,
}, { }, {
'url': 'https://rplay.live/c/furachi?page=contents', 'url': 'https://rplay.live/c/furachi?page=contents',
'info_dict': { 'info_dict': {
@ -235,10 +232,13 @@ def _real_extract(self, url):
user_id = self._match_id(url) user_id = self._match_id(url)
user_id = self._download_json(f'https://api.rplay.live/account/getuser?customUrl={user_id}', user_id)['_id'] user_id = self._download_json(f'https://api.rplay.live/account/getuser?customUrl={user_id}', user_id)['_id']
live_info = self._download_json('https://api.rplay.live/live/play', user_id, query={ live_info = self._download_json('https://api.rplay.live/live/play', user_id,
'creatorOid': user_id, query={'creatorOid': user_id})
})
if live_info['streamState'] == 'youtube': stream_state = live_info['streamState']
if stream_state == 'youtube':
return self.url_result(f'https://www.youtube.com/watch?v={live_info["liveStreamId"]}') return self.url_result(f'https://www.youtube.com/watch?v={live_info["liveStreamId"]}')
elif stream_state == 'offline':
raise UserNotLive
else: else:
raise ExtractorError(f'Unknow streamState: {live_info["streamState"]}') raise ExtractorError(f'Unknow streamState: {stream_state}')