etc
/
yt-dlp
mirror of https://github.com/yt-dlp/yt-dlp.git
0
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge a376ab99f8 into 1a366403d9

This commit is contained in:
pukkandan 2024-04-29 01:02:30 +08:00 committed by GitHub
parent 1a366403d9 a376ab99f8
commit a7b938813b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devscripts/make_lazy_extractors.py
View File

@ -15,7 +15,7 @@ from devscripts.utils import get_filename_args, read_file, write_file
NO_ATTR = object()
STATIC_CLASS_PROPERTIES = [
'IE_NAME', '_ENABLED', '_VALID_URL', # Used for URL matching
'_WORKING', 'IE_DESC', '_NETRC_MACHINE', 'SEARCH_KEY', # Used for --extractor-descriptions
'_REPORTED_BROKEN', 'IE_DESC', '_NETRC_MACHINE', 'SEARCH_KEY', # Used for --extractor-descriptions
'age_limit', # Used for --age-limit (evaluated)
'_RETURN_TYPE', # Accessed in CLI only with instance (evaluated)
]

10
supportedsites.md
View File

@ -304,10 +304,10 @@
- **CrowdBunker**
- **CrowdBunkerChannel**
- **Crtvg**
- **crunchyroll**: [*crunchyroll*](## "netrc machine")
- **crunchyroll:artist**: [*crunchyroll*](## "netrc machine")
- **crunchyroll:music**: [*crunchyroll*](## "netrc machine")
- **crunchyroll:playlist**: [*crunchyroll*](## "netrc machine")
- **crunchyroll**: [*crunchyroll*](## "netrc machine") ([**Currently broken**](https://github.com/yt-dlp/yt-dlp/issues/9453))
- **crunchyroll:artist**: [*crunchyroll*](## "netrc machine") ([**Currently broken**](https://github.com/yt-dlp/yt-dlp/issues/9453))
- **crunchyroll:music**: [*crunchyroll*](## "netrc machine") ([**Currently broken**](https://github.com/yt-dlp/yt-dlp/issues/9453))
- **crunchyroll:playlist**: [*crunchyroll*](## "netrc machine") ([**Currently broken**](https://github.com/yt-dlp/yt-dlp/issues/9453))
- **CSpan**: C-SPAN
- **CSpanCongress**
- **CtsNews**: 華視新聞
@ -553,7 +553,7 @@
- **hgtv.com:show**
- **HGTVDe**
- **HGTVUsa**
- **HiDive**: [*hidive*](## "netrc machine")
- **HiDive**: [*hidive*](## "netrc machine") ([**Currently broken**](https://github.com/yt-dlp/yt-dlp/issues/9385))
- **HistoricFilms**
- **history:player**
- **history:topic**: History.com Topic

4
test/test_download.py
View File

@ -98,7 +98,7 @@ def generator(test_case, tname):
self.skipTest(reason)
if not ie.working():
print_skipping('IE marked as not _WORKING')
print_skipping('IE is _REPORTED_BROKEN')
for tc in test_cases:
if tc.get('expected_exception'):
@ -117,7 +117,7 @@ def generator(test_case, tname):
for other_ie in other_ies:
if not other_ie.working():
print_skipping('test depends on %sIE, marked as not WORKING' % other_ie.ie_key())
print_skipping(f'test depends on {other_ie.ie_key()}IE, is _REPORTED_BROKEN')
params = get_params(test_case.get('params', {}))
params['outtmpl'] = tname + '_' + params['outtmpl']

4
test/test_subtitles.py
View File

@ -40,8 +40,8 @@ class BaseTestSubtitles(unittest.TestCase):
self.ie = self.IE()
self.DL.add_info_extractor(self.ie)
if not self.IE.working():
print('Skipping: %s marked as not _WORKING' % self.IE.ie_key())
self.skipTest('IE marked as not _WORKING')
print(f'Skipping: {self.IE.ie_key()} is _REPORTED_BROKEN')
self.skipTest('IE is _REPORTED_BROKEN')
def getInfoDict(self):
info_dict = self.DL.extract_info(self.url, download=False)

8
yt_dlp/YoutubeDL.py
View File

@ -1582,8 +1582,12 @@ class YoutubeDL:
continue
if not ie.working():
self.report_warning('The program functionality for this site has been marked as broken, '
'and will probably not work.')
self.report_warning(join_nonempty(
f'[{ie.IE_NAME}] The program\'s functionality for this site has been marked as '
f'{self._format_err("BROKEN", self.Styles.ERROR)}, and will probably not work.',
format_field(ie._REPORTED_BROKEN, None, f'See {self._format_err("%s", self.Styles.EMPHASIS)}'
' for more information. Do NOT open a new issue for this.'),
delim='\n '))
temp_id = ie.get_temp_id(url)
if temp_id is not None and self.in_download_archive({'id': temp_id, 'ie_key': key}):

17
yt_dlp/extractor/common.py
View File

@ -546,8 +546,9 @@ class InfoExtractor:
The _ENABLED attribute should be set to False for IEs that
are disabled by default and must be explicitly enabled.
The _WORKING attribute should be set to False for broken IEs
For broken extractors, the _REPORTED_BROKEN attribute can be set to the issue URL
in order to warn the users and skip the tests.
[Deprecated] If there is no open issue, set _WORKING = False instead.
"""
_ready = False
@ -613,10 +614,13 @@ class InfoExtractor:
except (IndexError, AttributeError):
return None
@classproperty(cache=True)
def _REPORTED_BROKEN(cls):
return not cls._WORKING and ''
@classmethod
def working(cls):
"""Getter method for _WORKING."""
return cls._WORKING
return cls._REPORTED_BROKEN is False
@classmethod
def supports_login(cls):
@ -3674,7 +3678,12 @@ class InfoExtractor:
_COUNTS = ('', '5', '10', 'all')
desc += f' (e.g. "{cls.SEARCH_KEY}{random.choice(_COUNTS)}:{random.choice(search_examples)}")'
if not cls.working():
desc += ' (**Currently broken**)' if markdown else ' (Currently broken)'
msg = 'Currently broken'
if markdown:
msg = f'**{msg}**'
if cls._REPORTED_BROKEN:
msg = f'[{msg}]({cls._REPORTED_BROKEN})'
desc += f' ({msg})'
# Escape emojis. Ref: https://github.com/github/markup/issues/1153
name = (' - **%s**' % re.sub(r':(\w+:)', ':\u200B\\g<1>', cls.IE_NAME)) if markdown else cls.IE_NAME

1
yt_dlp/extractor/crunchyroll.py
View File

@ -21,6 +21,7 @@ from ..utils import (
class CrunchyrollBaseIE(InfoExtractor):
_REPORTED_BROKEN = 'https://github.com/yt-dlp/yt-dlp/issues/9453'
_BASE_URL = 'https://www.crunchyroll.com'
_API_BASE = 'https://api.crunchyroll.com'
_NETRC_MACHINE = 'crunchyroll'

1
yt_dlp/extractor/hidive.py
View File

@ -9,6 +9,7 @@ from ..utils import (
class HiDiveIE(InfoExtractor):
_REPORTED_BROKEN = 'https://github.com/yt-dlp/yt-dlp/issues/9385'
_VALID_URL = r'https?://(?:www\.)?hidive\.com/stream/(?P<id>(?P<title>[^/]+)/(?P<key>[^/?#&]+))'
# Using X-Forwarded-For results in 403 HTTP error for HLS fragments,
# so disabling geo bypass completely