diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2012-02-27 20:19:28 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2012-02-27 20:19:28 +0100 |
| commit | 9c228928b6a636ff4ed294e170e3de36d9bb45c5 (patch) | |
| tree | 575cb29a35e2d4a57f03858a25cc9fc263fb58a5 | |
| parent | ff3a2b8eab9064e553de29b3110ef8dd845b639d (diff) | |
| download | youtube-dl-9c228928b6a636ff4ed294e170e3de36d9bb45c5.tar.gz youtube-dl-9c228928b6a636ff4ed294e170e3de36d9bb45c5.tar.xz youtube-dl-9c228928b6a636ff4ed294e170e3de36d9bb45c5.zip | |
release 2012.02.27 2012.02.27
| -rw-r--r-- | LATEST_VERSION | 2 | ||||
| -rwxr-xr-x | youtube-dl | 11 | ||||
| -rwxr-xr-x | youtube_dl/__init__.py | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/LATEST_VERSION b/LATEST_VERSION index c89802cb7..0c8dc502a 100644 --- a/LATEST_VERSION +++ b/LATEST_VERSION @@ -1 +1 @@ -2012.02.26 +2012.02.27 diff --git a/youtube-dl b/youtube-dl index 9de8ca270..789724041 100755 --- a/youtube-dl +++ b/youtube-dl @@ -18,7 +18,7 @@ __authors__ = ( ) __license__ = 'Public Domain' -__version__ = '2012.02.26' +__version__ = '2012.02.27' UPDATE_URL = 'https://raw.github.com/rg3/youtube-dl/master/youtube-dl' @@ -901,7 +901,7 @@ class FileDownloader(object): # possible. This is part of rtmpdump's normal usage, AFAIK. basic_args = ['rtmpdump', '-q'] + [[], ['-W', player_url]][player_url is not None] + ['-r', url, '-o', tmpfilename] args = basic_args + [[], ['-e', '-k', '1']][self.params.get('continuedl', False)] - if self.params['verbose']: + if self.params.get('verbose', False): try: import pipes shell_quote = lambda args: ' '.join(map(pipes.quote, args)) @@ -1381,10 +1381,9 @@ class YoutubeIE(InfoExtractor): lxml.etree except NameError: video_description = u'No description available.' - if self._downloader.params.get('forcedescription', False) or self._downloader.params.get('writedescription', False): - mobj = re.search(r'<meta name="description" content="(.*)"(?:\s*/)?>', video_webpage) - if mobj is not None: - video_description = mobj.group(1).decode('utf-8') + mobj = re.search(r'<meta name="description" content="(.*?)">', video_webpage) + if mobj is not None: + video_description = mobj.group(1).decode('utf-8') else: html_parser = lxml.etree.HTMLParser(encoding='utf-8') vwebpage_doc = lxml.etree.parse(StringIO.StringIO(video_webpage), html_parser) diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index a91a379f8..789724041 100755 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -18,7 +18,7 @@ __authors__ = ( ) __license__ = 'Public Domain' -__version__ = '2012.02.26' +__version__ = '2012.02.27' UPDATE_URL = 'https://raw.github.com/rg3/youtube-dl/master/youtube-dl' |