secstate/Notify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check errors in add_subscription_dialog

Browse Source
This commit is contained in:
ranfdev
2023-10-24 12:35:57 +02:00
parent d2af2712da
commit a88308d67a
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ntfy-daemon/src/models.rs
View File

@ -14,7 +14,7 @@ fn emoji_map() -> &'static HashMap<String, String> {
}) })
} }
fn validate_topic(topic: &str) -> Result<&str, Error> { pub fn validate_topic(topic: &str) -> Result<&str, Error> {
let re = Regex::new(r"^\w+$").unwrap(); let re = Regex::new(r"^\w+$").unwrap();
if re.is_match(topic) { if re.is_match(topic) {
Ok(topic) Ok(topic)

28
src/widgets/add_subscription_dialog.rs
View File

@ -6,6 +6,7 @@ use glib::once_cell::sync::Lazy;
use glib::subclass::Signal; use glib::subclass::Signal;
use gtk::gio; use gtk::gio;
use gtk::glib; use gtk::glib;
use ntfy_daemon::models;
mod imp { mod imp {
pub use super::*; pub use super::*;
@ -13,6 +14,7 @@ mod imp {
pub struct AddSubscriptionDialog { pub struct AddSubscriptionDialog {
pub topic_entry: RefCell<adw::EntryRow>, pub topic_entry: RefCell<adw::EntryRow>,
pub server_entry: RefCell<adw::EntryRow>, pub server_entry: RefCell<adw::EntryRow>,
pub sub_btn: RefCell<gtk::Button>,
} }
#[glib::object_subclass] #[glib::object_subclass]
@ -119,7 +121,7 @@ impl AddSubscriptionDialog {
} }
} }
}, },
append = &gtk::Button { append: sub_btn = &gtk::Button {
set_label: "Subscribe", set_label: "Subscribe",
add_css_class: "suggested-action", add_css_class: "suggested-action",
add_css_class: "pill", add_css_class: "pill",
@ -134,8 +136,20 @@ impl AddSubscriptionDialog {
}, },
} }
let (tx, rx) = glib::MainContext::channel(Default::default());
let txc = tx.clone();
topic_entry.delegate().unwrap().connect_changed(move |_| {
txc.send(()).unwrap();
});
let rx = crate::async_utils::debounce_channel(std::time::Duration::from_millis(500), rx);
let objc = obj.clone();
rx.attach(None, move |_| {
objc.check_errors();
glib::ControlFlow::Continue
});
imp.topic_entry.replace(topic_entry); imp.topic_entry.replace(topic_entry);
imp.server_entry.replace(server_entry); imp.server_entry.replace(server_entry);
imp.sub_btn.replace(sub_btn);
obj.set_content(Some(&toolbar_view)); obj.set_content(Some(&toolbar_view));
} }
@ -145,6 +159,18 @@ impl AddSubscriptionDialog {
pub fn server(&self) -> String { pub fn server(&self) -> String {
self.imp().server_entry.borrow().text().to_string() self.imp().server_entry.borrow().text().to_string()
} }
fn check_errors(&self) {
let imp = self.imp();
let topic_entry = imp.topic_entry.borrow().clone();
let sub_btn = imp.sub_btn.borrow().clone();
if let Err(_) = models::validate_topic(&topic_entry.delegate().unwrap().text()) {
topic_entry.add_css_class("error");
sub_btn.set_sensitive(false);
} else {
topic_entry.remove_css_class("error");
sub_btn.set_sensitive(true);
}
}
fn emit_subscribe_request(&self) { fn emit_subscribe_request(&self) {
self.emit_by_name::<()>("subscribe-request", &[]); self.emit_by_name::<()>("subscribe-request", &[]);
} }