Merge pull request #80 from lolPants/reee-v2

Fixes and stuff and things

Author: Umbranoxio

BeatSaberModManager/Core/RemoteLogic.cs

@@ -152,25 +152,21 @@ private void CreateRelease(ReleaseInfo release)
             if (release.gameVersion != selectedGameVersion.value)
                 return;
 
-            ReleaseInfo test = releases.Find(x => x.name == release.name);
-            if (test != null)
-            {
-                Version testVersion = new Version(test.version);
-                Version newVersion = new Version(release.version);
-
-                if (testVersion > newVersion)
-                {
-                    return;
-                }
-                else
-                {
-                    int idx = releases.FindIndex(x => (x.name == test.name) && (x.version == test.version));
-                    releases[idx] = release;
-                }
-            } else
+            ReleaseInfo current = releases.Find(x => x.name == release.name);
+            if (current == null)
             {
                 releases.Add(release);
+                return;
             }
+
+            Version currentVersion = new Version(current.version);
+            Version newVersion = new Version(release.version);
+
+            if (currentVersion >= newVersion)
+                return;
+
+            releases.Remove(current);
+            releases.Add(release);
         }
     }
 }

BeatSaberModManager/Forms/FormMain.cs

@@ -70,6 +70,10 @@ private void RemoteLoad()
 
         private void comboBox_gameVersions_SelectedIndexChanged(object sender, EventArgs e)
         {
+            // For some reason this breaks deps/conflicts
+            // God knows why
+            // listViewMods.Items.Clear();
+
             ComboBox comboBox = (ComboBox)sender;
             GameVersion gameVersion = remote.gameVersions[comboBox.SelectedIndex];
 
@@ -121,6 +125,8 @@ private void ShowReleases()
                 }
             }
 
+            ReRenderListView();
+
             ListViewGroup[] sortedGroups = new ListViewGroup[this.listViewMods.Groups.Count];
 
             listViewMods.Groups.CopyTo(sortedGroups, 0);
@@ -147,6 +153,7 @@ private void UpdateStatus(string status)
                 labelStatus.Text = formattedText;
             }));
         }
+
         private void CheckDefaultMod(ReleaseInfo release, ListViewItem item)
         {
             string link = release.downloadLink.ToLower();
@@ -264,10 +271,16 @@ private void listViewMods_ItemChecked(object sender, ItemCheckedEventArgs e)
                     Range range = new Range(link.semver);
 
                     return range.IsSatisfied(version);
-                }).ToList();
+                })
+                .GroupBy(lvi =>
+                {
+                    ReleaseInfo info = (ReleaseInfo)lvi.Tag;
+                    return $"{info.name}@{info.version}";
+                }).Select(x => x.First()).ToList();
 
                 if (filtered.Count != release.dependsOn.Count)
                 {
+                    Console.WriteLine($"aaa // {release.name}@{release.version}");
                     release.install = false;
                     release.disabled = true;