Merge remote-tracking branch 'yasoob/master'

[youtube-dl] / youtube_dl / extractor / youtube.py

diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py
index def6f7a74e951882403deff45603a214924ba9a8..109c8a93fa9ca7cb4caeca87462e1385a802bb69 100644 (file)
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@@ -83,40 +83,40 @@ class YoutubeIE(InfoExtractor):
     IE_NAME = u'youtube'
     _TESTS = [
         {
-            "url":  "http://www.youtube.com/watch?v=BaW_jenozKc",
-            "file":  "BaW_jenozKc.mp4",
-            "info_dict": {
-              "title": "youtube-dl test video \"'/\\ä↭𝕐",
-              "uploader": "Philipp Hagemeister",
-              "uploader_id": "phihag",
-              "upload_date": "20121002",
-              "description": "test chars:  \"'/\\ä↭𝕐\n\nThis is a test video for youtube-dl.\n\nFor more information, contact phihag@phihag.de ."
+            u"url":  u"http://www.youtube.com/watch?v=BaW_jenozKc",
+            u"file":  u"BaW_jenozKc.mp4",
+            u"info_dict": {
+                u"title": u"youtube-dl test video \"'/\\ä↭𝕐",
+                u"uploader": u"Philipp Hagemeister",
+                u"uploader_id": u"phihag",
+                u"upload_date": u"20121002",
+                u"description": u"test chars:  \"'/\\ä↭𝕐\n\nThis is a test video for youtube-dl.\n\nFor more information, contact phihag@phihag.de ."
             }
-          },
-          {
-            "url":  "http://www.youtube.com/watch?v=1ltcDfZMA3U",
-            "file":  "1ltcDfZMA3U.flv",
-            "note": "Test VEVO video (#897)",
-            "info_dict": {
-              "upload_date": "20070518",
-              "title": "Maps - It Will Find You",
-              "description": "Music video by Maps performing It Will Find You.",
-              "uploader": "MuteUSA",
-              "uploader_id": "MuteUSA"
+        },
+        {
+            u"url":  u"http://www.youtube.com/watch?v=1ltcDfZMA3U",
+            u"file":  u"1ltcDfZMA3U.flv",
+            u"note": u"Test VEVO video (#897)",
+            u"info_dict": {
+                u"upload_date": u"20070518",
+                u"title": u"Maps - It Will Find You",
+                u"description": u"Music video by Maps performing It Will Find You.",
+                u"uploader": u"MuteUSA",
+                u"uploader_id": u"MuteUSA"
             }
-          },
-          {
-            "url":  "http://www.youtube.com/watch?v=UxxajLWwzqY",
-            "file":  "UxxajLWwzqY.mp4",
-            "note": "Test generic use_cipher_signature video (#897)",
-            "info_dict": {
-              "upload_date": "20120506",
-              "title": "Icona Pop - I Love It (feat. Charli XCX) [OFFICIAL VIDEO]",
-              "description": "md5:b085c9804f5ab69f4adea963a2dceb3c",
-              "uploader": "IconaPop",
-              "uploader_id": "IconaPop"
+        },
+        {
+            u"url":  u"http://www.youtube.com/watch?v=UxxajLWwzqY",
+            u"file":  u"UxxajLWwzqY.mp4",
+            u"note": u"Test generic use_cipher_signature video (#897)",
+            u"info_dict": {
+                u"upload_date": u"20120506",
+                u"title": u"Icona Pop - I Love It (feat. Charli XCX) [OFFICIAL VIDEO]",
+                u"description": u"md5:b085c9804f5ab69f4adea963a2dceb3c",
+                u"uploader": u"IconaPop",
+                u"uploader_id": u"IconaPop"
             }
-          }
+        }
     ]
 
 
@@ -168,7 +168,7 @@ class YoutubeIE(InfoExtractor):
         self.to_screen(u'RTMP download detected')
 
     def _decrypt_signature(self, s):
-        """Decrypt the key"""
+        """Turn the encrypted s field into a working signature"""
 
         if len(s) == 88:
             return s[48] + s[81:67:-1] + s[82] + s[66:62:-1] + s[85] + s[61:48:-1] + s[67] + s[47:12:-1] + s[3] + s[11:3:-1] + s[2] + s[12]
@@ -402,6 +402,9 @@ class YoutubeIE(InfoExtractor):
         return video_id
 
     def _real_extract(self, url):
+        if re.match(r'(?:https?://)?[^/]+/watch\?feature=[a-z_]+$', url):
+            self._downloader.report_warning(u'Did you forget to quote the URL? Remember that & is a meta-character in most shells, so you want to put the URL in quotes, like  youtube-dl \'http://www.youtube.com/watch?feature=foo&v=BaW_jenozKc\' (or simply  youtube-dl BaW_jenozKc  ).')
+
         # Extract original video URL from URL with redirection, like age verification, using next_url parameter
         mobj = re.search(self._NEXT_URL_RE, url)
         if mobj: