show_hidden_files and group_dirs in termscp configuration; instantiate FileExplorer based on current configuration in FileTransferActivity

src/config/mod.rs

@@ -54,6 +54,8 @@ pub struct UserConfig {
 pub struct UserInterfaceConfig {
     pub text_editor: PathBuf,
     pub default_protocol: String,
+    pub show_hidden_files: bool,
+    pub group_dirs: Option<String>,
 }
 
 #[derive(Deserialize, Serialize, std::fmt::Debug)]
@@ -81,6 +83,8 @@ impl Default for UserInterfaceConfig {
                 Err(_) => PathBuf::from("nano"), // Default to nano
             },
             default_protocol: FileTransferProtocol::Sftp.to_string(),
+            show_hidden_files: false,
+            group_dirs: None,
         }
     }
 }
@@ -165,14 +169,15 @@ mod tests {
         let ui: UserInterfaceConfig = UserInterfaceConfig {
             default_protocol: String::from("SFTP"),
             text_editor: PathBuf::from("nano"),
+            show_hidden_files: true,
+            group_dirs: Some(String::from("first")),
         };
         let cfg: UserConfig = UserConfig {
             user_interface: ui,
             remote: remote,
         };
         assert_eq!(
-            *cfg
-                .remote
+            *cfg.remote
                 .ssh_keys
                 .get(&String::from("192.168.1.31"))
                 .unwrap(),
@@ -180,6 +185,8 @@ mod tests {
         );
         assert_eq!(cfg.user_interface.default_protocol, String::from("SFTP"));
         assert_eq!(cfg.user_interface.text_editor, PathBuf::from("nano"));
+        assert_eq!(cfg.user_interface.show_hidden_files, true);
+        assert_eq!(cfg.user_interface.group_dirs, Some(String::from("first")));
     }
 
     #[test]

src/config/serializer.rs

@@ -106,6 +106,43 @@ mod tests {
         // Verify ui
         assert_eq!(cfg.user_interface.default_protocol, String::from("SCP"));
         assert_eq!(cfg.user_interface.text_editor, PathBuf::from("vim"));
+        assert_eq!(cfg.user_interface.show_hidden_files, true);
+        assert_eq!(cfg.user_interface.group_dirs, Some(String::from("last")));
+        // Verify keys
+        assert_eq!(
+            *cfg.remote
+                .ssh_keys
+                .get(&String::from("192.168.1.31"))
+                .unwrap(),
+            PathBuf::from("/home/omar/.ssh/raspberry.key")
+        );
+        assert_eq!(
+            *cfg.remote
+                .ssh_keys
+                .get(&String::from("192.168.1.32"))
+                .unwrap(),
+            PathBuf::from("/home/omar/.ssh/beaglebone.key")
+        );
+        assert!(cfg.remote.ssh_keys.get(&String::from("1.1.1.1")).is_none());
+    }
+
+    #[test]
+    fn test_config_serializer_deserialize_ok_no_opts() {
+        let toml_file: tempfile::NamedTempFile = create_good_toml_no_opts();
+        toml_file.as_file().sync_all().unwrap();
+        toml_file.as_file().seek(SeekFrom::Start(0)).unwrap();
+        // Parse
+        let deserializer: ConfigSerializer = ConfigSerializer {};
+        let cfg = deserializer.deserialize(Box::new(toml_file));
+        println!("{:?}", cfg);
+        assert!(cfg.is_ok());
+        let cfg: UserConfig = cfg.ok().unwrap();
+        // Verify configuration
+        // Verify ui
+        assert_eq!(cfg.user_interface.default_protocol, String::from("SCP"));
+        assert_eq!(cfg.user_interface.text_editor, PathBuf::from("vim"));
+        assert_eq!(cfg.user_interface.show_hidden_files, true);
+        assert_eq!(cfg.user_interface.group_dirs, None);
         // Verify keys
         assert_eq!(
             *cfg.remote
@@ -160,6 +197,25 @@ mod tests {
         [user_interface]
         default_protocol = "SCP"
         text_editor = "vim"
+        show_hidden_files = true
+        group_dirs = "last"
+
+        [remote.ssh_keys]
+        "192.168.1.31" = "/home/omar/.ssh/raspberry.key"
+        "192.168.1.32" = "/home/omar/.ssh/beaglebone.key"
+        "#;
+        tmpfile.write_all(file_content.as_bytes()).unwrap();
+        tmpfile
+    }
+
+    fn create_good_toml_no_opts() -> tempfile::NamedTempFile {
+        // Write
+        let mut tmpfile: tempfile::NamedTempFile = tempfile::NamedTempFile::new().unwrap();
+        let file_content: &str = r#"
+        [user_interface]
+        default_protocol = "SCP"
+        text_editor = "vim"
+        show_hidden_files = true
 
         [remote.ssh_keys]
         "192.168.1.31" = "/home/omar/.ssh/raspberry.key"