diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4f54eb0d..ed53970a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,5 +1,12 @@
name: Build
-on: [push, pull_request]
+on:
+ push:
+ pull_request:
+ workflow_dispatch:
+
+env:
+ FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
permissions:
contents: read
@@ -9,200 +16,232 @@ jobs:
runs-on: ubuntu-22.04
steps:
-
- - name: Checkout
- uses: actions/checkout@v3
-
- - name: Rust Cache
- uses: actions/cache@v3
- with:
- path: |
- ~/.cargo/bin/
- ~/.cargo/registry/index/
- ~/.cargo/registry/cache/
- ~/.cargo/git/db/
- target/
- key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
- - name: Install dependencies
- run: |
- sudo apt update
- sudo apt install -y lld autogen libasound2-dev pkg-config make libssl-dev gcc g++ curl wget git libwebkit2gtk-4.1-dev
-
- - name: Install NodeJS
- uses: actions/setup-node@v3
- with:
- node-version: 18
-
- - name: Install pnpm
- uses: pnpm/action-setup@v2
- with:
- version: 8
-
- - name: Build
- run: |
- cd client
- pnpm i
- pnpm run build
- cd ..
- cargo update
- cargo build --release
-
- - name: Bundle
- run: |
- tar zcf OneTagger-linux.tar.gz -C target/release onetagger
- tar zcf OneTagger-linux-cli.tar.gz -C target/release onetagger-cli
- mkdir dist
- mv OneTagger-linux.tar.gz dist/
- mv OneTagger-linux-cli.tar.gz dist/
+ - name: Checkout
+ uses: actions/checkout@v4
+
+ - name: Rust Cache
+ uses: actions/cache@v4
+ with:
+ path: |
+ ~/.cargo/bin/
+ ~/.cargo/registry/index/
+ ~/.cargo/registry/cache/
+ ~/.cargo/git/db/
+ target/
+ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+ - name: Install dependencies
+ run: |
+ sudo apt update
+ sudo apt install -y lld autogen libasound2-dev pkg-config make libssl-dev gcc g++ curl wget git libwebkit2gtk-4.1-dev
+
+ - name: Install NodeJS
+ uses: actions/setup-node@v4
+ with:
+ node-version: 22
+
+ - name: Install pnpm
+ uses: pnpm/action-setup@v4
+ with:
+ version: 8
+
+ - name: Build
+ run: |
+ cd client
+ pnpm i
+ pnpm run build
+ cd ..
+ cargo update
+ cargo build --release
+
+ - name: Bundle
+ run: |
+ tar zcf OneTagger-linux.tar.gz -C target/release onetagger
+ tar zcf OneTagger-linux-cli.tar.gz -C target/release onetagger-cli
+ mkdir dist
+ mv OneTagger-linux.tar.gz dist/
+ mv OneTagger-linux-cli.tar.gz dist/
- - name: Upload Linux
- uses: actions/upload-artifact@v4
- with:
- name: onetagger-linux
- path: dist/OneTagger-linux.tar.gz
+ - name: Upload Linux
+ uses: actions/upload-artifact@v4
+ with:
+ name: onetagger-linux
+ path: dist/OneTagger-linux.tar.gz
- - name: Upload Linux CLI
- uses: actions/upload-artifact@v4
- with:
- name: onetagger-linux-cli
- path: dist/OneTagger-linux-cli.tar.gz
-
+ - name: Upload Linux CLI
+ uses: actions/upload-artifact@v4
+ with:
+ name: onetagger-linux-cli
+ path: dist/OneTagger-linux-cli.tar.gz
build-win:
name: Windows
runs-on: windows-2022
steps:
- - name: Checkout
- uses: actions/checkout@v3
-
- - name: Rust Cache
- uses: actions/cache@v3
- with:
- path: |
- ~/.cargo/bin/
- ~/.cargo/registry/index/
- ~/.cargo/registry/cache/
- ~/.cargo/git/db/
- target/
- key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
- - name: Install NodeJS
- uses: actions/setup-node@v3
- with:
- node-version: 18
-
- - name: Install pnpm
- uses: pnpm/action-setup@v2
- with:
- version: 8
-
- - name: Install Dependencies
- run: |
- choco install nsis -y
- rustup update
-
- - name: Build
- run: |
- cd client
- pnpm i
- pnpm run build
- cd ..
- cargo update
- cargo build --release
+ - name: Checkout
+ uses: actions/checkout@v4
+
+ - name: Rust Cache
+ uses: actions/cache@v4
+ with:
+ path: |
+ ~/.cargo/bin/
+ ~/.cargo/registry/index/
+ ~/.cargo/registry/cache/
+ ~/.cargo/git/db/
+ target/
+ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+ - name: Install NodeJS
+ uses: actions/setup-node@v4
+ with:
+ node-version: 22
+
+ - name: Install pnpm
+ uses: pnpm/action-setup@v4
+ with:
+ version: 8
+
+ - name: Install Dependencies
+ run: |
+ choco install nsis -y
+ rustup update
+
+ - name: Build
+ run: |
+ cd client
+ pnpm i
+ pnpm run build
+ cd ..
+ cargo update
+ cargo build --release
- - name: Bundle
- run: |
- mkdir dist
- powershell -command "(new-object System.Net.WebClient).DownloadFile('https://aka.ms/vs/16/release/vc_redist.x64.exe','vc_redist.x64.exe')"
- powershell -command "(new-object System.Net.WebClient).DownloadFile('https://go.microsoft.com/fwlink/p/?LinkId=2124703','MicrosoftEdgeWebview2Setup.exe')"
- &'C:\Program Files (x86)\NSIS\makensis.exe' 'assets\installer.nsi'
- copy target\release\onetagger.exe dist\OneTagger-windows.exe
- copy target\release\onetagger-cli.exe dist\OneTagger-windows-cli.exe
-
- - name: Upload Archive
- uses: actions/upload-artifact@v4
- with:
- name: onetagger-win
- path: |
- dist/OneTagger-windows.exe
+ - name: Bundle
+ run: |
+ mkdir dist
+ powershell -command "(new-object System.Net.WebClient).DownloadFile('https://aka.ms/vs/16/release/vc_redist.x64.exe','vc_redist.x64.exe')"
+ powershell -command "(new-object System.Net.WebClient).DownloadFile('https://go.microsoft.com/fwlink/p/?LinkId=2124703','MicrosoftEdgeWebview2Setup.exe')"
+ &'C:\Program Files (x86)\NSIS\makensis.exe' 'assets\installer.nsi'
+ copy target\release\onetagger.exe dist\OneTagger-windows.exe
+ copy target\release\onetagger-cli.exe dist\OneTagger-windows-cli.exe
+
+ - name: Upload Archive
+ uses: actions/upload-artifact@v4
+ with:
+ name: onetagger-win
+ path: |
+ dist/OneTagger-windows.exe
- - name: Upload Archive
- uses: actions/upload-artifact@v4
- with:
- name: onetagger-win-setup
- path: dist/OneTagger-windows-setup.exe
-
- - name: Upload CLI
- uses: actions/upload-artifact@v4
- with:
- name: onetagger-win-cli
- path: |
- dist/OneTagger-windows-cli.exe
-
- build-mac:
- name: Mac
- runs-on: macos-13
+ - name: Upload Archive Setup
+ uses: actions/upload-artifact@v4
+ with:
+ name: onetagger-win-setup
+ path: dist/OneTagger-windows-setup.exe
+
+ - name: Upload CLI
+ uses: actions/upload-artifact@v4
+ with:
+ name: onetagger-win-cli
+ path: |
+ dist/OneTagger-windows-cli.exe
+
+ build-mac-universal:
+ name: macOS Universal
+ runs-on: macos-14
steps:
-
- - name: Checkout
- uses: actions/checkout@v3
-
- - name: Rust Cache
- uses: actions/cache@v3
- with:
- path: |
- ~/.cargo/bin/
- ~/.cargo/registry/index/
- ~/.cargo/registry/cache/
- ~/.cargo/git/db/
- target/
- key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
- - name: Install dependencies
- run: |
- brew install rustup nodejs pnpm
- rustup install stable
- cargo install cargo-bundle --version 0.6.1 --locked || true
-
- - name: Build
- run: |
- cd client
- pnpm i
- pnpm run build
- cd ..
- cargo update
- cargo build --release
- cargo bundle --release
-
- - name: Bundle
- run: |
- mkdir dist
-
- cd target/release/bundle/osx
- chmod +x OneTagger.app/Contents/MacOS/onetagger
- zip -r OneTagger-mac.zip .
- cd -
-
- cd target/release
- chmod +x onetagger-cli
- zip OneTagger-mac-cli.zip onetagger-cli
- cd -
-
- mv target/release/bundle/osx/OneTagger-mac.zip dist/
- mv target/release/OneTagger-mac-cli.zip dist/
-
- - name: Upload Mac
- uses: actions/upload-artifact@v4
- with:
- name: onetagger-mac
- path: dist/OneTagger-mac.zip
-
- - name: Upload Mac CLI
- uses: actions/upload-artifact@v4
- with:
- name: onetagger-mac-cli
- path: dist/OneTagger-mac-cli.zip
-
+ - name: Checkout v4
+ uses: actions/checkout@v4
+
+ - name: Set up Rust
+ uses: dtolnay/rust-toolchain@stable
+ with:
+ targets: x86_64-apple-darwin, aarch64-apple-darwin
+
+ - name: Rust Cache v4
+ uses: actions/cache@v4
+ with:
+ path: |
+ ~/.cargo/bin/
+ ~/.cargo/registry/index/
+ ~/.cargo/registry/cache/
+ ~/.cargo/git/db/
+ target/
+ key: ${{ runner.os }}-universal-cargo-${{ hashFiles('**/Cargo.lock') }}
+
+ - name: Install cargo-bundle
+ run: |
+ if ! command -v cargo-bundle &> /dev/null; then
+ cargo install cargo-bundle --version 0.6.1 --locked
+ fi
+
+ - name: Install NodeJS 22
+ uses: actions/setup-node@v4
+ with:
+ node-version: 22
+
+ - name: Install pnpm 8
+ uses: pnpm/action-setup@v4
+ with:
+ version: 8
+
+ - name: Build UI via PNPM
+ run: |
+ cd client
+ pnpm i
+ pnpm run build
+
+ - name: Build macOS Intel & Apple Silicon Architecture Binaries
+ run: |
+ cargo update
+
+ # Build & bundle Intel x86_64
+ cargo build --release --target x86_64-apple-darwin
+ cargo bundle --release --target x86_64-apple-darwin
+
+ # Build & bundle Apple Silicon
+ cargo build --release --target aarch64-apple-darwin
+ cargo bundle --release --target aarch64-apple-darwin
+
+ - name: Create Universal Bundle
+ run: |
+ mkdir dist
+
+ # Copy the ARM64 bundle structure as our foundation
+ cp -R target/aarch64-apple-darwin/release/bundle/osx/OneTagger.app .
+
+ # Combine the core GUI binaries inside the bundle
+ lipo -create \
+ target/x86_64-apple-darwin/release/bundle/osx/OneTagger.app/Contents/MacOS/onetagger \
+ target/aarch64-apple-darwin/release/bundle/osx/OneTagger.app/Contents/MacOS/onetagger \
+ -output OneTagger.app/Contents/MacOS/onetagger
+
+ # Combine the CLI binaries
+ lipo -create \
+ target/x86_64-apple-darwin/release/onetagger-cli \
+ target/aarch64-apple-darwin/release/onetagger-cli \
+ -output onetagger-cli
+
+ # Verify structural architecture matches both
+ file OneTagger.app/Contents/MacOS/onetagger
+ file onetagger-cli
+
+ chmod +x OneTagger.app/Contents/MacOS/onetagger
+ chmod +x onetagger-cli
+
+ # Package your universal distributions
+ zip -r dist/OneTagger-mac-universal.zip OneTagger.app
+ zip dist/OneTagger-mac-universal-cli.zip onetagger-cli
+
+ - name: Upload Universal Mac App
+ uses: actions/upload-artifact@v4
+ with:
+ name: onetagger-mac-universal
+ path: dist/OneTagger-mac-universal.zip
+
+ - name: Upload Universal Mac CLI
+ uses: actions/upload-artifact@v4
+ with:
+ name: onetagger-mac-universal-cli
+ path: dist/OneTagger-mac-universal-cli.zip
diff --git a/Cargo.lock b/Cargo.lock
index 1d3dc9a6..748293ec 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -35,21 +35,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
dependencies = [
"cfg-if",
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
"once_cell",
"version_check",
"zerocopy",
]
-[[package]]
-name = "aho-corasick"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
-dependencies = [
- "memchr",
-]
-
[[package]]
name = "aho-corasick"
version = "1.1.3"
@@ -77,23 +68,29 @@ dependencies = [
"equator",
]
+[[package]]
+name = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+
[[package]]
name = "alsa"
-version = "0.9.1"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43"
+checksum = "812947049edcd670a82cd5c73c3661d2e58468577ba8489de58e1a73c04cbd5d"
dependencies = [
"alsa-sys",
- "bitflags 2.9.1",
+ "bitflags 2.11.1",
"cfg-if",
"libc",
]
[[package]]
name = "alsa-sys"
-version = "0.3.1"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527"
+checksum = "ad7569085a265dd3f607ebecce7458eaab2132a84393534c95b18dcbc3f31e04"
dependencies = [
"libc",
"pkg-config",
@@ -116,9 +113,9 @@ dependencies = [
[[package]]
name = "anstream"
-version = "0.6.19"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933"
+checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d"
dependencies = [
"anstyle",
"anstyle-parse",
@@ -131,15 +128,15 @@ dependencies = [
[[package]]
name = "anstyle"
-version = "1.0.11"
+version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
+checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
[[package]]
name = "anstyle-parse"
-version = "0.2.7"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e"
dependencies = [
"utf8parse",
]
@@ -190,7 +187,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -257,6 +254,28 @@ dependencies = [
"arrayvec",
]
+[[package]]
+name = "aws-lc-rs"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ec2f1fc3ec205783a5da9a7e6c1509cc69dedf09a1949e412c1e18469326d00"
+dependencies = [
+ "aws-lc-sys",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-lc-sys"
+version = "0.41.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a2f9779ce85b93ab6170dd940ad0169b5766ff848247aff13bb788b832fe3f4"
+dependencies = [
+ "cc",
+ "cmake",
+ "dunce",
+ "fs_extra",
+]
+
[[package]]
name = "axum"
version = "0.8.4"
@@ -351,23 +370,30 @@ dependencies = [
]
[[package]]
-name = "bindgen"
-version = "0.72.0"
+name = "base64-simd"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195"
+dependencies = [
+ "outref 0.5.2",
+ "vsimd",
+]
+
+[[package]]
+name = "bit-set"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f72209734318d0b619a5e0f5129918b848c416e122a3c4ce054e03cb87b726f"
+checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
dependencies = [
- "bitflags 2.9.1",
- "cexpr",
- "clang-sys",
- "itertools 0.13.0",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash 2.1.1",
- "shlex",
- "syn 2.0.104",
+ "bit-vec",
]
+[[package]]
+name = "bit-vec"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+
[[package]]
name = "bit_field"
version = "0.10.2"
@@ -382,11 +408,11 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.9.1"
+version = "2.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
dependencies = [
- "serde",
+ "serde_core",
]
[[package]]
@@ -436,11 +462,11 @@ dependencies = [
[[package]]
name = "block2"
-version = "0.6.1"
+version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "340d2f0bdb2a43c1d3cd40513185b2bd7def0aa1052f956455114bc98f82dcf2"
+checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
dependencies = [
- "objc2 0.6.1",
+ "objc2 0.6.4",
]
[[package]]
@@ -465,6 +491,9 @@ name = "bumpalo"
version = "3.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+dependencies = [
+ "allocator-api2",
+]
[[package]]
name = "bytecheck"
@@ -518,7 +547,7 @@ version = "0.18.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.11.1",
"cairo-sys-rs",
"glib",
"libc",
@@ -537,12 +566,22 @@ dependencies = [
"system-deps",
]
+[[package]]
+name = "castaway"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dec551ab6e7578819132c713a93c022a05d60159dc86e7a7050223577484c55a"
+dependencies = [
+ "rustversion",
+]
+
[[package]]
name = "cc"
-version = "1.2.31"
+version = "1.2.62"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3a42d84bb6b69d3a8b3eaacf0d88f179e1929695e1ad012b6cf64d9caaa5fd2"
+checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98"
dependencies = [
+ "find-msvc-tools",
"jobserver",
"libc",
"shlex",
@@ -554,15 +593,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
-[[package]]
-name = "cexpr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-dependencies = [
- "nom 7.1.3",
-]
-
[[package]]
name = "cfg-expr"
version = "0.15.8"
@@ -585,6 +615,17 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+[[package]]
+name = "chacha20"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601"
+dependencies = [
+ "cfg-if",
+ "cpufeatures 0.3.0",
+ "rand_core 0.10.1",
+]
+
[[package]]
name = "chfft"
version = "0.3.4"
@@ -607,25 +648,14 @@ dependencies = [
"num-traits",
"serde",
"wasm-bindgen",
- "windows-link",
-]
-
-[[package]]
-name = "clang-sys"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
-dependencies = [
- "glob",
- "libc",
- "libloading",
+ "windows-link 0.1.3",
]
[[package]]
name = "clap"
-version = "4.5.42"
+version = "4.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed87a9d530bb41a67537289bafcac159cb3ee28460e0a4571123d2a778a6a882"
+checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51"
dependencies = [
"clap_builder",
"clap_derive",
@@ -633,9 +663,9 @@ dependencies = [
[[package]]
name = "clap_builder"
-version = "4.5.42"
+version = "4.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64f4f3f3c77c94aff3c7e9aac9a2ca1974a5adf392a8bb751e827d6d127ab966"
+checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f"
dependencies = [
"anstream",
"anstyle",
@@ -645,27 +675,39 @@ dependencies = [
[[package]]
name = "clap_derive"
-version = "4.5.41"
+version = "4.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
+checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9"
dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
name = "clap_lex"
-version = "0.7.5"
+version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
+checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9"
[[package]]
-name = "claxon"
-version = "0.4.3"
+name = "cmake"
+version = "0.1.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "cobs"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688"
+checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1"
+dependencies = [
+ "thiserror 2.0.12",
+]
[[package]]
name = "color_quant"
@@ -699,6 +741,20 @@ dependencies = [
"memchr",
]
+[[package]]
+name = "compact_str"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb1325a1cece981e8a296ab8f0f9b63ae357bd0784a9faaf548cc7b480707a"
+dependencies = [
+ "castaway",
+ "cfg-if",
+ "itoa",
+ "rustversion",
+ "ryu",
+ "static_assertions",
+]
+
[[package]]
name = "const-str"
version = "0.3.2"
@@ -719,12 +775,6 @@ dependencies = [
"syn 1.0.109",
]
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
[[package]]
name = "convert_case"
version = "0.6.0"
@@ -745,9 +795,9 @@ dependencies = [
[[package]]
name = "convert_case"
-version = "0.8.0"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baaaa0ecca5b51987b9423ccdc971514dd8b0bb7b4060b983d3664dad3f1f89f"
+checksum = "affbf0190ed2caf063e3def54ff444b449371d55c58e513a95ab98eca50adb49"
dependencies = [
"unicode-segmentation",
]
@@ -799,11 +849,11 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
[[package]]
name = "core-graphics"
-version = "0.24.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
+checksum = "064badf302c3194842cf2c5d61f56cc88e54a759313879cdf03abdd27d0c3b97"
dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.11.1",
"core-foundation",
"core-graphics-types",
"foreign-types",
@@ -816,52 +866,59 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.11.1",
"core-foundation",
"libc",
]
[[package]]
name = "coreaudio-rs"
-version = "0.11.3"
+version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace"
+checksum = "7d5d7dca3ebcf65a035582c9ad4385371a9d9ee6537474d2a278f4e1e475bb58"
dependencies = [
- "bitflags 1.3.2",
- "core-foundation-sys",
- "coreaudio-sys",
+ "bitflags 2.11.1",
+ "libc",
+ "objc2-audio-toolbox",
+ "objc2-core-audio",
+ "objc2-core-audio-types",
+ "objc2-core-foundation",
]
[[package]]
-name = "coreaudio-sys"
-version = "0.2.17"
+name = "cow-utils"
+version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ceec7a6067e62d6f931a2baf6f3a751f4a892595bcec1461a3c94ef9949864b6"
-dependencies = [
- "bindgen",
-]
+checksum = "417bef24afe1460300965a25ff4a24b8b45ad011948302ec221e8a0a81eb2c79"
[[package]]
name = "cpal"
-version = "0.15.3"
+version = "0.17.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779"
+checksum = "d8942da362c0f0d895d7cac616263f2f9424edc5687364dfd1d25ef7eba506d7"
dependencies = [
"alsa",
- "core-foundation-sys",
"coreaudio-rs",
"dasp_sample",
- "jni",
+ "jni 0.21.1",
"js-sys",
"libc",
- "mach2",
- "ndk 0.8.0",
+ "mach2 0.5.0",
+ "ndk",
"ndk-context",
- "oboe",
+ "num-derive",
+ "num-traits",
+ "objc2 0.6.4",
+ "objc2-audio-toolbox",
+ "objc2-avf-audio",
+ "objc2-core-audio",
+ "objc2-core-audio-types",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
- "windows 0.54.0",
+ "windows 0.61.3",
]
[[package]]
@@ -873,6 +930,15 @@ dependencies = [
"libc",
]
+[[package]]
+name = "cpufeatures"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201"
+dependencies = [
+ "libc",
+]
+
[[package]]
name = "crc32fast"
version = "1.5.0"
@@ -922,9 +988,9 @@ version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.11.1",
"crossterm_winapi",
- "derive_more 2.0.1",
+ "derive_more",
"document-features",
"mio",
"parking_lot",
@@ -961,44 +1027,40 @@ dependencies = [
[[package]]
name = "cssparser"
-version = "0.29.6"
+version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa"
+checksum = "9be934d936a0fbed5bcdc01042b770de1398bf79d0e192f49fa7faea0e99281e"
dependencies = [
- "cssparser-macros",
+ "cssparser-macros 0.6.1",
"dtoa-short",
"itoa",
- "matches",
- "phf 0.10.1",
- "proc-macro2",
- "quote",
+ "phf 0.11.3",
"smallvec",
- "syn 1.0.109",
]
[[package]]
name = "cssparser"
-version = "0.33.0"
+version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be934d936a0fbed5bcdc01042b770de1398bf79d0e192f49fa7faea0e99281e"
+checksum = "dae61cf9c0abb83bd659dab65b7e4e38d8236824c85f0f804f173567bda257d2"
dependencies = [
- "cssparser-macros",
+ "cssparser-macros 0.6.1",
"dtoa-short",
"itoa",
- "phf 0.11.3",
+ "phf 0.13.1",
"smallvec",
]
[[package]]
name = "cssparser"
-version = "0.34.0"
+version = "0.37.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7c66d1cd8ed61bf80b38432613a7a2f09401ab8d0501110655f8b341484a3e3"
+checksum = "8c9cdaae01d5ed7882b04d795e7f752f46ff52d2fa3b50a20d28c464510bba98"
dependencies = [
- "cssparser-macros",
+ "cssparser-macros 0.7.0",
"dtoa-short",
"itoa",
- "phf 0.11.3",
+ "phf 0.13.1",
"smallvec",
]
@@ -1018,7 +1080,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
dependencies = [
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "cssparser-macros"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10a2a99df6e410a8ff4245aa2006499ea662245f967cc7c0a38c83ef8eb44dbf"
+dependencies = [
+ "quote",
+ "syn 2.0.117",
]
[[package]]
@@ -1042,9 +1114,9 @@ checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f"
[[package]]
name = "data-encoding"
-version = "2.9.0"
+version = "2.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
+checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8"
[[package]]
name = "data-url"
@@ -1056,25 +1128,23 @@ dependencies = [
]
[[package]]
-name = "deranged"
-version = "0.4.0"
+name = "dbus"
+version = "0.9.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
+checksum = "b942602992bb7acfd1f51c49811c58a610ef9181b6e66f3e519d79b540a3bf73"
dependencies = [
- "powerfmt",
+ "libc",
+ "libdbus-sys",
+ "windows-sys 0.61.2",
]
[[package]]
-name = "derive_more"
-version = "0.99.20"
+name = "deranged"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f"
+checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
dependencies = [
- "convert_case 0.4.0",
- "proc-macro2",
- "quote",
- "rustc_version",
- "syn 2.0.104",
+ "powerfmt",
]
[[package]]
@@ -1095,7 +1165,7 @@ dependencies = [
"convert_case 0.7.1",
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -1135,25 +1205,19 @@ dependencies = [
"libc",
"option-ext",
"redox_users",
- "windows-sys 0.60.2",
+ "windows-sys 0.61.2",
]
-[[package]]
-name = "dispatch"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
-
[[package]]
name = "dispatch2"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
dependencies = [
- "bitflags 2.9.1",
- "block2 0.6.1",
+ "bitflags 2.11.1",
+ "block2 0.6.2",
"libc",
- "objc2 0.6.1",
+ "objc2 0.6.4",
]
[[package]]
@@ -1164,14 +1228,14 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
name = "dlopen2"
-version = "0.7.0"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1297103d2bbaea85724fcee6294c2d50b1081f9ad47d0f6f6f61eda65315a6"
+checksum = "5e2c5bd4158e66d1e215c49b837e11d62f3267b30c92f1d171c4d3105e3dc4d4"
dependencies = [
"dlopen2_derive",
"libc",
@@ -1187,7 +1251,7 @@ checksum = "788160fb30de9cdd857af31c6a2675904b16ece8fc2737b2c7127ba368c9d0f4"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -1199,12 +1263,33 @@ dependencies = [
"litrs",
]
+[[package]]
+name = "dom_query"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "521e380c0c8afb8d9a1e83a1822ee03556fc3e3e7dbc1fd30be14e37f9cb3f89"
+dependencies = [
+ "bit-set",
+ "cssparser 0.36.0",
+ "foldhash 0.2.0",
+ "html5ever 0.38.0",
+ "precomputed-hash",
+ "selectors 0.36.1",
+ "tendril",
+]
+
[[package]]
name = "dpi"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
+[[package]]
+name = "dragonbox_ecma"
+version = "0.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d742b56656e8b14d63e7ea9806597b1849ae25412584c8adf78c0f67bd985e66"
+
[[package]]
name = "dtoa"
version = "1.0.10"
@@ -1228,9 +1313,9 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
[[package]]
name = "ego-tree"
-version = "0.10.0"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2972feb8dffe7bc8c5463b1dacda1b0dfbed3710e50f977d965429692d74cd8"
+checksum = "b04dc5a38e4f151a79d9f2451ae6037fb6eaf5cba34771f44781f80e508498e3"
[[package]]
name = "either"
@@ -1238,6 +1323,18 @@ version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+[[package]]
+name = "embedded-io"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced"
+
+[[package]]
+name = "embedded-io"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"
+
[[package]]
name = "encoding_rs"
version = "0.8.35"
@@ -1256,7 +1353,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -1282,7 +1379,7 @@ checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -1329,7 +1426,7 @@ checksum = "ce8cd46a041ad005ab9c71263f9a0ff5b529eac0fe4cc9b4a20f4f0765d8cf4b"
dependencies = [
"execute-command-tokens",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -1353,6 +1450,12 @@ dependencies = [
"zune-inflate",
]
+[[package]]
+name = "extended"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af9673d8203fcb076b19dfd17e38b3d4ae9f44959416ea532ce72415a6020365"
+
[[package]]
name = "fallible_collections"
version = "0.4.9"
@@ -1362,6 +1465,12 @@ dependencies = [
"hashbrown 0.13.2",
]
+[[package]]
+name = "fastrand"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
+
[[package]]
name = "fdeflate"
version = "0.3.7"
@@ -1391,6 +1500,12 @@ dependencies = [
"rustc_version",
]
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
+
[[package]]
name = "fixed"
version = "1.29.0"
@@ -1405,9 +1520,9 @@ dependencies = [
[[package]]
name = "flate2"
-version = "1.1.2"
+version = "1.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
+checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
dependencies = [
"crc32fast",
"miniz_oxide",
@@ -1419,6 +1534,18 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
+[[package]]
+name = "foldhash"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
+
[[package]]
name = "foreign-types"
version = "0.5.0"
@@ -1437,7 +1564,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -1462,20 +1589,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d8866fac38f53fc87fa3ae1b09ddd723e0482f8fa74323518b4c59df2c55a00a"
[[package]]
-name = "funty"
-version = "2.0.0"
+name = "fs_extra"
+version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
[[package]]
-name = "futf"
-version = "0.1.5"
+name = "funty"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843"
-dependencies = [
- "mac",
- "new_debug_unreachable",
-]
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
[[package]]
name = "futures-channel"
@@ -1518,7 +1641,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -1550,15 +1673,6 @@ dependencies = [
"slab",
]
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
[[package]]
name = "gdk"
version = "0.18.2"
@@ -1679,48 +1793,53 @@ dependencies = [
[[package]]
name = "getopts"
-version = "0.2.23"
+version = "0.2.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cba6ae63eb948698e300f645f87c70f76630d505f23b8907cf1e193ee85048c1"
+checksum = "cfe4fbac503b8d1f88e6676011885f34b7174f46e59956bba534ba83abded4df"
dependencies = [
"unicode-width 0.2.1",
]
[[package]]
name = "getrandom"
-version = "0.1.16"
+version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
dependencies = [
"cfg-if",
+ "js-sys",
"libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
+ "wasi",
+ "wasm-bindgen",
]
[[package]]
name = "getrandom"
-version = "0.2.16"
+version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
dependencies = [
"cfg-if",
"js-sys",
"libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "r-efi 5.3.0",
+ "wasip2",
"wasm-bindgen",
]
[[package]]
name = "getrandom"
-version = "0.3.3"
+version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
dependencies = [
"cfg-if",
"js-sys",
"libc",
- "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
+ "r-efi 6.0.0",
+ "rand_core 0.10.1",
+ "wasip2",
+ "wasip3",
"wasm-bindgen",
]
@@ -1778,7 +1897,7 @@ version = "0.18.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.11.1",
"futures-channel",
"futures-core",
"futures-executor",
@@ -1806,7 +1925,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -1819,12 +1938,6 @@ dependencies = [
"system-deps",
]
-[[package]]
-name = "glob"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
-
[[package]]
name = "gobject-sys"
version = "0.18.0"
@@ -1885,7 +1998,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -1923,7 +2036,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
dependencies = [
"ahash 0.8.12",
- "bumpalo",
]
[[package]]
@@ -1937,6 +2049,18 @@ name = "hashbrown"
version = "0.15.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
+dependencies = [
+ "foldhash 0.1.5",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+dependencies = [
+ "allocator-api2",
+]
[[package]]
name = "heapless"
@@ -1974,14 +2098,22 @@ checksum = "62adaabb884c94955b19907d60019f4e145d091c75345379e70d1ee696f7854f"
[[package]]
name = "html5ever"
-version = "0.29.1"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1054432bae2f14e0061e33d23402fbaa67a921d319d56adc6bcf887ddad1cbc2"
+dependencies = [
+ "log",
+ "markup5ever 0.38.0",
+]
+
+[[package]]
+name = "html5ever"
+version = "0.39.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b7410cae13cbc75623c98ac4cbfd1f0bedddf3227afc24f370cf0f50a44a11c"
+checksum = "46a1761807faccc9a19e86944bbf40610014066306f96edcdedc2fb714bcb7b8"
dependencies = [
"log",
- "mac",
- "markup5ever",
- "match_token",
+ "markup5ever 0.39.0",
]
[[package]]
@@ -2085,7 +2217,7 @@ dependencies = [
"libc",
"percent-encoding",
"pin-project-lite",
- "socket2 0.6.0",
+ "socket2 0.6.3",
"tokio",
"tower-service",
"tracing",
@@ -2201,13 +2333,19 @@ dependencies = [
"zerovec",
]
+[[package]]
+name = "id-arena"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
+
[[package]]
name = "id3"
-version = "1.16.3"
+version = "1.16.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aadb14a5ba1a0d58ecd4a29bfc9b8f1d119eee24aa01a62c1ec93eb9630a1d86"
+checksum = "965c5e6a62a241f2f673df956ea5f52c27780bc1031855890a551ed9b869e2d1"
dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.11.1",
"byteorder",
"flate2",
]
@@ -2246,7 +2384,7 @@ dependencies = [
"gif",
"image-webp",
"num-traits",
- "png",
+ "png 0.17.16",
"qoi",
"ravif",
"rayon",
@@ -2310,18 +2448,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "io-uring"
-version = "0.7.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4"
-dependencies = [
- "bitflags 2.9.1",
- "cfg-if",
- "libc",
+ "syn 2.0.117",
]
[[package]]
@@ -2330,16 +2457,6 @@ version = "2.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
-[[package]]
-name = "iri-string"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
-dependencies = [
- "memchr",
- "serde",
-]
-
[[package]]
name = "is_terminal_polyfill"
version = "1.70.1"
@@ -2364,15 +2481,6 @@ dependencies = [
"either",
]
-[[package]]
-name = "itertools"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
-dependencies = [
- "either",
-]
-
[[package]]
name = "itertools"
version = "0.14.0"
@@ -2420,26 +2528,75 @@ dependencies = [
"cesu8",
"cfg-if",
"combine",
- "jni-sys",
+ "jni-sys 0.3.0",
"log",
"thiserror 1.0.69",
"walkdir",
"windows-sys 0.45.0",
]
+[[package]]
+name = "jni"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498"
+dependencies = [
+ "cfg-if",
+ "combine",
+ "jni-macros",
+ "jni-sys 0.4.1",
+ "log",
+ "simd_cesu8",
+ "thiserror 2.0.12",
+ "walkdir",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "jni-macros"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "simd_cesu8",
+ "syn 2.0.117",
+]
+
[[package]]
name = "jni-sys"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
+[[package]]
+name = "jni-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2"
+dependencies = [
+ "jni-sys-macros",
+]
+
+[[package]]
+name = "jni-sys-macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
+dependencies = [
+ "quote",
+ "syn 2.0.117",
+]
+
[[package]]
name = "jobserver"
version = "0.1.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
"libc",
]
@@ -2459,35 +2616,35 @@ dependencies = [
"wasm-bindgen",
]
+[[package]]
+name = "json-escape-simd"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35e770254dd7802184595b1d30da2a15cb72569e2aca2b177aef8d22eac8a693"
+
[[package]]
name = "keyboard-types"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a"
dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.11.1",
"serde",
"unicode-segmentation",
]
-[[package]]
-name = "kuchikiki"
-version = "0.8.8-speedreader"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02cb977175687f33fa4afa0c95c112b987ea1443e5a51c8f8ff27dc618270cc2"
-dependencies = [
- "cssparser 0.29.6",
- "html5ever",
- "indexmap",
- "selectors 0.24.0",
-]
-
[[package]]
name = "lazy_static"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+[[package]]
+name = "leb128fmt"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
+
[[package]]
name = "lebe"
version = "0.5.2"
@@ -2495,21 +2652,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
[[package]]
-name = "lewton"
-version = "0.10.2"
+name = "libc"
+version = "0.2.186"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030"
-dependencies = [
- "byteorder",
- "ogg",
- "tinyvec",
-]
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
[[package]]
-name = "libc"
-version = "0.2.174"
+name = "libdbus-sys"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
+checksum = "328c4789d42200f1eeec05bd86c9c13c7f091d2ba9a6ea35acdf51f31bc0f043"
+dependencies = [
+ "pkg-config",
+]
[[package]]
name = "libfuzzer-sys"
@@ -2523,12 +2678,12 @@ dependencies = [
[[package]]
name = "libloading"
-version = "0.8.8"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
+checksum = "754ca22de805bb5744484a5b151a9e1a8e837d5dc232c2d7d8c2e3492edc8b60"
dependencies = [
"cfg-if",
- "windows-targets 0.53.3",
+ "windows-link 0.2.1",
]
[[package]]
@@ -2543,7 +2698,7 @@ version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3"
dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.11.1",
"libc",
]
@@ -2568,28 +2723,29 @@ dependencies = [
[[package]]
name = "lightningcss"
-version = "1.0.0-alpha.67"
+version = "1.0.0-alpha.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "798fba4e1205eed356b8ed7754cc3f7f04914e27855ca641409f4a532e992149"
+checksum = "cb6314c2f0590ac93c86099b98bb7ba8abcf759bfd89604ffca906472bb54937"
dependencies = [
"ahash 0.8.12",
- "bitflags 2.9.1",
+ "bitflags 2.11.1",
"const-str",
"cssparser 0.33.0",
"cssparser-color",
"dashmap",
"data-encoding",
- "getrandom 0.2.16",
+ "getrandom 0.3.4",
"indexmap",
"itertools 0.10.5",
"lazy_static",
"lightningcss-derive",
"parcel_selectors",
"parcel_sourcemap",
- "paste",
+ "pastey",
"pathdiff",
"rayon",
"serde",
+ "serde-content",
"smallvec",
]
@@ -2635,9 +2791,9 @@ dependencies = [
[[package]]
name = "lofty"
-version = "0.22.4"
+version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca260c51a9c71f823fbfd2e6fbc8eb2ee09834b98c00763d877ca8bfa85cde3e"
+checksum = "dec4feeff6c7d75093278133a06e827d7af6d2bfe20b0f331f9d10338a5ec7ca"
dependencies = [
"byteorder",
"data-encoding",
@@ -2650,20 +2806,20 @@ dependencies = [
[[package]]
name = "lofty_attr"
-version = "0.11.1"
+version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9983e64b2358522f745c1251924e3ab7252d55637e80f6a0a3de642d6a9efc"
+checksum = "458ace39169e4b83c4f77ae3d42d5d1d11c422feef590219a97c973d3b524557"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
name = "log"
-version = "0.4.27"
+version = "0.4.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
[[package]]
name = "loop9"
@@ -2681,43 +2837,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
[[package]]
-name = "mac"
-version = "0.1.1"
+name = "mach2"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
+checksum = "d640282b302c0bb0a2a8e0233ead9035e3bed871f0b7e81fe4a1ec829765db44"
+dependencies = [
+ "libc",
+]
[[package]]
name = "mach2"
-version = "0.4.3"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d640282b302c0bb0a2a8e0233ead9035e3bed871f0b7e81fe4a1ec829765db44"
+checksum = "6a1b95cd5421ec55b445b5ae102f5ea0e768de1f82bd3001e11f426c269c3aea"
dependencies = [
"libc",
]
[[package]]
name = "markup5ever"
-version = "0.14.1"
+version = "0.38.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7a7213d12e1864c0f002f52c2923d4556935a43dec5e71355c2760e0f6e7a18"
+checksum = "8983d30f2915feeaaab2d6babdd6bc7e9ed1a00b66b5e6d74df19aa9c0e91862"
dependencies = [
"log",
- "phf 0.11.3",
- "phf_codegen 0.11.3",
- "string_cache",
- "string_cache_codegen",
"tendril",
+ "web_atoms",
]
[[package]]
-name = "match_token"
-version = "0.1.0"
+name = "markup5ever"
+version = "0.39.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b"
+checksum = "7122d987ec5f704ee56f6e5b41a7d93722e9aae27ae07cafa4036c4d3f9757de"
dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
+ "log",
+ "tendril",
+ "web_atoms",
]
[[package]]
@@ -2740,7 +2896,7 @@ checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -2796,45 +2952,38 @@ dependencies = [
[[package]]
name = "minify-html"
-version = "0.16.4"
+version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0df760078ad1daa3e9a37629e1a5aa50ec0429ed512e567f18a1b5ec54cbbd5"
+checksum = "644c1511457e5f70dcbc03c932d4bd26351eceb8657b119c919dde2e65b6d120"
dependencies = [
"ahash 0.8.12",
- "aho-corasick 0.7.20",
+ "aho-corasick",
"lightningcss",
"memchr",
"minify-html-common",
- "minify-js",
"once_cell",
+ "oxc_allocator",
+ "oxc_codegen",
+ "oxc_minifier",
+ "oxc_parser",
+ "oxc_span",
]
[[package]]
name = "minify-html-common"
-version = "0.0.2"
+version = "0.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "697a6b40dffdc5de10c0cbd709dc2bc2039cea9dab8aaa636eb9a49d6b411780"
+checksum = "53c3d71ae301c4e36949937ed9d121e1bf6847f2dc69ec20929b379d14659aac"
dependencies = [
- "aho-corasick 0.7.20",
- "itertools 0.12.1",
- "lazy_static",
+ "ahash 0.8.12",
+ "aho-corasick",
+ "itertools 0.14.0",
"memchr",
- "rustc-hash 1.1.0",
+ "once_cell",
"serde",
"serde_json",
]
-[[package]]
-name = "minify-js"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1fa5546ee8bd66024113e506cabe4230e76635a094c06ea2051b66021dda92e"
-dependencies = [
- "aho-corasick 0.7.20",
- "lazy_static",
- "parse-js",
-]
-
[[package]]
name = "minimal-lexical"
version = "0.2.1"
@@ -2873,14 +3022,14 @@ dependencies = [
[[package]]
name = "mio"
-version = "1.0.4"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
+checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1"
dependencies = [
"libc",
"log",
- "wasi 0.11.1+wasi-snapshot-preview1",
- "windows-sys 0.59.0",
+ "wasi",
+ "windows-sys 0.61.2",
]
[[package]]
@@ -2917,41 +3066,41 @@ dependencies = [
[[package]]
name = "muda"
-version = "0.16.1"
+version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4de14a9b5d569ca68d7c891d613b390cf5ab4f851c77aaa2f9e435555d3d9492"
+checksum = "0ae8844f63b5b118e334e205585b8c5c17b984121dbdb179d44aeb087ffad3cb"
dependencies = [
"crossbeam-channel",
"dpi",
"gtk",
"keyboard-types",
"libxdo",
- "objc2 0.6.1",
+ "objc2 0.6.4",
"objc2-app-kit",
"objc2-core-foundation",
- "objc2-foundation 0.3.1",
+ "objc2-foundation 0.3.2",
"once_cell",
- "png",
+ "png 0.18.1",
"thiserror 2.0.12",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
]
[[package]]
name = "native-dialog"
-version = "0.9.0"
+version = "0.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f006431cea71a83e6668378cb5abc2d52af299cbac6dca1780c6eeca90822df"
+checksum = "3b2373fb763ea6962e8c586571c7f9c5d8c995f9777cbdebbe0180263691bd4b"
dependencies = [
"ascii",
- "block2 0.6.1",
+ "block2 0.6.2",
"dirs",
"dispatch2",
"formatx",
- "objc2 0.6.1",
+ "objc2 0.6.4",
"objc2-app-kit",
"objc2-core-foundation",
"objc2-core-graphics",
- "objc2-foundation 0.3.1",
+ "objc2-foundation 0.3.2",
"raw-window-handle 0.6.2",
"thiserror 2.0.12",
"versions",
@@ -2960,30 +3109,16 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "ndk"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
-dependencies = [
- "bitflags 2.9.1",
- "jni-sys",
- "log",
- "ndk-sys 0.5.0+25.2.9519653",
- "num_enum",
- "thiserror 1.0.69",
-]
-
[[package]]
name = "ndk"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
dependencies = [
- "bitflags 2.9.1",
- "jni-sys",
+ "bitflags 2.11.1",
+ "jni-sys 0.3.0",
"log",
- "ndk-sys 0.6.0+11769913",
+ "ndk-sys",
"num_enum",
"raw-window-handle 0.6.2",
"thiserror 1.0.69",
@@ -2995,22 +3130,13 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
-[[package]]
-name = "ndk-sys"
-version = "0.5.0+25.2.9519653"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691"
-dependencies = [
- "jni-sys",
-]
-
[[package]]
name = "ndk-sys"
version = "0.6.0+11769913"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873"
dependencies = [
- "jni-sys",
+ "jni-sys 0.3.0",
]
[[package]]
@@ -3019,12 +3145,6 @@ version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
-[[package]]
-name = "nodrop"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-
[[package]]
name = "nom"
version = "7.1.3"
@@ -3044,6 +3164,12 @@ dependencies = [
"memchr",
]
+[[package]]
+name = "nonmax"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "610a5acd306ec67f907abe5567859a3c693fb9886eb1f012ab8f2a47bef3db51"
+
[[package]]
name = "noop_proc_macro"
version = "0.3.0"
@@ -3101,7 +3227,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -3153,7 +3279,7 @@ dependencies = [
"proc-macro-crate 2.0.2",
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -3174,9 +3300,9 @@ dependencies = [
[[package]]
name = "objc2"
-version = "0.6.1"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88c6597e14493ab2e44ce58f2fdecf095a51f12ca57bec060a11c57332520551"
+checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f"
dependencies = [
"objc2-encode",
"objc2-exception-helper",
@@ -3184,82 +3310,131 @@ dependencies = [
[[package]]
name = "objc2-app-kit"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6f29f568bec459b0ddff777cec4fe3fd8666d82d5a40ebd0ff7e66134f89bcc"
+checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
dependencies = [
- "bitflags 2.9.1",
- "block2 0.6.1",
- "libc",
- "objc2 0.6.1",
- "objc2-cloud-kit",
- "objc2-core-data",
+ "bitflags 2.11.1",
+ "block2 0.6.2",
+ "objc2 0.6.4",
"objc2-core-foundation",
"objc2-core-graphics",
- "objc2-core-image",
- "objc2-foundation 0.3.1",
- "objc2-quartz-core",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-audio-toolbox"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6948501a91121d6399b79abaa33a8aa4ea7857fe019f341b8c23ad6e81b79b08"
+dependencies = [
+ "bitflags 2.11.1",
+ "libc",
+ "objc2 0.6.4",
+ "objc2-core-audio",
+ "objc2-core-audio-types",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-avf-audio"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13a380031deed8e99db00065c45937da434ca987c034e13b87e4441f9e4090be"
+dependencies = [
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
]
[[package]]
name = "objc2-cloud-kit"
-version = "0.3.1"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
+dependencies = [
+ "bitflags 2.11.1",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-core-audio"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1eebcea8b0dbff5f7c8504f3107c68fc061a3eb44932051c8cf8a68d969c3b2"
+dependencies = [
+ "dispatch2",
+ "objc2 0.6.4",
+ "objc2-core-audio-types",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-core-audio-types"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17614fdcd9b411e6ff1117dfb1d0150f908ba83a7df81b1f118005fe0a8ea15d"
+checksum = "5a89f2ec274a0cf4a32642b2991e8b351a404d290da87bb6a9a9d8632490bd1c"
dependencies = [
- "bitflags 2.9.1",
- "objc2 0.6.1",
- "objc2-foundation 0.3.1",
+ "bitflags 2.11.1",
+ "objc2 0.6.4",
]
[[package]]
name = "objc2-core-data"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291fbbf7d29287518e8686417cf7239c74700fd4b607623140a7d4a3c834329d"
+checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
dependencies = [
- "bitflags 2.9.1",
- "objc2 0.6.1",
- "objc2-foundation 0.3.1",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
]
[[package]]
name = "objc2-core-foundation"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166"
+checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
dependencies = [
- "bitflags 2.9.1",
- "block2 0.6.1",
+ "bitflags 2.11.1",
+ "block2 0.6.2",
"dispatch2",
"libc",
- "objc2 0.6.1",
+ "objc2 0.6.4",
]
[[package]]
name = "objc2-core-graphics"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "989c6c68c13021b5c2d6b71456ebb0f9dc78d752e86a98da7c716f4f9470f5a4"
+checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
dependencies = [
- "bitflags 2.9.1",
- "block2 0.6.1",
+ "bitflags 2.11.1",
"dispatch2",
- "libc",
- "objc2 0.6.1",
+ "objc2 0.6.4",
"objc2-core-foundation",
"objc2-io-surface",
- "objc2-metal",
]
[[package]]
name = "objc2-core-image"
-version = "0.3.1"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006"
+dependencies = [
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
+[[package]]
+name = "objc2-core-location"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79b3dc0cc4386b6ccf21c157591b34a7f44c8e75b064f85502901ab2188c007e"
+checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009"
dependencies = [
- "objc2 0.6.1",
- "objc2-foundation 0.3.1",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
]
[[package]]
@@ -3283,7 +3458,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.11.1",
"block2 0.5.1",
"libc",
"objc2 0.5.2",
@@ -3291,22 +3466,22 @@ dependencies = [
[[package]]
name = "objc2-foundation"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900831247d2fe1a09a683278e5384cfb8c80c79fe6b166f9d14bfdde0ea1b03c"
+checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
dependencies = [
- "bitflags 2.9.1",
- "block2 0.6.1",
+ "bitflags 2.11.1",
+ "block2 0.6.2",
"libc",
- "objc2 0.6.1",
+ "objc2 0.6.4",
"objc2-core-foundation",
]
[[package]]
name = "objc2-io-kit"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71c1c64d6120e51cd86033f67176b1cb66780c2efe34dec55176f77befd93c0a"
+checksum = "33fafba39597d6dc1fb709123dfa8289d39406734be322956a69f0931c73bb15"
dependencies = [
"libc",
"objc2-core-foundation",
@@ -3314,35 +3489,36 @@ dependencies = [
[[package]]
name = "objc2-io-surface"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7282e9ac92529fa3457ce90ebb15f4ecbc383e8338060960760fa2cf75420c3c"
+checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
dependencies = [
- "bitflags 2.9.1",
- "objc2 0.6.1",
+ "bitflags 2.11.1",
+ "objc2 0.6.4",
"objc2-core-foundation",
]
[[package]]
-name = "objc2-metal"
-version = "0.3.1"
+name = "objc2-open-directory"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f246c183239540aab1782457b35ab2040d4259175bd1d0c58e46ada7b47a874"
+checksum = "bb82bed227edf5201dfedf072bba4015a33d3d4a98519837295a90f0a23f676d"
dependencies = [
- "bitflags 2.9.1",
- "objc2 0.6.1",
- "objc2-foundation 0.3.1",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
]
[[package]]
name = "objc2-quartz-core"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ffb6a0cd5f182dc964334388560b12a57f7b74b3e2dec5e2722aa2dfb2ccd5"
+checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
dependencies = [
- "bitflags 2.9.1",
- "objc2 0.6.1",
- "objc2-foundation 0.3.1",
+ "bitflags 2.11.1",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
]
[[package]]
@@ -3351,10 +3527,28 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25b1312ad7bc8a0e92adae17aa10f90aae1fb618832f9b993b022b591027daed"
dependencies = [
- "bitflags 2.9.1",
- "objc2 0.6.1",
+ "bitflags 2.11.1",
+ "block2 0.6.2",
+ "objc2 0.6.4",
+ "objc2-cloud-kit",
+ "objc2-core-data",
"objc2-core-foundation",
- "objc2-foundation 0.3.1",
+ "objc2-core-graphics",
+ "objc2-core-image",
+ "objc2-core-location",
+ "objc2-foundation 0.3.2",
+ "objc2-quartz-core",
+ "objc2-user-notifications",
+]
+
+[[package]]
+name = "objc2-user-notifications"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
+dependencies = [
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
]
[[package]]
@@ -3363,12 +3557,12 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91672909de8b1ce1c2252e95bbee8c1649c9ad9d14b9248b3d7b4c47903c47ad"
dependencies = [
- "bitflags 2.9.1",
- "block2 0.6.1",
- "objc2 0.6.1",
+ "bitflags 2.11.1",
+ "block2 0.6.2",
+ "objc2 0.6.4",
"objc2-app-kit",
"objc2-core-foundation",
- "objc2-foundation 0.3.1",
+ "objc2-foundation 0.3.2",
]
[[package]]
@@ -3381,51 +3575,19 @@ dependencies = [
]
[[package]]
-name = "oboe"
-version = "0.6.1"
+name = "ogg_pager"
+version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb"
+checksum = "9d36b1d6964c3ac92b7aea701057e02b6b91143d70d83b20abf75a231a3c0216"
dependencies = [
- "jni",
- "ndk 0.8.0",
- "ndk-context",
- "num-derive",
- "num-traits",
- "oboe-sys",
+ "byteorder",
]
[[package]]
-name = "oboe-sys"
-version = "0.6.1"
+name = "once_cell"
+version = "1.21.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "ogg"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "ogg_pager"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e034c10fb5c1c012c1b327b85df89fb0ef98ae66ec28af30f0d1eed804a40c19"
-dependencies = [
- "byteorder",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
[[package]]
name = "once_cell_polyfill"
@@ -3478,9 +3640,9 @@ dependencies = [
"onetagger-shared",
"onetagger-tag",
"onetagger-tagger",
- "rand 0.9.2",
+ "rand 0.10.1",
"regex",
- "reqwest",
+ "reqwest 0.13.3",
"serde",
"serde_json",
"songrec",
@@ -3493,7 +3655,7 @@ version = "1.7.0"
dependencies = [
"anyhow",
"clap",
- "convert_case 0.8.0",
+ "convert_case 0.11.0",
"log",
"onetagger-autotag",
"onetagger-platforms",
@@ -3517,13 +3679,14 @@ dependencies = [
"onetagger-shared",
"onetagger-tag",
"onetagger-tagger",
- "rand 0.9.2",
+ "rand 0.10.1",
"regex",
- "reqwest",
+ "reqwest 0.13.3",
"rspotify",
"scraper",
"serde",
"serde_json",
+ "strsim",
"url",
]
@@ -3663,6 +3826,12 @@ dependencies = [
"windows-sys 0.59.0",
]
+[[package]]
+name = "openssl-probe"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
+
[[package]]
name = "option-ext"
version = "0.2.0"
@@ -3675,6 +3844,360 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f222829ae9293e33a9f5e9f440c6760a3d450a64affe1846486b140db81c1f4"
+[[package]]
+name = "outref"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e"
+
+[[package]]
+name = "owo-colors"
+version = "4.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d211803b9b6b570f68772237e415a029d5a50c65d382910b879fb19d3271f94d"
+
+[[package]]
+name = "oxc-browserslist"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abb7a1163a5501f935f8722d839b576491b749c695e7a066aa0b8df988b806df"
+dependencies = [
+ "flate2",
+ "postcard",
+ "rustc-hash",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.12",
+]
+
+[[package]]
+name = "oxc-miette"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4356a61f2ed4c9b3610245215fbf48970eb277126919f87db9d0efa93a74245c"
+dependencies = [
+ "cfg-if",
+ "owo-colors",
+ "oxc-miette-derive",
+ "textwrap",
+ "thiserror 2.0.12",
+ "unicode-segmentation",
+ "unicode-width 0.2.1",
+]
+
+[[package]]
+name = "oxc-miette-derive"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b237422b014f8f8fff75bb9379e697d13f8d57551a22c88bebb39f073c1bf696"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "oxc_allocator"
+version = "0.95.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "433214c659b860685d987ca25a523a544d35ebf87ee3658a942fd1c664cfa49b"
+dependencies = [
+ "allocator-api2",
+ "bumpalo",
+ "hashbrown 0.16.1",
+ "oxc_data_structures",
+ "rustc-hash",
+]
+
+[[package]]
+name = "oxc_ast"
+version = "0.95.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e78ea25d23521092edcd509198635dd0bd96df7fb71349bcd8087bb8f6a615d"
+dependencies = [
+ "bitflags 2.11.1",
+ "oxc_allocator",
+ "oxc_ast_macros",
+ "oxc_data_structures",
+ "oxc_diagnostics",
+ "oxc_estree",
+ "oxc_regular_expression",
+ "oxc_span",
+ "oxc_syntax",
+]
+
+[[package]]
+name = "oxc_ast_macros"
+version = "0.95.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3f29bf83925451a7ebbd30d3ff449414cc230c9b63aba70487c2ca74ea1e3ed"
+dependencies = [
+ "phf 0.13.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "oxc_ast_visit"
+version = "0.95.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "808862f42c9331954cf187261d6a48dbf471ccbe60b6a35f6b1056c11f32e95b"
+dependencies = [
+ "oxc_allocator",
+ "oxc_ast",
+ "oxc_span",
+ "oxc_syntax",
+]
+
+[[package]]
+name = "oxc_codegen"
+version = "0.95.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "480bab938439c921d34750708abf15aacf253ea11e2f348e4b085cbf697f4ea2"
+dependencies = [
+ "bitflags 2.11.1",
+ "cow-utils",
+ "dragonbox_ecma",
+ "itoa",
+ "oxc_allocator",
+ "oxc_ast",
+ "oxc_data_structures",
+ "oxc_index",
+ "oxc_semantic",
+ "oxc_sourcemap",
+ "oxc_span",
+ "oxc_syntax",
+ "rustc-hash",
+]
+
+[[package]]
+name = "oxc_compat"
+version = "0.95.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd06b5cb59ece933be410adc6f811108a10c567fa2d105321f8d0f01cc4ab0c6"
+dependencies = [
+ "cow-utils",
+ "oxc-browserslist",
+ "oxc_syntax",
+ "rustc-hash",
+ "serde",
+]
+
+[[package]]
+name = "oxc_data_structures"
+version = "0.95.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd090988aa69c1e394f424289abb9bb1281448a072419ca556a07228ad36b854"
+
+[[package]]
+name = "oxc_diagnostics"
+version = "0.95.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b8a09558d38ee7f23faf0249cdb37b5b26f53a7375941f8636c41c661b283ce"
+dependencies = [
+ "cow-utils",
+ "oxc-miette",
+ "percent-encoding",
+]
+
+[[package]]
+name = "oxc_ecmascript"
+version = "0.95.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0002ece1cc266aa6654913d39cf552b0cf501afce9d953b87c283dfcd307266"
+dependencies = [
+ "cow-utils",
+ "num-bigint",
+ "num-traits",
+ "oxc_allocator",
+ "oxc_ast",
+ "oxc_span",
+ "oxc_syntax",
+]
+
+[[package]]
+name = "oxc_estree"
+version = "0.95.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af85b24b7e10bf0ccb252f16d38492f51236c1ba146f62013993667cbf7fa649"
+
+[[package]]
+name = "oxc_index"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb3e6120999627ec9703025eab7c9f410ebb7e95557632a8902ca48210416c2b"
+dependencies = [
+ "nonmax",
+ "serde",
+]
+
+[[package]]
+name = "oxc_mangler"
+version = "0.95.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb751e1971f0809547347edfebe3755d5bed354aacf3ca7fe7216b901a11dd1d"
+dependencies = [
+ "itertools 0.14.0",
+ "oxc_allocator",
+ "oxc_ast",
+ "oxc_data_structures",
+ "oxc_index",
+ "oxc_semantic",
+ "oxc_span",
+ "oxc_syntax",
+ "rustc-hash",
+]
+
+[[package]]
+name = "oxc_minifier"
+version = "0.95.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e836caa36befa6f9603eebf56b0c08d1e164ae31160c8e99ab3f535203065a4c"
+dependencies = [
+ "cow-utils",
+ "oxc_allocator",
+ "oxc_ast",
+ "oxc_ast_visit",
+ "oxc_codegen",
+ "oxc_compat",
+ "oxc_data_structures",
+ "oxc_ecmascript",
+ "oxc_index",
+ "oxc_mangler",
+ "oxc_parser",
+ "oxc_regular_expression",
+ "oxc_semantic",
+ "oxc_span",
+ "oxc_syntax",
+ "oxc_traverse",
+ "rustc-hash",
+]
+
+[[package]]
+name = "oxc_parser"
+version = "0.95.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb730ab93ff23bbc471ef7109f847afa709bb284dd52a5d3366283d724858158"
+dependencies = [
+ "bitflags 2.11.1",
+ "cow-utils",
+ "memchr",
+ "num-bigint",
+ "num-traits",
+ "oxc_allocator",
+ "oxc_ast",
+ "oxc_data_structures",
+ "oxc_diagnostics",
+ "oxc_ecmascript",
+ "oxc_regular_expression",
+ "oxc_span",
+ "oxc_syntax",
+ "rustc-hash",
+ "seq-macro",
+]
+
+[[package]]
+name = "oxc_regular_expression"
+version = "0.95.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27bafc3035e3b0fe555ae56f7bbc108a7ee520b0858250ba16d197e44ca83746"
+dependencies = [
+ "bitflags 2.11.1",
+ "oxc_allocator",
+ "oxc_ast_macros",
+ "oxc_diagnostics",
+ "oxc_span",
+ "phf 0.13.1",
+ "rustc-hash",
+ "unicode-id-start",
+]
+
+[[package]]
+name = "oxc_semantic"
+version = "0.95.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "578e5fa0b975a28e1d1ffa6c81c8df094545fe3c3225956d4e93ffe1ade3dae0"
+dependencies = [
+ "itertools 0.14.0",
+ "oxc_allocator",
+ "oxc_ast",
+ "oxc_ast_visit",
+ "oxc_data_structures",
+ "oxc_diagnostics",
+ "oxc_ecmascript",
+ "oxc_index",
+ "oxc_span",
+ "oxc_syntax",
+ "phf 0.13.1",
+ "rustc-hash",
+ "self_cell",
+]
+
+[[package]]
+name = "oxc_sourcemap"
+version = "6.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d378eb8bad20e89d66276aebab51f6a5408571092cac94abdd3eabb773713d6"
+dependencies = [
+ "base64-simd 0.8.0",
+ "json-escape-simd",
+ "rustc-hash",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "oxc_span"
+version = "0.95.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71243fe1ece27f71a6be5e2ab11d051792eeb578f3b056d7c9bbe82ec8043bf3"
+dependencies = [
+ "compact_str",
+ "oxc-miette",
+ "oxc_allocator",
+ "oxc_ast_macros",
+ "oxc_estree",
+]
+
+[[package]]
+name = "oxc_syntax"
+version = "0.95.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93c99e555ed497111004a71fb2aa6f8fb90b0d3e2733aceeb035e24701d69634"
+dependencies = [
+ "bitflags 2.11.1",
+ "cow-utils",
+ "dragonbox_ecma",
+ "nonmax",
+ "oxc_allocator",
+ "oxc_ast_macros",
+ "oxc_data_structures",
+ "oxc_estree",
+ "oxc_index",
+ "oxc_span",
+ "phf 0.13.1",
+ "unicode-id-start",
+]
+
+[[package]]
+name = "oxc_traverse"
+version = "0.95.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68d00264248ef474988ea02bfa44ccacd9a1d8716f0efb33a9cd6f992cf07b7b"
+dependencies = [
+ "itoa",
+ "oxc_allocator",
+ "oxc_ast",
+ "oxc_ast_visit",
+ "oxc_data_structures",
+ "oxc_ecmascript",
+ "oxc_semantic",
+ "oxc_span",
+ "oxc_syntax",
+ "rustc-hash",
+]
+
[[package]]
name = "pacmog"
version = "0.6.0"
@@ -3729,13 +4252,13 @@ version = "0.28.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54fd03f1ad26cb6b3ec1b7414fa78a3bd639e7dbb421b1a60513c96ce886a196"
dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.11.1",
"cssparser 0.33.0",
"log",
"phf 0.11.3",
"phf_codegen 0.11.3",
"precomputed-hash",
- "rustc-hash 2.1.1",
+ "rustc-hash",
"smallvec",
]
@@ -3745,7 +4268,7 @@ version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "485b74d7218068b2b7c0e3ff12fbc61ae11d57cb5d8224f525bd304c6be05bbb"
dependencies = [
- "base64-simd",
+ "base64-simd 0.7.0",
"data-url",
"rkyv",
"serde",
@@ -3776,25 +4299,18 @@ dependencies = [
"windows-targets 0.52.6",
]
-[[package]]
-name = "parse-js"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2742b5e32dcb5930447ed9f9e401a7dfd883867fc079c4fac44ae8ba3593710e"
-dependencies = [
- "aho-corasick 0.7.20",
- "bumpalo",
- "hashbrown 0.13.2",
- "lazy_static",
- "memchr",
-]
-
[[package]]
name = "paste"
version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+[[package]]
+name = "pastey"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35fb2e5f958ec131621fdd531e9fc186ed768cbe395337403ae56c17a74c68ec"
+
[[package]]
name = "pathdiff"
version = "0.2.3"
@@ -3803,29 +4319,9 @@ checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
[[package]]
name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[package]]
-name = "phf"
-version = "0.8.0"
+version = "2.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
-dependencies = [
- "phf_shared 0.8.0",
-]
-
-[[package]]
-name = "phf"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
-dependencies = [
- "phf_macros 0.10.0",
- "phf_shared 0.10.0",
- "proc-macro-hack",
-]
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
[[package]]
name = "phf"
@@ -3838,13 +4334,14 @@ dependencies = [
]
[[package]]
-name = "phf_codegen"
-version = "0.8.0"
+name = "phf"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
+checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
dependencies = [
- "phf_generator 0.8.0",
- "phf_shared 0.8.0",
+ "phf_macros 0.13.1",
+ "phf_shared 0.13.1",
+ "serde",
]
[[package]]
@@ -3858,23 +4355,13 @@ dependencies = [
]
[[package]]
-name = "phf_generator"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
-dependencies = [
- "phf_shared 0.8.0",
- "rand 0.7.3",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.10.0"
+name = "phf_codegen"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
+checksum = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1"
dependencies = [
- "phf_shared 0.10.0",
- "rand 0.8.5",
+ "phf_generator 0.13.1",
+ "phf_shared 0.13.1",
]
[[package]]
@@ -3888,17 +4375,13 @@ dependencies = [
]
[[package]]
-name = "phf_macros"
-version = "0.10.0"
+name = "phf_generator"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
+checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "fastrand",
+ "phf_shared 0.13.1",
]
[[package]]
@@ -3911,34 +4394,38 @@ dependencies = [
"phf_shared 0.11.3",
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
-name = "phf_shared"
-version = "0.8.0"
+name = "phf_macros"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
+checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef"
dependencies = [
- "siphasher 0.3.11",
+ "phf_generator 0.13.1",
+ "phf_shared 0.13.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
]
[[package]]
name = "phf_shared"
-version = "0.10.0"
+version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
dependencies = [
- "siphasher 0.3.11",
+ "siphasher",
]
[[package]]
name = "phf_shared"
-version = "0.11.3"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
+checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
dependencies = [
- "siphasher 1.0.1",
+ "siphasher",
]
[[package]]
@@ -3972,6 +4459,31 @@ dependencies = [
"miniz_oxide",
]
+[[package]]
+name = "png"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
+dependencies = [
+ "bitflags 2.11.1",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "postcard"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6764c3b5dd454e283a30e6dfe78e9b31096d9e32036b5d1eaac7a6119ccb9a24"
+dependencies = [
+ "cobs",
+ "embedded-io 0.4.0",
+ "embedded-io 0.6.1",
+ "serde",
+]
+
[[package]]
name = "potential_utf"
version = "0.1.2"
@@ -4002,6 +4514,16 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+[[package]]
+name = "prettyplease"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.117",
+]
+
[[package]]
name = "proc-macro-crate"
version = "1.3.1"
@@ -4046,17 +4568,11 @@ dependencies = [
"version_check",
]
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.20+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
-
[[package]]
name = "proc-macro2"
-version = "1.0.95"
+version = "1.0.106"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
dependencies = [
"unicode-ident",
]
@@ -4077,7 +4593,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52717f9a02b6965224f95ca2a81e2e0c5c43baacd28ca057577988930b6c3d5b"
dependencies = [
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -4106,7 +4622,7 @@ version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e8bbe1a966bd2f362681a44f6edce3c2310ac21e4d5067a6e7ec396297a6ea0"
dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.11.1",
"getopts",
"memchr",
"pulldown-cmark-escape",
@@ -4145,7 +4661,7 @@ dependencies = [
"pin-project-lite",
"quinn-proto",
"quinn-udp",
- "rustc-hash 2.1.1",
+ "rustc-hash",
"rustls",
"socket2 0.5.10",
"thiserror 2.0.12",
@@ -4160,12 +4676,13 @@ version = "0.11.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e"
dependencies = [
+ "aws-lc-rs",
"bytes",
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
"lru-slab",
"rand 0.9.2",
"ring",
- "rustc-hash 2.1.1",
+ "rustc-hash",
"rustls",
"rustls-pki-types",
"slab",
@@ -4191,9 +4708,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.40"
+version = "1.0.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
dependencies = [
"proc-macro2",
]
@@ -4205,24 +4722,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
[[package]]
-name = "radium"
-version = "0.7.0"
+name = "r-efi"
+version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
[[package]]
-name = "rand"
-version = "0.7.3"
+name = "radium"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
- "rand_pcg",
-]
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
[[package]]
name = "rand"
@@ -4246,13 +4755,14 @@ dependencies = [
]
[[package]]
-name = "rand_chacha"
-version = "0.2.2"
+name = "rand"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
+ "chacha20",
+ "getrandom 0.4.2",
+ "rand_core 0.10.1",
]
[[package]]
@@ -4275,15 +4785,6 @@ dependencies = [
"rand_core 0.9.3",
]
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]
-
[[package]]
name = "rand_core"
version = "0.6.4"
@@ -4299,26 +4800,14 @@ version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
]
[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
-[[package]]
-name = "rand_pcg"
-version = "0.2.1"
+name = "rand_core"
+version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
-dependencies = [
- "rand_core 0.5.1",
-]
+checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69"
[[package]]
name = "rav1e"
@@ -4408,7 +4897,7 @@ version = "0.5.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.11.1",
]
[[package]]
@@ -4424,11 +4913,11 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.11.1"
+version = "1.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
dependencies = [
- "aho-corasick 1.1.3",
+ "aho-corasick",
"memchr",
"regex-automata",
"regex-syntax",
@@ -4436,11 +4925,11 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.4.9"
+version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
dependencies = [
- "aho-corasick 1.1.3",
+ "aho-corasick",
"memchr",
"regex-syntax",
]
@@ -4462,9 +4951,9 @@ dependencies = [
[[package]]
name = "reqwest"
-version = "0.12.22"
+version = "0.12.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531"
+checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147"
dependencies = [
"base64",
"bytes",
@@ -4500,6 +4989,46 @@ dependencies = [
"webpki-roots 1.0.2",
]
+[[package]]
+name = "reqwest"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62e0021ea2c22aed41653bc7e1419abb2c97e038ff2c33d0e1309e49a97deec0"
+dependencies = [
+ "base64",
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-rustls",
+ "hyper-util",
+ "js-sys",
+ "log",
+ "percent-encoding",
+ "pin-project-lite",
+ "quinn",
+ "rustls",
+ "rustls-pki-types",
+ "rustls-platform-verifier",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tokio-rustls",
+ "tower",
+ "tower-http",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
[[package]]
name = "rgb"
version = "0.8.52"
@@ -4557,27 +5086,28 @@ dependencies = [
[[package]]
name = "rodio"
-version = "0.20.1"
+version = "0.22.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ceb6607dd738c99bc8cb28eff249b7cd5c8ec88b9db96c0608c1480d140fb1"
+checksum = "d0a536bb79db59098ef71a4dd4246c02eb87b316deceb1b68e0cde7167ec01eb"
dependencies = [
- "claxon",
"cpal",
- "hound",
- "lewton",
+ "dasp_sample",
"minimp3_fixed",
+ "num-rational",
"symphonia",
+ "thiserror 2.0.12",
]
[[package]]
name = "rspotify"
-version = "0.15.0"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77beedc33ecff4c39e8ef0e6f7ebc8d849f3ffebbeb786f9997d96f0d9cf4017"
+checksum = "f906f59b800945449fbcb8ae4e3bcc971e3350e116a560e7aafd5cfadc605a56"
dependencies = [
"base64",
"chrono",
- "getrandom 0.2.16",
+ "getrandom 0.3.4",
+ "getrandom 0.4.2",
"log",
"maybe-async",
"rspotify-http",
@@ -4592,9 +5122,9 @@ dependencies = [
[[package]]
name = "rspotify-http"
-version = "0.15.0"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fde1ea9e2a49698cffbc994a83f5f909b37736c31cccb202f9577e8a32df3a63"
+checksum = "35d53699d56aa4412f56321600b6c816288cb6f60af6311236f47f8329e9fe5e"
dependencies = [
"log",
"maybe-async",
@@ -4605,15 +5135,15 @@ dependencies = [
[[package]]
name = "rspotify-macros"
-version = "0.15.0"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee3dfb51ee54bd754ad76e96ad60a3b64bc70ae33a89261d9dbabc4c148a496f"
+checksum = "45373be0355f53d1ca1065b9585be9924c7090c4bdc327ebf5a7924feeea6325"
[[package]]
name = "rspotify-model"
-version = "0.15.0"
+version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "018f29a6a8c47cfe7923c48140ed546a395f660c7af05b73e6001d4505f89c8d"
+checksum = "84b95fb66a9915464f94c7ce94af7f7b429708583bfd6b612f165f335364a8c5"
dependencies = [
"chrono",
"enum_dispatch",
@@ -4629,12 +5159,6 @@ version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
[[package]]
name = "rustc-hash"
version = "2.1.1"
@@ -4656,7 +5180,7 @@ version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.11.1",
"errno",
"libc",
"linux-raw-sys",
@@ -4669,6 +5193,7 @@ version = "0.23.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc"
dependencies = [
+ "aws-lc-rs",
"log",
"once_cell",
"ring",
@@ -4678,6 +5203,18 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "rustls-native-certs"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63"
+dependencies = [
+ "openssl-probe",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework",
+]
+
[[package]]
name = "rustls-pki-types"
version = "1.12.0"
@@ -4688,12 +5225,40 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "rustls-platform-verifier"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d1e2536ce4f35f4846aa13bff16bd0ff40157cdb14cc056c7b14ba41233ba0"
+dependencies = [
+ "core-foundation",
+ "core-foundation-sys",
+ "jni 0.22.4",
+ "log",
+ "once_cell",
+ "rustls",
+ "rustls-native-certs",
+ "rustls-platform-verifier-android",
+ "rustls-webpki",
+ "security-framework",
+ "security-framework-sys",
+ "webpki-root-certs",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "rustls-platform-verifier-android"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
+
[[package]]
name = "rustls-webpki"
version = "0.103.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc"
dependencies = [
+ "aws-lc-rs",
"ring",
"rustls-pki-types",
"untrusted",
@@ -4720,6 +5285,15 @@ dependencies = [
"winapi-util",
]
+[[package]]
+name = "schannel"
+version = "0.1.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
[[package]]
name = "scopeguard"
version = "1.2.0"
@@ -4728,16 +5302,16 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "scraper"
-version = "0.23.1"
+version = "0.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527e65d9d888567588db4c12da1087598d0f6f8b346cc2c5abc91f05fc2dffe2"
+checksum = "bdd0be4d296f048bfb06dd01bbc80ef789ddd2e55583e8d2e6b804942abfabc2"
dependencies = [
- "cssparser 0.34.0",
+ "cssparser 0.37.0",
"ego-tree",
"getopts",
- "html5ever",
+ "html5ever 0.39.0",
"precomputed-hash",
- "selectors 0.26.0",
+ "selectors 0.38.0",
"tendril",
]
@@ -4747,67 +5321,122 @@ version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
+[[package]]
+name = "security-framework"
+version = "3.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
+dependencies = [
+ "bitflags 2.11.1",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
[[package]]
name = "selectors"
-version = "0.24.0"
+version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416"
+checksum = "c5d9c0c92a92d33f08817311cf3f2c29a3538a8240e94a6a3c622ce652d7e00c"
dependencies = [
- "bitflags 1.3.2",
- "cssparser 0.29.6",
- "derive_more 0.99.20",
- "fxhash",
+ "bitflags 2.11.1",
+ "cssparser 0.36.0",
+ "derive_more",
"log",
- "phf 0.8.0",
- "phf_codegen 0.8.0",
+ "new_debug_unreachable",
+ "phf 0.13.1",
+ "phf_codegen 0.13.1",
"precomputed-hash",
- "servo_arc 0.2.0",
+ "rustc-hash",
+ "servo_arc",
"smallvec",
]
[[package]]
name = "selectors"
-version = "0.26.0"
+version = "0.38.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd568a4c9bb598e291a08244a5c1f5a8a6650bee243b5b0f8dbb3d9cc1d87fe8"
+checksum = "8adfa1c298912827b8a28b223b3b874357397ae706e6190acd9bf28cee99114d"
dependencies = [
- "bitflags 2.9.1",
- "cssparser 0.34.0",
- "derive_more 0.99.20",
- "fxhash",
+ "bitflags 2.11.1",
+ "cssparser 0.37.0",
+ "derive_more",
"log",
"new_debug_unreachable",
- "phf 0.11.3",
- "phf_codegen 0.11.3",
+ "phf 0.13.1",
+ "phf_codegen 0.13.1",
"precomputed-hash",
- "servo_arc 0.4.1",
+ "rustc-hash",
+ "servo_arc",
"smallvec",
]
+[[package]]
+name = "self_cell"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b12e76d157a900eb52e81bc6e9f3069344290341720e9178cde2407113ac8d89"
+
[[package]]
name = "semver"
version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
+[[package]]
+name = "seq-macro"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc"
+
[[package]]
name = "serde"
-version = "1.0.219"
+version = "1.0.228"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde-content"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3753ca04f350fa92d00b6146a3555e63c55388c9ef2e11e09bce2ff1c0b509c6"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.219"
+version = "1.0.228"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -4855,19 +5484,9 @@ dependencies = [
[[package]]
name = "servo_arc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741"
-dependencies = [
- "nodrop",
- "stable_deref_trait",
-]
-
-[[package]]
-name = "servo_arc"
-version = "0.4.1"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "204ea332803bd95a0b60388590d59cf6468ec9becf626e2451f1d26a1d972de4"
+checksum = "170fb83ab34de17dc69aa7c67482b22218ddb85da56546f9bd6b929e32a05930"
dependencies = [
"stable_deref_trait",
]
@@ -4879,7 +5498,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
dependencies = [
"cfg-if",
- "cpufeatures",
+ "cpufeatures 0.2.17",
"digest",
]
@@ -4890,7 +5509,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
dependencies = [
"cfg-if",
- "cpufeatures",
+ "cpufeatures 0.2.17",
"digest",
]
@@ -4912,9 +5531,9 @@ dependencies = [
[[package]]
name = "signal-hook-mio"
-version = "0.2.4"
+version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
+checksum = "b75a19a7a740b25bc7944bdee6172368f988763b744e3d4dfe753f6b4ece40cc"
dependencies = [
"libc",
"mio",
@@ -4936,7 +5555,7 @@ version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9cadb29c57caadc51ff8346233b5cec1d240b68ce55cf1afc764818791876987"
dependencies = [
- "outref",
+ "outref 0.1.0",
]
[[package]]
@@ -4945,6 +5564,16 @@ version = "0.3.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+[[package]]
+name = "simd_cesu8"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33"
+dependencies = [
+ "rustc_version",
+ "simdutf8",
+]
+
[[package]]
name = "simd_helpers"
version = "0.1.0"
@@ -4960,12 +5589,6 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
-[[package]]
-name = "siphasher"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
-
[[package]]
name = "siphasher"
version = "1.0.1"
@@ -4985,7 +5608,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84ae312bda09b2368f79f985fdb4df4a0b5cbc75546b511303972d195f8c27d6"
dependencies = [
"libc",
- "mach2",
+ "mach2 0.4.3",
"winapi",
]
@@ -4995,6 +5618,12 @@ version = "1.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+[[package]]
+name = "smawk"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
+
[[package]]
name = "socket2"
version = "0.5.10"
@@ -5007,12 +5636,12 @@ dependencies = [
[[package]]
name = "socket2"
-version = "0.6.0"
+version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
+checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
dependencies = [
"libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
]
[[package]]
@@ -5038,7 +5667,7 @@ dependencies = [
"log",
"percent-encoding",
"rand 0.8.5",
- "reqwest",
+ "reqwest 0.12.28",
"serde",
"serde_json",
"uuid",
@@ -5084,25 +5713,24 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "string_cache"
-version = "0.8.9"
+version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f"
+checksum = "a18596f8c785a729f2819c0f6a7eae6ebeebdfffbfe4214ae6b087f690e31901"
dependencies = [
"new_debug_unreachable",
"parking_lot",
- "phf_shared 0.11.3",
+ "phf_shared 0.13.1",
"precomputed-hash",
- "serde",
]
[[package]]
name = "string_cache_codegen"
-version = "0.5.4"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0"
+checksum = "585635e46db231059f76c5849798146164652513eb9e8ab2685939dd90f29b69"
dependencies = [
- "phf_generator 0.11.3",
- "phf_shared 0.11.3",
+ "phf_generator 0.13.1",
+ "phf_shared 0.13.1",
"proc-macro2",
"quote",
]
@@ -5131,7 +5759,7 @@ dependencies = [
"heck 0.5.0",
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -5142,33 +5770,71 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "symphonia"
-version = "0.5.4"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "815c942ae7ee74737bb00f965fa5b5a2ac2ce7b6c01c0cc169bbeaf7abd5f5a9"
+checksum = "5773a4c030a19d9bfaa090f49746ff35c75dfddfa700df7a5939d5e076a57039"
dependencies = [
"lazy_static",
+ "symphonia-bundle-flac",
"symphonia-codec-aac",
+ "symphonia-codec-pcm",
+ "symphonia-codec-vorbis",
"symphonia-core",
"symphonia-format-isomp4",
+ "symphonia-format-ogg",
+ "symphonia-format-riff",
"symphonia-metadata",
]
+[[package]]
+name = "symphonia-bundle-flac"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c91565e180aea25d9b80a910c546802526ffd0072d0b8974e3ebe59b686c9976"
+dependencies = [
+ "log",
+ "symphonia-core",
+ "symphonia-metadata",
+ "symphonia-utils-xiph",
+]
+
[[package]]
name = "symphonia-codec-aac"
-version = "0.5.4"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdbf25b545ad0d3ee3e891ea643ad115aff4ca92f6aec472086b957a58522f70"
+checksum = "4c263845aa86881416849c1729a54c7f55164f8b96111dba59de46849e73a790"
dependencies = [
"lazy_static",
"log",
"symphonia-core",
]
+[[package]]
+name = "symphonia-codec-pcm"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e89d716c01541ad3ebe7c91ce4c8d38a7cf266a3f7b2f090b108fb0cb031d95"
+dependencies = [
+ "log",
+ "symphonia-core",
+]
+
+[[package]]
+name = "symphonia-codec-vorbis"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f025837c309cd69ffef572750b4a2257b59552c5399a5e49707cc5b1b85d1c73"
+dependencies = [
+ "log",
+ "symphonia-core",
+ "symphonia-utils-xiph",
+]
+
[[package]]
name = "symphonia-core"
-version = "0.5.4"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "798306779e3dc7d5231bd5691f5a813496dc79d3f56bf82e25789f2094e022c3"
+checksum = "ea00cc4f79b7f6bb7ff87eddc065a1066f3a43fe1875979056672c9ef948c2af"
dependencies = [
"arrayvec",
"bitflags 1.3.2",
@@ -5179,9 +5845,9 @@ dependencies = [
[[package]]
name = "symphonia-format-isomp4"
-version = "0.5.4"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abfdf178d697e50ce1e5d9b982ba1b94c47218e03ec35022d9f0e071a16dc844"
+checksum = "243739585d11f81daf8dac8d9f3d18cc7898f6c09a259675fc364b382c30e0a5"
dependencies = [
"encoding_rs",
"log",
@@ -5190,11 +5856,35 @@ dependencies = [
"symphonia-utils-xiph",
]
+[[package]]
+name = "symphonia-format-ogg"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b4955c67c1ed3aa8ae8428d04ca8397fbef6a19b2b051e73b5da8b1435639cb"
+dependencies = [
+ "log",
+ "symphonia-core",
+ "symphonia-metadata",
+ "symphonia-utils-xiph",
+]
+
+[[package]]
+name = "symphonia-format-riff"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2d7c3df0e7d94efb68401d81906eae73c02b40d5ec1a141962c592d0f11a96f"
+dependencies = [
+ "extended",
+ "log",
+ "symphonia-core",
+ "symphonia-metadata",
+]
+
[[package]]
name = "symphonia-metadata"
-version = "0.5.4"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc622b9841a10089c5b18e99eb904f4341615d5aa55bbf4eedde1be721a4023c"
+checksum = "36306ff42b9ffe6e5afc99d49e121e0bd62fe79b9db7b9681d48e29fa19e6b16"
dependencies = [
"encoding_rs",
"lazy_static",
@@ -5204,9 +5894,9 @@ dependencies = [
[[package]]
name = "symphonia-utils-xiph"
-version = "0.5.4"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "484472580fa49991afda5f6550ece662237b00c6f562c7d9638d1b086ed010fe"
+checksum = "ee27c85ab799a338446b68eec77abf42e1a6f1bb490656e121c6e27bfbab9f16"
dependencies = [
"symphonia-core",
"symphonia-metadata",
@@ -5225,9 +5915,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.104"
+version = "2.0.117"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
dependencies = [
"proc-macro2",
"quote",
@@ -5251,21 +5941,22 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
name = "sysinfo"
-version = "0.35.2"
+version = "0.39.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c3ffa3e4ff2b324a57f7aeb3c349656c7b127c3c189520251a648102a92496e"
+checksum = "14311e7e9a03114cd4b65eedd54e8fed2945e17f08586ae97ef53bc0669f9581"
dependencies = [
"libc",
"memchr",
"ntapi",
"objc2-core-foundation",
"objc2-io-kit",
- "windows 0.61.3",
+ "objc2-open-directory",
+ "windows 0.62.0",
]
[[package]]
@@ -5283,35 +5974,36 @@ dependencies = [
[[package]]
name = "tao"
-version = "0.34.0"
+version = "0.35.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49c380ca75a231b87b6c9dd86948f035012e7171d1a7c40a9c2890489a7ffd8a"
+checksum = "a33f7f9e486ade65fcf1e45c440f9236c904f5c1002cdc7fc6ae582777345ce4"
dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.11.1",
+ "block2 0.6.2",
"core-foundation",
"core-graphics",
"crossbeam-channel",
- "dispatch",
+ "dbus",
+ "dispatch2",
"dlopen2",
"dpi",
"gdkwayland-sys",
"gdkx11-sys",
"gtk",
- "jni",
- "lazy_static",
+ "jni 0.21.1",
"libc",
"log",
- "ndk 0.9.0",
- "ndk-context",
- "ndk-sys 0.6.0+11769913",
- "objc2 0.6.1",
+ "ndk",
+ "ndk-sys",
+ "objc2 0.6.4",
"objc2-app-kit",
- "objc2-foundation 0.3.1",
+ "objc2-foundation 0.3.2",
+ "objc2-ui-kit",
"once_cell",
"parking_lot",
+ "percent-encoding",
"raw-window-handle 0.5.2",
"raw-window-handle 0.6.2",
- "scopeguard",
"tao-macros",
"unicode-segmentation",
"url",
@@ -5329,7 +6021,7 @@ checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -5346,15 +6038,25 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "tendril"
-version = "0.4.3"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0"
+checksum = "c4790fc369d5a530f4b544b094e31388b9b3a37c0f4652ade4505945f5660d24"
dependencies = [
- "futf",
- "mac",
+ "new_debug_unreachable",
"utf-8",
]
+[[package]]
+name = "textwrap"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c13547615a44dc9c452a8a534638acdf07120d4b6847c8178705da06306a3057"
+dependencies = [
+ "smawk",
+ "unicode-linebreak",
+ "unicode-width 0.2.1",
+]
+
[[package]]
name = "thiserror"
version = "1.0.69"
@@ -5381,7 +6083,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -5392,7 +6094,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -5483,31 +6185,28 @@ dependencies = [
[[package]]
name = "tokio"
-version = "1.47.1"
+version = "1.52.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038"
+checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe"
dependencies = [
- "backtrace",
"bytes",
- "io-uring",
"libc",
"mio",
"pin-project-lite",
- "slab",
- "socket2 0.6.0",
+ "socket2 0.6.3",
"tokio-macros",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
]
[[package]]
name = "tokio-macros"
-version = "2.5.0"
+version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -5604,20 +6303,20 @@ dependencies = [
[[package]]
name = "tower-http"
-version = "0.6.6"
+version = "0.6.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
+checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840"
dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.11.1",
"bytes",
"futures-util",
"http",
"http-body",
- "iri-string",
"pin-project-lite",
"tower",
"tower-layer",
"tower-service",
+ "url",
]
[[package]]
@@ -5705,12 +6404,24 @@ version = "2.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
+[[package]]
+name = "unicode-id-start"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81b79ad29b5e19de4260020f8919b443b2ef0277d242ce532ec7b7a2cc8b6007"
+
[[package]]
name = "unicode-ident"
version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+[[package]]
+name = "unicode-linebreak"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
+
[[package]]
name = "unicode-segmentation"
version = "1.12.0"
@@ -5729,6 +6440,12 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c"
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
[[package]]
name = "unidecode"
version = "0.3.0"
@@ -5802,7 +6519,7 @@ version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
"js-sys",
"wasm-bindgen",
]
@@ -5846,6 +6563,12 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "65dd7eed29412da847b0f78bcec0ac98588165988a8cfe41d4ea1d429f8ccfff"
+[[package]]
+name = "vsimd"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64"
+
[[package]]
name = "walkdir"
version = "2.5.0"
@@ -5867,23 +6590,26 @@ dependencies = [
[[package]]
name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
[[package]]
-name = "wasi"
-version = "0.11.1+wasi-snapshot-preview1"
+name = "wasip2"
+version = "1.0.3+wasi-0.2.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
+dependencies = [
+ "wit-bindgen 0.57.1",
+]
[[package]]
-name = "wasi"
-version = "0.14.2+wasi-0.2.4"
+name = "wasip3"
+version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
dependencies = [
- "wit-bindgen-rt",
+ "wit-bindgen 0.51.0",
]
[[package]]
@@ -5908,7 +6634,7 @@ dependencies = [
"log",
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
"wasm-bindgen-shared",
]
@@ -5943,7 +6669,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -5957,6 +6683,40 @@ dependencies = [
"unicode-ident",
]
+[[package]]
+name = "wasm-encoder"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
+dependencies = [
+ "leb128fmt",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasm-metadata"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
+dependencies = [
+ "anyhow",
+ "indexmap",
+ "wasm-encoder",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasmparser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
+dependencies = [
+ "bitflags 2.11.1",
+ "hashbrown 0.15.4",
+ "indexmap",
+ "semver",
+]
+
[[package]]
name = "web-sys"
version = "0.3.77"
@@ -5977,27 +6737,39 @@ dependencies = [
"wasm-bindgen",
]
+[[package]]
+name = "web_atoms"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7cff6eef815df1834fd250e3a2ff436044d82a9f1bc1980ca1dbdf07effc538"
+dependencies = [
+ "phf 0.13.1",
+ "phf_codegen 0.13.1",
+ "string_cache",
+ "string_cache_codegen",
+]
+
[[package]]
name = "webbrowser"
-version = "1.0.5"
+version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaf4f3c0ba838e82b4e5ccc4157003fb8c324ee24c058470ffb82820becbde98"
+checksum = "0fc95580916af1e68ff6a7be07446fc5db73ebf71cf092de939bbf5f7e189f72"
dependencies = [
"core-foundation",
- "jni",
+ "jni 0.22.4",
"log",
"ndk-context",
- "objc2 0.6.1",
- "objc2-foundation 0.3.1",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
"url",
"web-sys",
]
[[package]]
name = "webkit2gtk"
-version = "2.0.1"
+version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76b1bc1e54c581da1e9f179d0b38512ba358fb1af2d634a1affe42e37172361a"
+checksum = "a1027150013530fb2eaf806408df88461ae4815a45c541c8975e61d6f2fc4793"
dependencies = [
"bitflags 1.3.2",
"cairo-rs",
@@ -6019,9 +6791,9 @@ dependencies = [
[[package]]
name = "webkit2gtk-sys"
-version = "2.0.1"
+version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62daa38afc514d1f8f12b8693d30d5993ff77ced33ce30cd04deebc267a6d57c"
+checksum = "916a5f65c2ef0dfe12fff695960a2ec3d4565359fdbb2e9943c974e06c734ea5"
dependencies = [
"bitflags 1.3.2",
"cairo-sys-rs",
@@ -6037,6 +6809,15 @@ dependencies = [
"system-deps",
]
+[[package]]
+name = "webpki-root-certs"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31141ce3fc3e300ae89b78c0dd67f9708061d1d2eda54b8209346fd6be9a92c"
+dependencies = [
+ "rustls-pki-types",
+]
+
[[package]]
name = "webpki-roots"
version = "0.26.11"
@@ -6077,7 +6858,7 @@ checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -6150,16 +6931,6 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-[[package]]
-name = "windows"
-version = "0.54.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
-dependencies = [
- "windows-core 0.54.0",
- "windows-targets 0.52.6",
-]
-
[[package]]
name = "windows"
version = "0.56.0"
@@ -6176,11 +6947,24 @@ version = "0.61.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
dependencies = [
- "windows-collections",
+ "windows-collections 0.2.0",
"windows-core 0.61.2",
- "windows-future",
- "windows-link",
- "windows-numerics",
+ "windows-future 0.2.1",
+ "windows-link 0.1.3",
+ "windows-numerics 0.2.0",
+]
+
+[[package]]
+name = "windows"
+version = "0.62.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9579d0e6970fd5250aa29aba5994052385ff55cf7b28a059e484bb79ea842e42"
+dependencies = [
+ "windows-collections 0.3.0",
+ "windows-core 0.62.0",
+ "windows-future 0.3.0",
+ "windows-link 0.2.1",
+ "windows-numerics 0.3.0",
]
[[package]]
@@ -6193,13 +6977,12 @@ dependencies = [
]
[[package]]
-name = "windows-core"
-version = "0.54.0"
+name = "windows-collections"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
+checksum = "a90dd7a7b86859ec4cdf864658b311545ef19dbcf17a672b52ab7cefe80c336f"
dependencies = [
- "windows-result 0.1.2",
- "windows-targets 0.52.6",
+ "windows-core 0.62.0",
]
[[package]]
@@ -6222,9 +7005,22 @@ checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
dependencies = [
"windows-implement 0.60.0",
"windows-interface 0.59.1",
- "windows-link",
+ "windows-link 0.1.3",
"windows-result 0.3.4",
- "windows-strings",
+ "windows-strings 0.4.2",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.62.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57fe7168f7de578d2d8a05b07fd61870d2e73b4020e9f49aa00da8471723497c"
+dependencies = [
+ "windows-implement 0.60.0",
+ "windows-interface 0.59.1",
+ "windows-link 0.2.1",
+ "windows-result 0.4.1",
+ "windows-strings 0.5.1",
]
[[package]]
@@ -6234,8 +7030,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
dependencies = [
"windows-core 0.61.2",
- "windows-link",
- "windows-threading",
+ "windows-link 0.1.3",
+ "windows-threading 0.1.0",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2194dee901458cb79e1148a4e9aac2b164cc95fa431891e7b296ff0b2f1d8a6"
+dependencies = [
+ "windows-core 0.62.0",
+ "windows-link 0.2.1",
+ "windows-threading 0.2.1",
]
[[package]]
@@ -6246,7 +7053,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -6257,7 +7064,7 @@ checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -6268,7 +7075,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -6279,7 +7086,7 @@ checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -6288,6 +7095,12 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
[[package]]
name = "windows-numerics"
version = "0.2.0"
@@ -6295,7 +7108,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
dependencies = [
"windows-core 0.61.2",
- "windows-link",
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-numerics"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ce3498fe0aba81e62e477408383196b4b0363db5e0c27646f932676283b43d8"
+dependencies = [
+ "windows-core 0.62.0",
+ "windows-link 0.2.1",
]
[[package]]
@@ -6313,7 +7136,16 @@ version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
dependencies = [
- "windows-link",
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
+dependencies = [
+ "windows-link 0.2.1",
]
[[package]]
@@ -6322,7 +7154,16 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
dependencies = [
- "windows-link",
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
+dependencies = [
+ "windows-link 0.2.1",
]
[[package]]
@@ -6361,6 +7202,15 @@ dependencies = [
"windows-targets 0.53.3",
]
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
[[package]]
name = "windows-targets"
version = "0.42.2"
@@ -6398,7 +7248,7 @@ version = "0.53.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
dependencies = [
- "windows-link",
+ "windows-link 0.1.3",
"windows_aarch64_gnullvm 0.53.0",
"windows_aarch64_msvc 0.53.0",
"windows_i686_gnu 0.53.0",
@@ -6415,7 +7265,16 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
dependencies = [
- "windows-link",
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-threading"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37"
+dependencies = [
+ "windows-link 0.2.1",
]
[[package]]
@@ -6424,7 +7283,7 @@ version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e04a5c6627e310a23ad2358483286c7df260c964eb2d003d8efd6d0f4e79265c"
dependencies = [
- "windows-link",
+ "windows-link 0.1.3",
]
[[package]]
@@ -6596,12 +7455,97 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
[[package]]
-name = "wit-bindgen-rt"
-version = "0.39.0"
+name = "wit-bindgen"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
+dependencies = [
+ "wit-bindgen-rust-macro",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.57.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
+
+[[package]]
+name = "wit-bindgen-core"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
+dependencies = [
+ "anyhow",
+ "heck 0.5.0",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-bindgen-rust"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
+dependencies = [
+ "anyhow",
+ "heck 0.5.0",
+ "indexmap",
+ "prettyplease",
+ "syn 2.0.117",
+ "wasm-metadata",
+ "wit-bindgen-core",
+ "wit-component",
+]
+
+[[package]]
+name = "wit-bindgen-rust-macro"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
+dependencies = [
+ "anyhow",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+ "wit-bindgen-core",
+ "wit-bindgen-rust",
+]
+
+[[package]]
+name = "wit-component"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
+dependencies = [
+ "anyhow",
+ "bitflags 2.11.1",
+ "indexmap",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "wasm-encoder",
+ "wasm-metadata",
+ "wasmparser",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-parser"
+version = "0.244.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
dependencies = [
- "bitflags 2.9.1",
+ "anyhow",
+ "id-arena",
+ "indexmap",
+ "log",
+ "semver",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "unicode-xid",
+ "wasmparser",
]
[[package]]
@@ -6612,29 +7556,29 @@ checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
[[package]]
name = "wry"
-version = "0.52.1"
+version = "0.55.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12a714d9ba7075aae04a6e50229d6109e3d584774b99a6a8c60de1698ca111b9"
+checksum = "186f9871daa55fd9c016578b810d149de58367113db7fb72b462d2323ce19514"
dependencies = [
"base64",
- "block2 0.6.1",
+ "block2 0.6.2",
"cookie",
"crossbeam-channel",
+ "dirs",
+ "dom_query",
"dpi",
"dunce",
"gdkx11",
"gtk",
- "html5ever",
"http",
"javascriptcore-rs",
- "jni",
- "kuchikiki",
+ "jni 0.21.1",
"libc",
- "ndk 0.9.0",
- "objc2 0.6.1",
+ "ndk",
+ "objc2 0.6.4",
"objc2-app-kit",
"objc2-core-foundation",
- "objc2-foundation 0.3.1",
+ "objc2-foundation 0.3.2",
"objc2-ui-kit",
"objc2-web-kit",
"once_cell",
@@ -6704,7 +7648,7 @@ checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
"synstructure",
]
@@ -6725,7 +7669,7 @@ checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
@@ -6745,7 +7689,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
"synstructure",
]
@@ -6785,7 +7729,7 @@ checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.104",
+ "syn 2.0.117",
]
[[package]]
diff --git a/README.md b/README.md
index 009490b4..9cd48fd5 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,9 @@
+Temporary Beatport fix build May 2026
Cross-platform music tagger.
-It can fetch metadata from Beatport, Traxsource, Juno Download, Discogs, Musicbrainz and Spotify.
+It can fetch metadata from Beatport, Traxsource, Discogs, Musicbrainz and Spotify.
It is also able to fetch Spotify's Audio Features based on ISRC & exact match.
There is a manual tag editor and quick tag editor which lets you use keyboard shortcuts. Written in Rust, Vue.js and Quasar.
diff --git a/client/package.json b/client/package.json
index a944fd64..227b9e97 100644
--- a/client/package.json
+++ b/client/package.json
@@ -9,21 +9,21 @@
"preview": "vite preview"
},
"dependencies": {
- "@quasar/extras": "1.16.16",
- "axios": "1.8.2",
+ "@quasar/extras": "2.0.1",
+ "axios": "1.18.0",
"compare-versions": "6.1.1",
- "quasar": "2.17.7",
- "vue": "3.5.13",
- "vue-router": "4.5.0",
+ "quasar": "2.20.1",
+ "vue": "3.5.38",
+ "vue-router": "5.1.0",
"vuedraggable": "4.1.0"
},
"devDependencies": {
- "@quasar/vite-plugin": "1.9.0",
- "@vitejs/plugin-vue": "5.2.4",
- "path": "^0.12.7",
- "sass": "1.83.4",
- "typescript": "5.7.3",
- "vite": "6.3.5",
- "vue-tsc": "3.0.5"
+ "@quasar/vite-plugin": "1.12.0",
+ "@vitejs/plugin-vue": "6.0.7",
+ "path": "0.12.7",
+ "sass": "1.101.0",
+ "typescript": "6.0.3",
+ "vite": "8.0.16",
+ "vue-tsc": "3.3.5"
}
-}
\ No newline at end of file
+}
diff --git a/client/pnpm-workspace.yaml b/client/pnpm-workspace.yaml
new file mode 100644
index 00000000..d89ee945
--- /dev/null
+++ b/client/pnpm-workspace.yaml
@@ -0,0 +1,18 @@
+packages:
+ - 'client'
+
+allowBuilds:
+ '@parcel/watcher': true
+ esbuild: true
+minimumReleaseAgeExclude:
+ - '@vue/compiler-core@3.5.38'
+ - '@vue/compiler-dom@3.5.38'
+ - '@vue/compiler-sfc@3.5.38'
+ - '@vue/compiler-ssr@3.5.38'
+ - '@vue/reactivity@3.5.38'
+ - '@vue/runtime-core@3.5.38'
+ - '@vue/runtime-dom@3.5.38'
+ - '@vue/server-renderer@3.5.38'
+ - '@vue/shared@3.5.38'
+ - vue@3.5.38
+ - quasar@2.20.1
diff --git a/client/src/components/AutotaggerPlatforms.vue b/client/src/components/AutotaggerPlatforms.vue
index 075e8fbd..68198a90 100644
--- a/client/src/components/AutotaggerPlatforms.vue
+++ b/client/src/components/AutotaggerPlatforms.vue
@@ -1,6 +1,6 @@
-
+
@@ -80,7 +80,7 @@
\ No newline at end of file
+
diff --git a/client/src/views/TagEditor.vue b/client/src/views/TagEditor.vue
index 4d5ccc70..cf05c727 100644
--- a/client/src/views/TagEditor.vue
+++ b/client/src/views/TagEditor.vue
@@ -164,7 +164,7 @@
@@ -207,7 +207,7 @@
@change='id3CommentsChange'
>
-
+
@@ -242,7 +242,7 @@
@change='id3USLTChange'
>
-
+
diff --git a/client/tsconfig.json b/client/tsconfig.json
index d4aefa2c..0fdf9a37 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -3,7 +3,7 @@
"target": "ESNext",
"useDefineForClassFields": true,
"module": "ESNext",
- "moduleResolution": "Node",
+ "moduleResolution": "bundler",
"strict": true,
"jsx": "preserve",
"sourceMap": true,
diff --git a/crates/onetagger-autotag/Cargo.toml b/crates/onetagger-autotag/Cargo.toml
index 424ac31b..9d13687d 100644
--- a/crates/onetagger-autotag/Cargo.toml
+++ b/crates/onetagger-autotag/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2021"
[dependencies]
log = "0.4"
-rand = "0.9"
-regex = "1.11"
+rand = "0.10"
+regex = "1.12"
dunce = "1.0"
image = "0.25"
anyhow = "1.0"
@@ -16,16 +16,16 @@ chrono = "0.4"
base64 = "0.22"
execute = "0.2"
walkdir = "2.5"
-libloading = "0.8"
+libloading = "0.9"
serde_json = "1.0"
lazy_static = "1.5"
crossbeam-channel = "0.5"
serde = { version = "1.0", features = ["derive"] }
-reqwest = { version = "0.12", features = [
+reqwest = { version = "0.13", features = [
"json",
"blocking",
- "rustls-tls",
+ "rustls",
], default-features = false }
songrec = { git = "https://github.com/Marekkon5/SongRec.git" }
diff --git a/crates/onetagger-autotag/src/lib.rs b/crates/onetagger-autotag/src/lib.rs
index 43097470..c07a0224 100644
--- a/crates/onetagger-autotag/src/lib.rs
+++ b/crates/onetagger-autotag/src/lib.rs
@@ -169,6 +169,8 @@ impl TrackImpl for Track {
tag.set_field(Field::Style, self.styles.clone(), config.overwrite_tag(SupportedTag::Style));
}
}
+
+
// Release dates
if config.tag_enabled(SupportedTag::ReleaseDate) {
if let Some(date) = self.release_date {
@@ -213,6 +215,7 @@ impl TrackImpl for Track {
}, config.overwrite_tag(SupportedTag::PublishDate));
}
}
+
// URL
if config.tag_enabled(SupportedTag::URL) {
tag.set_raw("WWWAUDIOFILE", vec![self.url.to_string()], config.overwrite_tag(SupportedTag::URL));
@@ -325,16 +328,19 @@ impl TrackImpl for Track {
// Cover file
if let Some(cover_data) = cover_data {
- match AudioFileInfo::load_file(&path, None, None) {
- Ok(info) => {
- let cover_path = get_cover_path(&info, path.as_ref().parent().unwrap(), config);
- match std::fs::write(&cover_path, cover_data) {
- Ok(_) => debug!("Cover written to: {}", cover_path.display()),
- Err(e) => error!("Failed to write cover file: {e}"),
+ // --- FIXED: Only generate path and write file if album_art_file configuration is enabled ---
+ if config.album_art_file {
+ match AudioFileInfo::load_file(&path, None, None) {
+ Ok(info) => {
+ let cover_path = get_cover_path(&info, path.as_ref().parent().unwrap(), config);
+ match std::fs::write(&cover_path, cover_data) {
+ Ok(_) => debug!("Cover written to: {}", cover_path.display()),
+ Err(e) => error!("Failed to write cover file: {e}"),
+ }
+ },
+ Err(e) => {
+ error!("Failed generating cover path: {e}");
}
- },
- Err(e) => {
- error!("Failed generating cover path: {e}");
}
}
}
diff --git a/crates/onetagger-autotag/src/platforms.rs b/crates/onetagger-autotag/src/platforms.rs
index 082ece0a..87816fbb 100644
--- a/crates/onetagger-autotag/src/platforms.rs
+++ b/crates/onetagger-autotag/src/platforms.rs
@@ -6,7 +6,7 @@ use std::io::Cursor;
use std::sync::{Arc, Mutex};
use base64::Engine;
use libloading::{Library, Symbol};
-use onetagger_platforms::{beatport, junodownload, spotify, traxsource, discogs, itunes, musicbrainz, beatsource, bpmsupreme, bandcamp, deezer, musixmatch};
+use onetagger_platforms::{beatport, spotify, traxsource, discogs, itunes, musicbrainz, beatsource, bpmsupreme, bandcamp, deezer, musixmatch};
use image::{ImageFormat, ImageReader};
use onetagger_shared::Settings;
use onetagger_tagger::custom::MatchTrackResult;
@@ -33,7 +33,6 @@ impl AutotaggerPlatforms {
AutotaggerPlatforms::add_builtin::(&mut output);
AutotaggerPlatforms::add_builtin::(&mut output);
AutotaggerPlatforms::add_builtin::(&mut output);
- AutotaggerPlatforms::add_builtin::(&mut output);
AutotaggerPlatforms::add_builtin::(&mut output);
AutotaggerPlatforms::add_builtin::(&mut output);
AutotaggerPlatforms::add_builtin::(&mut output);
@@ -157,7 +156,7 @@ impl CustomPlatform {
/// Load library
pub fn open(path: &PathBuf) -> Result {
let p = unsafe {
- let lib = Library::new(&path)?;
+ let lib = Library::new(path)?;
// Check version compatibility
let version: Symbol<*const i32> = lib.get(b"_1T_PLATFORM_COMPATIBILITY")?;
if **version != onetagger_tagger::custom::CUSTOM_PLATFORM_COMPATIBILITY {
diff --git a/crates/onetagger-autotag/src/shazam.rs b/crates/onetagger-autotag/src/shazam.rs
index 5556f920..c3f28c0a 100644
--- a/crates/onetagger-autotag/src/shazam.rs
+++ b/crates/onetagger-autotag/src/shazam.rs
@@ -1,7 +1,8 @@
use anyhow::Error;
use std::path::Path;
use std::thread::Builder;
-use onetagger_player::rodio::source::UniformSourceIterator;
+use std::num::{NonZeroU16, NonZeroU32};
+use onetagger_player::rodio::source::{Source, UniformSourceIterator};
use serde::{Serialize, Deserialize};
use songrec::SignatureGenerator;
use onetagger_player::AudioSources;
@@ -14,21 +15,34 @@ impl Shazam {
// Load file
let source = AudioSources::from_path(path)?;
let duration = source.duration();
- let conv = UniformSourceIterator::new(source.get_source()?, 1, 16000);
- // Get 12s part from middle
- let buffer = if duration >= 12000 {
+
+ // Wrap sample rate and channel conversions using modern NonZero rules
+ let conv = UniformSourceIterator::new(
+ source.get_source()?,
+ NonZeroU16::new(1).unwrap(),
+ NonZeroU32::new(16000).unwrap()
+ );
+
+ // Extract 12s segment from middle and down-scale floating samples back to standard i16 bounds
+ let buffer: Vec = if duration >= 12000 {
// ((duration / 1000) * 16KHz) / 2 (half duration) - (6 * 16KHz) seconds.
- conv.skip((duration * 8 - 96000) as usize).take(16000 * 12).collect::>()
+ conv.skip((duration * 8 - 96000) as usize)
+ .take(16000 * 12)
+ .map(|s| (s * 32767.0) as i16)
+ .collect()
} else {
- conv.collect::>()
+ conv.map(|s| (s * 32767.0) as i16)
+ .collect()
};
- // Calculating singnature requires 6MB stack, because it allocates >2MB of buffers for some reason
+
+ // Calculating signature requires 6MB stack, because it allocates >2MB of buffers for some reason
let signature = Builder::new()
.stack_size(1024 * 1024 * 6)
.spawn(move || { SignatureGenerator::make_signature_from_buffer(&buffer) })
.unwrap()
.join()
.unwrap();
+
let response = songrec::recognize_song_from_signature(&signature, 0).map_err(|e| anyhow!("{e:?}"))?;
let response: ShazamResponse = serde_json::from_value(response)?;
let track = response.track.ok_or(anyhow!("Shazam returned no matches!"))?;
diff --git a/crates/onetagger-cli/Cargo.toml b/crates/onetagger-cli/Cargo.toml
index b644b37f..ae187087 100644
--- a/crates/onetagger-cli/Cargo.toml
+++ b/crates/onetagger-cli/Cargo.toml
@@ -9,9 +9,9 @@ edition = "2021"
log = "0.4"
anyhow = "1.0"
serde_json = "1.0"
-convert_case = "0.8"
+convert_case = "0.11"
-clap = { version = "4.5", features = ["derive"] }
+clap = { version = "4.6", features = ["derive"] }
onetagger-ui = { path = "../onetagger-ui" }
onetagger-tagger = { path = "../onetagger-tagger" }
diff --git a/crates/onetagger-platforms/Cargo.toml b/crates/onetagger-platforms/Cargo.toml
index 09d389d9..3bb76be0 100644
--- a/crates/onetagger-platforms/Cargo.toml
+++ b/crates/onetagger-platforms/Cargo.toml
@@ -8,21 +8,23 @@ edition = "2021"
[dependencies]
log = "0.4"
url = "2.5"
-rand = "0.9"
-regex = "1.11"
+rand = "0.10"
+regex = "1.12"
anyhow = "1.0"
-scraper = "0.23"
+scraper = "0.27"
serde_json = "1.0"
-minify-html = "0.16"
+minify-html = "0.18"
serde = { version = "1.0", features = ["derive"] }
chrono = { version = "0.4", features = ["serde"] }
-reqwest = { version = "0.12", features = [
+reqwest = { version = "0.13", features = [
"json",
"blocking",
- "rustls-tls",
+ "rustls",
+ "query",
+ "form",
], default-features = false }
-rspotify = { version = "0.15", features = [
+rspotify = { version = "0.16", features = [
"client-ureq",
"ureq-rustls-tls",
], default-features = false }
@@ -31,3 +33,4 @@ rspotify = { version = "0.15", features = [
onetagger-tag = { path = "../onetagger-tag" }
onetagger-shared = { path = "../onetagger-shared" }
onetagger-tagger = { path = "../onetagger-tagger" }
+strsim = "0.11.1"
diff --git a/crates/onetagger-platforms/assets/junodownload.png b/crates/onetagger-platforms/assets/junodownload.png
deleted file mode 100644
index 200b8df7..00000000
Binary files a/crates/onetagger-platforms/assets/junodownload.png and /dev/null differ
diff --git a/crates/onetagger-platforms/src/beatport.rs b/crates/onetagger-platforms/src/beatport.rs
index a7c259d7..2df262d9 100644
--- a/crates/onetagger-platforms/src/beatport.rs
+++ b/crates/onetagger-platforms/src/beatport.rs
@@ -1,18 +1,59 @@
-use std::sync::{Arc, Mutex};
-use anyhow::Error;
+use std::sync::{Arc, Mutex, OnceLock};
+use std::collections::{HashMap, HashSet};
+use anyhow::{anyhow, Error};
use std::time::Duration;
use reqwest::StatusCode;
use reqwest::blocking::Client;
-use chrono::NaiveDate;
-use scraper::{Html, Selector};
-use serde::de::DeserializeOwned;
+use chrono::{NaiveDate, Datelike};
use serde::{Serialize, Deserialize};
use onetagger_tag::FrameName;
-use onetagger_tagger::{supported_tags, Album, AudioFileInfo, AutotaggerSource, AutotaggerSourceBuilder, MatchingUtils, PlatformCustomOptionValue, PlatformCustomOptions, PlatformInfo, SupportedTag, TaggerConfig, Track, TrackMatch, TrackNumber};
-use serde_json::{json, Value};
+use onetagger_tagger::{
+ supported_tags, Album, AudioFileInfo, AutotaggerSource, AutotaggerSourceBuilder,
+ MatchingUtils, PlatformCustomOptionValue, PlatformCustomOptions, PlatformInfo,
+ SupportedTag, TaggerConfig, Track, TrackMatch, TrackNumber
+};
+use serde_json::json;
const INVALID_ART: &'static str = "ab2d1d04-233d-4b08-8234-9782b34dcab8";
+static MIX_REGEX: OnceLock = OnceLock::new();
+static FEATURE_REGEX: OnceLock = OnceLock::new();
+
+#[derive(PartialEq, Eq, Debug)]
+enum MixType {
+ Original,
+ Extended,
+ Club,
+ Radio,
+ Edit,
+ Remix,
+ Dub,
+ Unknown,
+}
+
+impl MixType {
+ fn from_str(s: &str) -> Self {
+ let m = s.to_lowercase();
+
+ if m.contains("remix") || m.contains("rmx") || m.contains("rework") {
+ MixType::Remix
+ } else if m.contains("dub") {
+ MixType::Dub
+ } else if m.contains("extended") {
+ MixType::Extended
+ } else if m.contains("club") {
+ MixType::Club
+ } else if m.contains("radio") {
+ MixType::Radio
+ } else if m.contains("edit") || m.contains("short") {
+ MixType::Edit
+ } else if m.is_empty() || m == "original mix" || m == "original" || m == "orig. mix" {
+ MixType::Original
+ } else {
+ MixType::Unknown
+ }
+ }
+}
pub struct Beatport {
client: Client,
@@ -20,79 +61,88 @@ pub struct Beatport {
}
impl Beatport {
- /// Create new instance
pub fn new(access_token: Arc>>) -> Beatport {
let client = Client::builder()
.user_agent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36")
.timeout(Duration::from_secs(60))
.build()
.unwrap();
+
Beatport {
- client, access_token
+ client,
+ access_token
}
}
- /// Search for tracks on beatport
pub fn search(&self, query: &str, page: i32, results_per_page: usize) -> Result {
let query = Self::clear_search_query(query);
- let response = self.client.get("https://www.beatport.com/search/tracks")
+ let token = self.update_token()?;
+
+ let response: BeatportTrackResults = self.client
+ .get("https://api.beatport.com/v4/catalog/search/")
+ .bearer_auth(token)
.query(&[
- ("q", &query),
+ ("q", query.as_str()),
+ ("type", "tracks"),
("page", &page.to_string()),
- ("per-page", &results_per_page.to_string())
+ ("per_page", &results_per_page.to_string())
])
.send()?
- .text()?;
-
- // Parse JSON
- let results: BeatportTrackResults = self.get_next_data(&response)?;
- Ok(results)
- }
-
- /// Extract next hydratation data from html
- fn get_next_data(&self, response: &str) -> Result {
- let document = Html::parse_document(&response);
- let selector = Selector::parse("script#__NEXT_DATA__").unwrap();
- let script = document.select(&selector).next().ok_or(anyhow!("Missing __NEXT_DATA__"))?.text().collect::();
- let value: Value = serde_json::from_str(&script)?;
- Ok(serde_json::from_value(value["props"]["pageProps"]["dehydratedState"]["queries"][0]["state"]["data"].to_owned())?)
+ .json()?;
+
+ Ok(response)
}
- /// Update embed auth token
pub fn update_token(&self) -> Result {
- let mut token = self.access_token.lock().unwrap();
- // Fetch new if doesn't exist
- if (*token).is_none() {
- // Taken from https://embed.beatport.com/?id=4418593&type=release
- let mut response: BeatportOAuth = self.client.post("https://account.beatport.com/o/token/")
- .form(&json!({
- "client_id": "2tiTbKxmQFwnbFjMONU4k7njMRZmV3ZMwRBndiZs",
- "client_secret": "RDUJyAk4zFEGtQ8rsTmylDSfxmALRNBn3D1BsRr7MKi3oa1TL9Mq9QxqUPK7loiumXolEWbJcWa4IGAhtwnTz1cSXClGJ1tkkNCNWwRwjxIKTZJKOJxbwaNt0Rm3WG0v",
- "grant_type": "client_credentials"
- }))
- .send()?
- .json()?;
- response.expires_in = response.expires_in * 1000 + timestamp!() - 10_000;
- *token = Some(response);
- debug!("OAuth: {:?}", token);
- }
- // Expired
- let t = token.clone().unwrap();
- if t.expires_in <= timestamp!() {
+ // BOUNDED RETRY LOOP: Prevents infinite recursion if the Beatport API
+ // continually serves expired tokens (e.g., due to severe clock skew).
+ for attempt in 1..=2 {
+ let mut token = self.access_token.lock().unwrap();
+
+ if (*token).is_none() {
+ let mut response: BeatportOAuth = self.client.post("https://account.beatport.com/o/token/")
+ .form(&json!({
+ "client_id": "2tiTbKxmQFwnbFjMONU4k7njMRZmV3ZMwRBndiZs",
+ "client_secret": "RDUJyAk4zFEGtQ8rsTmylDSfxmALRNBn3D1BsRr7MKi3oa1TL9Mq9QxqUPK7loiumXolEWbJcWa4IGAhtwnTz1cSXClGJ1tkkNCNWwRwjxIKTZJKOJxbwaNt0Rm3WG0v",
+ "grant_type": "client_credentials"
+ }))
+ .send()?
+ .json()?;
+
+ response.expires_in = response.expires_in * 1000 + timestamp!() - 10_000;
+ *token = Some(response);
+ debug!("OAuth: {:?}", token);
+ }
+
+ let t = token.clone().unwrap();
+
+ // If the token is valid, return it immediately.
+ if t.expires_in > timestamp!() {
+ return Ok(t.access_token);
+ }
+
+ // If we are here, the token registered as instantly expired.
+ if attempt == 2 {
+ return Err(anyhow!("Beatport API continuously provided an expired token. Please check your system clock sync."));
+ }
+
+ // Clear the token to force a fresh fetch on the next iteration.
*token = None;
- return self.update_token();
+ // The Mutex guard (`token`) is automatically and safely dropped here at the end of the loop scope.
}
- Ok(t.access_token)
+
+ Err(anyhow!("Failed to acquire a valid Beatport token."))
}
- /// Fetch track using API
+
pub fn track(&self, id: i64) -> Result, Error> {
let token = self.update_token()?;
- let response = self.client.get(&format!("https://api.beatport.com/v4/catalog/tracks/{}", id))
+
+ let response = self.client
+ .get(&format!("https://api.beatport.com/v4/catalog/tracks/{}", id))
.bearer_auth(token)
.send()?;
- // Restricted / deleted track
if response.status() == StatusCode::FORBIDDEN {
return Ok(None);
}
@@ -100,86 +150,64 @@ impl Beatport {
Ok(response.json()?)
}
- /// Fetch release using API
pub fn release(&self, id: i64) -> Result {
let token = self.update_token()?;
- let response = self.client.get(&format!("https://api.beatport.com/v4/catalog/releases/{}", id))
+
+ let response = self.client
+ .get(&format!("https://api.beatport.com/v4/catalog/releases/{}", id))
.bearer_auth(token)
- .send()?.json()?;
+ .send()?
+ .json()?;
+
Ok(response)
}
- /// Get tracks from release
pub fn release_tracks(&self, id: i64) -> Result, Error> {
let token = self.update_token()?;
- let response: BeatportPagination = self.client.get(&format!("https://api.beatport.com/v4/catalog/releases/{}/tracks?per_page=200", id))
+
+ let response: BeatportPagination = self.client
+ .get(&format!("https://api.beatport.com/v4/catalog/releases/{}/tracks?per_page=200", id))
.bearer_auth(token)
- .send()?.json()?;
+ .send()?
+ .json()?;
+
Ok(response.results)
}
-
- /// Beatport returns 403 if you have more than single () pair
pub fn clear_search_query(query: &str) -> String {
- let mut open = 0;
- let mut closed = 0;
-
- query.chars().filter(|c| {
- match c {
- '(' if open > 0 => false,
- '(' => { open += 1; true },
- ')' if closed > 0 => false,
- ')' => { closed += 1; true },
- _ => true
- }
- }).collect()
+ let re = FEATURE_REGEX.get_or_init(|| regex::Regex::new(r"(?i)\s+(?:ft|feat|featuring)\.?\s+[^()]+").unwrap());
+ let stripped_query = re.replace_all(query, "").to_string();
+
+ stripped_query
+ .replace("(", " ")
+ .replace(")", " ")
+ .replace("[", " ")
+ .replace("]", " ")
+ .replace(",", " ")
+ .replace("Ft.", "")
+ .replace("ft.", "")
+ .replace(" Ft ", " ")
+ .replace(" ft ", " ")
+ .replace(" feat. ", " ")
+ .replace(" feat ", " ")
+ .replace(" ", " ")
+ .trim()
+ .to_string()
}
}
-
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct BeatportOAuth {
pub access_token: String,
pub expires_in: u128
}
-/// When searching for tracks
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct BeatportTrackResults {
- pub data: Vec
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct BeatportTrackResult {
- pub track_id: i64,
- pub track_name: String,
- pub artists: Option>,
- pub isrc: Option,
- pub length: Option,
- pub mix_name: Option,
- pub release: Option,
- pub genre: Option>,
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct BeatportTrackResultRelease {
- pub release_id: i64,
- pub release_image_uri: Option
+ #[serde(rename = "tracks")]
+ pub data: Vec
}
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct BeatportTrackResultsGenre {
- pub genre_name: String
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct BeatportArtist {
- pub artist_id: i64,
- pub artist_name: String,
- pub artist_type_name: String,
-}
-
-
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct BeatportTrack {
pub artists: Vec,
@@ -211,7 +239,7 @@ pub struct BeatportGeneric {
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct BeatportImage {
- pub id: i64,
+ pub id: Option,
pub dynamic_uri: String,
}
@@ -231,27 +259,6 @@ struct BeatportPagination {
pub results: Vec
}
-impl BeatportTrackResult {
- pub fn to_track(self, include_version: bool) -> Track {
- Track {
- platform: "beatport".to_string(),
- url: format!("https://www.beatport.com/track/{}/{}", self.track_name.to_lowercase().replace(" ", "-"), self.track_id),
- title: self.track_name,
- track_id: Some(self.track_id.to_string()),
- artists: self.artists.unwrap_or(vec![]).into_iter().map(|a| a.artist_name).collect(),
- version: match include_version {
- true => self.mix_name,
- false => None
- },
- duration: Duration::from_millis(self.length.unwrap_or(0)).into(),
- isrc: self.isrc,
- thumbnail: self.release.map(|r| r.release_image_uri).flatten(),
- genres: self.genre.map(|g| g.into_iter().map(|g| g.genre_name).collect()).unwrap_or(vec![]),
- ..Default::default()
- }
- }
-}
-
impl BeatportTrack {
pub fn to_track(self, art_resolution: u32) -> Track {
let art = self.get_art(art_resolution);
@@ -283,15 +290,14 @@ impl BeatportTrack {
remixers: self.remixers.into_iter().map(|r| r.name).collect(),
track_number: self.number.map(|n| TrackNumber::Number(n as i32)),
isrc: self.isrc,
- release_year: self.new_release_date.as_ref().map(|d| d.chars().take(4).collect::().parse().ok()).flatten(),
- publish_year: self.publish_date.as_ref().map(|d| d.chars().take(4).collect::().parse().ok()).flatten(),
- release_date: self.new_release_date.as_ref().map_or(None, |d| NaiveDate::parse_from_str(d, "%Y-%m-%d").ok()),
- publish_date: self.publish_date.as_ref().map_or(None, |d| NaiveDate::parse_from_str(d, "%Y-%m-%d").ok()),
+ release_year: self.new_release_date.as_ref().and_then(|d| d.chars().take(4).collect::().parse().ok()),
+ publish_year: self.publish_date.as_ref().and_then(|d| d.chars().take(4).collect::().parse().ok()),
+ release_date: self.new_release_date.as_ref().and_then(|d| NaiveDate::parse_from_str(d, "%Y-%m-%d").ok()),
+ publish_date: self.publish_date.as_ref().and_then(|d| NaiveDate::parse_from_str(d, "%Y-%m-%d").ok()),
thumbnail,
..Default::default()
};
- // Exclusive
if self.exclusive {
track.other.push((FrameName::same("BEATPORT_EXCLUSIVE"), vec!["1".to_string()]));
}
@@ -299,100 +305,215 @@ impl BeatportTrack {
track
}
- /// Get album art URL
pub fn get_art(&self, art_resolution: u32) -> Option {
if self.release.image.dynamic_uri.contains(&INVALID_ART) {
return None;
}
+
let r = art_resolution.to_string();
- Some(self.release.image.dynamic_uri.replace("{w}", &r).replace("{h}", &r).replace("{x}", &r).replace("{y}", &r))
+
+ Some(
+ self.release.image.dynamic_uri
+ .replace("{w}", &r)
+ .replace("{h}", &r)
+ .replace("{x}", &r)
+ .replace("{y}", &r)
+ )
}
}
-// Match track
impl AutotaggerSource for Beatport {
- fn match_track(&mut self, info: &AudioFileInfo, config: &TaggerConfig) -> Result, Error> {
- // Load custom config
+ fn match_track(&mut self, info: &AudioFileInfo, config: &TaggerConfig) -> Result, Error> {
let custom_config: BeatportConfig = config.get_custom("beatport")?;
let mut output = vec![];
- // Fetch by ID
- if let Some(id) = info.tags.get("BEATPORT_TRACK_ID").map(|t| t.first().map(|id| id.trim().replace("\0", "").parse().ok()).flatten()).flatten() {
+ if let Some(id) = info.tags.get("BEATPORT_TRACK_ID").map(|t| t.first().and_then(|id| id.trim().replace("\0", "").parse().ok())).flatten() {
info!("Fetching by ID: {}", id);
+
match self.track(id) {
Ok(Some(api_track)) => {
let track = TrackMatch::new_id(api_track.to_track(custom_config.art_resolution));
if !config.fetch_all_results {
- return Ok(vec![track]);
+ return Ok(vec![track]);
}
output.push(track);
},
Ok(None) => warn!("Matching by ID failed, track restricted, matching normally"),
- Err(e) => {
- warn!("Matching by ID failed, matching normally: {e}");
- }
+ Err(e) => warn!("Matching by ID failed, matching normally: {e}")
}
}
- // Fetch by ISRC
if let Some(isrc) = info.isrc.as_ref() {
match self.search(isrc, 1, 25) {
Ok(results) => {
if !results.data.is_empty() {
- let track = self.track(results.data[0].track_id)?;
- match track {
- Some(track) => {
+ // FIX: Graceful failover if track detail fetch fails, rather than hard crashing `?`
+ match self.track(results.data[0].id) {
+ Ok(Some(track)) => {
let track = TrackMatch::new_isrc(track.to_track(custom_config.art_resolution));
if !config.fetch_all_results {
- return Ok(vec![track]);
+ return Ok(vec![track]);
}
output.push(track);
},
- None => warn!("Matching by ISRC failed, track restricted, trying normal."),
+ Ok(None) => warn!("Matching by ISRC failed, track restricted, trying normal."),
+ Err(e) => warn!("Failed fetching track details by ISRC: {e}, falling back to normal match."),
}
}
},
- Err(e) => {
- warn!("Failed fetching track by ISRC: {e}");
- },
+ Err(e) => warn!("Failed fetching track by ISRC: {e}"),
}
}
- // Search
- let query = format!("{} {}", info.artist()?, MatchingUtils::clean_title(info.title()?));
+ let raw_title = info.title().unwrap_or("");
+ let re_feat = FEATURE_REGEX.get_or_init(|| regex::Regex::new(r"(?i)\s+(?:ft|feat|featuring)\.?\s+[^()]+").unwrap());
+ let virtual_title = re_feat.replace_all(raw_title, "").to_string();
+
+ let query = format!("{} {}", info.artist()?, MatchingUtils::clean_title(&virtual_title));
debug!("BP Query: {}", query);
- for page in 1..custom_config.max_pages+1 {
+
+ for page in 1..custom_config.max_pages + 1 {
match self.search(&query, page, 50) {
Ok(res) => {
- // Match
- let tracks = res.data
+ let api_tracks = res.data
.into_iter()
- .map(|t| t.to_track(true))
+ .map(|t| t.to_track(custom_config.art_resolution))
.collect::>();
- // Ignore version match
- let tracks = if custom_config.ignore_version {
- let t = tracks.clone().into_iter().map(|mut t| { t.version = None; t }).collect();
- // Copy back versions
+ let mut matched_tracks = if custom_config.ignore_version {
+ let t = api_tracks.clone().into_iter().map(|mut t| {
+ t.version = None;
+ t
+ }).collect();
+
MatchingUtils::match_track(info, &t, config, true)
.into_iter()
.map(|mut t| {
- if let Some(ot) = tracks.iter().find(|ot| ot.url == t.track.url) {
+ if let Some(ot) = api_tracks.iter().find(|ot| ot.url == t.track.url) {
t.track.version = ot.version.to_owned();
}
t
})
.collect()
} else {
- MatchingUtils::match_track(info, &tracks, config, true)
+ MatchingUtils::match_track(info, &api_tracks, config, true)
};
- // Return
- output.extend(tracks);
+ // --- NEW FALLBACK LOGIC START ---
+ let local_title_full = virtual_title.clone();
+
+ let re_mix = MIX_REGEX.get_or_init(|| regex::Regex::new(r"^(.*?)\s*(?:\(|\[)([^()\[\]]+)(?:\)|\])$").unwrap());
+
+ let (local_title, local_mix) = if let Some(caps) = re_mix.captures(&local_title_full) {
+ (caps.get(1).map_or("", |m| m.as_str()).trim(), caps.get(2).map_or("", |m| m.as_str()).trim())
+ } else {
+ (local_title_full.trim(), "")
+ };
+
+ let normalize_punctuation = |s: &str| -> String {
+ s.to_lowercase().replace(['(', ')', '[', ']', '-', ',', '.', '!'], " ")
+ };
+
+ let normalize_artists = |artists: &Vec| -> HashSet {
+ artists.iter()
+ .flat_map(|a| a.to_lowercase().replace("&", "and").split(',').map(|s| s.trim().to_string()).collect::>())
+ .filter(|s| !s.is_empty())
+ .collect()
+ };
+
+ let local_mix_clean = normalize_punctuation(local_mix);
+ let local_cat = MixType::from_str(&local_mix_clean);
+
+ for track in &api_tracks {
+ let beatport_title_original = &track.title;
+ let beatport_mix_clean = normalize_punctuation(track.version.as_deref().unwrap_or(""));
+ let api_cat = MixType::from_str(&beatport_mix_clean);
+
+ let mut is_compatible = false;
+ let mut mix_acc = 1.0;
+
+ if local_cat == api_cat
+ || (local_cat == MixType::Club && api_cat == MixType::Extended)
+ || (local_cat == MixType::Extended && api_cat == MixType::Club) {
+
+ if local_cat == MixType::Remix || local_cat == MixType::Dub {
+ let stopwords = ["remix", "rmx", "mix", "edit", "version", "vip", "rework", "dub"];
+ let words_local: HashSet<&str> = local_mix_clean.split_whitespace().filter(|w| !stopwords.contains(w)).collect();
+ let words_api: HashSet<&str> = beatport_mix_clean.split_whitespace().filter(|w| !stopwords.contains(w)).collect();
+ let intersection = words_local.intersection(&words_api).count() as f64;
+ let union = words_local.union(&words_api).count() as f64;
+ let jaccard = if union == 0.0 { 1.0 } else { intersection / union };
+
+ if jaccard >= 0.50 {
+ is_compatible = true;
+ mix_acc = jaccard;
+ }
+ } else {
+ is_compatible = true;
+ }
+ } else if (local_cat == MixType::Original && api_cat == MixType::Unknown) ||
+ (local_cat == MixType::Unknown && api_cat == MixType::Original) ||
+ (local_cat == MixType::Unknown && api_cat == MixType::Unknown) {
+ is_compatible = true;
+ mix_acc = 0.9;
+ }
+
+ if !is_compatible {
+ continue;
+ }
+
+ let beatport_title_clean = re_feat.replace_all(beatport_title_original, "").to_string();
+
+ let title_acc = strsim::normalized_levenshtein(
+ &MatchingUtils::clean_title_matching(&local_title),
+ &MatchingUtils::clean_title_matching(&beatport_title_clean)
+ );
+
+ let artist_acc = if MatchingUtils::match_artist(&info.artists, &track.artists, config.strictness) {
+ 1.0
+ } else {
+ let api_artist_words = normalize_artists(&track.artists);
+ let mut local_artists_rescued = normalize_artists(&info.artists);
+ let beatport_title_original_lower = beatport_title_original.to_lowercase();
+
+ for api_artist in &api_artist_words {
+ if beatport_title_original_lower.contains(api_artist) {
+ local_artists_rescued.insert(api_artist.clone());
+ }
+ }
+
+ let intersection = local_artists_rescued.intersection(&api_artist_words).count() as f64;
+ let union = local_artists_rescued.union(&api_artist_words).count() as f64;
+
+ if union == 0.0 { 0.0 } else { intersection / union }
+ };
+
+ mix_acc = mix_acc.clamp(0.0, 1.0);
+ let final_acc = (title_acc * 0.5) + (artist_acc * 0.3) + (mix_acc * 0.2);
+
+ if final_acc >= config.strictness {
+ if let Some(existing) = matched_tracks.iter_mut().find(|m| m.track.url == track.url) {
+ if final_acc > existing.accuracy {
+ existing.accuracy = final_acc;
+ }
+ } else {
+ matched_tracks.push(TrackMatch::new(final_acc, track.clone()));
+ }
+ }
+ }
+
+ matched_tracks.sort_by(|a, b| b.accuracy.partial_cmp(&a.accuracy).unwrap_or(std::cmp::Ordering::Equal));
+ // --- NEW FALLBACK LOGIC END ---
+
+ output.extend(matched_tracks);
+
if config.fetch_all_results {
continue;
}
- return Ok(output);
+
+ if output.iter().any(|m| m.accuracy >= config.strictness) {
+ return Ok(output);
+ }
},
Err(e) => {
warn!("Beatport search failed, query: {}. {}", query, e);
@@ -400,35 +521,44 @@ impl AutotaggerSource for Beatport {
}
}
}
+
Ok(output)
}
-
fn extend_track(&mut self, track: &mut Track, config: &TaggerConfig) -> Result<(), Error> {
let custom_config: BeatportConfig = config.get_custom("beatport")?;
- // Extend search results track
if track.other.is_empty() {
- let id = track.track_id.as_ref().unwrap().parse().unwrap();
- *track = self.track(id)?.ok_or(anyhow!("Restricted track"))?.to_track(custom_config.art_resolution);
+ if let Some(track_id_str) = &track.track_id {
+ if let Ok(id) = track_id_str.parse() {
+ if let Ok(Some(api_track)) = self.track(id) {
+ *track = api_track.to_track(custom_config.art_resolution);
+ }
+ }
+ }
}
- // Ignore extending track
if !config.tag_enabled(SupportedTag::AlbumArtist) && !config.tag_enabled(SupportedTag::TrackTotal) {
return Ok(());
}
- let release = self.release(track.release_id.as_ref().ok_or(anyhow!("Missing release_id"))?.parse()?)?;
- track.track_total = release.track_count;
- track.album_artists = match release.artists {
- Some(a) => a.into_iter().map(|a| a.name).collect(),
- None => vec![],
- };
+ if let Some(release_id_str) = &track.release_id {
+ if let Ok(id) = release_id_str.parse() {
+ if let Ok(release) = self.release(id) {
+ track.track_total = release.track_count;
+ track.album_artists = match release.artists {
+ Some(a) => a.into_iter().map(|a| a.name).collect(),
+ None => vec![],
+ };
+ }
+ }
+ }
+
Ok(())
}
-
+
fn get_album(&mut self, id: &str, config: &TaggerConfig) -> Result, Error> {
- let custom_config: BeatportConfig = config.get_custom("beatport")?;
+ let custom_config: BeatportConfig = config.get_custom("beatport")?;
let id: i64 = id.trim().parse()?;
let release = self.release(id)?;
let tracks = self.release_tracks(id)?;
@@ -441,10 +571,8 @@ impl AutotaggerSource for Beatport {
Ok(Some(album))
}
-
}
-/// For creating Beatport instances
#[derive(Debug, Clone)]
pub struct BeatportBuilder {
access_token: Arc>>
@@ -468,27 +596,34 @@ impl AutotaggerSourceBuilder for BeatportBuilder {
description: "Overall more specialized in Techno, can match using ISRC".to_string(),
icon: include_bytes!("../assets/beatport.png"),
max_threads: 0,
- version: "1.0.0".to_string(),
+ version: "1.0.1".to_string(),
requires_auth: false,
- supported_tags: supported_tags!(Title, Version, Artist, AlbumArtist, Album, BPM, Genre, Style, Label, URL, ReleaseDate, PublishDate, Key, AlbumArt, OtherTags, TrackId, ReleaseId, Duration, Remixer, CatalogNumber, TrackTotal, ISRC, TrackNumber),
+ supported_tags: supported_tags!(
+ Title, Version, Artist, AlbumArtist, Album, BPM, Genre, Style,
+ Label, URL, ReleaseDate, PublishDate, Key, AlbumArt, OtherTags,
+ TrackId, ReleaseId, Duration, Remixer, CatalogNumber, TrackTotal,
+ ISRC, TrackNumber
+ ),
custom_options: PlatformCustomOptions::new()
- // Album art resolution
.add("art_resolution", "Album art resolution", PlatformCustomOptionValue::Number {
- min: 200, max: 1600, step: 100, value: 500
+ min: 200,
+ max: 1600,
+ step: 100,
+ value: 500
})
- // Max pages to search
.add_tooltip("max_pages", "Max pages", "How many pages of search results to scan for tracks", PlatformCustomOptionValue::Number {
- min: 1, max: 10, step: 1, value: 1
+ min: 1,
+ max: 10,
+ step: 1,
+ value: 1
})
- // Ignore version
- .add_tooltip("ignore_version", "Ignore version when matching", "Ignores (Extended Mix), (Original Mix) and such", PlatformCustomOptionValue::Boolean {
+ .add_tooltip("ignore_version", "Ignore version when matching", "Ignores (Extended Mix), (Original Mix) and such", PlatformCustomOptionValue::Boolean {
value: false
})
}
}
}
-
#[derive(Debug, Clone, Serialize, Deserialize)]
struct BeatportConfig {
pub art_resolution: u32,
@@ -505,4 +640,4 @@ fn test_album() {
let mut bp = builder.get_source(&config).unwrap();
bp.get_album("2174307", &config).unwrap();
-}
\ No newline at end of file
+}
diff --git a/crates/onetagger-platforms/src/beatsource.rs b/crates/onetagger-platforms/src/beatsource.rs
index 8a4f8146..7ad76b01 100644
--- a/crates/onetagger-platforms/src/beatsource.rs
+++ b/crates/onetagger-platforms/src/beatsource.rs
@@ -1,11 +1,10 @@
-use anyhow::Error;
+use anyhow::{anyhow, Error};
use std::sync::{Arc, Mutex};
use std::time::Duration;
use chrono::NaiveDate;
use reqwest::blocking::Client;
-use scraper::{Html, Selector};
-use serde_json::Value;
use serde::{Serialize, Deserialize};
+use serde_json::json;
use onetagger_tagger::{AutotaggerSource, Track, TaggerConfig, AudioFileInfo, MatchingUtils, AutotaggerSourceBuilder, PlatformInfo, PlatformCustomOptions, PlatformCustomOptionValue, supported_tags, TrackMatch};
@@ -19,21 +18,44 @@ impl Beatsource {
pub fn new(token_manager: BeatsourceTokenManager) -> Beatsource {
Beatsource {
client: Client::builder()
- .user_agent("Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:85.0) Gecko/20100101 Firefox/85.0")
+ .user_agent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36")
+ .timeout(Duration::from_secs(60))
.build()
.unwrap(),
token_manager
}
}
+ /// Strip ALL parentheses to prevent Beatsource API 403/400 decoding errors
+ pub fn clear_search_query(query: &str) -> String {
+ query
+ .replace("(", " ")
+ .replace(")", " ")
+ .replace("[", " ")
+ .replace("]", " ")
+ .replace(",", " ")
+ .replace("Ft.", "")
+ .replace("ft.", "")
+ .replace(" Ft ", " ")
+ .replace(" ft ", " ")
+ .replace(" feat. ", " ")
+ .replace(" feat ", " ")
+ .replace(" ", " ")
+ .trim()
+ .to_string()
+ }
+
/// Search for tracks
pub fn search(&self, query: &str) -> Result {
+ // Run the query through the cleaner before sending it to the API
+ let safe_query = Self::clear_search_query(query);
+
let res: BeatsourceSearchResponse = self.client.get("https://api.beatsource.com/v4/catalog/search")
.query(&[
- ("pubper_page", "100"),
+ ("per_page", "100"), // Fixed typo from pubper_page
("page", "1"),
("type", "tracks"),
- ("q", query)
+ ("q", safe_query.as_str()) // Use the cleaned query here
])
.bearer_auth(self.token_manager.token()?)
.send()?
@@ -63,8 +85,6 @@ impl AutotaggerSource for Beatsource {
fn extend_track(&mut self, _track: &mut Track, _config: &TaggerConfig) -> Result<(), Error> {
Ok(())
}
-
-
}
#[derive(Debug, Clone, Serialize, Deserialize)]
@@ -166,6 +186,12 @@ pub struct BeatsourceToken {
pub expires: u128
}
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct BeatsourceOAuth {
+ pub access_token: String,
+ pub expires_in: u128
+}
+
/// Manages the OAuth token
#[derive(Debug, Clone)]
pub struct BeatsourceTokenManager {
@@ -177,7 +203,8 @@ impl BeatsourceTokenManager {
/// Create new instance and fetch token
pub fn new() -> BeatsourceTokenManager {
let client = Client::builder()
- .user_agent("Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:85.0) Gecko/20100101 Firefox/85.0")
+ .user_agent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36")
+ .timeout(Duration::from_secs(60))
.build()
.unwrap();
BeatsourceTokenManager {
@@ -204,21 +231,25 @@ impl BeatsourceTokenManager {
Ok(code)
}
- /// Fetch token from homepage
+ /// Fetch token via API directly
fn fetch_token(&self) -> Result {
debug!("Updating Beatsource token!");
- let body = self.client.get("https://www.beatsource.com").send()?.text()?;
- let document = Html::parse_document(&body);
- let selector = Selector::parse("script#__NEXT_DATA__").unwrap();
- let elem = document.select(&selector).next().ok_or(anyhow!("Missing __NEXT_DATA__"))?;
- let text = elem.text().collect::>().join("");
- let json: Value = serde_json::from_str(&text)?;
- let token = json["props"]["rootStore"]["authStore"]["user"]["access_token"].as_str().ok_or(anyhow!("Missing access_token"))?;
- let expires = json["props"]["rootStore"]["authStore"]["user"]["expires_in"].as_u64().unwrap();
- debug!("New Beatsource token: {}", token);
+
+ // Beatsource and Beatport share the same account API.
+ // We can safely request an OAuth token using the embed client_credentials.
+ let response: BeatsourceOAuth = self.client.post("https://account.beatport.com/o/token/")
+ .form(&json!({
+ "client_id": "2tiTbKxmQFwnbFjMONU4k7njMRZmV3ZMwRBndiZs",
+ "client_secret": "RDUJyAk4zFEGtQ8rsTmylDSfxmALRNBn3D1BsRr7MKi3oa1TL9Mq9QxqUPK7loiumXolEWbJcWa4IGAhtwnTz1cSXClGJ1tkkNCNWwRwjxIKTZJKOJxbwaNt0Rm3WG0v",
+ "grant_type": "client_credentials"
+ }))
+ .send()?
+ .json()?;
+
+ debug!("New Beatsource token retrieved.");
Ok(BeatsourceToken {
- token: token.to_string(),
- expires: timestamp!() + expires as u128 - 100
+ token: response.access_token,
+ expires: response.expires_in * 1000 + timestamp!() - 10_000
})
}
}
@@ -246,7 +277,7 @@ impl AutotaggerSourceBuilder for BeatsourceBuilder {
description: "Overall more specialized in open-format (Hip Hop/Latin/Dancehall)".to_string(),
icon: include_bytes!("../assets/beatsource.png"),
max_threads: 0,
- version: "1.0.0".to_string(),
+ version: "1.0.1".to_string(),
requires_auth: false,
supported_tags: supported_tags!(Title, Version, Artist, Album, Key, BPM, Genre, AlbumArt, URL, Label, CatalogNumber, TrackId, ReleaseId, Duration, Remixer, ReleaseDate, ISRC),
custom_options: PlatformCustomOptions::new()
@@ -272,4 +303,4 @@ fn test_beatsource() {
b.search("martin garrix").unwrap();
b.search("illenium").unwrap();
b.search("test").unwrap();
-}
\ No newline at end of file
+}
diff --git a/crates/onetagger-platforms/src/junodownload.rs b/crates/onetagger-platforms/src/junodownload.rs
deleted file mode 100644
index a821ad6b..00000000
--- a/crates/onetagger-platforms/src/junodownload.rs
+++ /dev/null
@@ -1,219 +0,0 @@
-use reqwest::blocking::Client;
-use reqwest::StatusCode;
-use scraper::{Html, Selector, ElementRef};
-use chrono::NaiveDate;
-use regex::Regex;
-use std::thread::sleep;
-use std::time::Duration;
-use anyhow::Error;
-use onetagger_tagger::{Track, AutotaggerSource, AudioFileInfo, TaggerConfig, MatchingUtils, TrackNumber, AutotaggerSourceBuilder, PlatformInfo, supported_tags, TrackMatch};
-
-pub struct JunoDownload {
- client: Client
-}
-
-impl JunoDownload {
- // New instance
- pub fn new() -> JunoDownload {
- let client = Client::builder()
- .user_agent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36")
- .build()
- .unwrap();
-
- JunoDownload {
- client
- }
- }
-
- // Search releases, generate tracks
- pub fn search(&self, query: &str) -> Result, Error> {
- let response = self.client
- .get("https://www.junodownload.com/search/")
- .query(&[("q[all][]", query), ("solrorder", "relevancy"), ("items_per_page", "50")])
- .header("Referer", "https://www.junodownload.com/")
- .send()?;
-
- // Rate limitting
- if response.status() == StatusCode::TOO_MANY_REQUESTS {
- warn!("JunoDownload rate limit! Sleeping for 2s!");
- sleep(Duration::from_secs(2));
- return self.search(query);
- }
-
- let response = response.error_for_status()?;
-
- // Minify and parse
- let data = response.text()?;
- let data = String::from_utf8(minify_html::minify(data.as_bytes(), &minify_html::Cfg::new()))?;
- let document = Html::parse_document(&data);
-
- let mut out = vec![];
- let release_selector = Selector::parse("div.jd-listing-item").unwrap();
- for (index, release_element) in document.select(&release_selector).enumerate() {
- // Release
- if let Some(tracks) = self.parse_release(&release_element) {
- out.extend(tracks);
- } else {
- // Garbage elements at end of page
- if index < 50 {
- warn!("Error parsing JunoDownload release! Index: {}, Query: {}", index, query);
- }
- }
- }
-
- Ok(out)
- }
-
- // Parse data from release element
- fn parse_release(&self, elem: &ElementRef) -> Option> {
- let mut out = vec![];
- // Artists
- let mut selector = Selector::parse("div.juno-artist").unwrap();
- let artist_element = elem.select(&selector).next()?;
- let artists = artist_element.text().map(|a| a.trim()).filter(|a| a != &"/").collect::>();
- // Release title
- selector = Selector::parse("a.juno-title").unwrap();
- let title_elem = elem.select(&selector).next()?;
- let title = title_elem.text().collect::>().join(" ");
- let url = title_elem.value().attr("href")?;
- let mut release_id = url.split("/").collect::>();
- release_id.pop();
- let release_id = release_id.last().unwrap().to_string();
- // Label
- selector = Selector::parse("a.juno-label").unwrap();
- let label = elem.select(&selector).next()?.text().collect::>().join(" ");
- // Info text
- selector = Selector::parse("div.col.text-right div.text-sm").unwrap();
- let mut info_text = elem.select(&selector).next()?.text().collect::>();
- // Date, genres, catalog number
- let mut catalog_number = None;
- if info_text.len() == 3 {
- catalog_number = Some(info_text[0].to_string());
- info_text = info_text[1..].to_vec();
- }
- let release_date = NaiveDate::parse_from_str(info_text[0], "%d %b %y").ok()?;
- let genres: Vec = info_text[1].split("/").map(|g| g.to_string()).collect();
- // Album art
- selector = Selector::parse("img.li-img").unwrap();
- let image_elem = elem.select(&selector).next()?;
- let mut album_art_small = image_elem.value().attr("src")?;
- // Placeholder image
- if album_art_small.starts_with("data:image/") {
- album_art_small = image_elem.value().attr("data-src")?;
- }
- // Full resolution img
- let album_art = format!("https://imagescdn.junodownload.com/full/{}-BIG.jpg",
- album_art_small.split("/").last().unwrap().replace(".jpg", ""));
-
- // Tracks
- let track_selector = Selector::parse("div.jd-listing-tracklist div.col").unwrap();
- let track_total = elem.select(&track_selector).count() as u16;
- for (track_index, track_elem) in elem.select(&track_selector).enumerate() {
- let text = track_elem.text().collect::>();
- if let Some(full) = text.get(0) {
- let full = full.replace("\u{a0}", " ");
- // Duration
- let re = Regex::new(r" - \((\d+:\d\d)\) ?$").unwrap();
- let duration = if let Some(captures) = re.captures(&full) {
- if let Some(m) = captures.get(1) {
- MatchingUtils::parse_duration(m.as_str()).unwrap_or(Duration::ZERO)
- } else { Duration::ZERO }
- } else { Duration::ZERO };
- // Remove duration
- let no_duration = re.replace(&full, "");
- // Check if title or artist - title
- let split: Vec<&str> = no_duration.split(" - \"").collect();
- let mut track_artists = vec![];
- // Only title
- let track_title = if split.len() == 1 {
- split[0].to_string()
- } else {
- // Artists - "Title"
- track_artists = split[0].split(" & ").collect();
- split[1].replace("\"", "")
- };
- // BPM
- let bpm: Option = if text.len() >= 2 && text[1].contains("BPM") {
- Some(text[1].replace("\u{a0}BPM", "").parse::().ok()?)
- } else {
- None
- };
- // Get artists for track
- if track_artists.len() == 0 {
- track_artists = artists.clone();
- }
- // Generate track
- out.push(Track {
- platform: "junodownload".to_string(),
- title: track_title,
- artists: track_artists.into_iter().map(|a| a.to_string()).collect(),
- album_artists: artists.clone().into_iter().map(String::from).collect(),
- album: Some(title.to_owned()),
- bpm,
- genres: genres.to_owned(),
- label: Some(label.to_string()),
- styles: vec![],
- release_date: Some(release_date),
- art: Some(album_art.to_string()),
- url: format!("https://www.junodownload.com{}", url),
- catalog_number: catalog_number.clone(),
- other: vec![],
- release_id: Some(release_id.clone()),
- duration: duration.into(),
- track_number: Some(TrackNumber::Number((track_index + 1) as i32)),
- track_total: Some(track_total),
- thumbnail: Some(album_art_small.to_string()),
- ..Default::default()
- });
- } else {
- warn!("Failed to get track info, skipping, index: {}", track_index);
- }
-
- }
-
- Some(out)
- }
-}
-
-impl AutotaggerSource for JunoDownload {
- fn match_track(&mut self, info: &AudioFileInfo, config: &TaggerConfig) -> Result, Error> {
- // Search
- let query = format!("{} {}", info.artist()?, MatchingUtils::clean_title(info.title()?));
- debug!("Juno query: {query}");
- let tracks = self.search(&query)?;
- Ok(MatchingUtils::match_track(&info, &tracks, &config, true))
- }
-
- fn extend_track(&mut self, _track: &mut Track, _config: &TaggerConfig) -> Result<(), Error> {
- Ok(())
- }
-
-
-}
-
-#[derive(Debug, Clone)]
-pub struct JunoDownloadBuilder;
-
-impl AutotaggerSourceBuilder for JunoDownloadBuilder {
- fn new() -> JunoDownloadBuilder {
- JunoDownloadBuilder
- }
-
- fn get_source(&mut self, _config: &TaggerConfig) -> Result, Error> {
- Ok(Box::new(JunoDownload::new()))
- }
-
- fn info(&self) -> PlatformInfo {
- PlatformInfo {
- id: "junodownload".to_string(),
- name: "Juno Download".to_string(),
- description: "Overall a mixed bag with a lot of niche genres".to_string(),
- icon: include_bytes!("../assets/junodownload.png"),
- max_threads: 4,
- version: "1.0.0".to_string(),
- custom_options: Default::default(),
- requires_auth: false,
- supported_tags: supported_tags!(Title, Artist, AlbumArtist, Album, BPM, Genre, Label, ReleaseDate, AlbumArt, URL, CatalogNumber, ReleaseId, TrackNumber, TrackTotal, Duration)
- }
- }
-}
\ No newline at end of file
diff --git a/crates/onetagger-platforms/src/lib.rs b/crates/onetagger-platforms/src/lib.rs
index e9e29db2..51abd582 100644
--- a/crates/onetagger-platforms/src/lib.rs
+++ b/crates/onetagger-platforms/src/lib.rs
@@ -5,7 +5,6 @@
pub mod beatport;
pub mod traxsource;
pub mod discogs;
-pub mod junodownload;
pub mod spotify;
pub mod itunes;
pub mod musicbrainz;
diff --git a/crates/onetagger-platforms/src/musicbrainz.rs b/crates/onetagger-platforms/src/musicbrainz.rs
index 55b7eb0e..7a1c5af2 100644
--- a/crates/onetagger-platforms/src/musicbrainz.rs
+++ b/crates/onetagger-platforms/src/musicbrainz.rs
@@ -33,7 +33,7 @@ impl MusicBrainz {
if response.status() == StatusCode::SERVICE_UNAVAILABLE {
warn!("MusicBrainz rate limit hit! Waiting...");
// Use random rate limit delay because threading
- std::thread::sleep(Duration::from_millis(rand::rng().random_range(1000..3000)));
+ std::thread::sleep(Duration::from_millis(rand::random_range(1000..3000)));
return self.get(path, &query);
}
Ok(response.error_for_status()?.json()?)
diff --git a/crates/onetagger-player/Cargo.toml b/crates/onetagger-player/Cargo.toml
index 22dfe557..38cd3ed2 100644
--- a/crates/onetagger-player/Cargo.toml
+++ b/crates/onetagger-player/Cargo.toml
@@ -9,10 +9,9 @@ edition = "2021"
log = "0.4"
alac = "0.5"
hound = "3.5"
-lofty = "0.22"
+lofty = "0.24"
anyhow = "1.0"
pacmog = "0.6.0"
mp4parse = "0.17"
-rodio = { version = "0.20", features = ["symphonia-aac", "symphonia-isomp4", "flac", "vorbis", "wav", "minimp3"], default-features = false }
-
+rodio = { version = "0.22", features = ["playback", "symphonia-aac", "symphonia-isomp4", "flac", "vorbis", "wav", "minimp3"], default-features = false }
diff --git a/crates/onetagger-player/src/aiff.rs b/crates/onetagger-player/src/aiff.rs
index 4ca7e7c2..bb5e90ce 100644
--- a/crates/onetagger-player/src/aiff.rs
+++ b/crates/onetagger-player/src/aiff.rs
@@ -4,6 +4,7 @@ use lofty::file::AudioFile;
use std::fs::File;
use std::io::Read;
use std::time::Duration;
+use std::num::{NonZeroU16, NonZeroU32};
use pacmog::PcmReader;
use rodio::Source;
@@ -26,20 +27,18 @@ impl AIFFSource {
duration
})
}
-
}
impl AudioSource for AIFFSource {
// Get duration
fn duration(&self) -> u128 {
self.duration.as_millis()
-
}
// Get rodio source
- fn get_source(&self) -> Result + Send>, Error> {
+ fn get_source(&self) -> Result + Send>, Error> {
let source = AIFFDecoder::load(&self.path)?;
- Ok(Box::new(source.convert_samples()))
+ Ok(Box::new(source))
}
}
@@ -48,7 +47,7 @@ struct AIFFDecoder {
samples: u32,
sample_rate: u32,
index: usize,
- buffer: Vec
+ buffer: Vec
}
impl AIFFDecoder {
@@ -66,14 +65,14 @@ impl AIFFDecoder {
// Decode the file (because the library is weeeird)
// TODO: Make better using symphonia / new rodio
- let mut samples = vec![0i16; specs.num_channels as usize * specs.num_samples as usize];
+ let mut samples = vec![0f32; specs.num_channels as usize * specs.num_samples as usize];
let mut i = 0;
for sample in 0..specs.num_samples {
for channel in 0..specs.num_channels {
let s = std::panic::catch_unwind(|| {
reader.read_sample::(channel, sample)
}).map_err(|e| anyhow!("Failed decoding AIFF: {e:?}"))?.map_err(|e| anyhow!("Failed decoding AIFF: {e}"))?;
- samples[i] = (s * i16::MAX as f32) as i16;
+ samples[i] = s;
i += 1;
}
}
@@ -89,16 +88,16 @@ impl AIFFDecoder {
}
impl Source for AIFFDecoder {
- fn current_frame_len(&self) -> Option {
+ fn current_span_len(&self) -> Option {
None
}
- fn channels(&self) -> u16 {
- self.channels as u16
+ fn channels(&self) -> NonZeroU16 {
+ NonZeroU16::new(self.channels as u16).unwrap_or(NonZeroU16::new(1).unwrap())
}
- fn sample_rate(&self) -> u32 {
- self.sample_rate
+ fn sample_rate(&self) -> NonZeroU32 {
+ NonZeroU32::new(self.sample_rate).unwrap_or(NonZeroU32::new(44100).unwrap())
}
fn total_duration(&self) -> Option {
@@ -107,7 +106,7 @@ impl Source for AIFFDecoder {
}
impl Iterator for AIFFDecoder {
- type Item = i16;
+ type Item = f32;
fn next(&mut self) -> Option {
if self.index >= self.buffer.len() {
diff --git a/crates/onetagger-player/src/alac.rs b/crates/onetagger-player/src/alac.rs
index c969bb5b..ce60997f 100644
--- a/crates/onetagger-player/src/alac.rs
+++ b/crates/onetagger-player/src/alac.rs
@@ -3,6 +3,7 @@ use std::path::Path;
use std::fs::File;
use std::io::BufReader;
use std::time::Duration;
+use std::num::{NonZeroU16, NonZeroU32};
use rodio::Source;
use alac::{Reader, Samples, StreamInfo};
@@ -26,16 +27,16 @@ impl ALACSource {
}
impl Source for ALACSource {
- fn current_frame_len(&self) -> Option {
+ fn current_span_len(&self) -> Option {
None
}
- fn channels(&self) -> u16 {
- self.stream_info.channels() as u16
+ fn channels(&self) -> NonZeroU16 {
+ NonZeroU16::new(self.stream_info.channels() as u16).unwrap_or(NonZeroU16::new(1).unwrap())
}
- fn sample_rate(&self) -> u32 {
- self.stream_info.sample_rate()
+ fn sample_rate(&self) -> NonZeroU32 {
+ NonZeroU32::new(self.stream_info.sample_rate()).unwrap_or(NonZeroU32::new(44100).unwrap())
}
fn total_duration(&self) -> Option {
@@ -44,13 +45,13 @@ impl Source for ALACSource {
}
impl Iterator for ALACSource {
- type Item = i16;
+ type Item = f32;
fn next(&mut self) -> Option {
// Wrapper against samples
if let Some(r) = self.samples.next() {
if let Ok(s) = r {
- return Some((s >> 16) as i16);
+ return Some(((s >> 16) as f32) / 32768.0);
}
}
None
diff --git a/crates/onetagger-player/src/flac.rs b/crates/onetagger-player/src/flac.rs
index 079c996c..25c45f7e 100644
--- a/crates/onetagger-player/src/flac.rs
+++ b/crates/onetagger-player/src/flac.rs
@@ -30,7 +30,7 @@ impl AudioSource for FLACSource {
}
// Get rodio decoder
- fn get_source(&self) -> Result + Send>, Error> {
+ fn get_source(&self) -> Result + Send>, Error> {
Ok(Box::new(Decoder::new_flac(BufReader::new(File::open(&self.path)?))?))
}
}
\ No newline at end of file
diff --git a/crates/onetagger-player/src/lib.rs b/crates/onetagger-player/src/lib.rs
index 1cf8606f..33a704f0 100644
--- a/crates/onetagger-player/src/lib.rs
+++ b/crates/onetagger-player/src/lib.rs
@@ -7,7 +7,7 @@ use std::path::Path;
use std::sync::mpsc::{Sender, Receiver, channel};
use std::thread;
use hound::{WavSpec, SampleFormat, WavWriter};
-use rodio::{Sink, Source};
+use rodio::{Source};
pub mod mp3;
pub mod mp4;
@@ -34,33 +34,33 @@ impl AudioPlayer {
thread::spawn(move || {
let mut volume = 0.5;
let mut source = None;
- // Create sink
- let (_stream, stream_handle) = rodio::OutputStream::try_default().unwrap();
- let mut sink = Sink::try_new(&stream_handle).unwrap();
- sink.set_volume(volume);
- sink.pause();
+ // Create sink (Now DeviceSinkBuilder in rodio 0.22)
+ let stream_handle = rodio::DeviceSinkBuilder::open_default_sink().unwrap();
+ let mut player = rodio::Player::connect_new(&stream_handle.mixer());
+ player.set_volume(volume);
+ player.pause();
// Wait for messages
for action in rx {
match action {
PlayerAction::Volume(v) => {
- sink.set_volume(v);
+ player.set_volume(v);
volume = v;
},
PlayerAction::Stop => {
- sink.stop();
+ player.stop();
}
- PlayerAction::Play => sink.play(),
- PlayerAction::Pause => sink.pause(),
+ PlayerAction::Play => player.play(),
+ PlayerAction::Pause => player.pause(),
// Play new source
PlayerAction::Load(audio_source) => {
// Create new sink
- sink.stop();
- sink = Sink::try_new(&stream_handle).unwrap();
- sink.set_volume(volume);
- sink.pause();
+ player.stop();
+ player = rodio::Player::connect_new(&stream_handle.mixer());
+ player.set_volume(volume);
+ player.pause();
// Append source
if let Ok(s) = audio_source.get_source() {
- sink.append(s);
+ player.append(s);
}
// Save source
source = Some(audio_source);
@@ -69,27 +69,27 @@ impl AudioPlayer {
PlayerAction::Seek(pos) => {
if source.is_some() {
// Create new sink
- let paused = sink.is_paused();
- sink.stop();
- sink = Sink::try_new(&stream_handle).unwrap();
- sink.set_volume(volume);
+ let paused = player.is_paused();
+ player.stop();
+ player = rodio::Player::connect_new(&stream_handle.mixer());
+ player.set_volume(volume);
if paused {
- sink.pause();
+ player.pause();
}
// Add source again
let s = source.as_ref().unwrap();
if let Ok(mut s) = s.get_source() {
// Skip manually because some sources are kinda bugged
- let n_skip = s.sample_rate() as f32 * s.channels() as f32 * pos as f32 / 1000.0;
+ let n_skip = s.sample_rate().get() as f32 * s.channels().get() as f32 * pos as f32 / 1000.0;
for _ in 0..n_skip as u64 {
if s.next().is_none() {
break;
}
}
- sink.append(s);
+ player.append(s);
}
// Sync
- tx.send(!sink.is_paused()).ok();
+ tx.send(!player.is_paused()).ok();
}
}
}
@@ -178,15 +178,15 @@ impl AudioSources {
pub trait AudioSource {
/// Duration in ms
fn duration(&self) -> u128;
- /// Rodio Source
- fn get_source(&self) -> Result + Send>, Error>;
+ /// Rodio Source (Now strictly f32 in rodio 0.22)
+ fn get_source(&self) -> Result + Send>, Error>;
/// Stream generate 2D waveform, in thread, stream
fn generate_waveform(&self, bars: i16) -> Result<(Receiver, Sender), Error> {
let source = self.get_source()?;
// Calculate n samples per bar
- let sample_rate = source.sample_rate() as f32;
- let channels = source.channels() as f32;
+ let sample_rate = source.sample_rate().get() as f32;
+ let channels = source.channels().get() as f32;
let duration = self.duration() as f32 / 1000.0;
let n_samples = (sample_rate * channels * (duration / bars as f32)).round() as usize;
@@ -195,7 +195,7 @@ pub trait AudioSource {
let (tx1, rx1) = channel();
thread::spawn(move || {
// Get samples
- let mut samples: Vec = vec![];
+ let mut samples: Vec = vec![];
for sample in source {
// Cancel
if rx1.try_recv().is_ok() {
@@ -206,8 +206,9 @@ pub trait AudioSource {
// Buffer full
if samples.len() >= n_samples {
- let sum: i64 = samples.iter().fold(0, |s, v| s + *v as i64);
- let wave: f64 = sum as f64 / samples.len() as f64;
+ // Re-scale the f32 samples (-1.0 to 1.0) back up to the old i16 scale logic so the UI waveform stays identical
+ let sum: f64 = samples.iter().fold(0.0, |s, v| s + (*v as f64 * 32768.0));
+ let wave: f64 = sum / samples.len() as f64;
tx.send(((wave.abs() + 1.0).log2() / 10.0) as f32).ok();
samples = vec![];
}
@@ -222,8 +223,8 @@ pub trait AudioSource {
fn generate_wav(&self) -> Result, Error> {
let source = self.get_source()?;
let spec = WavSpec {
- channels: source.channels(),
- sample_rate: source.sample_rate(),
+ channels: source.channels().get(),
+ sample_rate: source.sample_rate().get(),
bits_per_sample: 16,
sample_format: SampleFormat::Int
};
@@ -233,7 +234,7 @@ pub trait AudioSource {
let mut cursor = Cursor::new(&mut buf);
let mut writer = WavWriter::new(&mut cursor, spec)?;
for s in source {
- writer.write_sample(s)?;
+ writer.write_sample((s * 32767.0) as i16)?;
}
writer.finalize()?;
}
diff --git a/crates/onetagger-player/src/mp3.rs b/crates/onetagger-player/src/mp3.rs
index ae7985e3..b8623e0d 100644
--- a/crates/onetagger-player/src/mp3.rs
+++ b/crates/onetagger-player/src/mp3.rs
@@ -30,7 +30,7 @@ impl AudioSource for MP3Source {
}
// Get rodio decoder
- fn get_source(&self) -> Result + Send>, Error> {
+ fn get_source(&self) -> Result + Send>, Error> {
Ok(Box::new(Decoder::new_mp3(BufReader::new(File::open(&self.path)?))?))
}
}
\ No newline at end of file
diff --git a/crates/onetagger-player/src/mp4.rs b/crates/onetagger-player/src/mp4.rs
index 6919d5ef..f92644e9 100644
--- a/crates/onetagger-player/src/mp4.rs
+++ b/crates/onetagger-player/src/mp4.rs
@@ -1,6 +1,5 @@
use anyhow::Error;
use mp4parse::{SampleEntry, CodecType};
-use rodio::decoder::Mp4Type;
use std::io::BufReader;
use std::fs::File;
use std::path::{PathBuf, Path};
@@ -42,7 +41,7 @@ impl AudioSource for MP4Source {
self.duration
}
- fn get_source(&self) -> Result + Send>, Error> {
+ fn get_source(&self) -> Result + Send>, Error> {
// ALAC MP4
if self.alac {
let alac = ALACSource::new(&self.path)?;
@@ -50,8 +49,8 @@ impl AudioSource for MP4Source {
}
// Symphonia
- let decoder = Decoder::new_mp4(BufReader::new(File::open(&self.path)?), Mp4Type::M4a)?;
+ let decoder = Decoder::new_mp4(BufReader::new(File::open(&self.path)?))?;
return Ok(Box::new(decoder));
}
-}
+}
\ No newline at end of file
diff --git a/crates/onetagger-player/src/ogg.rs b/crates/onetagger-player/src/ogg.rs
index ec449656..690dfdf3 100644
--- a/crates/onetagger-player/src/ogg.rs
+++ b/crates/onetagger-player/src/ogg.rs
@@ -31,9 +31,8 @@ impl AudioSource for OGGSource {
self.duration.as_millis()
}
- fn get_source(&self) -> Result + Send>, Error> {
+ fn get_source(&self) -> Result + Send>, Error> {
// Use rodio vorbis
Ok(Box::new(Decoder::new_vorbis(BufReader::new(File::open(&self.path)?))?))
}
-}
-
+}
\ No newline at end of file
diff --git a/crates/onetagger-player/src/wav.rs b/crates/onetagger-player/src/wav.rs
index 0ce48f08..5bd0e7dc 100644
--- a/crates/onetagger-player/src/wav.rs
+++ b/crates/onetagger-player/src/wav.rs
@@ -30,7 +30,7 @@ impl AudioSource for WAVSource {
}
// Get rodio decoder
- fn get_source(&self) -> Result + Send>, Error> {
+ fn get_source(&self) -> Result + Send>, Error> {
Ok(Box::new(Decoder::new_wav(BufReader::new(File::open(&self.path)?))?))
}
}
\ No newline at end of file
diff --git a/crates/onetagger-renamer/Cargo.toml b/crates/onetagger-renamer/Cargo.toml
index bf4462f9..5bce4cd6 100644
--- a/crates/onetagger-renamer/Cargo.toml
+++ b/crates/onetagger-renamer/Cargo.toml
@@ -9,9 +9,9 @@ edition = "2021"
log = "0.4"
pad = "0.1"
dunce = "1.0"
-regex = "1.11"
+regex = "1.12"
anyhow = "1.0"
-titlecase = "3.5"
+titlecase = "3.6"
lazy_static = "1.5"
pulldown-cmark = "0.13"
diff --git a/crates/onetagger-tag/Cargo.toml b/crates/onetagger-tag/Cargo.toml
index 5c98bfce..d863ad31 100644
--- a/crates/onetagger-tag/Cargo.toml
+++ b/crates/onetagger-tag/Cargo.toml
@@ -10,9 +10,9 @@ chrono = "0.4"
anyhow = "1.0"
log = { version = "0.4", optional = true }
-id3 = { version = "1.16.2", optional = true }
+id3 = { version = "1.16.4", optional = true }
riff = { version = "2.0.0", optional = true }
-lofty = { version = "0.22", optional = true }
+lofty = { version = "0.24", optional = true }
base64 = { version = "0.22", optional = true }
mp4ameta = { version = "0.13", optional = true }
metaflac = { version = "0.2.8", optional = true }
diff --git a/crates/onetagger-tag/src/id3.rs b/crates/onetagger-tag/src/id3.rs
index 299f99f8..c2893aae 100644
--- a/crates/onetagger-tag/src/id3.rs
+++ b/crates/onetagger-tag/src/id3.rs
@@ -246,49 +246,73 @@ impl TagImpl for ID3Tag {
tags
}
+
// Set date to tag
- fn set_date(&mut self, date: &TagDate, overwrite: bool) {
- // ID3 v2.3
- if !self.id3v24 {
- // Year
- if overwrite || self.tag.get("TYER").is_none() {
- // Remove v2.4
- self.tag.remove_date_recorded();
- self.tag.set_text("TYER", date.year.to_string());
- }
- // Date
- if date.has_md() && (overwrite || self.tag.get("TDAT").is_none()) {
- self.tag.remove_date_recorded();
- self.tag.set_text("TDAT", &format!("{:02}{:02}", date.day.unwrap(), date.month.unwrap()));
- }
- return;
- }
- // ID3 v2.4
- if overwrite || self.tag.date_recorded().is_none() {
- let ts = Timestamp {
- year: date.year,
- month: date.month,
- day: date.day,
- hour: None,
- minute: None,
- second: None
- };
- self.tag.set_date_recorded(ts);
- }
- }
-
- // Set publish date
- fn set_publish_date(&mut self, date: &TagDate, overwrite: bool) {
- if overwrite || self.tag.date_released().is_none() {
+ fn set_date(&mut self, date: &TagDate, overwrite: bool) {
+ // ID3 v2.3
+ if !self.id3v24 {
+ // Year
+ if overwrite || self.tag.get("TYER").is_none() {
+ // Remove v2.4 date fields
+ self.tag.remove_date_recorded();
+ self.tag.set_text("TYER", date.year.to_string());
+ }
+
+ // Day + Month
+ if date.has_md() && (overwrite || self.tag.get("TDAT").is_none()) {
+ self.tag.remove_date_recorded();
+ self.tag.set_text(
+ "TDAT",
+ &format!("{:02}{:02}", date.day.unwrap(), date.month.unwrap())
+ );
+ }
+
+ return;
+ }
+
+ // =========================
+ // ID3 v2.4
+ // TDRC = YEAR ONLY
+ // TDRL = FULL RELEASE DATE
+ // =========================
+
+ // TDRC
+ if overwrite || self.tag.date_recorded().is_none() {
+ self.tag.set_date_recorded(Timestamp {
+ year: date.year,
+ month: date.month,
+ day: date.day,
+ hour: None,
+ minute: None,
+ second: None,
+ });
+ }
+
+ // TDRL
+ if overwrite || self.tag.date_released().is_none() {
+ self.tag.set_date_released(Timestamp {
+ year: date.year,
+ month: date.month,
+ day: date.day,
+ hour: None,
+ minute: None,
+ second: None,
+ });
+ }
+ }
+
+ // Set publish date
+ fn set_publish_date(&mut self, date: &TagDate, overwrite: bool) {
+ if overwrite || self.tag.original_date_released().is_none() {
let ts = Timestamp {
year: date.year,
month: date.month,
day: date.day,
hour: None,
minute: None,
- second: None
+ second: None,
};
- self.tag.set_date_released(ts);
+ self.tag.set_original_date_released(ts);
}
}
@@ -395,11 +419,15 @@ impl TagImpl for ID3Tag {
// TXXX
if tag.len() != 4 {
if overwrite || self.get_raw(tag).is_none() {
+
+ // FIX: Remove existing frame FIRST to prevent duplicates
+ self.tag.remove_extended_text(Some(tag), None);
+
// Remove if empty
if value.is_empty() {
- self.tag.remove_extended_text(Some(tag), None);
- return;
+ return;
}
+
self.tag.add_frame(ExtendedText {
description: tag.to_string(),
value: value.join(&self.id3_separator),
diff --git a/crates/onetagger-tag/src/vorbis.rs b/crates/onetagger-tag/src/vorbis.rs
index bfb63aeb..d8f9d871 100644
--- a/crates/onetagger-tag/src/vorbis.rs
+++ b/crates/onetagger-tag/src/vorbis.rs
@@ -165,17 +165,19 @@ impl TagImpl for VorbisTag {
}
}
- fn set_art(&mut self, kind: CoverType, mime: &str, description: Option<&str>, data: Vec) {
+ fn set_art(&mut self, kind: CoverType, mime: &str, description: Option<&str>, data: Vec) {
self.tag.remove_picture_type(self.picture_type(&kind));
- match self.tag.insert_picture(
- lofty::picture::Picture::new_unchecked(
- self.picture_type(&kind),
- Some(MimeType::from_str(&mime.trim().to_lowercase())),
- description.map(String::from),
- data
- ),
- None
- ) {
+
+ // Use the new Lofty 0.24 PictureBuilder pattern with .pic_type
+ let mut builder = lofty::picture::Picture::unchecked(data)
+ .pic_type(self.picture_type(&kind))
+ .mime_type(MimeType::from_str(&mime.trim().to_lowercase()));
+
+ if let Some(desc) = description {
+ builder = builder.description(String::from(desc));
+ }
+
+ match self.tag.insert_picture(builder.build(), None) {
Ok(_) => {},
Err(e) => error!("Error adding picture to Vorbis tag: {e}"),
}
diff --git a/crates/onetagger-tagger/Cargo.toml b/crates/onetagger-tagger/Cargo.toml
index 3ce17cf9..9e34d002 100644
--- a/crates/onetagger-tagger/Cargo.toml
+++ b/crates/onetagger-tagger/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
[dependencies]
log = "0.4"
-regex = "1.11"
+regex = "1.12"
anyhow = "1.0"
strsim = "0.11"
unidecode = "0.3"
diff --git a/crates/onetagger-ui/Cargo.toml b/crates/onetagger-ui/Cargo.toml
index 6ce7a3bd..70812132 100644
--- a/crates/onetagger-ui/Cargo.toml
+++ b/crates/onetagger-ui/Cargo.toml
@@ -15,7 +15,7 @@ opener = "0.8"
base64 = "0.22"
walkdir = "2.5"
serde_json = "1.0"
-webbrowser = "1.0"
+webbrowser = "1.2"
mime_guess = "2.0"
urlencoding = "2.1"
include_dir = "0.7"
@@ -24,7 +24,7 @@ tinyfiledialogs = "3.9"
axum = { version = "0.8", features = ["ws"] }
serde = { version = "1.0", features = ["derive"] }
-tokio = { version = "1.45", features = ["rt-multi-thread"] }
+tokio = { version = "1.52", features = ["rt-multi-thread"] }
onetagger-tag = { path = "../onetagger-tag" }
onetagger-shared = { path = "../onetagger-shared" }
@@ -37,4 +37,4 @@ onetagger-platforms = { path = "../onetagger-platforms" }
# Windows specific
[target.'cfg(windows)'.dependencies]
-sysinfo = "0.35"
+sysinfo = "0.39"
diff --git a/crates/onetagger/Cargo.toml b/crates/onetagger/Cargo.toml
index a7c98585..73d63500 100644
--- a/crates/onetagger/Cargo.toml
+++ b/crates/onetagger/Cargo.toml
@@ -11,9 +11,9 @@ log = "0.4"
anyhow = "1.0"
urlencoding = "2.1"
-tao = { version = "0.34", features = ["rwh_05"] }
-wry = { version = "0.52", features = ["devtools"] }
-clap = { version = "4.5", features = ["derive"] }
+tao = { version = "0.35", features = ["rwh_05"] }
+wry = { version = "0.55", features = ["devtools"] }
+clap = { version = "4.6", features = ["derive"] }
serde = { version = "1.0", features = ["derive"] }
onetagger-ui = { path = "../onetagger-ui" }
@@ -31,8 +31,8 @@ winres = "0.1"
# MacOS specific
[target.'cfg(target_os = "macos")'.dependencies]
-muda = "0.16"
-native-dialog = "0.9.0"
+muda = "0.19"
+native-dialog = "0.9.6"
[package.metadata.bundle]
diff --git a/crates/onetagger/src/main.rs b/crates/onetagger/src/main.rs
index 35c055e8..a428c0ba 100644
--- a/crates/onetagger/src/main.rs
+++ b/crates/onetagger/src/main.rs
@@ -167,22 +167,35 @@ pub fn start_webview() -> Result<(), Error> {
// Windows webview2 does NOT support custom DnD, janky workaround
if cfg!(target_os = "windows") {
- // Handler
- let proxy = proxy.clone();
- let handle_url = move |url: String| -> bool {
- debug!("Navigation/NewWindow to: {url}");
+ // Navigation handler only requires url string tracking
+ let p_nav = proxy.clone();
+ let handle_nav = move |url: String| -> bool {
+ debug!("Navigation to: {url}");
if url.starts_with("file://") {
let url = url.replace("file:///", "");
let path = urlencoding::decode(&url).map(|r| r.to_string()).unwrap_or(url).replace("/", "\\");
- proxy.send_event(CustomWindowEvent::DropFolder(path.into())).ok();
+ p_nav.send_event(CustomWindowEvent::DropFolder(path.into())).ok();
return false;
}
true
};
+
+ // New window handler requires url tracking and window properties context
+ let p_win = proxy.clone();
+ let handle_new_window = move |url: String, _: _| -> wry::NewWindowResponse {
+ debug!("NewWindow requested to: {url}");
+ if url.starts_with("file://") {
+ let url = url.replace("file:///", "");
+ let path = urlencoding::decode(&url).map(|r| r.to_string()).unwrap_or(url).replace("/", "\\");
+ p_win.send_event(CustomWindowEvent::DropFolder(path.into())).ok();
+ return wry::NewWindowResponse::Deny; // Changed from Ignore
+ }
+ wry::NewWindowResponse::Allow // Changed from Handled
+ };
- // Register
- webview = webview.with_navigation_handler(handle_url.clone());
- webview = webview.with_new_window_req_handler(handle_url);
+ // Register separated handlers built for Wry 0.55 architecture
+ webview = webview.with_navigation_handler(handle_nav);
+ webview = webview.with_new_window_req_handler(handle_new_window);
}
// Handle dropped folders (for all other than Windows)
@@ -190,7 +203,11 @@ pub fn start_webview() -> Result<(), Error> {
webview = webview.with_drag_drop_handler(move |event| {
match event {
DragDropEvent::Drop { mut paths, .. } => {
- if paths.len() > 1 || paths.is_empty() {
+ // Ignore empty drops (internal drag operations like vuedraggable)
+ if paths.is_empty() {
+ return false;
+ }
+ if paths.len() > 1 {
warn!("Drop only 1 path!");
return true;
}
@@ -278,4 +295,4 @@ enum CustomWindowEvent {
DropFolder(PathBuf),
DevTools,
Exit
-}
+}
\ No newline at end of file