Handle some unwrap calls

Author: nozwock

src/ext.rs

@@ -0,0 +1,14 @@
+use rqs_lib::channel::{Message, MessageClient};
+
+pub trait MessageExt {
+    fn as_client_unchecked(&self) -> &MessageClient;
+}
+
+impl MessageExt for Message {
+    fn as_client_unchecked(&self) -> &MessageClient {
+        match self {
+            Message::Client(message_client) => message_client,
+            _ => panic!("Failed to cast Message to MessageClient"),
+        }
+    }
+}

src/main.rs

@@ -2,6 +2,7 @@ mod application;
 #[rustfmt::skip]
 mod config;
 mod constants;
+mod ext;
 mod monitors;
 mod objects;
 mod plugins;

src/objects/send_transfer.rs

@@ -7,7 +7,7 @@ use rqs_lib::hdl::{
     info::{TransferPayload, TransferPayloadKind},
 };
 
-use crate::{impl_deref_for_newtype, utils};
+use crate::{ext::MessageExt, impl_deref_for_newtype, utils};
 
 #[derive(Debug, Clone, Default, glib::Boxed)]
 #[boxed_type(name = "StateBoxed")]
@@ -39,8 +39,7 @@ impl_deref_for_newtype!(ChannelMessage, rqs_lib::channel::ChannelMessage);
 impl ChannelMessage {
     pub fn device_name(&self) -> String {
         self.msg
-            .as_client()
-            .unwrap()
+            .as_client_unchecked()
             .metadata
             .as_ref()
             .and_then(|meta| meta.source.as_ref())
@@ -50,8 +49,7 @@ impl ChannelMessage {
 
     pub fn files(&self) -> Option<&Vec<String>> {
         self.msg
-            .as_client()
-            .unwrap()
+            .as_client_unchecked()
             .metadata
             .as_ref()
             .and_then(|it| match &it.payload {
@@ -62,17 +60,15 @@ impl ChannelMessage {
 
     pub fn text_preview(&self) -> Option<String> {
         self.msg
-            .as_client()
-            .unwrap()
+            .as_client_unchecked()
             .metadata
             .as_ref()
             .and_then(|meta| meta.payload_preview.clone())
     }
 
     pub fn is_text_type(&self) -> bool {
         self.msg
-            .as_client()
-            .unwrap()
+            .as_client_unchecked()
             .metadata
             .as_ref()
             .map(|meta| match meta.payload_kind {
@@ -86,8 +82,7 @@ impl ChannelMessage {
 
     pub fn transferred_text_data(&self) -> Option<(String, TextPayloadType)> {
         self.msg
-            .as_client()
-            .unwrap()
+            .as_client_unchecked()
             .metadata
             .as_ref()
             .and_then(|meta| match &meta.payload {

src/utils.rs

@@ -124,10 +124,10 @@ pub fn remove_notification(id: String) {
 }
 
 pub fn strip_user_home_prefix<P: AsRef<Path>>(path: P) -> PathBuf {
-    if let Some(home) = dirs::home_dir() {
-        if path.as_ref().starts_with(&home) {
-            return PathBuf::from("~").join(path.as_ref().strip_prefix(&home).unwrap());
-        }
+    if let Some(home) = dirs::home_dir()
+        && let Ok(stripped) = path.as_ref().strip_prefix(&home)
+    {
+        return PathBuf::from("~").join(stripped);
     }
 
     path.as_ref().into()

src/widgets/file_card.rs

@@ -100,7 +100,12 @@ pub fn create_file_card(
     root_box.append(&file_avatar);
 
     let filename_label = gtk::Label::builder()
-        .label(model_item.basename().unwrap().to_string_lossy())
+        .label(
+            model_item
+                .basename()
+                .expect("Derived GFile from uri/path should be valid")
+                .to_string_lossy(),
+        )
         .xalign(0.)
         .hexpand(true)
         .wrap(true)

src/widgets/receive_transfer.rs

@@ -13,6 +13,7 @@ use rqs_lib::hdl::TextPayloadType;
 use tokio_util::sync::CancellationToken;
 
 use crate::{
+    ext::MessageExt,
     objects::{self, UserAction},
     utils::{remove_notification, spawn_notification},
     window::PacketApplicationWindow,
@@ -55,7 +56,10 @@ pub fn present_receive_transfer_ui(
     notification_id: String,
     auto_decline_ctk: CancellationToken,
 ) {
-    let init_id = receive_state.event().unwrap().id.clone();
+    let event = receive_state
+        .event()
+        .expect("ReceiveTransferState.event must be set");
+    let init_id = event.id.clone();
     let win = win.clone();
 
     // Progress dialog
@@ -94,7 +98,7 @@ pub fn present_receive_transfer_ui(
         .build();
     progress_stack.add_named(&progress_files_box, Some("progress_files"));
 
-    let device_name = receive_state.event().unwrap().device_name();
+    let device_name = event.device_name();
     let device_name_box = create_device_name_box(&device_name);
     device_name_box.set_margin_bottom(4);
     progress_files_box.append(&device_name_box);
@@ -169,7 +173,9 @@ pub fn present_receive_transfer_ui(
                 auto_decline_ctk.cancel();
             }
 
-            let event = receive_state.event().unwrap();
+            let event = receive_state
+                .event()
+                .expect("ReceiveTransferState.event must be set");
             match receive_state.user_action() {
                 Some(UserAction::ConsentAccept) => {
                     consent_dialog.close();
@@ -257,8 +263,9 @@ pub fn present_receive_transfer_ui(
         move |receive_state| {
             use rqs_lib::TransferState;
 
-            let event_msg = receive_state.event().expect("Property setter isn't nullable");
-            let client_msg = event_msg.msg.as_client().unwrap();
+            let event_msg = receive_state.event().expect("ReceiveTransferState.event must be set");
+            let client_msg = event_msg.msg.as_client_unchecked();
+            let metadata = client_msg.metadata.as_ref().unwrap();
 
             match client_msg.state.clone().unwrap_or(TransferState::Initial) {
                 TransferState::Initial => {}
@@ -295,7 +302,7 @@ pub fn present_receive_transfer_ui(
                     let device_name_box = create_device_name_box(&device_name);
                     info_box.append(&device_name_box);
 
-                    let total_bytes = client_msg.metadata.as_ref().unwrap().total_bytes;
+                    let total_bytes = metadata.total_bytes;
                     let transfer_size = human_bytes::human_bytes(total_bytes as f64);
 
                     if let Some(files) = event_msg.files() {
@@ -346,10 +353,9 @@ pub fn present_receive_transfer_ui(
                                 client_msg
                                     .metadata
                                     .as_ref()
-                                    .unwrap()
-                                    .pin_code
-                                    .clone()
-                                    .unwrap_or_default()
+                                    .map(|it| it.pin_code.as_ref().map(|it| it.as_str()))
+                                    .flatten()
+                                    .unwrap_or("???")
                             )
                             .unwrap_or_else(|_| "badly formatted locale string".into()),
                         )
@@ -462,7 +468,7 @@ pub fn present_receive_transfer_ui(
 
                     // TODO: show a progress dialog for both but with a delay?
                     // Create Progress bar dialog
-                    let total_bytes = client_msg.metadata.as_ref().unwrap().total_bytes;
+                    let total_bytes = metadata.total_bytes;
                     receive_state
                         .imp()
                         .eta

src/widgets/recipient_card.rs

@@ -1,4 +1,5 @@
 use crate::{
+    ext::MessageExt,
     objects::{self, TransferState, send_transfer::SendRequestState},
     tokio_runtime,
     window::PacketApplicationWindow,
@@ -11,7 +12,7 @@ use gettextrs::{gettext, ngettext};
 use gtk::{gio, glib, glib::clone};
 use rqs_lib::channel::{ChannelMessage, MessageClient};
 
-fn get_model_item_from_listbox<T>(
+fn get_model_item_from_listbox_row<T>(
     model: &gio::ListStore,
     list_box: &gtk::ListBox,
     row: &gtk::ListBoxRow,
@@ -44,7 +45,7 @@ where
 {
     let mut pos = 0;
     while let Some(x) = model.item(pos) {
-        if x.downcast_ref::<T>().unwrap() == model_item {
+        if x.downcast_ref::<T>()? == model_item {
             break;
         }
         pos = pos + 1;
@@ -61,8 +62,8 @@ pub fn handle_recipient_card_clicked(
     let imp = win.imp();
 
     let model_item =
-        get_model_item_from_listbox::<SendRequestState>(&imp.recipient_model, list_box, row)
-            .unwrap();
+        get_model_item_from_listbox_row::<SendRequestState>(&imp.recipient_model, list_box, row)
+            .expect("Index should be valid since model and ListBox are related");
 
     emit_send_files(win, &model_item);
 
@@ -91,15 +92,19 @@ fn emit_send_files(win: &PacketApplicationWindow, model_item: &SendRequestState)
         model_item.set_transfer_state(TransferState::Queued);
     }
 
-    tokio_runtime().spawn(clone!(
+    glib::spawn_future_local(clone!(
         #[weak(rename_to = file_sender)]
         imp.file_sender,
+        // #[weak]
+        // model_item,
         async move {
+            // FIXME: Set Failed state on Err and update UI on Failed state change
+            // model_item.set_transfer_state(TransferState::Failed);
             file_sender
                 .lock()
                 .await
                 .as_mut()
-                .unwrap()
+                .expect("RQS .file_sender must be set")
                 .send(rqs_lib::SendInfo {
                     id: endpoint_info.id.clone(),
                     name: endpoint_info
@@ -401,7 +406,7 @@ pub fn create_recipient_card(
             let eta_estimator = model_item.imp().eta.as_ref();
 
             if let Some(event_msg) = model_item.event() {
-                let client_msg = event_msg.msg.as_client().unwrap();
+                let client_msg = event_msg.msg.as_client_unchecked();
                 let state = client_msg.state.as_ref().unwrap_or(&RqsState::Initial);
 
                 match state {
@@ -444,10 +449,9 @@ pub fn create_recipient_card(
                                 client_msg
                                     .metadata
                                     .as_ref()
-                                    .unwrap()
-                                    .pin_code
-                                    .clone()
-                                    .unwrap()
+                                    .map(|it| it.pin_code.as_ref().map(|it| it.as_str()))
+                                    .flatten()
+                                    .unwrap_or("???")
                             )
                             .unwrap_or_else(|_| "badly formatted locale string".into()),
                         );

src/window.rs

@@ -19,6 +19,7 @@ use tokio_util::sync::CancellationToken;
 use crate::application::PacketApplication;
 use crate::config::{APP_ID, PROFILE};
 use crate::constants::packet_log_path;
+use crate::ext::MessageExt;
 use crate::objects::{self, SendRequestState};
 use crate::objects::{TransferState, UserAction};
 use crate::plugins::{FileBasedPlugin, NautilusPlugin, Plugin};
@@ -49,7 +50,7 @@ mod imp {
 
     use tokio::sync::Mutex;
 
-    use crate::utils::remove_notification;
+    use crate::{ext::MessageExt, utils::remove_notification};
 
     use super::*;
 
@@ -247,8 +248,7 @@ mod imp {
                     .event()
                     .unwrap()
                     .msg
-                    .as_client()
-                    .expect("Cached TransferMessage is only of type User")
+                    .as_client_unchecked()
                     .state
                     .as_ref()
                     .unwrap_or(&TransferState::Initial)
@@ -1784,8 +1784,7 @@ impl PacketApplicationWindow {
                 .event()
                 .unwrap()
                 .msg
-                .as_client()
-                .unwrap()
+                .as_client_unchecked()
                 .state
                 .as_ref()
                 .unwrap_or(&rqs_lib::TransferState::Initial)
@@ -2139,7 +2138,7 @@ impl PacketApplicationWindow {
                         tracing::debug!(event = ?channel_message, "Received event on UI thread");
 
                         let id = &channel_message.id;
-                        let client_msg = channel_message.msg.as_client().unwrap();
+                        let client_msg = channel_message.msg.as_client_unchecked();
 
                         use rqs_lib::TransferState;
                         match client_msg