Common code of Dial in brec - untested could use some more refatoring

Chopped off a couple stray tabs

Author: Utumno

Mopy/bash/brec.py

@@ -1685,7 +1685,6 @@ def updateMasters(self,masters):
 
 #------------------------------------------------------------------------------
 #-- Common Records
-
 #------------------------------------------------------------------------------
 class MreHeaderBase(MelRecord):
     """File header.  Base class for all 'TES4' like records"""
@@ -1873,6 +1872,59 @@ def mergeWith(self,other,otherMod):
         #--Done
         self.setChanged(self.mergeOverLast)
 
+class MreDial(MelRecord):
+    """Dialog record."""
+    classType = 'DIAL'
+    __slots__ = []
+
+    def __init__(self, header, ins=None, do_unpack=False):
+        """Initialize."""
+        MelRecord.__init__(self, header, ins, do_unpack)
+        self.infoStamp = 0 #--Stamp for info GRUP
+        self.infoStamp2 = 0 #--Stamp for info GRUP
+        self.infos = []
+
+    def loadInfos(self,ins,endPos,infoClass):
+        """Load infos from ins. Called from MobDials."""
+        infos = self.infos
+        recHead = ins.unpackRecHeader
+        infosAppend = infos.append
+        while not ins.atEnd(endPos,'INFO Block'):
+            #--Get record info and handle it
+            header = recHead()
+            recType = header[0]
+            if recType == 'INFO':
+                info = infoClass(header,ins,True)
+                infosAppend(info)
+            else:
+                raise exception.ModError(ins.inName,
+                  _(u'Unexpected %s record in %s group.') % (recType, "INFO"))
+
+    def dump(self,out):
+        """Dumps self., then group header and then records."""
+        MreRecord.dump(self,out)
+        if not self.infos: return
+        # Magic number '24': size of game's record header - override for Oblivion
+        # Magic format '4sIIIII': format for game's GRUP record - override for Oblivion
+        dial_size = 24 + sum([24 + info.getSize() for info in self.infos])
+        out.pack('4sIIIII', 'GRUP', dial_size, self.fid, 7, self.infoStamp,
+                 self.infoStamp2)
+        for info in self.infos: info.dump(out)
+
+    def updateMasters(self,masters):
+        """Updates set of master names according to masters actually used."""
+        MelRecord.updateMasters(self,masters)
+        for info in self.infos:
+            info.updateMasters(masters)
+
+    def convertFids(self,mapper,toLong):
+        """Converts fids between formats according to mapper.
+        toLong should be True if converting to long format or False if
+        converting to short format."""
+        MelRecord.convertFids(self,mapper,toLong)
+        for info in self.infos:
+            info.convertFids(mapper,toLong)
+
 #------------------------------------------------------------------------------
 # Skyrim and Fallout ----------------------------------------------------------
 #------------------------------------------------------------------------------

Mopy/bash/game/fallout3/records.py

@@ -33,8 +33,8 @@
 from ...bolt import Flags, DataDict, GPath, struct_unpack, struct_pack
 from ...brec import MelRecord, MelStructs, MelObject, MelGroups, MelStruct, \
     FID, MelGroup, MelString, MelSet, MelFid, MelNull, MelOptStruct, MelFids, \
-    MreHeaderBase, MelBase, MelUnicode, MelFidList, MelStructA, MreRecord, \
-    MreGmstBase, MelStrings, MelFull0, MelTuple, MelMODS, MreHasEffects
+    MreHeaderBase, MelBase, MelUnicode, MelFidList, MelStructA, MreGmstBase, \
+    MelStrings, MelFull0, MelTuple, MelMODS, MreHasEffects
 from ...exception import BoltError, ModError, ModSizeError, StateError
 # Set MelModel in brec but only if unset
 if brec.MelModel is None:
@@ -1252,9 +1252,8 @@ def dumpData(self,record,out):
     __slots__ = melSet.getSlotsUsed()
 
 #------------------------------------------------------------------------------
-class MreDial(MelRecord):
+class MreDial(brec.MreDial):
     """Dialog record."""
-    classType = 'DIAL'
     _flags = Flags(0,Flags.getNames('rumors','toplevel',))
     class MelDialData(MelStruct):
         """Handle older truncated DATA for DIAL subrecord."""
@@ -1284,53 +1283,6 @@ def loadData(self, record, ins, sub_type, size_, readId):
     )
     __slots__ = melSet.getSlotsUsed() + ['infoStamp', 'infoStamp2', 'infos']
 
-    def __init__(self, header, ins=None, do_unpack=False):
-        """Initialize."""
-        MelRecord.__init__(self, header, ins, do_unpack)
-        self.infoStamp = 0 #--Stamp for info GRUP
-        self.infoStamp2 = 0 #--Stamp for info GRUP
-        self.infos = []
-
-    def loadInfos(self,ins,endPos,infoClass):
-        """Load infos from ins. Called from MobDials."""
-        infos = self.infos
-        recHead = ins.unpackRecHeader
-        infosAppend = infos.append
-        while not ins.atEnd(endPos,'INFO Block'):
-            #--Get record info and handle it
-            header = recHead()
-            recType = header[0]
-            if recType == 'INFO':
-                info = infoClass(header,ins,True)
-                infosAppend(info)
-            else:
-                raise ModError(ins.inName, _('Unexpected %s record in %s group.')
-                    % (recType,"INFO"))
-
-    def dump(self,out):
-        """Dumps self., then group header and then records."""
-        MreRecord.dump(self,out)
-        if not self.infos: return
-        # Magic number '24': size of Fallout 3's record header
-        # Magic format '4sIIIII': format for Fallout 3's GRUP record
-        dial_size = 24 + sum([24 + info.getSize() for info in self.infos])
-        out.pack('4sIIIII', 'GRUP', dial_size, self.fid, 7, self.infoStamp,
-                 self.infoStamp2)
-        for info in self.infos: info.dump(out)
-
-    def updateMasters(self,masters):
-        """Updates set of master names according to masters actually used."""
-        MelRecord.updateMasters(self,masters)
-        for info in self.infos:
-            info.updateMasters(masters)
-
-    def convertFids(self,mapper,toLong):
-        """Converts fids between formats according to mapper.
-        toLong should be True if converting to long format or False if converting to short format."""
-        MelRecord.convertFids(self,mapper,toLong)
-        for info in self.infos:
-            info.convertFids(mapper,toLong)
-
 #------------------------------------------------------------------------------
 class MreDobj(MelRecord):
     """Default object manager record."""

Mopy/bash/game/falloutnv/records.py

@@ -32,8 +32,8 @@
 from ...brec import MelModel # set in Mopy/bash/game/fallout3/records.py
 from ...brec import MelRecord, MelStructs, MelGroups, MelStruct, FID, \
     MelGroup, MelString, MelSet, MelFid, MelNull, MelOptStruct, MelFids, \
-    MelBase, MelFidList, MelStructA, MreRecord, MreGmstBase, MelFull0, \
-    MreHeaderBase, MelUnicode
+    MelBase, MelFidList, MelStructA, MreGmstBase, MelFull0, MreHeaderBase, \
+    MelUnicode, MreDial
 from ...exception import ModError, ModSizeError
 
 # Those are unused here, but need be in this file as are accessed via it
@@ -719,9 +719,8 @@ class MreDehy(MelRecord):
     __slots__ = melSet.getSlotsUsed()
 
 #------------------------------------------------------------------------------
-class MreDial(MelRecord):
+class MreDial(MreDial):
     """Dialog record."""
-    classType = 'DIAL'
     _flags = Flags(0,Flags.getNames('rumors','toplevel',))
     class MelDialData(MelStruct):
         """Handle older truncated DATA for DIAL subrecord."""
@@ -786,53 +785,6 @@ def loadData(self, record, ins, sub_type, size_, readId):
 
     __slots__ = melSet.getSlotsUsed() + ['infoStamp', 'infoStamp2', 'infos']
 
-    def __init__(self, header, ins=None, do_unpack=False):
-        """Initialize."""
-        MelRecord.__init__(self, header, ins, do_unpack)
-        self.infoStamp = 0 #--Stamp for info GRUP
-        self.infoStamp2 = 0 #--Stamp for info GRUP
-        self.infos = []
-
-    def loadInfos(self,ins,endPos,infoClass):
-        """Load infos from ins. Called from MobDials."""
-        infos = self.infos
-        recHead = ins.unpackRecHeader
-        infosAppend = infos.append
-        while not ins.atEnd(endPos,'INFO Block'):
-            #--Get record info and handle it
-            header = recHead()
-            recType = header[0]
-            if recType == 'INFO':
-                info = infoClass(header,ins,True)
-                infosAppend(info)
-            else:
-                raise ModError(ins.inName, _('Unexpected %s record in %s group.')
-                    % (recType,"INFO"))
-
-    def dump(self,out):
-        """Dumps self., then group header and then records."""
-        MreRecord.dump(self,out)
-        if not self.infos: return
-        # Magic number '24': size of Fallout New Vegas's record header
-        # Magic format '4sIIIII': format for Fallout New Vegas's GRUP record
-        dial_size = 24 + sum([24 + info.getSize() for info in self.infos])
-        out.pack('4sIIIII', 'GRUP', dial_size, self.fid, 7, self.infoStamp,
-                 self.infoStamp2)
-        for info in self.infos: info.dump(out)
-
-    def updateMasters(self,masters):
-        """Updates set of master names according to masters actually used."""
-        MelRecord.updateMasters(self,masters)
-        for info in self.infos:
-            info.updateMasters(masters)
-
-    def convertFids(self,mapper,toLong):
-        """Converts fids between formats according to mapper.
-        toLong should be True if converting to long format or False if converting to short format."""
-        MelRecord.convertFids(self,mapper,toLong)
-        for info in self.infos:
-            info.convertFids(mapper,toLong)
-
 #------------------------------------------------------------------------------
 class MreDobj(MelRecord):
     """Default object manager record."""

Mopy/bash/game/oblivion/records.py

@@ -785,9 +785,8 @@ def loadData(self, record, ins, sub_type, size_, readId):
         )
     __slots__ = melSet.getSlotsUsed()
 
-class MreDial(MelRecord):
+class MreDial(brec.MreDial):
     """Dialog record."""
-    classType = 'DIAL'
     melSet = MelSet(
         MelString('EDID','eid'),
         MelFids('QSTI','quests'), ### QSTRs?
@@ -828,20 +827,6 @@ def dump(self,out):
         out.pack('4sIIII', 'GRUP', dial_size, self.fid, 7, self.infoStamp)
         for info in self.infos: info.dump(out)
 
-    def updateMasters(self,masters):
-        """Updates set of master names according to masters actually used."""
-        MelRecord.updateMasters(self,masters)
-        for info in self.infos:
-            info.updateMasters(masters)
-
-    def convertFids(self,mapper,toLong):
-        """Converts fids between formats according to mapper.
-        toLong should be True if converting to long format or False if
-        converting to short format."""
-        MelRecord.convertFids(self,mapper,toLong)
-        for info in self.infos:
-            info.convertFids(mapper,toLong)
-
 class MreDoor(MelRecord):
     """Container record."""
     classType = 'DOOR'

Mopy/bash/game/skyrim/records.py

@@ -175,8 +175,8 @@ def __init__(self):
 #------------------------------------------------------------------------------
 class MelCoed(MelOptStruct):
     """Needs custom unpacker to look at FormID type of owner.  If owner is an
-	NPC then it is followed by a FormID.  If owner is a faction then it is
-	followed by an signed integer or '=Iif' instead of '=IIf' """ # see #282
+    NPC then it is followed by a FormID.  If owner is a faction then it is
+    followed by an signed integer or '=Iif' instead of '=IIf' """ # see #282
     def __init__(self):
         MelOptStruct.__init__(self,'COED','=IIf',(FID,'owner'),(FID,'glob'),
                               'itemCondition')
@@ -2144,9 +2144,8 @@ def dumpData(self,record,out):
 
 # Verified for 305
 #------------------------------------------------------------------------------
-class MreDial(MelRecord):
+class MreDial(brec.MreDial):
     """Dialogue Records"""
-    classType = 'DIAL'
 
     # DATA has wbEnum in TES5Edit
     # Assigned to 'subtype' for WB
@@ -2182,53 +2181,6 @@ class MreDial(MelRecord):
         )
     __slots__ = melSet.getSlotsUsed() + ['infoStamp','infoStamp2','infos']
 
-    def __init__(self, header, ins=None, do_unpack=False):
-        """Initialize."""
-        MelRecord.__init__(self, header, ins, do_unpack)
-        self.infoStamp = 0 #--Stamp for info GRUP
-        self.infoStamp2 = 0 #--Stamp for info GRUP
-        self.infos = []
-
-    def loadInfos(self,ins,endPos,infoClass):
-        """Load infos from ins. Called from MobDials."""
-        infos = self.infos
-        recHead = ins.unpackRecHeader
-        infosAppend = infos.append
-        while not ins.atEnd(endPos,'INFO Block'):
-            #--Get record info and handle it
-            header = recHead()
-            recType = header[0]
-            if recType == 'INFO':
-                info = infoClass(header,ins,True)
-                infosAppend(info)
-            else:
-                raise ModError(ins.inName, _('Unexpected %s record in %s group.')
-                    % (recType,"INFO"))
-
-    def dump(self,out):
-        """Dumps self., then group header and then records."""
-        MreRecord.dump(self,out)
-        if not self.infos: return
-        # Magic number '24': size of Skyrim's record header
-        # Magic format '4sIIIII': format for Skyrim's GRUP record
-        dial_size = 24 + sum([24 + info.getSize() for info in self.infos])
-        out.pack('4sIIIII', 'GRUP', dial_size, self.fid, 7, self.infoStamp,
-                 self.infoStamp2)
-        for info in self.infos: info.dump(out)
-
-    def updateMasters(self,masters):
-        """Updates set of master names according to masters actually used."""
-        MelRecord.updateMasters(self,masters)
-        for info in self.infos:
-            info.updateMasters(masters)
-
-    def convertFids(self,mapper,toLong):
-        """Converts fids between formats according to mapper.
-        toLong should be True if converting to long format or False if converting to short format."""
-        MelRecord.convertFids(self,mapper,toLong)
-        for info in self.infos:
-            info.convertFids(mapper,toLong)
-
 # Verified for 305
 #------------------------------------------------------------------------------
 class MreDlbr(MelRecord):