1212class Environment :
1313 files : dict
1414 path : str
15-
15+
1616 def __init__ (self , * args ):
1717 self .files = {}
1818 self .path = "."
19-
19+
2020 if args :
2121 for arg in args :
2222 if isinstance (arg , str ):
@@ -31,44 +31,51 @@ def __init__(self, *args):
3131 self .load_folder (arg )
3232 else :
3333 self .path = None
34- self .files [str (len (self .files ))] = self .load_file (stream = arg )
35-
34+ self .files [str (len (self .files ))
35+ ] = self .load_file (stream = arg )
36+
3637 if len (self .files ) == 1 :
3738 self .file = list (self .files .values ())[0 ]
38-
39+
3940 def load_files (self , files : list ):
4041 """Loads all files (list) into the AssetsManager and merges .split files for common usage."""
4142 # ImportHelper.merge_split_assets(path)
4243 # to_read_file = ImportHelper.processing_split_files(files)
4344 self .load (files )
44-
45+
4546 def load_folder (self , path : str ):
4647 """Loads all files in the given path and its subdirs into the AssetsManager."""
4748 ImportHelper .merge_split_assets (path , True )
4849 files = ImportHelper .list_all_files (path )
4950 to_read_file = ImportHelper .processing_split_files (files )
5051 self .load (to_read_file )
51-
52+
5253 def load (self , files : list ):
5354 """Loads all files into the AssetsManager."""
5455 for f in files :
55- self .files [f [len (self .path ):].lstrip ("/\\ " )] = self .load_file (open (f , "rb" ), self )
56-
56+ self .files [f [len (self .path ):].lstrip (
57+ "/\\ " )] = self .load_file (open (f , "rb" ), self )
58+
5759 def load_file (self , stream , parent = None ):
5860 if not parent :
5961 parent = self
6062 typ , reader = ImportHelper .check_file_type (stream )
61- if typ == FileType .AssetsFile :
62- return files .SerializedFile (reader , parent )
63- elif typ == FileType .BundleFile :
64- return files .BundleFile (reader , parent )
65- elif typ == FileType .WebFile :
66- return files .WebFile (reader , parent )
67- elif typ == FileType .ZIP :
68- self .load_zip_file (stream )
69- elif typ == FileType .ResourceFile :
63+ try :
64+ if typ == FileType .AssetsFile :
65+ return files .SerializedFile (reader , parent )
66+ elif typ == FileType .BundleFile :
67+ return files .BundleFile (reader , parent )
68+ elif typ == FileType .WebFile :
69+ return files .WebFile (reader , parent )
70+ elif typ == FileType .ZIP :
71+ self .load_zip_file (stream )
72+ elif typ == FileType .ResourceFile :
73+ return EndianBinaryReader (stream )
74+ except :
75+ # just to be sure
76+ # cuz the SerializedFile detection isn't perfect
7077 return EndianBinaryReader (stream )
71-
78+
7279 def load_zip_file (self , value ):
7380 buffer = None
7481 if isinstance (value , str ) and os .path .exists (value ):
@@ -77,7 +84,7 @@ def load_zip_file(self, value):
7784 buffer = ZipFile (io .BytesIO (value ))
7885 elif isinstance (value , (io .BufferedReader , io .BufferedIOBase )):
7986 buffer = value
80-
87+
8188 z = ZipFile (buffer )
8289 for path in z .namelist ():
8390 stream = z .open (path )
@@ -90,25 +97,26 @@ def load_zip_file(self, value):
9097 cur .files [d ] = files .File (self )
9198 cur = cur .files [d ]
9299 cur .files [name ] = self .load_file (stream , cur )
93-
100+ z .close ()
101+
94102 @property
95103 def objects (self ):
96104 def search (item ):
97105 ret = []
98106 if not isinstance (item , Environment ) and getattr (item , "objects" , None ):
99107 # serialized file
100108 return [val for val in item .objects .values ()]
101-
109+
102110 elif getattr (item , "files" , None ): # WebBundle and BundleFile
103111 # bundle
104112 for item in item .files .values ():
105113 ret .extend (search (item ))
106114 return ret
107-
115+
108116 return ret
109-
117+
110118 return search (self )
111-
119+
112120 @property
113121 def container (self ):
114122 return {
@@ -117,10 +125,10 @@ def container(self):
117125 if isinstance (f , File )
118126 for path , obj in f .container .items ()
119127 }
120-
128+
121129 @property
122130 def assets (self ):
123131 return self .files
124-
125- def get (self , key , default = None ):
132+
133+ def get (self , key , default = None ):
126134 return getattr (self , key , default )
0 commit comments