release 2012.02.27

pull/250/merge 2012.02.27
Philipp Hagemeister 13 years ago
parent ff3a2b8eab
commit 9c228928b6

@ -1 +1 @@
2012.02.26 2012.02.27

@ -18,7 +18,7 @@ __authors__ = (
) )
__license__ = 'Public Domain' __license__ = 'Public Domain'
__version__ = '2012.02.26' __version__ = '2012.02.27'
UPDATE_URL = 'https://raw.github.com/rg3/youtube-dl/master/youtube-dl' 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. # 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,8 +1381,7 @@ 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:

@ -18,7 +18,7 @@ __authors__ = (
) )
__license__ = 'Public Domain' __license__ = 'Public Domain'
__version__ = '2012.02.26' __version__ = '2012.02.27'
UPDATE_URL = 'https://raw.github.com/rg3/youtube-dl/master/youtube-dl' UPDATE_URL = 'https://raw.github.com/rg3/youtube-dl/master/youtube-dl'

Loading…
Cancel
Save