YoutubeIE: Extend decryption of signatures to all videos that have the 's' field in the url_encoded_fmt_stream_map (related #920)

This commit is contained in:
Jaime Marquínez Ferrándiz 2013-06-24 21:19:04 +02:00
parent 93eb15c573
commit 7ce7e39476

View file

@ -486,9 +486,11 @@ class YoutubeIE(InfoExtractor):
mobj = re.search(r';ytplayer.config = ({.*?});', video_webpage) mobj = re.search(r';ytplayer.config = ({.*?});', video_webpage)
info = json.loads(mobj.group(1)) info = json.loads(mobj.group(1))
args = info['args'] args = info['args']
if args.get('ptk','') == 'vevo' or 'dashmpd' in args: # Easy way to know if the 's' value is in url_encoded_fmt_stream_map
# Vevo videos with encrypted signatures # this signatures are encrypted
self.to_screen(u'%s: Vevo video detected.' % video_id) m_s = re.search(r'[&,]s=', args['url_encoded_fmt_stream_map'])
if m_s is not None:
self.to_screen(u'%s: Encrypted signatures detected.' % video_id)
video_info['url_encoded_fmt_stream_map'] = [args['url_encoded_fmt_stream_map']] video_info['url_encoded_fmt_stream_map'] = [args['url_encoded_fmt_stream_map']]
except ValueError: except ValueError:
pass pass