Properly handle game-specific xEdit and CK names RRR

I *was* just going to introduce a quick bush.game variable and use it in
the approriate strings, but one thing led to another, the CS/CK got
involved, and it turned into a bigger refactoring that also features a
bunch of typo corrections, improved translation possibilities, etc.

But the main draw is that we now always show the right name for xEdit
and the CS/CK/GECK, unless I missed something :P

Note that I added GameInfo.xe as a class for this - I expect it to grow
with further refactoring in the future, as mentioned in links.py.
Another important part of this is GameInfo.cs -> GameInfo.ck. This
isn't due to my bias against the CS, but due to bolt.Path.cs already
existing and thereby making any searches for '.cs' annoying.

Closes # 239 <--- RRR

Author: Infernio

Mopy/bash/basher/app_buttons.py

@@ -342,7 +342,8 @@ class _Mods_xEditExpert(BoolLink):
 
     def __init__(self):
         super(_Mods_xEditExpert, self).__init__()
-        self._text, self.key = bush.game.xEdit_expert
+        self._text = _(u'%s Expert') % bush.game.xe.full_name
+        self.key = bush.game.xe.expert_key
 
 class App_Tes4View(App_Button):
     """Allow some extra args for Tes4View."""
@@ -382,7 +383,7 @@ class App_Tes4View(App_Button):
 #  or name ends with Trans.exe
     def __init__(self,*args,**kwdargs):
         App_Button.__init__(self,*args,**kwdargs)
-        if bush.game.xEdit_expert:
+        if bush.game.xe.expert_key:
             self.mainMenu.append(_Mods_xEditExpert())
 
     def IsPresent(self):
@@ -395,8 +396,8 @@ def IsPresent(self):
         return True
 
     def Execute(self):
-        is_expert = bush.game.xEdit_expert and bass.settings[
-            bush.game.xEdit_expert[1]]
+        is_expert = bush.game.xe.expert_key and bass.settings[
+            bush.game.xe.expert_key]
         extraArgs = bass.inisettings[
             'xEditCommandLineArguments'].split() if is_expert else []
         if balt.getKeyState_Control():
@@ -504,7 +505,7 @@ def version(self):
 
 #------------------------------------------------------------------------------
 class TESCS_Button(App_Button):
-    """CS button.  Needs a special Tooltip when OBSE is enabled."""
+    """CS/CK button. Needs a special tooltip when OBSE is enabled."""
     @property
     def obseTip(self):
         # TESCS (version)

Mopy/bash/basher/constants.py

@@ -396,6 +396,8 @@
     'fo3View.iKnowWhatImDoing':False,
     'fnvView.iKnowWhatImDoing':False,
     'enderalView.iKnowWhatImDoing':False,
+    'tes5vrView.iKnowWhatImDoing':False,
+    'fo4vrView.iKnowWhatImDoing':False,
     #--BOSS:
     'BOSS.ClearLockTimes':True,
     'BOSS.AlwaysUpdate':True,

Mopy/bash/basher/installer_links.py

@@ -625,9 +625,10 @@ def Execute(self):
 class Installer_ExportAchlist(OneItemLink, _InstallerLink):
     """Write an achlist file with all the destinations files for this
     installer in this configuration."""
-    _text = _(u"Export Achlist")
+    _text = _(u'Export Achlist')
     _mode_info_dir = u'Mod Info Exports'
-    _help = _(u'Create achlist file for use by the CK')
+    _help = (_(u'Create achlist file for use by the %s.') %
+             bush.game.ck.long_name)
 
     def _enable(self):
         isSingle = super(Installer_ExportAchlist, self)._enable()

Mopy/bash/basher/links.py

@@ -81,11 +81,11 @@ def _init_tool_buttons(): # tooldirs must have been initialized
             u' '.join((_(u"Launch"),bush.game.displayName,u'%(version)s'))))
     BashStatusBar.buttons.append( #TESCS/CreationKit
         TESCS_Button(
-            bass.dirs['app'].join(bush.game.cs.exe),
-            imageList(bush.game.cs.image_name),
-            u' '.join((_(u"Launch"),bush.game.cs.cs_abbrev)),
-            u' '.join((_(u"Launch"),bush.game.cs.cs_abbrev,u'%(version)s')),
-            bush.game.cs.se_args,
+            bass.dirs['app'].join(bush.game.ck.exe),
+            imageList(bush.game.ck.image_name),
+            u' '.join((_(u"Launch"),bush.game.ck.ck_abbrev)),
+            u' '.join((_(u"Launch"),bush.game.ck.ck_abbrev,u'%(version)s')),
+            bush.game.ck.se_args,
             uid=u'TESCS'))
     BashStatusBar.buttons.append( #OBMM
         App_Button(bass.dirs['app'].join(u'OblivionModManager.exe'),
@@ -103,6 +103,9 @@ def _init_tool_buttons(): # tooldirs must have been initialized
             imageList(u'tools/tes4view%s.png'),
             _(u"Launch TES4View"),
             uid=u'TES4View'))
+    # TODO(inf) Refactor this! I made bush.game.xe a class precisely for stuff
+    #  like this - so add stuff like xe.command_line_arg and drop these 30+
+    #  braindead lines
     BashStatusBar.buttons.append( #Tes4Edit
         App_Tes4View((bass.tooldirs['Tes4EditPath'], u'-TES4 -edit'),
                      imageList(u'tools/tes4edit%s.png'),

Mopy/bash/basher/mod_links.py

@@ -93,23 +93,27 @@ def Execute(self):
 # File submenu ----------------------------------------------------------------
 # the rest of the File submenu links come from file_links.py
 class Mod_CreateDummyMasters(OneItemLink):
-    """TES4Edit tool, makes dummy plugins for each missing master, for use if looking at a 'Filter' patch."""
+    """xEdit tool, makes dummy plugins for each missing master, for use if
+    looking at a 'Filter' patch."""
     _text = _(u'Create Dummy Masters...')
-    _help = _(u"TES4Edit tool, makes dummy plugins for each missing master of"
-             u" the selected mod, for use if looking at a 'Filter' patch")
+    _help = _(u'Creates empty plugins for each missing master of the selected '
+              u'mod, allowing it to be loaded by tools like %s or the %s.') % (
+        bush.game.xe.full_name, bush.game.ck.long_name)
 
     def _enable(self):
         return super(Mod_CreateDummyMasters, self)._enable() and \
                self._selected_info.getStatus() == 30  # Missing masters
 
     def Execute(self):
         """Create Dummy Masters"""
-        msg = _(u"This is an advanced feature for editing 'Filter' patches in "
-                u"TES4Edit.  It will create dummy plugins for each missing "
-                u"master.  Are you sure you want to continue?") + u'\n\n' + _(
-                u"To remove these files later, use 'Clean Dummy Masters...'")
+        msg = _(u'This is an advanced feature, originally intended for '
+                u"viewing and editing 'Filter' patches in %s. It will create "
+                u'empty plugins for each missing master. Are you sure you '
+                u'want to continue?\n\nTo remove these files later, use '
+                u"'Clean Dummy Masters...'") % bush.game.xe.full_name
         if not self._askYes(msg, title=_(u'Create Files')): return
-        doCBash = bass.settings['bash.CBashEnabled'] # something odd's going on, can't rename temp names
+        # something odd's going on, can't rename temp names
+        doCBash = bass.settings['bash.CBashEnabled']
         if doCBash:
             newFiles = []
         to_refresh = []
@@ -1670,8 +1674,8 @@ def Execute(self):
 class Mod_FlipMasters(OneItemLink, _Esm_Esl_Flip):
     """Swaps masters between esp and esm versions."""
     _help = _(u'Flips the ESM flag on all masters of the selected plugin, '
-              u'allowing you to load it in the %(csName)s.') % (
-              {'csName': bush.game.cs.long_name})
+              u'allowing you to load it in the %(ck_name)s.') % (
+              {u'ck_name': bush.game.ck.long_name})
 
     def _initData(self, window, selection,
                   __reEspExt=re.compile(u'' r'\.esp(.ghost)?$', re.I | re.U)):
@@ -1696,10 +1700,10 @@ def _enable(self): return self.enable
 
     @balt.conversation
     def Execute(self):
-        message = _(u"WARNING! For advanced modders only! Flips the ESM flag "
-                    u"of all ESP masters of the selected plugin. Useful for "
-                    u"loading ESP-mastered mods in the %(csName)s.") % (
-                    {'csName': bush.game.cs.long_name})
+        message = _(u'WARNING! For advanced modders only! Flips the ESM flag '
+                    u'of all ESP masters of the selected plugin. Useful for '
+                    u'loading ESP-mastered mods in the %(ck_name)s.') % (
+                    {u'ck_name': bush.game.ck.long_name})
         if not self._askContinue(message, 'bash.flipMasters.continue'): return
         updated = [self._selected_item]
         for masterPath in self.espMasters:
@@ -1714,11 +1718,12 @@ def Execute(self):
 class Mod_SetVersion(OneItemLink):
     """Sets version of file back to 0.8."""
     _text = _(u'Version 0.8')
-    _help = _(u'Sets version of file back to 0.8')
-    message = _(u"WARNING! For advanced modders only! This feature allows you "
-        u"to edit newer official mods in the TES Construction Set by resetting"
-        u" the internal file version number back to 0.8. While this will make "
-        u"the mod editable, it may also break the mod in some way.")
+    _help = _(u'Sets version of file back to 0.8.')
+    message = _(u'WARNING! For advanced modders only! This feature allows you '
+                u'to edit newer official mods in the %s by resetting the '
+                u'internal file version number back to 0.8. While this will '
+                u'make the mod editable, it may also break the mod in some '
+                u'way.' % bush.game.ck.long_name)
 
     def _enable(self):
         return (super(Mod_SetVersion, self)._enable() and

Mopy/bash/basher/patcher_dialog.py

@@ -30,7 +30,7 @@
 import time
 from datetime import timedelta
 from . import BashFrame ##: drop this - decouple !
-from .. import bass, bosh, bolt, balt, env, load_order
+from .. import balt, bass, bolt, bosh, bush, env, load_order
 from ..balt import Link, Resources, set_event_hook, Events, HorizontalLine
 from ..bolt import SubProgress, GPath, Path
 from ..exception import BoltError, CancelError, FileEditError, \
@@ -324,24 +324,27 @@ def _save_cbash(self, patchFile, patch_name):
                 raise
 
     def _pretry(self, patch_name):
-        return balt.askYes(self, (
-            _(u'Bash encountered and error when saving %(patch_name)s.') +
-            u'\n\n' + _(u'Either Bash needs Administrator Privileges to '
-            u'save the file, or the file is in use by another process '
-            u'such as TES4Edit.') + u'\n' + _(u'Please close any program '
-            u'that is accessing %(patch_name)s, and provide Administrator '
-            u'Privileges if prompted to do so.') + u'\n\n' +
-            _(u'Try again?')) % {'patch_name': patch_name.s},
-                           _(u'Bash Patch - Save Error'))
+        return balt.askYes(
+            self, _(u'Bash encountered an error when saving %(patch_name)s.'
+                    u'\n\nEither Bash needs Administrator Privileges to save '
+                    u'the file, or the file is in use by another process such '
+                    u'as %(xedit_name)s.\nPlease close any program that is '
+                    u'accessing %(patch_name)s, and provide Administrator '
+                    u'Privileges if prompted to do so.\n\nTry again?') % {
+                u'patch_name': patch_name.s,
+                u'xedit_name': bush.game.xe.full_name},
+            _(u'Bashed Patch - Save Error'))
 
     def _cretry(self, patch_name):
-        return balt.askYes(self, (
-            _(u'Bash encountered an error when renaming %s to %s.') + u'\n\n' +
-            _(u'The file is in use by another process such as TES4Edit.') +
-            u'\n' + _(u'Please close the other program that is accessing %s.')
-            + u'\n\n' + _(u'Try again?')) % (
-                               patch_name.temp.s, patch_name.s, patch_name.s),
-                           _(u'Bash Patch - Save Error'))
+        return balt.askYes(
+            self, _(u'Bash encountered an error when renaming '
+                    u'%(temp_patch)s to %(patch_name)s.\n\nThe file is in use '
+                    u'by another process such as %(xedit_name)s.\nPlease '
+                    u'close the other program that is accessing %s.\n\nTry '
+                    u'again?') % {
+                u'temp_patch': patch_name.temp.s, u'patch_name': patch_name.s,
+                u'xedit_name': bush.game.xe.full_name},
+            _(u'Bashed Patch - Save Error'))
 
     def __config(self):
         config = {'ImportedMods': set()}

Mopy/bash/bosh/__init__.py

@@ -2613,12 +2613,14 @@ def _setOblivionVersions(self):
         else: self.voCurrent = None # just in case
 
     def _retry(self, old, new):
-        return balt.askYes(self,
-            _(u'Bash encountered an error when renaming %s to %s.') + u'\n\n' +
-            _(u'The file is in use by another process such as TES4Edit.') +
-            u'\n' + _(u'Please close the other program that is accessing %s.')
-            + u'\n\n' + _(u'Try again?') % (old.s, new.s, old.s),
-            _(u'File in use'))
+        return balt.askYes(
+            self, _(u'Bash encountered an error when renaming %(old)s to '
+                    u'%(new)s.\n\nThe file is in use by another process such '
+                    u'as %(xedit_name)s.\nPlease close the other program that '
+                    u'is accessing %(new)s.\n\nTry again?') % {
+                u'xedit_name': bush.game.xe.full_name, u'old': old.s,
+                u'new': new.s},
+        _(u'File in use'))
 
     def _get_version_paths(self, newVersion):
         baseName = self.masterName # Oblivion.esm, say it's currently SI one

Mopy/bash/bosh/_mergeability.py

@@ -151,10 +151,10 @@ def is_esl_capable(modInfo, _minfos, reasons):
     #--Skipped over types?
     if modFile.topsSkipped:
         if not verbose: return False
-        reasons.append(_(u'Record type: ') + u', '.join(sorted(
-            modFile.topsSkipped)) + u' ; currently unsupported by ESLify ' \
-                                    u'verification. Use xEdit to check ESL '
-                                    u'qualifications and modify ESL flag.')
+        reasons.append(_(u'Record type(s): %s; currently unsupported by ESL '
+                         u'verification. Use %s to check ESL qualifications '
+                         u'and modify ESL flag.') % (
+            u', '.join(sorted(modFile.topsSkipped)), bush.game.xe.full_name))
     #--Form greater then 0xFFF
     lenMasters = len(modFile.tes4.masters)
     for rec_typ,block in modFile.tops.iteritems():

Mopy/bash/bosh/mods_metadata.py

@@ -300,8 +300,8 @@ def checkMods(self, showModList=False, showCRC=False, showVersion=True,
             if removeEslFlag:
                 log.setHeader(u'=== ' + _(u'Potentially Incorrect ESL Flag'))
                 log(_(u'Following mods have an ESL flag, but may not qualify. '
-                      u'Run \'Check ESL Qualifications\' on them and/or check '
-                      u'them with xEdit to be sure.'))
+                      u"Run 'Check ESL Qualifications' on them and/or check "
+                      u'them with %s to be sure.') % bush.game.xe.full_name)
                 for mod in sorted(removeEslFlag):
                     log(u'* __' + mod.s + u'__')
             if shouldDeactivateB:
@@ -327,34 +327,42 @@ def checkMods(self, showModList=False, showCRC=False, showVersion=True,
                     log(u'* __'+mod.s+u'__')
             if shouldClean:
                 log.setHeader(
-                    u'=== ' + _(u'Mods that need cleaning with TES4Edit'))
-                log(_(u'Following mods have identical to master (ITM) records,'
-                      u' deleted records (UDR), or other issues that should be'
-                      u' fixed with TES4Edit.  Visit the %(cleaning_wiki_url)s'
-                      u' for more information.') % {
-                        'cleaning_wiki_url': self._cleaning_wiki_url})
+                    u'=== ' + _(u'Mods that need cleaning with %s') %
+                    bush.game.xe.full_name)
+                log(_(u'Following mods have identical to master (ITM) '
+                      u'records, deleted records (UDR), or other issues that '
+                      u'should be fixed with %(xedit_name)s. Visit the '
+                      u'%(cleaning_wiki_url)s for more information.') % {
+                    u'cleaning_wiki_url': self._cleaning_wiki_url,
+                    u'xedit_name': bush.game.xe.full_name})
                 for mod in sorted(shouldClean.keys()):
                     log(u'* __'+mod.s+u':__  %s' % shouldClean[mod])
             if shouldCleanMaybe:
                 log.setHeader(
                     u'=== ' + _(u'Mods with special cleaning instructions'))
                 log(_(u'Following mods have special instructions for cleaning '
-                      u'with TES4Edit'))
+                      u'with %s') % bush.game.xe.full_name)
                 for mod in sorted(shouldCleanMaybe):
                     log(u'* __'+mod[0].s+u':__  '+mod[1])
             elif mod_checker and not shouldClean:
                 log.setHeader(
-                    u'=== ' + _(u'Mods that need cleaning with TES4Edit'))
-                log(_(u'Congratulations all mods appear clean.'))
+                    u'=== ' + _(u'Mods that need cleaning with %s') %
+                    bush.game.xe.full_name)
+                log(_(u'Congratulations, all mods appear clean.'))
             if invalidVersion:
-                ver_list = u', '.join(
-                    sorted(bush.game.esp.validHeaderVersions))
+                # Always an ASCII byte string, so this is fine
+                header_sig = unicode(
+                    bush.game_mod.records.MreHeader.classType,
+                    encoding='ascii')
+                ver_list = u', '.join(sorted([
+                    unicode(v) for v in bush.game.esp.validHeaderVersions]))
                 log.setHeader(
-                    u'=== ' + _(u'Mods with non standard TES4 versions'))
-                log(_(u"Following mods have a TES4 version that isn't "
-                      u"recognized as (one of) the standard version(s) "
-                      u"(%s).  It is untested what effect this can have on "
-                      u"%s.") % (ver_list, bush.game.displayName))
+                    u'=== ' + _(u'Mods with non-standard %s versions') %
+                    header_sig)
+                log(_(u"The following mods have a %s version that isn't "
+                      u'recognized as one of the standard versions '
+                      u'(%s). It is untested what effects this can have on '
+                      u'%s.') % (header_sig, ver_list, bush.game.displayName))
                 for mod in sorted(invalidVersion):
                     log(u'* __'+mod[0].s+u':__  '+mod[1])
             #--Missing/Delinquent Masters
@@ -832,18 +840,18 @@ def copyPrev(size):
                             else:
                                 copy(rec_size)
             #--Save
-            retry = _(u'Bash encountered an error when saving %s.') + u'\n\n' \
-                + _(u'The file is in use by another process such as TES4Edit.'
-                ) + u'\n' + _(u'Please close the other program that is '
-                              u'accessing %s.') + u'\n\n' + _(u'Try again?')
+            retry = _(u'Bash encountered an error when saving %(newpath)s.'
+                      u'\n\nThe file is in use by another process such as '
+                      u'%(xedit_name)s.\nPlease close the other program that '
+                      u'is accessing %(newpath)s.\n\nTry again?') % {
+                u'newpath': path.stail, u'xedit_name': bush.game.xe.full_name}
             if changed:
                 cleaner.modInfo.makeBackup()
                 try:
                     path.untemp()
                 except OSError as werr:
                     while werr.errno == errno.EACCES and balt.askYes(
-                            None, retry % (path.stail, path.stail),
-                            path.stail + _(u' - Save Error')):
+                            None, retry, _(u'%s - Save Error') % path.stail):
                         try:
                             path.untemp()
                             break

Mopy/bash/exception.py

@@ -63,7 +63,7 @@ def __init__(self):
 
 # File exceptions -------------------------------------------------------------
 class FileError(BoltError):
-    """TES4/Tes4SaveFile Error: File is corrupted."""
+    """An error that occurred while handling a file."""
     def __init__(self, in_name, message):
         ## type: (Union[Path, unicode], unicode) -> None
         super(FileError, self).__init__(message)