Add custom mount options

Co-authored-by: moson-mo <[email protected]>
moson-mo · Jan 24, 2024 · 6a486aa · 6a486aa
1 parent 59402e0
commit 6a486aa
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 3 deletions.
diff --git a/resources/ui/VaultWindow.ui b/resources/ui/VaultWindow.ui
@@ -250,6 +250,28 @@
                 <property name="top-attach">4</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="halign">start</property>
+                <property name="label" translatable="yes">Custom mount options</property>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">5</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="entry_custom_options">
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+              </object>
+              <packing>
+                <property name="left-attach">1</property>
+                <property name="top-attach">5</property>
+              </packing>
+            </child>
             <child>
               <placeholder/>
             </child>

diff --git a/src/Gocrypt.vala b/src/Gocrypt.vala
@@ -27,7 +27,7 @@ namespace Cryptor {
             }
         }
 
-        public static void mount_vault (string path, string mountpoint, string password, bool ro, bool reverse) throws Error {
+        public static void mount_vault (string path, string mountpoint, string password, bool ro, bool reverse, string custom_options) throws Error {
             string standard_error;
             int status;
 
@@ -39,6 +39,9 @@ namespace Cryptor {
             if (reverse) {
                 cmd += "-reverse ";
             }
+            if (custom_options != "") {
+                cmd += custom_options + " ";
+            }
             cmd += " -passfile " + pfile.get_path () + " -- " + path + " " + mountpoint;
             try {
                 Process.spawn_command_line_sync (cmd, null, out standard_error, out status);

diff --git a/src/data/Vault.vala b/src/data/Vault.vala
@@ -5,6 +5,7 @@ namespace Cryptor.Data {
         public string mount_point { get; set; }
         public string mode { get; set; }
         public bool reverse { get; set; }
+        public string custom_options { get; set; default = ""; }
         public bool is_mounted;
     }
 }
diff --git a/src/ui/CryptorWindow.vala b/src/ui/CryptorWindow.vala
@@ -240,15 +240,15 @@ namespace Cryptor.UI {
                     return;
                 }
                 try {
-                    Gocrypt.mount_vault (vault.path, vault.mount_point, password, (vault.mode == "r"), vault.reverse);
+                    Gocrypt.mount_vault (vault.path, vault.mount_point, password, (vault.mode == "r"), vault.reverse, vault.custom_options);
                     vault.is_mounted = true;
                     sync_treeview_from_conf ();
                 } catch (Error e) {
                     if (e.message.contains ("fusermount exited with code 256")) {
                         if (Utils.show_question (this, "%s\n\n%s\n%s".printf (e.message, _("Vault might be mounted already."), _("Shall I retry unmounting it first?"))) == ResponseType.YES) {
                             try {
                                 Gocrypt.unmount_vault (vault.mount_point);
-                                Gocrypt.mount_vault (vault.path, vault.mount_point, password, (vault.mode == "r"), vault.reverse);
+                                Gocrypt.mount_vault (vault.path, vault.mount_point, password, (vault.mode == "r"), vault.reverse, vault.custom_options);
                                 vault.is_mounted = true;
                                 sync_treeview_from_conf ();
                             } catch (Error e) {

diff --git a/src/ui/VaultWindow.vala b/src/ui/VaultWindow.vala
@@ -25,6 +25,9 @@ namespace Cryptor.UI {
         [GtkChild]
         private unowned CheckButton check_reverse;
 
+        [GtkChild]
+        private unowned Entry entry_custom_options;
+
         public VaultWindow (Window parent, int row, Config config) {
             Object (
                 transient_for: parent
@@ -38,6 +41,7 @@ namespace Cryptor.UI {
                 entry_vault.text = v.path;
                 entry_mountpoint.text = v.mount_point;
                 combo_mode.active_id = v.mode;
+                entry_custom_options.text = v.custom_options;
             }
             if (row == -1) {
                 this.title = _("New vault");
@@ -157,6 +161,7 @@ namespace Cryptor.UI {
             v.mount_point = entry_mountpoint.text;
             v.mode = combo_mode.active_id;
             v.reverse = check_reverse.active;
+            v.custom_options = entry_custom_options.text;
 
             config.changes_made = true;