Fix: prevent opening unknown extension & broken links to crash app.

2 files changed, 21 insertions, 7 deletions

diff --git a/src/fileinfo.rs b/src/fileinfo.rs
index 650c369..0ddc4f9 100644
--- a/src/fileinfo.rs
+++ b/src/fileinfo.rs
@@ -120,7 +120,7 @@ impl FileKind {
 /// We read and keep tracks every displayable information about
 /// a file.
 /// Like in [exa](https://github.com/ogham/exa) we don't display the group.
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct FileInfo {
     /// Full path of the file
     pub path: path::PathBuf,
@@ -371,14 +371,21 @@ impl PathContent {
     }
 
     pub fn is_selected_dir(&self) -> FmResult<bool> {
-        if let FileKind::Directory = self
+        match self
             .selected_file()
             .ok_or_else(|| FmError::new("Empty directory"))?
             .file_kind
         {
-            Ok(true)
-        } else {
-            Ok(false)
+            FileKind::Directory => Ok(true),
+            FileKind::SymbolicLink => {
+                let dest = self
+                    .selected_file()
+                    .ok_or_else(|| FmError::new("unreachable"))?
+                    .read_dest()
+                    .unwrap_or_default();
+                Ok(path::PathBuf::from(dest).is_dir())
+            }
+            _ => Ok(false),
         }
     }
 
diff --git a/src/tab.rs b/src/tab.rs
index 72ac742..5acccfd 100644
--- a/src/tab.rs
+++ b/src/tab.rs
@@ -381,13 +381,20 @@ impl Tab {
     }
 
     pub fn event_open_file(&mut self) -> FmResult<()> {
-        self.opener.open(
+        match self.opener.open(
             self.path_content
                 .selected_file()
                 .ok_or_else(|| FmError::new("Empty directory"))?
                 .path
                 .clone(),
-        )?;
+        ) {
+            Ok(_) => (),
+            Err(e) => eprint!(
+                "Error opening {:?}: {:?}",
+                self.path_content.selected_file(),
+                e
+            ),
+        }
         Ok(())
     }