WIP: Use FileInfo.get_masters() where possible

Note: This relies on the cosaves rework, specifically the 'cosaves.py -
beta' commit and the 'correct save masters' commit.

Much easier to find the definition and search usages for than the
previous '.header.masters' code, which is now only used where necessary.
Will also allow us to be much more flexible in the future if masters
become more complex than that.

Obviously touches a ton of places, so WIP, but it shouldn't have any
functional impacts.

Author: Infernio

Mopy/bash/basher/mod_links.py

@@ -114,7 +114,7 @@ def Execute(self):
         to_refresh = []
         # creates esp files - so place them correctly after the last esm
         previous_master = bosh.modInfos.cached_lo_last_esm()
-        for master in self._selected_info.header.masters:
+        for master in self._selected_info.get_masters():
             if master in bosh.modInfos:
                 continue
             # Missing master, create a dummy plugin for it
@@ -713,7 +713,7 @@ def Execute(self):
             loOrder =  lambda tup: load_order.cached_lo_index_or_max(tup[0])
             text_list = u''
             for mod, info in sorted(modInfos.items(), key=loOrder):
-                if self._selected_item in info.header.masters:
+                if self._selected_item in info.get_masters():
                     hexIndex = modInfos.hexIndexString(mod)
                     if hexIndex:
                         prefix = bul + hexIndex
@@ -985,7 +985,7 @@ def _Execute(self):
         delinquent = collections.defaultdict(list)
         for mod in load_order.cached_active_tuple():
             if mod == self._selected_item: break
-            for master in bosh.modInfos[mod].header.masters:
+            for master in bosh.modInfos[mod].get_masters():
                 if not load_order.cached_is_active(master):
                     missing[mod].append(master)
                 elif master not in previousMods:
@@ -1448,7 +1448,7 @@ def Execute(self):
                 return self._showError(_(
                     u"File must be selected from %s Data Files directory.")
                                        % bush.game.fsName)
-            if name in self._selected_info.header.masters:
+            if name in self._selected_info.get_masters():
                 return self._showError(_(u"%s is already a master!") % name.s)
             names.append(name)
         # actually do the modification
@@ -1681,7 +1681,7 @@ def _initData(self, window, selection,
                   __reEspExt=re.compile(ur'\.esp(.ghost)?$', re.I | re.U)):
         super(Mod_FlipMasters, self)._initData(window, selection)
         self._text = _(u'Esmify Masters')
-        masters = self._selected_info.header.masters
+        masters = self._selected_info.get_masters()
         enable = len(selection) == 1 and len(masters) > 1
         self.espMasters = [master for master in masters
             if __reEspExt.search(master.s)] if enable else []
@@ -2620,7 +2620,7 @@ def Execute(self):
                 return self._showError(_(
                     u"File must be selected from %s Data Files directory.")
                                        % bush.game.fsName)
-            if name in modInfo.header.masters:
+            if name in modInfo.get_masters():
                 return self._showError(
                     name.s + u' ' + _(u"is already a master."))
             names.append(name)

Mopy/bash/bosh/__init__.py

@@ -690,7 +690,7 @@ def hasActiveTimeConflict(self):
     def hasBadMasterNames(self):
         """True if has a master with un unencodable name in cp1252."""
         try:
-            for x in self.header.masters: x.s.encode('cp1252')
+            for x in self.get_masters(): x.s.encode('cp1252')
             return False
         except UnicodeEncodeError:
             return True
@@ -1026,7 +1026,7 @@ def write_masters(self):
         self.abs_path.untemp()
         #--Cosaves
         master_map = dict((x.s, y.s) for x, y in
-                          zip(oldMasters, self.header.masters) if x != y)
+                          zip(oldMasters, self.get_masters()) if x != y)
         if master_map:
             #--Pluggy cosave?
             if bush.game.has_standalone_pluggy:
@@ -2140,7 +2140,7 @@ def getModList(self,showCRC=False,showVersion=True,fileInfo=None,wtxt=False):
                 _(u'----> Delinquent MASTER: '),
                 u'**')
             if fileInfo:
-                masters = set(fileInfo.header.masters)
+                masters = set(fileInfo.get_masters())
                 missing = sorted([x for x in masters if x not in self])
                 log.setHeader(head+_(u'Missing Masters for %s: ') % fileInfo.name.s)
                 for mod in missing:
@@ -2175,7 +2175,7 @@ def getModList(self,showCRC=False,showVersion=True,fileInfo=None,wtxt=False):
                     text +=_(u'  [CRC: %s]') % (self[name].crc_string())
                 log(text)
                 if name in masters:
-                    for master2 in self[name].header.masters:
+                    for master2 in self[name].get_masters():
                         if master2 not in self:
                             log(sMissing+master2.s)
                         elif load_order.get_ordered((name, master2))[1] == master2:
@@ -2266,7 +2266,7 @@ def lo_activate(self, fileName, doSave=True, _modSet=None, _children=None,
             #  Disabled for now
             ##if self[fileName].hasBadMasterNames():
             ##    return
-            for master in self[fileName].header.masters:
+            for master in self[fileName].get_masters():
                 if master in _modSet: self.lo_activate(master, False, _modSet,
                                                        _children, _activated)
             #--Select in plugins
@@ -2293,7 +2293,7 @@ def lo_deactivate(self, fileName, doSave=True):
         def _children(parent):
             for selFile in sel:
                 if selFile in children: continue # if no more => no more in sel
-                for master in self[selFile].header.masters:
+                for master in self[selFile].get_masters():
                     if master == parent:
                         children.add(selFile)
                         break

Mopy/bash/bosh/_mergeability.py

@@ -112,7 +112,7 @@ def isPBashMergeable(modInfo, minfos, reasons):
                 break
     if newblocks: reasons.append(_(u'New record(s) in block(s): ')+u', '.join(sorted(newblocks))+u'.')
     dependent = [name.s for name, info in minfos.iteritems()
-                 if not info.isBP() and modInfo.name in info.header.masters]
+                 if not info.isBP() and modInfo.name in info.get_masters()]
     if dependent:
         if not verbose: return False
         reasons.append(_(u'Is a master of mod(s): ')+u', '.join(sorted(dependent))+u'.')
@@ -197,7 +197,7 @@ def _modIsMergeableLoad(modInfo, minfos, reasons):
                     reasons.append(_(u'New record(s) in block(s): %s.') % u', '.join(sorted(newblocks)))
         # dependent mods mergeability should be determined BEFORE their masters
         dependent = [name.s for name, info in minfos.iteritems() if
-                     not info.isBP() and modInfo.name in info.header.masters
+                     not info.isBP() and modInfo.name in info.get_masters()
                      and name not in minfos.mergeable]
         if dependent:
             if not verbose: return False

Mopy/bash/bosh/mods_metadata.py

@@ -515,7 +515,7 @@ def checkMods(self, showModList=False, showRuleSets=False, showNotes=False,
                 previousMods = set()
                 for mod in load_order.cached_active_tuple():
                     loggedMod = False
-                    for master in modInfos[mod].header.masters:
+                    for master in modInfos[mod].get_masters():
                         if master not in active:
                             label = _(u'MISSING')
                         elif master not in previousMods:

Mopy/bash/parsers.py

@@ -64,7 +64,7 @@ def __init__(self,aliases=None):
     def readFactionEids(self,modInfo):
         """Extracts faction editor ids from modInfo and its masters."""
         loadFactory = LoadFactory(False,MreRecord.type_class['FACT'])
-        for modName in (modInfo.header.masters + [modInfo.name]):
+        for modName in (modInfo.get_masters() + [modInfo.name]):
             if modName in self.gotFactions: continue
             modFile = ModFile(bosh.modInfos[modName],loadFactory)
             modFile.load(True)
@@ -304,7 +304,7 @@ def readFromMod(self,modInfo):
         """Imports actor level data from the specified mod and its masters."""
         mod_id_levels, gotLevels = self.mod_id_levels, self.gotLevels
         loadFactory = LoadFactory(False,MreRecord.type_class['NPC_'])
-        for modName in (modInfo.header.masters + [modInfo.name]):
+        for modName in (modInfo.get_masters() + [modInfo.name]):
             if modName in gotLevels: continue
             modFile = ModFile(bosh.modInfos[modName],loadFactory)
             modFile.load(True)
@@ -823,7 +823,7 @@ def __init__(self,aliases=None):
     def readFactionEids(self,modInfo):
         """Extracts faction editor ids from modInfo and its masters."""
         loadFactory = LoadFactory(False,MreRecord.type_class['FACT'])
-        for modName in (modInfo.header.masters + [modInfo.name]):
+        for modName in (modInfo.get_masters() + [modInfo.name]):
             if modName in self.gotFactions: continue
             modFile = ModFile(bosh.modInfos[modName],loadFactory)
             modFile.load(True)

Mopy/bash/patcher/patchers/importers.py

@@ -86,7 +86,7 @@ def initData(self, progress):
             if srcMod not in bosh.modInfos: continue
             srcInfo = bosh.modInfos[srcMod]
             srcFile = ModFile(srcInfo,loadFactory)
-            masters = srcInfo.header.masters
+            masters = srcInfo.get_masters()
             srcFile.load(True)
             srcFile.convertToLongFids(longTypes)
             mapper = srcFile.getLongMapper()
@@ -334,7 +334,7 @@ def checkMasterCellBlockData(cellBlock):
             srcFile.load(True)
             srcFile.convertToLongFids(('CELL','WRLD'))
             cachedMasters[srcMod] = srcFile
-            masters = srcInfo.header.masters
+            masters = srcInfo.get_masters()
             bashTags = srcInfo.getBashTags()
             # print bashTags
             tags = bashTags & set(self.recAttrs)
@@ -818,7 +818,7 @@ def initData(self,progress):
             if srcMod not in bosh.modInfos: continue
             srcInfo = bosh.modInfos[srcMod]
             srcFile = ModFile(srcInfo,loadFactory)
-            masters = srcInfo.header.masters
+            masters = srcInfo.get_masters()
             srcFile.load(True)
             srcFile.convertToLongFids(longTypes)
             mapper = srcFile.getLongMapper()
@@ -1077,7 +1077,7 @@ def initData(self,progress):
             if srcMod not in bosh.modInfos: continue
             srcInfo = bosh.modInfos[srcMod]
             srcFile = ModFile(srcInfo,loadFactory)
-            masters = srcInfo.header.masters
+            masters = srcInfo.get_masters()
             bashTags = srcInfo.getBashTags()
             srcFile.load(True)
             srcFile.convertToLongFids(longTypes)
@@ -1746,7 +1746,7 @@ def initPatchFile(self, patchFile):
         self.isActive = bool(self.srcs)
         self.masters = set()
         for srcMod in self.srcs:
-            self.masters |= set(bosh.modInfos[srcMod].header.masters)
+            self.masters |= set(bosh.modInfos[srcMod].get_masters())
         self.allMods = self.masters | set(self.srcs)
         self.mod_id_entries = {}
         self.touched = set()
@@ -1980,7 +1980,7 @@ def initData(self,progress):
             if srcMod not in bosh.modInfos: continue
             srcInfo = bosh.modInfos[srcMod]
             srcFile = ModFile(srcInfo,loadFactory)
-            masters = srcInfo.header.masters
+            masters = srcInfo.get_masters()
             bashTags = srcInfo.getBashTags()
             srcFile.load(True)
             srcFile.convertToLongFids(longTypes)
@@ -2370,7 +2370,7 @@ def initData(self,progress):
             temp_faceData = {}
             faceInfo = bosh.modInfos[faceMod]
             faceFile = ModFile(faceInfo,loadFactory)
-            masters = faceInfo.header.masters
+            masters = faceInfo.get_masters()
             bashTags = faceInfo.getBashTags()
             faceFile.load(True)
             faceFile.convertToLongFids(('NPC_',))
@@ -3049,7 +3049,7 @@ def initData(self,progress):
             if srcMod not in bosh.modInfos: continue
             srcInfo = bosh.modInfos[srcMod]
             srcFile = ModFile(srcInfo,loadFactory)
-            masters = srcInfo.header.masters
+            masters = srcInfo.get_masters()
             srcFile.load(True)
             srcFile.convertToLongFids(longTypes)
             mapper = srcFile.getLongMapper()

Mopy/bash/patcher/patchers/races_multitweaks.py

@@ -721,7 +721,7 @@ def initData(self,progress):
             srcInfo = bosh.modInfos[srcMod]
             srcFile = ModFile(srcInfo,loadFactory)
             srcFile.load(True)
-            masters = srcInfo.header.masters
+            masters = srcInfo.get_masters()
             bashTags = srcInfo.getBashTags()
             if 'RACE' not in srcFile.tops: continue
             srcFile.convertToLongFids(('RACE',))

Mopy/bash/patcher/patchers/special.py

@@ -126,7 +126,7 @@ def scanModFile(self, modFile, progress):
                              leveler in self.patchFile.allSet]
             self.delevMasters = set()
             for leveler in self.levelers:
-                self.delevMasters.update(bosh.modInfos[leveler].header.masters)
+                self.delevMasters.update(bosh.modInfos[leveler].get_masters())
         #--Begin regular scan
         modName = modFile.fileInfo.name
         modFile.convertToLongFids(self.listTypes)
@@ -536,7 +536,7 @@ def scanModFile(self, modFile, progress):
                              leveler in self.patchFile.allSet]
             self.deflstMasters = set()
             for leveler in self.levelers:
-                self.deflstMasters.update(bosh.modInfos[leveler].header.masters)
+                self.deflstMasters.update(bosh.modInfos[leveler].get_masters())
         #--Begin regular scan
         modName = modFile.fileInfo.name
         modFile.convertToLongFids(self.listTypes)