From 977331c3b2cbd0f4a2e66519437e41e26aab5a10 Mon Sep 17 00:00:00 2001
From: ITotalJustice <47043333+ITotalJustice@users.noreply.github.com>
Date: Tue, 14 Jan 2025 15:45:52 +0000
Subject: [PATCH] remove download non-thread_queue code, fix thread queue exit
 bug

due to the previous commit, requesting the stop token to exit during a download
would cause the thread queue itself to exit.
---
 sphaira/source/download.cpp | 54 +++++++++----------------------------
 1 file changed, 13 insertions(+), 41 deletions(-)

diff --git a/sphaira/source/download.cpp b/sphaira/source/download.cpp
index 9104c96..d99bce8 100644
--- a/sphaira/source/download.cpp
+++ b/sphaira/source/download.cpp
@@ -25,7 +25,6 @@ namespace {
         log_write("curl_share_setopt(%s, %s) msg: %s\n", #opt, #v, curl_share_strerror(r)); \
     } \
 
-#define USE_THREAD_QUEUE 1
 constexpr auto API_AGENT = "ITotalJustice";
 constexpr u64 CHUNK_SIZE = 1024*1024;
 constexpr auto MAX_THREADS = 4;
@@ -302,18 +301,19 @@ struct ThreadQueue {
     }
 
     auto Add(const Api& api) -> bool {
+        if (api.GetUrl().empty() || api.GetPath().empty() || !api.GetOnComplete()) {
+            return false;
+        }
+
         mutexLock(&m_mutex);
         ON_SCOPE_EXIT(mutexUnlock(&m_mutex));
 
-        ThreadQueueEntry entry{};
-        entry.api = api;
-
         switch (api.GetPriority()) {
             case Priority::Normal:
-                m_entries.emplace_back(entry);
+                m_entries.emplace_back(api);
                 break;
             case Priority::High:
-                m_entries.emplace_front(entry);
+                m_entries.emplace_front(api);
                 break;
         }
 
@@ -443,6 +443,11 @@ auto header_callback(char* b, size_t size, size_t nitems, void* userdata) -> siz
 }
 
 auto DownloadInternal(CURL* curl, const Api& e) -> ApiResult {
+    // check if stop has been requested before starting download
+    if (e.GetToken().stop_requested()) {
+        return {};
+    }
+
     fs::FsPath tmp_buf;
     const bool has_file = !e.GetPath().empty() && e.GetPath() != "";
     const bool has_post = !e.GetFields().empty() && e.GetFields() != "";
@@ -596,23 +601,18 @@ void ThreadEntry::ThreadFunc(void* p) {
         auto rc = waitSingle(waiterForUEvent(&data->m_uevent), UINT64_MAX);
         // log_write("woke up\n");
         if (!g_running) {
-            return;
+            break;
         }
+
         if (R_FAILED(rc)) {
             continue;
         }
 
-        #if 1
         const auto result = DownloadInternal(data->m_curl, data->m_api);
         if (g_running && data->m_api.GetOnComplete() && !data->m_api.GetToken().stop_requested()) {
             const DownloadEventData event_data{data->m_api.GetOnComplete(), result, data->m_api.GetToken()};
             evman::push(std::move(event_data), false);
-        } else {
-            break;
         }
-        #endif
-        // mutexLock(&data->m_mutex);
-        // ON_SCOPE_EXIT(mutexUnlock(&data->m_mutex));
 
         data->m_in_progress = false;
         // notify the queue that there's a space free
@@ -750,39 +750,11 @@ auto ToFile(const Api& e) -> ApiResult {
 }
 
 auto ToMemoryAsync(const Api& api) -> bool {
-    #if USE_THREAD_QUEUE
     return g_thread_queue.Add(api);
-    #else
-    // mutexLock(&g_thread_queue.m_mutex);
-    // ON_SCOPE_EXIT(mutexUnlock(&g_thread_queue.m_mutex));
-
-    for (auto& entry : g_threads) {
-        if (!entry.InProgress()) {
-            return entry.Setup(callback, url);
-        }
-    }
-
-    log_write("failed to start download, no avaliable threads\n");
-    return false;
-    #endif
 }
 
 auto ToFileAsync(const Api& e) -> bool {
-    #if USE_THREAD_QUEUE
     return g_thread_queue.Add(e);
-    #else
-    // mutexLock(&g_thread_queue.m_mutex);
-    // ON_SCOPE_EXIT(mutexUnlock(&g_thread_queue.m_mutex));
-
-    for (auto& entry : g_threads) {
-        if (!entry.InProgress()) {
-            return entry.Setup(callback, url, out);
-        }
-    }
-
-    log_write("failed to start download, no avaliable threads\n");
-    return false;
-    #endif
 }
 
 } // namespace sphaira::curl