Skip to content

Commit

Permalink
updates for openmwplayer, rootbuilder and reinstaller.
Browse files Browse the repository at this point in the history
  • Loading branch information
Kezyma committed Aug 6, 2024
1 parent 79e44c1 commit 7bdad60
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 17 deletions.
19 changes: 19 additions & 0 deletions directory/plugins/openmwplayer.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,25 @@
"PluginPath": [ "openmwplayer" ],
"LocalePath": [],
"DataPath": [ "data/openmwplayer" ]
},
{
"Version": "2.0.1B",
"Released": "2024-08-06",
"MinSupport": "2.4.0",
"MaxSupport": "2.5.2",
"MinWorking": "2.4.0",
"MaxWorking": "",
"ReleaseNotes": [
"(2.0.1) Updated to work with MO2 2.5.2."
],
"DownloadUrl": "https://github.com/Kezyma/ModOrganizer-Plugins/releases/download/openmwplayer/openmwplayer.2.0.1.zip",
"PluginPath": [
"openmwplayer"
],
"LocalePath": [],
"DataPath": [
"data/openmwplayer"
]
}
]
}
5 changes: 3 additions & 2 deletions directory/plugins/reinstaller.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,10 @@
"MinWorking": "2.4.0",
"MaxWorking": "",
"ReleaseNotes": [
"(2.0.0) Total rewrite."
"(2.0.0) Total rewrite.",
"(2.0.1) Update for MO2 2.5.2 with some minor fixes."
],
"DownloadUrl": "https://github.com/Kezyma/ModOrganizer-Plugins/releases/download/reinstaller/reinstaller.2.0.0.zip",
"DownloadUrl": "https://github.com/Kezyma/ModOrganizer-Plugins/releases/download/reinstaller/reinstaller.2.0.1.zip",
"PluginPath": [
"reinstaller"
],
Expand Down
5 changes: 3 additions & 2 deletions directory/plugins/rootbuilder.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,10 @@
"(5.0.1) Fixed an issue with case senstivity and different path separators if using redirect.",
"(5.0.2) Fixed an issue with [ and ] being treated as a wildcard when part of a path name.",
"(5.0.3) Fixed an issue with running the installer module on MO v2.5.",
"(5.0.4) Exclusions & custom mode settings now support regex expressions with the prefix r:"
"(5.0.4) Exclusions & custom mode settings now support regex expressions with the prefix r:",
"(5.0.5) Updates for MO2 2.5.2, primarily courtesy of Zash"
],
"DownloadUrl": "https://github.com/Kezyma/ModOrganizer-Plugins/releases/download/rootbuilder/rootbuilder.5.0.4.zip",
"DownloadUrl": "https://github.com/Kezyma/ModOrganizer-Plugins/releases/download/rootbuilder/rootbuilder.5.0.5.zip",
"PluginPath": [
"rootbuilder"
],
Expand Down
2 changes: 1 addition & 1 deletion meta/openmwplayer.meta
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
installed=true
gameName=morrowind
modID=52345
fileID=1000041309
fileID=1000046633
2 changes: 1 addition & 1 deletion meta/reinstaller.meta
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
installed=true
gameName=skyrimse
modID=59292
fileID=461962
fileID=528776
2 changes: 1 addition & 1 deletion meta/rootbuilder.meta
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
installed=true
gameName=skyrimse
modID=31720
fileID=460345
fileID=528774
2 changes: 1 addition & 1 deletion src/plugin/openmwplayer/core/openmwplayer_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class OpenMWPlayerPlugin(BasePlugin):
"""Base OpenMW Player plugin, to be inherited by all other plugins."""

def __init__(self):
super().__init__("OpenMWPlayer", "OpenMW Player", mobase.VersionInfo(2, 0, 0))
super().__init__("OpenMWPlayer", "OpenMW Player", mobase.VersionInfo(2, 0, 1))

def init(self, organiser:mobase.IOrganizer):
self._openmwPlayer = OpenMWPlayer(organiser)
Expand Down
12 changes: 6 additions & 6 deletions src/plugin/openmwplayer/modules/openmwplayer_deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,28 @@ def deployCfg(self):
settingsBackupCfg = f"{settingsCfg}.omwpbackup"
customSettingsCfg = self._strings.customSettingsCfgPath()

if Path(openmwCfg).exists() and not Path(openmwBackupCfg).exists():
if openmwCfg is not None and Path(openmwCfg).exists() and not Path(openmwBackupCfg).exists():
moveFile(openmwCfg, openmwBackupCfg)
if Path(settingsCfg).exists() and not Path(settingsBackupCfg).exists():
if settingsCfg is not None and Path(settingsCfg).exists() and not Path(settingsBackupCfg).exists():
moveFile(settingsCfg, settingsBackupCfg)

if Path(customOpenmwCfg).exists():
if customOpenmwCfg is not None and Path(customOpenmwCfg).exists():
copyFile(customOpenmwCfg, openmwCfg)
if Path(customSettingsCfg).exists():
if customSettingsCfg is not None and Path(customSettingsCfg).exists():
copyFile(customSettingsCfg, settingsCfg)

def restoreCfg(self):
openmwCfg = self._strings.openmwCfgPath()
openmwBackupCfg = f"{openmwCfg}.omwpbackup"
customOpenmwCfg = self._strings.customOpenmwCfgPath()
if Path(openmwCfg).exists() and Path(openmwBackupCfg).exists():
if openmwCfg is not None and Path(openmwCfg).exists() and Path(openmwBackupCfg).exists():
copyFile(openmwCfg, customOpenmwCfg)
moveFile(openmwBackupCfg, openmwCfg)

settingsCfg = self._strings.settingsCfgPath()
settingsBackupCfg = f"{settingsCfg}.omwpbackup"
customSettingsCfg = self._strings.customSettingsCfgPath()
if Path(settingsCfg).exists() and Path(settingsBackupCfg).exists():
if settingsCfg is not None and Path(settingsCfg).exists() and Path(settingsBackupCfg).exists():
copyFile(settingsCfg, customSettingsCfg)
moveFile(settingsBackupCfg, settingsCfg)

2 changes: 1 addition & 1 deletion src/plugin/openmwplayer/modules/openmwplayer_import.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def importOpenmwCfg(self):
self._settings.updateSetting("openmwcfgpath", str(manualPath))
cfgPath = self._strings.openmwCfgPath()
# If the config actually exists, import it.
if Path(cfgPath).exists():
if cfgPath is not None and Path(cfgPath).exists():
currentPath = self._strings.customOpenmwCfgPath()
# Delete any existing openmw.cfg
if Path(currentPath).exists():
Expand Down
2 changes: 1 addition & 1 deletion src/plugin/reinstaller/core/reinstaller_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class ReinstallerPlugin(BasePlugin):
"""Base Reinstaller plugin, to be inherited by all other plugins."""

def __init__(self):
super().__init__("Reinstaller", "Reinstaller", mobase.VersionInfo(2, 0, 0))
super().__init__("Reinstaller", "Reinstaller", mobase.VersionInfo(2, 0, 1))

def init(self, organiser:mobase.IOrganizer):
self._reinstaller = Reinstaller(organiser)
Expand Down
2 changes: 1 addition & 1 deletion src/plugin/rootbuilder/core/rootbuilder_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class RootBuilderPlugin(BasePlugin):
"""Base Root Builder plugin, to be inherited by all other plugins."""

def __init__(self):
super().__init__("RootBuilder", "Root Builder", mobase.VersionInfo(5, 0, 4))
super().__init__("RootBuilder", "Root Builder", mobase.VersionInfo(5, 0, 5))

def init(self, organiser:mobase.IOrganizer):
self._rootBuilder = RootBuilder(organiser)
Expand Down

0 comments on commit 7bdad60

Please sign in to comment.