From 4d8bac9645eace055d581f27e772dcf46522f435 Mon Sep 17 00:00:00 2001 From: 4gray Date: Fri, 15 Nov 2024 09:25:42 +0100 Subject: [PATCH] chore: adapt config files and add tauri related plugins --- package-lock.json | 30 +++++++++ package.json | 3 + src-tauri/Cargo.lock | 95 +++++++++++++++++++++++++++++ src-tauri/Cargo.toml | 5 ++ src-tauri/capabilities/default.json | 6 +- src-tauri/capabilities/desktop.json | 11 ++++ src-tauri/tauri.conf.json | 2 +- 7 files changed, 149 insertions(+), 3 deletions(-) create mode 100644 src-tauri/capabilities/desktop.json diff --git a/package-lock.json b/package-lock.json index ef28dd540..c5806f28f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,8 +24,11 @@ "@rx-angular/cdk": "18.0.0", "@rx-angular/template": "18.0.0", "@tauri-apps/api": "2.1.0", + "@tauri-apps/plugin-fs": "2.0.2", "@tauri-apps/plugin-http": "2.0.1", + "@tauri-apps/plugin-os": "2.0.0", "@tauri-apps/plugin-shell": "2.0.1", + "@tauri-apps/plugin-window-state": "2.0.0", "@videojs/http-streaming": "2.15.0", "@yangkghjh/videojs-aspect-ratio-panel": "0.0.1", "about-window": "1.15.2", @@ -8107,6 +8110,15 @@ "node": ">= 10" } }, + "node_modules/@tauri-apps/plugin-fs": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-fs/-/plugin-fs-2.0.2.tgz", + "integrity": "sha512-4YZaX2j7ta81M5/DL8aN10kTnpUkEpkPo1FTYPT8Dd0ImHe3azM8i8MrtjrDGoyBYLPO3zFv7df/mSCYF8oA0Q==", + "license": "MIT OR Apache-2.0", + "dependencies": { + "@tauri-apps/api": "^2.0.0" + } + }, "node_modules/@tauri-apps/plugin-http": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-http/-/plugin-http-2.0.1.tgz", @@ -8116,6 +8128,15 @@ "@tauri-apps/api": "^2.0.0" } }, + "node_modules/@tauri-apps/plugin-os": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-os/-/plugin-os-2.0.0.tgz", + "integrity": "sha512-M7hG/nNyQYTJxVG/UhTKhp9mpXriwWzrs9mqDreB8mIgqA3ek5nHLdwRZJWhkKjZrnDT4v9CpA9BhYeplTlAiA==", + "license": "MIT OR Apache-2.0", + "dependencies": { + "@tauri-apps/api": "^2.0.0" + } + }, "node_modules/@tauri-apps/plugin-shell": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.0.1.tgz", @@ -8125,6 +8146,15 @@ "@tauri-apps/api": "^2.0.0" } }, + "node_modules/@tauri-apps/plugin-window-state": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-window-state/-/plugin-window-state-2.0.0.tgz", + "integrity": "sha512-O82iRlrh1BLgBI8CTc+NMTPxQhQo8II5admKq9mLvH45Us5i4Zcr74At6eM46nOflFd7R8bZsVNGy+PxOEqUmQ==", + "license": "MIT OR Apache-2.0", + "dependencies": { + "@tauri-apps/api": "^2.0.0" + } + }, "node_modules/@tootallnate/once": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", diff --git a/package.json b/package.json index 79eaa9bf9..84dbef453 100644 --- a/package.json +++ b/package.json @@ -67,8 +67,11 @@ "@rx-angular/cdk": "18.0.0", "@rx-angular/template": "18.0.0", "@tauri-apps/api": "2.1.0", + "@tauri-apps/plugin-fs": "2.0.2", "@tauri-apps/plugin-http": "2.0.1", + "@tauri-apps/plugin-os": "2.0.0", "@tauri-apps/plugin-shell": "2.0.1", + "@tauri-apps/plugin-window-state": "2.0.0", "@videojs/http-streaming": "2.15.0", "@yangkghjh/videojs-aspect-ratio-panel": "0.0.1", "about-window": "1.15.2", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index dda8b4c4c..4cadd5817 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -12,9 +12,12 @@ dependencies = [ "serde_json", "tauri", "tauri-build", + "tauri-plugin-fs", "tauri-plugin-http", "tauri-plugin-log", + "tauri-plugin-os", "tauri-plugin-shell", + "tauri-plugin-window-state", ] [[package]] @@ -882,6 +885,16 @@ dependencies = [ "typeid", ] +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "fdeflate" version = "0.3.6" @@ -1187,6 +1200,16 @@ dependencies = [ "version_check", ] +[[package]] +name = "gethostname" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc3655aa6818d65bc620d6911f05aa7b6aeb596291e1e9f79e52df85583d1e30" +dependencies = [ + "rustix", + "windows-targets 0.52.6", +] + [[package]] name = "getrandom" version = "0.1.16" @@ -1856,6 +1879,12 @@ dependencies = [ "libc", ] +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + [[package]] name = "lock_api" version = "0.4.12" @@ -2319,6 +2348,17 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" +[[package]] +name = "os_info" +version = "3.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" +dependencies = [ + "log", + "serde", + "windows-sys 0.52.0", +] + [[package]] name = "os_pipe" version = "1.2.1" @@ -3031,6 +3071,19 @@ dependencies = [ "semver", ] +[[package]] +name = "rustix" +version = "0.38.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99e4ea3e1cdc4b559b8e5650f9c8e5998e3e5c1343b4eaf034565f32318d63c0" +dependencies = [ + "bitflags 2.6.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + [[package]] name = "rustls" version = "0.23.16" @@ -3533,6 +3586,15 @@ dependencies = [ "futures-core", ] +[[package]] +name = "sys-locale" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eab9a99a024a169fe8a903cf9d4a3b3601109bcc13bd9e3c6fff259138626c4" +dependencies = [ + "libc", +] + [[package]] name = "system-configuration" version = "0.6.1" @@ -3824,6 +3886,24 @@ dependencies = [ "time", ] +[[package]] +name = "tauri-plugin-os" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc5f23a86f37687c7f4fecfdc706b279087bc44f7a46702f7307ff1551ee03a" +dependencies = [ + "gethostname", + "log", + "os_info", + "serde", + "serde_json", + "serialize-to-javascript", + "sys-locale", + "tauri", + "tauri-plugin", + "thiserror", +] + [[package]] name = "tauri-plugin-shell" version = "2.0.2" @@ -3845,6 +3925,21 @@ dependencies = [ "tokio", ] +[[package]] +name = "tauri-plugin-window-state" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683c8764751fbbcebf3a594bcee24cf84c62773fa0080d1b40fc80698472421e" +dependencies = [ + "bitflags 2.6.0", + "log", + "serde", + "serde_json", + "tauri", + "tauri-plugin", + "thiserror", +] + [[package]] name = "tauri-runtime" version = "2.1.1" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index d6d2029f8..af0a0523e 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -26,3 +26,8 @@ tauri-plugin-log = "2.0.0-rc" tauri-plugin-http = {version = "2", features = ["unsafe-headers"] } tauri-plugin-shell = "2" fix-path-env = { git = "https://github.com/tauri-apps/fix-path-env-rs" } +tauri-plugin-os = "2" +tauri-plugin-fs = "2" + +[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies] +tauri-plugin-window-state = "2" diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json index 6c0875381..298d0faec 100644 --- a/src-tauri/capabilities/default.json +++ b/src-tauri/capabilities/default.json @@ -33,7 +33,9 @@ } ] }, - "shell:default", - "http:default" + "http:default", + "window-state:default", + "os:default", + "fs:default" ] } diff --git a/src-tauri/capabilities/desktop.json b/src-tauri/capabilities/desktop.json new file mode 100644 index 000000000..de53dc6c2 --- /dev/null +++ b/src-tauri/capabilities/desktop.json @@ -0,0 +1,11 @@ +{ + "identifier": "desktop-capability", + "platforms": [ + "macOS", + "windows", + "linux" + ], + "permissions": [ + "window-state:default" + ] +} \ No newline at end of file diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 3d532a715..d2c157cc1 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "../node_modules/@tauri-apps/cli/config.schema.json", "productName": "iptvnator", - "version": "0.1.0", + "version": "1.0.0-beta.0", "identifier": "com.4gray.dev", "build": { "frontendDist": "../dist",