]> git.bitcoin.ninja Git - youtube-dl/commitdiff
extracts full title from source
authorKevin Ngo <ngoke@onid.oregonstate.edu>
Sun, 13 Nov 2011 01:08:40 +0000 (17:08 -0800)
committerKevin Ngo <ngoke@onid.oregonstate.edu>
Sun, 13 Nov 2011 01:08:40 +0000 (17:08 -0800)
youtube-dl

index 949d2e532d38eb154d9063aedfe6660ad12bed81..f717f35ada03d8a95d42bc89ca800e5a399ecfe9 100755 (executable)
@@ -3532,13 +3532,18 @@ class SoundcloudIE(InfoExtractor):
 
                self.report_extraction('%s/%s' % (uploader, slug_title))
 
-               # extract uid and access token
+               # extract uid and stream token that soundcloud hands out for access
                mobj = re.search('"uid":"([\w\d]+?)".*?stream_token=([\w\d]+)', webpage)   
                if mobj:
                        video_id = mobj.group(1)
                        stream_token = mobj.group(2)
 
-               # construct media url (with uid/token) to request song
+               # extract unsimplified title
+               mobj = re.search('"title":"(.*?)",', webpage)
+               if mobj:
+                       title = mobj.group(1)
+
+               # construct media url (with uid/token)
                mediaURL = "http://media.soundcloud.com/stream/%s?stream_token=%s"
                mediaURL = mediaURL % (video_id, stream_token)
 
@@ -3557,22 +3562,21 @@ class SoundcloudIE(InfoExtractor):
                        except Exception as e:
                                print str(e)
 
-               # for soundcloud, a request must be made to a cross domain to establish
-               # needed cookies
+               # for soundcloud, a request to a cross domain is required for cookies
                request = urllib2.Request('http://media.soundcloud.com/crossdomain.xml', std_headers)
 
                try:
                        self._downloader.process_info({
-                               'id':           video_id,
+                               'id':           video_id.decode('utf-8'),
                                'url':          mediaURL,
-                               'uploader':     uploader,
+                               'uploader':     uploader.decode('utf-8'),
                                'upload_date':  upload_date,
-                               'title':        simple_title,
-                               'stitle':       simple_title,
+                               'title':        simple_title.decode('utf-8'),
+                               'stitle':       simple_title.decode('utf-8'),
                                'ext':          u'mp3',
                                'format':       u'NA',
                                'player_url':   None,
-                               'description': description
+                               'description': description.decode('utf-8')
                        })
                except UnavailableVideoError:
                        self._downloader.trouble(u'\nERROR: unable to download video')