@@ -29,30 +29,6 @@ impl Default for FileEntry {
 
 #[allow(dead_code)]
 impl FileEntry {
-  /// create a simple FileEntry
-  fn from_path(path: PathBuf) -> Self {
-    let file_name = path.file_name().unwrap();
-    let name = match file_name.to_str() {
-      None => "".to_string(),
-      Some(na) => na.to_string(),
-    };
-    let ext = match path.extension() {
-      None => "".to_string(),
-      Some(ext) => ext.to_str().unwrap().to_string(),
-    };
-
-    let path = format!("{}", path.display());
-
-    FileEntry {
-      name,
-      ext,
-      is_dir: false,
-      path,
-      relative: "".to_string(),
-      children: vec![],
-    }
-  }
-
   pub fn new(relative: &Path ,path: &Path) -> Self {
     let mut ext = "".to_string();
     if relative.is_file() {
@@ -67,7 +43,7 @@ impl FileEntry {
     FileEntry {
       name: format!("{}", short.display()),
       ext,
-      is_dir: true,
+      is_dir: false,
       path: format!("{}", path.display()),
       relative: format!("{}", relative.display()),
       children: vec![],
@@ -169,9 +145,8 @@ impl FileEntry {
           entry.is_dir = true;
           node.children.push(entry.to_owned());
         } else {
-          // todo: add parent
-          let file = FileEntry::from_path(path);
-          node.children.push(file);
+          let file = &mut FileEntry::new(relative, &path);
+          node.children.push(file.to_owned());
         }
       }
     }