Release 1.0.3

Author: TychoTheTaco

assets/SpotifyLoginViewController.bsml

@@ -9,15 +9,15 @@
         <text font-size="3.5" text="Client ID"/>
         <horizontal>
             <text-field id="clientIdTextField_" text="Client ID"/>
-            <icon-button id="clientIdPasteButton_" on-click="onPasteClientIdButtonClicked" hover-hint="Paste" icon="#Papercut" pref-width="8" pref-height="8"/>
+            <icon-button id="clientIdPasteButton_" on-click="onPasteClientIdButtonClicked" hover-hint="Paste" pref-width="8" pref-height="8"/>
         </horizontal>
     </vertical>
 
     <vertical vertical-fit="PreferredSize" horizontal-fit="Unconstrained" spacing="-1">
         <text font-size="3.5" text="Client Secret"/>
         <horizontal>
             <text-field id="clientSecretTextField_" text="Client Secret"/>
-            <icon-button id="clientSecretPasteButton_" on-click="onPasteClientSecretButtonClicked" hover-hint="Paste" icon="#HorizontalArrowIcon" pref-width="8" pref-height="8"/>
+            <icon-button id="clientSecretPasteButton_" on-click="onPasteClientSecretButtonClicked" hover-hint="Paste" pref-width="8" pref-height="8"/>
         </horizontal>
     </vertical>
 

qpm.json

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

qpm_defines.cmake

@@ -1,6 +1,6 @@
 # YOU SHOULD NOT MANUALLY EDIT THIS FILE, QPM WILL VOID ALL CHANGES
 # Version defines, pretty useful
-set(MOD_VERSION "1.0.1")
+set(MOD_VERSION "1.0.3")
 # take the mod name and just remove spaces, that will be MOD_ID, if you don't like it change it after the include of this file
 set(MOD_ID "SpotifySearch")
 

src/UI/ViewControllers/SpotifyLoginViewController.cpp

@@ -53,6 +53,7 @@ void SpotifyLoginViewController::PostParse() {
         button->GetComponent<BSML::ButtonIconImage*>()->SetIcon(sprite);
         static constexpr float scale = 1.5f;
         button->get_transform()->Find("Content/Icon")->set_localScale({scale, scale, scale});
+        Utils::removeRaycastFromButtonIcon(button);
     }
 
     // Set the redirect URI text field
@@ -61,6 +62,8 @@ void SpotifyLoginViewController::PostParse() {
 }
 
 bool generateSelfSignedCert(const std::string& certFile, const std::string& keyFile) {
+    SpotifySearch::Log.info("Generating SSL certificate. certFile = {} keyFile = {}", certFile, keyFile);
+
     // Generate RSA key pair
     EVP_PKEY* pkey = EVP_PKEY_new();
     RSA* rsa = RSA_new();
@@ -91,11 +94,21 @@ bool generateSelfSignedCert(const std::string& certFile, const std::string& keyF
 
     // Write certificate to file
     FILE* certFp = fopen(certFile.c_str(), "wb");
+    if (!certFp) {
+        const auto reason = strerror(errno);
+        SpotifySearch::Log.info("Failed to open certFile! error = {} reason = {} path = {}", errno, reason, certFile);
+        return false;
+    }
     PEM_write_X509(certFp, x509);
     fclose(certFp);
 
     // Write private key to file
     FILE* keyFp = fopen(keyFile.c_str(), "wb");
+    if (!keyFp) {
+        const auto reason = strerror(errno);
+        SpotifySearch::Log.info("Failed to open keyFile! error = {} reason = {} path = {}", errno, reason, keyFile);
+        return false;
+    }
     PEM_write_PrivateKey(keyFp, pkey, nullptr, nullptr, 0, nullptr, nullptr);
     fclose(keyFp);
 
@@ -224,15 +237,14 @@ void SpotifyLoginViewController::onLoginButtonClicked() {
             // Check we got the authorization code
             std::string authorizationCode;
             for (const auto& item : request.params) {
-                SpotifySearch::Log.debug("PARAM: {}, {}", item.first, item.second);
                 if (item.first == "code") {
                     authorizationCode = item.second;
                     break;
                 }
             }
             if (!authorizationCode.empty()) {
                 response.status = 200;
-                response.set_content("Login successful. You can now close this window.", "text/plain");
+                response.set_content("Login successful. You can now close this window and return to Beat Saber.", "text/plain");
                 BSML::MainThreadScheduler::Schedule([this, authorizationCode](){
                     onAuthorizationCodeReceived(authorizationCode);
                 });

src/main.cpp

@@ -32,6 +32,8 @@ MOD_EXTERN_FUNC void setup(CModInfo* info) noexcept {
     // Initialize logging. This enables saving logs to disk.
     Paper::Logger::RegisterFileContextId("spotify-search");
 
+    SpotifySearch::Log.info("Version: {}", info->version);
+
     // Capture fatal logs from logcat to get crash stacks
     std::thread([](){
         SpotifySearch::Log.info("Logcat thread started");
@@ -129,7 +131,13 @@ MOD_EXTERN_FUNC void late_load() noexcept {
     // Install hooks
     INSTALL_HOOK(SpotifySearch::Log, onDismissFlowCoordinator);
 
-    SpotifySearch::dataDir_ = getDataDir(modInfo);
+    // Set up the data directory
+    const std::string dataDirectoryString = getDataDir(modInfo);
+    const std::filesystem::path dataDirectory {dataDirectoryString};
+    if (!std::filesystem::exists(dataDirectory)) {
+        std::filesystem::create_directory(dataDirectory);
+    }
+    SpotifySearch::dataDir_ = dataDirectory;
 
     // Initialize the Spotify client
     SpotifySearch::spotifyClient = std::make_shared<spotify::Client>();

tools/decode.py

@@ -2,7 +2,7 @@
 import subprocess
 from os import environ
 from pathlib import Path
-from typing import List
+from typing import List, Optional
 
 from ansi import Color
 
@@ -11,33 +11,54 @@ def main():
     # Parse arguments
     parser = argparse.ArgumentParser()
     parser.add_argument('--input', '-i', required=True)
+    parser.add_argument('--symbols', '-s')
     args = parser.parse_args()
 
     input_arg: str = args.input
+    symbols_arg: Optional[str] = args.symbols
 
     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:
+    if not symbols_arg:
+        print(Color.CYAN('Pulling libraries from device...'))
         process = subprocess.run([
             'adb',
             'pull',
-            path.as_posix(),
+            '/sdcard/ModData/com.beatgames.beatsaber/Modloader/mods/libspotify-search.so',
         ], cwd=temp_dir, stderr=subprocess.STDOUT)
 
+    total_paths: List[Path] = []
+
+    match input_arg:
+        case 'logs':
+            # 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)
+                total_paths.append(temp_dir / path.name)
+        case 'logcat':
+            # 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)
+            total_paths.append(logcat_output_path)
+        case _:
+            total_paths.append(Path(input_arg))
+
     ndk_path = Path(environ.get('ANDROID_NDK_HOME'))
     ndk_stack_exe = ndk_path / 'ndk-stack.cmd'
 
@@ -47,24 +68,7 @@ def main():
     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:
+    for path in total_paths:
         print(Color.CYAN(f'Decoding: {path}'))
         process = subprocess.run([
             str(ndk_stack_exe.absolute()),