artem/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2026-04-28 03:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove smuggled_url

Browse Source
This commit is contained in:
ChocoLZS 2024-08-23 23:12:18 +08:00
parent 1a22cc3d3f
commit fad7c2a75a
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
yt_dlp/extractor/pialive.py
View File

@ -1,10 +1,10 @@
from .common import InfoExtractor from .common import InfoExtractor
from .piaulizaportal import PIAULIZAPortalAPIIE from .piaulizaportal import PIAULIZAPortalAPIIE
from ..utils import ExtractorError, extract_attributes, multipart_encode, smuggle_url, traverse_obj from ..utils import ExtractorError, extract_attributes, multipart_encode, traverse_obj
class PiaLiveIE(InfoExtractor): class PiaLiveIE(InfoExtractor):
PLAYER_ROOT_URL = 'https://player.pia-live.jp' PLAYER_ROOT_URL = 'https://player.pia-live.jp/'
PIA_LIVE_API_URL = 'https://api.pia-live.jp' PIA_LIVE_API_URL = 'https://api.pia-live.jp'
_VALID_URL = r'https?://player\.pia-live\.jp/stream/(?P<id>[\w-]+)' _VALID_URL = r'https?://player\.pia-live\.jp/stream/(?P<id>[\w-]+)'
@ -42,10 +42,7 @@ class PiaLiveIE(InfoExtractor):
if player_data_url.startswith(PIAULIZAPortalAPIIE.BASE_URL): if player_data_url.startswith(PIAULIZAPortalAPIIE.BASE_URL):
return self.url_result( return self.url_result(
smuggle_url( player_data_url,
player_data_url,
{'referer': self.PLAYER_ROOT_URL},
),
ie=PIAULIZAPortalAPIIE.ie_key(), ie=PIAULIZAPortalAPIIE.ie_key(),
url_transparent=True, url_transparent=True,
**info_dict, **info_dict,
@ -81,7 +78,7 @@ class PiaLiveIE(InfoExtractor):
)['data']['chat_one_tag'] )['data']['chat_one_tag']
chat_room_url = extract_attributes(chat_info)['src'] chat_room_url = extract_attributes(chat_info)['src']
comment_page = self._download_webpage( comment_page = self._download_webpage(
chat_room_url, program_code, headers={'Referer': f'{self.PLAYER_ROOT_URL}/'}, note='Fetching comment page', errnote='Unable to fetch comment page') chat_room_url, program_code, headers={'Referer': f'{self.PLAYER_ROOT_URL}'}, note='Fetching comment page', errnote='Unable to fetch comment page')
comment_list = self._search_json( comment_list = self._search_json(
r'var\s+_history\s*=', comment_page, 'comment list', program_code, r'var\s+_history\s*=', comment_page, 'comment list', program_code,
contains_pattern=r'\[(?s:.+)\]') or [] contains_pattern=r'\[(?s:.+)\]') or []

12
yt_dlp/extractor/piaulizaportal.py
View File

@ -1,5 +1,5 @@
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ExtractorError, int_or_none, parse_qs, smuggle_url, time_seconds, traverse_obj, unsmuggle_url from ..utils import ExtractorError, int_or_none, parse_qs, time_seconds, traverse_obj
class PIAULIZAPortalAPIIE(InfoExtractor): class PIAULIZAPortalAPIIE(InfoExtractor):
@ -48,12 +48,9 @@ class PIAULIZAPortalAPIIE(InfoExtractor):
] ]
def _real_extract(self, url): def _real_extract(self, url):
url, smuggled_data = unsmuggle_url(url, {})
tmp_video_id = self._search_regex(r'&name=([^&]+)', self._match_id(url), 'video id', default='unknown') tmp_video_id = self._search_regex(r'&name=([^&]+)', self._match_id(url), 'video id', default='unknown')
player_data = self._download_webpage( player_data = self._download_webpage(
url, url, tmp_video_id, headers={'Referer': 'https://player-api.p.uliza.jp/'},
tmp_video_id,
headers={'Referer': smuggled_data.get('referer') or f'{self.BASE_URL}/'},
note='Fetching player data', errnote='Unable to fetch player data', note='Fetching player data', errnote='Unable to fetch player data',
) )
@ -119,10 +116,7 @@ class PIAULIZAPortalIE(InfoExtractor):
PIAULIZAPortalAPIIE.TAG_REGEX, PIAULIZAPortalAPIIE.TAG_REGEX,
webpage, 'player data url') webpage, 'player data url')
return self.url_result( return self.url_result(
smuggle_url( player_data_url,
player_data_url,
{'referer': 'https://ulizaportal.jp/'},
),
ie=PIAULIZAPortalAPIIE.ie_key(), ie=PIAULIZAPortalAPIIE.ie_key(),
url_transparent=True, url_transparent=True,
video_id=video_id, video_id=video_id,