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

[XVideos] Support playlists, searches and channels #30774

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
+940 −21
Open

[XVideos] Support playlists, searches and channels #30774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9a330a9
[workflows/ci.yml] Run apt-get update before installing
dirkf Oct 18, 2023
533797d
[XVideos] Support playlists, searches and channels
dirkf Mar 25, 2022
7715194
[XVideos] Add # coding: utf-8
dirkf Jan 5, 2023
35230a2
[test] Improve shortcut processing for test playlists
dirkf Oct 16, 2023
b04d780
[XVideos] Update XVideosIE including features from PR #30689
dirkf Oct 16, 2023
2218768
[XVideos] Refactor XVideosPlaylistIE and XVideosRelatedIE with a base…
dirkf Oct 16, 2023
352ec03
[XVideos] Update XVideosChannelIE to handle all profile, channel and …
dirkf Oct 16, 2023
45088c6
[XVideos] Add XVideosCategoryIE for category and tag pages
dirkf Oct 16, 2023
596a620
[XVideos] Update XVideosSearchIE
dirkf Oct 16, 2023
cc1657b
[XVideos] Add XVideosSearchKeyIE to implement a search key: xvsearchn…
dirkf Oct 16, 2023
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
7 changes: 7 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,20 @@ jobs:
ytdl-test-set: ${{ contains(needs.select.outputs.test-set, 'download') && 'download' || 'nodownload' }}
run-tests-ext: sh
steps:
- name: Prepare Linux
if: ${{ startswith(matrix.os, 'ubuntu') }}
shell: bash
run: |
# apt in runner, if needed, may not be up-to-date
sudo apt-get update
- name: Checkout
uses: actions/checkout@v3
#-------- Python 3 -----
- name: Set up supported Python ${{ matrix.python-version }}
id: setup-python
if: ${{ matrix.python-impl == 'cpython' && matrix.python-version != '2.6' && matrix.python-version != '2.7' && matrix.python-version != '3.12'}}
# wrap broken actions/setup-python@v4
# NB may run apt-get install in Linux
uses: ytdl-org/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
Expand Down
14 changes: 10 additions & 4 deletions test/test_download.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
ExtractorError,
error_to_compat_str,
format_bytes,
T,
traverse_obj,
UnavailableVideoError,
)
from youtube_dl.extractor import get_info_extractor
Expand Down Expand Up @@ -120,10 +122,14 @@ def print_skipping(reason):

params = get_params(test_case.get('params', {}))
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('skip_download', True)
if is_playlist:
if 'playlist' not in test_case:
params.setdefault('extract_flat', 'in_playlist')
params.setdefault('skip_download', True)
# only process enough items for specified tests
pl_counts = traverse_obj(test_case, (None, ('playlist_count', 'playlist_mincount', 'playlist_maxcount', ('playlist', T(len)))))
if pl_counts is not None:
params.setdefault('playlistend', max(pl_counts) + 1)

ydl = YoutubeDL(params, auto_init=False)
ydl.add_default_info_extractors()
Expand Down
10 changes: 9 additions & 1 deletion youtube_dl/extractor/extractors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1619,7 +1619,15 @@
from .xstream import XstreamIE
from .xtube import XTubeUserIE, XTubeIE
from .xuite import XuiteIE
from .xvideos import XVideosIE
from .xvideos import (
XVideosIE,
XVideosCategoryIE,
XVideosChannelIE,
XVideosPlaylistIE,
XVideosRelatedIE,
XVideosSearchIE,
XVideosSearchKeyIE,
)
from .xxxymovies import XXXYMoviesIE
from .yahoo import (
YahooIE,
Expand Down