cleanup generic open function

bingus/src/lib.rs

@@ -40,25 +40,27 @@ pub mod dynamic {
 
     pub fn open<P: AsRef<Path>>(path: P) -> Result<Option<DynamicBendable>, OpenError> {
         use MatcherType::*;
-        if let Some(matcher) = infer::get_from_path(&path)?.map(|t| t.matcher_type()) {
+        infer::get_from_path(&path)?
-            Ok(Some(match matcher {
+            .map(|t| t.matcher_type())
-                Image => DynamicBendable::Image(img::open(path)?),
+            .map(|matcher| -> Result<Option<DynamicBendable>, OpenError> {
-                App | Archive => DynamicBendable::Binary({
+                Ok(match matcher {
+                    Image => Some(DynamicBendable::Image(img::open(path)?)),
+                    App | Archive => Some(DynamicBendable::Binary({
                         let mut buf = Vec::new();
                         File::open(path)?.read_to_end(&mut buf)?;
                         buf
-                }),
+                    })),
                     Audio => todo!(),
                     Book => todo!(),
                     Doc => todo!(),
                     Font => todo!(),
                     Text => todo!(),
                     Video => todo!(),
-                Custom => unimplemented!("I don't even know what this is!"),
+                    Custom => None,
-            }))
+                })
-        } else {
+            })
-            Ok(None)
+            .transpose()
-        }
+            .map(|opt| -> Option<DynamicBendable> { opt? })
     }
 }