]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[openload] Fix extraction (closes #10408)
authorYen Chi Hsuan <yan12125@gmail.com>
Fri, 17 Mar 2017 07:20:12 +0000 (15:20 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Fri, 17 Mar 2017 07:22:34 +0000 (15:22 +0800)
Thanks to @makgun02

Ref: http://pastebin.com/raw/JX9gHFUz

ChangeLog
youtube_dl/extractor/openload.py

index 75a8bd7a6e9f0ebfc6115f77c140fdc2ac56cbc6..eeb5813c5c93e24945eaa4fc0184534e2cdd2040 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+version <unreleased>
+
+Extractors
+* [openload] Fix extraction (#10408)
+
+
 version 2017.03.16
 
 Core
index 5ea749f35dc0d8622de1f1b15b140d6963b007ff..fa876b1277c783da1dc9bb9cfacbddcdc6605c56 100644 (file)
@@ -78,34 +78,45 @@ class OpenloadIE(InfoExtractor):
         video_url_chars = []
 
         first_char = ord(ol_id[0])
-        key = first_char - 50
+        key = first_char - 55
         maxKey = max(2, key)
-        key = min(maxKey, len(ol_id) - 22)
-        t = ol_id[key:key + 20]
+        key = min(maxKey, len(ol_id) - 26)
+        t = ol_id[key:key + 24]
 
         hashMap = {}
-        v = ol_id.replace(t, "")
+        v = ol_id.replace(t, '')
         h = 0
 
         while h < len(t):
-            f = t[h:h + 2]
-            i = int(f, 16)
-            hashMap[h / 2] = i
-            h += 2
+            f = t[h:h + 3]
+            i = int(f, 8)
+            hashMap[h / 3] = i
+            h += 3
 
         h = 0
-
+        H = 0
         while h < len(v):
-            B = v[h:h + 3]
+            B = ''
+            C = ''
+            if len(v) >= h + 2:
+                B = v[h:h + 2]
+            if len(v) >= h + 3:
+                C = v[h:h + 3]
             i = int(B, 16)
-            if (h / 3) % 3 == 0:
-                i = int(B, 8)
-            index = (h / 3) % 10
+            h += 2
+            if H % 3 == 0:
+                i = int(C, 8)
+                h += 1
+            elif H % 2 == 0 and H != 0 and ord(v[H - 1]) < 60:
+                i = int(C, 10)
+                h += 1
+            index = H % 8
+
             A = hashMap[index]
-            i = i ^ 47
-            i = i ^ A
+            i ^= 213
+            i ^= A
             video_url_chars.append(compat_chr(i))
-            h += 3
+            H += 1
 
         video_url = 'https://openload.co/stream/%s?mime=true'
         video_url = video_url % (''.join(video_url_chars))