File tree Expand file tree Collapse file tree 1 file changed +7
-7
lines changed
Expand file tree Collapse file tree 1 file changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -57,10 +57,14 @@ def _load(self, fn: str) -> Detail:
5757 """Low-level function to load metadata from specific file"""
5858 try :
5959 with open (fn , "r" ) as f :
60- return json .load (f )
60+ loaded = json .load (f )
6161 except ValueError :
6262 with open (fn , "rb" ) as f :
63- return pickle .load (f )
63+ loaded = pickle .load (f )
64+ for c in loaded .values ():
65+ if isinstance (c .get ("blocks" ), list ):
66+ c ["blocks" ] = set (c ["blocks" ])
67+ return loaded
6468
6569 def _save (self , metadata_to_save : Detail , fn : str ) -> None :
6670 """Low-level function to save metadata to specific file"""
@@ -152,11 +156,7 @@ def load(self) -> None:
152156 for fn , _ , _ in self ._scan_locations ():
153157 if os .path .exists (fn ):
154158 # TODO: consolidate blocks here
155- loaded_cached_files = self ._load (fn )
156- for c in loaded_cached_files .values ():
157- if isinstance (c ["blocks" ], list ):
158- c ["blocks" ] = set (c ["blocks" ])
159- cached_files .append (loaded_cached_files )
159+ cached_files .append (self ._load (fn ))
160160 else :
161161 cached_files .append ({})
162162 self .cached_files = cached_files or [{}]
You can’t perform that action at this time.
0 commit comments