update locations.json and sshfs_mounter.py

talosh · Jan 4, 2023 · f28a453 · f28a453
1 parent 0057b45
commit f28a453
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/config/locations.json b/config/locations.json
@@ -1,8 +1,8 @@
 [
     {
         "user@machine": "dladmin@10.1.16.30",
-        "remote_folders": ["/Volumes/"],
-        "local_folders": ["/Volumes/", "/vol/flux1-images/solaar/"],
+        "remote_locations": {"/Volumes/": "hiupizda"},
+        "local_locations": ["/Volumes/", "/vol/flux1-images/solaar/"],
         "identity_file": "/etc/ssh/ssh_host_rsa_key",
         "exclude_folders": [
             "Macintosh HD",

diff --git a/sshfs_mounter.py b/sshfs_mounter.py
@@ -66,7 +66,15 @@ def get_config_data(config_folder_path):
                 if "IdentityFile" not in mount_options:
                     mount_options += ',IdentityFile=' + identity_file
                     print (mount_options)
-
+            remote_locations = location.get('remote_locations')
+            if not remote_locations:
+                remote_locations = []
+            elif isinstance(remote_locations, str):
+                remote_locations = [remote_locations]
+            elif not isinstance(remote_locations, list):
+                print ('remote locations should be list but found %s' % type(location))
+                remote_locations = []
+
             args = ['ssh']
             if identity_file:
                 args.append('-i')