[extractor] Common function `_match_valid_url`

[yt-dlp.git] / yt_dlp / extractor / dailymotion.py

diff --git a/yt_dlp/extractor/dailymotion.py b/yt_dlp/extractor/dailymotion.py
index b8529050c45c8ee1479e2624ba26aac3f002b9fe..e04e10b8659cd478688e96c6950530c937de8258 100644 (file)
--- a/yt_dlp/extractor/dailymotion.py
+++ b/yt_dlp/extractor/dailymotion.py
@@ -42,7 +42,7 @@ def _set_dailymotion_cookie(self, name, value):
     def _real_initialize(self):
         cookies = self._get_dailymotion_cookies()
         ff = self._get_cookie_value(cookies, 'ff')
-        self._FAMILY_FILTER = ff == 'on' if ff else age_restricted(18, self._downloader.params.get('age_limit'))
+        self._FAMILY_FILTER = ff == 'on' if ff else age_restricted(18, self.get_param('age_limit'))
         self._set_dailymotion_cookie('ff', 'on' if self._FAMILY_FILTER else 'off')
 
     def _call_api(self, object_type, xid, object_fields, note, filter_extra=None):
@@ -204,17 +204,17 @@ def _extract_urls(webpage):
         return urls
 
     def _real_extract(self, url):
-        video_id, playlist_id = re.match(self._VALID_URL, url).groups()
+        video_id, playlist_id = self._match_valid_url(url).groups()
 
         if playlist_id:
-            if not self._downloader.params.get('noplaylist'):
+            if not self.get_param('noplaylist'):
                 self.to_screen('Downloading playlist %s - add --no-playlist to just download video' % playlist_id)
                 return self.url_result(
                     'http://www.dailymotion.com/playlist/' + playlist_id,
                     'DailymotionPlaylist', playlist_id)
             self.to_screen('Downloading just video %s because of --no-playlist' % video_id)
 
-        password = self._downloader.params.get('videopassword')
+        password = self.get_param('videopassword')
         media = self._call_api(
             'media', video_id, '''... on Video {
       %s
@@ -232,7 +232,7 @@ def _real_extract(self, url):
       audienceCount
       isOnAir
     }''' % (self._COMMON_MEDIA_FIELDS, self._COMMON_MEDIA_FIELDS), 'Downloading media JSON metadata',
-            'password: "%s"' % self._downloader.params.get('videopassword') if password else None)
+            'password: "%s"' % self.get_param('videopassword') if password else None)
         xid = media['xid']
 
         metadata = self._download_json(