Fix startup bug

Author: timkicker

src/app/App.cpp

@@ -33,6 +33,8 @@ App::App() = default;
 App::~App() {
     elog("~App: DownloadQueue stop");
     DownloadQueue::get().stop();
+    elog("~App: clearing screens");
+    m_screens.clear();
     elog("~App: ImageCache clear");
     if (m_renderer) ImageCache::get().clear(m_renderer);
     elog("~App: DestroyRenderer");
@@ -45,8 +47,6 @@ App::~App() {
     TTF_Quit();
     elog("~App: SDL_Quit");
     SDL_Quit();
-    elog("~App: clearing screens");
-    m_screens.clear();
     elog("~App: done");
 }
 

src/net/HttpClient.cpp

@@ -1,13 +1,23 @@
 #include "HttpClient.h"
+#include <atomic>
 #include "util/Logger.h"
 #include <curl/curl.h>
 
+struct CancelCtx { std::atomic<bool>* flag; };
+
+static int progressCallback(void* userdata, curl_off_t, curl_off_t, curl_off_t, curl_off_t) {
+    auto* ctx = static_cast<CancelCtx*>(userdata);
+    if (ctx && ctx->flag && ctx->flag->load()) return 1; // abort
+    return 0;
+}
+
 static size_t writeCallback(void* ptr, size_t size, size_t nmemb, std::string* data) {
     data->append((char*)ptr, size * nmemb);
     return size * nmemb;
 }
 
-bool HttpClient::get(const std::string& url, std::string& result) {
+bool HttpClient::get(const std::string& url, std::string& result,
+                    std::atomic<bool>* cancelFlag) {
     LOG_INFO("HTTP GET: %s", url.c_str());
 
     CURL* curl = curl_easy_init();
@@ -27,6 +37,10 @@ bool HttpClient::get(const std::string& url, std::string& result) {
     curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
     curl_easy_setopt(curl, CURLOPT_USERAGENT, "WiiUModStore/0.1");
 
+    CancelCtx ctx{ cancelFlag };
+    curl_easy_setopt(curl, CURLOPT_XFERINFOFUNCTION, progressCallback);
+    curl_easy_setopt(curl, CURLOPT_XFERINFODATA, &ctx);
+    curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L);
     LOG_INFO("curl_easy_perform starting...");
     CURLcode res = curl_easy_perform(curl);
     LOG_INFO("curl_easy_perform returned: %d", res);

src/net/HttpClient.h

@@ -1,9 +1,14 @@
 #pragma once
 #include <string>
-
+#include <atomic>
+#include <curl/curl.h>
 class HttpClient {
 public:
     // Fetches URL content into result string.
     // Returns true on success, false on error.
-    static bool get(const std::string& url, std::string& result);
+    // If cancelFlag is set to true during the request, curl aborts immediately.
+    static bool get(const std::string& url, std::string& result,
+                    std::atomic<bool>* cancelFlag = nullptr);
+private:
+    static int progressCallback(void* userdata, curl_off_t, curl_off_t, curl_off_t, curl_off_t);
 };

src/net/RepoManager.cpp

@@ -1,4 +1,5 @@
 #include "RepoManager.h"
+#include <atomic>
 #include "util/Logger.h"
 
 #include <curl/curl.h>
@@ -21,7 +22,12 @@ bool RepoManager::validateUrl(const std::string& url) {
     return true;
 }
 
-static std::string fetchUrl(const std::string& url, std::string& error) {
+struct FetchCancelCtx { std::atomic<bool>* flag; };
+static int fetchProgress(void* ud, curl_off_t, curl_off_t, curl_off_t, curl_off_t) {
+    auto* ctx = static_cast<FetchCancelCtx*>(ud);
+    return (ctx && ctx->flag && ctx->flag->load()) ? 1 : 0;
+}
+static std::string fetchUrl(const std::string& url, std::string& error, std::atomic<bool>* cancelFlag = nullptr) {
     LOG_INFO("fetchUrl: %s", url.c_str());
     std::string body;
     CURL* curl = curl_easy_init();
@@ -30,12 +36,16 @@ static std::string fetchUrl(const std::string& url, std::string& error) {
     curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION,  writeString);
     curl_easy_setopt(curl, CURLOPT_WRITEDATA,      &body);
     curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
-    curl_easy_setopt(curl, CURLOPT_TIMEOUT,        30L);
-    curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 10L);
+    curl_easy_setopt(curl, CURLOPT_TIMEOUT,        5L);
+    curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 3L);
     curl_easy_setopt(curl, CURLOPT_NOSIGNAL,       1L);
     curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
     curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
     curl_easy_setopt(curl, CURLOPT_USERAGENT,      "WiiUModStore/0.1");
+    FetchCancelCtx ctx{ cancelFlag };
+    curl_easy_setopt(curl, CURLOPT_XFERINFOFUNCTION, fetchProgress);
+    curl_easy_setopt(curl, CURLOPT_XFERINFODATA,     &ctx);
+    curl_easy_setopt(curl, CURLOPT_NOPROGRESS,       0L);
     LOG_INFO("calling curl_easy_perform...");
     CURLcode res = curl_easy_perform(curl);
     LOG_INFO("curl returned: %d", res);
@@ -56,7 +66,7 @@ static std::string resolveUrl(const std::string& base, const std::string& path)
     return base.substr(0, slash + 1) + path;
 }
 
-void RepoManager::fetch(const std::string& url) {
+void RepoManager::fetch(const std::string& url, std::atomic<bool>* cancelFlag) {
     m_lastError.clear();
     m_repo = {};
 
@@ -67,7 +77,7 @@ void RepoManager::fetch(const std::string& url) {
     }
 
     std::string err;
-    std::string body = fetchUrl(url, err);
+    std::string body = fetchUrl(url, err, cancelFlag);
     if (body.empty()) {
         m_lastError = "Network error: " + err;
         LOG_ERROR("RepoManager: %s", m_lastError.c_str());
@@ -101,7 +111,7 @@ void RepoManager::fetch(const std::string& url) {
                 std::string gameUrl  = resolveUrl(url, gamePath);
                 LOG_INFO("RepoManager: fetching game from %s", gameUrl.c_str());
 
-                std::string gameBody = fetchUrl(gameUrl, err);
+                std::string gameBody = fetchUrl(gameUrl, err, cancelFlag);
                 if (gameBody.empty()) {
                     LOG_WARN("RepoManager: failed to fetch %s: %s", gameUrl.c_str(), err.c_str());
                     continue;

src/net/RepoManager.h

@@ -4,6 +4,7 @@
 #include <optional>
 #include <vector>
 #include <cstdint>
+#include <atomic>
 
 struct Mod {
     std::string id;
@@ -46,7 +47,7 @@ class RepoManager {
     // Returns false if URL is invalid format
     static bool validateUrl(const std::string& url);
 
-    void fetch(const std::string& url);
+    void fetch(const std::string& url, std::atomic<bool>* cancelFlag = nullptr);
 
     const Repo&        repo()      const { return m_repo; }
     const std::string& lastError() const { return m_lastError; }

src/ui/MainLayout.cpp

@@ -25,10 +25,16 @@ static constexpr int GRID_TOP      = 70;
 MainLayout::MainLayout(App* app) : Screen(app) {}
 
 MainLayout::~MainLayout() {
-    if (m_fetchThread.joinable()) m_fetchThread.detach();
+    elog("~MainLayout: start");
+    m_stopFetch = true;
+    elog("~MainLayout: joining fetchThread");
+    if (m_fetchThread.joinable()) m_fetchThread.join();
+    elog("~MainLayout: join done");
+    elog("~MainLayout: closing fonts");
     if (m_fontNormal) TTF_CloseFont(m_fontNormal);
     if (m_fontSmall)  TTF_CloseFont(m_fontSmall);
     if (m_fontTiny)   TTF_CloseFont(m_fontTiny);
+    elog("~MainLayout: done");
 }
 
 void MainLayout::onEnter() {
@@ -51,7 +57,7 @@ void MainLayout::onEnter() {
                 if (m_stopFetch) break;
                 LOG_INFO("Processing repo: %s", url.c_str());
                 RepoManager rm;
-                rm.fetch(url);
+                rm.fetch(url, &m_stopFetch);
                 {
                     std::lock_guard<std::mutex> sl(m_repoMutex);
                     m_repoStatus[url] = rm.lastError().empty() ? "OK" : rm.lastError();
@@ -68,6 +74,7 @@ void MainLayout::onEnter() {
                 }
             }
 
+            if (m_stopFetch) return;
             std::lock_guard<std::mutex> lock(m_repoMutex);
             LOG_INFO("Fetch loop done, %zu total games", combined.games.size());
             m_repo = combined;