Changeset 8953 for ipk/source.sh4/swapplayers_mytube_1_0/var/swap/extensions/MyTube/MyTubeService.py

Timestamp:

Aug 19, 2011, 9:48:11 AM (15 years ago)

Author:

bonkel

Message:

fix swapmytube

File:

• ipk/source.sh4/swapplayers_mytube_1_0/var/swap/extensions/MyTube/MyTubeService.py (modified) (5 diffs)

ipk/source.sh4/swapplayers_mytube_1_0/var/swap/extensions/MyTube/MyTubeService.py

@@ -1 +1 @@
 # -*- coding: iso-8859-1 -*-
+from __init__ import bin2long, long2bin, rsa_pub1024, decrypt_block
 import gdata.youtube
 import gdata.youtube.service
@@ -224 +225 @@
                                 infopage = urlopen2(request).read()
                                 videoinfo = parse_qs(infopage)
-                                if 'fmt_url_map' in videoinfo:
+                                if ('url_encoded_fmt_stream_map' or 'fmt_url_map') in videoinfo:
                                         break
                         except (URLError, HTTPException, socket.error), err:
@@ -230 +231 @@
                                 return video_url
 
-                if 'fmt_url_map' not in videoinfo:
+                if ('url_encoded_fmt_stream_map' or 'fmt_url_map') not in videoinfo:
                         # Attempt to see if YouTube has issued an error message
                         if 'reason' not in videoinfo:
-                                print '[MyTube] Error: unable to extract "fmt_url_map" parameter for unknown reason'
+                                print '[MyTube] Error: unable to extract "fmt_url_map" or "url_encoded_fmt_stream_map" parameter for unknown reason'
                         else:
                                 reason = unquote_plus(videoinfo['reason'][0])
@@ -241 +242 @@
                 video_fmt_map = {}
                 fmt_infomap = {}
-                tmp_fmtUrlDATA = videoinfo['fmt_url_map'][0].split(',')
+                if videoinfo.has_key('url_encoded_fmt_stream_map'):
+                        tmp_fmtUrlDATA = videoinfo['url_encoded_fmt_stream_map'][0].split(',url=')
+                else:
+                        tmp_fmtUrlDATA = videoinfo['fmt_url_map'][0].split(',')        
                 for fmtstring in tmp_fmtUrlDATA:
-                        (fmtid,fmturl) = fmtstring.split('|')
+                        if videoinfo.has_key('url_encoded_fmt_stream_map'):
+                                (fmturl, fmtid) = fmtstring.split('&itag=')
+                                if fmturl.find("url=") !=-1:
+                                        fmturl = fmturl.replace("url=","")
+                        else:
+                                (fmtid,fmturl) = fmtstring.split('|')                
                         if VIDEO_FMT_PRIORITY_MAP.has_key(fmtid):
                                 video_fmt_map[VIDEO_FMT_PRIORITY_MAP[fmtid]] = { 'fmtid': fmtid, 'fmturl': unquote_plus(fmturl) }
@@ -250 +259 @@
                 if video_fmt_map and len(video_fmt_map):
                         print "[MyTube] found best available video format:",video_fmt_map[sorted(video_fmt_map.iterkeys())[0]]['fmtid']
-                        video_url = video_fmt_map[sorted(video_fmt_map.iterkeys())[0]]['fmturl']
+                        video_url = video_fmt_map[sorted(video_fmt_map.iterkeys())[0]]['fmturl'].split(';')[0]
                         print "[MyTube] found best available video url:",video_url