diff --git a/app/legacy/src-tauri/src/store.rs b/app/legacy/src-tauri/src/store.rs index bc34b9c..e81a1dd 100644 --- a/app/legacy/src-tauri/src/store.rs +++ b/app/legacy/src-tauri/src/store.rs @@ -78,7 +78,7 @@ pub fn get_visibility(app_handle: &AppHandle) -> Visibility { error!("get_visibility: error: {}", e); None }) - .map_or(Visibility::Visible, |v| Visibility::from_raw_value(v as u8)) + .map_or(Visibility::Visible, Visibility::from_raw_value) } pub fn set_visibility(app_handle: &AppHandle, v: Visibility) -> Result<(), anyhow::Error> { diff --git a/app/main/package.json b/app/main/package.json index 863cfc9..4b0d4eb 100644 --- a/app/main/package.json +++ b/app/main/package.json @@ -18,13 +18,13 @@ }, "dependencies": { "@martichou/core_lib": "link:../../core_lib", - "@tauri-apps/api": "2.0.0-rc.4", - "@tauri-apps/plugin-autostart": "2.0.0-rc.1", - "@tauri-apps/plugin-clipboard-manager": "2.0.0-rc.2", - "@tauri-apps/plugin-dialog": "2.0.0-rc.1", - "@tauri-apps/plugin-notification": "2.0.0-rc.1", - "@tauri-apps/plugin-shell": "2.0.0-rc.1", - "@tauri-apps/plugin-store": "2.0.0-rc.1", + "@tauri-apps/api": "^2.0.1", + "@tauri-apps/plugin-autostart": "^2.0.0", + "@tauri-apps/plugin-clipboard-manager": "^2.0.0", + "@tauri-apps/plugin-dialog": "^2.0.0", + "@tauri-apps/plugin-notification": "^2.0.0", + "@tauri-apps/plugin-shell": "^2.0.0", + "@tauri-apps/plugin-store": "^2.0.0", "pinia": "^2.2.2", "semver": "^7.6.3", "vue": "3.5.5" @@ -32,7 +32,7 @@ "devDependencies": { "@stylistic/eslint-plugin": "^2.8.0", "@tailwindcss/typography": "^0.5.15", - "@tauri-apps/cli": "2.0.0-rc.15", + "@tauri-apps/cli": "^2.0.0", "@types/node": "^20.16.5", "@types/semver": "^7.5.8", "@vitejs/plugin-vue": "^5.1.3", diff --git a/app/main/pnpm-lock.yaml b/app/main/pnpm-lock.yaml index 5c67544..aa39868 100644 --- a/app/main/pnpm-lock.yaml +++ b/app/main/pnpm-lock.yaml @@ -12,26 +12,26 @@ importers: specifier: link:../../core_lib version: link:../../core_lib '@tauri-apps/api': - specifier: 2.0.0-rc.4 - version: 2.0.0-rc.4 + specifier: ^2.0.1 + version: 2.0.1 '@tauri-apps/plugin-autostart': - specifier: 2.0.0-rc.1 - version: 2.0.0-rc.1 + specifier: ^2.0.0 + version: 2.0.0 '@tauri-apps/plugin-clipboard-manager': - specifier: 2.0.0-rc.2 - version: 2.0.0-rc.2 + specifier: ^2.0.0 + version: 2.0.0 '@tauri-apps/plugin-dialog': - specifier: 2.0.0-rc.1 - version: 2.0.0-rc.1 + specifier: ^2.0.0 + version: 2.0.0 '@tauri-apps/plugin-notification': - specifier: 2.0.0-rc.1 - version: 2.0.0-rc.1 + specifier: ^2.0.0 + version: 2.0.0 '@tauri-apps/plugin-shell': - specifier: 2.0.0-rc.1 - version: 2.0.0-rc.1 + specifier: ^2.0.0 + version: 2.0.0 '@tauri-apps/plugin-store': - specifier: 2.0.0-rc.1 - version: 2.0.0-rc.1 + specifier: ^2.0.0 + version: 2.0.0 pinia: specifier: ^2.2.2 version: 2.2.2(typescript@5.6.0-dev.20240811)(vue@3.5.5(typescript@5.6.0-dev.20240811)) @@ -49,8 +49,8 @@ importers: specifier: ^0.5.15 version: 0.5.15(tailwindcss@3.4.11) '@tauri-apps/cli': - specifier: 2.0.0-rc.15 - version: 2.0.0-rc.15 + specifier: ^2.0.0 + version: 2.0.0 '@types/node': specifier: ^20.16.5 version: 20.16.5 @@ -478,91 +478,91 @@ packages: peerDependencies: tailwindcss: '>=3.0.0 || insiders || >=4.0.0-alpha.20' - '@tauri-apps/api@2.0.0-rc.4': - resolution: {integrity: sha512-UNiIhhKG08j4ooss2oEEVexffmWkgkYlC2M3GcX3VPtNsqFgVNL8Mcw/4Y7rO9M9S+ffAMnLOF5ypzyuyb8tyg==} + '@tauri-apps/api@2.0.1': + resolution: {integrity: sha512-eoQWT+Tq1qSwQpHV+nw1eNYe5B/nm1PoRjQCRiEOS12I1b+X4PUcREfXVX8dPcBT6GrzWGDtaecY0+1p0Rfqlw==} - '@tauri-apps/cli-darwin-arm64@2.0.0-rc.15': - resolution: {integrity: sha512-WuzQRELJTeSHe/uLu6IClCCEkwQy4qtZdHUmcAW3baKD217WCytn4jQ5+NFs2GxhK1a2GLHMQtQZSFTLkKiXkw==} + '@tauri-apps/cli-darwin-arm64@2.0.0': + resolution: {integrity: sha512-+agYqg2c77imaMfKw7mzqecVIDGcwr6bZMdglJ808O2UjTFzMwnAam1sU26YBYU+IyIjwOu00fm9Azpal+N/Ew==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] - '@tauri-apps/cli-darwin-x64@2.0.0-rc.15': - resolution: {integrity: sha512-71H1dNWlEr+Hyi096Ir3SnlClw4CSR4MhJ8UG8IUBqYwydJPYFzA+GFWRAgnPgcV6sBzdt8trcV9BLV4teDzEw==} + '@tauri-apps/cli-darwin-x64@2.0.0': + resolution: {integrity: sha512-keN2PLTTcZmbWwFMup/NGcshmvyLnhRPChO8lbm9C5a0IY7zUNQUD7/o/zIulQdLJqDxkdpWJ1j2jTycAtvtKQ==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] - '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-rc.15': - resolution: {integrity: sha512-hO7AS09l6XZRCu/vqvB/iv6CvIlD//h9njhyw++0tJPCNH3X4rl13ji6SnoO0V6ZUCEeCeQBTAALsanYAlZelQ==} + '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0': + resolution: {integrity: sha512-FQJNrlCUBb9E7Fhp5ARy+Or8lSvorG41aVrfi0cGNvv1QlIGSj77TN7SKK+L1jAGzKj1Bl2kCZIESF6Zi8N/+Q==} engines: {node: '>= 10'} cpu: [arm] os: [linux] - '@tauri-apps/cli-linux-arm64-gnu@2.0.0-rc.15': - resolution: {integrity: sha512-r9FrwY83TD4w3vX7J9zS3GPSeis0YWq52p/MVLYR1i8sSJppbvYY72EXi5pR2CZ3vb+6z9/w7LpYTv+hOd2RbA==} + '@tauri-apps/cli-linux-arm64-gnu@2.0.0': + resolution: {integrity: sha512-TK3VrZG5LK1NGueKwnZA1/3gj/qkwry001MNCHXjT6394dwrDv+digCc9Qc569h+xeH/FF71jyoiRIu3gRE6iA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-arm64-musl@2.0.0-rc.15': - resolution: {integrity: sha512-PqMn3/GiqLAhs7p0jr5XqwWN1t7SAgvo6+bFuYNL/SWx1Ui6mOck3ncfDkf+dQAnXnrhX2Qfwkl3agiOZxUZtA==} + '@tauri-apps/cli-linux-arm64-musl@2.0.0': + resolution: {integrity: sha512-E3hRmS/0m8YUYMTKZtBExpk/284CTi2nymks0dK0L1j+3KjffL7DiilnIfNFmTvWBgMrs0cVCtoaN/ba/A9mNA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-x64-gnu@2.0.0-rc.15': - resolution: {integrity: sha512-o8lvgVBGXwthMV8+8EzEwXQY5jk2q+c700xeC/LY+J0lBL5ai3i0revlhO+3RwKnjnRLZMCXatr5K3gGtXIsoQ==} + '@tauri-apps/cli-linux-x64-gnu@2.0.0': + resolution: {integrity: sha512-veX4BJp5xnW8KmxVjchWt4oZEIvKGhuSR7qU1WpqTR21e/eTe/ksGsdXPsqOKQvv/w1X6jhqmlPvhnFmDwUJ/w==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-linux-x64-musl@2.0.0-rc.15': - resolution: {integrity: sha512-cmANCyhcdInZSfIM3CPjA0eDu1toYABapSttA1rHbNrcJrHIq2KPKRCNuXIjWiBggxfIhJKWX7mTgQCQIyHd/w==} + '@tauri-apps/cli-linux-x64-musl@2.0.0': + resolution: {integrity: sha512-9Eso/8wbsWbOyd9PZEIzN/48ZQJrUGQqGZtglcjUku0lO76mnX0fOnit4nQ57Oj0wezJPhv4mgSseG1OsTIVzw==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-win32-arm64-msvc@2.0.0-rc.15': - resolution: {integrity: sha512-FyWwCQb+uCCBtEDTDKtILH3wv0TWCQ2mXwMyZlibpbZ4RbaV5yDY82h8h7usfEuPHtBtAJHknHvX5WV1ETl5kw==} + '@tauri-apps/cli-win32-arm64-msvc@2.0.0': + resolution: {integrity: sha512-ky8vWAuDUf8WGt9+a0G/EbU0OhdIkogelh9qjIYGHbyEYAJqXfN5P40aHUEg3y8ngQ0YGwRX5ePsQsSZiiR5PQ==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] - '@tauri-apps/cli-win32-ia32-msvc@2.0.0-rc.15': - resolution: {integrity: sha512-+bOBX7EdpmkCSBxgd9HcC/p9LoG/q1a5dJebWFuL9GhmdPeb5hv4plB/OTUAtg1OnEVGPXhTiSkcdRatZVryfA==} + '@tauri-apps/cli-win32-ia32-msvc@2.0.0': + resolution: {integrity: sha512-uD45cLZ/EBaT8o4a27tHW7t5UKFplnvDLt/uSUaCpJ3NyOTV6nMXOUrJBe+hH9hSBohqNAF7LEyYo1p932DWFg==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] - '@tauri-apps/cli-win32-x64-msvc@2.0.0-rc.15': - resolution: {integrity: sha512-Phpk18bs1YxC+OFYaZNWiddYRmiZvMjB9Rzjl6M128gIkgnqDGnZyfWtM5GZ85/BmX1HVGgILK/46RU6Q88z1g==} + '@tauri-apps/cli-win32-x64-msvc@2.0.0': + resolution: {integrity: sha512-oFlo14YMsvyhJHmmHgRuOpJ1L9w15193c1Nfj1DksS2LHj6tLzirI7YrAF9inY/XjHFjNHzYPmBpABibkf/9wQ==} engines: {node: '>= 10'} cpu: [x64] os: [win32] - '@tauri-apps/cli@2.0.0-rc.15': - resolution: {integrity: sha512-w5cq2WBKYRJDCE5wi5gyjM79Cq3AchTFImbcGBB+uyB/m3PDBXEidaTBTHqwiup2hKbMivuBAzGUCHt+OfgBhA==} + '@tauri-apps/cli@2.0.0': + resolution: {integrity: sha512-xxmPllRa6w/LRRcPczST3yHrYoi8l6ZZmzwabEmM0cgDdhVDmX+Y4oDJkiKD+8cVdxwwEzIuIKuaCwsX8iNsgA==} engines: {node: '>= 10'} hasBin: true - '@tauri-apps/plugin-autostart@2.0.0-rc.1': - resolution: {integrity: sha512-5h801HJf6Z5CtUmJhwv+PBSn2nNAWqsuKmu0hABn/IpP2AElZev4XicMzrnYVevJeIhWgRA8HNpg3s8pbic1Rw==} + '@tauri-apps/plugin-autostart@2.0.0': + resolution: {integrity: sha512-NEwOQWVasZ8RczXkMLNJokRDujneuMH/UFA5t84DLkbNZUmiD3G7HZWhgSd1YQ0BFU9h9w+h2B/py3y6bzWg4Q==} - '@tauri-apps/plugin-clipboard-manager@2.0.0-rc.2': - resolution: {integrity: sha512-WWHPgUAOXeh1/LRpv4+FeFyb2Dd+FwNH5gHEROcGJa5K4Gb+6J8VlZc/rglT5BOFoDI7dpvV1O/Z6MuKn3ydGw==} + '@tauri-apps/plugin-clipboard-manager@2.0.0': + resolution: {integrity: sha512-V1sXmbjnwfXt/r48RJMwfUmDMSaP/8/YbH4CLNxt+/sf1eHlIP8PRFdFDQwLN0cNQKu2rqQVbG/Wc/Ps6cDUhw==} - '@tauri-apps/plugin-dialog@2.0.0-rc.1': - resolution: {integrity: sha512-H28gh6BfZtjflHQ+HrmWwunDriBI3AQLAKnMs50GA6zeNUULqbQr7VXbAAKeJL/0CmWcecID4PKXVoSlaWRhEg==} + '@tauri-apps/plugin-dialog@2.0.0': + resolution: {integrity: sha512-ApNkejXP2jpPBSifznPPcHTXxu9/YaRW+eJ+8+nYwqp0lLUtebFHG4QhxitM43wwReHE81WAV1DQ/b+2VBftOA==} - '@tauri-apps/plugin-notification@2.0.0-rc.1': - resolution: {integrity: sha512-ddDj7xM8XR7Zv2vdpofNXlLjcp49p/VjlL0D+/eBcMuyooaLNMor3jz/+H6s23iHerdxMWA50mzy26BRN1BySA==} + '@tauri-apps/plugin-notification@2.0.0': + resolution: {integrity: sha512-6qEDYJS7mgXZWLXA0EFL+DVCJh8sJlzSoyw6B50pxhLPVFjc5Vr5DVzl5W3mUHaYhod5wsC984eQnlCCGqxYDA==} - '@tauri-apps/plugin-shell@2.0.0-rc.1': - resolution: {integrity: sha512-JtNROc0rqEwN/g93ig5pK4cl1vUo2yn+osCpY9de64cy/d9hRzof7AuYOgvt/Xcd5VPQmlgo2AGvUh5sQRSR1A==} + '@tauri-apps/plugin-shell@2.0.0': + resolution: {integrity: sha512-OpW2+ycgJLrEoZityWeWYk+6ZWP9VyiAfbO+N/O8VfLkqyOym8kXh7odKDfINx9RAotkSGBtQM4abyKfJDkcUg==} - '@tauri-apps/plugin-store@2.0.0-rc.1': - resolution: {integrity: sha512-rW71Tkr7OifxoL8NkWgPy5Os4Gn3oJTbv/j/nJ03HDuYsq+F4+8kU8o4epRFJnr6VKmgB/2CtiacSC3dnSSRnA==} + '@tauri-apps/plugin-store@2.0.0': + resolution: {integrity: sha512-l4xsbxAXrKGdBdYNNswrLfcRv3v1kOatdycOcVPYW+jKwkznCr1HEOrPXkPhXsZLSLyYmNXpgfOmdSZNmcykDg==} '@types/cacheable-request@6.0.3': resolution: {integrity: sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==} @@ -2638,74 +2638,74 @@ snapshots: postcss-selector-parser: 6.0.10 tailwindcss: 3.4.11 - '@tauri-apps/api@2.0.0-rc.4': {} + '@tauri-apps/api@2.0.1': {} - '@tauri-apps/cli-darwin-arm64@2.0.0-rc.15': + '@tauri-apps/cli-darwin-arm64@2.0.0': optional: true - '@tauri-apps/cli-darwin-x64@2.0.0-rc.15': + '@tauri-apps/cli-darwin-x64@2.0.0': optional: true - '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-rc.15': + '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0': optional: true - '@tauri-apps/cli-linux-arm64-gnu@2.0.0-rc.15': + '@tauri-apps/cli-linux-arm64-gnu@2.0.0': optional: true - '@tauri-apps/cli-linux-arm64-musl@2.0.0-rc.15': + '@tauri-apps/cli-linux-arm64-musl@2.0.0': optional: true - '@tauri-apps/cli-linux-x64-gnu@2.0.0-rc.15': + '@tauri-apps/cli-linux-x64-gnu@2.0.0': optional: true - '@tauri-apps/cli-linux-x64-musl@2.0.0-rc.15': + '@tauri-apps/cli-linux-x64-musl@2.0.0': optional: true - '@tauri-apps/cli-win32-arm64-msvc@2.0.0-rc.15': + '@tauri-apps/cli-win32-arm64-msvc@2.0.0': optional: true - '@tauri-apps/cli-win32-ia32-msvc@2.0.0-rc.15': + '@tauri-apps/cli-win32-ia32-msvc@2.0.0': optional: true - '@tauri-apps/cli-win32-x64-msvc@2.0.0-rc.15': + '@tauri-apps/cli-win32-x64-msvc@2.0.0': optional: true - '@tauri-apps/cli@2.0.0-rc.15': + '@tauri-apps/cli@2.0.0': optionalDependencies: - '@tauri-apps/cli-darwin-arm64': 2.0.0-rc.15 - '@tauri-apps/cli-darwin-x64': 2.0.0-rc.15 - '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-rc.15 - '@tauri-apps/cli-linux-arm64-gnu': 2.0.0-rc.15 - '@tauri-apps/cli-linux-arm64-musl': 2.0.0-rc.15 - '@tauri-apps/cli-linux-x64-gnu': 2.0.0-rc.15 - '@tauri-apps/cli-linux-x64-musl': 2.0.0-rc.15 - '@tauri-apps/cli-win32-arm64-msvc': 2.0.0-rc.15 - '@tauri-apps/cli-win32-ia32-msvc': 2.0.0-rc.15 - '@tauri-apps/cli-win32-x64-msvc': 2.0.0-rc.15 + '@tauri-apps/cli-darwin-arm64': 2.0.0 + '@tauri-apps/cli-darwin-x64': 2.0.0 + '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0 + '@tauri-apps/cli-linux-arm64-gnu': 2.0.0 + '@tauri-apps/cli-linux-arm64-musl': 2.0.0 + '@tauri-apps/cli-linux-x64-gnu': 2.0.0 + '@tauri-apps/cli-linux-x64-musl': 2.0.0 + '@tauri-apps/cli-win32-arm64-msvc': 2.0.0 + '@tauri-apps/cli-win32-ia32-msvc': 2.0.0 + '@tauri-apps/cli-win32-x64-msvc': 2.0.0 - '@tauri-apps/plugin-autostart@2.0.0-rc.1': + '@tauri-apps/plugin-autostart@2.0.0': dependencies: - '@tauri-apps/api': 2.0.0-rc.4 + '@tauri-apps/api': 2.0.1 - '@tauri-apps/plugin-clipboard-manager@2.0.0-rc.2': + '@tauri-apps/plugin-clipboard-manager@2.0.0': dependencies: - '@tauri-apps/api': 2.0.0-rc.4 + '@tauri-apps/api': 2.0.1 - '@tauri-apps/plugin-dialog@2.0.0-rc.1': + '@tauri-apps/plugin-dialog@2.0.0': dependencies: - '@tauri-apps/api': 2.0.0-rc.4 + '@tauri-apps/api': 2.0.1 - '@tauri-apps/plugin-notification@2.0.0-rc.1': + '@tauri-apps/plugin-notification@2.0.0': dependencies: - '@tauri-apps/api': 2.0.0-rc.4 + '@tauri-apps/api': 2.0.1 - '@tauri-apps/plugin-shell@2.0.0-rc.1': + '@tauri-apps/plugin-shell@2.0.0': dependencies: - '@tauri-apps/api': 2.0.0-rc.4 + '@tauri-apps/api': 2.0.1 - '@tauri-apps/plugin-store@2.0.0-rc.1': + '@tauri-apps/plugin-store@2.0.0': dependencies: - '@tauri-apps/api': 2.0.0-rc.4 + '@tauri-apps/api': 2.0.1 '@types/cacheable-request@6.0.3': dependencies: diff --git a/app/main/src-tauri/Cargo.lock b/app/main/src-tauri/Cargo.lock index dfee5fa..1d944de 100644 --- a/app/main/src-tauri/Cargo.lock +++ b/app/main/src-tauri/Cargo.lock @@ -32,6 +32,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "aligned-vec" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" + [[package]] name = "alloc-no-stdlib" version = "2.0.4" @@ -68,6 +74,12 @@ version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +[[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" + [[package]] name = "arboard" version = "3.4.1" @@ -76,7 +88,7 @@ checksum = "df099ccb16cd014ff054ac1bf392c67feeef57164b05c42f037cd40f5d4357f4" dependencies = [ "clipboard-win", "core-graphics 0.23.2", - "image 0.25.2", + "image", "log", "objc2", "objc2-app-kit", @@ -86,20 +98,41 @@ dependencies = [ "x11rb", ] +[[package]] +name = "arg_enum_proc_macro" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + [[package]] name = "ashpd" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" dependencies = [ "enumflags2", "futures-channel", "futures-util", "rand 0.8.5", + "raw-window-handle", "serde", "serde_repr", "tokio", "url", + "wayland-backend", + "wayland-client", + "wayland-protocols", "zbus", ] @@ -292,6 +325,29 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +[[package]] +name = "av1-grain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf" +dependencies = [ + "anyhow", + "arrayvec", + "log", + "nom", + "num-rational", + "v_frame", +] + +[[package]] +name = "avif-serialize" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2" +dependencies = [ + "arrayvec", +] + [[package]] name = "backtrace" version = "0.3.74" @@ -352,6 +408,12 @@ dependencies = [ "serde", ] +[[package]] +name = "bitstream-io" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452" + [[package]] name = "block" version = "0.1.6" @@ -496,6 +558,12 @@ dependencies = [ "windows 0.52.0", ] +[[package]] +name = "built" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" + [[package]] name = "bumpalo" version = "3.16.0" @@ -608,6 +676,8 @@ version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" dependencies = [ + "jobserver", + "libc", "shlex", ] @@ -1211,6 +1281,15 @@ dependencies = [ "syn 2.0.77", ] +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading", +] + [[package]] name = "dlopen2" version = "0.7.0" @@ -1234,6 +1313,12 @@ dependencies = [ "syn 2.0.77", ] +[[package]] +name = "downcast-rs" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" + [[package]] name = "dpi" version = "0.1.1" @@ -1800,19 +1885,6 @@ dependencies = [ "x11", ] -[[package]] -name = "generator" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows 0.48.0", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -2299,35 +2371,43 @@ dependencies = [ [[package]] name = "image" -version = "0.24.9" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" +checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" dependencies = [ "bytemuck", - "byteorder", + "byteorder-lite", "color_quant", "exr", "gif", - "jpeg-decoder", + "image-webp", "num-traits", "png", "qoi", + "ravif", + "rayon", + "rgb", "tiff", + "zune-core", + "zune-jpeg", ] [[package]] -name = "image" -version = "0.25.2" +name = "image-webp" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99314c8a2152b8ddb211f924cdae532d8c5e4c8bb54728e12fff1b0cd5963a10" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" dependencies = [ - "bytemuck", "byteorder-lite", - "num-traits", - "png", - "tiff", + "quick-error", ] +[[package]] +name = "imgref" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" + [[package]] name = "indexmap" version = "1.9.3" @@ -2368,6 +2448,17 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "interpolate_name" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "io-kit-sys" version = "0.3.0" @@ -2527,14 +2618,20 @@ dependencies = [ "uuid", ] +[[package]] +name = "jobserver" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +dependencies = [ + "libc", +] + [[package]] name = "jpeg-decoder" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" -dependencies = [ - "rayon", -] [[package]] name = "js-sys" @@ -2650,6 +2747,17 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "libfuzzer-sys" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7" +dependencies = [ + "arbitrary", + "cc", + "once_cell", +] + [[package]] name = "libloading" version = "0.7.4" @@ -2693,18 +2801,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] -name = "loom" -version = "0.5.6" +name = "loop9" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" dependencies = [ - "cfg-if", - "generator", - "scoped-tls", - "serde", - "serde_json", - "tracing", - "tracing-subscriber", + "imgref", ] [[package]] @@ -2788,6 +2890,15 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" +[[package]] +name = "maybe-rayon" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" +dependencies = [ + "cfg-if", +] + [[package]] name = "mdns-sd" version = "0.10.4" @@ -2831,6 +2942,12 @@ dependencies = [ "unicase", ] +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "miniz_oxide" version = "0.7.4" @@ -2864,16 +2981,17 @@ dependencies = [ [[package]] name = "muda" -version = "0.14.1" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba8ac4080fb1e097c2c22acae467e46e4da72d941f02e82b67a87a2a89fa38b1" +checksum = "b8123dfd4996055ac9b15a60ad263b44b01e539007523ad7a4a533a3d93b0591" dependencies = [ - "cocoa 0.26.0", "crossbeam-channel", "dpi", "gtk", "keyboard-types", - "objc", + "objc2", + "objc2-app-kit", + "objc2-foundation", "once_cell", "png", "serde", @@ -2959,6 +3077,22 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "noop_proc_macro" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" + [[package]] name = "notify-rust" version = "4.11.3" @@ -3018,6 +3152,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -3139,6 +3284,7 @@ checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ "bitflags 2.6.0", "block2", + "dispatch", "libc", "objc2", ] @@ -3364,6 +3510,12 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + [[package]] name = "pathdiff" version = "0.2.1" @@ -3752,6 +3904,25 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "profiling" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" +dependencies = [ + "profiling-procmacros", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" +dependencies = [ + "quote", + "syn 2.0.77", +] + [[package]] name = "prost" version = "0.13.2" @@ -3814,6 +3985,12 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + [[package]] name = "quick-xml" version = "0.31.0" @@ -3832,6 +4009,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "quick-xml" +version = "0.36.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" +dependencies = [ + "memchr", +] + [[package]] name = "quote" version = "1.0.37" @@ -3922,6 +4108,55 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rav1e" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" +dependencies = [ + "arbitrary", + "arg_enum_proc_macro", + "arrayvec", + "av1-grain", + "bitstream-io", + "built", + "cfg-if", + "interpolate_name", + "itertools 0.12.1", + "libc", + "libfuzzer-sys", + "log", + "maybe-rayon", + "new_debug_unreachable", + "noop_proc_macro", + "num-derive", + "num-traits", + "once_cell", + "paste", + "profiling", + "rand 0.8.5", + "rand_chacha 0.3.1", + "simd_helpers", + "system-deps", + "thiserror", + "v_frame", + "wasm-bindgen", +] + +[[package]] +name = "ravif" +version = "0.11.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f0bfd976333248de2078d350bfdf182ff96e168a24d23d2436cef320dd4bdd" +dependencies = [ + "avif-serialize", + "imgref", + "loop9", + "quick-error", + "rav1e", + "rgb", +] + [[package]] name = "raw-window-handle" version = "0.6.2" @@ -4065,21 +4300,20 @@ dependencies = [ [[package]] name = "rfd" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a73a7337fc24366edfca76ec521f51877b114e42dab584008209cca6719251" +checksum = "8af382a047821a08aa6bfc09ab0d80ff48d45d8726f7cd8e44891f7cb4a4278e" dependencies = [ "ashpd", - "block", - "dispatch", + "block2", "glib-sys", "gobject-sys", "gtk-sys", "js-sys", "log", - "objc", - "objc-foundation", - "objc_id", + "objc2", + "objc2-app-kit", + "objc2-foundation", "raw-window-handle", "wasm-bindgen", "wasm-bindgen-futures", @@ -4087,6 +4321,15 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "rgb" +version = "0.8.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" +dependencies = [ + "bytemuck", +] + [[package]] name = "rqs_lib" version = "0.11.2" @@ -4237,6 +4480,7 @@ dependencies = [ "serde", "serde_json", "url", + "uuid", ] [[package]] @@ -4561,6 +4805,15 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +[[package]] +name = "simd_helpers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6" +dependencies = [ + "quote", +] + [[package]] name = "siphasher" version = "0.3.11" @@ -4675,15 +4928,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "state" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8" -dependencies = [ - "loom", -] - [[package]] name = "static_assertions" version = "1.1.0" @@ -4833,9 +5077,9 @@ dependencies = [ [[package]] name = "tao" -version = "0.30.1" +version = "0.30.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e7ede56f9ef03a0bb384c7b2bed4f3985ee7f3f79ec887c50d8466eec21096" +checksum = "06e48d7c56b3f7425d061886e8ce3b6acfab1993682ed70bef50fd133d721ee6" dependencies = [ "bitflags 2.6.0", "cocoa 0.26.0", @@ -4889,9 +5133,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.0.0-rc.15" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3c3b1c7ac5b72d59da307b84af900a0098c74c9d7369f65018cd8ec0eb50fb" +checksum = "3c9c08beea86d5095b6f5fb1c788fe8759b23c3f71927c66a69e725a91d089cd" dependencies = [ "anyhow", "bytes", @@ -4904,7 +5148,7 @@ dependencies = [ "gtk", "heck 0.5.0", "http", - "image 0.25.2", + "image", "jni 0.21.1", "libc", "log", @@ -4921,7 +5165,6 @@ dependencies = [ "serde_json", "serde_repr", "serialize-to-javascript", - "state", "swift-rs", "tauri-build", "tauri-macros", @@ -4941,9 +5184,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.0-rc.12" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5713e81e02e0b99f5219b275abbd7d2c0cc0f30180e25b1b650e08feeac63" +checksum = "93bb649a284aec2ab43e8df6831b8c8060d231ec8ddf05bf021d58cb67570e1f" dependencies = [ "anyhow", "cargo_toml", @@ -4963,9 +5206,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-rc.12" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5370f2591dcc93d4ff08d9dd168f5097f79b34e859883586a409c627544190e3" +checksum = "a4511912612ba0da11aeb300e18e18b2c7067fd14aa886eac46bdcc43b4fa3ee" dependencies = [ "base64 0.22.1", "brotli", @@ -4990,9 +5233,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-rc.11" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19442dc8ee002ab1926586f6aecb90114f3a1226766008b0c9ac2d9fec9eeb7e" +checksum = "62ee976578a14b779996d7b6879d7e625c8ce674bc87e223953664f37def2eef" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -5004,9 +5247,9 @@ dependencies = [ [[package]] name = "tauri-plugin" -version = "2.0.0-rc.12" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e3368e91a98aa55ea4e3e8ccff516bc1ed2f85872c335ec35e9b345469032e0" +checksum = "774d084450b7ec8e445ad119079307f935b7bf3d736da139a8664eb1d4909aa5" dependencies = [ "anyhow", "glob", @@ -5021,9 +5264,9 @@ dependencies = [ [[package]] name = "tauri-plugin-autostart" -version = "2.0.0-rc.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "992fef0cc6ef3637a8b336c9bf9758b8e718db934afd744846422c1da877dac0" +checksum = "b01d95fecae3c613d6d2b94a71387f03c3fc372d358fb73d6f909d41499eb2ce" dependencies = [ "auto-launch", "log", @@ -5036,12 +5279,12 @@ dependencies = [ [[package]] name = "tauri-plugin-clipboard-manager" -version = "2.1.0-beta.7" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "becbc5a692e842f8d6a7ab5e490c3c36d267b5c3d5bf4b6a0cdd039d7df25569" +checksum = "8336820003f8fac414d444a7aeeb9b927760b529e39736d3344852fd4ff776f0" dependencies = [ "arboard", - "image 0.24.9", + "image", "log", "serde", "serde_json", @@ -5052,9 +5295,9 @@ dependencies = [ [[package]] name = "tauri-plugin-dialog" -version = "2.0.0-rc.7" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "785722c81beb4a6b729ae55d06aeb68d47166c933e64b727e33254dcb5d4d82d" +checksum = "6da13d0dd431efe6b5e40a3314d7a33d7bce8f8ed34e2bf044f95ccad82f10ec" dependencies = [ "log", "raw-window-handle", @@ -5070,9 +5313,9 @@ dependencies = [ [[package]] name = "tauri-plugin-fs" -version = "2.0.0-rc.5" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cb1dfbbea322afbc9dec49351bc29edf4e85e74d37d9a3fcc72d67ed55ffdbd" +checksum = "6ba59d7880ffdc24f72350b48bec374482803e167b7275655f6bd8426b7fc9c3" dependencies = [ "anyhow", "dunce", @@ -5091,9 +5334,9 @@ dependencies = [ [[package]] name = "tauri-plugin-notification" -version = "2.0.0-rc.5" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27f6edb6c4219e9be6ff9b3b1957e679e918051d1070a57bc2de876f23d33072" +checksum = "85e26a56dd9666275f43fbfd4b803e64a5d9ea39e0d1754f4bee87456af01e67" dependencies = [ "log", "notify-rust", @@ -5110,9 +5353,9 @@ dependencies = [ [[package]] name = "tauri-plugin-process" -version = "2.0.0-rc.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9eb80b601682dcbd45dc5ed5f7cc214f1d994aeea730d500899cc616784559" +checksum = "73a682de610de60cfeea5212cbbaca9a6c25bd48854067f2aee3c27ee87ae65c" dependencies = [ "tauri", "tauri-plugin", @@ -5120,9 +5363,9 @@ dependencies = [ [[package]] name = "tauri-plugin-shell" -version = "2.0.0-rc.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83800ddf78b820172efb5ed7310344e8e4f97fd30cd8237a3f20c12a79eb136" +checksum = "2929bb35edb7255949e0cbcb2285ff6b02371bf826ad03471077b6b3bf4e6d60" dependencies = [ "encoding_rs", "log", @@ -5141,9 +5384,9 @@ dependencies = [ [[package]] name = "tauri-plugin-single-instance" -version = "2.0.0-rc.4" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15679effe51bd7db0038e7c5aed2d26a20b7e7c4657b6df693f5fb67af7dcaec" +checksum = "9245be5ccad41f2980996b37c1f97f669aee1407969b9090e3f37a4c4668dd1a" dependencies = [ "log", "serde", @@ -5156,9 +5399,9 @@ dependencies = [ [[package]] name = "tauri-plugin-store" -version = "2.0.0-rc.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e54ba1a0c0c60a6a08e711e184239f8a50354988b6fe1af8b5ce2215b2e79a2" +checksum = "c824c56d35d3aeb97eda0f827c9c419d8fd153a2958f3f40e8e9f34ecc564e6d" dependencies = [ "dunce", "log", @@ -5167,13 +5410,14 @@ dependencies = [ "tauri", "tauri-plugin", "thiserror", + "tokio", ] [[package]] name = "tauri-runtime" -version = "2.0.0-rc.12" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f38d8aaa1e81d20e8e208e3e317f81b59fb75c530fbae8a90e72d02001d687" +checksum = "2570e1f33f332a2d2d9967ebb3903bc4e1f92b9c47e4d1b302c10ea4153fcdbb" dependencies = [ "dpi", "gtk", @@ -5190,9 +5434,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.0.0-rc.13" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1ef5171e14c8fe3b5a63e75004c20d057747bc3e7fdc5f8ded625f0b29f5c7" +checksum = "8147d8f9ed418d83a90af3d64fbdca5e0e924ae28e5351da88f9568169db8665" dependencies = [ "gtk", "http", @@ -5216,9 +5460,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-rc.12" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31fe4c9148e1b35225e1c00753f24b517ce00041d02eb4b4d6fd10613a47736c" +checksum = "f87856e9d7fa91fd710362f3c73fccbf6bfd036934908791e65bd803d54dc8a8" dependencies = [ "brotli", "cargo_metadata", @@ -5246,6 +5490,7 @@ dependencies = [ "toml 0.8.19", "url", "urlpattern", + "uuid", "walkdir", ] @@ -5622,9 +5867,9 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044d7738b3d50f288ddef035b793228740ad4d927f5466b0af55dc15e7e03cfe" +checksum = "533fc2d4105e0e3d96ce1c71f2d308c9fbbe2ef9c587cab63dd627ab5bde218f" dependencies = [ "core-graphics 0.24.0", "crossbeam-channel", @@ -5811,6 +6056,17 @@ dependencies = [ "serde", ] +[[package]] +name = "v_frame" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6f32aaa24bacd11e488aa9ba66369c7cd514885742c9fe08cfe85884db3e92b" +dependencies = [ + "aligned-vec", + "num-traits", + "wasm-bindgen", +] + [[package]] name = "valuable" version = "0.1.0" @@ -5966,6 +6222,66 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wayland-backend" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6" +dependencies = [ + "cc", + "downcast-rs", + "rustix", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d" +dependencies = [ + "bitflags 2.6.0", + "rustix", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.32.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0" +dependencies = [ + "bitflags 2.6.0", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" +dependencies = [ + "proc-macro2", + "quick-xml 0.36.2", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09" +dependencies = [ + "dlib", + "log", + "pkg-config", +] + [[package]] name = "web-sys" version = "0.3.70" @@ -6113,15 +6429,6 @@ dependencies = [ "windows-version", ] -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows" version = "0.52.0" @@ -6531,9 +6838,9 @@ dependencies = [ [[package]] name = "wry" -version = "0.43.1" +version = "0.44.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4d715cf5fe88e9647f3d17b207b6d060d4a88e7171d4ccb2d2c657dd1d44728" +checksum = "440600584cfbd8b0d28eace95c1f2c253db05dae43780b79380aa1e868f04c73" dependencies = [ "base64 0.22.1", "block", @@ -6713,6 +7020,12 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + [[package]] name = "zune-inflate" version = "0.2.54" @@ -6722,6 +7035,15 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "zune-jpeg" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" +dependencies = [ + "zune-core", +] + [[package]] name = "zvariant" version = "4.2.0" diff --git a/app/main/src-tauri/Cargo.toml b/app/main/src-tauri/Cargo.toml index d5803a0..5eef6ee 100644 --- a/app/main/src-tauri/Cargo.toml +++ b/app/main/src-tauri/Cargo.toml @@ -9,7 +9,7 @@ license = "AGPL-3.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] -tauri-build = { version = "2.0.0-beta", features = [] } +tauri-build = { version = "2.0.0", features = [] } [dependencies] anyhow = "1.0" @@ -21,18 +21,18 @@ rqs_lib = { path = "../../../core_lib", features = ["experimental"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" sys_metrics = "0.2" -tauri = { version = "2.0.0-beta", features = [ "devtools", "tray-icon", "native-tls-vendored", "image-png"] } -tauri-plugin-autostart = "2.0.0-beta" -tauri-plugin-process = "2.0.0-beta" -tauri-plugin-notification = "2.0.0-beta" -tauri-plugin-single-instance = "2.0.0-beta" -tauri-plugin-store = "2.0.0-beta" -tauri-plugin-dialog = "2.0.0-beta" -tauri-plugin-shell = "2.0.0-beta" +tauri = { version = "2.0.0", features = [ "devtools", "tray-icon", "native-tls-vendored", "image-png"] } +tauri-plugin-autostart = "2.0.0" +tauri-plugin-process = "2.0.0" +tauri-plugin-notification = "2.0.0" +tauri-plugin-single-instance = "2.0.0" +tauri-plugin-store = "2.0.0" +tauri-plugin-dialog = "2.0.0" +tauri-plugin-shell = "2.0.0" time = { version = "0.3", features = ["formatting"] } tokio = { version = "1.25", features = ["macros", "rt", "rt-multi-thread", "net", "sync", "time", "io-util"] } tokio-util = { version = "0.7", features = ["rt"] } -tauri-plugin-clipboard-manager = "2.1.0-beta.7" +tauri-plugin-clipboard-manager = "2.0.0" [features] # by default Tauri runs in production mode diff --git a/app/main/src-tauri/src/store.rs b/app/main/src-tauri/src/store.rs index 7e7ff75..6be3604 100644 --- a/app/main/src-tauri/src/store.rs +++ b/app/main/src-tauri/src/store.rs @@ -1,135 +1,95 @@ -use std::path::PathBuf; +use std::{path::PathBuf, time::Duration}; use rqs_lib::Visibility; -use tauri::{AppHandle, Emitter, Manager}; -use tauri_plugin_store::{with_store, JsonValue}; +use tauri::{AppHandle, Emitter, Wry}; +use tauri_plugin_store::{JsonValue, Store, StoreExt}; + +fn _get_store(app_handle: &AppHandle) -> Store { + app_handle + .store_builder(".settings.json") + .auto_save(Duration::from_millis(100)) + .build() +} pub fn init_default(app_handle: &AppHandle) { - let _ = with_store( - app_handle.clone(), - app_handle.state(), - ".settings.json", - |store| { - if !store.has("autostart") { - store - .insert("autostart".to_owned(), JsonValue::Bool(true)) - .ok(); - } - - if !store.has("realclose") { - store - .insert("realclose".to_owned(), JsonValue::Bool(false)) - .ok(); - } - - if !store.has("visibility") { - store - .insert( - "visibility".to_owned(), - JsonValue::Number((Visibility::Visible as u8).into()), - ) - .ok(); - } - - if !store.has("startminimized") { - store - .insert("startminimized".to_owned(), JsonValue::Bool(false)) - .ok(); - } - Ok(()) - }, - ); + let store = _get_store(app_handle); + + if !store.has("autostart") { + store.set("autostart", JsonValue::Bool(true)); + } + + if !store.has("realclose") { + store.set("realclose", JsonValue::Bool(false)); + } + + if !store.has("visibility") { + store.set( + "visibility", + JsonValue::Number((Visibility::Visible as u8).into()), + ); + } + + if !store.has("startminimized") { + store.set("startminimized", JsonValue::Bool(false)); + } } pub fn get_realclose(app_handle: &AppHandle) -> bool { - with_store( - app_handle.clone(), - app_handle.state(), - ".settings.json", - |store| Ok(store.get("realclose").and_then(|json| json.as_bool())), - ) - .unwrap_or_else(|e| { - error!("get_realclose: error: {}", e); - None - }) - .unwrap_or(false) + let store = _get_store(app_handle); + + store + .get("realclose") + .and_then(|json| json.as_bool()) + .unwrap_or_default() } pub fn get_port(app_handle: &AppHandle) -> Option { - with_store( - app_handle.clone(), - app_handle.state(), - ".settings.json", - |store| Ok(store.get("port").and_then(|json| json.as_u64())), - ) - .ok() - .flatten() - .map(|v| v as u32) + let store = _get_store(app_handle); + + store + .get("port") + .and_then(|json| json.as_u64().map(|v| v as u32)) } pub fn get_visibility(app_handle: &AppHandle) -> Visibility { - with_store( - app_handle.clone(), - app_handle.state(), - ".settings.json", - |store| Ok(store.get("visibility").and_then(|json| json.as_u64())), - ) - .unwrap_or_else(|e| { - error!("get_visibility: error: {}", e); - None - }) - .map_or(Visibility::Visible, |v| Visibility::from_raw_value(v as u8)) + let store = _get_store(app_handle); + + store + .get("visibility") + .and_then(|json| json.as_u64().map(Visibility::from_raw_value)) + .unwrap_or(Visibility::Visible) } pub fn set_visibility(app_handle: &AppHandle, v: Visibility) -> Result<(), anyhow::Error> { - with_store( - app_handle.clone(), - app_handle.state(), - ".settings.json", - |store| store.insert("visibility".to_owned(), JsonValue::Number((v as u8).into())), - )?; + let store = _get_store(app_handle); + store.set("visibility", JsonValue::Number((v as u8).into())); app_handle.emit("visibility_updated", ())?; + Ok(()) } pub fn get_download_path(app_handle: &AppHandle) -> Option { - with_store( - app_handle.clone(), - app_handle.state(), - ".settings.json", - |store| Ok(store.get("download_path").cloned()), - ) - .ok() - .flatten() - .and_then(|v| v.as_str().map(PathBuf::from)) + let store = _get_store(app_handle); + + store + .get("download_path") + .and_then(|json| json.as_str().map(PathBuf::from)) } pub fn get_logging_level(app_handle: &AppHandle) -> Option { - with_store( - app_handle.clone(), - app_handle.state(), - ".settings.json", - |store| { - Ok(store - .get("debug_level") - .and_then(|json| json.as_str().map(String::from))) - }, - ) - .ok() - .flatten() + let store = _get_store(app_handle); + + store + .get("debug_level") + .and_then(|json| json.as_str().map(String::from)) } pub fn get_startminimized(app_handle: &AppHandle) -> bool { - with_store( - app_handle.clone(), - app_handle.state(), - ".settings.json", - |store| Ok(store.get("startminimized").and_then(|json| json.as_bool())), - ) - .unwrap_or_else(|e| { - error!("get_startminimized: error: {}", e); - None - }) - .unwrap_or(false) + let store = _get_store(app_handle); + + store + .get("startminimized") + .and_then(|json| json.as_bool()) + .unwrap_or_default() } diff --git a/core_lib/src/hdl/mdns.rs b/core_lib/src/hdl/mdns.rs index 7865e56..4fc8907 100644 --- a/core_lib/src/hdl/mdns.rs +++ b/core_lib/src/hdl/mdns.rs @@ -24,7 +24,7 @@ pub enum Visibility { #[allow(dead_code)] impl Visibility { - pub fn from_raw_value(value: u8) -> Self { + pub fn from_raw_value(value: u64) -> Self { match value { 0 => Visibility::Visible, 1 => Visibility::Invisible,