PyTouhou: pytouhou/resource/loader.py comparison

Remove AnmWrapper, since ANMs are lists of entries now.

author	Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date	Sat, 03 Aug 2013 15:49:04 +0200
parents	40d5f3083ebc
children	69c73023f7a0

comparison

equal deleted inserted replaced

-:40d5f3083ebc
+:c9433188ffdb
 from pytouhou.formats.msg import MSG
 from pytouhou.formats.sht import SHT
 from pytouhou.formats.exe import SHT as EoSDSHT, InvalidExeException
 from pytouhou.formats.music import Track
 from pytouhou.formats.fmt import FMT
-from pytouhou.resource.anmwrapper import AnmWrapper
 from pytouhou.utils.helpers import get_logger
 logger = get_logger(__name__)
 def get_fmt(self, name):
 file = self.get_file(name)
 return FMT.read(file) #TODO: modular
-def get_anm_wrapper(self, names, offsets=None):
+def get_single_anm(self, name):
-"""Create an AnmWrapper for ANM files “names”.
+"""Hack for EoSD, since it doesn’t support multi-entries ANMs."""
+anm = self.get_anm(name)
-If one of the files “names” does not exist or is not a valid ANM file,
+assert len(anm) == 1
-raises an exception.
+return anm[0]
-"""
-return AnmWrapper((self.get_anm(name) for name in names), offsets)
-def get_anm_wrapper2(self, names, offsets=None):
+def get_multi_anm(self, names):
-"""Create an AnmWrapper for ANM files “names”.
+"""Hack for EoSD, since it doesn’t support multi-entries ANMs."""
+return sum((self.get_anm(name) for name in names), [])
-Stop at the first non-existent or invalid ANM file if there is one,
-and return an AnmWrapper for all the previous correct files.
-"""
-anms = []
-try:
-for name in names:
-anms.append(self.get_anm(name))
-except KeyError:
-pass
-return AnmWrapper(anms, offsets)

Mercurial > touhou