Rework exe-based game detection logic

Prerequisite for Enderal, otherwise launching with '-o' will break.

The core root of the problem is that:
 1. GameInfo.exe was used for two separate tasks (game detection and
    specifying which exe to use when launching the game).
 2. It was not flexible enough - only top-level files could be used for
    game detection this way. NB: This was not a problem YET, but could
    certainly become one in the future.

To solve this problem, the obvious solution is to explicitly split
GameInfo.exe into two separate variables for the two tasks. This commit
does just that, splitting it into launch_exe and game_detect_file. This
also allowed making game_detect_file more flexible, by turning it into a
list that will be Path.join()-ed with the path given by the -o
parameter.

Currently, only Skyrim and Enderal need a non-standard game_detect_file,
because they both ship TESV.exe.

Author: Infernio

Mopy/bash/basher/app_buttons.py

@@ -249,7 +249,7 @@ def Execute(self):
             exeObse = bass.dirs['app'].join(bush.game.se.exe)
             exeLaa = bass.dirs['app'].join(bush.game.laa.exe)
             if BashStatusBar.laaButton.button_state and \
-                            self.exePath.tail == bush.game.exe:
+                            self.exePath.tail == bush.game.launch_exe:
                 # Should use the LAA Launcher
                 exePath = exeLaa
                 args = [exePath.s]

Mopy/bash/basher/gui_fomod.py

@@ -62,7 +62,7 @@ def __init__(self, parent_window, installer, page_size, pos):
 
         fomod_file = installer.fomod_file().s
         data_path = bass.dirs["mods"]
-        ver = env.get_file_version(bass.dirs["app"].join(bush.game.exe).s)
+        ver = env.get_file_version(bass.dirs["app"].join(bush.game.launch_exe).s)
         game_ver = u".".join([unicode(i) for i in ver])
 
         self.parser = FomodInstaller(fomod_file, self.files_list, data_path, game_ver)

Mopy/bash/basher/links.py

@@ -73,7 +73,7 @@ def _init_tool_buttons(): # tooldirs must have been initialized
     BashStatusBar.buttons.append(AutoQuit_Button(uid=u'AutoQuit'))
     BashStatusBar.buttons.append( # Game
         Game_Button(
-            exePathArgs=bass.dirs['app'].join(bush.game.exe),
+            exePathArgs=bass.dirs['app'].join(bush.game.launch_exe),
             images=imageList(u'%s%%s.png' % bush.game.fsName.lower()),
             tip=u' '.join((_(u"Launch"),bush.game.displayName)),
             obseTip=u' '.join((_(u"Launch"),bush.game.displayName,u'%(version)s')),

Mopy/bash/belt.py

@@ -1077,7 +1077,8 @@ def opExp(self, l, r): return l ** r
 
     # Functions...
     def fnCompareGameVersion(self, obWant):
-        ret = self._TestVersion(self._TestVersion_Want(obWant), bass.dirs['app'].join(bush.game.exe))
+        ret = self._TestVersion(self._TestVersion_Want(obWant),
+                                bass.dirs['app'].join(bush.game.launch_exe))
         return ret[0]
     def fnCompareSEVersion(self, seWant):
         if bush.game.se.se_abbrev != u'':
@@ -1557,7 +1558,8 @@ def kwdRequireVersions(self, game, se=u'None', ge=u'None', wbWant=u'0.0'):
         if not wbWant: wbWant = u'0.0'
         wbHave = bass.AppVersion
 
-        ret = self._TestVersion(gameWant, bass.dirs['app'].join(bush.game.exe))
+        ret = self._TestVersion(gameWant,
+                                bass.dirs['app'].join(bush.game.launch_exe))
         bGameOk = ret[0] >= 0
         gameHave = ret[1]
         if bush.game.se.se_abbrev != u'':

Mopy/bash/bush.py

@@ -147,7 +147,7 @@ def _detectGames(cli_path=u'', bash_ini_=None):
     # iterate installPaths in insert order ('cmd', 'ini', 'upMopy')
     for test_path, foundMsg, errorMsg in installPaths.itervalues():
         for name, info in _allGames.items():
-            if test_path.join(info.exe).exists():
+            if test_path.join(*info.game_detect_file).exists():
                 # Must be this game
                 deprint(foundMsg % {'gamename': name}, test_path)
                 foundGames_[name] = test_path

Mopy/bash/env.py

@@ -69,7 +69,7 @@ def get_registry_path(subkey, entry, exe):
 def get_registry_game_path(submod):
     """Check registry supplied game paths for the game.exe."""
     subkey, entry = submod.regInstallKeys
-    return get_registry_path(subkey, entry, submod.exe)
+    return get_registry_path(subkey, entry, submod.launch_exe)
 
 try: # Python27\Lib\site-packages\win32comext\shell
     from win32com.shell import shell, shellcon

Mopy/bash/game/__init__.py

@@ -39,8 +39,14 @@ class GameInfo(object):
     altName = u'' ## Example: u'Wrye Smash'
     # Name of game's default ini file.
     defaultIniFile = u''
-    # Exe to look for to see if this is the right game
-    exe = u'' ## Example: u'TESV.exe'
+    # Path to a file to look for to see if this is the right game. Given as a
+    # list of strings that will be joined with the -o parameter. Must be unique
+    # among all games. As a rule of thumb, use the file you specified in
+    # launch_exe, unless that file is shared by multiple games, in which case
+    # you MUST find unique files - see Skyrim and Enderal, which share TESV.exe
+    game_detect_file = []
+    # The exe to use when launching the game (without xSE present)
+    launch_exe = u'' ## Example: u'TESV.exe'
     # The main plugin Wrye Bash should look for
     masterFiles = []
     # INI files that should show up in the INI Edits tab

Mopy/bash/game/fallout3/__init__.py

@@ -33,7 +33,8 @@ class Fallout3GameInfo(GameInfo):
     fsName = u'Fallout3'
     altName = u'Wrye Flash'
     defaultIniFile = u'Fallout_default.ini'
-    exe = u'Fallout3.exe'
+    game_detect_file = [u'Fallout3.exe']
+    launch_exe = u'Fallout3.exe'
     masterFiles = [u'Fallout3.esm']
     iniFiles = [u'Fallout.ini', u'FalloutPrefs.ini']
     pklfile = ur'bash\db\Fallout3_ids.pkl'

Mopy/bash/game/fallout4/__init__.py

@@ -33,7 +33,8 @@ class Fallout4GameInfo(GameInfo):
     fsName = u'Fallout4'
     altName = u'Wrye Flash'
     defaultIniFile = u'Fallout4_default.ini'
-    exe = u'Fallout4.exe'
+    game_detect_file = [u'Fallout4.exe']
+    launch_exe = u'Fallout4.exe'
     masterFiles = [u'Fallout4.esm']
     iniFiles = [u'Fallout4.ini', u'Fallout4Prefs.ini', u'Fallout4Custom.ini', ]
     pklfile = ur'bash\db\Fallout4_ids.pkl'

Mopy/bash/game/falloutnv/__init__.py

@@ -33,7 +33,8 @@ class FalloutNVGameInfo(GameInfo):
     fsName = u'FalloutNV'
     altName = u'Wrye Flash NV'
     defaultIniFile = u'Fallout_default.ini'
-    exe = u'FalloutNV.exe'
+    game_detect_file = [u'FalloutNV.exe']
+    launch_exe = u'FalloutNV.exe'
     masterFiles = [u'FalloutNV.esm']
     iniFiles = [u'Fallout.ini', u'FalloutPrefs.ini']
     pklfile = ur'bash\db\FalloutNV_ids.pkl'