From 8e6400e8d8c3a2ec1b734c4405b27dd2b547a835 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <jmansfield@cadixdev.org>
Date: Fri, 26 Mar 2021 20:03:57 +0000
Subject: [PATCH] NOISSUE Fix edgecase where new searches won't be processed

This resolves an issue with the modpacks.ch search functionality, in
which a search issued while one is currently in progress won't be made
and the UI won't allow for the search to be made after.

Reproduction Steps:
1. Open the FTB pane in the Add Instance Dialog
2. Perform a search while MMC is still performing the initial search

The search won't be performed, the existing search will have been
aborted, and you are unable to try the search again (without trying a
different search in the meantime).

This was caused by 2 things:
1. A search cannot be re-attempted, and this logic doesn't consider
   failures.
2. The failure slot wasn't called when the NetJob was aborted, so
   the search would never be performed - but the term would be
   stored as if it had (trigering point 1).

I have resolved this by doing 2 things:
1. If the failure slot is called, set a searchState of Failed. Allow
   search re-attempts in this case.
2. If there is a present NetJob, abort and reset it. The immediately
   continue with the search.
---
 .../pages/modplatform/ftb/FtbListModel.cpp    | 29 +++++++------------
 .../pages/modplatform/ftb/FtbListModel.h      |  3 +-
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/application/pages/modplatform/ftb/FtbListModel.cpp b/application/pages/modplatform/ftb/FtbListModel.cpp
index 63236827..98973f2e 100644
--- a/application/pages/modplatform/ftb/FtbListModel.cpp
+++ b/application/pages/modplatform/ftb/FtbListModel.cpp
@@ -106,21 +106,22 @@ void ListModel::getLogo(const QString &logo, const QString &logoUrl, LogoCallbac
 
 void ListModel::searchWithTerm(const QString &term)
 {
-    if(currentSearchTerm == term && currentSearchTerm.isNull() == term.isNull()) {
+    if(searchState != Failed && currentSearchTerm == term && currentSearchTerm.isNull() == term.isNull()) {
+        // unless the search has failed, then there is no need to perform an identical search.
         return;
     }
     currentSearchTerm = term;
+
     if(jobPtr) {
         jobPtr->abort();
-        searchState = ResetRequested;
-        return;
-    }
-    else {
-        beginResetModel();
-        modpacks.clear();
-        endResetModel();
-        searchState = None;
+        jobPtr.reset();
     }
+
+    beginResetModel();
+    modpacks.clear();
+    endResetModel();
+    searchState = None;
+
     performSearch();
 }
 
@@ -154,15 +155,7 @@ void ListModel::searchRequestFailed(QString reason)
     jobPtr.reset();
     remainingPacks.clear();
 
-    if(searchState == ResetRequested) {
-        beginResetModel();
-        modpacks.clear();
-        endResetModel();
-
-        performSearch();
-    } else {
-        searchState = Finished;
-    }
+    searchState = Failed;
 }
 
 void ListModel::requestPack()
diff --git a/application/pages/modplatform/ftb/FtbListModel.h b/application/pages/modplatform/ftb/FtbListModel.h
index 9c057d73..de94e6ba 100644
--- a/application/pages/modplatform/ftb/FtbListModel.h
+++ b/application/pages/modplatform/ftb/FtbListModel.h
@@ -57,7 +57,8 @@ private:
         None,
         CanPossiblyFetchMore,
         ResetRequested,
-        Finished
+        Finished,
+        Failed,
     } searchState = None;
     NetJobPtr jobPtr;
     int currentPack;