artem/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2026-04-18 14:49:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ie/tvw:TvChannels] Simplify code

Browse Source
This commit is contained in:
Fries 2025-04-12 16:01:59 -07:00
parent 02b0073156
commit fe0d8cd782
No known key found for this signature in database
GPG Key ID: B594BC20DB6FE5AA
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
yt_dlp/extractor/_extractors.py
View File

@ -2237,7 +2237,10 @@ from .tvplay import (
TVPlayIE, TVPlayIE,
) )
from .tvplayer import TVPlayerIE from .tvplayer import TVPlayerIE
from .tvw import TvwIE, TvwTvChannelsIE from .tvw import (
TvwIE,
TvwTvChannelsIE,
)
from .tweakers import TweakersIE from .tweakers import TweakersIE
from .twentymin import TwentyMinutenIE from .twentymin import TwentyMinutenIE
from .twentythreevideo import TwentyThreeVideoIE from .twentythreevideo import TwentyThreeVideoIE

39
yt_dlp/extractor/tvw.py
View File

@ -1,9 +1,16 @@
import json import json
import urllib
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import clean_html, remove_end, unescapeHTML, unified_timestamp, url_or_none from ..utils import (
from ..utils.traversal import traverse_obj clean_html,
extract_attributes,
parse_qs,
remove_end,
require,
unified_timestamp,
url_or_none,
)
from ..utils.traversal import find_element, traverse_obj
class TvwIE(InfoExtractor): class TvwIE(InfoExtractor):
@ -124,9 +131,8 @@ class TvwTvChannelsIE(InfoExtractor):
_TESTS = [{ _TESTS = [{
'url': 'https://tvw.org/tvchannels/air/', 'url': 'https://tvw.org/tvchannels/air/',
'info_dict': { 'info_dict': {
'id': 'TVWAIR', 'id': 'air',
'ext': 'mp4', 'ext': 'mp4',
'display_id': 'air',
'title': r're:^TVW Cable Channel Live Stream', 'title': r're:^TVW Cable Channel Live Stream',
'thumbnail': r're:^https?://.*\.(?:jpe?g|png)$', 'thumbnail': r're:^https?://.*\.(?:jpe?g|png)$',
'live_status': 'is_live', 'live_status': 'is_live',
@ -134,9 +140,8 @@ class TvwTvChannelsIE(InfoExtractor):
}, { }, {
'url': 'https://tvw.org/tvchannels/tvw2/', 'url': 'https://tvw.org/tvchannels/tvw2/',
'info_dict': { 'info_dict': {
'id': 'TVW2', 'id': 'tvw2',
'ext': 'mp4', 'ext': 'mp4',
'display_id': 'tvw2',
'title': r're:^TVW-2 Broadcast Channel', 'title': r're:^TVW-2 Broadcast Channel',
'thumbnail': r're:^https?://.*\.(?:jpe?g|png)$', 'thumbnail': r're:^https?://.*\.(?:jpe?g|png)$',
'live_status': 'is_live', 'live_status': 'is_live',
@ -144,24 +149,16 @@ class TvwTvChannelsIE(InfoExtractor):
}] }]
def _real_extract(self, url): def _real_extract(self, url):
display_id = self._match_id(url) video_id = self._match_id(url)
webpage = self._download_webpage(url, display_id) webpage = self._download_webpage(url, video_id)
stream_url = self._html_search_regex(r"<iframe[\s]*id=\"invintus-persistent-stream-frame\"[^>]+src=[\"\'](?P<url>.+?)[\"\']", webpage, 'url') m3u8_url = traverse_obj(webpage, (
parsed_url = urllib.parse.urlparse(unescapeHTML(stream_url)) {find_element(id='invintus-persistent-stream-frame', html=True)}, {extract_attributes},
parsed_querystring = urllib.parse.parse_qs(parsed_url.query) 'src', {parse_qs}, 'encoder', 0, {json.loads}, 'live247URI', {url_or_none}, {require('stream url')}))
encoder_obj = json.loads(traverse_obj(parsed_querystring, ('encoder', 0)))
video_id = encoder_obj.get('streamName')
m3u8_url = encoder_obj.get('live247URI')
formats = self._extract_m3u8_formats(m3u8_url, video_id, 'mp4', m3u8_id='hls', fatal=True)
return { return {
'id': video_id, 'id': video_id,
'display_id': display_id, 'formats': self._extract_m3u8_formats(m3u8_url, video_id, 'mp4', m3u8_id='hls', live=True),
'formats': formats,
'title': remove_end(self._og_search_title(webpage, default=None), ' - TVW'), 'title': remove_end(self._og_search_title(webpage, default=None), ' - TVW'),
'thumbnail': self._og_search_thumbnail(webpage, default=None), 'thumbnail': self._og_search_thumbnail(webpage, default=None),
'is_live': True, 'is_live': True,