Procházet zdrojové kódy

[5tv] Add another video URL pattern (closes #13354)

rrooij před 8 roky
rodič
revize
f354d84807
1 změnil soubory, kde provedl 3 přidání a 2 odebrání
  1. 3 2
      youtube_dl/extractor/fivetv.py

+ 3 - 2
youtube_dl/extractor/fivetv.py

@@ -43,7 +43,7 @@ class FiveTVIE(InfoExtractor):
         'info_dict': {
         'info_dict': {
             'id': 'glavnoe',
             'id': 'glavnoe',
             'ext': 'mp4',
             'ext': 'mp4',
-            'title': 'Итоги недели с 8 по 14 июня 2015 года',
+            'title': r're:^Итоги недели с \d+ по \d+ \w+ \d{4} года$',
             'thumbnail': r're:^https?://.*\.jpg$',
             'thumbnail': r're:^https?://.*\.jpg$',
         },
         },
     }, {
     }, {
@@ -70,7 +70,8 @@ class FiveTVIE(InfoExtractor):
         webpage = self._download_webpage(url, video_id)
         webpage = self._download_webpage(url, video_id)
 
 
         video_url = self._search_regex(
         video_url = self._search_regex(
-            r'<a[^>]+?href="([^"]+)"[^>]+?class="videoplayer"',
+            [r'<div[^>]+?class="flowplayer[^>]+?data-href="([^"]+)"',
+             r'<a[^>]+?href="([^"]+)"[^>]+?class="videoplayer"'],
             webpage, 'video url')
             webpage, 'video url')
 
 
         title = self._og_search_title(webpage, default=None) or self._search_regex(
         title = self._og_search_title(webpage, default=None) or self._search_regex(