Release 1.0.2

TychoTheTaco · TychoTheTaco · commit 1300d8547668 · 2025-10-25T13:49:19.000-07:00
diff --git a/assets/CustomSongTableViewCell.bsml b/assets/CustomSongTableViewCell.bsml
@@ -7,7 +7,7 @@
     <horizontal flex-height="100" vertical-fit="Unconstrained" spacing="1" pad-left="1" pad-right="1">
 
         <image id="image_" image-color="white" src="UI/Skin/Background" preserve-aspect="true" pref-width="6"
-               pref-height="6" min-width="6" min-height="6" flex-height="0"/>
+               pref-height="6" min-width="6" min-height="6" flex-height="0" raycast-target="false"/>
 
         <vertical horizontal-fit="Unconstrained" flex-width="100" vertical-fit="PreferredSize">
 
diff --git a/assets/SpotifyPlaylistTableViewCell.bsml b/assets/SpotifyPlaylistTableViewCell.bsml
@@ -3,7 +3,7 @@
             id="root_" bg='round-rect-panel' pad='1' spacing="1" child-align="MiddleLeft" vertical-fit="Unconstrained">
 
     <image id="image_" image-color="white" src="UI/Skin/Background" preserve-aspect="true" pref-width="6"
-           pref-height="6" min-width="6" min-height="6"/>
+           pref-height="6" min-width="6" min-height="6" raycast-target="false"/>
 
     <vertical horizontal-fit="Unconstrained" vertical-fit="PreferredSize" spacing="-0.5">
         <horizontal flex-width="100">
diff --git a/assets/SpotifyTrackTableViewCell.bsml b/assets/SpotifyTrackTableViewCell.bsml
@@ -3,7 +3,7 @@
             id="root_" bg='round-rect-panel' pad='1' spacing="1" child-align="MiddleLeft" vertical-fit="Unconstrained">
 
     <image id="image_" image-color="white" src="UI/Skin/Background" preserve-aspect="true" pref-width="6"
-           pref-height="6" min-width="6" min-height="6"/>
+           pref-height="6" min-width="6" min-height="6" raycast-target="false"/>
 
     <vertical horizontal-fit="Unconstrained" vertical-fit="PreferredSize" spacing="-0.5">
         <horizontal flex-width="100">
diff --git a/extern/includes/beatsaber-hook/shared b/extern/includes/beatsaber-hook/shared
@@ -0,0 +1 @@
+C:/Users/Tycho/AppData/Roaming/QPM-RS/cache/beatsaber-hook/6.4.2/src/shared
diff --git a/extern/includes/bs-cordl/include b/extern/includes/bs-cordl/include
@@ -0,0 +1 @@
+C:/Users/Tycho/AppData/Roaming/QPM-RS/cache/bs-cordl/4008.0.0/src/include
diff --git a/extern/includes/bsml/shared b/extern/includes/bsml/shared
@@ -0,0 +1 @@
+C:/Users/Tycho/AppData/Roaming/QPM-RS/cache/bsml/0.4.55/src/shared
diff --git a/extern/includes/custom-types/shared b/extern/includes/custom-types/shared
@@ -0,0 +1 @@
+C:/Users/Tycho/AppData/Roaming/QPM-RS/cache/custom-types/0.18.4/src/shared
diff --git a/extern/includes/fmt/fmt/include b/extern/includes/fmt/fmt/include
@@ -0,0 +1 @@
+C:/Users/Tycho/AppData/Roaming/QPM-RS/cache/fmt/11.0.2/src/fmt/include
diff --git a/extern/includes/libil2cpp/il2cpp b/extern/includes/libil2cpp/il2cpp
@@ -0,0 +1 @@
+C:/Users/Tycho/AppData/Roaming/QPM-RS/cache/libil2cpp/0.4.0/src/il2cpp
diff --git a/extern/includes/paper2_scotland2/shared b/extern/includes/paper2_scotland2/shared
@@ -0,0 +1 @@
+C:/Users/Tycho/AppData/Roaming/QPM-RS/cache/paper2_scotland2/4.7.0/src/shared
diff --git a/extern/includes/scotland2/shared b/extern/includes/scotland2/shared
@@ -0,0 +1 @@
+C:/Users/Tycho/AppData/Roaming/QPM-RS/cache/scotland2/0.1.6/src/shared
diff --git a/extern/includes/tinyxml2/shared b/extern/includes/tinyxml2/shared
@@ -0,0 +1 @@
+C:/Users/Tycho/AppData/Roaming/QPM-RS/cache/tinyxml2/10.0.0/src/shared
diff --git a/extern/libs/libbeatsaber-hook.debug.so b/extern/libs/libbeatsaber-hook.debug.so
@@ -0,0 +1 @@
+C:/Users/Tycho/AppData/Roaming/QPM-RS/cache/beatsaber-hook/6.4.2/lib/libbeatsaber-hook.debug.so
diff --git a/extern/libs/libbeatsaber-hook.so b/extern/libs/libbeatsaber-hook.so
@@ -0,0 +1 @@
+C:/Users/Tycho/AppData/Roaming/QPM-RS/cache/beatsaber-hook/6.4.2/lib/libbeatsaber-hook.so
diff --git a/extern/libs/libbsml.debug.so b/extern/libs/libbsml.debug.so
@@ -0,0 +1 @@
+C:/Users/Tycho/AppData/Roaming/QPM-RS/cache/bsml/0.4.55/lib/libbsml.debug.so
diff --git a/extern/libs/libbsml.so b/extern/libs/libbsml.so
@@ -0,0 +1 @@
+C:/Users/Tycho/AppData/Roaming/QPM-RS/cache/bsml/0.4.55/lib/libbsml.so
diff --git a/extern/libs/libcustom-types.debug.so b/extern/libs/libcustom-types.debug.so
@@ -0,0 +1 @@
+C:/Users/Tycho/AppData/Roaming/QPM-RS/cache/custom-types/0.18.4/lib/libcustom-types.debug.so
diff --git a/extern/libs/libcustom-types.so b/extern/libs/libcustom-types.so
@@ -0,0 +1 @@
+C:/Users/Tycho/AppData/Roaming/QPM-RS/cache/custom-types/0.18.4/lib/libcustom-types.so
diff --git a/extern/libs/libpaper2_scotland2.so b/extern/libs/libpaper2_scotland2.so
@@ -0,0 +1 @@
+C:/Users/Tycho/AppData/Roaming/QPM-RS/cache/paper2_scotland2/4.7.0/lib/libpaper2_scotland2.so
diff --git a/extern/libs/libsl2.debug.so b/extern/libs/libsl2.debug.so
@@ -0,0 +1 @@
+C:/Users/Tycho/AppData/Roaming/QPM-RS/cache/scotland2/0.1.6/lib/libsl2.debug.so
diff --git a/extern/libs/libsl2.so b/extern/libs/libsl2.so
@@ -0,0 +1 @@
+C:/Users/Tycho/AppData/Roaming/QPM-RS/cache/scotland2/0.1.6/lib/libsl2.so
diff --git a/qpm.json b/qpm.json
@@ -6,7 +6,7 @@
   "info": {
     "name": "Spotify Search",
     "id": "spotify-search",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "url": "https://github.com/TychoTheTaco/Beat-Saber-Spotify-Search",
     "additionalData": {
       "overrideSoName": "libspotify-search.so",
diff --git a/src/UI/TableViewCells/CustomSongTableViewCell.cpp b/src/UI/TableViewCells/CustomSongTableViewCell.cpp
@@ -6,6 +6,7 @@
 
 #include "Log.hpp"
 #include "Utils.hpp"
+#include "bsml/shared/BSML/Components/Backgroundable.hpp"
 
 using namespace SpotifySearch::UI;
 
@@ -118,5 +119,6 @@ void CustomSongTableViewCell::setSong(const SongDetailsCache::Song* const song)
     for (const SongDetailsCache::SongDifficulty* const difficulty : difficulties) {
         HMUI::CurvedTextMeshPro* const curvedTextMeshPro = BSML::Lite::CreateText(diffsContainer_->get_transform(), getDifficultyName(difficulty->difficulty), 2);
         curvedTextMeshPro->set_alignment(TMPro::TextAlignmentOptions::Center);
+        curvedTextMeshPro->set_raycastTarget(false);
     }
 }
diff --git a/src/UI/ViewControllers/MainViewController.cpp b/src/UI/ViewControllers/MainViewController.cpp
@@ -180,7 +180,7 @@ void MainViewController::reloadSpotifyTrackListView() {
             if (tracks.size() < 50) {
                 allTracksLoaded_ = true;
             }
-            BSML::MainThreadScheduler::Schedule([this, spotifyTrackTableViewDataSource, tracks]() {
+            BSML::MainThreadScheduler::Schedule([this, spotifyTrackTableViewDataSource, tracks, offset]() {
                 spotifyTrackTableViewDataSource->tracks_.insert(spotifyTrackTableViewDataSource->tracks_.end(), tracks.begin(), tracks.end());
                 if (spotifyTrackTableViewDataSource->tracks_.empty()) {
                     spotifyListViewStatusContainer_->get_gameObject()->set_active(true);
@@ -192,7 +192,16 @@ void MainViewController::reloadSpotifyTrackListView() {
 
                 isLoadingMoreSpotifyTracks_ = false;
                 spotifyTrackListLoadingIndicatorContainer_->get_gameObject()->set_active(false);
-                randomTrackButton_->get_gameObject()->set_active(true);
+
+                if (!spotifyTrackTableViewDataSource->tracks_.empty()) {
+                    randomTrackButton_->get_gameObject()->set_active(true);
+                }
+
+                // Automatically select the first track
+                if (offset == 0 && !spotifyTrackTableViewDataSource->tracks_.empty()) {
+                    spotifyTrackListView_->tableView->SelectCellWithIdx(0, true);
+                    onTrackSelected(spotifyTrackListView_->tableView, 0);
+                }
             });
         }).detach();
     };
diff --git a/src/main.cpp b/src/main.cpp
@@ -23,7 +23,11 @@ MOD_EXTERN_FUNC void setup(CModInfo* info) noexcept {
     *info = modInfo.to_c();
     getConfig().Load();
 
-    std::filesystem::rename("/sdcard/ModData/com.beatgames.beatsaber/logs2/spotify-search.log", "/sdcard/ModData/com.beatgames.beatsaber/logs2/spotify-search.1.log");
+    try {
+        std::filesystem::rename("/sdcard/ModData/com.beatgames.beatsaber/logs2/spotify-search.log", "/sdcard/ModData/com.beatgames.beatsaber/logs2/spotify-search.1.log");
+    } catch (const std::filesystem::filesystem_error &error) {
+        SpotifySearch::Log.info("Failed to rotate log: {}", error.what());
+    }
 
     // Initialize logging. This enables saving logs to disk.
     Paper::Logger::RegisterFileContextId("spotify-search");
diff --git a/tools/.gitignore b/tools/.gitignore
@@ -1,2 +1,5 @@
 # Python virtual environment
-venv/
+/venv/
+
+# Temporary directory
+/temp/
diff --git a/tools/adb.py b/tools/adb.py
@@ -0,0 +1,11 @@
+import subprocess
+from pathlib import Path, PosixPath
+from subprocess import CompletedProcess
+
+
+def push(src_path: str | Path, dst_path: str | PosixPath) -> CompletedProcess:
+    src_path = Path(src_path).absolute()
+    dst_path = Path(dst_path)
+    return subprocess.run(
+        ['adb', 'push', str(src_path), dst_path.as_posix()]
+    )
diff --git a/tools/ansi.py b/tools/ansi.py
@@ -0,0 +1,17 @@
+from enum import Enum
+
+ANSI_ESCAPE = '\x1B'
+
+class Color(Enum):
+    RESET = '[0m'
+    RED = '[31m'
+    YELLOW = '[33m'
+    CYAN = '[36m'
+    GRAY = '[90m'
+    MAGENTA = '[95m'
+
+    def __call__(self, content: str):
+        return self.wrap(content)
+
+    def wrap(self, content: str) -> str:
+        return f'{ANSI_ESCAPE}{self.value}{content}{ANSI_ESCAPE}{Color.RESET.value}'
diff --git a/tools/build_and_run.py b/tools/build_and_run.py
@@ -9,6 +9,8 @@
 from subprocess import CompletedProcess
 from typing import Any, Dict, List, Literal, Optional, get_args
 
+import adb
+
 logging.basicConfig(
     format='%(asctime)s [%(name)s] [%(levelname)s] %(message)s',
     level=logging.INFO,
@@ -158,24 +160,20 @@ def deploy(
     late_mod_files = mod_json['lateModFiles']
 
     for mod_file in mod_files:
-        process = subprocess.run([
-            'adb',
-            'push',
-            Path('build', 'debug', mod_file).as_posix(),
-            Path('/sdcard/ModData/com.beatgames.beatsaber/Modloader/early_mods/').as_posix()
-        ], cwd=project_dir)
-        if process.returncode != 0:
-            raise RuntimeError(f'Command Failed! Exit Code = {process.returncode}')
+        result = adb.push(
+            project_dir / 'build' / 'debug' / 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:
-        process = subprocess.run([
-            'adb',
-            'push',
-            Path('build', 'debug', mod_file).as_posix(),
-            Path('/sdcard/ModData/com.beatgames.beatsaber/Modloader/mods/').as_posix()
-        ], cwd=project_dir)
-        if process.returncode != 0:
-            raise RuntimeError(f'Command Failed! Exit Code = {process.returncode}')
+        result = adb.push(
+            project_dir / 'build' / 'debug' / mod_file,
+            '/sdcard/ModData/com.beatgames.beatsaber/Modloader/mods/'
+        )
+        if result.returncode != 0:
+            raise RuntimeError(f'Command Failed! Exit Code = {result.returncode}')
 
 
 def main():
diff --git a/tools/decode.py b/tools/decode.py
@@ -0,0 +1,79 @@
+import argparse
+import subprocess
+from os import environ
+from pathlib import Path
+from typing import List
+
+from ansi import Color
+
+
+def main():
+    # Parse arguments
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--input', '-i', required=True)
+    args = parser.parse_args()
+
+    input_arg: str = args.input
+
+    temp_dir = Path('./temp')
+    temp_dir.mkdir(exist_ok=True)
+
+    # Pull the debug library from the device
+    process = subprocess.run([
+        'adb',
+        'pull',
+        '/sdcard/ModData/com.beatgames.beatsaber/Modloader/mods/libspotify-search.so',
+    ], cwd=temp_dir, stderr=subprocess.STDOUT)
+
+    # Pull the logs from the device
+    log_file_dir = Path('/sdcard/ModData/com.beatgames.beatsaber/logs2')
+    log_file_paths = [
+        log_file_dir / 'spotify-search.log',
+        log_file_dir / 'spotify-search.1.log'
+    ]
+    for path in log_file_paths:
+        process = subprocess.run([
+            'adb',
+            'pull',
+            path.as_posix(),
+        ], cwd=temp_dir, stderr=subprocess.STDOUT)
+
+    ndk_path = Path(environ.get('ANDROID_NDK_HOME'))
+    ndk_stack_exe = ndk_path / 'ndk-stack.cmd'
+
+    project_root_dir = (Path(__file__) / '..' / '..').resolve()
+    build_output_dir = project_root_dir / 'build'
+
+    symbol_dir = temp_dir
+    print(ndk_stack_exe)
+
+    # Get logcat output
+    logcat_output_path = temp_dir / 'logcat.txt'
+    with open(logcat_output_path, 'w') as file:
+        process = subprocess.run([
+            'adb',
+            'shell',
+            'logcat -d *:F'
+        ], cwd=temp_dir, stdout=file)
+
+    input_paths: List[Path] = [
+        *[
+            temp_dir / p.name for p in log_file_paths
+        ],
+        Path(input_arg),
+        logcat_output_path
+    ]
+
+    for path in input_paths:
+        print(Color.CYAN(f'Decoding: {path}'))
+        process = subprocess.run([
+            str(ndk_stack_exe.absolute()),
+            '-sym',
+            str(symbol_dir),
+            '-i',
+            path.absolute()
+        ], stderr=subprocess.STDOUT)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/tools/hot_reload_watchdog.py b/tools/hot_reload_watchdog.py
@@ -1,17 +1,11 @@
-import subprocess
 import threading
 import time
-from pathlib import Path, PosixPath
+from pathlib import Path
 
 from watchdog.events import DirModifiedEvent, FileModifiedEvent, FileSystemEventHandler
 from watchdog.observers import Observer
 
-
-def push(src_path: str | Path, dst_path: str | PosixPath):
-    result = subprocess.call(
-        ['adb', 'push', str(src_path), str(dst_path)]
-    )
-    print(result)
+import adb
 
 
 class WatchdogEventHandler(FileSystemEventHandler):
@@ -24,7 +18,7 @@ def __init__(self, *, dst_dir: str | Path, debounce_seconds: float = 0.5):
 
     def on_timer_expired(self):
         for path in self._modified_files:
-            push(path, self._dst_dir.as_posix())
+            adb.push(path, self._dst_dir.as_posix())
         self._modified_files.clear()
 
     def on_modified(self, event: DirModifiedEvent | FileModifiedEvent):

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+C:/Users/Tycho/AppData/Roaming/QPM-RS/cache/beatsaber-hook/6.4.2/src/shared`