f-denkena/rclone-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for windows prompt, #99

Browse Source 
Signed-off-by: FTCHD <144691102+FTCHD@users.noreply.github.com>
This commit is contained in:
FTCHD
2025-12-13 19:52:13 +07:00
parent 7a62659323
commit a059ea4db3
1 changed files with 20 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src-tauri/src/lib.rs
+20 -135
View File
@@ -383,145 +383,12 @@ async fn prompt_text(
return Ok(None);
}
#[cfg(target_os = "linux")]
{
let default_value = default.unwrap_or_default();
let is_sensitive = sensitive.unwrap_or(false);
if is_sensitive {
// Try zenity password dialog first
match std::process::Command::new("zenity")
.args(&["--password", "--title", &title, "--text", &message])
.output()
{
Ok(output) => {
if output.status.success() {
let result = String::from_utf8_lossy(&output.stdout).trim().to_string();
return Ok(Some(result));
} else {
// Check if user cancelled (exit code 1) or other error
let exit_code = output.status.code().unwrap_or(-1);
if exit_code == 1 {
// User clicked Cancel
return Ok(None);
}
// For other errors, fall through to try kdialog
let stderr = String::from_utf8_lossy(&output.stderr);
eprintln!(
"zenity password dialog failed (exit {}): {}",
exit_code, stderr
);
}
}
Err(e) => {
// Command not found or couldn't execute, try kdialog
eprintln!("zenity not available: {}", e);
}
}
// Fallback to kdialog password
match std::process::Command::new("kdialog")
.args(&["--password", &message, "--title", &title])
.output()
{
Ok(output) => {
if output.status.success() {
let result = String::from_utf8_lossy(&output.stdout).trim().to_string();
return Ok(Some(result));
} else {
let exit_code = output.status.code().unwrap_or(-1);
if exit_code == 1 {
// User clicked Cancel
return Ok(None);
}
let stderr = String::from_utf8_lossy(&output.stderr);
eprintln!(
"kdialog password dialog failed (exit {}): {}",
exit_code, stderr
);
}
}
Err(e) => {
eprintln!("kdialog not available: {}", e);
}
}
return Err(
"No suitable password dialog found. Please install zenity or kdialog.".to_string(),
);
} else {
// Try zenity text entry first
match std::process::Command::new("zenity")
.args(&[
"--entry",
"--title",
&title,
"--text",
&message,
"--entry-text",
&default_value,
])
.output()
{
Ok(output) => {
if output.status.success() {
let result = String::from_utf8_lossy(&output.stdout).trim().to_string();
return Ok(Some(result));
} else {
let exit_code = output.status.code().unwrap_or(-1);
if exit_code == 1 {
// User clicked Cancel
return Ok(None);
}
let stderr = String::from_utf8_lossy(&output.stderr);
eprintln!(
"zenity entry dialog failed (exit {}): {}",
exit_code, stderr
);
}
}
Err(e) => {
eprintln!("zenity not available: {}", e);
}
}
// Fallback to kdialog input box
match std::process::Command::new("kdialog")
.args(&["--inputbox", &message, &default_value, "--title", &title])
.output()
{
Ok(output) => {
if output.status.success() {
let result = String::from_utf8_lossy(&output.stdout).trim().to_string();
return Ok(Some(result));
} else {
let exit_code = output.status.code().unwrap_or(-1);
if exit_code == 1 {
// User clicked Cancel
return Ok(None);
}
let stderr = String::from_utf8_lossy(&output.stderr);
eprintln!("kdialog inputbox failed (exit {}): {}", exit_code, stderr);
}
}
Err(e) => {
eprintln!("kdialog not available: {}", e);
}
}
return Err(
"No suitable input dialog found. Please install zenity or kdialog.".to_string(),
);
}
}
#[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "linux")))]
#[cfg(not(any(target_os = "macos", target_os = "windows")))]
{
Err("Text input not supported on this platform".to_string())
}
}
#[tauri::command]
async fn tiny_prompt_text(
title: String,
message: String,
@@ -546,6 +413,24 @@ async fn tiny_prompt_text(
Ok(result)
}
#[tauri::command]
async fn prompt(
title: String,
message: String,
default: Option<String>,
sensitive: Option<bool>,
) -> Result<Option<String>, String> {
#[cfg(any(target_os = "macos", target_os = "windows"))]
{
prompt_text(title, message, default, sensitive).await
}
#[cfg(not(any(target_os = "macos", target_os = "windows")))]
{
tiny_prompt_text(title, message, default, sensitive).await
}
}
#[tauri::command]
async fn test_proxy_connection(proxy_url: String) -> Result<String, String> {
use std::time::Duration;
@@ -767,7 +652,7 @@ pub fn run() {
get_uid,
is_rclone_running,
stop_rclone_processes,
tiny_prompt_text,
prompt,
stop_pid,
update_toolbar_shortcut,
show_toolbar,