Release 1.0.1

Author: TychoTheTaco

.gitea/workflows/build.yml

@@ -0,0 +1,47 @@
+name: Build
+
+on:
+  - push
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y cmake ninja-build
+          
+          # QPM
+          TMP_DIR="/tmp/qpm"
+          mkdir -p "$TMP_DIR"
+          curl -L "https://github.com/QuestPackageManager/QPM.CLI/releases/download/v1.5.2/qpm-linux-x64-static.zip" -o "$TMP_DIR/qpm.zip"
+          unzip -o "$TMP_DIR/qpm.zip" -d "$TMP_DIR"
+          QPM_BIN=$(find "$TMP_DIR" -type f -name qpm)
+          chmod +x "$QPM_BIN"
+          sudo ln -sf "$QPM_BIN" /usr/local/bin/qpm
+          
+          # NDK
+          qpm ndk download 27
+          NDK_PATH=$(qpm ndk list | grep -F "27." | awk '{print $3}')
+          echo "ANDROID_NDK_HOME=$NDK_PATH" >> $GITEA_ENV
+
+      - name: Build
+        run: |
+          qpm restore
+          cd tools
+          python3 build_and_run.py --clean --build-only
+          python3 build_and_run.py --build-only --build-type release
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: Artifacts
+          compression-level: 0
+          path: |
+            build/libspotify-search.so
+            build/debug/libspotify-search.so
+            build/spotify-search-v*.qmod

.github/workflows/build.yml

@@ -0,0 +1,47 @@
+name: Build
+
+on:
+  - push
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y cmake ninja-build
+          
+          # QPM
+          TMP_DIR="/tmp/qpm"
+          mkdir -p "$TMP_DIR"
+          curl -L "https://github.com/QuestPackageManager/QPM.CLI/releases/download/v1.5.2/qpm-linux-x64-static.zip" -o "$TMP_DIR/qpm.zip"
+          unzip -o "$TMP_DIR/qpm.zip" -d "$TMP_DIR"
+          QPM_BIN=$(find "$TMP_DIR" -type f -name qpm)
+          chmod +x "$QPM_BIN"
+          sudo ln -sf "$QPM_BIN" /usr/local/bin/qpm
+          
+          # NDK
+          qpm ndk download 27
+          NDK_PATH=$(qpm ndk list | grep -F "27." | awk '{print $3}')
+          echo "ANDROID_NDK_HOME=$NDK_PATH" >> $GITHUB_ENV
+
+      - name: Build
+        run: |
+          qpm restore
+          cd tools
+          python3 build_and_run.py --clean --build-only
+          python3 build_and_run.py --build-only --build-type release
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: Artifacts
+          compression-level: 0
+          path: |
+            build/libspotify-search.so
+            build/debug/libspotify-search.so
+            build/spotify-search-v*.qmod

.gitignore

@@ -1,15 +1,16 @@
 # Build output
-build/
-*.qmod
+/build/
 
 # Python virtual environment
 venv/
 
 # External dependencies
-extern/
+/extern/
 
 # Auto-generated files
-include/Assets.hpp
+/include/Assets.hpp
+mod.json
+qpm.shared.json
 
 # Crash dump
 crash.txt

assets/MainViewController.bsml

@@ -64,8 +64,9 @@
         <vertical horizontal-fit="Unconstrained" pref-width="70">
             <horizontal pref-height="6">
                 <text text='Search Results' align="Left"/>
-                <horizontal pad-right="-4">
+                <horizontal pad-right="-4" child-align="MiddleRight" spacing="3" horizontal-fit="MinSize">
                     <icon-button active="false" pad="0" id="showAllByArtistButton_" icon="#GuestUserIcon" on-click="onShowAllByArtistButtonClicked" pref-width="8" pref-height="6" hover-hint="Show all songs from this artist"/>
+                    <icon-button active="false" pad="0" id="hideDownloadedMapsButton_" on-click="onHideDownloadedMapsButtonClicked" pref-width="8" pref-height="6" hover-hint="Hide downloaded maps"/>
                 </horizontal>
             </horizontal>
 

assets/show_downloaded_songs.png

@@ -12,6 +12,7 @@ struct CustomSongFilter {
     }
 
     std::vector<SongDetailsCache::MapDifficulty> difficulties_;
+    bool includeDownloadedSongs_ = true;
 };
 
 }

include/CustomSongFilter.hpp

@@ -8,9 +8,9 @@ class SpriteCache {
 
     public:
 
-    UnityW<UnityEngine::Sprite> get(const std::string& key);
+    UnityW<UnityEngine::Sprite> get(const std::string_view key);
 
-    void add(const std::string& key, UnityW<UnityEngine::Sprite> sprite);
+    void add(const std::string_view key, UnityW<UnityEngine::Sprite> sprite);
     void addToDiskCache(const std::string& key, const std::vector<uint8_t>& data);
 
     static SpriteCache& getInstance() {
@@ -20,7 +20,7 @@ class SpriteCache {
 
     private:
 
-    std::string getKeyHash(const std::string& key);
+    std::string getKeyHash(const std::string_view key);
 
     std::unordered_map<std::string, UnityW<UnityEngine::Sprite>> memoryCache_;
 

include/SpriteCache.hpp

@@ -0,0 +1,34 @@
+#pragma once
+
+#include <functional>
+#include <thread>
+
+#include "Log.hpp"
+
+namespace SpotifySearch {
+
+class ThreadPool {
+    public:
+    struct Job {
+        size_t id_;
+        std::function<void()> task_;
+
+        bool operator==(const Job& other) const {
+            return id_ == other.id_;
+        }
+    };
+
+    void submit(const std::function<void()>& task);
+
+    void wait();
+
+    private:
+    size_t maxThreadCount_ = std::thread::hardware_concurrency();
+    std::vector<Job> jobs_;
+    std::mutex mutex_;
+    std::condition_variable conditionVariable_;
+
+    void onJobFinished(const Job& job);
+};
+
+}// namespace SpotifySearch

include/ThreadPool.hpp

@@ -25,7 +25,7 @@ using BaseViewController = HMUI::ViewController;
 
 namespace SpotifySearch::Filter {
 
-using SongFilterFunction = std::function<std::vector<const SongDetailsCache::Song*>(const spotify::Track& track, const CustomSongFilter& customSongFilter)>;
+using SongFilterFunction = std::function<bool(const SongDetailsCache::Song* const song, const spotify::Track& track)>;
 using SongScoreFunction = std::function<int(const spotify::Track& track, const SongDetailsCache::Song& song)>;
 
 extern SongFilterFunction DEFAULT_SONG_FILTER_FUNCTION;
@@ -77,6 +77,8 @@ DECLARE_CLASS_CODEGEN_INTERFACES(SpotifySearch::UI::ViewControllers, MainViewCon
     DECLARE_INSTANCE_FIELD(UnityW<TMPro::TextMeshProUGUI>, searchResultsListStatusTextView_);
     DECLARE_INSTANCE_FIELD(UnityW<UnityEngine::UI::Button>, showAllByArtistButton_);
     DECLARE_INSTANCE_METHOD(void, onShowAllByArtistButtonClicked);
+    DECLARE_INSTANCE_FIELD(UnityW<UnityEngine::UI::Button>, hideDownloadedMapsButton_);
+    DECLARE_INSTANCE_METHOD(void, onHideDownloadedMapsButtonClicked);
 
     // Custom Song Preview
     DECLARE_INSTANCE_FIELD(TMPro::TextMeshProUGUI*, previewSongNameTextView_);
@@ -113,6 +115,8 @@ DECLARE_CLASS_CODEGEN_INTERFACES(SpotifySearch::UI::ViewControllers, MainViewCon
     std::atomic<bool> allPlaylistsLoaded_;
 
     std::atomic<bool> isShowingAllTracksByArtist_;
+    std::atomic<bool> isShowingDownloadedMaps_;
+
     SpotifySearch::Filter::SongFilterFunction currentSongFilter_;
     SpotifySearch::Filter::SongScoreFunction currentSongScore_;
 

include/UI/ViewControllers/MainViewController.hpp

@@ -41,6 +41,8 @@ std::string jsonDocumentToString(const rapidjson::Value& value);
 
 SongDetailsCache::MapDifficulty getMapDifficultyFromString(const std::string& text);
 
+void removeRaycastFromButtonIcon(UnityW<UnityEngine::UI::Button> button);
+
 namespace json {
 
 std::string getString(const rapidjson::Value& json, const std::string& key);