Merge branch 'review/pr5' into release/0.6.0

# Conflicts:
#	src-tauri/src/lib.rs
This commit is contained in:
Дмитрий committed 2026-10-03 22:45:53 +05:00
commit 79d293e120
3 files changed
+52

No files matched your search

+6
View File
@@ -88,10 +88,16 @@ pub struct Tailscale {
pub connected: bool,
}
#[cfg(windows)]
fn tailscale_exe() -> Option<PathBuf> {
["C:/Program Files/Tailscale/tailscale.exe", "C:/Program Files (x86)/Tailscale/tailscale.exe"].iter().map(PathBuf::from).find(|p| p.is_file())
}
#[cfg(not(windows))]
fn tailscale_exe() -> Option<PathBuf> {
["/usr/bin/tailscale", "/usr/local/bin/tailscale", "/usr/sbin/tailscale"].iter().map(PathBuf::from).find(|p| p.is_file())
}
pub fn parse_tailscale_ip(out: &str) -> Option<String> {
out.lines().map(str::trim).find(|l| l.parse::<Ipv4Addr>().map(is_cgnat_range).unwrap_or(false)).map(str::to_string)
}