[xfileshare] Add title regex for streamin.to and fallback to video id (Closes #10646)
authorSergey M․ <dstftw@gmail.com>
Sun, 18 Sep 2016 00:22:06 +0000 (07:22 +0700)
committerSergey M․ <dstftw@gmail.com>
Sun, 18 Sep 2016 00:22:06 +0000 (07:22 +0700)
youtube_dl/extractor/xfileshare.py

index 995aada0d1565ccc76f2fa2c7654e3f53f834d91..de344bad25309c03b1d7378ceb6b3968c2d4c47a 100644 (file)
@@ -124,12 +124,14 @@ class XFileShareIE(InfoExtractor):
             webpage = self._download_webpage(req, video_id, 'Downloading video page')
 
         title = (self._search_regex(
-            [r'style="z-index: [0-9]+;">([^<]+)</span>',
+            (r'style="z-index: [0-9]+;">([^<]+)</span>',
              r'<td nowrap>([^<]+)</td>',
              r'h4-fine[^>]*>([^<]+)<',
              r'>Watch (.+) ',
-             r'<h2 class="video-page-head">([^<]+)</h2>'],
-            webpage, 'title', default=None) or self._og_search_title(webpage)).strip()
+             r'<h2 class="video-page-head">([^<]+)</h2>',
+             r'<h2 style="[^"]*color:#403f3d[^"]*"[^>]*>([^<]+)<'),  # streamin.to
+            webpage, 'title', default=None) or self._og_search_title(
+            webpage, default=None) or video_id).strip()
 
         def extract_video_url(default=NO_DEFAULT):
             return self._search_regex(