Roxedus/ytdl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[utils] Merge base_n functions

Browse Source
This commit is contained in:
Yen Chi Hsuan 2016-02-26 14:37:20 +08:00
parent 8f4a2124a9
commit 59f898b7a7
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
youtube_dl/extractor/iqiyi.py
View File

@ -18,7 +18,7 @@ from ..compat import (
compat_urllib_parse_urlparse, compat_urllib_parse_urlparse,
) )
from ..utils import ( from ..utils import (
base62, base_n,
ExtractorError, ExtractorError,
ohdave_rsa_encrypt, ohdave_rsa_encrypt,
remove_start, remove_start,
@ -143,7 +143,7 @@ class IqiyiSDKInterpreter(object):
while count: while count:
count -= 1 count -= 1
b62count = base62(count) b62count = base_n(count, 62)
symbol_table[b62count] = symbols[count] or b62count symbol_table[b62count] = symbols[count] or b62count
self.sdk_code = re.sub( self.sdk_code = re.sub(

4
youtube_dl/extractor/vidzi.py
View File

@ -5,7 +5,7 @@ import re
from .jwplatform import JWPlatformBaseIE from .jwplatform import JWPlatformBaseIE
from ..utils import ( from ..utils import (
base36, base_n,
js_to_json, js_to_json,
) )
@ -42,7 +42,7 @@ class VidziIE(JWPlatformBaseIE):
while count: while count:
count -= 1 count -= 1
if symbols[count]: if symbols[count]:
code = re.sub(r'\b%s\b' % base36(count), symbols[count], code) code = re.sub(r'\b%s\b' % base_n(count, 36), symbols[count], code)
code = code.replace('\\\'', '\'') code = code.replace('\\\'', '\'')
jwplayer_data = self._parse_json( jwplayer_data = self._parse_json(

16
youtube_dl/utils.py
View File

@ -2621,19 +2621,17 @@ def ohdave_rsa_encrypt(data, exponent, modulus):
return '%x' % encrypted return '%x' % encrypted
def base_n(num, n, table): def base_n(num, n, table=None):
if num == 0: if num == 0:
return '0' return '0'
FULL_TABLE = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
assert n <= len(FULL_TABLE)
if not table:
table = FULL_TABLE[:n]
ret = '' ret = ''
while num: while num:
ret = table[num % n] + ret ret = table[num % n] + ret
num = num // n num = num // n
return ret return ret
def base36(num):
return base_n(num, 36, '0123456789abcdefghijklmnopqrstuvwxyz')
def base62(num):
return base_n(num, 62, '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')