gui: split host:port pasted into address field
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
+37
-2
@@ -16,6 +16,15 @@ fn address_is_valid(addr: &str) -> bool {
|
|||||||
!addr.is_empty() && !addr.contains(':')
|
!addr.is_empty() && !addr.contains(':')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn split_host_port(input: &str) -> (String, Option<String>) {
|
||||||
|
if let Some((host, port)) = input.rsplit_once(':') {
|
||||||
|
if !port.is_empty() && port.chars().all(|c| c.is_ascii_digit()) {
|
||||||
|
return (host.to_string(), Some(port.to_string()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
(input.to_string(), None)
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, PartialEq, Eq)]
|
#[derive(Clone, Copy, PartialEq, Eq)]
|
||||||
pub enum UserIcon {
|
pub enum UserIcon {
|
||||||
Normal,
|
Normal,
|
||||||
@@ -830,6 +839,7 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
|||||||
.unwrap_or_default()
|
.unwrap_or_default()
|
||||||
});
|
});
|
||||||
let mut password = use_signal(|| String::new());
|
let mut password = use_signal(|| String::new());
|
||||||
|
let mut address_paste_pending = use_signal(|| false);
|
||||||
let mut submit_attempted = use_signal(|| false);
|
let mut submit_attempted = use_signal(|| false);
|
||||||
|
|
||||||
let do_save = move |_| {
|
let do_save = move |_| {
|
||||||
@@ -897,7 +907,19 @@ fn AddServerModal(on_save: EventHandler<ServerEntry>, on_cancel: EventHandler<()
|
|||||||
placeholder: "mumble.example.com",
|
placeholder: "mumble.example.com",
|
||||||
pattern: ADDRESS_PATTERN,
|
pattern: ADDRESS_PATTERN,
|
||||||
value: "{address.read()}",
|
value: "{address.read()}",
|
||||||
oninput: move |evt| address.set(evt.value().clone()),
|
onpaste: move |_| address_paste_pending.set(true),
|
||||||
|
oninput: move |evt| {
|
||||||
|
if address_paste_pending() {
|
||||||
|
address_paste_pending.set(false);
|
||||||
|
let (host, maybe_port) = split_host_port(&evt.value());
|
||||||
|
address.set(host);
|
||||||
|
if let Some(p) = maybe_port {
|
||||||
|
port.set(p);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
address.set(evt.value());
|
||||||
|
}
|
||||||
|
},
|
||||||
required: true,
|
required: true,
|
||||||
}
|
}
|
||||||
div {
|
div {
|
||||||
@@ -975,6 +997,7 @@ fn EditServerModal(
|
|||||||
let mut port = use_signal(|| entry.port.to_string());
|
let mut port = use_signal(|| entry.port.to_string());
|
||||||
let mut username = use_signal(|| entry.username.clone());
|
let mut username = use_signal(|| entry.username.clone());
|
||||||
let mut password = use_signal(|| entry.password.clone().unwrap_or_default());
|
let mut password = use_signal(|| entry.password.clone().unwrap_or_default());
|
||||||
|
let mut address_paste_pending = use_signal(|| false);
|
||||||
|
|
||||||
let do_save = move |_| {
|
let do_save = move |_| {
|
||||||
let port_num: u16 = port.read().parse().unwrap_or(64738);
|
let port_num: u16 = port.read().parse().unwrap_or(64738);
|
||||||
@@ -1025,7 +1048,19 @@ fn EditServerModal(
|
|||||||
placeholder: "mumble.example.com",
|
placeholder: "mumble.example.com",
|
||||||
pattern: ADDRESS_PATTERN,
|
pattern: ADDRESS_PATTERN,
|
||||||
value: "{address.read()}",
|
value: "{address.read()}",
|
||||||
oninput: move |evt| address.set(evt.value().clone()),
|
onpaste: move |_| address_paste_pending.set(true),
|
||||||
|
oninput: move |evt| {
|
||||||
|
if address_paste_pending() {
|
||||||
|
address_paste_pending.set(false);
|
||||||
|
let (host, maybe_port) = split_host_port(&evt.value());
|
||||||
|
address.set(host);
|
||||||
|
if let Some(p) = maybe_port {
|
||||||
|
port.set(p);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
address.set(evt.value());
|
||||||
|
}
|
||||||
|
},
|
||||||
required: true,
|
required: true,
|
||||||
}
|
}
|
||||||
div {
|
div {
|
||||||
|
|||||||
Reference in New Issue
Block a user