WIP Counter SSS

Took the opportunity to unnamespace the defaultdict - those classes are
builtin status (plus wraps better)

Author: Utumno

Mopy/bash/game/oblivion/patcher/special.py

@@ -21,9 +21,9 @@
 #  https://github.com/wrye-bash
 #
 # =============================================================================
-import collections
 import os
 import re
+from collections import Counter, defaultdict
 from ....bolt import GPath, sio, SubProgress, CsvReader
 from ....patcher import getPatchesPath
 from ....parsers import LoadFactory, ModFile
@@ -142,7 +142,7 @@ def getBook(objectId,eid,full,value,iconPath,modelPath,modb_p):
                     buffWrite(u'\r\n')
                 book.text = re.sub(u'\r\n',u'<br>\r\n',buff.getvalue())
         #--Get Ingredients by Effect
-        effect_ingred = collections.defaultdict(list)
+        effect_ingred = defaultdict(list)
         for fid,(eid,full,effects) in id_ingred.iteritems():
             for index,(mgef,actorValue) in enumerate(effects):
                 effectName = mgef_name[mgef]
@@ -184,7 +184,7 @@ def initPatchFile(self, patchFile):
         if not self.isActive: return
         patchFile.indexMGEFs = True
         self.id_ingred = {}
-        self.effect_ingred = collections.defaultdict(list)
+        self.effect_ingred = defaultdict(list)
         self.SEFF = MGEFCode('SEFF')
         self.DebugPrintOnce = 0
 
@@ -287,7 +287,7 @@ def getBook(patchFile, objectId):
                     buff.write(u'\r\n')
                 book.text = re.sub(u'\r\n',u'<br>\r\n',buff.getvalue())
         #--Get Ingredients by Effect
-        effect_ingred = self.effect_ingred = collections.defaultdict(list)
+        effect_ingred = self.effect_ingred = defaultdict(list)
         for fid,(eid,full,effects_list) in id_ingred.iteritems():
             for index,effect in enumerate(effects_list):
                 mgef, actorValue = effect[0], effect[5]
@@ -353,7 +353,7 @@ def buildPatchLog(self, log):
         if not self.isActive: return
         #--Log
         self._pLog(log, self.mod_count)
-        self.mod_count = collections.defaultdict(int)
+        self.mod_count = Counter()
 
 class _ACoblExhaustion(SpecialPatcher):
     """Modifies most Greater power to work with Cobl's power exhaustion
@@ -432,7 +432,7 @@ def scanModFile(self,modFile,progress):
     def buildPatch(self,log,progress):
         """Edits patch file as desired. Will write to log."""
         if not self.isActive: return
-        count = {}
+        count = Counter()
         exhaustId = (self.cobl,0x05139B)
         keep = self.patchFile.getKeeper()
         for record in self.patchFile.SPEL.records:
@@ -461,8 +461,7 @@ def buildPatch(self,log,progress):
             effect.scriptEffect = scriptEffect
             record.effects.append(effect)
             keep(record.fid)
-            srcMod = record.fid[0]
-            count[srcMod] = count.get(srcMod,0) + 1
+            count[record.fid[0]] += 1
         #--Log
         self._pLog(log, count)
 
@@ -622,7 +621,7 @@ def buildPatch(self,log,progress):
         id_info = self.id_info
         modFile = self.patchFile
         keep = self.patchFile.getKeeper()
-        changed = collections.defaultdict(int)
+        changed = Counter()
         mFactable = []
         for record in modFile.FACT.getActiveRecords():
             if record.fid not in id_info: continue
@@ -648,8 +647,7 @@ def buildPatch(self,log,progress):
                         rank.insigniaPath = \
                             u'Menus\\Stats\\Cobl\\generic%02d.dds' % rank.rank
                 keep(record.fid)
-                mod = record.fid[0]
-                changed[mod] += 1
+                changed[record.fid[0]] += 1
         #--MFact record
         record = modFile.FACT.getRecord(mFactLong)
         if record:
@@ -847,7 +845,7 @@ def initPatchFile(self, patchFile):
         self.cyrodiilQuests = set()
         self.srcs = [GPath(u'Oblivion.esm')]
         self.isActive = self.srcs[0] in patchFile.loadSet
-        self.mod_eids = collections.defaultdict(list)
+        self.mod_eids = defaultdict(list)
 
     def getTypes(self):
         return ['QUST']
@@ -890,7 +888,7 @@ def buildPatchLog(self,log):
             log(u'* %s: %d' % (mod.s, len(eids)))
             for eid in sorted(eids):
                 log(u'  * %s' % eid)
-        self.mod_eids = collections.defaultdict(list)
+        self.mod_eids = defaultdict(list)
 
 # Alchemical Catalogs ---------------------------------------------------------
 _ingred_alchem = (

Mopy/bash/patcher/patchers/base.py

@@ -23,7 +23,7 @@
 # =============================================================================
 
 """This module contains base patcher classes."""
-import collections
+from collections import Counter
 from operator import itemgetter
 # Internal
 from .. import getPatchesPath
@@ -45,7 +45,7 @@ def initPatchFile(self, patchFile):
         super(CBash_ListPatcher, self).initPatchFile(patchFile)
         # used in all subclasses except CBash_RacePatcher,
         # CBash_PatchMerger, CBash_UpdateReferences
-        self.mod_count = collections.defaultdict(int)
+        self.mod_count = Counter()
 
     #--Patch Phase ------------------------------------------------------------
     def getConfigChecked(self):
@@ -94,7 +94,7 @@ def __init__(self, label, tweak_tip, key, *choices, **kwargs):
         super(CBash_MultiTweakItem, self).__init__(label, tweak_tip, key,
                                                    *choices, **kwargs)
         # extra CBash_MultiTweakItem attribute, mod -> num of tweaked records
-        self.mod_count = collections.defaultdict(int)
+        self.mod_count = Counter()
 
     #--Patch Phase ------------------------------------------------------------
     def getTypes(self):
@@ -107,7 +107,7 @@ def getTypes(self):
     def buildPatchLog(self,log):
         """Will write to log."""
         self._patchLog(log, self.mod_count)
-        self.mod_count = collections.defaultdict(int)
+        self.mod_count = Counter()
 
 class MultiTweaker(AMultiTweaker,Patcher):
 
@@ -286,7 +286,7 @@ def buildPatch(self,log,progress):
         if not self.isActive: return
         old_new,old_eid,new_eid = self.old_new,self.old_eid,self.new_eid
         keep = self.patchFile.getKeeper()
-        count = collections.defaultdict(int)
+        count = Counter()
         def swapper(oldId):
             newId = old_new.get(oldId,None)
             return newId if newId else oldId
@@ -531,7 +531,7 @@ def _clog(self,log):
         log(self.__class__.logMsg % sum(mod_count.values()))
         for srcMod in load_order.get_ordered(mod_count.keys()):
             log(u'  * %s: %d' % (srcMod.s,mod_count[srcMod]))
-        self.mod_count = collections.defaultdict(int)
+        self.mod_count = Counter()
 
     # helpers WIP
     def _parse_texts(self, parser_class, progress):

Mopy/bash/patcher/patchers/importers.py

@@ -23,8 +23,8 @@
 # =============================================================================
 
 """This module contains the oblivion importer patcher classes."""
-import collections
 import re
+from collections import defaultdict, Counter
 from itertools import chain
 from operator import attrgetter
 # Internal
@@ -50,7 +50,7 @@ class _SimpleImporter(ImportPatcher):
     def initPatchFile(self, patchFile):
         super(_SimpleImporter, self).initPatchFile(patchFile)
         #--(attribute-> value) dicts keyed by long fid.
-        self.id_data = collections.defaultdict(dict)
+        self.id_data = defaultdict(dict)
         self.srcClasses = set() #--Record classes actually provided by src
         # mods/files.
         self.classestemp = set()
@@ -195,7 +195,7 @@ def buildPatch(self, log, progress, types=None):
         if not self.isActive: return
         modFileTops = self.patchFile.tops
         keep = self.patchFile.getKeeper()
-        type_count = collections.defaultdict(int)
+        type_count = Counter()
         types = filter(modFileTops.__contains__, types if types else map(
             attrgetter('classType'), self.srcClasses))
         for top_mod_rec in types:
@@ -213,9 +213,8 @@ class _RecTypeModLogging(CBash_ImportPatcher):
 
     def initPatchFile(self, patchFile):
         super(_RecTypeModLogging, self).initPatchFile(patchFile)
-        self.mod_count = collections.defaultdict(
-            lambda: collections.defaultdict(int))
-        self.fid_attr_value = collections.defaultdict(dict) # used in some
+        self.mod_count = defaultdict(Counter)
+        self.fid_attr_value = defaultdict(dict) # used in some
 
     def _clog(self, log):
         """Used in: CBash_SoundPatcher, CBash_ImportScripts,
@@ -235,8 +234,7 @@ def _clog(self, log):
                               'count': sum(mod_count[group_type].values())})
             for srcMod in load_order.get_ordered(mod_count[group_type].keys()):
                 log(u'  * %s: %d' % (srcMod.s, mod_count[group_type][srcMod]))
-        self.mod_count = collections.defaultdict(
-                lambda: collections.defaultdict(int))
+        self.mod_count = defaultdict(Counter)
 
     def scan(self,modFile,record,bashTags):
         """Records information needed to apply the patch."""
@@ -262,7 +260,7 @@ class CellImporter(_ACellImporter, ImportPatcher):
     #--Patch Phase ------------------------------------------------------------
     def initPatchFile(self, patchFile):
         super(CellImporter, self).initPatchFile(patchFile)
-        self.cellData = collections.defaultdict(dict)
+        self.cellData = defaultdict(dict)
         # TODO: docs: recAttrs vs tag_attrs - extra in PBash:
         # 'unused1','unused2','unused3'
         self.recAttrs = bush.game.cellRecAttrs # dict[unicode, tuple[str]]
@@ -326,7 +324,7 @@ def checkMasterCellBlockData(cellBlock):
             # (attributes (among attrs) -> their values for this mod). It is
             # used to update cellData with cells that change those attributes'
             # values from the value in any of srcMod's masters.
-            tempCellData = collections.defaultdict(dict)
+            tempCellData = defaultdict(dict)
             tempCellData['Maps'] = {} # unused !
             srcInfo = bosh.modInfos[srcMod]
             srcFile = ModFile(srcInfo,loadFactory)
@@ -437,7 +435,7 @@ def handlePatchCellBlock(patchCellBlock):
             return modified
         if not self.isActive: return
         keep = self.patchFile.getKeeper()
-        cellData, count = self.cellData, collections.defaultdict(int)
+        cellData, count = self.cellData, Counter()
         for cellBlock in self.patchFile.CELL.cellBlocks:
             if cellBlock.cell.fid in cellData and handlePatchCellBlock(cellBlock):
                 count[cellBlock.cell.fid[0]] += 1
@@ -479,7 +477,7 @@ class CBash_CellImporter(_ACellImporter,CBash_ImportPatcher):
     def initPatchFile(self, patchFile):
         super(CBash_CellImporter, self).initPatchFile(patchFile)
         if not self.isActive: return
-        self.fid_attr_value = collections.defaultdict(dict)
+        self.fid_attr_value = defaultdict(dict)
         self.tag_attrs = {
             u'C.Climate': ('climate','IsBehaveLikeExterior'),
             u'C.Music': ('musicType',),
@@ -973,7 +971,7 @@ class CBash_KFFZPatcher(CBash_ImportPatcher, _AKFFZPatcher):
     def initPatchFile(self, patchFile):
         super(CBash_KFFZPatcher, self).initPatchFile(patchFile)
         if not self.isActive: return
-        self.id_animations = collections.defaultdict(list)
+        self.id_animations = defaultdict(list)
 
     def getTypes(self):
         """Returns the group types that this patcher checks"""
@@ -1160,7 +1158,7 @@ def buildPatch(self,log,progress): # buildPatch1:no modFileTops, for type..
         if not self.isActive: return
         keep = self.patchFile.getKeeper()
         merged_deleted = self.id_merged_deleted
-        mod_count = collections.defaultdict(int)
+        mod_count = Counter()
         for rec_type in ('NPC_','CREA'):
             for record in getattr(self.patchFile,rec_type).records:
                 fid = record.fid
@@ -1171,8 +1169,7 @@ def buildPatch(self,log,progress): # buildPatch1:no modFileTops, for type..
                     changed = True
                 if changed:
                     keep(record.fid)
-                    mod = record.fid[0]
-                    mod_count[mod] += 1
+                    mod_count[record.fid[0]] += 1
         self.id_merged_deleted.clear()
         self._patchLog(log,mod_count)
 
@@ -1799,7 +1796,7 @@ def buildPatch(self,log,progress): # buildPatch1:no modFileTops, for type..
         if not self.isActive: return
         keep = self.patchFile.getKeeper()
         id_deltas = self.id_deltas
-        mod_count = collections.defaultdict(int)
+        mod_count = Counter()
         for inv_type in bush.game.inventoryTypes:
             for record in getattr(self.patchFile,inv_type).records:
                 changed = False
@@ -1823,8 +1820,7 @@ def buildPatch(self,log,progress): # buildPatch1:no modFileTops, for type..
                                 changed = True
                 if changed:
                     keep(record.fid)
-                    mod = record.fid[0]
-                    mod_count[mod] += 1
+                    mod_count[record.fid[0]] += 1
         self.id_deltas.clear()
         self._patchLog(log,mod_count)
 
@@ -2074,7 +2070,7 @@ def buildPatch(self,log,progress): # buildPatch1:no modFileTops, for type..
         if not self.isActive: return
         keep = self.patchFile.getKeeper()
         merged_deleted = self.id_merged_deleted
-        mod_count = collections.defaultdict(int)
+        mod_count = Counter()
         for rec_type in ('NPC_','CREA'):
             for record in getattr(self.patchFile,rec_type).records:
                 fid = record.fid
@@ -2086,8 +2082,7 @@ def buildPatch(self,log,progress): # buildPatch1:no modFileTops, for type..
                     changed = True
                 if changed:
                     keep(record.fid)
-                    mod = record.fid[0]
-                    mod_count[mod] += 1
+                    mod_count[record.fid[0]] += 1
         self.id_merged_deleted.clear()
         self._patchLog(log,mod_count)
 
@@ -2235,7 +2230,7 @@ def buildPatch(self,log,progress):# buildPatch0
         modFile = self.patchFile
         keep = self.patchFile.getKeeper()
         id_full = self.id_full
-        type_count = collections.defaultdict(int)
+        type_count = Counter()
         for act_type in self.activeTypes:
             if act_type not in modFile.tops: continue
             if act_type == 'CELL':
@@ -2785,7 +2780,7 @@ def buildPatch(self,log,progress):# buildPatch2 !!!!
         for group in self.activeTypes:
             if group not in patchFile.tops: continue
             attrs = self.class_attrs[group]
-            count,counts = 0,{}
+            counts = Counter()
             for record in patchFile.tops[group].records:
                 fid = record.fid
                 itemStats = fid_attr_value.get(fid,None)
@@ -2795,9 +2790,8 @@ def buildPatch(self,log,progress):# buildPatch2 !!!!
                     for attr, value in itemStats.iteritems():
                         setattr(record,attr,value)
                     keep(fid)
-                    count += 1
-                    counts[fid[0]] = 1 + counts.get(fid[0],0)
-            allCounts.append((group,count,counts))
+                    counts[fid[0]] += 1
+            allCounts.append((group, sum(counts.values()), counts))
         self.fid_attr_value.clear()
         self._patchLog(log, allCounts)
 
@@ -2911,7 +2905,7 @@ def buildPatch(self,log,progress):# buildPatch3: one type
         id_stat = self.id_stat
         allCounts = []
         spell_attrs = self.spell_attrs
-        count,counts = 0,{}
+        counts = Counter()
         for record in patchFile.SPEL.records:
             fid = record.fid
             spellStats = id_stat.get(fid)
@@ -2921,10 +2915,9 @@ def buildPatch(self,log,progress):# buildPatch3: one type
             for attr,value in zip(spell_attrs,spellStats):
                 setattr_deep(record,attr,value)
             keep(fid)
-            count += 1
-            counts[fid[0]] = 1 + counts.get(fid[0],0)
+            counts[fid[0]] += 1
         self.id_stat.clear()
-        allCounts.append(('SPEL',count,counts))
+        allCounts.append(('SPEL', sum(counts.values()), counts))
         self._patchLog(log, allCounts)
 
     def _plog(self, log, allCounts): self._plog2(log, allCounts)