Merge remote-tracking branch 'origin/genius-playlist'

# Conflicts:
#	crates/mt-tauri/src/lastfm/client.rs

Author: pythoninthegrass

.github/actions/setup-tauri-build/action.yml

@@ -9,6 +9,22 @@ inputs:
 runs:
   using: 'composite'
   steps:
+    - name: Read pinned Rust toolchain from .tool-versions (Unix)
+      if: runner.os != 'Windows'
+      id: rust-version-unix
+      shell: bash
+      run: |
+        version=$(grep '^rust ' .tool-versions | awk '{print $2}')
+        echo "toolchain=${version}" >> "$GITHUB_OUTPUT"
+
+    - name: Read pinned Rust toolchain from .tool-versions (Windows)
+      if: runner.os == 'Windows'
+      id: rust-version-windows
+      shell: pwsh
+      run: |
+        $version = (Select-String -Path .tool-versions -Pattern '^rust ').Line -replace '^rust\s+',''
+        echo "toolchain=$version" >> $env:GITHUB_OUTPUT
+
     - name: Setup macOS self-hosted runner PATH
       if: runner.os == 'macOS'
       shell: bash
@@ -46,10 +62,11 @@ runs:
       run: npm ci
 
 
-    - name: Setup Rust nightly toolchain
+    - name: Setup Rust toolchain (${{ steps.rust-version-unix.outputs.toolchain || steps.rust-version-windows.outputs.toolchain }})
       uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
-        toolchain: nightly
+        toolchain: ${{ steps.rust-version-unix.outputs.toolchain || steps.rust-version-windows.outputs.toolchain }}
+        target: ${{ runner.os == 'Windows' && 'x86_64-pc-windows-msvc' || '' }}
         cache: false
 
     - name: Setup CI environment (macOS/Linux)

.github/workflows/test.yml

@@ -26,10 +26,13 @@ env:
   FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
 
 jobs:
-  rust-lint:
-    name: Rust Lint and Format Check
-    runs-on: [self-hosted, macOS, ARM64]
-    timeout-minutes: 15
+  rust:
+    name: Rust Lint, Format, and Test
+    runs-on: [macOS, ARM64, studio]
+    timeout-minutes: 20
+    env:
+      CARGO_INCREMENTAL: 1
+      CARGO_TERM_COLOR: always
 
     steps:
       - name: Setup macOS self-hosted runner PATH
@@ -40,19 +43,36 @@ jobs:
 
       - uses: actions/checkout@v6
 
-      - name: Setup Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: nightly
-          components: clippy, rustfmt
-          cache: false
-
-      - name: Cargo clippy
-        run: cargo clippy --workspace -- -D warnings
+      - name: Setup Tauri build environment
+        uses: ./.github/actions/setup-tauri-build
 
       - name: Cargo fmt check
         run: cargo fmt --all -- --check
 
+      - name: Cargo clippy
+        run: cargo clippy --workspace --all-features -- -D warnings
+
+      - uses: cargo-bins/cargo-binstall@main
+
+      - name: Install cargo-tarpaulin
+        run: cargo binstall --no-confirm --force cargo-tarpaulin
+
+      - name: Run Rust tests with coverage
+        run: |
+          cargo tarpaulin --workspace --out Html --out Json --output-dir coverage \
+            --ignore-tests --skip-clean \
+            --exclude-files 'crates/mt-tauri/src/commands/*' 'crates/mt-tauri/src/lib.rs' 'crates/mt-tauri/src/main.rs' 'crates/mt-tauri/src/watcher.rs' 'crates/mt-tauri/src/dialog.rs' 'crates/mt-tauri/src/media_keys.rs' \
+            --fail-under 50
+
+      - name: Upload coverage report
+        if: always()
+        continue-on-error: true
+        uses: actions/upload-artifact@v7
+        with:
+          name: rust-coverage
+          path: coverage/
+          retention-days: 30
+
   deno-lint:
     name: Deno Lint and Format Check
     runs-on: blacksmith-4vcpu-ubuntu-2404
@@ -74,7 +94,7 @@ jobs:
 
   build:
     name: Build (${{ matrix.platform }})
-    needs: [rust-lint, deno-lint, vitest-tests, playwright-tests, rust-tests]
+    needs: [rust, deno-lint, vitest-tests, playwright-tests]
     strategy:
       fail-fast: false
       matrix:
@@ -215,41 +235,3 @@ jobs:
           path: test-results/
           retention-days: 30
 
-  rust-tests:
-    name: Rust Tests with Coverage
-    needs: rust-lint
-    runs-on: [macOS, ARM64, studio]
-    timeout-minutes: 10
-    env:
-      CARGO_INCREMENTAL: 1
-      CARGO_TERM_COLOR: always
-
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Setup Tauri build environment
-        uses: ./.github/actions/setup-tauri-build
-
-      - name: Check Rust build
-        run: cargo check --workspace --all-features
-
-      - uses: cargo-bins/cargo-binstall@main
-
-      - name: Install cargo-tarpaulin
-        run: cargo binstall --no-confirm --force cargo-tarpaulin
-
-      - name: Run Rust tests with coverage
-        run: |
-          cargo tarpaulin --workspace --out Html --out Json --output-dir coverage \
-            --ignore-tests --skip-clean \
-            --exclude-files 'crates/mt-tauri/src/commands/*' 'crates/mt-tauri/src/lib.rs' 'crates/mt-tauri/src/main.rs' 'crates/mt-tauri/src/watcher.rs' 'crates/mt-tauri/src/dialog.rs' 'crates/mt-tauri/src/media_keys.rs' \
-            --fail-under 50
-
-      - name: Upload coverage report
-        if: always()
-        continue-on-error: true
-        uses: actions/upload-artifact@v7
-        with:
-          name: rust-coverage
-          path: coverage/
-          retention-days: 30

crates/mt-tauri/src/lastfm/client.rs

@@ -24,6 +24,19 @@ impl LastFmClient {
         }
     }
 
+    #[cfg(all(test, feature = "agent"))]
+    pub(crate) fn new_unconfigured() -> Self {
+        Self {
+            config: ApiKeyConfig {
+                api_key: None,
+                api_secret: None,
+            },
+            rate_limiter: Arc::new(RateLimiter::new()),
+            http_client: reqwest::Client::new(),
+            base_url: "https://ws.audioscrobbler.com/2.0/".to_string(),
+        }
+    }
+
     /// Check if API is properly configured
     pub(crate) fn is_configured(&self) -> bool {
         self.config.is_configured()

taskfiles/ci.yml

@@ -15,11 +15,13 @@ vars:
   CONFIG: '{{.CONFIG | default ""}}'
   CONFIG_FLAG: '{{if .CONFIG}}--config {{.CONFIG}}{{end}}'
   EXE_EXT: '{{if eq OS "windows"}}.exe{{end}}'
+  PINNED_RUST:
+    sh: grep '^rust ' {{.ROOT_DIR}}/.tool-versions | awk '{print $2}'
 
 env:
   PATH: "{{.CARGO_BIN}}:{{.MISE_SHIMS}}:{{.PATH}}"
   RUSTC_WRAPPER: ""
-  RUSTUP_TOOLCHAIN: nightly
+  RUSTUP_TOOLCHAIN: "{{.PINNED_RUST}}"
 
 tasks:
   setup:
@@ -33,27 +35,28 @@ tasks:
     platforms: [darwin, linux]
     cmds:
       - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs |
-          sh -s -- -y --default-toolchain nightly --no-modify-path
-      - rustup toolchain install nightly --profile minimal --no-self-update
-      - rustup default nightly
+          sh -s -- -y --default-toolchain {{.PINNED_RUST}} --no-modify-path
+      - rustup toolchain install {{.PINNED_RUST}} --profile minimal --no-self-update
+      - rustup default {{.PINNED_RUST}}
       - rustc --version
       - cargo --version
     status:
       - test -x "{{.CARGO_BIN}}/rustup"
       - test -x "{{.CARGO_BIN}}/rustc"
       - test -x "{{.CARGO_BIN}}/cargo"
-      - rustup run nightly rustc --version
+      - rustup run {{.PINNED_RUST}} rustc --version
 
   setup-rust-windows:
     desc: "Configure rustup nightly toolchain (Windows)"
     platforms: [windows]
     cmds:
-      - rustup toolchain install nightly --profile minimal --no-self-update --target x86_64-pc-windows-msvc
-      - rustup default nightly
+      - rustup toolchain install {{.PINNED_RUST}} --profile minimal --no-self-update --target x86_64-pc-windows-msvc
+      - rustup default {{.PINNED_RUST}}
       - rustc --version
       - cargo --version
     status:
-      - rustup run nightly rustc --version
+      - rustup run {{.PINNED_RUST}} rustc --version
+      - rustup target list --installed --toolchain {{.PINNED_RUST}} | findstr x86_64-pc-windows-msvc
 
   setup-cargo-tools:
     desc: "Install cargo-binstall and tauri-cli"