New --add-storage-directory and --add-server options

* New --add-storage-directory and --add-server options, which can be used
  to make keysafe backup/restore using additional locations.
* Removed --store-local option; use --add-storage-directory instead.

This commit was sponsored by Thomas Hochstein on Patreon.

1 files changed, 7 insertions, 1 deletions

diff --git a/keysafe.hs b/keysafe.hs
index 11f52dc..4c93251 100644
--- a/keysafe.hs
+++ b/keysafe.hs
@@ -360,7 +360,13 @@ userName = do
 	return $ Name $ BU8.fromString $ takeWhile (/= ',') (userGecos u)
 
 cmdLineStorageLocations :: CmdLine.CmdLine -> IO StorageLocations
-cmdLineStorageLocations = networkStorageLocations . CmdLine.localstoragedirectory
+cmdLineStorageLocations cmdline = 
+	shuffleStorageLocations (preflocs <> netlocs)
+  where
+	netlocs = networkStorageLocations lsd
+	preflocs = StorageLocations $
+		map (\mk -> mk lsd) (CmdLine.preferredStorage cmdline)
+	lsd = CmdLine.localstoragedirectory cmdline
 
 getPasswordEntropy :: Password -> Name -> IO (Entropy UnknownPassword)
 getPasswordEntropy password name = do