pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-11-05 18:08:00 +09:00
Code Issues Projects Releases Wiki Activity

Always determine youtube description

Browse Source
This commit is contained in:
Philipp Hagemeister 2012-02-27 20:19:03 +01:00
parent c4105fa035
commit ff3a2b8eab
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
youtube_dl/__init__.py
View File

@ -901,7 +901,7 @@ class FileDownloader(object):
# possible. This is part of rtmpdump's normal usage, AFAIK. # 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] 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)] args = basic_args + [[], ['-e', '-k', '1']][self.params.get('continuedl', False)]
if self.params['verbose']: if self.params.get('verbose', False):
try: try:
import pipes import pipes
shell_quote = lambda args: ' '.join(map(pipes.quote, args)) shell_quote = lambda args: ' '.join(map(pipes.quote, args))
@ -1381,10 +1381,9 @@ class YoutubeIE(InfoExtractor):
lxml.etree lxml.etree
except NameError: except NameError:
video_description = u'No description available.' 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="(.*?)">', video_webpage)
mobj = re.search(r'<meta name="description" content="(.*)"(?:\s*/)?>', video_webpage) if mobj is not None:
if mobj is not None: video_description = mobj.group(1).decode('utf-8')
video_description = mobj.group(1).decode('utf-8')
else: else:
html_parser = lxml.etree.HTMLParser(encoding='utf-8') html_parser = lxml.etree.HTMLParser(encoding='utf-8')
vwebpage_doc = lxml.etree.parse(StringIO.StringIO(video_webpage), html_parser) vwebpage_doc = lxml.etree.parse(StringIO.StringIO(video_webpage), html_parser)