CalvinBackup/tauri-plugins-workspace
1
0
Fork 0
mirror of https://github.com/tauri-apps/plugins-workspace.git synced 2026-06-06 13:53:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: Merge branch v1 into v2 (#702)

Browse Source
This commit is contained in:
Fabian-Lars
2023-11-14 01:50:13 +01:00
committed by GitHub
parent d4d1633c4d
commit 251852ccbc
42 changed files with 1663 additions and 5522 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/persisted-scope/Cargo.toml
+1 -1
View File
@@ -17,7 +17,7 @@ serde_json = { workspace = true }
tauri = { workspace = true }
log = { workspace = true }
thiserror = { workspace = true }
aho-corasick = "1.0"
aho-corasick = "1"
bincode = "1"
tauri-plugin-fs = { path = "../fs", version = "2.0.0-alpha.4" }
plugins/persisted-scope/src/lib.rs
+15 -14
View File
@@ -13,13 +13,13 @@
use aho_corasick::AhoCorasick;
use serde::{Deserialize, Serialize};
#[cfg(feature = "protocol-asset")]
use tauri::scope::fs::{Event as FsScopeEvent, Scope as FsScope};
use tauri::{
plugin::{Builder, TauriPlugin},
scope::fs::Pattern as GlobPattern,
Manager, Runtime,
};
#[cfg(feature = "protocol-asset")]
use tauri::{FsScope, FsScopeEvent};
use tauri_plugin_fs::{FsExt, Scope as FsPluginScope, ScopeEvent as FsPluginScopeEvent};
use std::{
@@ -58,7 +58,7 @@ trait ScopeExt {
fn forbidden_patterns(&self) -> HashSet<GlobPattern>;
}
impl ScopeExt for &FsPluginScope {
impl ScopeExt for FsPluginScope {
fn allow_file(&self, path: &Path) {
let _ = FsPluginScope::allow_file(self, path);
}
@@ -85,7 +85,7 @@ impl ScopeExt for &FsPluginScope {
}
#[cfg(feature = "protocol-asset")]
impl ScopeExt for &FsScope {
impl ScopeExt for FsScope {
fn allow_file(&self, path: &Path) {
let _ = FsScope::allow_file(self, path);
}
@@ -171,7 +171,7 @@ fn fix_directory(path_str: &str) -> &Path {
path
}
fn allow_path(scope: impl ScopeExt, path: &str) {
fn allow_path(scope: &impl ScopeExt, path: &str) {
let target_type = detect_scope_type(path);
match target_type {
@@ -189,7 +189,7 @@ fn allow_path(scope: impl ScopeExt, path: &str) {
}
}
fn forbid_path(scope: impl ScopeExt, path: &str) {
fn forbid_path(scope: &impl ScopeExt, path: &str) {
let target_type = detect_scope_type(path);
match target_type {
@@ -205,7 +205,7 @@ fn forbid_path(scope: impl ScopeExt, path: &str) {
}
}
fn save_scopes(scope: impl ScopeExt, app_dir: &Path, scope_state_path: &Path) {
fn save_scopes(scope: &impl ScopeExt, app_dir: &Path, scope_state_path: &Path) {
let scope = Scope {
allowed_paths: scope
.allowed_patterns()
@@ -243,7 +243,8 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
let asset_scope_state_path = app_dir.join(ASSET_SCOPE_STATE_FILENAME);
if let Some(fs_scope) = fs_scope {
let _ = fs_scope.forbid_file(&fs_scope_state_path);}
let _ = fs_scope.forbid_file(&fs_scope_state_path);
}
#[cfg(feature = "protocol-asset")]
let _ = asset_protocol_scope.forbid_file(&asset_scope_state_path);
@@ -271,7 +272,7 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
// This is needed to fix broken .peristed-scope files in case the app doesn't update the scope itself.
save_scopes(fs_scope, &app_dir, &fs_scope_state_path);
}
}
}
#[cfg(feature = "protocol-asset")]
if asset_scope_state_path.exists() {
@@ -303,15 +304,15 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
}
});
}
#[cfg(feature = "protocol-asset")]
{
let asset_protocol_scope_ = asset_protocol_scope.clone();
asset_protocol_scope.listen(move |event| {
if let FsScopeEvent::PathAllowed(_) = event {
save_scopes(&asset_protocol_scope_, &app_dir_, &asset_scope_state_path);
}
});}
if let FsScopeEvent::PathAllowed(_) = event {
save_scopes(&asset_protocol_scope_, &app_dir_, &asset_scope_state_path);
}
});
}
}
Ok(())
})