WIP: Set game-specific prefix for SLocalSavePath

Prerequisite for Enderal, which is the first game to use a prefix other
than 'Saves\' for this INI setting - otherwise, saves profiles won't
work with Enderal.

Touches a lot of code in many different places, so marked as WIP since
it will need lots of testing - but it seems to work as intended.

Author: Infernio

Mopy/bash/basher/__init__.py

@@ -3750,7 +3750,9 @@ def SetTitle(*args, **kwargs):
             title += u', CBash %s: ' % (CBashApi.VersionText,)
         else:
             title += u': '
-        maProfile = re.match(ur'Saves\\(.+)\\$',bosh.saveInfos.localSave,re.U)
+        save_prefix = re.escape(bush.game.saveProfilesKey[2])
+        maProfile = re.match(save_prefix + ur'(.+)\\$',
+                             bosh.saveInfos.localSave, re.U)
         if maProfile:
             title += maProfile.group(1)
         else:

Mopy/bash/basher/saves_links.py

@@ -72,11 +72,11 @@ def getItemList(self):
     #--Info box
     def getInfo(self,item):
         """Returns string info on specified item."""
-        profileSaves = u'Saves\\'+item+u'\\'
+        profileSaves = bush.game.saveProfilesKey[2]+item+u'\\'
         return bosh.saveInfos.profiles.getItem(profileSaves,'info',_(u'About %s:') % item)
     def setInfo(self,item,text):
         """Sets string info on specified item."""
-        profileSaves = u'Saves\\'+item+u'\\'
+        profileSaves = bush.game.saveProfilesKey[2]+item+u'\\'
         bosh.saveInfos.profiles.setItem(profileSaves,'info',text)
 
     def add(self):
@@ -97,7 +97,7 @@ def add(self):
                 _(u'Name must be encodable in Windows Codepage 1252 (Western European), due to limitations of %(gameIni)s.') % {'gameIni':bush.game.iniFiles[0]})
             return False
         self.baseSaves.join(newName).makedirs()
-        newSaves = u'Saves\\'+newName+u'\\'
+        newSaves = bush.game.saveProfilesKey[2]+newName+u'\\'
         bosh.saveInfos.profiles.setItem(newSaves,'vOblivion',bosh.modInfos.voCurrent)
         return newName
 
@@ -117,7 +117,7 @@ def rename(self,oldName,newName):
         oldDir, newDir = (self.baseSaves.join(subdir) for subdir in
                           (oldName, newName))
         oldDir.moveTo(newDir)
-        oldSaves,newSaves = ((u'Saves\\'+name+u'\\') for name in (oldName,newName))
+        oldSaves,newSaves = ((bush.game.saveProfilesKey[2]+name+u'\\') for name in (oldName,newName))
         if bosh.saveInfos.localSave == oldSaves:
             bosh.saveInfos.setLocalSave(newSaves)
             Link.Frame.SetTitle()
@@ -126,7 +126,7 @@ def rename(self,oldName,newName):
 
     def remove(self,profile):
         """Removes load list."""
-        profileSaves = u'Saves\\'+profile+u'\\'
+        profileSaves = bush.game.saveProfilesKey[2]+profile+u'\\'
         #--Can't remove active or Default directory.
         if bosh.saveInfos.localSave == profileSaves:
             balt.showError(self.parent,_(u'Active profile cannot be removed.'))
@@ -160,7 +160,8 @@ def menu_help(self):
             return _(u'Set profile to %(prof)s (My Games/Saves/%(prof)s)') % {
                                'prof': self._text}
         @property
-        def relativePath(self): return u'Saves\\' + self._text + u'\\'
+        def relativePath(self):
+            return bush.game.saveProfilesKey[2] + self._text + u'\\'
         def _check(self): return Saves_Profiles.local == self.relativePath
         def _enable(self): return not self._check()
         def Execute(self):
@@ -186,7 +187,7 @@ def menu_help(self):
             return _(u'Set profile to the default (My Games/Saves)')
 
         @property
-        def relativePath(self): return u'Saves\\'
+        def relativePath(self): return bush.game.saveProfilesKey[2]
 
     class _Edit(ItemLink):
         _text = _(u"Edit Profiles...")
@@ -595,15 +596,17 @@ def _initData(self, window, selection):
         class _Default(EnabledLink):
             _text = _(u'Default')
             _help = _self._help_str % bass.dirs['saveBase'].join(u'Saves')
-            def _enable(self): return Save_Move.local != u'Saves\\'
+            def _enable(self):
+                return Save_Move.local != bush.game.saveProfilesKey[2]
             def Execute(self): _self.MoveFiles(_(u'Default'))
         class _SaveProfileLink(EnabledLink):
             @property
             def menu_help(self):
                 return _self._help_str % bass.dirs['saveBase'].join(
                     u'Saves', self._text)
             def _enable(self):
-                return Save_Move.local != (u'Saves\\' + self._text + u'\\')
+                return Save_Move.local != (bush.game.saveProfilesKey[2] +
+                                           self._text + u'\\')
             def Execute(self): _self.MoveFiles(self._text)
         self.__class__.choiceLinkType = _SaveProfileLink
         self.extraItems = [_Default()]

Mopy/bash/bosh/__init__.py

@@ -2663,7 +2663,7 @@ def _setLocalSaveFromIni(self):
         # saveInfos singleton is constructed in InitData after bosh.oblivionIni
         self.localSave = oblivionIni.getSetting(
             bush.game.saveProfilesKey[0], bush.game.saveProfilesKey[1],
-            u'Saves\\')
+            bush.game.saveProfilesKey[2])
         # Hopefully will solve issues with unicode usernames # TODO(ut) test
         self.localSave = decode(self.localSave) # encoding = 'cp1252' ?
 
@@ -2673,7 +2673,7 @@ def __init__(self):
             ur'((quick|auto)save(\.bak)+|(' + # quick or auto save.bak(.bak...)
             _ext + ur'|' + _ext[:-1] + ur'r' + ur'))$', # enabled/disabled save
             re.I | re.U)
-        self.localSave = u'Saves\\'
+        self.localSave = bush.game.saveProfilesKey[2]
         self._setLocalSaveFromIni()
         super(SaveInfos, self).__init__(dirs['saveBase'].join(self.localSave),
                                         factory=SaveInfo)

Mopy/bash/game/__init__.py

@@ -203,8 +203,8 @@ class pnd(object):
         voice_dir = [u'sound', u'voice']
 
     # INI setting used to setup Save Profiles
-    #  (section,key)
-    saveProfilesKey = (u'General', u'SLocalSavePath')
+    #  (section, key, prefix)
+    saveProfilesKey = (u'General', u'SLocalSavePath', u'Saves\\')
 
     # BAIN:
     #  These are the allowed default data directories that BAIN can install to