Merge pull request #611 from jonathandturner/autoview_plugin

Protect autoview against missing plugins

src/commands/autoview.rs

@@ -43,17 +43,36 @@ pub fn autoview(
                 ..
             } = input[0usize]
             {
-                let binary = context.expect_command("binaryview");
+                let binary = context.get_command("binaryview");
-                let result = binary.run(raw.with_input(input), &context.commands);
+                if let Some(binary) = binary {
-                result.collect::<Vec<_>>().await;
+                    let result = binary.run(raw.with_input(input), &context.commands);
+                    result.collect::<Vec<_>>().await;
+                } else {
+                    for i in input {
+                        match i.item {
+                            Value::Binary(b) => {
+                                use pretty_hex::*;
+                                println!("{:?}", b.hex_dump());
+                            }
+                            _ => {}
+                        }
+                    }
+                };
             } else if is_single_text_value(&input) {
-                let text = context.expect_command("textview");
+                let text = context.get_command("textview");
-                let result = text.run(raw.with_input(input), &context.commands);
+                if let Some(text) = text {
-                result.collect::<Vec<_>>().await;
+                    let result = text.run(raw.with_input(input), &context.commands);
-            } else if equal_shapes(&input) {
+                    result.collect::<Vec<_>>().await;
-                let table = context.expect_command("table");
+                } else {
-                let result = table.run(raw.with_input(input), &context.commands);
+                    for i in input {
-                result.collect::<Vec<_>>().await;
+                        match i.item {
+                            Value::Primitive(Primitive::String(s)) => {
+                                println!("{}", s);
+                            }
+                            _ => {}
+                        }
+                    }
+                }
             } else {
                 let table = context.expect_command("table");
                 let result = table.run(raw.with_input(input), &context.commands);
@@ -63,25 +82,6 @@ pub fn autoview(
     }))
 }
 
-fn equal_shapes(input: &Vec<Tagged<Value>>) -> bool {
-    let mut items = input.iter();
-
-    let item = match items.next() {
-        Some(item) => item,
-        None => return false,
-    };
-
-    let desc = item.data_descriptors();
-
-    for item in items {
-        if desc != item.data_descriptors() {
-            return false;
-        }
-    }
-
-    true
-}
-
 fn is_single_text_value(input: &Vec<Tagged<Value>>) -> bool {
     if input.len() != 1 {
         return false;

src/commands/command.rs

@@ -236,6 +236,10 @@ impl RunnableContext {
             .get_command(name)
             .expect(&format!("Expected command {}", name))
     }
+
+    pub fn get_command(&self, name: &str) -> Option<Arc<Command>> {
+        self.commands.get_command(name)
+    }
 }
 
 pub struct RunnablePerItemArgs<T> {