Added "Bash Patches/FormID Lists.csv". This file is a pre-set of the FLST merger tags.

valda · valda · commit f2dbd6efada6 · 2010-02-23T07:26:53.000+09:00
diff --git a/Data/Bash Patches/FormID Lists.csv b/Data/Bash Patches/FormID Lists.csv
@@ -0,0 +1,5 @@
+"Mod","LevelerTags","Comments"
+"FO3 Wanderers Edition - Main File.esp","DR","Alters lists"
+"WeaponModKits.esp",,"Adds new items"
+"WeaponModKits - FWE Master Release.esp","DR","Alters lists"
+"WeaponModKits - FWE Optional Worn Weapons.esp","DR","Alters lists"
diff --git a/Data/masterlist.txt.example b/Data/masterlist.txt.example
@@ -42,7 +42,7 @@ FOOK2 - Main.esm
 FOOK2 - [DIK] DLC Improvement Kit.esm
 FOOK2 - [WANK] World And Neighbourhood Kit.esm
 FO3 Wanderers Edition - Main File.esm
-% {{BASH:Invent,Stats,Relations,Reflst,Deflst}}
+% {{BASH:Invent,Stats,Relations}}
 LingsFinerThings.esm
 RH_IRONSIGHTS.esm
 EnhancedChildren.esm
@@ -209,6 +209,7 @@ teddybear_brothers.esp
 StealthArmorHelmLess.esp
 JM Stealth Suit.esp
 JM Stealth Suit - Vanilla.esp
+FrenchMaid.esp
 
 BoS_DX.esp
 % {{BASH:Graphics}}
@@ -360,7 +361,6 @@ CALIBR Ammo Schematics - CRAFT.esp
 \Weapon Mod Kits
 \'''''''''''''''''''''''''''''''''''''''
 WeaponModKits.esp
-% {{BASH:Reflst}}
 
 \FOIP-WMK
 \'''''''''''''''''''''''''''''''''''''''
diff --git a/Mopy/bosh.py b/Mopy/bosh.py
@@ -9192,6 +9192,10 @@ def __init__(self):
         self.patchesLLPath = dirs['patches'].join('Leveled Lists.csv')
         self.patchesLLTime = 0
         self.patchesLLTags = {}
+        #--Bash Patches\FormID Lists.csv
+        self.patchesFLPath = dirs['patches'].join('FormID Lists.csv')
+        self.patchesFLTime = 0
+        self.patchesFLTags = {}
         #--Boss Master List
         self.bossMasterPath = dirs['mods'].join('masterlist.txt')
         self.bossMasterTime = 0
@@ -9212,6 +9216,17 @@ def refresh(self):
                     tags[GPath(fields[0])] = tuple(mapper[x] for x in fields[1])
             reader.close()
             self.patchesLLTime = path.mtime
+        #--Bash Patches\FormID Lists.csv
+        path,mtime,tags = (self.patchesFLPath, self.patchesFLTime, self.patchesFLTags,)
+        if path.exists() and path.mtime != mtime:
+            tags.clear()
+            mapper = {'D':'Deflst','R':'Reflst'}
+            reader = bolt.CsvReader(path)
+            for fields in reader:
+                if len(fields) >= 2 and fields[0] and fields[1] in ('DR','R','D','RD',''):
+                    tags[GPath(fields[0])] = tuple(mapper[x] for x in fields[1])
+            reader.close()
+            self.patchesFLTime = path.mtime
         #--Boss Master List
         path,mtime,tags = (self.bossMasterPath, self.bossMasterTime, self.bossMasterTags,)
         if path.exists() and path.mtime != mtime:
@@ -9240,8 +9255,12 @@ def getBashTags(self,modName):
         """Retrieves bash tags for given file."""
         if modName in self.bossMasterTags:
             return set(self.bossMasterTags[modName])
+        patchesTags = set()
         if modName in self.patchesLLTags:
-            return set(self.patchesLLTags[modName])
+            patchesTags |= set(self.patchesLLTags[modName])
+        if modName in self.patchesFLTags:
+            patchesTags |= set(self.patchesFLTags[modName])
+        return patchesTags
 
     #--Mod Checker ------------------------------------------------------------
     def refreshRuleSets(self):
@@ -17669,6 +17688,20 @@ class FidListsMerger(SpecialPatcher,ListPatcher):
     forceItemCheck = True #--Force configChecked to True for all items
     iiMode = True
 
+    #--Static------------------------------------------------------------------
+    @staticmethod
+    def getDefaultTags():
+        tags = {}
+        for fileName in ('FormID Lists.csv','My FormId Lists.csv'):
+            textPath = dirs['patches'].join(fileName)
+            if textPath.exists():
+                reader = bolt.CsvReader(textPath)
+                for fields in reader:
+                    if len(fields) < 2 or not fields[0] or fields[1] not in ('DR','R','D','RD',''): continue
+                    tags[GPath(fields[0])] = fields[1]
+                reader.close()
+        return tags
+
     #--Config Phase -----------------------------------------------------------
     def getChoice(self,item):
         """Get default config choice."""
