diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2012-02-27 20:19:03 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2012-02-27 20:19:03 +0100 |
| commit | ff3a2b8eab9064e553de29b3110ef8dd845b639d (patch) | |
| tree | 837f2ac9836ce0b2675aa51e35ad888967a272f3 /youtube_dl/__init__.py | |
| parent | c4105fa035a5c7c4d9aebc4a27822b1839961b7f (diff) | |
Always determine youtube description
Diffstat (limited to 'youtube_dl/__init__.py')
| -rwxr-xr-x | youtube_dl/__init__.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 9de8ca270..a91a379f8 100755 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -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) |