diff options
| author | pukkandan <pukkandan.ytdlp@gmail.com> | 2021-09-05 11:16:23 +0530 |
|---|---|---|
| committer | pukkandan <pukkandan.ytdlp@gmail.com> | 2021-09-05 11:16:23 +0530 |
| commit | 526d74ec5a8bd422d5327d576fd341136ec802d2 (patch) | |
| tree | 2a4a10ddd0ff562d9babb1b39161d57b8660b30b /yt_dlp/extractor | |
| parent | e04a1ff92e015bf431486d1fbcc8b243a92bfc71 (diff) | |
| download | hypervideo-pre-526d74ec5a8bd422d5327d576fd341136ec802d2.tar.lz hypervideo-pre-526d74ec5a8bd422d5327d576fd341136ec802d2.tar.xz hypervideo-pre-526d74ec5a8bd422d5327d576fd341136ec802d2.zip | |
[cleanup] Misc
Diffstat (limited to 'yt_dlp/extractor')
| -rw-r--r-- | yt_dlp/extractor/soundcloud.py | 2 | ||||
| -rw-r--r-- | yt_dlp/extractor/tiktok.py | 6 | ||||
| -rw-r--r-- | yt_dlp/extractor/youtube.py | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/yt_dlp/extractor/soundcloud.py b/yt_dlp/extractor/soundcloud.py index c7078ece6..77e248a47 100644 --- a/yt_dlp/extractor/soundcloud.py +++ b/yt_dlp/extractor/soundcloud.py @@ -23,7 +23,6 @@ from ..utils import ( int_or_none, KNOWN_EXTENSIONS, mimetype2ext, - network_exceptions, remove_end, parse_qs, str_or_none, @@ -711,7 +710,6 @@ class SoundcloudPagedPlaylistBaseIE(SoundcloudIE): query.pop('offset', None) - class SoundcloudUserIE(SoundcloudPagedPlaylistBaseIE): _VALID_URL = r'''(?x) https?:// diff --git a/yt_dlp/extractor/tiktok.py b/yt_dlp/extractor/tiktok.py index 08a34db47..6c50ec7df 100644 --- a/yt_dlp/extractor/tiktok.py +++ b/yt_dlp/extractor/tiktok.py @@ -132,9 +132,9 @@ class TikTokIE(InfoExtractor): class TikTokUserIE(InfoExtractor): IE_NAME = 'tiktok:user' - _VALID_URL = r'(?!.*/video/)https?://www\.tiktok\.com/@(?P<id>[\w\._]+)' + _VALID_URL = r'https?://(?:www\.)?tiktok\.com/@(?P<id>[\w\._]+)/?(?:$|[#?])' _TESTS = [{ - 'url': 'https://www.tiktok.com/@corgibobaa?lang=en', + 'url': 'https://tiktok.com/@corgibobaa?lang=en', 'playlist_mincount': 45, 'info_dict': { 'id': '6935371178089399301', @@ -196,7 +196,7 @@ class TikTokUserIE(InfoExtractor): 'Referer': video_url, } } - if not data_json['hasMore']: + if not data_json.get('hasMore'): break cursor = data_json['cursor'] diff --git a/yt_dlp/extractor/youtube.py b/yt_dlp/extractor/youtube.py index e184cc6a6..65a6c043e 100644 --- a/yt_dlp/extractor/youtube.py +++ b/yt_dlp/extractor/youtube.py @@ -803,7 +803,7 @@ class YoutubeBaseInfoExtractor(InfoExtractor): # We also want to catch all other network exceptions since errors in later pages can be troublesome # See https://github.com/yt-dlp/yt-dlp/issues/507#issuecomment-880188210 if not isinstance(e.cause, compat_HTTPError) or e.cause.code not in (403, 429): - last_error = error_to_compat_str(e.cause or e) + last_error = error_to_compat_str(e.cause or e.msg) if count < retries: continue if fatal: |