Remove None values from info.json

This commit is contained in:
pukkandan 2021-05-28 21:45:06 +05:30
parent 077c476276
commit ae8f99e648
No known key found for this signature in database
GPG Key ID: 0F00D95A001F4698

View File

@ -2777,19 +2777,20 @@ def download_with_info_file(self, info_filename):
@staticmethod @staticmethod
def filter_requested_info(info_dict, actually_filter=True): def filter_requested_info(info_dict, actually_filter=True):
info_dict.pop('__original_infodict', None) # Always remove this remove_keys = ['__original_infodict'] # Always remove this since this may contain a copy of the entire dict
if not actually_filter: keep_keys = ['_type'], # Always keep this to facilitate load-info-json
if actually_filter:
remove_keys += ('requested_formats', 'requested_subtitles', 'requested_entries', 'filepath', 'entries')
empty_values = (None, {}, [], set(), tuple())
reject = lambda k, v: k not in keep_keys and (
k.startswith('_') or k in remove_keys or v in empty_values)
else:
info_dict['epoch'] = int(time.time()) info_dict['epoch'] = int(time.time())
return info_dict reject = lambda k, v: k in remove_keys
exceptions = {
'remove': ['requested_formats', 'requested_subtitles', 'requested_entries', 'filepath', 'entries'],
'keep': ['_type'],
}
keep_key = lambda k: k in exceptions['keep'] or not (k.startswith('_') or k in exceptions['remove'])
filter_fn = lambda obj: ( filter_fn = lambda obj: (
list(map(filter_fn, obj)) if isinstance(obj, (list, tuple)) list(map(filter_fn, obj)) if isinstance(obj, (list, tuple, set))
else obj if not isinstance(obj, dict) else obj if not isinstance(obj, dict)
else dict((k, filter_fn(v)) for k, v in obj.items() if keep_key(k))) else dict((k, filter_fn(v)) for k, v in obj.items() if not reject(k, v)))
return filter_fn(info_dict) return filter_fn(info_dict)
def run_pp(self, pp, infodict): def run_pp(self, pp, infodict):