Compare commits

..

No commits in common. "565999e58ae1c01ef3ac5040725f2f324d22ac8f" and "087cb24bb2101c3dcb08b394df28b734b940eb8f" have entirely different histories.

View File

@ -269,6 +269,7 @@ class WgetFD(ExternalFD):
class Aria2cFD(ExternalFD): class Aria2cFD(ExternalFD):
AVAILABLE_OPT = '-v' AVAILABLE_OPT = '-v'
SUPPORTED_PROTOCOLS = ('http', 'https', 'ftp', 'ftps', 'dash_frag_urls', 'm3u8_frag_urls') SUPPORTED_PROTOCOLS = ('http', 'https', 'ftp', 'ftps', 'dash_frag_urls', 'm3u8_frag_urls')
_CAPTURE_STDERR = False
@staticmethod @staticmethod
def supports_manifest(manifest): def supports_manifest(manifest):
@ -293,7 +294,9 @@ class Aria2cFD(ExternalFD):
return super()._call_downloader(tmpfilename, info_dict) return super()._call_downloader(tmpfilename, info_dict)
def _make_cmd(self, tmpfilename, info_dict): def _make_cmd(self, tmpfilename, info_dict):
cmd = [self.exe, '--no-conf', '--auto-save-interval=10', cmd = [self.exe, '--no-conf', '--stderr=true',
'--auto-save-interval=10', '--allow-overwrite=true', '--always-resume=false',
'--auto-file-renaming=false', '--force-save=false',
'--console-log-level=warn', '--summary-interval=0', '--download-result=hide', '--console-log-level=warn', '--summary-interval=0', '--download-result=hide',
'--http-accept-gzip=true', '--file-allocation=none', '-x16', '-j16', '-s16'] '--http-accept-gzip=true', '--file-allocation=none', '-x16', '-j16', '-s16']
if 'fragments' in info_dict: if 'fragments' in info_dict:
@ -314,11 +317,6 @@ class Aria2cFD(ExternalFD):
cmd += self._bool_option('--show-console-readout', 'noprogress', 'false', 'true', '=') cmd += self._bool_option('--show-console-readout', 'noprogress', 'false', 'true', '=')
cmd += self._bool_option('--remove-control-file', 'continuedl', 'false', 'true', '=') cmd += self._bool_option('--remove-control-file', 'continuedl', 'false', 'true', '=')
cmd += self._configuration_args() cmd += self._configuration_args()
# do not allow changing these flags
cmd += ['--allow-overwrite=true']
cmd += ['--always-resume=false']
cmd += ['--auto-file-renaming=false']
cmd += ['--force-save=false']
if '__rpc' in info_dict: if '__rpc' in info_dict:
cmd += [ cmd += [