xZero707/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-02-26 22:37:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

[PromoDJ] Fix login regex

Browse Source
This commit is contained in:
DmitryScaletta 2024-02-17 04:16:05 +03:00
parent 345d01a175
commit e32ba3fc21
No known key found for this signature in database
GPG Key ID: 167A65222EDD4C2A
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
yt_dlp/extractor/promodj.py
View File

@ -65,8 +65,8 @@ class PromoDJBaseIE(InfoExtractor):
_PAGES = ['featured', 'shop', *_MEDIA_TYPES] _PAGES = ['featured', 'shop', *_MEDIA_TYPES]
_BASE_URL_RE = r'https?://(?:www\.)?promodj\.com' _BASE_URL_RE = r'https?://(?:www\.)?promodj\.com'
_NOT_LOGIN_LIST = '|'.join(['radio', *_PAGES]) _NOT_LOGIN_LIST = '|'.join(['radio', 'embed', *_PAGES])
_LOGIN_RE = rf'(?!{_NOT_LOGIN_LIST})[\w.-]+' _LOGIN_RE = rf'(?!(?:{_NOT_LOGIN_LIST})(?:/|$))[\w.-]+'
def _set_url_page(self, url, page): def _set_url_page(self, url, page):
parsed_url = urllib.parse.urlparse(url) parsed_url = urllib.parse.urlparse(url)
@ -247,6 +247,10 @@ class PromoDJUserIE(PromoDJBaseIE):
'id': 'slim96', 'id': 'slim96',
}, },
'playlist_count': 0, 'playlist_count': 0,
}, {
# login starts with page name
'url': 'https://promodj.com/radio.remix',
'only_matching': True,
}] }]
def _real_extract(self, url): def _real_extract(self, url):
@ -288,6 +292,10 @@ class PromoDJUserMediaIE(PromoDJBaseIE):
'id': 'worobyev-video', 'id': 'worobyev-video',
}, },
'playlist_count': 0, 'playlist_count': 0,
}, {
# login starts with page name
'url': 'https://promodj.com/radio.remix/music',
'only_matching': True,
}] }]
def _real_extract(self, url): def _real_extract(self, url):
@ -378,15 +386,18 @@ class PromoDJUserPageIE(PromoDJBaseIE):
*PromoDJBaseIE._MEDIA_TYPES, *PromoDJBaseIE._MEDIA_TYPES,
] ]
_NOT_USER_PAGE_LIST = '|'.join(_USER_PATHS) _NOT_USER_PAGE_LIST = '|'.join(_USER_PATHS)
_USER_PAGE_RE = rf'(?!{_NOT_USER_PAGE_LIST})[\w-]+'
_VALID_URL = rf'{PromoDJBaseIE._BASE_URL_RE}/(?P<login>{PromoDJBaseIE._LOGIN_RE})/(?P<slug>{_USER_PAGE_RE})$' _VALID_URL = rf'{PromoDJBaseIE._BASE_URL_RE}/(?P<login>{PromoDJBaseIE._LOGIN_RE})/(?P<slug>(?!(?:{_NOT_USER_PAGE_LIST})$)[\w-]+$)'
_TESTS = [{ _TESTS = [{
'url': 'https://promodj.com/djperetse/MaxMixes', 'url': 'https://promodj.com/djperetse/MaxMixes',
'info_dict': { 'info_dict': {
'id': 'djperetse-MaxMixes', 'id': 'djperetse-MaxMixes',
}, },
'playlist_count': 5, 'playlist_count': 5,
}, {
# user page starts with media type (not a real link)
'url': 'https://promodj.com/djperetse/remixes-best',
'only_matching': True,
}] }]
def _real_extract(self, url): def _real_extract(self, url):