1
0
mirror of https://github.com/mon/ifstools.git synced 2024-11-27 18:40:48 +01:00

Proper _super_ support

This commit is contained in:
Will Toohey 2018-02-12 22:53:51 +00:00
parent 471e825c61
commit 2b847d08d7
4 changed files with 24 additions and 16 deletions

View File

@ -1,2 +1,3 @@
from .ifstools import main
from .ifs import IFS
from .handlers import GenericFolder, GenericFile

View File

@ -1,5 +1,5 @@
from itertools import chain
from os.path import getmtime, basename, join
from os.path import getmtime, basename, dirname, join, realpath
from collections import OrderedDict
import lxml.etree as etree
@ -9,14 +9,14 @@ from .Node import Node
class GenericFolder(Node):
def __init__(self, ifs_data, obj, parent = None, path = '', name = '', has_super = False):
def __init__(self, ifs_data, obj, parent = None, path = '', name = '', supers = None):
# circular dependencies mean we import here
from . import AfpFolder, TexFolder
self.folder_handlers = {
'afp' : AfpFolder,
'tex' : TexFolder,
}
self.has_super = has_super
self.supers = supers if supers else []
Node.__init__(self, ifs_data, obj, parent, path, name)
file_handler = GenericFile
@ -27,22 +27,29 @@ class GenericFolder(Node):
self.files = OrderedDict()
self.folders = {}
my_path = dirname(realpath(self.ifs_data.file.name))
# muh circular deps
from ..ifs import IFS
for child in element.iterchildren(tag=etree.Element):
filename = Node.fix_name(child.tag)
if filename == '_info_': # metadata
continue
elif filename == '_super_':
self.has_super = True
# folder: has children or timestamp only
elif list(child) or len(child.text.split(' ')) == 1:
# note: files with 'super' references have 'i' tags as backrefs
# We just ignore these
if self.has_super and child[0].tag == 'i':
continue
elif filename == '_super_': # sub-reference
self.supers.append(IFS(join(my_path, child.text)).data_blob)
# folder: has children or timestamp only, and isn't a reference
elif (list(child) or len(child.text.split(' ')) == 1) and child[0].tag != 'i':
handler = self.folder_handlers.get(filename, GenericFolder)
self.folders[filename] = handler(self.ifs_data, child, self, self.full_path, filename, self.has_super)
self.folders[filename] = handler(self.ifs_data, child, self, self.full_path, filename, self.supers)
else: # file
self.files[filename] = self.file_handler(self.ifs_data, child, self, self.full_path, filename)
if list(child) and child[0].tag == 'i':
# backref
super_ref = int(child[0].text)
if super_ref > len(self.supers):
raise IOError('IFS references super-IFS {} but we only have {}'.format(super_ref, len(self.supers)))
self.files[filename].ifs_data = self.supers[super_ref - 1]
if not self.full_path: # root
self.tree_complete()

View File

@ -6,8 +6,8 @@ from . import GenericFolder
class MD5Folder(GenericFolder):
def __init__(self, ifs_data, parent, obj, path = '', name = '', has_super = False, md5_tag = None, extension = None):
GenericFolder.__init__(self, ifs_data, parent, obj, path, name, has_super)
def __init__(self, ifs_data, parent, obj, path = '', name = '', supers = None, md5_tag = None, extension = None):
GenericFolder.__init__(self, ifs_data, parent, obj, path, name, supers)
self.md5_tag = md5_tag if md5_tag else self.name
self.extension = extension

View File

@ -13,8 +13,8 @@ class TextureList(GenericFile):
return k.to_binary()
class TexFolder(MD5Folder):
def __init__(self, ifs_data, obj, parent = None, path = '', name = '', has_super = False):
MD5Folder.__init__(self, ifs_data, obj, parent, path, name, has_super, 'image', '.png')
def __init__(self, ifs_data, obj, parent = None, path = '', name = '', supers = None):
MD5Folder.__init__(self, ifs_data, obj, parent, path, name, supers, 'image', '.png')
def tree_complete(self):
MD5Folder.tree_complete(self)