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

[motherless] Fixed the broken uploader_id in the extractor. #31243

Merged
merged 6 commits into from
Oct 10, 2022
Merged

[motherless] Fixed the broken uploader_id in the extractor. #31243

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f2080d9
[patch_motherless] Fixed the broken uploader_id in the extractor.
xuminic Sep 19, 2022
79f977c
Make uploader_id RE looser
dirkf Oct 10, 2022
09a3a82
Fix uploader_id in test Motherless_3
dirkf Oct 10, 2022
e4d7f52
Fix group pagination
dirkf Oct 10, 2022
f9af74e
# coding: utf-8
dirkf Oct 10, 2022
cd00b5c
Parens
dirkf Oct 10, 2022
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
13 changes: 7 additions & 6 deletions youtube_dl/extractor/motherless.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# coding: utf-8
from __future__ import unicode_literals

import datetime
Expand Down Expand Up @@ -71,7 +72,7 @@ class MotherlessIE(InfoExtractor):
'title': 'a/ Hot Teens',
'categories': list,
'upload_date': '20210104',
'uploader_id': 'yonbiw',
'uploader_id': 'anonymous',
'thumbnail': r're:https?://.*\.jpg',
'age_limit': 18,
},
Expand Down Expand Up @@ -127,7 +128,7 @@ def _real_extract(self, url):

comment_count = webpage.count('class="media-comment-contents"')
uploader_id = self._html_search_regex(
r'"thumb-member-username">\s+<a href="/m/([^"]+)"',
r'''(?s)['"](?:media-meta-member|thumb-member-username)\b[^>]+>\s*<a\b[^>]+\bhref\s*=\s*['"]/m/([^"']+)''',
webpage, 'uploader_id')

categories = self._html_search_meta('keywords', webpage, default=None)
Expand Down Expand Up @@ -169,7 +170,7 @@ class MotherlessGroupIE(InfoExtractor):
'description': 'Sex can be funny. Wide smiles,laugh, games, fun of '
'any kind!'
},
'playlist_mincount': 9,
'playlist_mincount': 0,
}]

@classmethod
Expand Down Expand Up @@ -208,9 +209,9 @@ def _real_extract(self, url):
r'<title>([\w\s]+\w)\s+-', webpage, 'title', fatal=False)
description = self._html_search_meta(
'description', webpage, fatal=False)
page_count = self._int(self._search_regex(
r'(\d+)</(?:a|span)><(?:a|span)[^>]+>\s*NEXT',
webpage, 'page_count'), 'page_count')
page_count = str_to_int(self._search_regex(
r'(\d+)\s*</(?:a|span)>\s*<(?:a|span)[^>]+(?:>\s*NEXT|\brel\s*=\s*["\']?next)\b',
webpage, 'page_count', default='1')
dirkf marked this conversation as resolved.
Show resolved Hide resolved
PAGE_SIZE = 80

def _get_page(idx):
Expand Down