From: Sergey M․ <dstftw@gmail.com>
Date: Mon, 13 Feb 2017 16:44:43 +0000 (+0700)
Subject: [xtube] Fix extraction for both kinds of video id (closes #12088)
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=085f169ffebc17ec8b2bfc63aec8f5df57c7bdcf;p=youtube-dl.git

[xtube] Fix extraction for both kinds of video id (closes #12088)
---

diff --git a/youtube_dl/extractor/xtube.py b/youtube_dl/extractor/xtube.py
index ed3a37649..5584674a0 100644
--- a/youtube_dl/extractor/xtube.py
+++ b/youtube_dl/extractor/xtube.py
@@ -44,6 +44,9 @@ class XTubeIE(InfoExtractor):
     }, {
         'url': 'xtube:625837',
         'only_matching': True,
+    }, {
+        'url': 'xtube:kVTUy_G222_',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -53,11 +56,16 @@ class XTubeIE(InfoExtractor):
 
         if not display_id:
             display_id = video_id
-            url = 'http://www.xtube.com/watch.php?v=%s' % video_id
 
-        req = sanitized_Request(url)
-        req.add_header('Cookie', 'age_verified=1; cookiesAccepted=1')
-        webpage = self._download_webpage(req, display_id)
+        if video_id.isdigit() and len(video_id) < 11:
+            url_pattern = 'http://www.xtube.com/video-watch/-%s'
+        else:
+            url_pattern = 'http://www.xtube.com/watch.php?v=%s'
+
+        webpage = self._download_webpage(
+            url_pattern % video_id, display_id, headers={
+                'Cookie': 'age_verified=1; cookiesAccepted=1',
+            })
 
         sources = self._parse_json(self._search_regex(
             r'(["\'])sources\1\s*:\s*(?P<sources>{.+?}),',