Release 1.0.4

Author: TychoTheTaco

include/UI/ViewControllers/MainViewController.hpp

@@ -132,7 +132,7 @@ DECLARE_CLASS_CODEGEN_INTERFACES(SpotifySearch::UI::ViewControllers, MainViewCon
 
     void doSongSearch(const spotify::Track& track);
 
-    std::unique_ptr<CustomSongFilter> customSongFilter_;
+    CustomSongFilter customSongFilter_;
 
     void startDownloadThread();
 

qpm.json

@@ -6,7 +6,7 @@
   "info": {
     "name": "Spotify Search",
     "id": "spotify-search",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "url": "https://github.com/TychoTheTaco/Beat-Saber-Spotify-Search",
     "additionalData": {
       "overrideSoName": "libspotify-search.so",

src/SpriteCache.cpp

@@ -19,6 +19,9 @@ bool isSpriteValid(UnityW<UnityEngine::Sprite> sprite) {
     if (!texture) {
         return false;
     }
+    if (!UnityEngine::Object::IsNativeObjectAlive(texture)) {
+        return false;
+    }
 
     return true;
 }

src/UI/ViewControllers/MainViewController.cpp

@@ -339,7 +339,8 @@ void MainViewController::onSpotifyTrackListRetryButtonClicked() {
 }
 
 void MainViewController::setFilter(const CustomSongFilter& customSongFilter) {
-    customSongFilter_ = std::make_unique<CustomSongFilter>(customSongFilter);
+    customSongFilter_ = customSongFilter;
+    customSongFilter_.includeDownloadedSongs_ = isShowingDownloadedMaps_;
     if (selectedTrack_) {
         doSongSearch(*selectedTrack_);
     }
@@ -353,7 +354,7 @@ void MainViewController::ctor() {
     isLoadingMoreSpotifyPlaylists_ = false;
     allTracksLoaded_ = false;
     allPlaylistsLoaded_ = false;
-    customSongFilter_ = std::make_unique<CustomSongFilter>();
+    customSongFilter_ = CustomSongFilter();
     isShowingAllTracksByArtist_ = false;
     isShowingDownloadedMaps_ = true;
     currentSongFilter_ = SpotifySearch::Filter::DEFAULT_SONG_FILTER_FUNCTION;
@@ -650,11 +651,12 @@ void MainViewController::doSongSearch(const spotify::Track& track) {
     searchResultsListViewErrorContainer_->get_gameObject()->set_active(false);
 
     isSearchInProgress_ = true;
-    std::thread([this, track]() {
+    const CustomSongFilter customSongFilter = customSongFilter_;
+    std::thread([this, track, customSongFilter]() {
         SongDetailsCache::SongDetails* songDetails = SongDetailsCache::SongDetails::Init().get();
-        std::vector<const SongDetailsCache::Song*> songs = songDetails->FindSongs([this](const SongDetailsCache::SongDifficulty& songDifficulty) {
+        std::vector<const SongDetailsCache::Song*> songs = songDetails->FindSongs([customSongFilter](const SongDetailsCache::SongDifficulty& songDifficulty) {
             // Difficulty
-            const std::vector<SongDetailsCache::MapDifficulty>& filterMapDifficulties = customSongFilter_->difficulties_;
+            const std::vector<SongDetailsCache::MapDifficulty>& filterMapDifficulties = customSongFilter.difficulties_;
             if (!filterMapDifficulties.empty()) {
                 const SongDetailsCache::MapDifficulty mapDifficulty = songDifficulty.difficulty;
                 if (!std::ranges::contains(filterMapDifficulties, mapDifficulty)) {
@@ -663,7 +665,7 @@ void MainViewController::doSongSearch(const spotify::Track& track) {
             }
 
             // Show downloaded songs
-            if (!customSongFilter_->includeDownloadedSongs_) {
+            if (!customSongFilter.includeDownloadedSongs_) {
                 if (SongCore::API::Loading::GetLevelByHash(songDifficulty.song().hash())) {
                     return false;
                 }
@@ -1013,9 +1015,8 @@ void MainViewController::onHideDownloadedMapsButtonClicked() {
     controller->HideHintInstant(hoverHintComponent);
     controller->SetupAndShowHintPanel(hoverHintComponent);
 
-    auto csf = std::move(customSongFilter_);
-    csf->includeDownloadedSongs_ = isShowingDownloadedMaps_;
-    setFilter(*csf);
+    customSongFilter_.includeDownloadedSongs_ = isShowingDownloadedMaps_;
+    setFilter(customSongFilter_);
 }
 
 void MainViewController::onDownloadButtonClicked() {

tools/build_and_run.py

@@ -159,17 +159,21 @@ def deploy(
     mod_files = mod_json['modFiles']
     late_mod_files = mod_json['lateModFiles']
 
+    lib_prefix_path_release = project_dir / 'build'
+    lib_prefix_path_debug = lib_prefix_path_release / 'debug'
+    lib_prefix_path = lib_prefix_path_release
+
     for mod_file in mod_files:
         result = adb.push(
-            project_dir / 'build' / 'debug' / mod_file,
+            lib_prefix_path / mod_file,
             '/sdcard/ModData/com.beatgames.beatsaber/Modloader/early_mods/'
         )
         if result.returncode != 0:
             raise RuntimeError(f'Command Failed! Exit Code = {result.returncode}')
 
     for mod_file in late_mod_files:
         result = adb.push(
-            project_dir / 'build' / 'debug' / mod_file,
+            lib_prefix_path / mod_file,
             '/sdcard/ModData/com.beatgames.beatsaber/Modloader/mods/'
         )
         if result.returncode != 0:

tools/decode.py

@@ -20,6 +20,10 @@ def main():
     temp_dir = Path('./temp')
     temp_dir.mkdir(exist_ok=True)
 
+    symbols_dir = temp_dir
+    if symbols_arg:
+        symbols_dir = Path(symbols_arg)
+
     # Pull the debug library from the device
     if not symbols_arg:
         print(Color.CYAN('Pulling libraries from device...'))
@@ -65,15 +69,14 @@ def main():
     project_root_dir = (Path(__file__) / '..' / '..').resolve()
     build_output_dir = project_root_dir / 'build'
 
-    symbol_dir = temp_dir
     print(ndk_stack_exe)
 
     for path in total_paths:
         print(Color.CYAN(f'Decoding: {path}'))
         process = subprocess.run([
             str(ndk_stack_exe.absolute()),
             '-sym',
-            str(symbol_dir),
+            str(symbols_dir),
             '-i',
             path.absolute()
         ], stderr=subprocess.STDOUT)