X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=inline;f=youtube_dl%2Fextractor%2Fopenload.py;h=fc7ff43a62ba4a1a294d368d0b8fbaeb9abdb2ed;hb=39e7277ed16c1647d636c766d57870121f5f2d68;hp=bd1120fd81b048f3f2112bdad0ac1c1fddf45b71;hpb=d94badc755228ee3159b9b499aa718d27fa472ed;p=youtube-dl
diff --git a/youtube_dl/extractor/openload.py b/youtube_dl/extractor/openload.py
index bd1120fd8..fc7ff43a6 100644
--- a/youtube_dl/extractor/openload.py
+++ b/youtube_dl/extractor/openload.py
@@ -72,23 +72,25 @@ class OpenloadIE(InfoExtractor):
raise ExtractorError('File not found', expected=True)
ol_id = self._search_regex(
- ']+id="[^"]+"[^>]*>([0-9]+)',
+ ']+id="[^"]+"[^>]*>([0-9A-Za-z]+)',
webpage, 'openload ID')
- first_two_chars = int(float(ol_id[0:][:2]))
- urlcode = {}
- num = 2
+ first_char = int(ol_id[0])
+ urlcode = []
+ num = 1
while num < len(ol_id):
- key = int(float(ol_id[num + 3:][:2]))
- urlcode[key] = compat_chr(int(float(ol_id[num:][:3])) - first_two_chars)
+ i = ord(ol_id[num])
+ key = 0
+ if i <= 90:
+ key = i - 65
+ elif i >= 97:
+ key = 25 + i - 97
+ urlcode.append((key, compat_chr(int(ol_id[num + 2:num + 5]) // int(ol_id[num + 1]) - first_char)))
num += 5
-
- sorted(urlcode, key=lambda key: urlcode[key])
- urllink = ''.join(['%s' % (value) for (key, value) in urlcode.items()])
-
- video_url = 'https://openload.co/stream/' + urllink
+ video_url = 'https://openload.co/stream/' + ''.join(
+ [value for _, value in sorted(urlcode, key=lambda x: x[0])])
title = self._og_search_title(webpage, default=None) or self._search_regex(
r']+class=["\']title["\'][^>]*>([^<]+)', webpage,