feat: use try_get_item() method

mrjackwills · Jul 29, 2023 · 171dca8 · 171dca8
1 parent 06a831f
commit 171dca8
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 36 deletions.
diff --git a/src-tauri/src/internal_message_handler/mod.rs b/src-tauri/src/internal_message_handler/mod.rs
@@ -163,9 +163,9 @@ fn update_menu_session_number(
         window
             .app_handle()
             .tray_handle()
-            .get_item(MenuItem::Session.get_id())
-            .set_title(state.lock().get_sessions_before_long_title())
-            .ok();
+            .try_get_item(MenuItem::Session.get_id()).and_then(|item|
+            item.set_title(state.lock().get_sessions_before_long_title())
+            .ok());
     };
     sx.send(InternalMessage::Emit(Emitter::SessionsBeforeLong))
         .ok();
@@ -181,9 +181,9 @@ fn update_menu_next_break(
         window
             .app_handle()
             .tray_handle()
-            .get_item(MenuItem::Next.get_id())
-            .set_title(state.lock().get_next_break_title())
-            .ok();
+            .try_get_item(MenuItem::Next.get_id()).and_then(|item|
+            item.set_title(state.lock().get_next_break_title())
+            .ok());
     }
     sx.send(InternalMessage::Emit(Emitter::NextBreak)).ok();
 }
@@ -201,21 +201,21 @@ fn update_menu_pause(app: &AppHandle, state: &Arc<Mutex<ApplicationState>>) {
         window
             .app_handle()
             .tray_handle()
-            .get_item(MenuItem::Next.get_id())
-            .set_enabled(!paused)
-            .ok();
+            .try_get_item(MenuItem::Next.get_id()).and_then(|item|
+            item.set_enabled(!paused)
+            .ok());
         window
             .app_handle()
             .tray_handle()
-            .get_item(MenuItem::Session.get_id())
-            .set_enabled(!paused)
-            .ok();
+            .try_get_item(MenuItem::Session.get_id()).and_then(|item|
+            item.set_enabled(!paused)
+            .ok());
         window
             .app_handle()
             .tray_handle()
-            .get_item(MenuItem::Pause.get_id())
-            .set_title(title)
-            .ok();
+            .try_get_item(MenuItem::Pause.get_id()).and_then(|item|
+           item .set_title(title)
+            .ok());
     }
 }
 
@@ -265,11 +265,11 @@ async fn handle_settings(
             }
         }
         SettingChange::Reset => {
-			{
-				let sqlite = state.lock().sqlite.clone();
-				let settings = ModelSettings::reset_settings(&sqlite).await?;
-				state.lock().reset_settings(settings);
-			}
+            {
+                let sqlite = state.lock().sqlite.clone();
+                let settings = ModelSettings::reset_settings(&sqlite).await?;
+                state.lock().reset_settings(settings);
+            }
             reset_timer(state);
             sx.send(InternalMessage::Emit(Emitter::Settings)).ok();
             sx.send(InternalMessage::Emit(Emitter::Paused)).ok();
@@ -283,10 +283,10 @@ async fn handle_settings(
         }
         SettingChange::SessionLength(value) => {
             if value != settings.session_as_sec {
-				{
-					let sqlite = state.lock().sqlite.clone();
-					ModelSettings::update_session(&sqlite, value).await?;
-				}
+                {
+                    let sqlite = state.lock().sqlite.clone();
+                    ModelSettings::update_session(&sqlite, value).await?;
+                }
                 state.lock().set_session_as_sec(value);
                 reset_timer(state);
             }

diff --git a/src-tauri/src/system_tray/mod.rs b/src-tauri/src/system_tray/mod.rs
@@ -40,14 +40,14 @@ impl MenuItem {
 
 pub fn menu_enabled(app: &tauri::AppHandle, enable: bool) {
     if !enable {
-        if let Some(window) = app.get_window(ObliqoroWindow::Main.as_str()) {
-            window
-                .app_handle()
-                .tray_handle()
-                .get_item(MenuItem::Next.get_id())
-                .set_title("on a break")
-                .ok();
-        }
+        app.get_window(ObliqoroWindow::Main.as_str())
+            .and_then(|window| {
+                window
+                    .app_handle()
+                    .tray_handle()
+                    .try_get_item(MenuItem::Next.get_id())
+                    .and_then(|item| item.set_title("on a break").ok())
+            });
     }
 
     for i in [
@@ -57,10 +57,10 @@ pub fn menu_enabled(app: &tauri::AppHandle, enable: bool) {
         MenuItem::Next,
         MenuItem::Session,
     ] {
-        app.tray_handle()
-            .get_item(i.get_id())
-            .set_enabled(enable)
-            .ok();
+        app.app_handle()
+            .tray_handle()
+            .try_get_item(i.get_id())
+            .and_then(|item| item.set_enabled(enable).ok());
     }
 }