mirrors/Authenticator
1
0
Fork 0
mirror of https://gitlab.gnome.org/World/Authenticator.git synced 2025-03-04 00:34:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

utils: Add a spawn helper

Browse source
This commit is contained in:
Bilal Elmoussaoui 2023-04-11 22:51:55 +02:00
parent be3e550565
commit f652ef0e31
6 changed files with 33 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/application.rs
View file

@ -16,7 +16,7 @@ use crate::{
keyring, start as start_search_provider, Account, OTPUri, Provider, ProvidersModel, keyring, start as start_search_provider, Account, OTPUri, Provider, ProvidersModel,
SearchProviderAction, FAVICONS_PATH, RUNTIME, SECRET_SERVICE, SETTINGS, SearchProviderAction, FAVICONS_PATH, RUNTIME, SECRET_SERVICE, SETTINGS,
}, },
utils::spawn_tokio_blocking, utils::{spawn, spawn_tokio_blocking},
widgets::{PreferencesWindow, ProvidersDialog, Window}, widgets::{PreferencesWindow, ProvidersDialog, Window},
}; };
@ -179,8 +179,7 @@ mod imp {
}), }),
); );
let ctx = glib::MainContext::default(); spawn(clone!(@strong app => async move {
ctx.spawn_local(clone!(@strong app => async move {
app.start_search_provider().await; app.start_search_provider().await;
})); }));
} }

10
src/utils.rs
View file

@ -27,3 +27,13 @@ where
}); });
receiver.await.unwrap() receiver.await.unwrap()
} }
pub fn spawn<F>(fut: F)
where
F: std::future::Future + 'static,
{
let ctx = gtk::glib::MainContext::default();
ctx.spawn_local(async move {
fut.await;
});
}

13
src/widgets/preferences/password_page.rs
View file

@ -8,7 +8,12 @@ use gtk::{
subclass::prelude::*, subclass::prelude::*,
}; };
use crate::{config, models::keyring, utils::spawn_tokio, widgets::ErrorRevealer}; use crate::{
config,
models::keyring,
utils::{spawn, spawn_tokio},
widgets::ErrorRevealer,
};
mod imp { mod imp {
use glib::subclass::InitializingObject; use glib::subclass::InitializingObject;
@ -138,16 +143,14 @@ impl PasswordPage {
let actions = self.actions(); let actions = self.actions();
let save_password = gio::ActionEntry::builder("save_password") let save_password = gio::ActionEntry::builder("save_password")
.activate(clone!(@weak self as page => move |_, _, _| { .activate(clone!(@weak self as page => move |_, _, _| {
let ctx = glib::MainContext::default(); spawn(clone!(@weak page => async move {
ctx.spawn_local(clone!(@weak page => async move {
page.save().await; page.save().await;
})); }));
})) }))
.build(); .build();
let reset_password = gio::ActionEntry::builder("reset_password") let reset_password = gio::ActionEntry::builder("reset_password")
.activate(clone!(@weak self as page => move |_, _, _| { .activate(clone!(@weak self as page => move |_, _, _| {
let ctx = glib::MainContext::default(); spawn(clone!(@weak page => async move {
ctx.spawn_local(clone!(@weak page => async move {
page.reset_password().await; page.reset_password().await;
})); }));
})) }))

16
src/widgets/preferences/window.rs
View file

@ -15,6 +15,7 @@ use crate::{
Operation, Restorable, RestorableItem, Operation, Restorable, RestorableItem,
}, },
models::{ProvidersModel, SETTINGS}, models::{ProvidersModel, SETTINGS},
utils::spawn,
widgets::screenshot, widgets::screenshot,
}; };
@ -243,8 +244,7 @@ impl PreferencesWindow {
let action = gio::ActionEntry::builder(T::IDENTIFIER) let action = gio::ActionEntry::builder(T::IDENTIFIER)
.activate(clone!(@weak self as win => move |_, _,_| { .activate(clone!(@weak self as win => move |_, _,_| {
let ctx = glib::MainContext::default(); spawn(clone!(@weak win => async move {
ctx.spawn_local(clone!(@weak win => async move {
if let Err(err) = win.backup_into_file::<T>(filters).await { if let Err(err) = win.backup_into_file::<T>(filters).await {
tracing::error!("Failed to backup into a file {err}"); tracing::error!("Failed to backup into a file {err}");
win.add_toast(adw::Toast::new(&gettext("Failed to create a backup"))); win.add_toast(adw::Toast::new(&gettext("Failed to create a backup")));
@ -360,8 +360,7 @@ impl PreferencesWindow {
let camera_action = gio::ActionEntry::builder(&format!("{}.camera", T::IDENTIFIER)) let camera_action = gio::ActionEntry::builder(&format!("{}.camera", T::IDENTIFIER))
.activate(clone!(@weak self as win=> move |_, _, _| { .activate(clone!(@weak self as win=> move |_, _, _| {
win.imp().actions.activate_action("show_camera_page", None); win.imp().actions.activate_action("show_camera_page", None);
let ctx = glib::MainContext::default(); spawn(clone!(@weak win => async move {
ctx.spawn_local(clone!(@weak win => async move {
if let Err(err) = win.restore_from_camera::<T, T::Item>().await { if let Err(err) = win.restore_from_camera::<T, T::Item>().await {
tracing::error!("Failed to restore from camera {err}"); tracing::error!("Failed to restore from camera {err}");
win.add_toast(adw::Toast::new(&gettext("Failed to restore from camera"))); win.add_toast(adw::Toast::new(&gettext("Failed to restore from camera")));
@ -372,8 +371,7 @@ impl PreferencesWindow {
let screenshot_action = let screenshot_action =
gio::ActionEntry::builder(&format!("{}.screenshot", T::IDENTIFIER)) gio::ActionEntry::builder(&format!("{}.screenshot", T::IDENTIFIER))
.activate(clone!(@weak self as win => move |_, _, _| { .activate(clone!(@weak self as win => move |_, _, _| {
let ctx = glib::MainContext::default(); spawn(clone!(@weak win => async move {
ctx.spawn_local(clone!(@weak win => async move {
if let Err(err) = win.restore_from_screenshot::<T, T::Item>().await { if let Err(err) = win.restore_from_screenshot::<T, T::Item>().await {
tracing::error!("Failed to restore from a screenshot {err}"); tracing::error!("Failed to restore from a screenshot {err}");
win.add_toast(adw::Toast::new(&gettext("Failed to restore from a screenshot"))); win.add_toast(adw::Toast::new(&gettext("Failed to restore from a screenshot")));
@ -383,8 +381,7 @@ impl PreferencesWindow {
.build(); .build();
let file_action = gio::ActionEntry::builder(&format!("{}.file", T::IDENTIFIER)) let file_action = gio::ActionEntry::builder(&format!("{}.file", T::IDENTIFIER))
.activate(clone!(@weak self as win => move |_, _, _| { .activate(clone!(@weak self as win => move |_, _, _| {
let ctx = glib::MainContext::default(); spawn(clone!(@weak win => async move {
ctx.spawn_local(clone!(@weak win => async move {
if let Err(err) = win.restore_from_image::<T, T::Item>().await { if let Err(err) = win.restore_from_image::<T, T::Item>().await {
tracing::error!("Failed to restore from an image {err}"); tracing::error!("Failed to restore from an image {err}");
win.add_toast(adw::Toast::new(&gettext("Failed to restore from an image"))); win.add_toast(adw::Toast::new(&gettext("Failed to restore from an image")));
@ -397,8 +394,7 @@ impl PreferencesWindow {
} else { } else {
let action = gio::ActionEntry::builder(T::IDENTIFIER) let action = gio::ActionEntry::builder(T::IDENTIFIER)
.activate(clone!(@weak self as win => move |_, _, _| { .activate(clone!(@weak self as win => move |_, _, _| {
let ctx = glib::MainContext::default(); spawn(clone!(@weak win => async move {
ctx.spawn_local(clone!(@weak win => async move {
if let Err(err) = win.restore_from_file::<T, T::Item>(filters).await { if let Err(err) = win.restore_from_file::<T, T::Item>(filters).await {
tracing::error!("Failed to restore from a file {err}"); tracing::error!("Failed to restore from a file {err}");
win.add_toast(adw::Toast::new(&gettext("Failed to restore from a file"))); win.add_toast(adw::Toast::new(&gettext("Failed to restore from a file")));

7
src/widgets/providers/image.rs
View file

@ -5,7 +5,10 @@ use gtk::{
subclass::prelude::*, subclass::prelude::*,
}; };
use crate::models::{Provider, FAVICONS_PATH, RUNTIME, SETTINGS}; use crate::{
models::{Provider, FAVICONS_PATH, RUNTIME, SETTINGS},
utils::spawn,
};
pub enum ImageAction { pub enum ImageAction {
Ready(String), Ready(String),
@ -194,7 +197,7 @@ impl ProviderImage {
let join_handle = RUNTIME.spawn(future); let join_handle = RUNTIME.spawn(future);
imp.join_handle.borrow_mut().replace(join_handle); imp.join_handle.borrow_mut().replace(join_handle);
glib::MainContext::default().spawn_local(clone!(@weak self as this => async move { spawn(clone!(@weak self as this => async move {
let imp = this.imp(); let imp = this.imp();
imp.was_downloaded.set(true); imp.was_downloaded.set(true);
match receiver.await { match receiver.await {

4
src/widgets/url_row.rs
View file

@ -10,6 +10,7 @@ mod imp {
use adw::subclass::prelude::*; use adw::subclass::prelude::*;
use super::*; use super::*;
use crate::utils::spawn;
#[derive(Default, glib::Properties)] #[derive(Default, glib::Properties)]
#[properties(wrapper_type = super::UrlRow)] #[properties(wrapper_type = super::UrlRow)]
@ -44,8 +45,7 @@ mod imp {
let gesture = gtk::GestureClick::new(); let gesture = gtk::GestureClick::new();
gesture.connect_pressed(clone!(@weak obj as row => move |_,_,_,_| { gesture.connect_pressed(clone!(@weak obj as row => move |_,_,_,_| {
if let Some(uri) = row.imp().uri.borrow().clone() { if let Some(uri) = row.imp().uri.borrow().clone() {
let ctx = glib::MainContext::default(); spawn(async move {
ctx.spawn_local(async move {
let file = gio::File::for_uri(&uri); let file = gio::File::for_uri(&uri);
let launcher = gtk::FileLauncher::new(Some(&file)); let launcher = gtk::FileLauncher::new(Some(&file));
if let Err(err) = launcher.launch_future(gtk::Window::NONE).await { if let Err(err) = launcher.launch_future(gtk::Window::NONE).await {