yt_dlp/extractor/motherless.py

@@ -177,7 +177,6 @@ class MotherlessIE(InfoExtractor):
 
 
 class MotherlessPaginatedIE(InfoExtractor):
-    _EXTRA_QUERY = {}
     _PAGE_SIZE = 60
 
     def _correct_path(self, url, item_id):
@@ -200,7 +199,7 @@ class MotherlessPaginatedIE(InfoExtractor):
         def get_page(idx):
             page = idx + 1
             current_page = webpage if not idx else self._download_webpage(
-                real_url, item_id, note=f'Downloading page {page}', query={'page': page, **self._EXTRA_QUERY})
+                real_url, item_id, note=f'Downloading page {page}', query={'page': page})
             yield from self._extract_entries(current_page, real_url)
 
         return self.playlist_result(
@@ -214,7 +213,7 @@ class MotherlessGroupIE(MotherlessPaginatedIE):
         'url': 'http://motherless.com/gv/movie_scenes',
         'info_dict': {
             'id': 'movie_scenes',
-            'title': 'Movie Scenes - Videos - Hot and sexy scenes from "regular" movies... Beautiful actresses fully',
+            'title': 'Movie Scenes',
         },
         'playlist_mincount': 540,
     }, {
@@ -245,7 +244,7 @@ class MotherlessGalleryIE(MotherlessPaginatedIE):
             'id': '338999F',
             'title': 'Random',
         },
-        'playlist_mincount': 171,
+        'playlist_mincount': 190,
     }, {
         'url': 'https://motherless.com/GVABD6213',
         'info_dict': {
@@ -274,7 +273,7 @@ class MotherlessGalleryIE(MotherlessPaginatedIE):
 
 
 class MotherlessUploaderIE(MotherlessPaginatedIE):
-    _VALID_URL = r'https?://(?:www\.)?motherless\.com/u/(?P<id>\w+)/?(?:$|[?#])'
+    _VALID_URL = r'https?://(?:www\.)?motherless\.com/u/(?P<id>[a-zA-Z0-9_]+)($|\?t=v)'
     _TESTS = [{
         'url': 'https://motherless.com/u/Mrgo4hrs2023',
         'info_dict': {
@@ -291,7 +290,20 @@ class MotherlessUploaderIE(MotherlessPaginatedIE):
         'playlist_mincount': 8,
     }]
 
-    _EXTRA_QUERY = {'t': 'v'}
+    def _real_extract(self, url):
+        item_id = self._match_id(url)
+        real_url = self._correct_path(url, item_id)
+        webpage = self._download_webpage(real_url, item_id, 'Downloading page 1')
+
+        def get_page(idx):
+            page = idx + 1
+            current_page = webpage if not idx else self._download_webpage(
+                real_url, item_id, note=f'Downloading page {page}', query={'page': page, 't': 'v'})
+            yield from self._extract_entries(current_page, real_url)
+
+        return self.playlist_result(
+            OnDemandPagedList(get_page, self._PAGE_SIZE), item_id,
+            remove_end(self._html_extract_title(webpage), ' | MOTHERLESS.COM ™'))
 
     def _correct_path(self, url, item_id):
         return urllib.parse.urljoin(url, f'/u/{item_id}?t=v')