diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2011-07-18 19:43:21 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2011-07-18 19:43:21 +0200 |
| commit | 91e6a3855b4d76cefe7415ea9a1bafd98ad6bece (patch) | |
| tree | ba576fd66ecfbefd9ccb5aa1bb492949512b3784 | |
| parent | 5623100e43b12413790c4017eafb3412e29e517f (diff) | |
Be lenient about download URLs (Closes #108)
| -rwxr-xr-x | youtube-dl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/youtube-dl b/youtube-dl index 762bfc3ef..07904604c 100755 --- a/youtube-dl +++ b/youtube-dl @@ -62,7 +62,7 @@ simple_title_chars = string.ascii_letters.decode('ascii') + string.digits.decode try: import json -except ImportError: # Python <2.5, use trivialjson (https://github.com/phihag/trivialjson): +except ImportError: # Python <2.6, use trivialjson (https://github.com/phihag/trivialjson): import re class json(object): @staticmethod @@ -1241,6 +1241,7 @@ class YoutubeIE(InfoExtractor): html_parser = lxml.etree.HTMLParser(encoding='utf-8') vwebpage_doc = lxml.etree.parse(StringIO.StringIO(video_webpage), html_parser) video_description = u''.join(vwebpage_doc.xpath('id("eow-description")//text()')) + # TODO use another parser # token video_token = urllib.unquote_plus(video_info['token'][0]) @@ -1248,7 +1249,7 @@ class YoutubeIE(InfoExtractor): # Decide which formats to download req_format = self._downloader.params.get('format', None) - if 'fmt_url_map' in video_info and len(video_info['fmt_url_map']) >= 1 and ',' in video_info['fmt_url_map'][0]: + if 'fmt_url_map' in video_info and len(video_info['fmt_url_map']) >= 1: url_map = dict(tuple(pair.split('|')) for pair in video_info['fmt_url_map'][0].split(',')) format_limit = self._downloader.params.get('format_limit', None) if format_limit is not None and format_limit in self._available_formats: |