|
|
@ -28,14 +28,14 @@ class HlsFD(FileDownloader):
|
|
|
|
if check_executable(program, ['-version']):
|
|
|
|
if check_executable(program, ['-version']):
|
|
|
|
break
|
|
|
|
break
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
self.report_error(u'm3u8 download detected but ffmpeg or avconv could not be found. Please install one.')
|
|
|
|
self.report_error('m3u8 download detected but ffmpeg or avconv could not be found. Please install one.')
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
cmd = [program] + args
|
|
|
|
cmd = [program] + args
|
|
|
|
|
|
|
|
|
|
|
|
retval = subprocess.call(cmd)
|
|
|
|
retval = subprocess.call(cmd)
|
|
|
|
if retval == 0:
|
|
|
|
if retval == 0:
|
|
|
|
fsize = os.path.getsize(encodeFilename(tmpfilename))
|
|
|
|
fsize = os.path.getsize(encodeFilename(tmpfilename))
|
|
|
|
self.to_screen(u'\r[%s] %s bytes' % (cmd[0], fsize))
|
|
|
|
self.to_screen('\r[%s] %s bytes' % (cmd[0], fsize))
|
|
|
|
self.try_rename(tmpfilename, filename)
|
|
|
|
self.try_rename(tmpfilename, filename)
|
|
|
|
self._hook_progress({
|
|
|
|
self._hook_progress({
|
|
|
|
'downloaded_bytes': fsize,
|
|
|
|
'downloaded_bytes': fsize,
|
|
|
@ -45,8 +45,8 @@ class HlsFD(FileDownloader):
|
|
|
|
})
|
|
|
|
})
|
|
|
|
return True
|
|
|
|
return True
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
self.to_stderr(u"\n")
|
|
|
|
self.to_stderr('\n')
|
|
|
|
self.report_error(u'%s exited with code %d' % (program, retval))
|
|
|
|
self.report_error('%s exited with code %d' % (program, retval))
|
|
|
|
return False
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|