@@ -4,22 +4,35 @@ package main
44
55import (
66 "fmt"
7- "strconv"
8- getopt "github.com/pborman/getopt/v2"
7+ "github.com/pythonhacker/argparse"
98 "os"
9+ "strconv"
1010)
1111
12- const VERSION = 0.2
12+ const VERSION = 0.3
1313const APP = "varuh"
14- const AUTHOR_EMAIL = "Anand B Pillai <[email protected] >" 14+
15+ const AUTHOR_INFO = `
16+ AUTHORS
17+ Copyright (C) 2021 Anand B Pillai <[email protected] > 18+ `
1519
1620type actionFunc func (string ) error
1721type actionFunc2 func (string ) (error , string )
1822type voidFunc func () error
1923
24+ // Structure to keep the options data
25+ type CmdOption struct {
26+ Short string
27+ Long string
28+ Help string
29+ Path string
30+ Default string
31+ }
32+
2033// Print the program's usage string and exit
2134func printUsage () error {
22- getopt .Usage ()
35+ // getopt.Usage()
2336 os .Exit (0 )
2437
2538 return nil
@@ -34,13 +47,13 @@ func printVersionInfo() error {
3447}
3548
3649// Command-line wrapper to generateRandomPassword
37- func generatePassword (length string ) (error , string ) {
50+ func genPass (length string ) (error , string ) {
3851 var iLength int
3952 var err error
4053 var passwd string
41-
54+
4255 iLength , _ = strconv .Atoi (length )
43- err , passwd = generateRandomPassword (iLength )
56+ err , passwd = generatePassword (iLength )
4457
4558 if err != nil {
4659 fmt .Printf ("Error generating password - \" %s\" \n " , err .Error ())
@@ -53,12 +66,12 @@ func generatePassword(length string) (error, string) {
5366 copyPasswordToClipboard (passwd )
5467 fmt .Println ("Password copied to clipboard" )
5568 }
56-
69+
5770 return nil , passwd
5871}
5972
60- // Perform an action by using the command line options map
61- func performAction (optMap map [string ]interface {}, optionMap map [ string ] interface {} ) {
73+ // // Perform an action by using the command line options map
74+ func performAction (optMap map [string ]interface {}) {
6275
6376 var flag bool
6477
@@ -84,7 +97,7 @@ func performAction(optMap map[string]interface{}, optionMap map[string]interface
8497
8598 stringActions2Map := map [string ]actionFunc2 {
8699 "decrypt" : decryptDatabase ,
87- "genpass" : generatePassword ,
100+ "genpass" : genPass ,
88101 }
89102
90103 flagsActionsMap := map [string ]voidFunc {
@@ -113,9 +126,7 @@ func performAction(optMap map[string]interface{}, optionMap map[string]interface
113126 }
114127
115128 for key , mappedFunc := range stringActionsMap {
116- option := optionMap [key ].(Option )
117-
118- if * optMap [key ].(* string ) != option .Path {
129+ if * optMap [key ].(* string ) != "" {
119130
120131 var val = * (optMap [key ].(* string ))
121132 mappedFunc (val )
@@ -129,10 +140,7 @@ func performAction(optMap map[string]interface{}, optionMap map[string]interface
129140 }
130141
131142 for key , mappedFunc := range stringActions2Map {
132- option := optionMap [key ].(Option )
133-
134- if * optMap [key ].(* string ) != option .Path {
135-
143+ if * optMap [key ].(* string ) != "" {
136144 var val = * (optMap [key ].(* string ))
137145 mappedFunc (val )
138146 break
@@ -141,19 +149,66 @@ func performAction(optMap map[string]interface{}, optionMap map[string]interface
141149
142150}
143151
152+ func initializeCmdLine (parser * argparse.Parser ) map [string ]interface {} {
153+ var optMap map [string ]interface {}
154+
155+ optMap = make (map [string ]interface {})
156+
157+ stringOptions := []CmdOption {
158+ {"I" , "init" , "Initialize a new database" , "<path>" , "" },
159+ {"d" , "decrypt" , "Decrypt password database" , "<path>" , "" },
160+ {"C" , "clone" , "Clone an entry with <id>" , "<id>" , "" },
161+ {"R" , "remove" , "Remove an entry with <id>" , "<id>" , "" },
162+ {"U" , "use-db" , "Set <path> as active database" , "<path>" , "" },
163+ {"f" , "find" , "Search entries with <term>" , "<term>" , "" },
164+ {"E" , "edit" , "Edit entry by <id>" , "<id>" , "" },
165+ {"l" , "list-entry" , "List entry by <id>" , "<id>" , "" },
166+ {"x" , "export" , "Export all entries to <filename>" , "<filename>" , "" },
167+ {"g" , "genpass" , "Generate password of given <length>" , "<length>" , "" },
168+ }
169+
170+ for _ , opt := range stringOptions {
171+ optMap [opt .Long ] = parser .String (opt .Short , opt .Long , & argparse.Options {Help : opt .Help , Path : opt .Path })
172+ }
173+
174+ boolOptions := []CmdOption {
175+ {"e" , "encrypt" , "Encrypt the current database" , "" , "" },
176+ {"A" , "add" , "Add a new entry" , "" , "" },
177+ {"p" , "path" , "Show current database path" , "" , "" },
178+ {"a" , "list-all" , "List all entries in current database" , "" , "" },
179+ {"s" , "show" , "Show passwords when listing entries" , "" , "" },
180+ {"c" , "copy" , "Copy password to clipboard" , "" , "" },
181+ {"v" , "version" , "Show version information and exit" , "" , "" },
182+ {"h" , "help" , "Print this help message and exit" , "" , "" },
183+ }
184+
185+ for _ , opt := range boolOptions {
186+ optMap [opt .Long ] = parser .Flag (string (opt .Short ), opt .Long , & argparse.Options {Help : opt .Help })
187+ }
188+
189+ return optMap
190+ }
191+
144192// Main routine
145193func main () {
146194 if len (os .Args ) == 1 {
147195 os .Args = append (os .Args , "-h" )
148196 }
149197
150- optMap , optionMap := initializeCommandLine ()
151- getopt .SetUsage (func () {
152- usageString (optionMap )
153- })
198+ parser := argparse .NewParser ("varuh" ,
199+ "Password manager for the command line for Unix like operating systems" ,
200+ AUTHOR_INFO ,
201+ )
202+
203+ optMap := initializeCmdLine (parser )
204+
205+ err := parser .Parse (os .Args )
206+
207+ if err != nil {
208+ fmt .Println (parser .Usage (err ))
209+ }
154210
155- getopt .Parse ()
156211 getOrCreateLocalConfig (APP )
157212
158- performAction (optMap , optionMap )
213+ performAction (optMap )
159214}
0 commit comments