add support for multiple storage locattions

also, server upload queues in ~/.keysafe

1 files changed, 3 insertions, 6 deletions

diff --git a/CmdLine.hs b/CmdLine.hs
index 1c0abd2..a55e985 100644
--- a/CmdLine.hs
+++ b/CmdLine.hs
@@ -11,14 +11,11 @@ import qualified Gpg
 import Options.Applicative
 import qualified Data.ByteString.UTF8 as BU8
 import System.Directory
-import Storage
-import Storage.Local
-import Storage.Network
 
 data CmdLine = CmdLine
 	{ mode :: Maybe Mode
 	, secretkeysource :: Maybe SecretKeySource
-	, storage :: Storage
+	, localstorage :: Bool
 	, gui :: Bool
 	, testMode :: Bool
 	, customShardParams :: Maybe ShardParams
@@ -31,7 +28,7 @@ parse :: Parser CmdLine
 parse = CmdLine
 	<$> optional (backup <|> restore <|> benchmark)
 	<*> optional (gpgswitch <|> fileswitch)
-	<*> localstorageflag
+	<*> localstorageswitch
 	<*> guiswitch
 	<*> testmodeswitch
 	<*> optional (ShardParams <$> totalobjects <*> neededobjects)
@@ -58,7 +55,7 @@ parse = CmdLine
 		<> metavar "FILE"
 		<> help "Specify secret key file to back up or restore. (The same filename must be used to restore a key as was used to back it up.)"
 		)
-	localstorageflag = flag networkStorage localStorage
+	localstorageswitch = switch
 		( long "store-local"
 		<> help "Store data locally, in ~/.keysafe/objects. (The default is to store data in the cloud.)"
 		)