mirror of
https://github.com/tauri-apps/tauri.git
synced 2025-01-22 20:37:18 +08:00
fix(cli): Ignore file access events (#12164)
Some checks are pending
Audit / audit-rust (push) Waiting to run
Audit / audit-js (push) Waiting to run
bench / bench (map[os:ubuntu-latest target:x86_64-unknown-linux-gnu], nightly) (push) Waiting to run
covector version or publish / run-integration-tests (macos-latest) (push) Waiting to run
covector version or publish / run-integration-tests (ubuntu-latest) (push) Waiting to run
covector version or publish / run-integration-tests (windows-latest) (push) Waiting to run
covector version or publish / version-or-publish (push) Blocked by required conditions
lint rust / clippy (push) Waiting to run
supply chain health status / check rust dependencies with cargo vet (push) Waiting to run
test `@tauri-apps/cli` / test (macos-latest) (push) Waiting to run
test `@tauri-apps/cli` / test (ubuntu-latest) (push) Waiting to run
test `@tauri-apps/cli` / test (windows-latest) (push) Waiting to run
test `tauri-cli` / test (map[args:--no-default-features --features native-tls-vendored os:windows-latest target:aarch64-pc-windows-msvc]) (push) Waiting to run
test `tauri-cli` / test (map[os:macos-latest target:x86_64-apple-darwin]) (push) Waiting to run
test `tauri-cli` / test (map[os:ubuntu-latest target:x86_64-unknown-linux-gnu]) (push) Waiting to run
test `tauri-cli` / test (map[os:windows-latest target:x86_64-pc-windows-msvc]) (push) Waiting to run
test core / test (map[args:--all-features key:all], map[command:build cross:false os:macos-latest target:aarch64-apple-ios toolchain:1.77.2]) (push) Waiting to run
test core / test (map[args:--all-features key:all], map[command:build cross:true os:ubuntu-latest target:aarch64-linux-android toolchain:1.77.2]) (push) Waiting to run
test core / test (map[args:--all-features key:all], map[command:test cross:false os:macos-14 target:aarch64-apple-darwin toolchain:1.77.2]) (push) Waiting to run
test core / test (map[args:--all-features key:all], map[command:test cross:false os:ubuntu-latest target:x86_64-unknown-linux-gnu toolchain:1.77.2]) (push) Waiting to run
test core / test (map[args:--all-features key:all], map[command:test cross:false os:windows-latest target:x86_64-pc-windows-msvc toolchain:1.77.2]) (push) Waiting to run
test core / test (map[args:--no-default-features key:no-default], map[command:build cross:false os:macos-latest target:aarch64-apple-ios toolchain:1.77.2]) (push) Waiting to run
test core / test (map[args:--no-default-features key:no-default], map[command:build cross:true os:ubuntu-latest target:aarch64-linux-android toolchain:1.77.2]) (push) Waiting to run
test core / test (map[args:--no-default-features key:no-default], map[command:test cross:false os:macos-14 target:aarch64-apple-darwin toolchain:1.77.2]) (push) Waiting to run
test core / test (map[args:--no-default-features key:no-default], map[command:test cross:false os:ubuntu-latest target:x86_64-unknown-linux-gnu toolchain:1.77.2]) (push) Waiting to run
test core / test (map[args:--no-default-features key:no-default], map[command:test cross:false os:windows-latest target:x86_64-pc-windows-msvc toolchain:1.77.2]) (push) Waiting to run
Udeps / changes (push) Waiting to run
Udeps / setup (push) Blocked by required conditions
Udeps / udeps (push) Blocked by required conditions
Some checks are pending
Audit / audit-rust (push) Waiting to run
Audit / audit-js (push) Waiting to run
bench / bench (map[os:ubuntu-latest target:x86_64-unknown-linux-gnu], nightly) (push) Waiting to run
covector version or publish / run-integration-tests (macos-latest) (push) Waiting to run
covector version or publish / run-integration-tests (ubuntu-latest) (push) Waiting to run
covector version or publish / run-integration-tests (windows-latest) (push) Waiting to run
covector version or publish / version-or-publish (push) Blocked by required conditions
lint rust / clippy (push) Waiting to run
supply chain health status / check rust dependencies with cargo vet (push) Waiting to run
test `@tauri-apps/cli` / test (macos-latest) (push) Waiting to run
test `@tauri-apps/cli` / test (ubuntu-latest) (push) Waiting to run
test `@tauri-apps/cli` / test (windows-latest) (push) Waiting to run
test `tauri-cli` / test (map[args:--no-default-features --features native-tls-vendored os:windows-latest target:aarch64-pc-windows-msvc]) (push) Waiting to run
test `tauri-cli` / test (map[os:macos-latest target:x86_64-apple-darwin]) (push) Waiting to run
test `tauri-cli` / test (map[os:ubuntu-latest target:x86_64-unknown-linux-gnu]) (push) Waiting to run
test `tauri-cli` / test (map[os:windows-latest target:x86_64-pc-windows-msvc]) (push) Waiting to run
test core / test (map[args:--all-features key:all], map[command:build cross:false os:macos-latest target:aarch64-apple-ios toolchain:1.77.2]) (push) Waiting to run
test core / test (map[args:--all-features key:all], map[command:build cross:true os:ubuntu-latest target:aarch64-linux-android toolchain:1.77.2]) (push) Waiting to run
test core / test (map[args:--all-features key:all], map[command:test cross:false os:macos-14 target:aarch64-apple-darwin toolchain:1.77.2]) (push) Waiting to run
test core / test (map[args:--all-features key:all], map[command:test cross:false os:ubuntu-latest target:x86_64-unknown-linux-gnu toolchain:1.77.2]) (push) Waiting to run
test core / test (map[args:--all-features key:all], map[command:test cross:false os:windows-latest target:x86_64-pc-windows-msvc toolchain:1.77.2]) (push) Waiting to run
test core / test (map[args:--no-default-features key:no-default], map[command:build cross:false os:macos-latest target:aarch64-apple-ios toolchain:1.77.2]) (push) Waiting to run
test core / test (map[args:--no-default-features key:no-default], map[command:build cross:true os:ubuntu-latest target:aarch64-linux-android toolchain:1.77.2]) (push) Waiting to run
test core / test (map[args:--no-default-features key:no-default], map[command:test cross:false os:macos-14 target:aarch64-apple-darwin toolchain:1.77.2]) (push) Waiting to run
test core / test (map[args:--no-default-features key:no-default], map[command:test cross:false os:ubuntu-latest target:x86_64-unknown-linux-gnu toolchain:1.77.2]) (push) Waiting to run
test core / test (map[args:--no-default-features key:no-default], map[command:test cross:false os:windows-latest target:x86_64-pc-windows-msvc toolchain:1.77.2]) (push) Waiting to run
Udeps / changes (push) Waiting to run
Udeps / setup (push) Blocked by required conditions
Udeps / udeps (push) Blocked by required conditions
This commit is contained in:
parent
cd841d8e33
commit
881729448c
6
.changes/ignore-notify-access-type.md
Normal file
6
.changes/ignore-notify-access-type.md
Normal file
@ -0,0 +1,6 @@
|
||||
---
|
||||
tauri-cli: 'patch:bug'
|
||||
'@tauri-apps/cli': 'patch:bug'
|
||||
---
|
||||
|
||||
Fixed an issue that caused `tauri dev` to crash before showing the app on Linux.
|
20
Cargo.lock
generated
20
Cargo.lock
generated
@ -2954,6 +2954,15 @@ dependencies = [
|
||||
"version_check",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "file-id"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6bc904b9bbefcadbd8e3a9fb0d464a9b979de6324c03b3c663e8994f46a5be36"
|
||||
dependencies = [
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "filetime"
|
||||
version = "0.2.25"
|
||||
@ -5384,15 +5393,16 @@ dependencies = [
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "notify-debouncer-mini"
|
||||
version = "0.5.0"
|
||||
name = "notify-debouncer-full"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aaa5a66d07ed97dce782be94dcf5ab4d1b457f4243f7566c7557f15cabc8c799"
|
||||
checksum = "9dcf855483228259b2353f89e99df35fc639b2b2510d1166e4858e3f67ec1afb"
|
||||
dependencies = [
|
||||
"file-id",
|
||||
"log",
|
||||
"notify",
|
||||
"notify-types",
|
||||
"tempfile",
|
||||
"walkdir",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -9230,7 +9240,7 @@ dependencies = [
|
||||
"memchr",
|
||||
"minisign",
|
||||
"notify",
|
||||
"notify-debouncer-mini",
|
||||
"notify-debouncer-full",
|
||||
"object 0.36.5",
|
||||
"os_info",
|
||||
"os_pipe",
|
||||
|
@ -18,7 +18,7 @@ async fn read_file<R: Runtime>(app: AppHandle<R>) -> Result<Response, String> {
|
||||
.path()
|
||||
.resolve(".tauri_3mb.json", BaseDirectory::Home)
|
||||
.map_err(|e| e.to_string())?;
|
||||
let contents = read(&path).map_err(|e| e.to_string())?;
|
||||
let contents = read(path).map_err(|e| e.to_string())?;
|
||||
Ok(Response::new(contents))
|
||||
}
|
||||
|
||||
|
@ -56,7 +56,7 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
|
||||
let product_name = settings.product_name();
|
||||
|
||||
let mut settings = settings.clone();
|
||||
if main_binary.name().contains(" ") {
|
||||
if main_binary.name().contains(' ') {
|
||||
let main_binary_path = settings.binary_path(main_binary);
|
||||
let project_out_directory = settings.project_out_directory();
|
||||
|
||||
@ -108,7 +108,7 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
|
||||
|
||||
// Using create_dir_all for a single dir so we don't get errors if the path already exists
|
||||
fs::create_dir_all(&app_dir_usr_bin)?;
|
||||
fs::create_dir_all(&app_dir_usr_lib)?;
|
||||
fs::create_dir_all(app_dir_usr_lib)?;
|
||||
|
||||
// Copy bins and libs that linuxdeploy doesn't know about
|
||||
|
||||
@ -258,7 +258,7 @@ fn prepare_tools(tools_path: &Path, arch: &str) -> crate::Result<PathBuf> {
|
||||
fn write_and_make_executable(path: &Path, data: Vec<u8>) -> std::io::Result<()> {
|
||||
use std::os::unix::fs::PermissionsExt;
|
||||
|
||||
fs::write(path, &data)?;
|
||||
fs::write(path, data)?;
|
||||
fs::set_permissions(path, fs::Permissions::from_mode(0o770))?;
|
||||
|
||||
Ok(())
|
||||
|
@ -153,7 +153,7 @@ pub fn generate_desktop_file(
|
||||
|
||||
let mime_type = (!mime_type.is_empty()).then_some(mime_type.join(";"));
|
||||
|
||||
let bin_name_exec = if bin_name.contains(" ") {
|
||||
let bin_name_exec = if bin_name.contains(' ') {
|
||||
format!("\"{bin_name}\"")
|
||||
} else {
|
||||
bin_name.to_string()
|
||||
|
@ -52,7 +52,7 @@ colored = "2"
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
serde_json = { version = "1", features = ["preserve_order"] }
|
||||
notify = "7"
|
||||
notify-debouncer-mini = "0.5"
|
||||
notify-debouncer-full = "0.4"
|
||||
shared_child = "1"
|
||||
duct = "0.13"
|
||||
toml_edit = { version = "0.22", features = ["serde"] }
|
||||
|
@ -87,7 +87,7 @@ pub fn command(mut options: Options, verbosity: u8) -> Result<()> {
|
||||
|
||||
let bin_path = interface.build(interface_options)?;
|
||||
|
||||
log::info!(action ="Built"; "application at: {}", tauri_utils::display_path(&bin_path));
|
||||
log::info!(action ="Built"; "application at: {}", tauri_utils::display_path(bin_path));
|
||||
|
||||
let app_settings = interface.app_settings();
|
||||
|
||||
|
@ -162,11 +162,10 @@ fn watch<F: Fn() + Send + 'static>(dir: PathBuf, handler: F) {
|
||||
thread::spawn(move || {
|
||||
let (tx, rx) = std::sync::mpsc::channel();
|
||||
|
||||
let mut watcher = notify_debouncer_mini::new_debouncer(Duration::from_secs(1), tx)
|
||||
let mut watcher = notify_debouncer_full::new_debouncer(Duration::from_secs(1), None, tx)
|
||||
.expect("failed to start builtin server fs watcher");
|
||||
|
||||
watcher
|
||||
.watcher()
|
||||
.watch(&dir, notify::RecursiveMode::Recursive)
|
||||
.expect("builtin server failed to watch dir");
|
||||
|
||||
|
@ -18,7 +18,7 @@ use anyhow::Context;
|
||||
use glob::glob;
|
||||
use ignore::gitignore::{Gitignore, GitignoreBuilder};
|
||||
use notify::RecursiveMode;
|
||||
use notify_debouncer_mini::new_debouncer;
|
||||
use notify_debouncer_full::new_debouncer;
|
||||
use serde::{Deserialize, Deserializer};
|
||||
use tauri_bundler::{
|
||||
AppCategory, AppImageSettings, BundleBinary, BundleSettings, DebianSettings, DmgSettings,
|
||||
@ -124,15 +124,13 @@ impl Interface for Rust {
|
||||
fn new(config: &Config, target: Option<String>) -> crate::Result<Self> {
|
||||
let manifest = {
|
||||
let (tx, rx) = sync_channel(1);
|
||||
let mut watcher = new_debouncer(Duration::from_secs(1), move |r| {
|
||||
let mut watcher = new_debouncer(Duration::from_secs(1), None, move |r| {
|
||||
if let Ok(events) = r {
|
||||
let _ = tx.send(events);
|
||||
}
|
||||
})
|
||||
.unwrap();
|
||||
watcher
|
||||
.watcher()
|
||||
.watch(&tauri_dir().join("Cargo.toml"), RecursiveMode::Recursive)?;
|
||||
watcher.watch(tauri_dir().join("Cargo.toml"), RecursiveMode::Recursive)?;
|
||||
let (manifest, _modified) = rewrite_manifest(config)?;
|
||||
let now = Instant::now();
|
||||
let timeout = Duration::from_secs(2);
|
||||
@ -527,7 +525,7 @@ impl Rust {
|
||||
.expect("watch_folders should not be empty");
|
||||
let ignore_matcher = build_ignore_matcher(&common_ancestor);
|
||||
|
||||
let mut watcher = new_debouncer(Duration::from_secs(1), move |r| {
|
||||
let mut watcher = new_debouncer(Duration::from_secs(1), None, move |r| {
|
||||
if let Ok(events) = r {
|
||||
tx.send(events).unwrap()
|
||||
}
|
||||
@ -539,7 +537,7 @@ impl Rust {
|
||||
lookup(&path, |file_type, p| {
|
||||
if p != path {
|
||||
log::debug!("Watching {} for changes...", display_path(&p));
|
||||
let _ = watcher.watcher().watch(
|
||||
let _ = watcher.watch(
|
||||
&p,
|
||||
if file_type.is_dir() {
|
||||
RecursiveMode::Recursive
|
||||
@ -555,42 +553,43 @@ impl Rust {
|
||||
loop {
|
||||
if let Ok(events) = rx.recv() {
|
||||
for event in events {
|
||||
let event_path = event.path;
|
||||
#[cfg(target_os = "linux")]
|
||||
if event.kind.is_access() {
|
||||
continue;
|
||||
}
|
||||
|
||||
if !ignore_matcher.is_ignore(&event_path, event_path.is_dir()) {
|
||||
if is_configuration_file(self.app_settings.target, &event_path) {
|
||||
if let Ok(config) = reload_config(config.as_ref()) {
|
||||
let (manifest, modified) =
|
||||
rewrite_manifest(config.lock().unwrap().as_ref().unwrap())?;
|
||||
if modified {
|
||||
*self.app_settings.manifest.lock().unwrap() = manifest;
|
||||
// no need to run the watcher logic, the manifest was modified
|
||||
// and it will trigger the watcher again
|
||||
continue;
|
||||
if let Some(event_path) = event.paths.first() {
|
||||
if !ignore_matcher.is_ignore(event_path, event_path.is_dir()) {
|
||||
if is_configuration_file(self.app_settings.target, event_path) {
|
||||
if let Ok(config) = reload_config(config.as_ref()) {
|
||||
let (manifest, modified) =
|
||||
rewrite_manifest(config.lock().unwrap().as_ref().unwrap())?;
|
||||
if modified {
|
||||
*self.app_settings.manifest.lock().unwrap() = manifest;
|
||||
// no need to run the watcher logic, the manifest was modified
|
||||
// and it will trigger the watcher again
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
log::info!(
|
||||
"File {} changed. Rebuilding application...",
|
||||
display_path(
|
||||
event_path
|
||||
.strip_prefix(frontend_path)
|
||||
.unwrap_or(&event_path)
|
||||
)
|
||||
);
|
||||
log::info!(
|
||||
"File {} changed. Rebuilding application...",
|
||||
display_path(event_path.strip_prefix(frontend_path).unwrap_or(event_path))
|
||||
);
|
||||
|
||||
let mut p = process.lock().unwrap();
|
||||
p.kill().with_context(|| "failed to kill app process")?;
|
||||
let mut p = process.lock().unwrap();
|
||||
p.kill().with_context(|| "failed to kill app process")?;
|
||||
|
||||
// wait for the process to exit
|
||||
// note that on mobile, kill() already waits for the process to exit (duct implementation)
|
||||
loop {
|
||||
if !matches!(p.try_wait(), Ok(None)) {
|
||||
break;
|
||||
// wait for the process to exit
|
||||
// note that on mobile, kill() already waits for the process to exit (duct implementation)
|
||||
loop {
|
||||
if !matches!(p.try_wait(), Ok(None)) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
*p = run(self)?;
|
||||
}
|
||||
*p = run(self)?;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -478,7 +478,7 @@ fn rustc_version() -> (u32, u32) {
|
||||
.split(' ')
|
||||
.nth(1)
|
||||
.unwrap_or_default()
|
||||
.split(".")
|
||||
.split('.')
|
||||
.take(2)
|
||||
.flat_map(|p| p.parse::<u32>().ok())
|
||||
.collect::<Vec<_>>();
|
||||
|
@ -2682,7 +2682,7 @@ impl<T: UserEvent> Runtime<T> for Wry<T> {
|
||||
pending,
|
||||
)?;
|
||||
|
||||
#[allow(clippy::manual_inspect)]
|
||||
#[allow(unknown_lints, clippy::manual_inspect)]
|
||||
self
|
||||
.context
|
||||
.main_thread
|
||||
@ -3311,7 +3311,7 @@ fn handle_user_message<T: UserEvent>(
|
||||
let _ = webview.print();
|
||||
}
|
||||
WebviewMessage::Close => {
|
||||
#[allow(clippy::manual_inspect)]
|
||||
#[allow(unknown_lints, clippy::manual_inspect)]
|
||||
windows.0.borrow_mut().get_mut(&window_id).map(|window| {
|
||||
if let Some(i) = window.webviews.iter().position(|w| w.id == webview.id) {
|
||||
window.webviews.remove(i);
|
||||
@ -3535,7 +3535,7 @@ fn handle_user_message<T: UserEvent>(
|
||||
if let Some(window) = window {
|
||||
match handler(&window) {
|
||||
Ok(webview) => {
|
||||
#[allow(clippy::manual_inspect)]
|
||||
#[allow(unknown_lints, clippy::manual_inspect)]
|
||||
windows.0.borrow_mut().get_mut(&window_id).map(|w| {
|
||||
w.webviews.push(webview);
|
||||
w.has_children.store(true, Ordering::Relaxed);
|
||||
|
@ -396,6 +396,7 @@ mod tests {
|
||||
assert_eq!(resource_dir, path.parent().unwrap());
|
||||
|
||||
let path = PathBuf::from("/path/to/target/unknown-profile/app");
|
||||
#[allow(clippy::needless_borrows_for_generic_args)]
|
||||
let resource_dir = super::resource_dir_from(&path, &package_info, &env);
|
||||
#[cfg(target_os = "macos")]
|
||||
assert!(resource_dir.is_err());
|
||||
|
@ -428,7 +428,7 @@ permissions = [{}]
|
||||
.join(",")
|
||||
);
|
||||
|
||||
write_if_changed(&default_toml, toml_content)
|
||||
write_if_changed(default_toml, toml_content)
|
||||
.unwrap_or_else(|_| panic!("unable to autogenerate core:default set"));
|
||||
|
||||
let _ = tauri_utils::acl::build::define_permissions(
|
||||
|
@ -35,7 +35,7 @@ fn handle_file_associations(app: AppHandle, files: Vec<PathBuf>) {
|
||||
let files = files
|
||||
.into_iter()
|
||||
.map(|f| {
|
||||
let file = f.to_string_lossy().replace("\\", "\\\\"); // escape backslash
|
||||
let file = f.to_string_lossy().replace('\\', "\\\\"); // escape backslash
|
||||
format!("\"{file}\"",) // wrap in quotes for JS array
|
||||
})
|
||||
.collect::<Vec<_>>()
|
||||
@ -59,7 +59,7 @@ fn main() {
|
||||
// files may aslo be passed as `file://path/to/file`
|
||||
for maybe_file in std::env::args().skip(1) {
|
||||
// skip flags like -f or --flag
|
||||
if maybe_file.starts_with("-") {
|
||||
if maybe_file.starts_with('-') {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user