owml-config-fix

ow-mods · Jan 7, 2020 · e1bd5b1 · e1bd5b1
1 parent 5b4cf65
commit e1bd5b1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/OWML.Common/IModHelper.cs b/OWML.Common/IModHelper.cs
@@ -11,5 +11,6 @@ public interface IModHelper
         IModMenus Menus { get; }
         IModManifest Manifest { get; }
         IModConfig Config { get; }
+        IOwmlConfig OwmlConfig { get; }
     }
 }
diff --git a/OWML.Launcher/App.cs b/OWML.Launcher/App.cs
@@ -11,7 +11,7 @@ namespace OWML.Launcher
 {
     public class App
     {
-        private const string Version = "0.3.17";
+        private const string Version = "0.3.18";
 
         private readonly IOwmlConfig _owmlConfig;
         private readonly IModConsole _writer;
@@ -21,8 +21,8 @@ public class App
         private readonly ModPatcher _patcher;
         private readonly ModUpdate _update;
 
-        public App(IOwmlConfig owmlConfig, IModConsole writer, IModFinder modFinder, OutputListener listener,
-            PathFinder pathFinder, ModPatcher patcher, ModUpdate update)
+        public App(IOwmlConfig owmlConfig, IModConsole writer, IModFinder modFinder,
+            OutputListener listener, PathFinder pathFinder, ModPatcher patcher, ModUpdate update)
         {
             _owmlConfig = owmlConfig;
             _writer = writer;

diff --git a/OWML.SampleMods/OWML.EnableDebugMode/manifest.json b/OWML.SampleMods/OWML.EnableDebugMode/manifest.json
@@ -4,6 +4,6 @@
   "name": "EnableDebugMode",
   "uniqueName": "Alek.EnableDebugMode",
   "version": "0.2",
-  "owmlVersion": "0.3.17",
+  "owmlVersion": "0.3.18",
   "enabled": false
 }
diff --git a/OWML.SampleMods/OWML.LoadCustomAssets/manifest.json b/OWML.SampleMods/OWML.LoadCustomAssets/manifest.json
@@ -4,6 +4,6 @@
   "name": "LoadCustomAssets",
   "uniqueName": "Alek.LoadCustomAssets",
   "version": "0.4",
-  "owmlVersion": "0.3.17",
+  "owmlVersion": "0.3.18",
   "enabled": false
 }
diff --git a/OWML.Update/ModUpdate.cs b/OWML.Update/ModUpdate.cs
@@ -6,8 +6,7 @@ namespace OWML.Update
 {
     public class ModUpdate
     {
-        private const string BaseUrl = "https://github.com";
-        public string ReleasesUrl = BaseUrl + "/amazingalek/owml/releases";
+        public string ReleasesUrl = "https://github.com/amazingalek/owml/releases";
 
         private readonly IModConsole _writer;
 
@@ -19,25 +18,31 @@ public ModUpdate(IModConsole writer)
         public string GetLatestVersion()
         {
             var web = new HtmlWeb();
-
-            string versionNumber;
+            HtmlNode releaseLink;
 
             try
             {
                 var releasesDoc = web.Load(ReleasesUrl);
-                var releaseLink = releasesDoc.DocumentNode.QuerySelector("div.release-header a");
-                versionNumber = releaseLink.InnerText;
+                releaseLink = releasesDoc.DocumentNode.QuerySelector("div.release-header a");
             }
             catch (Exception ex)
             {
                 _writer.WriteLine("Error while getting latest version: " + ex);
                 return null;
             }
 
+            var versionNumber = releaseLink?.InnerText;
+
+            if (string.IsNullOrEmpty(versionNumber))
+            {
+                _writer.WriteLine("Error: version number is null or empty");
+                return null;
+            }
+
             if (versionNumber.Contains("+"))
             {
                 var indexOfPlus = versionNumber.IndexOf("+");
-                versionNumber = versionNumber.Substring(0, indexOfPlus);
+                return versionNumber.Substring(0, indexOfPlus);
             }
 
             return versionNumber;