Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[YouPorn] Fix and improve extraction; add playlist extraction #32740

Merged
merged 4 commits into from Apr 22, 2024
Merged

[YouPorn] Fix and improve extraction; add playlist extraction #32740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f38398d
[YouPorn] Incorporate yt-dlp PR 8827
dirkf Mar 1, 2024
263e5d0
[test/test_download] Support 'playlist_maxcount:count' expected value
dirkf Apr 11, 2024
88216f1
[YouPorn] Improve extraction
dirkf Mar 1, 2024
f66e450
[YouPorn] Add playlist extractors
dirkf Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 13 additions & 1 deletion test/test_download.py
View file
Open in desktop
Expand Up @@ -10,6 +10,7 @@

from test.helper import (
assertGreaterEqual,
assertLessEqual,
expect_warnings,
get_params,
gettestcases,
Expand Down Expand Up @@ -122,7 +123,10 @@ def print_skipping(reason):
params['outtmpl'] = tname + '_' + params['outtmpl']
if is_playlist and 'playlist' not in test_case:
params.setdefault('extract_flat', 'in_playlist')
params.setdefault('playlistend', test_case.get('playlist_mincount'))
params.setdefault('playlistend',
test_case['playlist_maxcount'] + 1
if test_case.get('playlist_maxcount')
else test_case.get('playlist_mincount'))
params.setdefault('skip_download', True)

ydl = YoutubeDL(params, auto_init=False)
Expand Down Expand Up @@ -190,6 +194,14 @@ def try_rm_tcs_files(tcs=None):
'Expected at least %d in playlist %s, but got only %d' % (
test_case['playlist_mincount'], test_case['url'],
len(res_dict['entries'])))
if 'playlist_maxcount' in test_case:
assertLessEqual(
self,
len(res_dict['entries']),
test_case['playlist_maxcount'],
'Expected at most %d in playlist %s, but got %d' % (
test_case['playlist_maxcount'], test_case['url'],
len(res_dict['entries'])))
if 'playlist_count' in test_case:
self.assertEqual(
len(res_dict['entries']),
Expand Down
10 changes: 9 additions & 1 deletion youtube_dl/extractor/extractors.py
View file
Open in desktop
Expand Up @@ -1653,7 +1653,15 @@
YouNowChannelIE,
YouNowMomentIE,
)
from .youporn import YouPornIE
from .youporn import (
YouPornIE,
YouPornCategoryIE,
YouPornChannelIE,
YouPornCollectionIE,
YouPornStarIE,
YouPornTagIE,
YouPornVideosIE,
)
from .yourporn import YourPornIE
from .yourupload import YourUploadIE
from .youtube import (
Expand Down