YoutubeIE: add algo for length 79 (fixes #1126)

diff --git a/devscripts/youtube_genalgo.py b/devscripts/youtube_genalgo.py
index 3218113e71b6c70a4eb657d6d6e251e5b8e29e47..22977ccd90fb0e26fd49d572a9b9b2fc36e31373 100644 (file)
--- a/devscripts/youtube_genalgo.py
+++ b/devscripts/youtube_genalgo.py
@@ -35,6 +35,9 @@ tests = [
     # 81 - vflLC8JvQ 2013/07/25
     ("qwertyuioplkjhgfdsazxcvbnm1234567890QWERTYUIOPLKHGFDSAZXCVBNM!@#$%^&*(-+={[};?/>.",
      "C>/?;}[{=+-(*&^%$#@!MNBVYXZASDFGHKLPOIU.TREWQ0q87659321mnbvcxzasdfghjkl4oiuytrewp"),
+    # 79 - vflLC8JvQ 2013/07/25 (sporadic)
+    ("qwertyuioplkjhgfdsazxcvbnm1234567890QWERTYUIOPLKHGFDSAZXCVBNM!@#$%^&*(-+={[};?/",
+     "Z?;}[{=+-(*&^%$#@!MNBVCXRASDFGHKLPOIUYT/EWQ0q87659321mnbvcxzasdfghjkl4oiuytrewp"),
 ]
 
 def find_matching(wrong, right):

diff --git a/test/test_youtube_sig.py b/test/test_youtube_sig.py
index 4e50d6f9010feae5f5a08c58aa9af27a55cfb945..4d45a0e08cfdd15906460c2285e70ec256a7e58e 100644 (file)
--- a/test/test_youtube_sig.py
+++ b/test/test_youtube_sig.py
@@ -63,5 +63,10 @@ class TestYoutubeSig(unittest.TestCase):
         right = "C>/?;}[{=+-(*&^%$#@!MNBVYXZASDFGHKLPOIU.TREWQ0q87659321mnbvcxzasdfghjkl4oiuytrewp"
         self.assertEqual(sig(wrong), right)
 
+    def test_79(self):
+        wrong = "qwertyuioplkjhgfdsazxcvbnm1234567890QWERTYUIOPLKHGFDSAZXCVBNM!@#$%^&*(-+={[};?/"
+        right = "Z?;}[{=+-(*&^%$#@!MNBVCXRASDFGHKLPOIUYT/EWQ0q87659321mnbvcxzasdfghjkl4oiuytrewp"
+        self.assertEqual(sig(wrong), right)
+
 if __name__ == '__main__':
     unittest.main()

diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py
index f86929e06f2591f569c77b166fd7e1769831a772..f10f2e3dd96fb8e32966e2cdcde7b821fe81ff6b 100644 (file)
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@@ -297,6 +297,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
             return s[36] + s[79:67:-1] + s[81] + s[66:40:-1] + s[33] + s[39:36:-1] + s[40] + s[35] + s[0] + s[67] + s[32:0:-1] + s[34]
         elif len(s) == 81:
             return s[56] + s[79:56:-1] + s[41] + s[55:41:-1] + s[80] + s[40:34:-1] + s[0] + s[33:29:-1] + s[34] + s[28:9:-1] + s[29] + s[8:0:-1] + s[9]
+        elif len(s) == 79:
+            return s[54] + s[77:54:-1] + s[39] + s[53:39:-1] + s[78] + s[38:34:-1] + s[0] + s[33:29:-1] + s[34] + s[28:9:-1] + s[29] + s[8:0:-1] + s[9]
 
         else:
             raise ExtractorError(u'Unable to decrypt signature, key length %d not supported; retrying might work' % (len(s)))