diff --git a/src/you_get/downloader/youtube.py b/src/you_get/downloader/youtube.py index 69285b6a..557eca1f 100644 --- a/src/you_get/downloader/youtube.py +++ b/src/you_get/downloader/youtube.py @@ -78,16 +78,24 @@ def parse_video_info(raw_info): for item in raw_info.split('&')]) -# Imported from youtube-dl -def _decrypt_signature(s): - """Decrypt the key the two subkeys must have a length of 43""" - (a, b) = s.split('.') - if len(a) != 43 or len(b) != 43: - raise Exception('Unable to decrypt signature, subkeys lengths not valid') - b = ''.join([b[:8], a[0], b[9:18], b[-4], b[19:39], b[18]])[0:40] - a = a[-40:] - s_dec = '.'.join((a, b))[::-1] - return s_dec +# Signature decryption algorithm, reused code from youtube-dl +def decrypt_signature(s): + 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] + elif len(s) == 87: + return s[62] + s[82:62:-1] + s[83] + s[61:52:-1] + s[0] + s[51:2:-1] + elif len(s) == 86: + return s[2:63] + s[82] + s[64:82] + s[63] + elif len(s) == 85: + return s[76] + s[82:76:-1] + s[83] + s[75:60:-1] + s[0] + s[59:50:-1] + s[1] + s[49:2:-1] + elif len(s) == 84: + return s[83:36:-1] + s[2] + s[35:26:-1] + s[3] + s[25:3:-1] + s[26] + elif len(s) == 83: + return s[52] + s[81:55:-1] + s[2] + s[54:52:-1] + s[82] + s[51:36:-1] + s[55] + s[35:2:-1] + s[36] + elif len(s) == 82: + 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] + else: + raise Exception(u'Unable to decrypt signature, key length %d not supported; retrying might work' % (len(s))) def youtube_download_by_id(id, title = None, output_dir = '.', merge = True, info_only = False): @@ -129,7 +137,7 @@ def youtube_download_by_id(id, title = None, output_dir = '.', merge = True, inf url = r1(r'url=([^\\]+)', fmt) url = unicodize(url) url = parse.unquote(url) - sig = r1(r'sig=([^\\]+)', fmt) or _decrypt_signature(r1(r's=([^\\]+)', fmt)) + sig = r1(r'sig=([^\\]+)', fmt) or decrypt_signature(r1(r's=([^\\]+)', fmt)) url = url + '&signature=' + sig break try: