Upstream/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-16 06:08:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Philipp Hagemeister 2014-08-28 01:01:04 +02:00
commit 27f774862d
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
youtube_dl/downloader/hls.py
View File

@ -3,6 +3,7 @@ import subprocess
from .common import FileDownloader from .common import FileDownloader
from ..utils import ( from ..utils import (
check_executable,
encodeFilename, encodeFilename,
) )
@ -19,13 +20,11 @@ class HlsFD(FileDownloader):
encodeFilename(tmpfilename, for_subprocess=True)] encodeFilename(tmpfilename, for_subprocess=True)]
for program in ['avconv', 'ffmpeg']: for program in ['avconv', 'ffmpeg']:
try: if check_executable(program, ['-version']):
subprocess.call([program, '-version'], stdout=(open(os.path.devnull, 'w')), stderr=subprocess.STDOUT)
break break
except (OSError, IOError):
pass
else: else:
self.report_error(u'm3u8 download detected but ffmpeg or avconv could not be found. Please install one.') self.report_error(u'm3u8 download detected but ffmpeg or avconv could not be found. Please install one.')
return False
cmd = [program] + args cmd = [program] + args
retval = subprocess.call(cmd) retval = subprocess.call(cmd)
@ -42,5 +41,5 @@ class HlsFD(FileDownloader):
return True return True
else: else:
self.to_stderr(u"\n") self.to_stderr(u"\n")
self.report_error(u'ffmpeg exited with code %d' % retval) self.report_error(u'%s exited with code %d' % (program, retval))
return False return False

7
youtube_dl/downloader/rtmp.py
View File

@ -8,9 +8,10 @@ import time
from .common import FileDownloader from .common import FileDownloader
from ..utils import ( from ..utils import (
check_executable,
compat_str,
encodeFilename, encodeFilename,
format_bytes, format_bytes,
compat_str,
) )
@ -103,9 +104,7 @@ class RtmpFD(FileDownloader):
test = self.params.get('test', False) test = self.params.get('test', False)
# Check for rtmpdump first # Check for rtmpdump first
try: if not check_executable('rtmpdump', ['-h']):
subprocess.call(['rtmpdump', '-h'], stdout=(open(os.path.devnull, 'w')), stderr=subprocess.STDOUT)
except (OSError, IOError):
self.report_error('RTMP download detected but "rtmpdump" could not be run. Please install it.') self.report_error('RTMP download detected but "rtmpdump" could not be run. Please install it.')
return False return False

2
youtube_dl/extractor/cbs.py
View File

@ -25,7 +25,7 @@ class CBSIE(InfoExtractor):
}, { }, {
'url': 'http://www.cbs.com/shows/liveonletterman/artist/221752/st-vincent/', 'url': 'http://www.cbs.com/shows/liveonletterman/artist/221752/st-vincent/',
'info_dict': { 'info_dict': {
'id': 'P9gjWjelt6iP', 'id': 'WWF_5KqY3PK1',
'ext': 'flv', 'ext': 'flv',
'title': 'Live on Letterman - St. Vincent', 'title': 'Live on Letterman - St. Vincent',
'description': 'Live On Letterman: St. Vincent in concert from New York\'s Ed Sullivan Theater on Tuesday, July 16, 2014.', 'description': 'Live On Letterman: St. Vincent in concert from New York\'s Ed Sullivan Theater on Tuesday, July 16, 2014.',

3
youtube_dl/extractor/yahoo.py
View File

@ -71,7 +71,8 @@ class YahooIE(InfoExtractor):
if items_json is None: if items_json is None:
CONTENT_ID_REGEXES = [ CONTENT_ID_REGEXES = [
r'YUI\.namespace\("Media"\)\.CONTENT_ID\s*=\s*"([^"]+)"', r'YUI\.namespace\("Media"\)\.CONTENT_ID\s*=\s*"([^"]+)"',
r'root\.App\.Cache\.context\.videoCache\.curVideo = \{"([^"]+)"' r'root\.App\.Cache\.context\.videoCache\.curVideo = \{"([^"]+)"',
r'"first_videoid"\s*:\s*"([^"]+)"',
] ]
long_id = self._search_regex(CONTENT_ID_REGEXES, webpage, 'content ID') long_id = self._search_regex(CONTENT_ID_REGEXES, webpage, 'content ID')
video_id = long_id video_id = long_id