Browse Source

[generic] Improve Livestream detection (closes #2234)

Yen Chi Hsuan 9 years ago
parent
commit
78d3b3e213
1 changed files with 14 additions and 1 deletions
  1. 14 1
      youtube_dl/extractor/generic.py

+ 14 - 1
youtube_dl/extractor/generic.py

@@ -784,6 +784,19 @@ class GenericIE(InfoExtractor):
                 'title': 'Rosetta #CometLanding webcast HL 10',
                 'title': 'Rosetta #CometLanding webcast HL 10',
             }
             }
         },
         },
+        # Another Livestream embed, without 'new.' in URL
+        {
+            'url': 'https://www.freespeech.org/',
+            'info_dict': {
+                'id': '123537347',
+                'ext': 'mp4',
+                'title': 're:^FSTV [0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}$',
+            },
+            'params': {
+                # Live stream
+                'skip_download': True,
+            },
+        },
         # LazyYT
         # LazyYT
         {
         {
             'url': 'http://discourse.ubuntu.com/t/unity-8-desktop-mode-windows-on-mir/1986',
             'url': 'http://discourse.ubuntu.com/t/unity-8-desktop-mode-windows-on-mir/1986',
@@ -1878,7 +1891,7 @@ class GenericIE(InfoExtractor):
             return self.url_result(self._proto_relative_url(mobj.group('url'), scheme='http:'), 'CondeNast')
             return self.url_result(self._proto_relative_url(mobj.group('url'), scheme='http:'), 'CondeNast')
 
 
         mobj = re.search(
         mobj = re.search(
-            r'<iframe[^>]+src="(?P<url>https?://new\.livestream\.com/[^"]+/player[^"]+)"',
+            r'<iframe[^>]+src="(?P<url>https?://(?:new\.)?livestream\.com/[^"]+/player[^"]+)"',
             webpage)
             webpage)
         if mobj is not None:
         if mobj is not None:
             return self.url_result(mobj.group('url'), 'Livestream')
             return self.url_result(mobj.group('url'), 'Livestream')