FFF chopping off type occurences untested

Author: Utumno

Mopy/bash/basher/saves_links.py

@@ -812,17 +812,20 @@ def Execute(self):
         if not createdCounts and not nullRefCount:
             self._showOk(_(u'No bloating found.'), self._selected_item.s)
             return
-        message = u''
+        message = [_(u'Remove savegame bloating?')]
         if createdCounts:
-            for type,name in sorted(createdCounts):
-                message += u'  %s %s: %s\n' % (type,name,formatInteger(createdCounts[(type,name)]))
+            for created_item_rec_type, name in sorted(createdCounts):
+                count_ = createdCounts[(created_item_rec_type, name)]
+                message.append(u'  %s %s: %s' % (
+                    created_item_rec_type, name, formatInteger(count_)))
         if nullRefCount:
-            message += u'  '+_(u'Null Ref Objects:')+ u' %s\n' % formatInteger(nullRefCount)
-        message = (_(u'Remove savegame bloating?')
-                   + u'\n'+message+u'\n' +
-                   _(u'WARNING: This is a risky procedure that may corrupt your savegame!  Use only if necessary!')
-                   )
-        if not self._askYes(message, _(u'Remove bloating?')): return
+            message.append(u'  ' + _(u'Null Ref Objects:') +
+                           u' %s' % formatInteger(nullRefCount))
+        message.extend([u'', _(
+            u'WARNING: This is a risky procedure that may corrupt your '
+            u'savegame!  Use only if necessary!')])
+        if not self._askYes(u'\n'.join(message), _(u'Remove bloating?')):
+            return
         #--Remove bloating
         with balt.Progress(_(u'Removing Bloat')) as progress:
             nums = saveFile.removeBloating(createdCounts.keys(),True,SubProgress(progress,0,0.9))

Mopy/bash/bosh/_saves.py

@@ -25,6 +25,7 @@
 Oblivion only . We need this split into cosaves and proper saves module and
 coded for rest of the games."""
 # TODO: Oblivion only - we need to support rest of games - help needed
+from collections import Counter
 from itertools import starmap, repeat
 from operator import attrgetter
 
@@ -610,7 +611,7 @@ def getMaster(modIndex):
     def findBloating(self,progress=None):
         """Analyzes file for bloating. Returns (createdCounts,nullRefCount)."""
         nullRefCount = 0
-        createdCounts = {}
+        createdCounts = Counter()
         progress = progress or bolt.Progress()
         progress.setFull(len(self.created)+len(self.records))
         #--Created objects
@@ -622,9 +623,7 @@ def findBloating(self,progress=None):
             else:
                 full = citem.getSubString('FULL')
             if full:
-                typeFull = (citem.recType,full)
-                count = createdCounts.get(typeFull,0)
-                createdCounts[typeFull] = count + 1
+                createdCounts[(citem.recType, full)] += 1
             progress.plus()
         for key in createdCounts.keys()[:]:
             minCount = (50,100)[key[0] == 'ALCH']