handle some remaining cases in output conversion, including u64

Author: devyn

src/client.rs

@@ -79,6 +79,6 @@ impl DbusClient {
         let resp = self.conn.send_with_reply_and_block(message, self.config.timeout.item)
             .map_err(|err| error!(err.to_string()))?;
 
-        Ok(crate::convert::from_message(&resp)?)
+        crate::convert::from_message(&resp).map_err(|err| error!(err))
     }
 }

src/convert.rs

@@ -1,19 +1,16 @@
 use dbus::{Message, arg::{ArgType, RefArg}};
-use nu_plugin::LabeledError;
 use nu_protocol::{Value, Span, Record};
 
-pub fn from_message(message: &Message) -> Result<Value, LabeledError> {
+pub fn from_message(message: &Message) -> Result<Value, String> {
     let mut out = vec![];
     for refarg in message.iter_init() {
-        if let Some(o) = from_refarg(&refarg) {
-            out.push(o);
-        }
+        out.push(from_refarg(&refarg)?);
     }
     Ok(Value::list(out, Span::unknown()))
 }
 
-pub fn from_refarg(refarg: &dyn RefArg) -> Option<Value> {
-    Some(match refarg.arg_type() {
+pub fn from_refarg(refarg: &dyn RefArg) -> Result<Value, String> {
+    Ok(match refarg.arg_type() {
         ArgType::Array => {
             if refarg.signature().starts_with("a{") {
                 // This is a dictionary
@@ -52,6 +49,10 @@ pub fn from_refarg(refarg: &dyn RefArg) -> Option<Value> {
         ArgType::Byte | ArgType::Int16 | ArgType::UInt16 | ArgType::Int32 |
         ArgType::UInt32 | ArgType::Int64 | ArgType::UnixFd =>
             Value::int(refarg.as_i64().unwrap(), Span::unknown()),
+
+        // Nushell doesn't support u64, so present it as a string
+        ArgType::UInt64 => Value::string(refarg.as_u64().unwrap().to_string(), Span::unknown()),
+
         // Floats
         ArgType::Double =>
             Value::float(refarg.as_f64().unwrap(), Span::unknown()),
@@ -61,10 +62,9 @@ pub fn from_refarg(refarg: &dyn RefArg) -> Option<Value> {
                 refarg.as_iter().unwrap().map(from_refarg).flatten().collect(),
                 Span::unknown()),
 
-        ArgType::DictEntry => todo!(),
-        ArgType::UInt64 => todo!(), // nushell only supports up to i64
-
-        // End of iterator
-        ArgType::Invalid => return None,
+        ArgType::DictEntry =>
+            return Err("Encountered dictionary entry outside of dictionary".into()),
+        ArgType::Invalid =>
+            return Err("Encountered invalid D-Bus value".into()),
     })
 }