Replacing unwrap calls with if-let and removing redundant key check

Author: ellieplayswow

cosmic-settings/src/pages/system/default_apps.rs

@@ -251,17 +251,14 @@ impl Page {
                     // if we're changing terminal, we want to update the COSMIC system actions shortcut
                     // for terminal
                     if category == Category::Terminal && self.shortcuts_config.is_some() {
-                        let shortcuts = self.shortcuts_config.as_ref().unwrap();
-                        let system_actions = shortcuts.get::<SystemActions>("system_actions");
-                        match system_actions {
-                            Err(e) => {
-                                // we don't have system_actions set?
-                                println!("{}", e);
-                            }
-                            Ok(mut actions) => {
-                                // get the current terminal option, which should default to cosmic-term
-                                let current_terminal = actions.get(&System::Terminal);
-                                if current_terminal.is_some() {
+                        if let Some(shortcuts) = self.shortcuts_config.as_ref() {
+                            let system_actions = shortcuts.get::<SystemActions>("system_actions");
+                            match system_actions {
+                                Err(e) => {
+                                    // we don't have system_actions set?
+                                    println!("{}", e);
+                                }
+                                Ok(mut actions) => {
                                     let default_paths = default_paths();
                                     let mut resolved_path = None;
 
@@ -275,16 +272,17 @@ impl Page {
                                     }
 
                                     // if we find a valid .desktop file, we can grab its exec
-                                    if resolved_path.is_some() {
-                                        let desktop_entry = DesktopEntry::from_path(resolved_path.unwrap(), Some(&get_languages_from_env()));
-                                        if desktop_entry.is_ok() {
-                                            // grab the exec, add it to system_actions and commit
-                                            let exec = String::from(desktop_entry.unwrap().exec().unwrap());
-                                            actions.insert(System::Terminal, exec);
-
-                                            if let Err(e) = shortcuts.set("system_actions", actions) {
-                                                println!("{}", e);
+                                    if let Some(resolved_path) = resolved_path {
+                                        let desktop_entry = DesktopEntry::from_path(resolved_path, Some(&get_languages_from_env()));
+                                        if let Ok(desktop_entry) = desktop_entry {
+                                            if let Some(exec) = desktop_entry.exec() {
+                                                actions.insert(System::Terminal, String::from(exec));
+
+                                                if let Err(e) = shortcuts.set("system_actions", actions) {
+                                                    println!("{}", e);
+                                                }
                                             }
+
                                         }
                                     }
                                 }