Merge pull request #46 from beat-saber-modding-group/scoresaber-debug

Fix for ScoreSaber not appearing in mods list
bsmg · Apr 24, 2019 · 5c49927 · 5c49927
2 parents 2e52a32 + 0eebf0b
commit 5c49927
Show file tree

Hide file tree

Showing 8 changed files with 111 additions and 31 deletions.
diff --git a/BeatSaberModManager/Core/PathLogic.cs b/BeatSaberModManager/Core/PathLogic.cs
@@ -20,11 +20,29 @@ public class PathLogic
         public string GetInstallationPath()
         {
             // Check if install path is already saved
-            if (Properties.Settings.Default.InstallPath != null)
+            if (Properties.Settings.Default.InstallPath.Length != 0
+                && Properties.Settings.Default.Platform != (int)Platform.Default)
             {
                 if (File.Exists(Path.Combine(Properties.Settings.Default.InstallPath, AppFileName)))
                 {
                     installPath = Properties.Settings.Default.InstallPath;
+
+                    if ((Platform)Properties.Settings.Default.Platform == Platform.Steam)
+                    {
+                        platform = Platform.Steam;
+                    } else if ((Platform)Properties.Settings.Default.Platform == Platform.Oculus)
+                    {
+                        platform = Platform.Oculus;
+                    } else
+                    {
+                        // If the platform isn't saved, prompt user to select
+                        FormPlatformSelect selector = new FormPlatformSelect(this);
+                        selector.ShowDialog();
+
+                        Properties.Settings.Default.Platform = (int)platform;
+                        Properties.Settings.Default.Save();
+                    }
+
                     return installPath;
                 }
             }
@@ -139,7 +157,6 @@ private string GetValidOculusLocation()
                     }
                 }
             }
-
             return null;
         }
         private string NotFoundHandler()
@@ -157,8 +174,7 @@ private string NotFoundHandler()
                             FormPlatformSelect selector = new FormPlatformSelect(this);
                             selector.ShowDialog();
                             found = true;
-                            Properties.Settings.Default.InstallPath = path;
-                            Properties.Settings.Default.Save();
+                            SaveInstallPath(path);
                             return path;
                         }
                         else
@@ -199,5 +215,23 @@ public string ManualFind()
             }
             return string.Empty;
         }
+
+        public string GetPlatformString()
+        {
+            switch (platform)
+            {
+                case Platform.Steam: return "Steam";
+                case Platform.Oculus: return "Oculus";
+            }
+            return "Default";
+        }
+
+        // Ensure that platform is saved along with install path
+        public void SaveInstallPath(string _path)
+        {
+            Properties.Settings.Default.InstallPath = _path;
+            Properties.Settings.Default.Platform = (int)platform;
+            Properties.Settings.Default.Save();
+        }
     }
 }
diff --git a/BeatSaberModManager/Core/RemoteLogic.cs b/BeatSaberModManager/Core/RemoteLogic.cs
@@ -73,22 +73,35 @@ public void PopulateReleases()
 
                     var files = current["downloads"];
 
-                    JSONNode steam = files[0];
-                    JSONNode oculus = files[1];
-
                     for (var f = 0; f < files.Count; ++f)
                     {
                         files[f]["url"] = BeatModsURL + files[f]["url"];
                     }
 
                     if (files.Count > 1)
                     {
+                        JSONNode steam = null;
+                        JSONNode oculus = null;
                         for (var f = 0; f < files.Count; ++f)
                         {
                             if (files[f]["type"] == "steam") steam = files[f];
                             if (files[f]["type"] == "oculus") oculus = files[f];
                         }
 
+                        if (steam == null && oculus == null)
+                        {
+                            MessageBox.Show($"Could not find Steam or Oculus release for {current["name"]}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                            continue;
+                        }else if (steam == null)
+                        {
+                            MessageBox.Show($"Could not find steam release for {current["name"]}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                            continue;
+                        }else if (oculus == null)
+                        {
+                            MessageBox.Show($"Could not find oculus release for {current["name"]}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                            continue;
+                        }
+
                         CreateRelease(
                             new ReleaseInfo(current["name"], current["name"], current["version"], current["author"]["username"],
                             current["description"], current["link"], 0, "0.13.2", steam["url"],

diff --git a/BeatSaberModManager/Forms/FormMain.Designer.cs b/BeatSaberModManager/Forms/FormMain.Designer.cs
diff --git a/BeatSaberModManager/Forms/FormMain.cs b/BeatSaberModManager/Forms/FormMain.cs
@@ -110,6 +110,7 @@ private void FormMain_Load(object sender, EventArgs e)
             {
                 new Thread(() => { updater.CheckForUpdates(); }).Start();
                 textBoxDirectory.Text = path.GetInstallationPath();
+                platformLabel.Text = $"Platform: {path.GetPlatformString()}";
 
                 new Thread(() => { RemoteLoad(); }).Start();
             }
@@ -208,7 +209,6 @@ private void ShowReleases()
                         groups.Add(release.category, index);
                         item.Group = listViewMods.Groups[index];
                     }
-
                     listViewMods.Items.Add(item);
                     release.itemHandle = item;
 
@@ -488,8 +488,7 @@ private void BrowseInstallationButton_Click(object sender, EventArgs e)
         {
             textBoxDirectory.Text = path.ManualFind();
             installer.installDirectory = textBoxDirectory.Text;
-            Properties.Settings.Default.InstallPath = textBoxDirectory.Text;
-            Properties.Settings.Default.Save();
+            path.SaveInstallPath(textBoxDirectory.Text);
         }
 
         private void ToggleTheme_CheckedChanged(object sender, EventArgs e)

diff --git a/BeatSaberModManager/Properties/AssemblyInfo.cs b/BeatSaberModManager/Properties/AssemblyInfo.cs
@@ -33,7 +33,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.3.4.0")]
-[assembly: AssemblyFileVersion("0.3.4.0")]
+[assembly: AssemblyVersion("0.3.4.1")]
+[assembly: AssemblyFileVersion("0.3.4.1")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/BeatSaberModManager/Properties/Settings.Designer.cs b/BeatSaberModManager/Properties/Settings.Designer.cs
diff --git a/BeatSaberModManager/Properties/Settings.settings b/BeatSaberModManager/Properties/Settings.settings
@@ -17,5 +17,8 @@
     <Setting Name="InstallPath" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="Platform" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/BeatSaberModManager/app.config b/BeatSaberModManager/app.config
@@ -22,6 +22,9 @@
             <setting name="InstallPath" serializeAs="String">
                 <value />
             </setting>
+            <setting name="Platform" serializeAs="String">
+                <value>0</value>
+            </setting>
         </BeatSaberModManager.Properties.Settings>
     </userSettings>
 </configuration>