From f9890e9e0ec865059b687e61438d45ef078daa82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Erik=20Andreas=20P=C3=B8rksen?=
 <erik.andreas.poerksen@gmail.com>
Date: Tue, 15 Oct 2019 20:10:46 +0200
Subject: [PATCH] added filtering to down-prioritize alternate files for
 curseforge addons

---
 build.gradle                                           |  2 +-
 .../TwitchOwned/CurseForge/CurseForgeAPI.java          |  5 +++++
 src/main/java/com/CAM/GUI/Controller.java              | 10 ++++------
 src/main/java/com/CAM/Updating/VersionInfo.java        |  2 +-
 system/CHANGELOG.txt                                   |  4 ++++
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index a21be13..752c064 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 group 'ClassicAddonManager'
-version '0.76'
+version '0.77'
 sourceCompatibility = 12
 
 repositories {
diff --git a/src/main/java/com/CAM/DataCollection/TwitchOwned/CurseForge/CurseForgeAPI.java b/src/main/java/com/CAM/DataCollection/TwitchOwned/CurseForge/CurseForgeAPI.java
index c604cf4..b1f2eb6 100644
--- a/src/main/java/com/CAM/DataCollection/TwitchOwned/CurseForge/CurseForgeAPI.java
+++ b/src/main/java/com/CAM/DataCollection/TwitchOwned/CurseForge/CurseForgeAPI.java
@@ -59,6 +59,11 @@ private CurseFile determineLatestFileByFlavor(String flavor){
             Date curFileDate = DateConverter.convertFromCurseAPI(latestFile.fileDate);
             Date fileDate = DateConverter.convertFromCurseAPI(file.fileDate);
             if(DateConverter.isNewerDate(fileDate, curFileDate)){
+                if(!latestFile.isAlternate && file.isAlternate){
+                    continue;
+                }
+                latestFile = file;
+            } else if(latestFile.isAlternate && !file.isAlternate){
                 latestFile = file;
             }
         }
diff --git a/src/main/java/com/CAM/GUI/Controller.java b/src/main/java/com/CAM/GUI/Controller.java
index 9555139..b3d08b7 100644
--- a/src/main/java/com/CAM/GUI/Controller.java
+++ b/src/main/java/com/CAM/GUI/Controller.java
@@ -384,12 +384,10 @@ private void curseSearch(String userQuery) throws ScrapeException {
             }
         }
 
-        ObservableList<CurseAddonResponse> observableList = null;
-        if(checkboxClassicSearch.isSelected()){
-            FXCollections.observableList(classicResults);
-        } else {
-            FXCollections.observableList(results);
-        }
+        ObservableList<CurseAddonResponse> observableList;
+        observableList = checkboxClassicSearch.isSelected()
+                ? FXCollections.observableList(classicResults)
+                : FXCollections.observableList(results);
         Platform.runLater(() -> {
             comboBoxSearch.show();
             comboBoxSearch.setItems(observableList);
diff --git a/src/main/java/com/CAM/Updating/VersionInfo.java b/src/main/java/com/CAM/Updating/VersionInfo.java
index 73e539e..b8a840b 100644
--- a/src/main/java/com/CAM/Updating/VersionInfo.java
+++ b/src/main/java/com/CAM/Updating/VersionInfo.java
@@ -5,7 +5,7 @@
 import java.io.*;
 
 public class VersionInfo {
-    public static final double CAM_VERSION = 0.76;
+    public static final double CAM_VERSION = 0.77;
     public static final double EXE_VERSION = 0.1;
     public static final double AUTOUPDATER_VERSION = 0.2;
 
diff --git a/system/CHANGELOG.txt b/system/CHANGELOG.txt
index e68cbcb..16aaf38 100644
--- a/system/CHANGELOG.txt
+++ b/system/CHANGELOG.txt
@@ -1,3 +1,7 @@
+v0.77
+    - Added option for classic only filtering for curseforge searches
+    - Will now down-prioritize 'alternate' versions of addon when updating
+
 v0.76
     - Bug fix (added conversion for old Tukui addons)