diff options
| author | f4pp3rk1ng <86558148+f4pp3rk1ng@users.noreply.github.com> | 2021-09-24 03:06:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-24 06:36:30 +0530 |
| commit | 20b91b9b633fbdf3bc31897a41efd2b6cf8fe140 (patch) | |
| tree | f8100843cda30182c24c4055641b56f7b52c3229 | |
| parent | 4c88ff87fc0e84659f7b6a7a88997eb6851125a0 (diff) | |
| download | hypervideo-pre-20b91b9b633fbdf3bc31897a41efd2b6cf8fe140.tar.lz hypervideo-pre-20b91b9b633fbdf3bc31897a41efd2b6cf8fe140.tar.xz hypervideo-pre-20b91b9b633fbdf3bc31897a41efd2b6cf8fe140.zip | |
[SpankBang] Fix uploader (#892)
Closes #833
Authored by: f4pp3rk1ng, coletdjnz
| -rw-r--r-- | yt_dlp/extractor/spankbang.py | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/yt_dlp/extractor/spankbang.py b/yt_dlp/extractor/spankbang.py index d70331bb3..dd849ae13 100644 --- a/yt_dlp/extractor/spankbang.py +++ b/yt_dlp/extractor/spankbang.py @@ -26,17 +26,18 @@ class SpankBangIE(InfoExtractor): ) ''' _TESTS = [{ - 'url': 'http://spankbang.com/3vvn/video/fantasy+solo', - 'md5': '1cc433e1d6aa14bc376535b8679302f7', + 'url': 'https://spankbang.com/56b3d/video/the+slut+maker+hmv', + 'md5': '2D13903DE4ECC7895B5D55930741650A', 'info_dict': { - 'id': '3vvn', + 'id': '56b3d', 'ext': 'mp4', - 'title': 'fantasy solo', - 'description': 'dillion harper masturbates on a bed', + 'title': 'The Slut Maker HMV', + 'description': 'Girls getting converted into cock slaves.', 'thumbnail': r're:^https?://.*\.jpg$', - 'uploader': 'silly2587', - 'timestamp': 1422571989, - 'upload_date': '20150129', + 'uploader': 'Mindself', + 'uploader_id': 'mindself', + 'timestamp': 1617109572, + 'upload_date': '20210330', 'age_limit': 18, } }, { @@ -134,15 +135,15 @@ class SpankBangIE(InfoExtractor): info = self._search_json_ld(webpage, video_id, default={}) title = self._html_search_regex( - r'(?s)<h1[^>]*>(.+?)</h1>', webpage, 'title', default=None) + r'(?s)<h1[^>]+\btitle=["\']([^"]+)["\']>', webpage, 'title', default=None) description = self._search_regex( r'<div[^>]+\bclass=["\']bottom[^>]+>\s*<p>[^<]*</p>\s*<p>([^<]+)', webpage, 'description', default=None) thumbnail = self._og_search_thumbnail(webpage, default=None) uploader = self._html_search_regex( - (r'(?s)<li[^>]+class=["\']profile[^>]+>(.+?)</a>', - r'class="user"[^>]*><img[^>]+>([^<]+)'), - webpage, 'uploader', default=None) + r'<svg[^>]+\bclass="(?:[^"]*?user[^"]*?)">.*?</svg>([^<]+)', webpage, 'uploader', default=None) + uploader_id = self._html_search_regex( + r'<a[^>]+href="/profile/([^"]+)"', webpage, 'uploader_id', default=None) duration = parse_duration(self._search_regex( r'<div[^>]+\bclass=["\']right_side[^>]+>\s*<span>([^<]+)', webpage, 'duration', default=None)) @@ -157,6 +158,7 @@ class SpankBangIE(InfoExtractor): 'description': description, 'thumbnail': thumbnail, 'uploader': uploader, + 'uploader_id': uploader_id, 'duration': duration, 'view_count': view_count, 'formats': formats, |