Recursively remove private keys from infojson

Related: https://github.com/yt-dlp/yt-dlp/issues/42

1 files changed, 10 insertions, 5 deletions

diff --git a/yt_dlp/YoutubeDL.py b/yt_dlp/YoutubeDL.py
index 5cfd830e2..7a5ad6d0e 100644
--- a/yt_dlp/YoutubeDL.py
+++ b/yt_dlp/YoutubeDL.py
@@ -1199,7 +1199,6 @@ class YoutubeDL(object):
                 else:
                     playlist_info = dict(ie_result)
                     # playlist_info['entries'] = list(playlist_info['entries'])  # Entries is a generator which shouldnot be resolved here
-                    del playlist_info['entries']
                     self.to_screen('[info] Writing playlist metadata as JSON to: ' + infofn)
                     try:
                         write_json_file(self.filter_requested_info(playlist_info), infofn)
@@ -2528,10 +2527,16 @@ class YoutubeDL(object):
 
     @staticmethod
     def filter_requested_info(info_dict):
-        fields_to_remove = ('requested_formats', 'requested_subtitles')
-        return dict(
-            (k, v) for k, v in info_dict.items()
-            if (k[0] != '_' or k == '_type') and k not in fields_to_remove)
+        exceptions = {
+            'remove': ['requested_formats', 'requested_subtitles', '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: (
+                list(map(filter_fn, obj)) if isinstance(obj, (list, tuple))
+                else obj if not isinstance(obj, dict)
+                else dict((k, filter_fn(v)) for k, v in obj.items() if keep_key(k)))
+        return filter_fn(info_dict)
 
     def run_pp(self, pp, infodict):
         files_to_delete = []