Cool_Tools/ifstools
1
0
Fork 0
mirror of https://github.com/mon/ifstools.git synced 2024-11-24 01:50:10 +01:00
Code Releases Activity

kwargs for nicer arg propagation

Browse Source
This commit is contained in:
Will Toohey 2018-04-22 18:07:48 +02:00
parent ac7ff78353
commit ee8ae3374c
5 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ifstools/handlers/GenericFile.py
View File

@ -15,7 +15,7 @@ class GenericFile(Node):
self.time = int(os.path.getmtime(self.disk_path))
self.start = self.size = None
def extract(self, base, use_cache = True):
def extract(self, base, **kwargs):
data = self.load()
path = os.path.join(base, self.full_path)
utils.save_with_timestamp(path, data, self.time)
@ -43,10 +43,10 @@ class GenericFile(Node):
def needs_preload(self):
return False
def preload(self, use_cache):
def preload(self, **kwargs):
pass
def repack(self, manifest, data_blob, tqdm_progress):
def repack(self, manifest, data_blob, tqdm_progress, **kwargs):
if tqdm_progress:
tqdm_progress.write(self.full_path)
tqdm_progress.update(1)

4
ifstools/handlers/GenericFolder.py
View File

@ -78,14 +78,14 @@ class GenericFolder(Node):
for f in self.files.values():
f.tree_complete()
def repack(self, manifest, data_blob, tqdm_progress):
def repack(self, manifest, data_blob, tqdm_progress, **kwargs):
if self.name:
manifest = etree.SubElement(manifest, self.packed_name)
manifest.attrib['__type'] = 's32'
manifest.text = str(self.time)
for name, entry in chain(self.folders.items(), self.files.items()):
entry.repack(manifest, data_blob, tqdm_progress)
entry.repack(manifest, data_blob, tqdm_progress, **kwargs)
@property
def all_files(self):

8
ifstools/handlers/ImageFile.py
View File

@ -32,8 +32,8 @@ class ImageFile(GenericFile):
(self.imgrect[3]-self.imgrect[2])//2
)
def extract(self, base, use_cache = True):
GenericFile.extract(self, base)
def extract(self, base, use_cache = True, **kwargs):
GenericFile.extract(self, base, **kwargs)
if use_cache and self.compress and self.from_ifs and self.format in cachable_formats:
self.write_cache(GenericFile._load_from_ifs(self), base)
@ -64,7 +64,7 @@ class ImageFile(GenericFile):
im.save(b, format = 'PNG')
return b.getvalue()
def repack(self, manifest, data_blob, tqdm_progress):
def repack(self, manifest, data_blob, tqdm_progress, **kwargs):
if tqdm_progress:
tqdm_progress.write(self.full_path)
tqdm_progress.update(1)
@ -111,7 +111,7 @@ class ImageFile(GenericFile):
return False
return True
def preload(self, use_cache):
def preload(self, use_cache = True, tex_suffix = None, **kwargs):
if not self.needs_preload and use_cache:
return
# Not cached/out of date, compressing

38
ifstools/ifs.py
View File

@ -20,15 +20,13 @@ FILE_VERSION = 3
# must be toplevel or can't be pickled
def _extract(args):
f = args[0]
path = args[1]
f.extract(path)
f, path, kwargs = args
f.extract(path, **kwargs)
return f.full_path
def _load(args):
f = args[0]
use_cache = args[1]
f.preload(use_cache)
f, kwargs = args
f.preload(**kwargs)
return f.full_path
class FileBlob(object):
@ -128,12 +126,14 @@ class IFS:
def __str__(self):
return str(self.tree)
def extract(self, progress = True, use_cache = True, recurse = True,
tex_only = False, extract_manifest = False, path = None):
def extract(self, progress = True, recurse = True, tex_only = False,
extract_manifest = False, path = None, **kwargs):
if path is None:
path = self.folder_out
if tex_only and 'tex' not in self.tree.folders:
return
if tex_only:
kwargs['use_cache'] = False
if 'tex' not in self.tree.folders:
return
utils.mkdir_silent(path)
utime(path, (self.time, self.time))
@ -153,14 +153,14 @@ class IFS:
for f in tqdm(self.tree.all_files):
if tex_only and not isinstance(f, ImageFile):
continue
f.extract(path, use_cache)
f.extract(path, **kwargs)
if progress:
tqdm.write(f.full_path)
if recurse and f.name.endswith('.ifs'):
rpath = join(path, f.full_path)
i = IFS(rpath)
i.extract(progress=progress, use_cache=use_cache, recurse=recurse,
tex_only=tex_only, extract_manifest=extract_manifest, path=rpath.replace('.ifs','_ifs'))
i.extract(progress=progress, recurse=recurse, tex_only=tex_only,
extract_manifest=extract_manifest, path=rpath.replace('.ifs','_ifs'), **kwargs)
''' Todo: reimplement this since we're using file objects now
'''
@ -172,7 +172,7 @@ class IFS:
if progress:
tqdm.write(f)'''
def repack(self, progress = True, use_cache = True, path = None):
def repack(self, progress = True, path = None, **kwargs):
if path is None:
path = self.ifs_out
# open first in case path is bad
@ -184,7 +184,7 @@ class IFS:
manifest_info = etree.SubElement(self.manifest.xml_doc, '_info_')
# the important bit
data = self._repack_tree(progress, use_cache)
data = self._repack_tree(progress, **kwargs)
data_md5 = etree.SubElement(manifest_info, 'md5')
data_md5.attrib['__type'] = 'bin'
@ -220,7 +220,7 @@ class IFS:
ifs_file.close()
def _repack_tree(self, progress = True, use_cache = True):
def _repack_tree(self, progress = True, **kwargs):
folders = self.tree.all_folders
files = self.tree.all_files
@ -231,8 +231,8 @@ class IFS:
kbin_backup.append(folder.info_kbin)
folder.info_kbin = None
needs_preload = (f for f in files if f.needs_preload or not use_cache)
args = list(zip(needs_preload, itertools.cycle((use_cache,))))
needs_preload = (f for f in files if f.needs_preload or not kwargs['use_cache'])
args = list(zip(needs_preload, itertools.cycle((kwargs,))))
p = Pool()
for f in tqdm(p.imap_unordered(_load, args), desc='Caching', total=len(args), disable = not progress):
if progress:
@ -246,6 +246,6 @@ class IFS:
tqdm_progress = None
if progress:
tqdm_progress = tqdm(desc='Writing', total=len(files))
self.tree.repack(self.manifest.xml_doc, self.data_blob, tqdm_progress)
self.tree.repack(self.manifest.xml_doc, self.data_blob, tqdm_progress, **kwargs)
return self.data_blob.getvalue()

6
ifstools/ifstools.py
View File

@ -25,14 +25,12 @@ def get_choice(prompt):
def extract(i, args, path):
if args.progress:
print('Extracting...')
i.extract(progress = args.progress, use_cache = args.use_cache,
recurse = args.recurse, tex_only = args.tex_only, path = path,
extract_manifest = args.extract_manifest)
i.extract(path=path, **vars(args))
def repack(i, args, path):
if args.progress:
print('Repacking...')
i.repack(progress = args.progress, use_cache = args.use_cache, path = path)
i.repack(path=path, **vars(args))
def main():
multiprocessing.freeze_support() # pyinstaller