From d1e4287745e3419ac1d967fb06e577002e9d7a2d Mon Sep 17 00:00:00 2001
From: Jonathan Lamothe <jlamothe1980@gmail.com>
Date: Sat, 29 Dec 2018 14:01:32 -0500
Subject: [PATCH] determine database path
---
app/Main.hs | 30 +++++++++++++++++++++++++++---
app/Types.hs | 3 ++-
2 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/app/Main.hs b/app/Main.hs
index c592bf2..cd87653 100644
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -24,7 +24,9 @@ module Main where
import Control.Monad (mapM_)
import Control.Monad.Trans.State as S
-import System.Console.HCL (Request, reqIO, runRequest)
+import Data.Maybe (maybe)
+import System.Console.HCL (Request, reqFail, reqIO, runRequest)
+import System.Environment (lookupEnv)
import System.Random (getStdGen)
import Password
@@ -38,8 +40,30 @@ main = runRequest setup >>= mapM_ (S.evalStateT mainMenu)
setup :: Request Status
setup = do
- g <- reqIO getStdGen
+ g <- reqIO getStdGen
mp <- getMasterPass
- return $ Status g mp newPWDatabase
+ p <- getDBPath
+ return $ Status g mp p newPWDatabase
+
+getDBPath :: Request FilePath
+getDBPath = reqIO (lookupEnv "HOME") >>= maybe
+ (do
+ reqIO $ putStrLn "ERROR: can't find home directory"
+ reqFail)
+ (\home -> case pathDelim home of
+ Nothing -> do
+ reqIO $ putStrLn "ERROR: unsupported home path"
+ reqFail
+ Just delim -> return $ home ++
+ (if last home == delim then "" else [delim]) ++
+ ".passman.json")
+
+pathDelim :: FilePath -> Maybe Char
+pathDelim = foldr
+ (\x a -> case x of
+ '/' -> Just '/'
+ '\\' -> Just '\\'
+ _ -> a)
+ Nothing
--jl
diff --git a/app/Types.hs b/app/Types.hs
index c27e253..2aaa1a8 100644
--- a/app/Types.hs
+++ b/app/Types.hs
@@ -22,7 +22,7 @@ License along with this program. If not, see
{-# LANGUAGE TemplateHaskell #-}
-module Types (Status (Status), gen, masterPass, database) where
+module Types (Status (Status), gen, dbPath, masterPass, database) where
import Control.Lens (makeLenses, set, (^.))
import System.Random (RandomGen (next, split), StdGen)
@@ -32,6 +32,7 @@ import Password
data Status = Status
{ _gen :: StdGen
, _masterPass :: String
+ , _dbPath :: FilePath
, _database :: PWDatabase
}