This commit is contained in:
Abdulmohsen 2024-11-18 15:31:40 +05:30 committed by GitHub
commit 1846c86e06
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -3606,13 +3606,10 @@ def download(self, url_list):
return self._download_retcode return self._download_retcode
def download_with_info_file(self, info_filename): def download_with_info(self, *info_list):
with contextlib.closing(fileinput.FileInput( """Download using already extracted info_dicts."""
[info_filename], mode='r', infos = [self.sanitize_info(info, self.params.get('clean_infojson', True))
openhook=fileinput.hook_encoded('utf-8'))) as f: for info in info_list]
# FileInput doesn't have a read method, we can't call json.load
infos = [self.sanitize_info(info, self.params.get('clean_infojson', True))
for info in variadic(json.loads('\n'.join(f)))]
for info in infos: for info in infos:
try: try:
self.__download_wrapper(self.process_ie_result)(info, download=True) self.__download_wrapper(self.process_ie_result)(info, download=True)
@ -3628,6 +3625,15 @@ def download_with_info_file(self, info_filename):
self.report_error(e) self.report_error(e)
return self._download_retcode return self._download_retcode
def download_with_info_file(self, info_filename):
"""Download using an info file."""
with contextlib.closing(fileinput.FileInput(
[info_filename], mode='r',
openhook=fileinput.hook_encoded('utf-8'))) as f:
# FileInput doesn't have a read method, we can't call json.load
infos = [info for info in variadic(json.loads('\n'.join(f)))]
return self.download_with_info(infos)
@staticmethod @staticmethod
def sanitize_info(info_dict, remove_private_keys=False): def sanitize_info(info_dict, remove_private_keys=False):
""" Sanitize the infodict for converting to json """ """ Sanitize the infodict for converting to json """