reorganized the titles sanitizing: now title is the untouched title
[youtube-dl] / youtube_dl / InfoExtractors.py
index d77154dcb4902422f9297c6b0d0fbf90168f5975..ee8783ffd6bd3ad5ce72f4c93216e25f415ea07b 100644 (file)
@@ -12,23 +12,14 @@ import time
 import urllib
 import urllib2
 import email.utils
+import xml.etree.ElementTree
+from urlparse import parse_qs
 
 try:
        import cStringIO as StringIO
 except ImportError:
        import StringIO
 
-# parse_qs was moved from the cgi module to the urlparse module recently.
-try:
-       from urlparse import parse_qs
-except ImportError:
-       from cgi import parse_qs
-
-try:
-       import xml.etree.ElementTree
-except ImportError: # Python<2.5: Not officially supported, but let it slip
-       warnings.warn('xml.etree.ElementTree support is missing. Consider upgrading to Python >= 2.5 if you get related errors.')
-
 from utils import *
 
 
@@ -48,7 +39,6 @@ class InfoExtractor(object):
        url:            Final video URL.
        uploader:       Nickname of the video uploader.
        title:          Literal title.
-       stitle:         Simplified title.
        ext:            Video filename extension.
        format:         Video format.
        player_url:     SWF Player URL (may be None).
@@ -112,8 +102,8 @@ class YoutubeIE(InfoExtractor):
        _NEXT_URL_RE = r'[\?&]next_url=([^&]+)'
        _NETRC_MACHINE = 'youtube'
        # Listed in order of quality
-       _available_formats = ['38', '37', '22', '45', '35', '44', '34', '18', '43', '6', '5', '17', '13']
-       _available_formats_prefer_free = ['38', '37', '45', '22', '44', '35', '43', '34', '18', '6', '5', '17', '13']
+       _available_formats = ['38', '37', '46', '22', '45', '35', '44', '34', '18', '43', '6', '5', '17', '13']
+       _available_formats_prefer_free = ['38', '46', '37', '45', '22', '44', '35', '43', '34', '18', '6', '5', '17', '13']
        _video_extensions = {
                '13': '3gp',
                '17': 'mp4',
@@ -124,6 +114,7 @@ class YoutubeIE(InfoExtractor):
                '43': 'webm',
                '44': 'webm',
                '45': 'webm',
+               '46': 'webm',
        }
        _video_dimensions = {
                '5': '240x400',
@@ -139,6 +130,7 @@ class YoutubeIE(InfoExtractor):
                '43': '360x640',
                '44': '480x854',
                '45': '720x1280',
+               '46': '1080x1920',
        }       
        IE_NAME = u'youtube'
 
@@ -334,10 +326,6 @@ class YoutubeIE(InfoExtractor):
                        return
                video_title = urllib.unquote_plus(video_info['title'][0])
                video_title = video_title.decode('utf-8')
-               video_title = sanitize_title(video_title)
-
-               # simplified title
-               simple_title = simplify_title(video_title)
 
                # thumbnail image
                if 'thumbnail_url' not in video_info:
@@ -359,40 +347,39 @@ class YoutubeIE(InfoExtractor):
                                        pass
 
                # description
-               video_description = get_element_by_id("eow-description", video_webpage)
-               if video_description: video_description = clean_html(video_description.decode('utf8'))
+               video_description = get_element_by_id("eow-description", video_webpage.decode('utf8'))
+               if video_description: video_description = clean_html(video_description)
                else: video_description = ''
                        
                # closed captions
                video_subtitles = None
                if self._downloader.params.get('writesubtitles', False):
-                       self.report_video_subtitles_download(video_id)
-                       request = urllib2.Request('http://video.google.com/timedtext?hl=en&type=list&v=%s' % video_id)
                        try:
-                               srt_list = urllib2.urlopen(request).read()
-                       except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-                               self._downloader.trouble(u'WARNING: unable to download video subtitles: %s' % str(err))
-                       else:
+                               self.report_video_subtitles_download(video_id)
+                               request = urllib2.Request('http://video.google.com/timedtext?hl=en&type=list&v=%s' % video_id)
+                               try:
+                                       srt_list = urllib2.urlopen(request).read()
+                               except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+                                       raise Trouble(u'WARNING: unable to download video subtitles: %s' % str(err))
                                srt_lang_list = re.findall(r'lang_code="([\w\-]+)"', srt_list)
-                               if srt_lang_list:
-                                       if self._downloader.params.get('subtitleslang', False):
-                                               srt_lang = self._downloader.params.get('subtitleslang')
-                                       elif 'en' in srt_lang_list:
-                                               srt_lang = 'en'
-                                       else:
-                                               srt_lang = srt_lang_list[0]
-                                       if not srt_lang in srt_lang_list:
-                                               self._downloader.trouble(u'WARNING: no closed captions found in the specified language')
-                                       else:
-                                               request = urllib2.Request('http://video.google.com/timedtext?hl=en&lang=%s&v=%s' % (srt_lang, video_id))
-                                               try:
-                                                       srt_xml = urllib2.urlopen(request).read()
-                                               except (urllib2.URLError, httplib.HTTPException, socket.error), err:
-                                                       self._downloader.trouble(u'WARNING: unable to download video subtitles: %s' % str(err))
-                                               else:
-                                                       video_subtitles = self._closed_captions_xml_to_srt(srt_xml.decode('utf-8'))
+                               if not srt_lang_list:
+                                       raise Trouble(u'WARNING: video has no closed captions')
+                               if self._downloader.params.get('subtitleslang', False):
+                                       srt_lang = self._downloader.params.get('subtitleslang')
+                               elif 'en' in srt_lang_list:
+                                       srt_lang = 'en'
                                else:
-                                       self._downloader.trouble(u'WARNING: video has no closed captions')
+                                       srt_lang = srt_lang_list[0]
+                               if not srt_lang in srt_lang_list:
+                                       raise Trouble(u'WARNING: no closed captions found in the specified language')
+                               request = urllib2.Request('http://video.google.com/timedtext?hl=en&lang=%s&v=%s' % (srt_lang, video_id))
+                               try:
+                                       srt_xml = urllib2.urlopen(request).read()
+                               except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+                                       raise Trouble(u'WARNING: unable to download video subtitles: %s' % str(err))
+                               video_subtitles = self._closed_captions_xml_to_srt(srt_xml.decode('utf-8'))
+                       except Trouble as trouble:
+                               self._downloader.trouble(trouble[0])
 
                # token
                video_token = urllib.unquote_plus(video_info['token'][0])
@@ -455,7 +442,6 @@ class YoutubeIE(InfoExtractor):
                                'uploader':     video_uploader.decode('utf-8'),
                                'upload_date':  upload_date,
                                'title':        video_title,
-                               'stitle':       simple_title,
                                'ext':          video_extension.decode('utf-8'),
                                'format':       (format_param is None and u'NA' or format_param.decode('utf-8')),
                                'thumbnail':    video_thumbnail.decode('utf-8'),
@@ -531,8 +517,6 @@ class MetacafeIE(InfoExtractor):
                        self._downloader.download(['http://www.youtube.com/watch?v=%s' % mobj2.group(1)])
                        return
 
-               simple_title = mobj.group(2).decode('utf-8')
-
                # Retrieve video webpage to extract further information
                request = urllib2.Request('http://www.metacafe.com/watch/%s/' % video_id)
                try:
@@ -578,7 +562,6 @@ class MetacafeIE(InfoExtractor):
                        self._downloader.trouble(u'ERROR: unable to extract title')
                        return
                video_title = mobj.group(1).decode('utf-8')
-               video_title = sanitize_title(video_title)
 
                mobj = re.search(r'(?ms)By:\s*<a .*?>(.+?)<', webpage)
                if mobj is None:
@@ -592,7 +575,6 @@ class MetacafeIE(InfoExtractor):
                        'uploader':     video_uploader.decode('utf-8'),
                        'upload_date':  u'NA',
                        'title':        video_title,
-                       'stitle':       simple_title,
                        'ext':          video_extension.decode('utf-8'),
                        'format':       u'NA',
                        'player_url':   None,
@@ -659,8 +641,6 @@ class DailymotionIE(InfoExtractor):
                        self._downloader.trouble(u'ERROR: unable to extract title')
                        return
                video_title = unescapeHTML(mobj.group('title').decode('utf-8'))
-               video_title = sanitize_title(video_title)
-               simple_title = simplify_title(video_title)
 
                mobj = re.search(r'(?im)<span class="owner[^\"]+?">[^<]+?<a [^>]+?>([^<]+?)</a></span>', webpage)
                if mobj is None:
@@ -674,7 +654,6 @@ class DailymotionIE(InfoExtractor):
                        'uploader':     video_uploader.decode('utf-8'),
                        'upload_date':  u'NA',
                        'title':        video_title,
-                       'stitle':       simple_title,
                        'ext':          video_extension.decode('utf-8'),
                        'format':       u'NA',
                        'player_url':   None,
@@ -738,8 +717,6 @@ class GoogleIE(InfoExtractor):
                        self._downloader.trouble(u'ERROR: unable to extract title')
                        return
                video_title = mobj.group(1).decode('utf-8')
-               video_title = sanitize_title(video_title)
-               simple_title = simplify_title(video_title)
 
                # Extract video description
                mobj = re.search(r'<span id=short-desc-content>([^<]*)</span>', webpage)
@@ -772,7 +749,6 @@ class GoogleIE(InfoExtractor):
                        'uploader':     u'NA',
                        'upload_date':  u'NA',
                        'title':        video_title,
-                       'stitle':       simple_title,
                        'ext':          video_extension.decode('utf-8'),
                        'format':       u'NA',
                        'player_url':   None,
@@ -831,8 +807,6 @@ class PhotobucketIE(InfoExtractor):
                        self._downloader.trouble(u'ERROR: unable to extract title')
                        return
                video_title = mobj.group(1).decode('utf-8')
-               video_title = sanitize_title(video_title)
-               simple_title = simplify_title(video_title)
 
                video_uploader = mobj.group(2).decode('utf-8')
 
@@ -842,7 +816,6 @@ class PhotobucketIE(InfoExtractor):
                        'uploader':     video_uploader,
                        'upload_date':  u'NA',
                        'title':        video_title,
-                       'stitle':       simple_title,
                        'ext':          video_extension.decode('utf-8'),
                        'format':       u'NA',
                        'player_url':   None,
@@ -920,7 +893,6 @@ class YahooIE(InfoExtractor):
                        self._downloader.trouble(u'ERROR: unable to extract video title')
                        return
                video_title = mobj.group(1).decode('utf-8')
-               simple_title = simplify_title(video_title)
 
                mobj = re.search(r'<h2 class="ti-5"><a href="http://video\.yahoo\.com/(people|profile)/[0-9]+" beacon=".*">(.*)</a></h2>', webpage)
                if mobj is None:
@@ -986,7 +958,6 @@ class YahooIE(InfoExtractor):
                        'uploader':     video_uploader,
                        'upload_date':  u'NA',
                        'title':        video_title,
-                       'stitle':       simple_title,
                        'ext':          video_extension.decode('utf-8'),
                        'thumbnail':    video_thumbnail.decode('utf-8'),
                        'description':  video_description,
@@ -1046,7 +1017,6 @@ class VimeoIE(InfoExtractor):
                
                # Extract title
                video_title = config["video"]["title"]
-               simple_title = simplify_title(video_title)
 
                # Extract uploader
                video_uploader = config["video"]["owner"]["name"]
@@ -1055,8 +1025,8 @@ class VimeoIE(InfoExtractor):
                video_thumbnail = config["video"]["thumbnail"]
 
                # Extract video description
-               video_description = get_element_by_id("description", webpage)
-               if video_description: video_description = clean_html(video_description.decode('utf8'))
+               video_description = get_element_by_id("description", webpage.decode('utf8'))
+               if video_description: video_description = clean_html(video_description)
                else: video_description = ''
 
                # Extract upload date
@@ -1092,7 +1062,6 @@ class VimeoIE(InfoExtractor):
                        'uploader':     video_uploader,
                        'upload_date':  video_upload_date,
                        'title':        video_title,
-                       'stitle':       simple_title,
                        'ext':          video_extension,
                        'thumbnail':    video_thumbnail,
                        'description':  video_description,
@@ -1227,8 +1196,6 @@ class GenericIE(InfoExtractor):
                        self._downloader.trouble(u'ERROR: unable to extract title')
                        return
                video_title = mobj.group(1).decode('utf-8')
-               video_title = sanitize_title(video_title)
-               simple_title = simplify_title(video_title)
 
                # video uploader is domain name
                mobj = re.match(r'(?:https?://)?([^/]*)/.*', url)
@@ -1243,7 +1210,6 @@ class GenericIE(InfoExtractor):
                        'uploader':     video_uploader,
                        'upload_date':  u'NA',
                        'title':        video_title,
-                       'stitle':       simple_title,
                        'ext':          video_extension.decode('utf-8'),
                        'format':       u'NA',
                        'player_url':   None,
@@ -1708,7 +1674,6 @@ class DepositFilesIE(InfoExtractor):
                        'uploader':     u'NA',
                        'upload_date':  u'NA',
                        'title':        file_title,
-                       'stitle':       file_title,
                        'ext':          file_extension.decode('utf-8'),
                        'format':       u'NA',
                        'player_url':   None,
@@ -1853,9 +1818,6 @@ class FacebookIE(InfoExtractor):
                        return
                video_title = video_info['title']
                video_title = video_title.decode('utf-8')
-               video_title = sanitize_title(video_title)
-
-               simple_title = simplify_title(video_title)
 
                # thumbnail image
                if 'thumbnail' not in video_info:
@@ -1916,7 +1878,6 @@ class FacebookIE(InfoExtractor):
                                'uploader':     video_uploader.decode('utf-8'),
                                'upload_date':  upload_date,
                                'title':        video_title,
-                               'stitle':       simple_title,
                                'ext':          video_extension.decode('utf-8'),
                                'format':       (format_param is None and u'NA' or format_param.decode('utf-8')),
                                'thumbnail':    video_thumbnail.decode('utf-8'),
@@ -1966,7 +1927,6 @@ class BlipTVIE(InfoExtractor):
                                        'id': title,
                                        'url': url,
                                        'title': title,
-                                       'stitle': simplify_title(title),
                                        'ext': ext,
                                        'urlhandle': urlh
                                }
@@ -1986,21 +1946,20 @@ class BlipTVIE(InfoExtractor):
                                        data = json_data['Post']
                                else:
                                        data = json_data
-       
+
                                upload_date = datetime.datetime.strptime(data['datestamp'], '%m-%d-%y %H:%M%p').strftime('%Y%m%d')
                                video_url = data['media']['url']
                                umobj = re.match(self._URL_EXT, video_url)
                                if umobj is None:
                                        raise ValueError('Can not determine filename extension')
                                ext = umobj.group(1)
-       
+
                                info = {
                                        'id': data['item_id'],
                                        'url': video_url,
                                        'uploader': data['display_name'],
                                        'upload_date': upload_date,
                                        'title': data['title'],
-                                       'stitle': simplify_title(data['title']),
                                        'ext': ext,
                                        'format': data['media']['mimeType'],
                                        'thumbnail': data['thumbnailUrl'],
@@ -2062,9 +2021,6 @@ class MyVideoIE(InfoExtractor):
                        return
 
                video_title = mobj.group(1)
-               video_title = sanitize_title(video_title)
-
-               simple_title = simplify_title(video_title)
 
                return [{
                        'id':           video_id,
@@ -2072,7 +2028,6 @@ class MyVideoIE(InfoExtractor):
                        'uploader':     u'NA',
                        'upload_date':  u'NA',
                        'title':        video_title,
-                       'stitle':       simple_title,
                        'ext':          u'flv',
                        'format':       u'NA',
                        'player_url':   None,
@@ -2086,7 +2041,7 @@ class ComedyCentralIE(InfoExtractor):
 
        def report_extraction(self, episode_id):
                self._downloader.to_screen(u'[comedycentral] %s: Extracting information' % episode_id)
-       
+
        def report_config_download(self, episode_id):
                self._downloader.to_screen(u'[comedycentral] %s: Downloading configuration' % episode_id)
 
@@ -2199,7 +2154,6 @@ class ComedyCentralIE(InfoExtractor):
                                'uploader': showId,
                                'upload_date': officialDate,
                                'title': effTitle,
-                               'stitle': simplify_title(effTitle),
                                'ext': 'mp4',
                                'format': format,
                                'thumbnail': None,
@@ -2273,7 +2227,6 @@ class EscapistIE(InfoExtractor):
                        'uploader': showName,
                        'upload_date': None,
                        'title': showName,
-                       'stitle': simplify_title(showName),
                        'ext': 'flv',
                        'format': 'flv',
                        'thumbnail': imgUrl,
@@ -2337,7 +2290,6 @@ class CollegeHumorIE(InfoExtractor):
                        videoNode = mdoc.findall('./video')[0]
                        info['description'] = videoNode.findall('./description')[0].text
                        info['title'] = videoNode.findall('./caption')[0].text
-                       info['stitle'] = simplify_title(info['title'])
                        info['url'] = videoNode.findall('./file')[0].text
                        info['thumbnail'] = videoNode.findall('./thumbnail')[0].text
                        info['ext'] = info['url'].rpartition('.')[2]
@@ -2411,7 +2363,6 @@ class XVideosIE(InfoExtractor):
                        'uploader': None,
                        'upload_date': None,
                        'title': video_title,
-                       'stitle': simplify_title(video_title),
                        'ext': 'flv',
                        'format': 'flv',
                        'thumbnail': video_thumbnail,
@@ -2455,7 +2406,7 @@ class SoundcloudIE(InfoExtractor):
                uploader = mobj.group(1).decode('utf-8')
                # extract simple title (uploader + slug of song title)
                slug_title =  mobj.group(2).decode('utf-8')
-               simple_title = uploader + '-' + slug_title
+               simple_title = uploader + u'-' + slug_title
 
                self.report_webpage('%s/%s' % (uploader, slug_title))
 
@@ -2477,7 +2428,9 @@ class SoundcloudIE(InfoExtractor):
                # extract unsimplified title
                mobj = re.search('"title":"(.*?)",', webpage)
                if mobj:
-                       title = mobj.group(1)
+                       title = mobj.group(1).decode('utf-8')
+               else:
+                       title = simple_title
 
                # construct media url (with uid/token)
                mediaURL = "http://media.soundcloud.com/stream/%s?stream_token=%s"
@@ -2506,8 +2459,7 @@ class SoundcloudIE(InfoExtractor):
                        'url':          mediaURL,
                        'uploader':     uploader.decode('utf-8'),
                        'upload_date':  upload_date,
-                       'title':        simple_title.decode('utf-8'),
-                       'stitle':       simple_title.decode('utf-8'),
+                       'title':        title,
                        'ext':          u'mp3',
                        'format':       u'NA',
                        'player_url':   None,
@@ -2577,7 +2529,6 @@ class InfoQIE(InfoExtractor):
                        'uploader': None,
                        'upload_date': None,
                        'title': video_title,
-                       'stitle': simplify_title(video_title),
                        'ext': extension,
                        'format': extension, # Extension is always(?) mp4, but seems to be flv
                        'thumbnail': None,
@@ -2614,7 +2565,6 @@ class MixcloudIE(InfoExtractor):
                        url_list = jsonData[fmt][bitrate]
                except TypeError: # we have no bitrate info.
                        url_list = jsonData[fmt]
-                               
                return url_list
 
        def check_urls(self, url_list):
@@ -2694,7 +2644,6 @@ class MixcloudIE(InfoExtractor):
                        'uploader':     uploader.decode('utf-8'),
                        'upload_date': u'NA',
                        'title': json_data['name'],
-                       'stitle': simplify_title(json_data['name']),
                        'ext': file_url.split('.')[-1].decode('utf-8'),
                        'format': (format_param is None and u'NA' or format_param.decode('utf-8')),
                        'thumbnail': json_data['thumbnail_url'],
@@ -2726,9 +2675,9 @@ class StanfordOpenClassroomIE(InfoExtractor):
                        course = mobj.group('course')
                        video = mobj.group('video')
                        info = {
-                               'id': simplify_title(course + '_' + video),
+                               'id': course + '_' + video,
                        }
-       
+
                        self.report_extraction(info['id'])
                        baseUrl = 'http://openclassroom.stanford.edu/MainFolder/courses/' + course + '/videos/'
                        xmlUrl = baseUrl + video + '.xml'
@@ -2744,14 +2693,13 @@ class StanfordOpenClassroomIE(InfoExtractor):
                        except IndexError:
                                self._downloader.trouble(u'\nERROR: Invalid metadata XML file')
                                return
-                       info['stitle'] = simplify_title(info['title'])
                        info['ext'] = info['url'].rpartition('.')[2]
                        info['format'] = info['ext']
                        return [info]
                elif mobj.group('course'): # A course page
                        course = mobj.group('course')
                        info = {
-                               'id': simplify_title(course),
+                               'id': course,
                                'type': 'playlist',
                        }
 
@@ -2767,7 +2715,6 @@ class StanfordOpenClassroomIE(InfoExtractor):
                                info['title'] = unescapeHTML(m.group(1))
                        else:
                                info['title'] = info['id']
-                       info['stitle'] = simplify_title(info['title'])
 
                        m = re.search('<description>([^<]+)</description>', coursepage)
                        if m:
@@ -2801,7 +2748,6 @@ class StanfordOpenClassroomIE(InfoExtractor):
                                return
 
                        info['title'] = info['id']
-                       info['stitle'] = simplify_title(info['title'])
 
                        links = orderedSet(re.findall('<a href="(CoursePage.php\?[^"]+)">', rootpage))
                        info['list'] = [
@@ -2900,7 +2846,6 @@ class MTVIE(InfoExtractor):
                        'url': video_url,
                        'uploader': performer,
                        'title': video_title,
-                       'stitle': simplify_title(video_title),
                        'ext': ext,
                        'format': format,
                }