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

src/system/config_client.rs

@@ -29,6 +29,7 @@ extern crate rand;
 use crate::config::serializer::ConfigSerializer;
 use crate::config::{SerializerError, SerializerErrorKind, UserConfig};
 use crate::filetransfer::FileTransferProtocol;
+use crate::fs::explorer::GroupDirs;
 // Ext
 use std::fs::{create_dir, remove_file, File, OpenOptions};
 use std::io::Write;
@@ -123,6 +124,45 @@ impl ConfigClient {
         self.config.user_interface.default_protocol = proto.to_string();
     }
 
+    /// ### get_show_hidden_files
+    ///
+    /// Get value of `show_hidden_files`
+    pub fn get_show_hidden_files(&self) -> bool {
+        self.config.user_interface.show_hidden_files
+    }
+
+    /// ### set_show_hidden_files
+    ///
+    /// Set new value for `show_hidden_files`
+    pub fn set_show_hidden_files(&mut self, value: bool) {
+        self.config.user_interface.show_hidden_files = value;
+    }
+
+    /// ### get_group_dirs
+    ///
+    /// Get GroupDirs value from configuration (will be converted from string)
+    pub fn get_group_dirs(&self) -> Option<GroupDirs> {
+        // Convert string to `GroupDirs`
+        match &self.config.user_interface.group_dirs {
+            None => None,
+            Some(val) => match GroupDirs::from_str(val.as_str()) {
+                Ok(val) => Some(val),
+                Err(_) => None,
+            },
+        }
+    }
+
+    /// ### set_group_dirs
+    ///
+    /// Set value for group_dir in configuration.
+    /// Provided value, if `Some` will be converted to `GroupDirs`
+    pub fn set_group_dirs(&mut self, val: Option<GroupDirs>) {
+        self.config.user_interface.group_dirs = match val {
+            None => None,
+            Some(val) => Some(val.to_string()),
+        };
+    }
+
     // SSH Keys
 
     /// ### save_ssh_key
@@ -387,6 +427,30 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_system_config_show_hidden_files() {
+        let tmp_dir: tempfile::TempDir = create_tmp_dir();
+        let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
+        let mut client: ConfigClient = ConfigClient::new(cfg_path.as_path(), key_path.as_path())
+            .ok()
+            .unwrap();
+        client.set_show_hidden_files(true);
+        assert_eq!(client.get_show_hidden_files(), true);
+    }
+
+    #[test]
+    fn test_system_config_group_dirs() {
+        let tmp_dir: tempfile::TempDir = create_tmp_dir();
+        let (cfg_path, key_path): (PathBuf, PathBuf) = get_paths(tmp_dir.path());
+        let mut client: ConfigClient = ConfigClient::new(cfg_path.as_path(), key_path.as_path())
+            .ok()
+            .unwrap();
+        client.set_group_dirs(Some(GroupDirs::First));
+        assert_eq!(client.get_group_dirs(), Some(GroupDirs::First),);
+        client.set_group_dirs(None);
+        assert_eq!(client.get_group_dirs(), None,);
+    }
+
     #[test]
     fn test_system_config_ssh_keys() {
         let tmp_dir: tempfile::TempDir = create_tmp_dir();