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

[XHamster] Overhaul existing extractors and add playlist extractors #32579

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

[XHamster] Overhaul existing extractors and add playlist extractors #32579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
296e436
[XHamster] Set default UA 'Mozilla' to bypass captcha page
dirkf Oct 2, 2023
bafa9d7
[XHamster] Update domain list
dirkf Oct 2, 2023
6845e4e
[XHamster] Revise video extraction
dirkf Oct 2, 2023
d912aa0
[test] Only limit playlist test when `playlist_mincount` is the only …
dirkf Oct 2, 2023
ffccff1
[XHamster] Add extraction for Creator, Category, Search pages
dirkf Oct 2, 2023
3a31e52
[test] pl_counts
dirkf Oct 3, 2023
e6c95bd
[utils] Add `classproperty()` decorator from yt-dlp
dirkf Oct 4, 2023
d0762cf
[utils] Add `classpropinit()` decorator for easier use of inherited c…
dirkf Oct 4, 2023
44a30c6
[XHamster] Move domain list to base class and introduce classpropinit
dirkf Oct 4, 2023
71aae1d
[XHamster] Add extraction of user's `favorites`
dirkf Oct 4, 2023
b2b622a
[XHamster] Add channel extraction
dirkf Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion test/test_download.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
ExtractorError,
error_to_compat_str,
format_bytes,
traverse_obj,
UnavailableVideoError,
)
from youtube_dl.extractor import get_info_extractor
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'))
# only process enough items for specified tests
pl_counts = traverse_obj(test_case, (None, ('playlist_count', 'playlist_mincount', 'playlist_maxcount')))
if pl_counts:
params.setdefault('playlistend', max(pl_counts) + 1)
params.setdefault('skip_download', True)

ydl = YoutubeDL(params, auto_init=False)
Expand Down
5 changes: 5 additions & 0 deletions youtube_dl/extractor/extractors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1602,6 +1602,11 @@
from .xhamster import (
XHamsterIE,
XHamsterEmbedIE,
XHamsterCategoryIE,
XHamsterChannelIE,
XHamsterCreatorIE,
XHamsterSearchIE,
XHamsterSearchKeyIE,
XHamsterUserIE,
)
from .xiami import (
Expand Down
Loading