From ce1f9b17a402ab0ad306020c2ae607c1d1b787ee Mon Sep 17 00:00:00 2001
From: Anand <anand@zoko.io>
Date: Mon, 29 Nov 2021 19:40:42 +0530
Subject: [PATCH 01/58] Fixed README.md indentation

---
 README.md | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index b58be98..8a41c0b 100644
--- a/README.md
+++ b/README.md
@@ -75,37 +75,38 @@ Usage
 
 		EDIT/CREATE ACTIONS:
 
-		  -E --edit            <id>       Edit entry by id
-		  -e --encrypt                    Encrypt the current database
-		  -U --use-db          <path>     Set as active database
-		  -d --decrypt         <path>     Decrypt password database
 		  -C --clone           <id>       Clone an entry
-		  -R --remove          <id>       Remove an entry
+		  -U --use-db          <path>     Set as active database
+		  -E --edit            <id>       Edit entry by id
 		  -A --add                        Add a new entry
 		  -I --init            <path>     Initialize a new database
+		  -d --decrypt         <path>     Decrypt password database
+		  -e --encrypt                    Encrypt the current database
+		  -R --remove          <id>       Remove an entry
 
 		FIND/LIST ACTIONS:
 
-		  -f --find            <term>     Search entries
 		  -x --export          <filename> Export all entries to <filename>
-		  -p --path                       Show current database path
 		  -a --list-all                   List all entries in current database
+		  -p --path                       Show current database path
+		  -f --find            <term>     Search entries
 		  -l --list-entry      <id>       List entry by id
 
 		HELP ACTIONS:
 
-		  -v --version                    Show version information and exit
 		  -h --help                       Print this help message and exit
+		  -v --version                    Show version information and exit
 
 		FLAGS:
 
-          -c --copy                       Copy password to clipboard
 		  -s --show                       Show passwords when listing entries
+		  -c --copy                       Copy password to clipboard
 
 
 	AUTHORS
 		Copyright (C) 2021 Anand B Pillai <anandpillai@alumni.iitm.ac.in>
 
+
 The command line flags are grouped into `Edit/Create`, `Find/List` and `Help` actions. The first group of actions allows you to work with password databases and perform create/edit as well as encrypt/decrypt actions. The second set of actions allows you to work with an active decrypted database and view/search/list entries.
 
 Encryption and Security

From 35cc37c72b077d5c2a97abbce5e5c5203750e24c Mon Sep 17 00:00:00 2001
From: Anand <anand@zoko.io>
Date: Mon, 29 Nov 2021 19:56:16 +0530
Subject: [PATCH 02/58] Updated README for version

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8a41c0b..c25898b 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ Install
 
 ## Binary Release
 
-If you are on a Debian or Debian derived system, you can directly download and install the 0.1 version. Check out the [releases](https://github.com/pythonhacker/varuh/releases) page and use `dpkg` to install the binary.
+If you are on a Debian or Debian derived system, you can directly download and install the latest version. Check out the [releases](https://github.com/pythonhacker/varuh/releases) page and use `dpkg` to install the binary.
 
 	$ sudo dpkg -i varuh-${VERSION}_amd64.deb
 

From 96772b575428c61eb3e0d86a6e7184a80cf0e716 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Fri, 3 Dec 2021 19:19:21 +0530
Subject: [PATCH 03/58] ref issue #8 - option to generate password -g

---
 main.go | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/main.go b/main.go
index fdd24c3..927f8ff 100644
--- a/main.go
+++ b/main.go
@@ -4,13 +4,14 @@ package main
 
 import (
 	"fmt"
+	"strconv"
 	getopt "github.com/pborman/getopt/v2"
 	"os"
 )
 
 const VERSION = 0.2
 const APP = "varuh"
-const AUTHOR_EMAIL = "Anand B Pillai <anandpillai@alumni.iitm.ac.in>"
+const AUTHOR_EMAIL = "Anand B Pillai <abpillai@gmail.com>"
 
 type actionFunc func(string) error
 type actionFunc2 func(string) (error, string)
@@ -32,6 +33,30 @@ func printVersionInfo() error {
 	return nil
 }
 
+// Command-line wrapper to generateRandomPassword
+func generatePassword(length string) (error, string) {
+	var iLength int
+	var err error
+	var passwd string
+	
+	iLength, _ = strconv.Atoi(length)
+	err, passwd = generateRandomPassword(iLength)
+
+	if err != nil {
+		fmt.Printf("Error generating password - \"%s\"\n", err.Error())
+		return err, ""
+	}
+
+	fmt.Println(passwd)
+
+	if settingsRider.CopyPassword {
+		copyPasswordToClipboard(passwd)
+		fmt.Println("Password copied to clipboard")
+	}
+	
+	return nil, passwd
+}
+
 // Perform an action by using the command line options map
 func performAction(optMap map[string]interface{}, optionMap map[string]interface{}) {
 
@@ -59,6 +84,7 @@ func performAction(optMap map[string]interface{}, optionMap map[string]interface
 
 	stringActions2Map := map[string]actionFunc2{
 		"decrypt": decryptDatabase,
+		"genpass": generatePassword,		
 	}
 
 	flagsActionsMap := map[string]voidFunc{
@@ -70,7 +96,6 @@ func performAction(optMap map[string]interface{}, optionMap map[string]interface
 	for key, mappedFunc := range flagsActionsMap {
 		if *optMap[key].(*bool) {
 			mappedFunc()
-			break
 		}
 	}
 

From 3597fb6ca2ad42c96475a6479cec6b0f401ef69b Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Fri, 3 Dec 2021 19:19:45 +0530
Subject: [PATCH 04/58] ref issue #8 - option to generate password -g

---
 options.go | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/options.go b/options.go
index cc9d7b8..c27a9a9 100644
--- a/options.go
+++ b/options.go
@@ -31,6 +31,10 @@ OPTIONS
 
     FIND/LIST ACTIONS:
 
+%s
+
+    MISC ACTIONS:
+
 %s
 
     HELP ACTIONS:
@@ -53,6 +57,7 @@ func usageString(optMap map[string]interface{}) {
 	var findActions []string
 	var helpActions []string
 	var flagActions []string
+	var miscActions []string
 
 	var maxLen1 int
 	var maxLen2 int
@@ -95,12 +100,18 @@ func usageString(optMap map[string]interface{}) {
 			helpActions = append(helpActions, fmt.Sprintf(usageTemplate, "-"+string(option.Short), option.Long, option.Path, option.Help))
 		case 3:
 			flagActions = append(flagActions, fmt.Sprintf(usageTemplate, "-"+string(option.Short), option.Long, option.Path, option.Help))
+		case 4:
+			miscActions = append(miscActions, fmt.Sprintf(usageTemplate, "-"+string(option.Short), option.Long, option.Path, option.Help))
 		}
 	}
 
-	fmt.Println(fmt.Sprintf(HELP_STRING, APP, strings.Join(editActions, "\n"),
-		strings.Join(findActions, "\n"), strings.Join(helpActions, "\n"),
-		strings.Join(flagActions, "\n"), AUTHOR_EMAIL))
+	fmt.Println(fmt.Sprintf(HELP_STRING, APP,
+		strings.Join(editActions, "\n"),
+		strings.Join(findActions, "\n"),
+		strings.Join(miscActions, "\n"),
+		strings.Join(helpActions, "\n"),
+		strings.Join(flagActions, "\n"),
+		AUTHOR_EMAIL))
 
 }
 
@@ -122,6 +133,7 @@ func initializeCommandLine() (map[string]interface{}, map[string]interface{}) {
 		{'E', "edit", "<id>", "Edit entry by id", 0},
 		{'l', "list-entry", "<id>", "List entry by id", 1},
 		{'x', "export", "<filename>", "Export all entries to <filename>", 1},
+		{'g', "genpass", "<length>", "Generate password of given length", 4},				
 	}
 
 	for _, opt := range stringOptions {

From 441f361e01443b9e746ef65a64ee1df1f1a864dc Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Fri, 3 Dec 2021 19:20:12 +0530
Subject: [PATCH 05/58] ref issue #8 - updated source for
 generateRandomPassword

---
 crypto.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto.go b/crypto.go
index af595e6..924031f 100644
--- a/crypto.go
+++ b/crypto.go
@@ -438,7 +438,7 @@ func decryptFileXChachaPoly(encDbPath string, password string) error {
 func generateRandomPassword(length int) (error, string) {
 
 	var data []byte
-	const source = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789#!+$@~"
+	const source = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?)(/%#!?)="
 
 	data = make([]byte, length)
 

From 08323c26380081af4248fa1102a44828d01c70ac Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Tue, 7 Dec 2021 00:17:23 +0530
Subject: [PATCH 06/58] Updated README for issue #8

---
 README.md | 42 ++++++++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index c25898b..b81d83a 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,7 @@ Table of Contents
 * [Encryption and Security](#encryption-and-security)
 * [Databases](#databases)
 * [Listing and Searching](#listing-and-searching)
+* [Misc](#misc)
 * [Export](#export)
 * [Configuration](#configuration)
 * [License](#license)
@@ -67,6 +68,7 @@ Usage
 
 	$ varuh -h
 
+
 	SYNOPSIS
 
 		varuh [options] [flags]
@@ -75,22 +77,26 @@ Usage
 
 		EDIT/CREATE ACTIONS:
 
-		  -C --clone           <id>       Clone an entry
-		  -U --use-db          <path>     Set as active database
-		  -E --edit            <id>       Edit entry by id
 		  -A --add                        Add a new entry
 		  -I --init            <path>     Initialize a new database
-		  -d --decrypt         <path>     Decrypt password database
-		  -e --encrypt                    Encrypt the current database
 		  -R --remove          <id>       Remove an entry
+		  -e --encrypt                    Encrypt the current database
+		  -d --decrypt         <path>     Decrypt password database
+		  -C --clone           <id>       Clone an entry
+		  -U --use-db          <path>     Set as active database
+		  -E --edit            <id>       Edit entry by id
 
 		FIND/LIST ACTIONS:
 
-		  -x --export          <filename> Export all entries to <filename>
-		  -a --list-all                   List all entries in current database
-		  -p --path                       Show current database path
 		  -f --find            <term>     Search entries
 		  -l --list-entry      <id>       List entry by id
+		  -x --export          <filename> Export all entries to <filename>
+		  -p --path                       Show current database path
+		  -a --list-all                   List all entries in current database
+
+		MISC ACTIONS:
+
+		  -g --genpass         <length>   Generate password of given length
 
 		HELP ACTIONS:
 
@@ -104,10 +110,10 @@ Usage
 
 
 	AUTHORS
-		Copyright (C) 2021 Anand B Pillai <anandpillai@alumni.iitm.ac.in>
+		Copyright (C) 2021 Anand B Pillai <abpillai@gmail.com>
 
 
-The command line flags are grouped into `Edit/Create`, `Find/List` and `Help` actions. The first group of actions allows you to work with password databases and perform create/edit as well as encrypt/decrypt actions. The second set of actions allows you to work with an active decrypted database and view/search/list entries.
+The command line flags are grouped into `Edit/Create`, `Find/List`, `Misc` and `Help` actions. The first group of actions allows you to work with password databases and perform create/edit as well as encrypt/decrypt actions. The second set of actions allows you to work with an active decrypted database and view/search/list entries.
 
 Encryption and Security
 =======================
@@ -439,6 +445,22 @@ If `pdftk` is installed, the PDF files will be encrypted with an (optional) pass
 	Added password to passwds.pdf.
 	Exported to passwds.pdf.
 
+Misc
+====
+
+The following miscellaneous actions are supported.
+
+Generate a secure password of given length.
+
+	$ varuh -g
+	7nhga7tkk9LNafz
+
+	By passing the `-c` option, the password is also copied to the clipboard.
+
+	$ varuh -g 15 -c 
+	yeXlLlk??IOsvL6
+	Password copied to clipboard
+
 
 Configuration
 =============

From c4f6f8b5e1913906b21f31f1b8dd675ebc68a6cf Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sat, 11 Dec 2021 20:45:12 +0530
Subject: [PATCH 07/58] ref issue #9  - moved all argument parsing logic to
 main.go

---
 main.go | 86 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 69 insertions(+), 17 deletions(-)

diff --git a/main.go b/main.go
index 927f8ff..462efea 100644
--- a/main.go
+++ b/main.go
@@ -5,7 +5,8 @@ package main
 import (
 	"fmt"
 	"strconv"
-	getopt "github.com/pborman/getopt/v2"
+	//	getopt "github.com/pborman/getopt/v2"
+	"github.com/akamensky/argparse"	
 	"os"
 )
 
@@ -17,9 +18,17 @@ type actionFunc func(string) error
 type actionFunc2 func(string) (error, string)
 type voidFunc func() error
 
+// Structure to keep the options data
+type CmdOption struct {
+	Short string
+	Long  string
+	Help  string
+	Default string
+}
+
 // Print the program's usage string and exit
 func printUsage() error {
-	getopt.Usage()
+	//	getopt.Usage()
 	os.Exit(0)
 
 	return nil
@@ -57,8 +66,8 @@ func generatePassword(length string) (error, string) {
 	return nil, passwd
 }
 
-// Perform an action by using the command line options map
-func performAction(optMap map[string]interface{}, optionMap map[string]interface{}) {
+// // Perform an action by using the command line options map
+func performAction(optMap map[string]interface{}) {
 
 	var flag bool
 
@@ -99,6 +108,7 @@ func performAction(optMap map[string]interface{}, optionMap map[string]interface
 		}
 	}
 
+	
 	// One of bool or string actions
 	for key, mappedFunc := range boolActionsMap {
 		if *optMap[key].(*bool) {
@@ -113,9 +123,7 @@ func performAction(optMap map[string]interface{}, optionMap map[string]interface
 	}
 
 	for key, mappedFunc := range stringActionsMap {
-		option := optionMap[key].(Option)
-
-		if *optMap[key].(*string) != option.Path {
+		if *optMap[key].(*string) != "" {
 
 			var val = *(optMap[key].(*string))
 			mappedFunc(val)
@@ -129,10 +137,7 @@ func performAction(optMap map[string]interface{}, optionMap map[string]interface
 	}
 
 	for key, mappedFunc := range stringActions2Map {
-		option := optionMap[key].(Option)
-
-		if *optMap[key].(*string) != option.Path {
-
+		if *optMap[key].(*string) != "" {
 			var val = *(optMap[key].(*string))
 			mappedFunc(val)
 			break
@@ -141,19 +146,66 @@ func performAction(optMap map[string]interface{}, optionMap map[string]interface
 
 }
 
+func initializeCmdLine(parser *argparse.Parser) map[string]interface{} {
+	var optMap map[string]interface{}
+
+	optMap = make(map[string]interface{})
+
+	boolOptions := []CmdOption{
+		{"e", "encrypt", "Encrypt the current database", ""},
+		{"A", "add", "Add a new entry", ""},
+		{"p", "path", "Show current database path", ""},
+		{"a", "list-all", "List all entries in current database", ""},
+		{"s", "show", "Show passwords when listing entries", ""},
+		{"c", "copy", "Copy password to clipboard", ""},
+		{"v", "version", "Show version information and exit", ""},
+		{"h", "help", "Print this help message and exit", ""},
+	}
+
+	for _, opt := range boolOptions {
+		optMap[opt.Long] = parser.Flag(string(opt.Short), opt.Long, &argparse.Options{Help: opt.Help})
+	}	
+
+	stringOptions := []CmdOption{
+		{"I", "init", "Initialize a new database", ""},
+		{"d", "decrypt", "Decrypt password database", ""},
+		{"C", "clone", "Clone an entry", ""},
+		{"R", "remove", "Remove an entry", ""},
+		{"U", "use-db", "Set as active database", ""},
+		{"f", "find", "Search entries", ""},
+		{"E", "edit", "Edit entry by id", ""},
+		{"l", "list-entry", "List entry by id", ""},
+		{"x", "export", "Export all entries to <filename>", ""},
+		{"g", "genpass", "Generate password of given length", "12"},				
+	}
+
+	for _, opt := range stringOptions {
+		optMap[opt.Long] = parser.String(opt.Short, opt.Long, &argparse.Options{Help: opt.Help, Default: opt.Default})
+	}
+	
+	return optMap
+}
+
 // Main routine
 func main() {
 	if len(os.Args) == 1 {
 		os.Args = append(os.Args, "-h")
 	}
 
-	optMap, optionMap := initializeCommandLine()
-	getopt.SetUsage(func() {
-		usageString(optionMap)
-	})
+	parser := argparse.NewParser("varuh", "Password manager for the command line for Unix like operating systems")
+		
+	//	optMap, optionMap := initializeCommandLine(parser)
 
-	getopt.Parse()
+	//	versionFlag := parser.Flag("v", "version", &argparse.Options{Help: "Show version information and exit"})
+	optMap := initializeCmdLine(parser)
+	
+	err := parser.Parse(os.Args)
+
+	if err != nil {
+		fmt.Println(parser.Usage(err))
+	}
+	
 	getOrCreateLocalConfig(APP)
 
-	performAction(optMap, optionMap)
+	performAction(optMap)
 }

From f1ee30c50c03448c3a35b2a346f9441c6a65fe66 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sat, 11 Dec 2021 20:45:59 +0530
Subject: [PATCH 08/58] ref issue #9 - removed options.go

---
 options.go | 161 -----------------------------------------------------
 1 file changed, 161 deletions(-)
 delete mode 100644 options.go

diff --git a/options.go b/options.go
deleted file mode 100644
index c27a9a9..0000000
--- a/options.go
+++ /dev/null
@@ -1,161 +0,0 @@
-// Managing command line options
-package main
-
-import (
-	"fmt"
-	"strings"
-
-	getopt "github.com/pborman/getopt/v2"
-)
-
-// Structure to keep the options data
-type Option struct {
-	Short rune
-	Long  string
-	Path  string
-	Help  string
-	Type  uint8
-}
-
-// Usage string template
-const HELP_STRING = `
-SYNOPSIS
-
-    %s [options] [flags]
-
-OPTIONS
-
-    EDIT/CREATE ACTIONS:
-
-%s
-
-    FIND/LIST ACTIONS:
-
-%s
-
-    MISC ACTIONS:
-
-%s
-
-    HELP ACTIONS:
-
-%s
-
-    FLAGS:
-
-%s
-
-
-AUTHORS
-    Copyright (C) 2021 %s
-`
-
-// Generate the usage string for the program
-func usageString(optMap map[string]interface{}) {
-
-	var editActions []string
-	var findActions []string
-	var helpActions []string
-	var flagActions []string
-	var miscActions []string
-
-	var maxLen1 int
-	var maxLen2 int
-
-	var usageTemplate = "%8s --%s %s %s"
-
-	// Find max string length
-	for _, value := range optMap {
-		option := value.(Option)
-
-		if len(option.Long) > maxLen1 {
-			maxLen1 = len(option.Long)
-		}
-		if len(option.Path) > maxLen2 {
-			maxLen2 = len(option.Path)
-		}
-	}
-
-	for _, value := range optMap {
-		option := value.(Option)
-
-		delta := maxLen1 + 5 - len(option.Long)
-		for i := 0; i < delta; i++ {
-			option.Long += " "
-		}
-
-		if len(option.Path) < maxLen2 {
-			delta := maxLen2 - len(option.Path)
-			for i := 0; i < delta; i++ {
-				option.Path += " "
-			}
-		}
-
-		switch option.Type {
-		case 0:
-			editActions = append(editActions, fmt.Sprintf(usageTemplate, "-"+string(option.Short), option.Long, option.Path, option.Help))
-		case 1:
-			findActions = append(findActions, fmt.Sprintf(usageTemplate, "-"+string(option.Short), option.Long, option.Path, option.Help))
-		case 2:
-			helpActions = append(helpActions, fmt.Sprintf(usageTemplate, "-"+string(option.Short), option.Long, option.Path, option.Help))
-		case 3:
-			flagActions = append(flagActions, fmt.Sprintf(usageTemplate, "-"+string(option.Short), option.Long, option.Path, option.Help))
-		case 4:
-			miscActions = append(miscActions, fmt.Sprintf(usageTemplate, "-"+string(option.Short), option.Long, option.Path, option.Help))
-		}
-	}
-
-	fmt.Println(fmt.Sprintf(HELP_STRING, APP,
-		strings.Join(editActions, "\n"),
-		strings.Join(findActions, "\n"),
-		strings.Join(miscActions, "\n"),
-		strings.Join(helpActions, "\n"),
-		strings.Join(flagActions, "\n"),
-		AUTHOR_EMAIL))
-
-}
-
-// Set up command line options - returns two maps
-func initializeCommandLine() (map[string]interface{}, map[string]interface{}) {
-	var optMap map[string]interface{}
-	var optionMap map[string]interface{}
-
-	optMap = make(map[string]interface{})
-	optionMap = make(map[string]interface{})
-
-	stringOptions := []Option{
-		{'I', "init", "<path>", "Initialize a new database", 0},
-		{'d', "decrypt", "<path>", "Decrypt password database", 0},
-		{'C', "clone", "<id>", "Clone an entry", 0},
-		{'R', "remove", "<id>", "Remove an entry", 0},
-		{'U', "use-db", "<path>", "Set as active database", 0},
-		{'f', "find", "<term>", "Search entries", 1},
-		{'E', "edit", "<id>", "Edit entry by id", 0},
-		{'l', "list-entry", "<id>", "List entry by id", 1},
-		{'x', "export", "<filename>", "Export all entries to <filename>", 1},
-		{'g', "genpass", "<length>", "Generate password of given length", 4},				
-	}
-
-	for _, opt := range stringOptions {
-		optMap[opt.Long] = getopt.StringLong(opt.Long, opt.Short, opt.Path, opt.Help)
-		optionMap[opt.Long] = opt
-	}
-
-	boolOptions := []Option{
-		{'e', "encrypt", "", "Encrypt the current database", 0},
-		{'A', "add", "", "Add a new entry", 0},
-		{'p', "path", "", "Show current database path", 1},
-		{'a', "list-all", "", "List all entries in current database", 1},
-		{'s', "show", "", "Show passwords when listing entries", 3},
-		{'c', "copy", "", "Copy password to clipboard", 3},
-		{'v', "version", "", "Show version information and exit", 2},
-		{'h', "help", "", "Print this help message and exit", 2},
-	}
-
-	for _, opt := range boolOptions {
-		optMap[opt.Long] = getopt.BoolLong(opt.Long, opt.Short, opt.Help)
-		optionMap[opt.Long] = opt
-	}
-
-	return optMap, optionMap
-}

From bd05925863c9f1f396530a959b4e89dfcf2b6fb3 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 12 Dec 2021 13:13:21 +0530
Subject: [PATCH 09/58] ref issue #9 - Updated version number

---
 main.go | 93 +++++++++++++++++++++++++++++----------------------------
 1 file changed, 48 insertions(+), 45 deletions(-)

diff --git a/main.go b/main.go
index 462efea..8396fd7 100644
--- a/main.go
+++ b/main.go
@@ -4,15 +4,18 @@ package main
 
 import (
 	"fmt"
-	"strconv"
-	//	getopt "github.com/pborman/getopt/v2"
-	"github.com/akamensky/argparse"	
+	"github.com/pythonhacker/argparse"
 	"os"
+	"strconv"
 )
 
-const VERSION = 0.2
+const VERSION = 0.3
 const APP = "varuh"
-const AUTHOR_EMAIL = "Anand B Pillai <abpillai@gmail.com>"
+
+const AUTHOR_INFO = `
+AUTHORS
+    Copyright (C) 2021 Anand B Pillai <abpillai@gmail.com>
+`
 
 type actionFunc func(string) error
 type actionFunc2 func(string) (error, string)
@@ -20,9 +23,10 @@ type voidFunc func() error
 
 // Structure to keep the options data
 type CmdOption struct {
-	Short string
-	Long  string
-	Help  string
+	Short   string
+	Long    string
+	Help    string
+	Path    string
 	Default string
 }
 
@@ -43,13 +47,13 @@ func printVersionInfo() error {
 }
 
 // Command-line wrapper to generateRandomPassword
-func generatePassword(length string) (error, string) {
+func genPass(length string) (error, string) {
 	var iLength int
 	var err error
 	var passwd string
-	
+
 	iLength, _ = strconv.Atoi(length)
-	err, passwd = generateRandomPassword(iLength)
+	err, passwd = generatePassword(iLength)
 
 	if err != nil {
 		fmt.Printf("Error generating password - \"%s\"\n", err.Error())
@@ -62,7 +66,7 @@ func generatePassword(length string) (error, string) {
 		copyPasswordToClipboard(passwd)
 		fmt.Println("Password copied to clipboard")
 	}
-	
+
 	return nil, passwd
 }
 
@@ -93,7 +97,7 @@ func performAction(optMap map[string]interface{}) {
 
 	stringActions2Map := map[string]actionFunc2{
 		"decrypt": decryptDatabase,
-		"genpass": generatePassword,		
+		"genpass": genPass,
 	}
 
 	flagsActionsMap := map[string]voidFunc{
@@ -108,7 +112,6 @@ func performAction(optMap map[string]interface{}) {
 		}
 	}
 
-	
 	// One of bool or string actions
 	for key, mappedFunc := range boolActionsMap {
 		if *optMap[key].(*bool) {
@@ -151,38 +154,38 @@ func initializeCmdLine(parser *argparse.Parser) map[string]interface{} {
 
 	optMap = make(map[string]interface{})
 
+	stringOptions := []CmdOption{
+		{"I", "init", "Initialize a new database", "<path>", ""},
+		{"d", "decrypt", "Decrypt password database", "<path>", ""},
+		{"C", "clone", "Clone an entry with <id>", "<id>", ""},
+		{"R", "remove", "Remove an entry with <id>", "<id>", ""},
+		{"U", "use-db", "Set <path> as active database", "<path>", ""},
+		{"f", "find", "Search entries with <term>", "<term>", ""},
+		{"E", "edit", "Edit entry by <id>", "<id>", ""},
+		{"l", "list-entry", "List entry by <id>", "<id>", ""},
+		{"x", "export", "Export all entries to <filename>", "<filename>", ""},
+		{"g", "genpass", "Generate password of given <length>", "<length>", ""},
+	}
+
+	for _, opt := range stringOptions {
+		optMap[opt.Long] = parser.String(opt.Short, opt.Long, &argparse.Options{Help: opt.Help, Path: opt.Path})
+	}
+
 	boolOptions := []CmdOption{
-		{"e", "encrypt", "Encrypt the current database", ""},
-		{"A", "add", "Add a new entry", ""},
-		{"p", "path", "Show current database path", ""},
-		{"a", "list-all", "List all entries in current database", ""},
-		{"s", "show", "Show passwords when listing entries", ""},
-		{"c", "copy", "Copy password to clipboard", ""},
-		{"v", "version", "Show version information and exit", ""},
-		{"h", "help", "Print this help message and exit", ""},
+		{"e", "encrypt", "Encrypt the current database", "", ""},
+		{"A", "add", "Add a new entry", "", ""},
+		{"p", "path", "Show current database path", "", ""},
+		{"a", "list-all", "List all entries in current database", "", ""},
+		{"s", "show", "Show passwords when listing entries", "", ""},
+		{"c", "copy", "Copy password to clipboard", "", ""},
+		{"v", "version", "Show version information and exit", "", ""},
+		{"h", "help", "Print this help message and exit", "", ""},
 	}
 
 	for _, opt := range boolOptions {
 		optMap[opt.Long] = parser.Flag(string(opt.Short), opt.Long, &argparse.Options{Help: opt.Help})
-	}	
-
-	stringOptions := []CmdOption{
-		{"I", "init", "Initialize a new database", ""},
-		{"d", "decrypt", "Decrypt password database", ""},
-		{"C", "clone", "Clone an entry", ""},
-		{"R", "remove", "Remove an entry", ""},
-		{"U", "use-db", "Set as active database", ""},
-		{"f", "find", "Search entries", ""},
-		{"E", "edit", "Edit entry by id", ""},
-		{"l", "list-entry", "List entry by id", ""},
-		{"x", "export", "Export all entries to <filename>", ""},
-		{"g", "genpass", "Generate password of given length", "12"},				
 	}
 
-	for _, opt := range stringOptions {
-		optMap[opt.Long] = parser.String(opt.Short, opt.Long, &argparse.Options{Help: opt.Help, Default: opt.Default})
-	}
-	
 	return optMap
 }
 
@@ -192,19 +195,19 @@ func main() {
 		os.Args = append(os.Args, "-h")
 	}
 
-	parser := argparse.NewParser("varuh", "Password manager for the command line for Unix like operating systems")
-		
-	//	optMap, optionMap := initializeCommandLine(parser)
+	parser := argparse.NewParser("varuh",
+		"Password manager for the command line for Unix like operating systems",
+		AUTHOR_INFO,
+	)
 
-	//	versionFlag := parser.Flag("v", "version", &argparse.Options{Help: "Show version information and exit"})
 	optMap := initializeCmdLine(parser)
-	
+
 	err := parser.Parse(os.Args)
 
 	if err != nil {
 		fmt.Println(parser.Usage(err))
 	}
-	
+
 	getOrCreateLocalConfig(APP)
 
 	performAction(optMap)

From ec5b88bcd046927ce01332caa8ee7ba441f399a9 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 12 Dec 2021 13:16:46 +0530
Subject: [PATCH 10/58] ref issue #9 - Updated usage on README.md

---
 README.md | 88 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 41 insertions(+), 47 deletions(-)

diff --git a/README.md b/README.md
index b81d83a..ec77c22 100644
--- a/README.md
+++ b/README.md
@@ -50,12 +50,15 @@ should work.
 
 Then,
 
-	$ make
-	go: downloading github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f
-	go: downloading github.com/pborman/getopt/v2 v2.1.0
-	go: downloading golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
-	go: downloading gorm.io/driver/sqlite v1.2.3
-	...
+	 $ make
+	 Building varuh
+	 go: downloading github.com/akamensky/argparse v1.3.1
+	 go: downloading golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
+	 go: downloading github.com/atotto/clipboard v0.1.4
+	 go: downloading github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f
+	 go: downloading github.com/pythonhacker/argparse v1.3.2
+	 go: downloading gorm.io/driver/sqlite v1.2.3
+	 ...
 
 	$ sudo make install
 	Installing varuh...done
@@ -66,53 +69,44 @@ The binary will be installed in `/usr/local/bin` folder.
 Usage
 =====
 
-	$ varuh -h
-
-
-	SYNOPSIS
-
-		varuh [options] [flags]
-
-	OPTIONS
-
-		EDIT/CREATE ACTIONS:
-
-		  -A --add                        Add a new entry
-		  -I --init            <path>     Initialize a new database
-		  -R --remove          <id>       Remove an entry
-		  -e --encrypt                    Encrypt the current database
-		  -d --decrypt         <path>     Decrypt password database
-		  -C --clone           <id>       Clone an entry
-		  -U --use-db          <path>     Set as active database
-		  -E --edit            <id>       Edit entry by id
-
-		FIND/LIST ACTIONS:
-
-		  -f --find            <term>     Search entries
-		  -l --list-entry      <id>       List entry by id
-		  -x --export          <filename> Export all entries to <filename>
-		  -p --path                       Show current database path
-		  -a --list-all                   List all entries in current database
-
-		MISC ACTIONS:
-
-		  -g --genpass         <length>   Generate password of given length
-
-		HELP ACTIONS:
-
-		  -h --help                       Print this help message and exit
-		  -v --version                    Show version information and exit
-
-		FLAGS:
-
-		  -s --show                       Show passwords when listing entries
-		  -c --copy                       Copy password to clipboard
+	$ ./varuh -h
+	usage: varuh [-h|--help] [-I|--init "<value>"] [-d|--decrypt "<value>"]
+				 [-C|--clone "<value>"] [-R|--remove "<value>"] [-U|--use-db
+				 "<value>"] [-f|--find "<value>"] [-E|--edit "<value>"]
+				 [-l|--list-entry "<value>"] [-x|--export "<value>"] [-g|--genpass
+				 "<value>"] [-e|--encrypt] [-A|--add] [-p|--path] [-a|--list-all]
+				 [-s|--show] [-c|--copy] [-v|--version]
+
+				 Password manager for the command line for Unix like operating
+				 systems
+
+	Options:
+
+	  -h  --help                   Print help information
+	  -I  --init        <path>     Initialize a new database
+	  -d  --decrypt     <path>     Decrypt password database
+	  -C  --clone       <id>       Clone an entry with <id>
+	  -R  --remove      <id>       Remove an entry with <id>
+	  -U  --use-db      <path>     Set <path> as active database
+	  -f  --find        <term>     Search entries with <term>
+	  -E  --edit        <id>       Edit entry by <id>
+	  -l  --list-entry  <id>       List entry by <id>
+	  -x  --export      <filename> Export all entries to <filename>
+	  -g  --genpass     <length>   Generate password of given <length>
+	  -e  --encrypt                Encrypt the current database
+	  -A  --add                    Add a new entry
+	  -p  --path                   Show current database path
+	  -a  --list-all               List all entries in current database
+	  -s  --show                   Show passwords when listing entries
+	  -c  --copy                   Copy password to clipboard
+	  -v  --version                Show version information and exit
 
 
 	AUTHORS
 		Copyright (C) 2021 Anand B Pillai <abpillai@gmail.com>
 
 
+
 The command line flags are grouped into `Edit/Create`, `Find/List`, `Misc` and `Help` actions. The first group of actions allows you to work with password databases and perform create/edit as well as encrypt/decrypt actions. The second set of actions allows you to work with an active decrypted database and view/search/list entries.
 
 Encryption and Security

From 6f4f50f778ee5e8ae1722b2c8ed70e865facee63 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 12 Dec 2021 13:17:11 +0530
Subject: [PATCH 11/58] ref issue #9 - Updated go.{mod,sum}

---
 go.mod | 3 ++-
 go.sum | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 8ef09b6..f320c0a 100644
--- a/go.mod
+++ b/go.mod
@@ -3,9 +3,10 @@ module varuh
 go 1.16
 
 require (
+	github.com/akamensky/argparse v1.3.1
 	github.com/atotto/clipboard v0.1.4
 	github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f
-	github.com/pborman/getopt/v2 v2.1.0
+	github.com/pythonhacker/argparse v1.3.2
 	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
 	gorm.io/driver/sqlite v1.2.3
 	gorm.io/gorm v1.22.2
diff --git a/go.sum b/go.sum
index 87a562f..b6161ad 100644
--- a/go.sum
+++ b/go.sum
@@ -1,3 +1,5 @@
+github.com/akamensky/argparse v1.3.1 h1:kP6+OyvR0fuBH6UhbE6yh/nskrDEIQgEA1SUXDPjx4g=
+github.com/akamensky/argparse v1.3.1/go.mod h1:S5kwC7IuDcEr5VeXtGPRVZ5o/FdhcMlQz4IZQuw64xA=
 github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
 github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -11,10 +13,10 @@ github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f h1:dKccXx7xA56UNq
 github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f/go.mod h1:4rEELDSfUAlBSyUjPG0JnaNGjf13JySHFeRdD/3dLP0=
 github.com/mattn/go-sqlite3 v1.14.9 h1:10HX2Td0ocZpYEjhilsuo6WWtUqttj2Kb0KtD86/KYA=
 github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/pborman/getopt/v2 v2.1.0 h1:eNfR+r+dWLdWmV8g5OlpyrTYHkhVNxHBdN2cCrJmOEA=
-github.com/pborman/getopt/v2 v2.1.0/go.mod h1:4NtW75ny4eBw9fO1bhtNdYTlZKYX5/tBLtsOpwKIKd0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pythonhacker/argparse v1.3.2 h1:JOojnYFHk7oap+MQiFgiPAHlzvhJfqukErLneWaHR/M=
+github.com/pythonhacker/argparse v1.3.2/go.mod h1:gdUstTr/g1ojhRwrF9gKFOVLwsNfwarBg8aCQRjtvo8=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=

From f69f83ef1c1cde654b6449b7ef9df118fa6c6188 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 12 Dec 2021 13:18:20 +0530
Subject: [PATCH 12/58] ref issue #9 - Updated README.md, removed irrelevant
 lines

---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index ec77c22..581965b 100644
--- a/README.md
+++ b/README.md
@@ -106,9 +106,6 @@ Usage
 		Copyright (C) 2021 Anand B Pillai <abpillai@gmail.com>
 
 
-
-The command line flags are grouped into `Edit/Create`, `Find/List`, `Misc` and `Help` actions. The first group of actions allows you to work with password databases and perform create/edit as well as encrypt/decrypt actions. The second set of actions allows you to work with an active decrypted database and view/search/list entries.
-
 Encryption and Security
 =======================
 

From 5c2350bcede4c5293de81884910c059d955171ad Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 12 Dec 2021 14:00:15 +0530
Subject: [PATCH 13/58] ref issue #13 - generate strong passwords

---
 crypto.go | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 98 insertions(+), 2 deletions(-)

diff --git a/crypto.go b/crypto.go
index 924031f..2c9ac69 100644
--- a/crypto.go
+++ b/crypto.go
@@ -13,7 +13,9 @@ import (
 	"golang.org/x/crypto/pbkdf2"
 	"io"
 	"math/big"
+	"math/rand"
 	"os"
+	"time"
 	"unsafe"
 
 	crand "crypto/rand"
@@ -435,10 +437,10 @@ func decryptFileXChachaPoly(encDbPath string, password string) error {
 }
 
 // Generate a random password - for adding listings
-func generateRandomPassword(length int) (error, string) {
+func generatePassword(length int) (error, string) {
 
 	var data []byte
-	const source = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?)(/%#!?)="
+	const source = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789=+_()$#@!~:/%"
 
 	data = make([]byte, length)
 
@@ -453,3 +455,97 @@ func generateRandomPassword(length int) (error, string) {
 
 	return nil, string(data)
 }
+
+// Generate a "strong" password
+// A strong password is defined as,
+// A mix of upper and lower case alphabets
+// at least one number [0-9]
+// at least one upper case alphabet [A-Z]
+// at least one punctuation character
+// at least length 12
+func generateStrongPassword() (error, string) {
+
+	var data []byte
+	var length int
+
+	const sourceAlpha = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+	const sourceLargeAlpha = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+	const sourceNum = "0123456789"
+	const sourcePunct = "=+_()$#@!~:/%"
+	const source = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789=+_()$#@!~:/%"
+
+	// Generate in range 12 - 16
+	rand.Seed(time.Now().UnixNano())
+
+	length = rand.Intn(4) + 12
+
+	data = make([]byte, length)
+
+	var lengthAlpha int
+	var i, j, k, l int
+
+	// Alpha chars is at least length 3-5
+	lengthAlpha = rand.Intn(2) + 3
+
+	for i = 0; i < lengthAlpha; i++ {
+		num, err := crand.Int(crand.Reader, big.NewInt(int64(len(sourceAlpha))))
+		if err != nil {
+			return err, ""
+		}
+
+		data[i] = sourceAlpha[num.Int64()]
+	}
+
+	// Add in numbers 1 or 2
+	var lengthNum int
+
+	lengthNum = rand.Intn(2) + 1
+
+	for j = i; j < i+lengthNum; j++ {
+		num, err := crand.Int(crand.Reader, big.NewInt(int64(len(sourceNum))))
+		if err != nil {
+			return err, ""
+		}
+
+		data[j] = sourceNum[num.Int64()]
+	}
+
+	// Add in punctuations 1 or 2
+	var lengthPunc int
+
+	lengthPunc = rand.Intn(2) + 1
+
+	for k = j; k < j+lengthPunc; k++ {
+		num, err := crand.Int(crand.Reader, big.NewInt(int64(len(sourcePunct))))
+		if err != nil {
+			return err, ""
+		}
+
+		data[k] = sourcePunct[num.Int64()]
+	}
+
+	// Fill in the rest
+	var lengthRem int
+
+	lengthRem = length - k
+
+	if lengthRem > 0 {
+		for l = k; l < k+lengthRem; l++ {
+			num, err := crand.Int(crand.Reader, big.NewInt(int64(len(source))))
+			if err != nil {
+				return err, ""
+			}
+
+			data[l] = source[num.Int64()]
+		}
+	}
+
+	// Shuffle a few times
+	for i = 0; i < 5; i++ {
+		rand.Shuffle(len(data), func(i, j int) {
+			data[i], data[j] = data[j], data[i]
+		})
+	}
+
+	return nil, string(data)
+}

From 023045bfe3a82cff3470622207fc4bf96375de34 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 12 Dec 2021 14:00:29 +0530
Subject: [PATCH 14/58] ref issue #13 - use strong passwords in creating
 entries

---
 actions.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/actions.go b/actions.go
index 73a61bb..e6db91c 100644
--- a/actions.go
+++ b/actions.go
@@ -239,7 +239,7 @@ func addNewEntry() error {
 
 	if len(passwd) == 0 {
 		fmt.Printf("\nGenerating password ...")
-		err, passwd = generateRandomPassword(16)
+		err, passwd = generateStrongPassword()
 		fmt.Printf("done")
 	}
 	//	fmt.Printf("Password => %s\n", passwd)
@@ -315,7 +315,7 @@ func editCurrentEntry(idString string) error {
 
 	if strings.ToLower(passwd) == "y" {
 		fmt.Printf("\nGenerating new password ...")
-		err, passwd = generateRandomPassword(16)
+		err, passwd = generateStrongPassword()
 	}
 	//	fmt.Printf("Password => %s\n", passwd)
 

From 4a856e718d88c1ddd33cf2fbd66c9078039f2d24 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 12 Dec 2021 14:00:42 +0530
Subject: [PATCH 15/58] ref issue #13 - generate strong passwords

---
 main.go | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/main.go b/main.go
index 8396fd7..343073d 100644
--- a/main.go
+++ b/main.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"github.com/pythonhacker/argparse"
 	"os"
-	"strconv"
 )
 
 const VERSION = 0.3
@@ -20,6 +19,7 @@ AUTHORS
 type actionFunc func(string) error
 type actionFunc2 func(string) (error, string)
 type voidFunc func() error
+type voidFunc2 func() (error, string)
 
 // Structure to keep the options data
 type CmdOption struct {
@@ -47,13 +47,11 @@ func printVersionInfo() error {
 }
 
 // Command-line wrapper to generateRandomPassword
-func genPass(length string) (error, string) {
-	var iLength int
+func genPass() (error, string) {
 	var err error
 	var passwd string
 
-	iLength, _ = strconv.Atoi(length)
-	err, passwd = generatePassword(iLength)
+	err, passwd = generateStrongPassword()
 
 	if err != nil {
 		fmt.Printf("Error generating password - \"%s\"\n", err.Error())
@@ -97,6 +95,9 @@ func performAction(optMap map[string]interface{}) {
 
 	stringActions2Map := map[string]actionFunc2{
 		"decrypt": decryptDatabase,
+	}
+
+	flagsActions2Map := map[string]voidFunc2{
 		"genpass": genPass,
 	}
 
@@ -112,6 +113,15 @@ func performAction(optMap map[string]interface{}) {
 		}
 	}
 
+	// Flag 2 actions
+	for key, mappedFunc := range flagsActions2Map {
+		if *optMap[key].(*bool) {
+			mappedFunc()
+			flag = true
+			break
+		}
+	}
+
 	// One of bool or string actions
 	for key, mappedFunc := range boolActionsMap {
 		if *optMap[key].(*bool) {
@@ -164,7 +174,6 @@ func initializeCmdLine(parser *argparse.Parser) map[string]interface{} {
 		{"E", "edit", "Edit entry by <id>", "<id>", ""},
 		{"l", "list-entry", "List entry by <id>", "<id>", ""},
 		{"x", "export", "Export all entries to <filename>", "<filename>", ""},
-		{"g", "genpass", "Generate password of given <length>", "<length>", ""},
 	}
 
 	for _, opt := range stringOptions {
@@ -176,6 +185,7 @@ func initializeCmdLine(parser *argparse.Parser) map[string]interface{} {
 		{"A", "add", "Add a new entry", "", ""},
 		{"p", "path", "Show current database path", "", ""},
 		{"a", "list-all", "List all entries in current database", "", ""},
+		{"g", "genpass", "Generate a strong password of length from 8 - 12", "", ""},
 		{"s", "show", "Show passwords when listing entries", "", ""},
 		{"c", "copy", "Copy password to clipboard", "", ""},
 		{"v", "version", "Show version information and exit", "", ""},

From 9118a489beaab1f11e1b14e10e829d2d0f208282 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 12 Dec 2021 14:04:31 +0530
Subject: [PATCH 16/58] ref issue #9 - Updated README.md with updated usage

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 581965b..056223e 100644
--- a/README.md
+++ b/README.md
@@ -73,9 +73,9 @@ Usage
 	usage: varuh [-h|--help] [-I|--init "<value>"] [-d|--decrypt "<value>"]
 				 [-C|--clone "<value>"] [-R|--remove "<value>"] [-U|--use-db
 				 "<value>"] [-f|--find "<value>"] [-E|--edit "<value>"]
-				 [-l|--list-entry "<value>"] [-x|--export "<value>"] [-g|--genpass
-				 "<value>"] [-e|--encrypt] [-A|--add] [-p|--path] [-a|--list-all]
-				 [-s|--show] [-c|--copy] [-v|--version]
+				 [-l|--list-entry "<value>"] [-x|--export "<value>"] [-e|--encrypt]
+				 [-A|--add] [-p|--path] [-a|--list-all] [-g|--genpass] [-s|--show]
+				 [-c|--copy] [-v|--version]
 
 				 Password manager for the command line for Unix like operating
 				 systems
@@ -92,11 +92,11 @@ Usage
 	  -E  --edit        <id>       Edit entry by <id>
 	  -l  --list-entry  <id>       List entry by <id>
 	  -x  --export      <filename> Export all entries to <filename>
-	  -g  --genpass     <length>   Generate password of given <length>
 	  -e  --encrypt                Encrypt the current database
 	  -A  --add                    Add a new entry
 	  -p  --path                   Show current database path
 	  -a  --list-all               List all entries in current database
+	  -g  --genpass                Generate a strong password of length from 8 - 12
 	  -s  --show                   Show passwords when listing entries
 	  -c  --copy                   Copy password to clipboard
 	  -v  --version                Show version information and exit

From 26ed9f52f0cf6e23c0c972e8fb2533320cc00fda Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 12 Dec 2021 14:05:48 +0530
Subject: [PATCH 17/58] ref issue #9 - Updated help for genpass

---
 main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.go b/main.go
index 343073d..6f90f87 100644
--- a/main.go
+++ b/main.go
@@ -185,7 +185,7 @@ func initializeCmdLine(parser *argparse.Parser) map[string]interface{} {
 		{"A", "add", "Add a new entry", "", ""},
 		{"p", "path", "Show current database path", "", ""},
 		{"a", "list-all", "List all entries in current database", "", ""},
-		{"g", "genpass", "Generate a strong password of length from 8 - 12", "", ""},
+		{"g", "genpass", "Generate a strong password of length from 12 - 16", "", ""},
 		{"s", "show", "Show passwords when listing entries", "", ""},
 		{"c", "copy", "Copy password to clipboard", "", ""},
 		{"v", "version", "Show version information and exit", "", ""},

From d30e22930b125de438487c4fbff266debe6228d8 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 12 Dec 2021 14:05:55 +0530
Subject: [PATCH 18/58] ref issue #9 - Updated help for genpass

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 056223e..db30300 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ Usage
 	  -A  --add                    Add a new entry
 	  -p  --path                   Show current database path
 	  -a  --list-all               List all entries in current database
-	  -g  --genpass                Generate a strong password of length from 8 - 12
+	  -g  --genpass                Generate a strong password of length from 12 - 16
 	  -s  --show                   Show passwords when listing entries
 	  -c  --copy                   Copy password to clipboard
 	  -v  --version                Show version information and exit

From dff252a2a5f2d521504822e8fa90bb0bb697549e Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 12 Dec 2021 14:09:25 +0530
Subject: [PATCH 19/58] ref issue #9 - Updated README.md

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index db30300..a41ca76 100644
--- a/README.md
+++ b/README.md
@@ -441,15 +441,15 @@ Misc
 
 The following miscellaneous actions are supported.
 
-Generate a secure password of given length.
+Generate a strong password of length ranging from 12 - 16.
 
 	$ varuh -g
-	7nhga7tkk9LNafz
+	7%zv/uzIgpqexJ
 
 	By passing the `-c` option, the password is also copied to the clipboard.
 
-	$ varuh -g 15 -c 
-	yeXlLlk??IOsvL6
+	$ varuh -g -c 
+	y6UpD$~uBI#8
 	Password copied to clipboard
 
 

From 0f06b642c40b7d9fa5f502b8ce68cc0a5fa7ca37 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 12 Dec 2021 14:10:46 +0530
Subject: [PATCH 20/58] ref issue #9 - Updated README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index a41ca76..ed0ead8 100644
--- a/README.md
+++ b/README.md
@@ -443,6 +443,8 @@ The following miscellaneous actions are supported.
 
 Generate a strong password of length ranging from 12 - 16.
 
+A `strong` password is defined as a cryptographically secure string contaning at least one upper-case letter, one punctuation character and one number.
+
 	$ varuh -g
 	7%zv/uzIgpqexJ
 

From 15147e8d9b272cedba7ad08ec778daebe896d7cc Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 12 Dec 2021 23:57:41 +0530
Subject: [PATCH 21/58] ref issue #6 - Allow custom fields

---
 actions.go | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 92 insertions(+), 2 deletions(-)

diff --git a/actions.go b/actions.go
index e6db91c..e413c78 100644
--- a/actions.go
+++ b/actions.go
@@ -15,6 +15,11 @@ import (
 	"syscall"
 )
 
+type CustomEntry struct {
+	fieldName  string
+	fieldValue string
+}
+
 // Wrappers (closures) for functions accepting strings as input for in/out encryption
 func WrapperMaxKryptStringFunc(fn actionFunc) actionFunc {
 
@@ -219,6 +224,7 @@ func addNewEntry() error {
 	var notes string
 	var passwd string
 	var err error
+	var customEntries []CustomEntry
 
 	if err = checkActiveDatabase(); err != nil {
 		return err
@@ -260,8 +266,10 @@ func addNewEntry() error {
 		return errors.New("invalid input")
 	}
 
+	customEntries = addCustomFields(reader)
+
 	// Trim spaces
-	err = addNewDatabaseEntry(title, userName, url, passwd, notes)
+	err = addNewDatabaseEntry(title, userName, url, passwd, notes, customEntries)
 
 	if err != nil {
 		fmt.Printf("Error adding entry - \"%s\"\n", err.Error())
@@ -270,6 +278,86 @@ func addNewEntry() error {
 	return err
 }
 
+// Function to update existing custom entries and add new ones
+// The bool part of the return value indicates whether to take action
+func addOrUpdateCustomFields(reader *bufio.Reader, entry *Entry) ([]CustomEntry, bool) {
+
+	var customEntries []ExtendedEntry
+	var editedCustomEntries []CustomEntry
+	var newCustomEntries []CustomEntry
+	var flag bool
+
+	customEntries = getExtendedEntries(entry)
+
+	if len(customEntries) > 0 {
+
+		fmt.Println("Editing/deleting custom fields")
+		for _, customEntry := range customEntries {
+			var fieldName string
+			var fieldValue string
+
+			fmt.Println("Field Name: " + customEntry.FieldName)
+			fieldName = readInput(reader, "\tNew Field Name (Enter to keep, \"x\" to delete)")
+			if strings.ToLower(strings.TrimSpace(fieldName)) == "x" {
+				fmt.Println("Deleting field " + fieldName)
+			} else {
+				if strings.TrimSpace(fieldName) == "" {
+					fieldName = customEntry.FieldName
+				}
+
+				fmt.Println("Field Value: " + customEntry.FieldValue)
+				fieldValue = readInput(reader, "\tNew Field Value (Enter to keep)")
+				if strings.TrimSpace(fieldValue) == "" {
+					fieldValue = customEntry.FieldValue
+				}
+
+				editedCustomEntries = append(editedCustomEntries, CustomEntry{fieldName, fieldValue})
+			}
+		}
+	}
+
+	newCustomEntries = addCustomFields(reader)
+
+	editedCustomEntries = append(editedCustomEntries, newCustomEntries...)
+
+	// Cases where length == 0
+	// 1. Existing entries - all deleted
+	flag = len(customEntries) > 0 || len(editedCustomEntries) > 0
+
+	return editedCustomEntries, flag
+}
+
+// Function to add custom fields to an entry
+func addCustomFields(reader *bufio.Reader) []CustomEntry {
+
+	// Custom fields
+	var custom string
+	var customEntries []CustomEntry
+
+	custom = readInput(reader, "Do you want to add custom fields [y/N]")
+	if strings.ToLower(custom) == "y" {
+
+		fmt.Println("Keep entering custom field name followed by the value. Press return with no input once done.")
+		for true {
+			var customFieldName string
+			var customFieldValue string
+
+			customFieldName = strings.TrimSpace(readInput(reader, "Field Name"))
+			if customFieldName != "" {
+				customFieldValue = strings.TrimSpace(readInput(reader, "Value for "+customFieldName))
+			}
+
+			if customFieldName == "" && customFieldValue == "" {
+				break
+			}
+
+			customEntries = append(customEntries, CustomEntry{customFieldName, customFieldValue})
+		}
+	}
+
+	return customEntries
+}
+
 // Edit a current entry by id
 func editCurrentEntry(idString string) error {
 
@@ -322,8 +410,10 @@ func editCurrentEntry(idString string) error {
 	fmt.Printf("\nCurrent Notes: %s\n", entry.Notes)
 	notes = readInput(reader, "New Notes")
 
+	customEntries, flag := addOrUpdateCustomFields(reader, entry)
+
 	// Update
-	err = updateDatabaseEntry(entry, title, userName, url, passwd, notes)
+	err = updateDatabaseEntry(entry, title, userName, url, passwd, notes, customEntries, flag)
 	if err != nil {
 		fmt.Printf("Error updating entry - \"%s\"\n", err.Error())
 	}

From b9386fd1e7a9c4eef42b79badfcb184be1b55d6b Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Mon, 13 Dec 2021 00:00:01 +0530
Subject: [PATCH 22/58] ref issue #6 - custom fields

---
 db.go | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 111 insertions(+), 3 deletions(-)

diff --git a/db.go b/db.go
index 9992591..423085f 100644
--- a/db.go
+++ b/db.go
@@ -29,6 +29,21 @@ func (e *Entry) TableName() string {
 	return "entries"
 }
 
+// Structure representing an extended entry in the db - for custom fields
+type ExtendedEntry struct {
+	ID         int       `gorm:"column:id;autoIncrement;primaryKey"`
+	FieldName  string    `gorm:"column:field_name"`
+	FieldValue string    `gorm:"column:field_value"`
+	Timestamp  time.Time `gorm:"type:timestamp;default:(datetime('now','localtime'))"` // sqlite3
+
+	Entry   Entry `gorm:"foreignKey:EntryID"`
+	EntryID int
+}
+
+func (ex *ExtendedEntry) TableName() string {
+	return "exentries"
+}
+
 // Clone an entry
 func (e1 *Entry) Copy(e2 *Entry) {
 
@@ -55,6 +70,11 @@ func createNewEntry(db *gorm.DB) error {
 	return db.AutoMigrate(&Entry{})
 }
 
+// Create a new table for Extended Entries in the database
+func createNewExEntry(db *gorm.DB) error {
+	return db.AutoMigrate(&ExtendedEntry{})
+}
+
 // Init new database including tables
 func initNewDatabase(dbPath string) error {
 
@@ -94,6 +114,12 @@ func initNewDatabase(dbPath string) error {
 		return err
 	}
 
+	err = createNewExEntry(db)
+	if err != nil {
+		fmt.Printf("Error creating schema - \"%s\"\n", err.Error())
+		return err
+	}
+
 	fmt.Printf("Created new database - %s\n", dbPath)
 
 	// Update config
@@ -133,8 +159,67 @@ func openActiveDatabase() (error, *gorm.DB) {
 	return nil, db
 }
 
+// Add custom entries to a database entry
+func addCustomEntries(db *gorm.DB, entry *Entry, customEntries []CustomEntry) error {
+
+	var count int
+	var err error
+
+	err = createNewExEntry(db)
+	if err != nil {
+		fmt.Printf("Error creating schema - \"%s\"\n", err.Error())
+		return err
+	}
+
+	for _, customEntry := range customEntries {
+		var exEntry ExtendedEntry
+
+		exEntry = ExtendedEntry{FieldName: customEntry.fieldName, FieldValue: customEntry.fieldValue,
+			EntryID: entry.ID}
+
+		resultEx := db.Create(&exEntry)
+		if resultEx.Error == nil && resultEx.RowsAffected == 1 {
+			count += 1
+		}
+	}
+
+	fmt.Printf("Created %d custom entries for entry: %d.\n", count, entry.ID)
+	return nil
+}
+
+// Replace custom entries to a database entry (Drop existing and add fresh)
+func replaceCustomEntries(db *gorm.DB, entry *Entry, updatedEntries []CustomEntry) error {
+
+	var count int
+	var err error
+	var customEntries []ExtendedEntry
+
+	err = createNewExEntry(db)
+	if err != nil {
+		fmt.Printf("Error creating schema - \"%s\"\n", err.Error())
+		return err
+	}
+
+	db.Where("entry_id = ?", entry.ID).Delete(&customEntries)
+
+	for _, customEntry := range updatedEntries {
+		var exEntry ExtendedEntry
+
+		exEntry = ExtendedEntry{FieldName: customEntry.fieldName, FieldValue: customEntry.fieldValue,
+			EntryID: entry.ID}
+
+		resultEx := db.Create(&exEntry)
+		if resultEx.Error == nil && resultEx.RowsAffected == 1 {
+			count += 1
+		}
+	}
+
+	fmt.Printf("Created %d custom entries for entry: %d.\n", count, entry.ID)
+	return nil
+}
+
 // Add a new entry to current database
-func addNewDatabaseEntry(title, userName, url, passwd, notes string) error {
+func addNewDatabaseEntry(title, userName, url, passwd, notes string, customEntries []CustomEntry) error {
 
 	var entry Entry
 	var err error
@@ -147,7 +232,11 @@ func addNewDatabaseEntry(title, userName, url, passwd, notes string) error {
 		//		result := db.Debug().Create(&entry)
 		result := db.Create(&entry)
 		if result.Error == nil && result.RowsAffected == 1 {
+			// Add custom fields if given
 			fmt.Printf("Created new entry with id: %d.\n", entry.ID)
+			if len(customEntries) > 0 {
+				return addCustomEntries(db, &entry, customEntries)
+			}
 			return nil
 		} else if result.Error != nil {
 			return result.Error
@@ -158,7 +247,7 @@ func addNewDatabaseEntry(title, userName, url, passwd, notes string) error {
 }
 
 // Update current database entry with new values
-func updateDatabaseEntry(entry *Entry, title, userName, url, passwd, notes string) error {
+func updateDatabaseEntry(entry *Entry, title, userName, url, passwd, notes string, customEntries []CustomEntry, flag bool) error {
 
 	var updateMap map[string]interface{}
 
@@ -172,7 +261,7 @@ func updateDatabaseEntry(entry *Entry, title, userName, url, passwd, notes strin
 		}
 	}
 
-	if len(updateMap) == 0 {
+	if len(updateMap) == 0 && !flag {
 		fmt.Printf("Nothing to update\n")
 		return nil
 	}
@@ -188,6 +277,9 @@ func updateDatabaseEntry(entry *Entry, title, userName, url, passwd, notes strin
 			return result.Error
 		}
 
+		if flag {
+			replaceCustomEntries(db, entry, customEntries)
+		}
 		fmt.Println("Updated entry.")
 		return nil
 	}
@@ -354,3 +446,19 @@ func entriesToStringArray(skipLongFields bool) (error, [][]string) {
 
 	return err, dataArray
 }
+
+// Get extended entries associated to an entry
+func getExtendedEntries(entry *Entry) []ExtendedEntry {
+
+	var err error
+	var db *gorm.DB
+	var customEntries []ExtendedEntry
+
+	err, db = openActiveDatabase()
+
+	if err == nil && db != nil {
+		db.Where("entry_id = ?", entry.ID).Find(&customEntries)
+	}
+
+	return customEntries
+}

From ccc29313061c79544f484242021741d5a3778031 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Mon, 13 Dec 2021 00:00:39 +0530
Subject: [PATCH 23/58] ref issue #9 - minor fix in cmd line

---
 main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.go b/main.go
index 6f90f87..0df1d8f 100644
--- a/main.go
+++ b/main.go
@@ -185,7 +185,7 @@ func initializeCmdLine(parser *argparse.Parser) map[string]interface{} {
 		{"A", "add", "Add a new entry", "", ""},
 		{"p", "path", "Show current database path", "", ""},
 		{"a", "list-all", "List all entries in current database", "", ""},
-		{"g", "genpass", "Generate a strong password of length from 12 - 16", "", ""},
+		{"g", "genpass", "Generate a strong password (length: 12 - 16)", "", ""},
 		{"s", "show", "Show passwords when listing entries", "", ""},
 		{"c", "copy", "Copy password to clipboard", "", ""},
 		{"v", "version", "Show version information and exit", "", ""},

From 3cb75a3751809441919e5a0ff7a8259418f68cfa Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Mon, 13 Dec 2021 00:01:04 +0530
Subject: [PATCH 24/58] ref issue #6 - print custom fields

---
 utils.go | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/utils.go b/utils.go
index dab41f7..440cad3 100644
--- a/utils.go
+++ b/utils.go
@@ -283,6 +283,7 @@ func printEntry(entry *Entry, delim bool) error {
 
 	var err error
 	var settings *Settings
+	var customEntries []ExtendedEntry
 
 	err, settings = getOrCreateLocalConfig(APP)
 
@@ -316,7 +317,17 @@ func printEntry(entry *Entry, delim bool) error {
 		fmt.Printf("Password: %s\n", strings.Join(asterisks, ""))
 	}
 	fmt.Printf("Notes: %s\n", entry.Notes)
+	// Query extended entries
+	customEntries = getExtendedEntries(entry)
+
+	if len(customEntries) > 0 {
+		for _, customEntry := range customEntries {
+			fmt.Printf("%s: %s\n", customEntry.FieldName, customEntry.FieldValue)
+		}
+	}
+
 	fmt.Printf("Modified: %s\n", entry.Timestamp.Format("2006-06-02 15:04:05"))
+
 	printDelim(settings.Delim, settings.Color)
 
 	// Reset

From 227d8d014a022d770c9d626fef3ebfdafd3faaf7 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Mon, 13 Dec 2021 00:18:47 +0530
Subject: [PATCH 25/58] ref issue #6 - Updated README for custom fields

---
 README.md | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 72 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index ed0ead8..e30b918 100644
--- a/README.md
+++ b/README.md
@@ -148,6 +148,7 @@ The password database is created and is active now. You can start adding entries
 	Password (enter to generate new): 
 	Generating password ...done
 	Notes: Website uses Nginx auth
+	Do you want to add custom fields [y/N]: 
 	Created new entry with id: 1
 
 You can now list the entry with one of the list options.
@@ -163,6 +164,36 @@ You can now list the entry with one of the list options.
 	Modified: 2021-21-09 23:12:35
 	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
+## Add an entry with custom fields
+
+From version 0.3 onwards, custom fields are supported.
+
+	$ varuh -A
+	Title: Github token
+	URL: https://github.com/mydev/myproject
+	Username: mydev
+	Password (enter to generate new): ghp_ipQrStuVwxYz1a2b3cdEF10ghI689kLaMnOp
+	Notes: Never Expires
+	Do you want to add custom fields [y/N]: y
+	Field Name: Domain
+	Value for Domain: github.com
+	Field Name: Type
+	Value for Type: Auth Token
+	Field Name:
+	Created new entry with id: 6
+
+	$ varuh -l 6
+	ID: 6
+	Title: Github token
+	User: mydev
+	URL: https://github.com/mydev/myproject
+	Password: ghp_ipQrStuVwxYz1a2b3cdEF10ghI689kLaMnOp
+	Notes: Never Expires
+	Domain: github.com
+	Type: Auth Token
+	Modified: 2021-21-13 00:07:18
+
+
 For more on listing see the [Listing and Searching](#listing-and-searching) section below.
 
 ## Edit an entry
@@ -178,6 +209,7 @@ For more on listing see the [Listing and Searching](#listing-and-searching) sect
 	New Password ([y/Y] to generate new, enter will keep old one): 
 	Current Notes: Website uses Nginx auth
 	New Notes: Website uses Apache
+	Do you want to add custom fields [y/N]:
 	Updated entry.
 
 	$ varuh -l 1 -s
@@ -191,6 +223,42 @@ For more on listing see the [Listing and Searching](#listing-and-searching) sect
 	Modified: 2021-21-09 23:15:29
 	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
+## Edit an entry with custom fields
+
+When you edit an entry with custom fields, you get the option to change the name of the fields or delete the fields entirely.
+
+	$ varuh -E 6
+	Current Title: Github token
+	New Title:
+	Current URL: https://github.com/mydev/myproject
+	New URL:
+	Current Username: mydev
+	New Username: 
+	Current Password: ghp_ipQrStuVwxYz1a2b3cdEF10ghI689kLaMnOp
+	New Password ([y/Y] to generate new, enter will keep old one): 
+	Current Notes: Never Expires
+	New Notes:
+	Editing/deleting custom fields
+	Field Name: Domain
+		New Field Name (Enter to keep, "x" to delete): x
+	Field Name: Type
+		New Field Name (Enter to keep, "x" to delete): Token Type
+	Field Value: Auth Token
+        New Field Value (Enter to keep): 
+	Do you want to add custom fields [y/N]: 
+	Created 1 custom entries for entry: 21.
+	Updated entry.
+
+	$ varuh -l 6 -s
+	ID: 6
+	Title: Github token
+	User: mydev
+	URL: https://github.com/mydev/myproject
+	Password: ghp_ipQrStuVwxYz1a2b3cdEF10ghI689kLaMnOp
+	Notes: Never Expires
+	Token Type: Auth Token
+	Modified: 2021-21-13 00:16:41
+
 (*-s* turns on visible passwords)
 
 ## Clone an entry
@@ -198,7 +266,7 @@ For more on listing see the [Listing and Searching](#listing-and-searching) sect
 To clone (copy) an entry,
 
 	$ $ varuh -C 1
-	Cloned to new entry, id: 2
+	Cloned to new entry, id: 3
 
 ## Remove an entry
 
@@ -207,8 +275,8 @@ To clone (copy) an entry,
 
 It is an error if the id does not exist.
 
-	$ varuh -R 3
-	No entry with id 3 was found
+	$ varuh -R 4
+	No entry with id 4 was found
 
 ## Switch to a new database
 
@@ -260,7 +328,7 @@ Manually decrypt the database using `-d` option.
 
 Now the database is active again and you can see the listings.
 
-	$ varuh -l 2
+	$ varuh -l 3
 	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 	ID: 2
 	Title: My Blog Login

From 61b95cce7521ffae0c36fb43836db52fff50a3b6 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Mon, 13 Dec 2021 23:55:30 +0530
Subject: [PATCH 26/58] ref issue #21 - Removal also accepts a range of ids

---
 actions.go | 74 ++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 58 insertions(+), 16 deletions(-)

diff --git a/actions.go b/actions.go
index e413c78..f4b8153 100644
--- a/actions.go
+++ b/actions.go
@@ -248,7 +248,7 @@ func addNewEntry() error {
 		err, passwd = generateStrongPassword()
 		fmt.Printf("done")
 	}
-	//	fmt.Printf("Password => %s\n", passwd)
+	//  fmt.Printf("Password => %s\n", passwd)
 
 	notes = readInput(reader, "\nNotes")
 
@@ -405,7 +405,7 @@ func editCurrentEntry(idString string) error {
 		fmt.Printf("\nGenerating new password ...")
 		err, passwd = generateStrongPassword()
 	}
-	//	fmt.Printf("Password => %s\n", passwd)
+	//  fmt.Printf("Password => %s\n", passwd)
 
 	fmt.Printf("\nCurrent Notes: %s\n", entry.Notes)
 	notes = readInput(reader, "New Notes")
@@ -434,7 +434,7 @@ func listCurrentEntry(idString string) error {
 
 	id, _ = strconv.Atoi(idString)
 
-	//	fmt.Printf("Listing current entry - %d\n", id)
+	//  fmt.Printf("Listing current entry - %d\n", id)
 	err, entry = getEntryById(id)
 	if err != nil || entry == nil {
 		fmt.Printf("No entry found for id %d\n", id)
@@ -444,7 +444,7 @@ func listCurrentEntry(idString string) error {
 	err = printEntry(entry, true)
 
 	if err == nil && settingsRider.CopyPassword {
-		//		fmt.Printf("Copying password " + entry.Password + " to clipboard\n")
+		//      fmt.Printf("Copying password " + entry.Password + " to clipboard\n")
 		copyPasswordToClipboard(entry.Password)
 	}
 
@@ -547,17 +547,51 @@ func findCurrentEntry(term string) error {
 	return err
 }
 
+// Remove a range of entries <id1>-<id2> say 10-14
+func removeMultipleEntries(idRangeEntry string) error {
+
+	var err error
+	var idRange []string
+	var id1, id2 int
+
+	idRange = strings.Split(idRangeEntry, "-")
+
+	if len(idRange) != 2 {
+		fmt.Println("Invalid id range - " + idRangeEntry)
+		return errors.New("Invalid id range - " + idRangeEntry)
+	}
+
+	id1, _ = strconv.Atoi(idRange[0])
+	id2, _ = strconv.Atoi(idRange[1])
+
+	if id1 >= id2 {
+		fmt.Println("Invalid id range - " + idRangeEntry)
+		return errors.New("Invalid id range - " + idRangeEntry)
+	}
+
+	for idNum := id1; idNum <= id2; idNum++ {
+		err = removeCurrentEntry(fmt.Sprintf("%d", idNum))
+	}
+
+	return err
+}
+
 // Remove current entry by id
 func removeCurrentEntry(idString string) error {
 
 	var err error
 	var entry *Entry
 	var id int
+	var response string
 
 	if err = checkActiveDatabase(); err != nil {
 		return err
 	}
 
+	if strings.Contains(idString, "-") {
+		return removeMultipleEntries(idString)
+	}
+
 	id, _ = strconv.Atoi(idString)
 
 	err, entry = getEntryById(id)
@@ -566,10 +600,18 @@ func removeCurrentEntry(idString string) error {
 		return err
 	}
 
-	// Drop from the database
-	err = removeDatabaseEntry(entry)
-	if err == nil {
-		fmt.Printf("Entry with id %d was removed from the database\n", id)
+	printEntryMinimal(entry, true)
+
+	response = readInput(bufio.NewReader(os.Stdin), "Please confirm removal [Y/n]: ")
+
+	if strings.ToLower(response) != "n" {
+		// Drop from the database
+		err = removeDatabaseEntry(entry)
+		if err == nil {
+			fmt.Printf("Entry with id %d was removed from the database\n", id)
+		}
+	} else {
+		fmt.Println("Removal of entry canceled by user.")
 	}
 
 	return err
@@ -655,7 +697,7 @@ func encryptDatabase(dbPath string, givenPasswd *string) error {
 		}
 	}
 
-	//	err = encryptFileAES(dbPath, passwd)
+	//  err = encryptFileAES(dbPath, passwd)
 	_, settings := getOrCreateLocalConfig(APP)
 
 	switch settings.Cipher {
@@ -796,7 +838,7 @@ func exportToMarkdown(fileName string) error {
 		}
 	}
 
-	//	fmt.Printf("%+v\n", maxLengths)
+	//  fmt.Printf("%+v\n", maxLengths)
 	fh, err = os.Create(fileName)
 	if err != nil {
 		fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
@@ -810,7 +852,7 @@ func exportToMarkdown(fileName string) error {
 	// Write markdown header
 	for idx, length := range maxLengths {
 		delta := length - len(headers[idx])
-		//		fmt.Printf("%d\n", delta)
+		//      fmt.Printf("%d\n", delta)
 		if delta > 0 {
 			for i := 0; i < delta+2; i++ {
 				headers[idx] += " "
@@ -872,7 +914,7 @@ func exportToPDF(fileName string) error {
 	}
 
 	tmpFile = randomFileName(os.TempDir(), ".tmp")
-	//	fmt.Printf("Temp file => %s\n", tmpFile)
+	//  fmt.Printf("Temp file => %s\n", tmpFile)
 	err = exportToMarkdownLimited(tmpFile)
 
 	if err == nil {
@@ -889,7 +931,7 @@ func exportToPDF(fileName string) error {
 
 			if pdfTkFound && len(passwd) > 0 {
 				tmpFile = randomFileName(".", ".pdf")
-				//				fmt.Printf("pdf file => %s\n", tmpFile)
+				//              fmt.Printf("pdf file => %s\n", tmpFile)
 				args = []string{fileName, "output", tmpFile, "user_pw", passwd}
 				cmd = exec.Command("pdftk", args...)
 				_, err = cmd.Output()
@@ -935,7 +977,7 @@ func exportToMarkdownLimited(fileName string) error {
 		}
 	}
 
-	//	fmt.Printf("%+v\n", maxLengths)
+	//  fmt.Printf("%+v\n", maxLengths)
 	fh, err = os.Create(fileName)
 	if err != nil {
 		fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
@@ -949,7 +991,7 @@ func exportToMarkdownLimited(fileName string) error {
 	// Write markdown header
 	for idx, length := range maxLengths {
 		delta := length - len(headers[idx])
-		//		fmt.Printf("%d\n", delta)
+		//      fmt.Printf("%d\n", delta)
 		if delta > 0 {
 			for i := 0; i < delta+2; i++ {
 				headers[idx] += " "
@@ -1000,7 +1042,7 @@ func exportToHTML(fileName string) error {
 		return err
 	}
 
-	//	fmt.Printf("%+v\n", maxLengths)
+	//  fmt.Printf("%+v\n", maxLengths)
 	fh, err = os.Create(fileName)
 	if err != nil {
 		fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())

From 91ff95a2a1aba8f24f65c3cdcedc053252f25771 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Mon, 13 Dec 2021 23:56:14 +0530
Subject: [PATCH 27/58] ref issue #21 - Addded printEntryMinimal

---
 utils.go | 42 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/utils.go b/utils.go
index 440cad3..abd84f7 100644
--- a/utils.go
+++ b/utils.go
@@ -104,7 +104,7 @@ func getOrCreateLocalConfig(app string) (error, *Settings) {
 	}
 
 	configFile = filepath.Join(configPath, "config.json")
-	//	fmt.Printf("Config file, path => %s %s\n", configFile, configPath)
+	//  fmt.Printf("Config file, path => %s %s\n", configFile, configPath)
 
 	if _, err = os.Stat(configFile); err == nil {
 		fh, err = os.Open(configFile)
@@ -121,7 +121,7 @@ func getOrCreateLocalConfig(app string) (error, *Settings) {
 		}
 
 	} else {
-		//		fmt.Printf("Creating default configuration ...")
+		//      fmt.Printf("Creating default configuration ...")
 		settings = Settings{"", "aes", true, true, false, configFile, "id,asc", "+", "default", "bgblack"}
 
 		if err = writeSettings(&settings, configFile); err == nil {
@@ -337,6 +337,42 @@ func printEntry(entry *Entry, delim bool) error {
 
 }
 
+// Print an entry to the console with minimal data
+func printEntryMinimal(entry *Entry, delim bool) error {
+
+	var err error
+	var settings *Settings
+
+	err, settings = getOrCreateLocalConfig(APP)
+
+	if err != nil {
+		fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
+		return err
+	}
+
+	fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
+	if strings.HasPrefix(settings.BgColor, "bg") {
+		fmt.Printf("%s", getColor(strings.ToLower(settings.BgColor)))
+	}
+
+	if delim {
+		printDelim(settings.Delim, settings.Color)
+	}
+
+	fmt.Printf("Title: %s\n", entry.Title)
+	fmt.Printf("User: %s\n", entry.User)
+	fmt.Printf("URL: %s\n", entry.Url)
+	fmt.Printf("Modified: %s\n", entry.Timestamp.Format("2006-06-02 15:04:05"))
+
+	printDelim(settings.Delim, settings.Color)
+
+	// Reset
+	fmt.Printf("%s", getColor("default"))
+
+	return nil
+
+}
+
 // Read user input and return entered value
 func readInput(reader *bufio.Reader, prompt string) string {
 
@@ -397,7 +433,7 @@ func isActiveDatabaseEncryptedAndMaxKryptOn() (bool, string) {
 
 // (Temporarily) enable showing of passwords
 func setShowPasswords() error {
-	//	fmt.Printf("Setting show passwords to true\n")
+	//  fmt.Printf("Setting show passwords to true\n")
 	settingsRider.ShowPasswords = true
 	return nil
 }

From 0bbb983b32f25d4aec20da0417e30224a6bb21a4 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Tue, 14 Dec 2021 10:15:13 +0530
Subject: [PATCH 28/58] ref issue #21 canceled -> cancelled

---
 actions.go | 1796 ++++++++++++++++++++++++++--------------------------
 1 file changed, 898 insertions(+), 898 deletions(-)

diff --git a/actions.go b/actions.go
index f4b8153..9bec025 100644
--- a/actions.go
+++ b/actions.go
@@ -2,1127 +2,1127 @@
 package main
 
 import (
-	"bufio"
-	"encoding/csv"
-	"errors"
-	"fmt"
-	"os"
-	"os/exec"
-	"os/signal"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"syscall"
+    "bufio"
+    "encoding/csv"
+    "errors"
+    "fmt"
+    "os"
+    "os/exec"
+    "os/signal"
+    "path/filepath"
+    "strconv"
+    "strings"
+    "syscall"
 )
 
 type CustomEntry struct {
-	fieldName  string
-	fieldValue string
+    fieldName  string
+    fieldValue string
 }
 
 // Wrappers (closures) for functions accepting strings as input for in/out encryption
 func WrapperMaxKryptStringFunc(fn actionFunc) actionFunc {
 
-	return func(inputStr string) error {
-		var maxKrypt bool
-		var defaultDB string
-		var encPasswd string
-		var err error
+    return func(inputStr string) error {
+        var maxKrypt bool
+        var defaultDB string
+        var encPasswd string
+        var err error
 
-		maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
+        maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
 
-		// If max krypt on - then autodecrypt on call and auto encrypt after call
-		if maxKrypt {
-			err, encPasswd = decryptDatabase(defaultDB)
-			if err != nil {
-				return err
-			}
+        // If max krypt on - then autodecrypt on call and auto encrypt after call
+        if maxKrypt {
+            err, encPasswd = decryptDatabase(defaultDB)
+            if err != nil {
+                return err
+            }
 
-			sigChan := make(chan os.Signal, 1)
-			signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
+            sigChan := make(chan os.Signal, 1)
+            signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
 
-			go func() {
-				sig := <-sigChan
-				fmt.Println("Received signal", sig)
-				// Reencrypt
-				encryptDatabase(defaultDB, &encPasswd)
-				os.Exit(1)
-			}()
-		}
+            go func() {
+                sig := <-sigChan
+                fmt.Println("Received signal", sig)
+                // Reencrypt
+                encryptDatabase(defaultDB, &encPasswd)
+                os.Exit(1)
+            }()
+        }
 
-		err = fn(inputStr)
+        err = fn(inputStr)
 
-		// If max krypt on - then autodecrypt on call and auto encrypt after call
-		if maxKrypt {
-			encryptDatabase(defaultDB, &encPasswd)
-		}
+        // If max krypt on - then autodecrypt on call and auto encrypt after call
+        if maxKrypt {
+            encryptDatabase(defaultDB, &encPasswd)
+        }
 
-		return err
-	}
+        return err
+    }
 
 }
 
 // Wrappers (closures) for functions accepting no input for in/out encryption
 func WrapperMaxKryptVoidFunc(fn voidFunc) voidFunc {
 
-	return func() error {
-		var maxKrypt bool
-		var defaultDB string
-		var encPasswd string
-		var err error
+    return func() error {
+        var maxKrypt bool
+        var defaultDB string
+        var encPasswd string
+        var err error
 
-		maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
+        maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
 
-		// If max krypt on - then autodecrypt on call and auto encrypt after call
-		if maxKrypt {
-			err, encPasswd = decryptDatabase(defaultDB)
-			if err != nil {
-				return err
-			}
+        // If max krypt on - then autodecrypt on call and auto encrypt after call
+        if maxKrypt {
+            err, encPasswd = decryptDatabase(defaultDB)
+            if err != nil {
+                return err
+            }
 
-			sigChan := make(chan os.Signal, 1)
-			signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
+            sigChan := make(chan os.Signal, 1)
+            signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
 
-			go func() {
-				sig := <-sigChan
-				fmt.Println("Received signal", sig)
-				// Reencrypt
-				encryptDatabase(defaultDB, &encPasswd)
-				os.Exit(1)
-			}()
-		}
+            go func() {
+                sig := <-sigChan
+                fmt.Println("Received signal", sig)
+                // Reencrypt
+                encryptDatabase(defaultDB, &encPasswd)
+                os.Exit(1)
+            }()
+        }
 
-		err = fn()
+        err = fn()
 
-		// If max krypt on - then autodecrypt on call and auto encrypt after call
-		if maxKrypt {
-			encryptDatabase(defaultDB, &encPasswd)
-		}
+        // If max krypt on - then autodecrypt on call and auto encrypt after call
+        if maxKrypt {
+            encryptDatabase(defaultDB, &encPasswd)
+        }
 
-		return err
-	}
+        return err
+    }
 
 }
 
 // Print the current active database path
 func showActiveDatabasePath() error {
 
-	err, settings := getOrCreateLocalConfig(APP)
-
-	if err != nil {
-		fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
-		return err
-	}
-
-	if settings != nil {
-		if settings.ActiveDB != "" {
-			fmt.Printf("%s\n", settings.ActiveDB)
-		} else {
-			fmt.Println("No active database")
-		}
-		return nil
-	} else {
-		fmt.Printf("Error - null config\n")
-		return errors.New("null config")
-	}
+    err, settings := getOrCreateLocalConfig(APP)
+
+    if err != nil {
+        fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
+        return err
+    }
+
+    if settings != nil {
+        if settings.ActiveDB != "" {
+            fmt.Printf("%s\n", settings.ActiveDB)
+        } else {
+            fmt.Println("No active database")
+        }
+        return nil
+    } else {
+        fmt.Printf("Error - null config\n")
+        return errors.New("null config")
+    }
 }
 
 // Set the current active database path
 func setActiveDatabasePath(dbPath string) error {
 
-	var fullPath string
-	var activeEncrypted bool
-	var newEncrypted bool
-
-	err, settings := getOrCreateLocalConfig(APP)
-
-	if err != nil {
-		fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
-		return err
-	}
-
-	if settings != nil {
-		var flag bool
-
-		if _, err = os.Stat(dbPath); os.IsNotExist(err) {
-			fmt.Printf("Error - path %s does not exist\n", dbPath)
-			return err
-		}
-
-		fullPath, _ = filepath.Abs(dbPath)
-
-		if fullPath == settings.ActiveDB {
-			fmt.Printf("Current database is \"%s\" - nothing to do\n", fullPath)
-			return nil
-		}
-
-		if _, flag = isFileEncrypted(settings.ActiveDB); flag {
-			activeEncrypted = true
-		}
-
-		if _, flag = isFileEncrypted(fullPath); flag {
-			newEncrypted = true
-		}
-
-		// If autoencrypt is true - encrypt current DB automatically
-		if settings.AutoEncrypt {
-			if !activeEncrypted {
-				fmt.Printf("Encrypting current active database - %s\n", settings.ActiveDB)
-				err = encryptActiveDatabase()
-				if err == nil {
-					activeEncrypted = true
-				}
-			}
-
-			if newEncrypted {
-				// Decrypt new database if it is encrypted
-				fmt.Printf("Database %s is encrypted, decrypting it\n", fullPath)
-				err, _ = decryptDatabase(fullPath)
-				if err != nil {
-					fmt.Printf("Decryption Error - \"%s\", not switching databases\n", err.Error())
-					return err
-				} else {
-					newEncrypted = false
-				}
-			}
-		}
-
-		if !activeEncrypted {
-			// Use should manually encrypt before switching
-			fmt.Println("Auto-encrypt disabled, encrypt existing database before switching to new.")
-			return nil
-		}
-
-		if newEncrypted {
-			// Use should manually decrypt before switching
-			fmt.Println("Auto-encrypt disabled, decrypt new database manually before switching.")
-			return nil
-		}
-
-		settings.ActiveDB = fullPath
-		err = updateSettings(settings, settings.ConfigPath)
-		if err == nil {
-			fmt.Println("Switched active database successfully.")
-		} else {
-			fmt.Printf("Error updating settings - \"%s\"\n", err.Error())
-		}
-
-		return err
-
-	} else {
-		fmt.Printf("Error - null config\n")
-		return errors.New("null config")
-	}
+    var fullPath string
+    var activeEncrypted bool
+    var newEncrypted bool
+
+    err, settings := getOrCreateLocalConfig(APP)
+
+    if err != nil {
+        fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
+        return err
+    }
+
+    if settings != nil {
+        var flag bool
+
+        if _, err = os.Stat(dbPath); os.IsNotExist(err) {
+            fmt.Printf("Error - path %s does not exist\n", dbPath)
+            return err
+        }
+
+        fullPath, _ = filepath.Abs(dbPath)
+
+        if fullPath == settings.ActiveDB {
+            fmt.Printf("Current database is \"%s\" - nothing to do\n", fullPath)
+            return nil
+        }
+
+        if _, flag = isFileEncrypted(settings.ActiveDB); flag {
+            activeEncrypted = true
+        }
+
+        if _, flag = isFileEncrypted(fullPath); flag {
+            newEncrypted = true
+        }
+
+        // If autoencrypt is true - encrypt current DB automatically
+        if settings.AutoEncrypt {
+            if !activeEncrypted {
+                fmt.Printf("Encrypting current active database - %s\n", settings.ActiveDB)
+                err = encryptActiveDatabase()
+                if err == nil {
+                    activeEncrypted = true
+                }
+            }
+
+            if newEncrypted {
+                // Decrypt new database if it is encrypted
+                fmt.Printf("Database %s is encrypted, decrypting it\n", fullPath)
+                err, _ = decryptDatabase(fullPath)
+                if err != nil {
+                    fmt.Printf("Decryption Error - \"%s\", not switching databases\n", err.Error())
+                    return err
+                } else {
+                    newEncrypted = false
+                }
+            }
+        }
+
+        if !activeEncrypted {
+            // Use should manually encrypt before switching
+            fmt.Println("Auto-encrypt disabled, encrypt existing database before switching to new.")
+            return nil
+        }
+
+        if newEncrypted {
+            // Use should manually decrypt before switching
+            fmt.Println("Auto-encrypt disabled, decrypt new database manually before switching.")
+            return nil
+        }
+
+        settings.ActiveDB = fullPath
+        err = updateSettings(settings, settings.ConfigPath)
+        if err == nil {
+            fmt.Println("Switched active database successfully.")
+        } else {
+            fmt.Printf("Error updating settings - \"%s\"\n", err.Error())
+        }
+
+        return err
+
+    } else {
+        fmt.Printf("Error - null config\n")
+        return errors.New("null config")
+    }
 }
 
 // Text menu driven function to add a new entry
 func addNewEntry() error {
 
-	var userName string
-	var title string
-	var url string
-	var notes string
-	var passwd string
-	var err error
-	var customEntries []CustomEntry
-
-	if err = checkActiveDatabase(); err != nil {
-		return err
-	}
-
-	reader := bufio.NewReader(os.Stdin)
-	title = readInput(reader, "Title")
-	url = readInput(reader, "URL")
-
-	if len(url) > 0 && !strings.HasPrefix(strings.ToLower(url), "http://") && !strings.HasPrefix(strings.ToLower(url), "https://") {
-		url = "http://" + url
-	}
-
-	userName = readInput(reader, "Username")
-
-	fmt.Printf("Password (enter to generate new): ")
-	err, passwd = readPassword()
-
-	if len(passwd) == 0 {
-		fmt.Printf("\nGenerating password ...")
-		err, passwd = generateStrongPassword()
-		fmt.Printf("done")
-	}
-	//  fmt.Printf("Password => %s\n", passwd)
-
-	notes = readInput(reader, "\nNotes")
-
-	// Title and username/password are mandatory
-	if len(title) == 0 {
-		fmt.Printf("Error - valid Title required\n")
-		return errors.New("invalid input")
-	}
-	if len(userName) == 0 {
-		fmt.Printf("Error - valid Username required\n")
-		return errors.New("invalid input")
-	}
-	if len(passwd) == 0 {
-		fmt.Printf("Error - valid Password required\n")
-		return errors.New("invalid input")
-	}
-
-	customEntries = addCustomFields(reader)
-
-	// Trim spaces
-	err = addNewDatabaseEntry(title, userName, url, passwd, notes, customEntries)
-
-	if err != nil {
-		fmt.Printf("Error adding entry - \"%s\"\n", err.Error())
-	}
-
-	return err
+    var userName string
+    var title string
+    var url string
+    var notes string
+    var passwd string
+    var err error
+    var customEntries []CustomEntry
+
+    if err = checkActiveDatabase(); err != nil {
+        return err
+    }
+
+    reader := bufio.NewReader(os.Stdin)
+    title = readInput(reader, "Title")
+    url = readInput(reader, "URL")
+
+    if len(url) > 0 && !strings.HasPrefix(strings.ToLower(url), "http://") && !strings.HasPrefix(strings.ToLower(url), "https://") {
+        url = "http://" + url
+    }
+
+    userName = readInput(reader, "Username")
+
+    fmt.Printf("Password (enter to generate new): ")
+    err, passwd = readPassword()
+
+    if len(passwd) == 0 {
+        fmt.Printf("\nGenerating password ...")
+        err, passwd = generateStrongPassword()
+        fmt.Printf("done")
+    }
+    //  fmt.Printf("Password => %s\n", passwd)
+
+    notes = readInput(reader, "\nNotes")
+
+    // Title and username/password are mandatory
+    if len(title) == 0 {
+        fmt.Printf("Error - valid Title required\n")
+        return errors.New("invalid input")
+    }
+    if len(userName) == 0 {
+        fmt.Printf("Error - valid Username required\n")
+        return errors.New("invalid input")
+    }
+    if len(passwd) == 0 {
+        fmt.Printf("Error - valid Password required\n")
+        return errors.New("invalid input")
+    }
+
+    customEntries = addCustomFields(reader)
+
+    // Trim spaces
+    err = addNewDatabaseEntry(title, userName, url, passwd, notes, customEntries)
+
+    if err != nil {
+        fmt.Printf("Error adding entry - \"%s\"\n", err.Error())
+    }
+
+    return err
 }
 
 // Function to update existing custom entries and add new ones
 // The bool part of the return value indicates whether to take action
 func addOrUpdateCustomFields(reader *bufio.Reader, entry *Entry) ([]CustomEntry, bool) {
 
-	var customEntries []ExtendedEntry
-	var editedCustomEntries []CustomEntry
-	var newCustomEntries []CustomEntry
-	var flag bool
+    var customEntries []ExtendedEntry
+    var editedCustomEntries []CustomEntry
+    var newCustomEntries []CustomEntry
+    var flag bool
 
-	customEntries = getExtendedEntries(entry)
+    customEntries = getExtendedEntries(entry)
 
-	if len(customEntries) > 0 {
+    if len(customEntries) > 0 {
 
-		fmt.Println("Editing/deleting custom fields")
-		for _, customEntry := range customEntries {
-			var fieldName string
-			var fieldValue string
+        fmt.Println("Editing/deleting custom fields")
+        for _, customEntry := range customEntries {
+            var fieldName string
+            var fieldValue string
 
-			fmt.Println("Field Name: " + customEntry.FieldName)
-			fieldName = readInput(reader, "\tNew Field Name (Enter to keep, \"x\" to delete)")
-			if strings.ToLower(strings.TrimSpace(fieldName)) == "x" {
-				fmt.Println("Deleting field " + fieldName)
-			} else {
-				if strings.TrimSpace(fieldName) == "" {
-					fieldName = customEntry.FieldName
-				}
+            fmt.Println("Field Name: " + customEntry.FieldName)
+            fieldName = readInput(reader, "\tNew Field Name (Enter to keep, \"x\" to delete)")
+            if strings.ToLower(strings.TrimSpace(fieldName)) == "x" {
+                fmt.Println("Deleting field " + fieldName)
+            } else {
+                if strings.TrimSpace(fieldName) == "" {
+                    fieldName = customEntry.FieldName
+                }
 
-				fmt.Println("Field Value: " + customEntry.FieldValue)
-				fieldValue = readInput(reader, "\tNew Field Value (Enter to keep)")
-				if strings.TrimSpace(fieldValue) == "" {
-					fieldValue = customEntry.FieldValue
-				}
+                fmt.Println("Field Value: " + customEntry.FieldValue)
+                fieldValue = readInput(reader, "\tNew Field Value (Enter to keep)")
+                if strings.TrimSpace(fieldValue) == "" {
+                    fieldValue = customEntry.FieldValue
+                }
 
-				editedCustomEntries = append(editedCustomEntries, CustomEntry{fieldName, fieldValue})
-			}
-		}
-	}
+                editedCustomEntries = append(editedCustomEntries, CustomEntry{fieldName, fieldValue})
+            }
+        }
+    }
 
-	newCustomEntries = addCustomFields(reader)
+    newCustomEntries = addCustomFields(reader)
 
-	editedCustomEntries = append(editedCustomEntries, newCustomEntries...)
+    editedCustomEntries = append(editedCustomEntries, newCustomEntries...)
 
-	// Cases where length == 0
-	// 1. Existing entries - all deleted
-	flag = len(customEntries) > 0 || len(editedCustomEntries) > 0
+    // Cases where length == 0
+    // 1. Existing entries - all deleted
+    flag = len(customEntries) > 0 || len(editedCustomEntries) > 0
 
-	return editedCustomEntries, flag
+    return editedCustomEntries, flag
 }
 
 // Function to add custom fields to an entry
 func addCustomFields(reader *bufio.Reader) []CustomEntry {
 
-	// Custom fields
-	var custom string
-	var customEntries []CustomEntry
+    // Custom fields
+    var custom string
+    var customEntries []CustomEntry
 
-	custom = readInput(reader, "Do you want to add custom fields [y/N]")
-	if strings.ToLower(custom) == "y" {
+    custom = readInput(reader, "Do you want to add custom fields [y/N]")
+    if strings.ToLower(custom) == "y" {
 
-		fmt.Println("Keep entering custom field name followed by the value. Press return with no input once done.")
-		for true {
-			var customFieldName string
-			var customFieldValue string
+        fmt.Println("Keep entering custom field name followed by the value. Press return with no input once done.")
+        for true {
+            var customFieldName string
+            var customFieldValue string
 
-			customFieldName = strings.TrimSpace(readInput(reader, "Field Name"))
-			if customFieldName != "" {
-				customFieldValue = strings.TrimSpace(readInput(reader, "Value for "+customFieldName))
-			}
+            customFieldName = strings.TrimSpace(readInput(reader, "Field Name"))
+            if customFieldName != "" {
+                customFieldValue = strings.TrimSpace(readInput(reader, "Value for "+customFieldName))
+            }
 
-			if customFieldName == "" && customFieldValue == "" {
-				break
-			}
+            if customFieldName == "" && customFieldValue == "" {
+                break
+            }
 
-			customEntries = append(customEntries, CustomEntry{customFieldName, customFieldValue})
-		}
-	}
+            customEntries = append(customEntries, CustomEntry{customFieldName, customFieldValue})
+        }
+    }
 
-	return customEntries
+    return customEntries
 }
 
 // Edit a current entry by id
 func editCurrentEntry(idString string) error {
 
-	var userName string
-	var title string
-	var url string
-	var notes string
-	var passwd string
-	var err error
-	var entry *Entry
-	var id int
+    var userName string
+    var title string
+    var url string
+    var notes string
+    var passwd string
+    var err error
+    var entry *Entry
+    var id int
 
-	if err = checkActiveDatabase(); err != nil {
-		return err
-	}
+    if err = checkActiveDatabase(); err != nil {
+        return err
+    }
 
-	id, _ = strconv.Atoi(idString)
+    id, _ = strconv.Atoi(idString)
 
-	err, entry = getEntryById(id)
-	if err != nil || entry == nil {
-		fmt.Printf("No entry found for id %d\n", id)
-		return err
-	}
+    err, entry = getEntryById(id)
+    if err != nil || entry == nil {
+        fmt.Printf("No entry found for id %d\n", id)
+        return err
+    }
 
-	reader := bufio.NewReader(os.Stdin)
+    reader := bufio.NewReader(os.Stdin)
 
-	fmt.Printf("Current Title: %s\n", entry.Title)
-	title = readInput(reader, "New Title")
+    fmt.Printf("Current Title: %s\n", entry.Title)
+    title = readInput(reader, "New Title")
 
-	fmt.Printf("Current URL: %s\n", entry.Url)
-	url = readInput(reader, "New URL")
+    fmt.Printf("Current URL: %s\n", entry.Url)
+    url = readInput(reader, "New URL")
 
-	if len(url) > 0 && !strings.HasPrefix(strings.ToLower(url), "http://") && !strings.HasPrefix(strings.ToLower(url), "https://") {
-		url = "http://" + url
-	}
+    if len(url) > 0 && !strings.HasPrefix(strings.ToLower(url), "http://") && !strings.HasPrefix(strings.ToLower(url), "https://") {
+        url = "http://" + url
+    }
 
-	fmt.Printf("Current Username: %s\n", entry.User)
-	userName = readInput(reader, "New Username")
+    fmt.Printf("Current Username: %s\n", entry.User)
+    userName = readInput(reader, "New Username")
 
-	fmt.Printf("Current Password: %s\n", entry.Password)
-	fmt.Printf("New Password ([y/Y] to generate new, enter will keep old one): ")
-	err, passwd = readPassword()
+    fmt.Printf("Current Password: %s\n", entry.Password)
+    fmt.Printf("New Password ([y/Y] to generate new, enter will keep old one): ")
+    err, passwd = readPassword()
 
-	if strings.ToLower(passwd) == "y" {
-		fmt.Printf("\nGenerating new password ...")
-		err, passwd = generateStrongPassword()
-	}
-	//  fmt.Printf("Password => %s\n", passwd)
+    if strings.ToLower(passwd) == "y" {
+        fmt.Printf("\nGenerating new password ...")
+        err, passwd = generateStrongPassword()
+    }
+    //  fmt.Printf("Password => %s\n", passwd)
 
-	fmt.Printf("\nCurrent Notes: %s\n", entry.Notes)
-	notes = readInput(reader, "New Notes")
+    fmt.Printf("\nCurrent Notes: %s\n", entry.Notes)
+    notes = readInput(reader, "New Notes")
 
-	customEntries, flag := addOrUpdateCustomFields(reader, entry)
+    customEntries, flag := addOrUpdateCustomFields(reader, entry)
 
-	// Update
-	err = updateDatabaseEntry(entry, title, userName, url, passwd, notes, customEntries, flag)
-	if err != nil {
-		fmt.Printf("Error updating entry - \"%s\"\n", err.Error())
-	}
+    // Update
+    err = updateDatabaseEntry(entry, title, userName, url, passwd, notes, customEntries, flag)
+    if err != nil {
+        fmt.Printf("Error updating entry - \"%s\"\n", err.Error())
+    }
 
-	return err
+    return err
 }
 
 // List current entry by id
 func listCurrentEntry(idString string) error {
 
-	var id int
-	var err error
-	var entry *Entry
+    var id int
+    var err error
+    var entry *Entry
 
-	if err = checkActiveDatabase(); err != nil {
-		return err
-	}
+    if err = checkActiveDatabase(); err != nil {
+        return err
+    }
 
-	id, _ = strconv.Atoi(idString)
+    id, _ = strconv.Atoi(idString)
 
-	//  fmt.Printf("Listing current entry - %d\n", id)
-	err, entry = getEntryById(id)
-	if err != nil || entry == nil {
-		fmt.Printf("No entry found for id %d\n", id)
-		return err
-	}
+    //  fmt.Printf("Listing current entry - %d\n", id)
+    err, entry = getEntryById(id)
+    if err != nil || entry == nil {
+        fmt.Printf("No entry found for id %d\n", id)
+        return err
+    }
 
-	err = printEntry(entry, true)
+    err = printEntry(entry, true)
 
-	if err == nil && settingsRider.CopyPassword {
-		//      fmt.Printf("Copying password " + entry.Password + " to clipboard\n")
-		copyPasswordToClipboard(entry.Password)
-	}
+    if err == nil && settingsRider.CopyPassword {
+        //      fmt.Printf("Copying password " + entry.Password + " to clipboard\n")
+        copyPasswordToClipboard(entry.Password)
+    }
 
-	return err
+    return err
 }
 
 // List all entries
 func listAllEntries() error {
 
-	var err error
-	var maxKrypt bool
-	var defaultDB string
-	var passwd string
-
-	maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
-
-	// If max krypt on - then autodecrypt on call and auto encrypt after call
-	if maxKrypt {
-		err, passwd = decryptDatabase(defaultDB)
-		if err != nil {
-			return err
-		}
-	}
-
-	if err = checkActiveDatabase(); err != nil {
-		return err
-	}
-
-	err, settings := getOrCreateLocalConfig(APP)
-
-	if err != nil {
-		fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
-		return err
-	}
-
-	orderKeys := strings.Split(settings.ListOrder, ",")
-	err, entries := iterateEntries(orderKeys[0], orderKeys[1])
-
-	if err == nil {
-		if len(entries) > 0 {
-			fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
-			printDelim(settings.Delim, settings.Color)
-			for _, entry := range entries {
-				printEntry(&entry, false)
-			}
-		} else {
-			fmt.Println("No entries.")
-		}
-	} else {
-		fmt.Printf("Error fetching entries: \"%s\"\n", err.Error())
-		return err
-	}
-
-	// If max krypt on - then autodecrypt on call and auto encrypt after call
-	if maxKrypt {
-		err = encryptDatabase(defaultDB, &passwd)
-	}
-
-	return err
+    var err error
+    var maxKrypt bool
+    var defaultDB string
+    var passwd string
+
+    maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
+
+    // If max krypt on - then autodecrypt on call and auto encrypt after call
+    if maxKrypt {
+        err, passwd = decryptDatabase(defaultDB)
+        if err != nil {
+            return err
+        }
+    }
+
+    if err = checkActiveDatabase(); err != nil {
+        return err
+    }
+
+    err, settings := getOrCreateLocalConfig(APP)
+
+    if err != nil {
+        fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
+        return err
+    }
+
+    orderKeys := strings.Split(settings.ListOrder, ",")
+    err, entries := iterateEntries(orderKeys[0], orderKeys[1])
+
+    if err == nil {
+        if len(entries) > 0 {
+            fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
+            printDelim(settings.Delim, settings.Color)
+            for _, entry := range entries {
+                printEntry(&entry, false)
+            }
+        } else {
+            fmt.Println("No entries.")
+        }
+    } else {
+        fmt.Printf("Error fetching entries: \"%s\"\n", err.Error())
+        return err
+    }
+
+    // If max krypt on - then autodecrypt on call and auto encrypt after call
+    if maxKrypt {
+        err = encryptDatabase(defaultDB, &passwd)
+    }
+
+    return err
 }
 
 // Find current entry by term - prints all matches
 func findCurrentEntry(term string) error {
 
-	var err error
-	var entries []Entry
-
-	if err = checkActiveDatabase(); err != nil {
-		return err
-	}
-
-	err, entries = searchDatabaseEntry(term)
-	if err != nil || len(entries) == 0 {
-		fmt.Printf("Entry for query \"%s\" not found\n", term)
-		return err
-	} else {
-		var delim bool
-		var pcopy bool
-
-		if len(entries) == 1 {
-			delim = true
-			pcopy = true
-			// Single entry means copy password can be enabled
-		} else {
-			_, settings := getOrCreateLocalConfig(APP)
-			fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
-			printDelim(settings.Delim, settings.Color)
-		}
-
-		for _, entry := range entries {
-			printEntry(&entry, delim)
-		}
-
-		if pcopy && settingsRider.CopyPassword {
-			// Single entry
-			copyPasswordToClipboard(entries[0].Password)
-		}
-	}
-
-	return err
+    var err error
+    var entries []Entry
+
+    if err = checkActiveDatabase(); err != nil {
+        return err
+    }
+
+    err, entries = searchDatabaseEntry(term)
+    if err != nil || len(entries) == 0 {
+        fmt.Printf("Entry for query \"%s\" not found\n", term)
+        return err
+    } else {
+        var delim bool
+        var pcopy bool
+
+        if len(entries) == 1 {
+            delim = true
+            pcopy = true
+            // Single entry means copy password can be enabled
+        } else {
+            _, settings := getOrCreateLocalConfig(APP)
+            fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
+            printDelim(settings.Delim, settings.Color)
+        }
+
+        for _, entry := range entries {
+            printEntry(&entry, delim)
+        }
+
+        if pcopy && settingsRider.CopyPassword {
+            // Single entry
+            copyPasswordToClipboard(entries[0].Password)
+        }
+    }
+
+    return err
 }
 
 // Remove a range of entries <id1>-<id2> say 10-14
 func removeMultipleEntries(idRangeEntry string) error {
 
-	var err error
-	var idRange []string
-	var id1, id2 int
+    var err error
+    var idRange []string
+    var id1, id2 int
 
-	idRange = strings.Split(idRangeEntry, "-")
+    idRange = strings.Split(idRangeEntry, "-")
 
-	if len(idRange) != 2 {
-		fmt.Println("Invalid id range - " + idRangeEntry)
-		return errors.New("Invalid id range - " + idRangeEntry)
-	}
+    if len(idRange) != 2 {
+        fmt.Println("Invalid id range - " + idRangeEntry)
+        return errors.New("Invalid id range - " + idRangeEntry)
+    }
 
-	id1, _ = strconv.Atoi(idRange[0])
-	id2, _ = strconv.Atoi(idRange[1])
+    id1, _ = strconv.Atoi(idRange[0])
+    id2, _ = strconv.Atoi(idRange[1])
 
-	if id1 >= id2 {
-		fmt.Println("Invalid id range - " + idRangeEntry)
-		return errors.New("Invalid id range - " + idRangeEntry)
-	}
+    if id1 >= id2 {
+        fmt.Println("Invalid id range - " + idRangeEntry)
+        return errors.New("Invalid id range - " + idRangeEntry)
+    }
 
-	for idNum := id1; idNum <= id2; idNum++ {
-		err = removeCurrentEntry(fmt.Sprintf("%d", idNum))
-	}
+    for idNum := id1; idNum <= id2; idNum++ {
+        err = removeCurrentEntry(fmt.Sprintf("%d", idNum))
+    }
 
-	return err
+    return err
 }
 
 // Remove current entry by id
 func removeCurrentEntry(idString string) error {
 
-	var err error
-	var entry *Entry
-	var id int
-	var response string
+    var err error
+    var entry *Entry
+    var id int
+    var response string
 
-	if err = checkActiveDatabase(); err != nil {
-		return err
-	}
+    if err = checkActiveDatabase(); err != nil {
+        return err
+    }
 
-	if strings.Contains(idString, "-") {
-		return removeMultipleEntries(idString)
-	}
+    if strings.Contains(idString, "-") {
+        return removeMultipleEntries(idString)
+    }
 
-	id, _ = strconv.Atoi(idString)
+    id, _ = strconv.Atoi(idString)
 
-	err, entry = getEntryById(id)
-	if err != nil || entry == nil {
-		fmt.Printf("No entry with id %d was found\n", id)
-		return err
-	}
+    err, entry = getEntryById(id)
+    if err != nil || entry == nil {
+        fmt.Printf("No entry with id %d was found\n", id)
+        return err
+    }
 
-	printEntryMinimal(entry, true)
+    printEntryMinimal(entry, true)
 
-	response = readInput(bufio.NewReader(os.Stdin), "Please confirm removal [Y/n]: ")
+    response = readInput(bufio.NewReader(os.Stdin), "Please confirm removal [Y/n]: ")
 
-	if strings.ToLower(response) != "n" {
-		// Drop from the database
-		err = removeDatabaseEntry(entry)
-		if err == nil {
-			fmt.Printf("Entry with id %d was removed from the database\n", id)
-		}
-	} else {
-		fmt.Println("Removal of entry canceled by user.")
-	}
+    if strings.ToLower(response) != "n" {
+        // Drop from the database
+        err = removeDatabaseEntry(entry)
+        if err == nil {
+            fmt.Printf("Entry with id %d was removed from the database\n", id)
+        }
+    } else {
+        fmt.Println("Removal of entry cancelled by user.")
+    }
 
-	return err
+    return err
 }
 
 // Copy current entry by id into new entry
 func copyCurrentEntry(idString string) error {
 
-	var err error
-	var entry *Entry
-	var id int
+    var err error
+    var entry *Entry
+    var id int
 
-	if err = checkActiveDatabase(); err != nil {
-		return err
-	}
+    if err = checkActiveDatabase(); err != nil {
+        return err
+    }
 
-	id, _ = strconv.Atoi(idString)
+    id, _ = strconv.Atoi(idString)
 
-	err, entry = getEntryById(id)
-	if err != nil || entry == nil {
-		fmt.Printf("No entry with id %d was found\n", id)
-		return err
-	}
+    err, entry = getEntryById(id)
+    if err != nil || entry == nil {
+        fmt.Printf("No entry with id %d was found\n", id)
+        return err
+    }
 
-	err, _ = cloneEntry(entry)
-	if err != nil {
-		fmt.Printf("Error cloning entry: \"%s\"\n", err.Error())
-		return err
-	}
+    err, _ = cloneEntry(entry)
+    if err != nil {
+        fmt.Printf("Error cloning entry: \"%s\"\n", err.Error())
+        return err
+    }
 
-	return err
+    return err
 }
 
 // Encrypt the active database
 func encryptActiveDatabase() error {
 
-	var err error
-	var dbPath string
+    var err error
+    var dbPath string
 
-	if err = checkActiveDatabase(); err != nil {
-		return err
-	}
+    if err = checkActiveDatabase(); err != nil {
+        return err
+    }
 
-	err, dbPath = getActiveDatabase()
-	if err != nil {
-		fmt.Printf("Error getting active database path - \"%s\"\n", err.Error())
-		return err
-	}
+    err, dbPath = getActiveDatabase()
+    if err != nil {
+        fmt.Printf("Error getting active database path - \"%s\"\n", err.Error())
+        return err
+    }
 
-	return encryptDatabase(dbPath, nil)
+    return encryptDatabase(dbPath, nil)
 }
 
 // Encrypt the database using AES
 func encryptDatabase(dbPath string, givenPasswd *string) error {
 
-	var err error
-	var passwd string
-	var passwd2 string
-
-	// If password is given, use it
-	if givenPasswd != nil {
-		passwd = *givenPasswd
-	}
-
-	if len(passwd) == 0 {
-		fmt.Printf("Password: ")
-		err, passwd = readPassword()
-
-		if err == nil {
-			fmt.Printf("\nPassword again: ")
-			err, passwd2 = readPassword()
-			if err == nil {
-				if passwd != passwd2 {
-					fmt.Println("\nPassword mismatch.")
-					return errors.New("mismatched passwords")
-				}
-			}
-		}
-
-		if err != nil {
-			fmt.Printf("Error reading password - \"%s\"\n", err.Error())
-			return err
-		}
-	}
-
-	//  err = encryptFileAES(dbPath, passwd)
-	_, settings := getOrCreateLocalConfig(APP)
-
-	switch settings.Cipher {
-	case "aes":
-		err = encryptFileAES(dbPath, passwd)
-	case "xchacha", "chacha", "xchachapoly":
-		err = encryptFileXChachaPoly(dbPath, passwd)
-	default:
-		fmt.Println("No cipher set, defaulting to AES")
-		err = encryptFileAES(dbPath, passwd)
-	}
-
-	if err == nil {
-		fmt.Println("\nEncryption complete.")
-	}
-
-	return err
+    var err error
+    var passwd string
+    var passwd2 string
+
+    // If password is given, use it
+    if givenPasswd != nil {
+        passwd = *givenPasswd
+    }
+
+    if len(passwd) == 0 {
+        fmt.Printf("Password: ")
+        err, passwd = readPassword()
+
+        if err == nil {
+            fmt.Printf("\nPassword again: ")
+            err, passwd2 = readPassword()
+            if err == nil {
+                if passwd != passwd2 {
+                    fmt.Println("\nPassword mismatch.")
+                    return errors.New("mismatched passwords")
+                }
+            }
+        }
+
+        if err != nil {
+            fmt.Printf("Error reading password - \"%s\"\n", err.Error())
+            return err
+        }
+    }
+
+    //  err = encryptFileAES(dbPath, passwd)
+    _, settings := getOrCreateLocalConfig(APP)
+
+    switch settings.Cipher {
+    case "aes":
+        err = encryptFileAES(dbPath, passwd)
+    case "xchacha", "chacha", "xchachapoly":
+        err = encryptFileXChachaPoly(dbPath, passwd)
+    default:
+        fmt.Println("No cipher set, defaulting to AES")
+        err = encryptFileAES(dbPath, passwd)
+    }
+
+    if err == nil {
+        fmt.Println("\nEncryption complete.")
+    }
+
+    return err
 }
 
 // Decrypt an encrypted database
 func decryptDatabase(dbPath string) (error, string) {
 
-	var err error
-	var passwd string
-	var flag bool
+    var err error
+    var passwd string
+    var flag bool
 
-	if err, flag = isFileEncrypted(dbPath); !flag {
-		fmt.Println(err.Error())
-		return err, ""
-	}
+    if err, flag = isFileEncrypted(dbPath); !flag {
+        fmt.Println(err.Error())
+        return err, ""
+    }
 
-	fmt.Printf("Password: ")
-	err, passwd = readPassword()
+    fmt.Printf("Password: ")
+    err, passwd = readPassword()
 
-	if err != nil {
-		fmt.Printf("\nError reading password - \"%s\"\n", err.Error())
-		return err, ""
-	}
+    if err != nil {
+        fmt.Printf("\nError reading password - \"%s\"\n", err.Error())
+        return err, ""
+    }
 
-	_, settings := getOrCreateLocalConfig(APP)
+    _, settings := getOrCreateLocalConfig(APP)
 
-	switch settings.Cipher {
-	case "aes":
-		err = decryptFileAES(dbPath, passwd)
-	case "xchacha", "chacha", "xchachapoly":
-		err = decryptFileXChachaPoly(dbPath, passwd)
-	default:
-		fmt.Println("No cipher set, defaulting to AES")
-		err = decryptFileAES(dbPath, passwd)
-	}
+    switch settings.Cipher {
+    case "aes":
+        err = decryptFileAES(dbPath, passwd)
+    case "xchacha", "chacha", "xchachapoly":
+        err = decryptFileXChachaPoly(dbPath, passwd)
+    default:
+        fmt.Println("No cipher set, defaulting to AES")
+        err = decryptFileAES(dbPath, passwd)
+    }
 
-	if err == nil {
-		fmt.Println("\nDecryption complete.")
-	}
+    if err == nil {
+        fmt.Println("\nDecryption complete.")
+    }
 
-	return err, passwd
+    return err, passwd
 }
 
 // Export data to a varity of file types
 func exportToFile(fileName string) error {
 
-	var err error
-	var maxKrypt bool
-	var defaultDB string
-	var passwd string
-
-	ext := strings.ToLower(filepath.Ext(fileName))
-
-	maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
-
-	if ext == ".csv" || ext == ".md" || ext == ".html" || ext == ".pdf" {
-		// If max krypt on - then autodecrypt on call and auto encrypt after call
-		if maxKrypt {
-			err, passwd = decryptDatabase(defaultDB)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	switch ext {
-	case ".csv":
-		err = exportToCsv(fileName)
-	case ".md":
-		err = exportToMarkdown(fileName)
-	case ".html":
-		err = exportToHTML(fileName)
-	case ".pdf":
-		err = exportToPDF(fileName)
-	default:
-		fmt.Printf("Error - extn %s not supported\n", ext)
-		return fmt.Errorf("format %s not supported", ext)
-	}
-
-	if err != nil {
-		fmt.Printf("Error exporting to \"%s\" - \"%s\"\n", fileName, err.Error())
-		return err
-	} else {
-		if _, err = os.Stat(fileName); err == nil {
-			fmt.Printf("Exported to %s.\n", fileName)
-			// Chmod 600
-			os.Chmod(fileName, 0600)
-
-			// If max krypt on - then autodecrypt on call and auto encrypt after call
-			if maxKrypt {
-				err = encryptDatabase(defaultDB, &passwd)
-			}
-
-			return err
-		}
-	}
-
-	return err
+    var err error
+    var maxKrypt bool
+    var defaultDB string
+    var passwd string
+
+    ext := strings.ToLower(filepath.Ext(fileName))
+
+    maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
+
+    if ext == ".csv" || ext == ".md" || ext == ".html" || ext == ".pdf" {
+        // If max krypt on - then autodecrypt on call and auto encrypt after call
+        if maxKrypt {
+            err, passwd = decryptDatabase(defaultDB)
+            if err != nil {
+                return err
+            }
+        }
+    }
+
+    switch ext {
+    case ".csv":
+        err = exportToCsv(fileName)
+    case ".md":
+        err = exportToMarkdown(fileName)
+    case ".html":
+        err = exportToHTML(fileName)
+    case ".pdf":
+        err = exportToPDF(fileName)
+    default:
+        fmt.Printf("Error - extn %s not supported\n", ext)
+        return fmt.Errorf("format %s not supported", ext)
+    }
+
+    if err != nil {
+        fmt.Printf("Error exporting to \"%s\" - \"%s\"\n", fileName, err.Error())
+        return err
+    } else {
+        if _, err = os.Stat(fileName); err == nil {
+            fmt.Printf("Exported to %s.\n", fileName)
+            // Chmod 600
+            os.Chmod(fileName, 0600)
+
+            // If max krypt on - then autodecrypt on call and auto encrypt after call
+            if maxKrypt {
+                err = encryptDatabase(defaultDB, &passwd)
+            }
+
+            return err
+        }
+    }
+
+    return err
 }
 
 // Export current database to markdown
 func exportToMarkdown(fileName string) error {
 
-	var err error
-	var dataArray [][]string
-	var fh *os.File
-	var maxLengths [7]int
-	var headers []string = []string{" ID ", " Title ", " User ", " URL ", " Password ", " Notes ", " Modified "}
-
-	err, dataArray = entriesToStringArray(false)
-
-	if err != nil {
-		fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
-		return err
-	}
-
-	for _, record := range dataArray {
-		for idx, field := range record {
-
-			if len(field) > maxLengths[idx] {
-				maxLengths[idx] = len(field)
-			}
-		}
-	}
-
-	//  fmt.Printf("%+v\n", maxLengths)
-	fh, err = os.Create(fileName)
-	if err != nil {
-		fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
-		return err
-	}
-
-	defer fh.Close()
-
-	writer := bufio.NewWriter(fh)
-
-	// Write markdown header
-	for idx, length := range maxLengths {
-		delta := length - len(headers[idx])
-		//      fmt.Printf("%d\n", delta)
-		if delta > 0 {
-			for i := 0; i < delta+2; i++ {
-				headers[idx] += " "
-			}
-		}
-	}
-
-	writer.WriteString(" |" + strings.Join(headers, "|") + "|\n")
-
-	// Write line separator
-	writer.WriteString(" | ")
-	for _, length := range maxLengths {
-
-		for i := 0; i < length; i++ {
-			writer.WriteString("-")
-		}
-		writer.WriteString(" | ")
-	}
-	writer.WriteString("\n")
-
-	// Write records
-	for _, record := range dataArray {
-		writer.WriteString(" | ")
-		for _, field := range record {
-			writer.WriteString(field + " | ")
-		}
-		writer.WriteString("\n")
-	}
-
-	writer.Flush()
-
-	return nil
+    var err error
+    var dataArray [][]string
+    var fh *os.File
+    var maxLengths [7]int
+    var headers []string = []string{" ID ", " Title ", " User ", " URL ", " Password ", " Notes ", " Modified "}
+
+    err, dataArray = entriesToStringArray(false)
+
+    if err != nil {
+        fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
+        return err
+    }
+
+    for _, record := range dataArray {
+        for idx, field := range record {
+
+            if len(field) > maxLengths[idx] {
+                maxLengths[idx] = len(field)
+            }
+        }
+    }
+
+    //  fmt.Printf("%+v\n", maxLengths)
+    fh, err = os.Create(fileName)
+    if err != nil {
+        fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
+        return err
+    }
+
+    defer fh.Close()
+
+    writer := bufio.NewWriter(fh)
+
+    // Write markdown header
+    for idx, length := range maxLengths {
+        delta := length - len(headers[idx])
+        //      fmt.Printf("%d\n", delta)
+        if delta > 0 {
+            for i := 0; i < delta+2; i++ {
+                headers[idx] += " "
+            }
+        }
+    }
+
+    writer.WriteString(" |" + strings.Join(headers, "|") + "|\n")
+
+    // Write line separator
+    writer.WriteString(" | ")
+    for _, length := range maxLengths {
+
+        for i := 0; i < length; i++ {
+            writer.WriteString("-")
+        }
+        writer.WriteString(" | ")
+    }
+    writer.WriteString("\n")
+
+    // Write records
+    for _, record := range dataArray {
+        writer.WriteString(" | ")
+        for _, field := range record {
+            writer.WriteString(field + " | ")
+        }
+        writer.WriteString("\n")
+    }
+
+    writer.Flush()
+
+    return nil
 
 }
 
 // This needs pandoc and pdflatex support
 func exportToPDF(fileName string) error {
 
-	var err error
-	var tmpFile string
-	var passwd string
-	var pdfTkFound bool
-
-	cmd := exec.Command("which", "pandoc")
-	if _, err = cmd.Output(); err != nil {
-		return errors.New("pandoc not found")
-	}
-
-	cmd = exec.Command("which", "pdftk")
-	if _, err = cmd.Output(); err != nil {
-		fmt.Printf("pdftk not found, PDF won't be secure!\n")
-	} else {
-		pdfTkFound = true
-	}
-
-	if pdfTkFound {
-		fmt.Printf("PDF Encryption Password: ")
-		err, passwd = readPassword()
-	}
-
-	tmpFile = randomFileName(os.TempDir(), ".tmp")
-	//  fmt.Printf("Temp file => %s\n", tmpFile)
-	err = exportToMarkdownLimited(tmpFile)
-
-	if err == nil {
-		var args []string = []string{"-o", fileName, "-f", "markdown", "-V", "geometry:landscape", "--columns=600", "--pdf-engine", "xelatex", "--dpi=150", tmpFile}
-
-		cmd = exec.Command("pandoc", args...)
-		_, err = cmd.Output()
-		// Remove tmpfile
-		os.Remove(tmpFile)
-
-		// If the file is generated, encrypt it if pdfTkFound
-		if _, err = os.Stat(fileName); err == nil {
-			fmt.Printf("\nFile %s created without password.\n", fileName)
-
-			if pdfTkFound && len(passwd) > 0 {
-				tmpFile = randomFileName(".", ".pdf")
-				//              fmt.Printf("pdf file => %s\n", tmpFile)
-				args = []string{fileName, "output", tmpFile, "user_pw", passwd}
-				cmd = exec.Command("pdftk", args...)
-				_, err = cmd.Output()
-
-				if err == nil {
-					// Copy over
-					fmt.Printf("Added password to %s.\n", fileName)
-					os.Remove(fileName)
-					err = os.Rename(tmpFile, fileName)
-				} else {
-					fmt.Printf("Error adding password to pdf - \"%s\"\n", err.Error())
-				}
-			}
-		}
-	}
-
-	return err
+    var err error
+    var tmpFile string
+    var passwd string
+    var pdfTkFound bool
+
+    cmd := exec.Command("which", "pandoc")
+    if _, err = cmd.Output(); err != nil {
+        return errors.New("pandoc not found")
+    }
+
+    cmd = exec.Command("which", "pdftk")
+    if _, err = cmd.Output(); err != nil {
+        fmt.Printf("pdftk not found, PDF won't be secure!\n")
+    } else {
+        pdfTkFound = true
+    }
+
+    if pdfTkFound {
+        fmt.Printf("PDF Encryption Password: ")
+        err, passwd = readPassword()
+    }
+
+    tmpFile = randomFileName(os.TempDir(), ".tmp")
+    //  fmt.Printf("Temp file => %s\n", tmpFile)
+    err = exportToMarkdownLimited(tmpFile)
+
+    if err == nil {
+        var args []string = []string{"-o", fileName, "-f", "markdown", "-V", "geometry:landscape", "--columns=600", "--pdf-engine", "xelatex", "--dpi=150", tmpFile}
+
+        cmd = exec.Command("pandoc", args...)
+        _, err = cmd.Output()
+        // Remove tmpfile
+        os.Remove(tmpFile)
+
+        // If the file is generated, encrypt it if pdfTkFound
+        if _, err = os.Stat(fileName); err == nil {
+            fmt.Printf("\nFile %s created without password.\n", fileName)
+
+            if pdfTkFound && len(passwd) > 0 {
+                tmpFile = randomFileName(".", ".pdf")
+                //              fmt.Printf("pdf file => %s\n", tmpFile)
+                args = []string{fileName, "output", tmpFile, "user_pw", passwd}
+                cmd = exec.Command("pdftk", args...)
+                _, err = cmd.Output()
+
+                if err == nil {
+                    // Copy over
+                    fmt.Printf("Added password to %s.\n", fileName)
+                    os.Remove(fileName)
+                    err = os.Rename(tmpFile, fileName)
+                } else {
+                    fmt.Printf("Error adding password to pdf - \"%s\"\n", err.Error())
+                }
+            }
+        }
+    }
+
+    return err
 
 }
 
 // Export current database to markdown minus the long fields
 func exportToMarkdownLimited(fileName string) error {
 
-	var err error
-	var dataArray [][]string
-	var fh *os.File
-	var maxLengths [5]int
-	var headers []string = []string{" ID ", " Title ", " User ", " Password ", " Modified "}
-
-	err, dataArray = entriesToStringArray(true)
-
-	if err != nil {
-		fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
-		return err
-	}
-
-	for _, record := range dataArray {
-		for idx, field := range record {
-
-			if len(field) > maxLengths[idx] {
-				maxLengths[idx] = len(field)
-			}
-		}
-	}
-
-	//  fmt.Printf("%+v\n", maxLengths)
-	fh, err = os.Create(fileName)
-	if err != nil {
-		fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
-		return err
-	}
-
-	defer fh.Close()
-
-	writer := bufio.NewWriter(fh)
-
-	// Write markdown header
-	for idx, length := range maxLengths {
-		delta := length - len(headers[idx])
-		//      fmt.Printf("%d\n", delta)
-		if delta > 0 {
-			for i := 0; i < delta+2; i++ {
-				headers[idx] += " "
-			}
-		}
-	}
-
-	writer.WriteString(" |" + strings.Join(headers, "|") + "|\n")
-
-	// Write line separator
-	writer.WriteString(" | ")
-	for _, length := range maxLengths {
-
-		for i := 0; i < length; i++ {
-			writer.WriteString("-")
-		}
-		writer.WriteString(" | ")
-	}
-	writer.WriteString("\n")
-
-	// Write records
-	for _, record := range dataArray {
-		writer.WriteString(" | ")
-		for _, field := range record {
-			writer.WriteString(field + " | ")
-		}
-		writer.WriteString("\n")
-	}
-
-	writer.Flush()
-
-	return nil
+    var err error
+    var dataArray [][]string
+    var fh *os.File
+    var maxLengths [5]int
+    var headers []string = []string{" ID ", " Title ", " User ", " Password ", " Modified "}
+
+    err, dataArray = entriesToStringArray(true)
+
+    if err != nil {
+        fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
+        return err
+    }
+
+    for _, record := range dataArray {
+        for idx, field := range record {
+
+            if len(field) > maxLengths[idx] {
+                maxLengths[idx] = len(field)
+            }
+        }
+    }
+
+    //  fmt.Printf("%+v\n", maxLengths)
+    fh, err = os.Create(fileName)
+    if err != nil {
+        fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
+        return err
+    }
+
+    defer fh.Close()
+
+    writer := bufio.NewWriter(fh)
+
+    // Write markdown header
+    for idx, length := range maxLengths {
+        delta := length - len(headers[idx])
+        //      fmt.Printf("%d\n", delta)
+        if delta > 0 {
+            for i := 0; i < delta+2; i++ {
+                headers[idx] += " "
+            }
+        }
+    }
+
+    writer.WriteString(" |" + strings.Join(headers, "|") + "|\n")
+
+    // Write line separator
+    writer.WriteString(" | ")
+    for _, length := range maxLengths {
+
+        for i := 0; i < length; i++ {
+            writer.WriteString("-")
+        }
+        writer.WriteString(" | ")
+    }
+    writer.WriteString("\n")
+
+    // Write records
+    for _, record := range dataArray {
+        writer.WriteString(" | ")
+        for _, field := range record {
+            writer.WriteString(field + " | ")
+        }
+        writer.WriteString("\n")
+    }
+
+    writer.Flush()
+
+    return nil
 
 }
 
 // Export current database to html
 func exportToHTML(fileName string) error {
 
-	var err error
-	var dataArray [][]string
-	var fh *os.File
-	var headers []string = []string{" ID ", " Title ", " User ", " URL ", " Password ", " Notes ", " Modified "}
+    var err error
+    var dataArray [][]string
+    var fh *os.File
+    var headers []string = []string{" ID ", " Title ", " User ", " URL ", " Password ", " Notes ", " Modified "}
 
-	err, dataArray = entriesToStringArray(false)
+    err, dataArray = entriesToStringArray(false)
 
-	if err != nil {
-		fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
-		return err
-	}
+    if err != nil {
+        fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
+        return err
+    }
 
-	//  fmt.Printf("%+v\n", maxLengths)
-	fh, err = os.Create(fileName)
-	if err != nil {
-		fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
-		return err
-	}
+    //  fmt.Printf("%+v\n", maxLengths)
+    fh, err = os.Create(fileName)
+    if err != nil {
+        fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
+        return err
+    }
 
-	defer fh.Close()
+    defer fh.Close()
 
-	writer := bufio.NewWriter(fh)
+    writer := bufio.NewWriter(fh)
 
-	writer.WriteString("<html><body>\n")
-	writer.WriteString("<table cellPadding=\"2\" cellSpacing=\"2\" border=\"1\">\n")
-	writer.WriteString("<theader>\n")
+    writer.WriteString("<html><body>\n")
+    writer.WriteString("<table cellPadding=\"2\" cellSpacing=\"2\" border=\"1\">\n")
+    writer.WriteString("<theader>\n")
 
-	for _, h := range headers {
-		writer.WriteString(fmt.Sprintf("<th>%s</th>", h))
-	}
-	writer.WriteString("</theader>\n")
-	writer.WriteString("<tbody>\n")
+    for _, h := range headers {
+        writer.WriteString(fmt.Sprintf("<th>%s</th>", h))
+    }
+    writer.WriteString("</theader>\n")
+    writer.WriteString("<tbody>\n")
 
-	// Write records
-	for _, record := range dataArray {
-		writer.WriteString("<tr>")
-		for _, field := range record {
-			writer.WriteString(fmt.Sprintf("<td>%s</td>", field))
-		}
-		writer.WriteString("</tr>\n")
-	}
-	writer.WriteString("</tbody>\n")
-	writer.WriteString("</table>\n")
+    // Write records
+    for _, record := range dataArray {
+        writer.WriteString("<tr>")
+        for _, field := range record {
+            writer.WriteString(fmt.Sprintf("<td>%s</td>", field))
+        }
+        writer.WriteString("</tr>\n")
+    }
+    writer.WriteString("</tbody>\n")
+    writer.WriteString("</table>\n")
 
-	writer.WriteString("</body></html>\n")
+    writer.WriteString("</body></html>\n")
 
-	writer.Flush()
+    writer.Flush()
 
-	return nil
+    return nil
 
 }
 
 // Export current database to CSV
 func exportToCsv(fileName string) error {
 
-	var err error
-	var dataArray [][]string
-	var fh *os.File
+    var err error
+    var dataArray [][]string
+    var fh *os.File
 
-	err, dataArray = entriesToStringArray(false)
+    err, dataArray = entriesToStringArray(false)
 
-	if err != nil {
-		fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
-		return err
-	}
+    if err != nil {
+        fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
+        return err
+    }
 
-	fh, err = os.Create(fileName)
-	if err != nil {
-		fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
-		return err
-	}
+    fh, err = os.Create(fileName)
+    if err != nil {
+        fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
+        return err
+    }
 
-	writer := csv.NewWriter(fh)
+    writer := csv.NewWriter(fh)
 
-	// Write header
-	writer.Write([]string{"ID", "Title", "User", "URL", "Password", "Notes", "Modified"})
+    // Write header
+    writer.Write([]string{"ID", "Title", "User", "URL", "Password", "Notes", "Modified"})
 
-	for idx, record := range dataArray {
-		if err = writer.Write(record); err != nil {
-			fmt.Printf("Error writing record #%d to %s - \"%s\"\n", idx+1, fileName, err.Error())
-			break
-		}
-	}
+    for idx, record := range dataArray {
+        if err = writer.Write(record); err != nil {
+            fmt.Printf("Error writing record #%d to %s - \"%s\"\n", idx+1, fileName, err.Error())
+            break
+        }
+    }
 
-	writer.Flush()
+    writer.Flush()
 
-	if err != nil {
-		return err
-	}
+    if err != nil {
+        return err
+    }
 
-	os.Chmod(fileName, 0600)
-	fmt.Printf("!WARNING: Passwords are stored in plain-text!\n")
-	fmt.Printf("Exported %d records to %s .\n", len(dataArray), fileName)
+    os.Chmod(fileName, 0600)
+    fmt.Printf("!WARNING: Passwords are stored in plain-text!\n")
+    fmt.Printf("Exported %d records to %s .\n", len(dataArray), fileName)
 
-	return nil
+    return nil
 }

From ba407ceeda46fb58f3c514817b4feafa411e058f Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Tue, 14 Dec 2021 10:35:23 +0530
Subject: [PATCH 29/58] ref issue #21 - Updated README.md for removal option

---
 README.md | 646 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 338 insertions(+), 308 deletions(-)

diff --git a/README.md b/README.md
index e30b918..970efa3 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ Install
 
 If you are on a Debian or Debian derived system, you can directly download and install the latest version. Check out the [releases](https://github.com/pythonhacker/varuh/releases) page and use `dpkg` to install the binary.
 
-	$ sudo dpkg -i varuh-${VERSION}_amd64.deb
+    $ sudo dpkg -i varuh-${VERSION}_amd64.deb
 
 The binary will be installed in `/usr/bin` folder.
 
@@ -44,24 +44,24 @@ You need the [Go compiler](https://golang.org/dl/) to build the code. (This can
 
 Install `make` by using your native package manager. Something like,
 
-	$ sudo apt install make -y
+    $ sudo apt install make -y
 
 should work.
 
 Then,
 
-	 $ make
-	 Building varuh
-	 go: downloading github.com/akamensky/argparse v1.3.1
-	 go: downloading golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
-	 go: downloading github.com/atotto/clipboard v0.1.4
-	 go: downloading github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f
-	 go: downloading github.com/pythonhacker/argparse v1.3.2
-	 go: downloading gorm.io/driver/sqlite v1.2.3
-	 ...
+     $ make
+     Building varuh
+     go: downloading github.com/akamensky/argparse v1.3.1
+     go: downloading golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
+     go: downloading github.com/atotto/clipboard v0.1.4
+     go: downloading github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f
+     go: downloading github.com/pythonhacker/argparse v1.3.2
+     go: downloading gorm.io/driver/sqlite v1.2.3
+     ...
 
-	$ sudo make install
-	Installing varuh...done
+    $ sudo make install
+    Installing varuh...done
 
 The binary will be installed in `/usr/local/bin` folder.
 
@@ -69,41 +69,42 @@ The binary will be installed in `/usr/local/bin` folder.
 Usage
 =====
 
-	$ ./varuh -h
-	usage: varuh [-h|--help] [-I|--init "<value>"] [-d|--decrypt "<value>"]
-				 [-C|--clone "<value>"] [-R|--remove "<value>"] [-U|--use-db
-				 "<value>"] [-f|--find "<value>"] [-E|--edit "<value>"]
-				 [-l|--list-entry "<value>"] [-x|--export "<value>"] [-e|--encrypt]
-				 [-A|--add] [-p|--path] [-a|--list-all] [-g|--genpass] [-s|--show]
-				 [-c|--copy] [-v|--version]
-
-				 Password manager for the command line for Unix like operating
-				 systems
-
-	Options:
-
-	  -h  --help                   Print help information
-	  -I  --init        <path>     Initialize a new database
-	  -d  --decrypt     <path>     Decrypt password database
-	  -C  --clone       <id>       Clone an entry with <id>
-	  -R  --remove      <id>       Remove an entry with <id>
-	  -U  --use-db      <path>     Set <path> as active database
-	  -f  --find        <term>     Search entries with <term>
-	  -E  --edit        <id>       Edit entry by <id>
-	  -l  --list-entry  <id>       List entry by <id>
-	  -x  --export      <filename> Export all entries to <filename>
-	  -e  --encrypt                Encrypt the current database
-	  -A  --add                    Add a new entry
-	  -p  --path                   Show current database path
-	  -a  --list-all               List all entries in current database
-	  -g  --genpass                Generate a strong password of length from 12 - 16
-	  -s  --show                   Show passwords when listing entries
-	  -c  --copy                   Copy password to clipboard
-	  -v  --version                Show version information and exit
-
-
-	AUTHORS
-		Copyright (C) 2021 Anand B Pillai <abpillai@gmail.com>
+    $ ./varuh -h
+    usage: varuh [-h|--help] [-I|--init "<value>"] [-d|--decrypt "<value>"]
+                 [-C|--clone "<value>"] [-R|--remove "<value>"] [-U|--use-db
+                 "<value>"] [-f|--find "<value>"] [-E|--edit "<value>"]
+                 [-l|--list-entry "<value>"] [-x|--export "<value>"] [-e|--encrypt]
+                 [-A|--add] [-p|--path] [-a|--list-all] [-g|--genpass] [-s|--show]
+                 [-c|--copy] [-y|--assume-yes] [-v|--version]
+
+                 Password manager for the command line for Unix like operating
+                 systems
+
+    Options:
+
+      -h  --help                   Print help information
+      -I  --init        <path>     Initialize a new database
+      -d  --decrypt     <path>     Decrypt password database
+      -C  --clone       <id>       Clone an entry with <id>
+      -R  --remove      <id>       Remove an entry with <id> or <id-range>
+      -U  --use-db      <path>     Set <path> as active database
+      -f  --find        <term>     Search entries with <term>
+      -E  --edit        <id>       Edit entry by <id>
+      -l  --list-entry  <id>       List entry by <id>
+      -x  --export      <filename> Export all entries to <filename>
+      -e  --encrypt                Encrypt the current database
+      -A  --add                    Add a new entry
+      -p  --path                   Show current database path
+      -a  --list-all               List all entries in current database
+      -g  --genpass                Generate a strong password (length: 12 - 16)
+      -s  --show                   Show passwords when listing entries
+      -c  --copy                   Copy password to clipboard
+      -y  --assume-yes             Assume yes to actions requiring confirmation
+      -v  --version                Show version information and exit
+
+
+    AUTHORS
+        Copyright (C) 2021 Anand B Pillai <abpillai@gmail.com>
 
 
 Encryption and Security
@@ -130,134 +131,134 @@ Databases
 
 ## Create a database
 
-	$ varuh -I mypasswds
-	Created new database - mypasswds
-	Updating active db path - /home/anand/mypasswds
+    $ varuh -I mypasswds
+    Created new database - mypasswds
+    Updating active db path - /home/anand/mypasswds
 
-	$ ls -lt mypasswds 
-	-rw------- 1 anand anand 8192 Nov  9 23:06 mypasswds
+    $ ls -lt mypasswds 
+    -rw------- 1 anand anand 8192 Nov  9 23:06 mypasswds
 
 The password database is created and is active now. You can start adding entries to it.
 
 ## Add an entry
 
-	$ varuh -A
-	Title: My Website Login
-	URL: mywebsite.name
-	Username: mememe
-	Password (enter to generate new): 
-	Generating password ...done
-	Notes: Website uses Nginx auth
-	Do you want to add custom fields [y/N]: 
-	Created new entry with id: 1
+    $ varuh -A
+    Title: My Website Login
+    URL: mywebsite.name
+    Username: mememe
+    Password (enter to generate new): 
+    Generating password ...done
+    Notes: Website uses Nginx auth
+    Do you want to add custom fields [y/N]: 
+    Created new entry with id: 1
 
 You can now list the entry with one of the list options.
 
-	$ varuh -l 1
-	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-	ID: 1
-	Title: My Website Login
-	User: mememe
-	URL: http://mywebsite.name
-	Password: ****************
-	Notes: Website uses Nginx auth
-	Modified: 2021-21-09 23:12:35
-	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    $ varuh -l 1
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    ID: 1
+    Title: My Website Login
+    User: mememe
+    URL: http://mywebsite.name
+    Password: ****************
+    Notes: Website uses Nginx auth
+    Modified: 2021-21-09 23:12:35
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 ## Add an entry with custom fields
 
 From version 0.3 onwards, custom fields are supported.
 
-	$ varuh -A
-	Title: Github token
-	URL: https://github.com/mydev/myproject
-	Username: mydev
-	Password (enter to generate new): ghp_ipQrStuVwxYz1a2b3cdEF10ghI689kLaMnOp
-	Notes: Never Expires
-	Do you want to add custom fields [y/N]: y
-	Field Name: Domain
-	Value for Domain: github.com
-	Field Name: Type
-	Value for Type: Auth Token
-	Field Name:
-	Created new entry with id: 6
-
-	$ varuh -l 6
-	ID: 6
-	Title: Github token
-	User: mydev
-	URL: https://github.com/mydev/myproject
-	Password: ghp_ipQrStuVwxYz1a2b3cdEF10ghI689kLaMnOp
-	Notes: Never Expires
-	Domain: github.com
-	Type: Auth Token
-	Modified: 2021-21-13 00:07:18
+    $ varuh -A
+    Title: Github token
+    URL: https://github.com/mydev/myproject
+    Username: mydev
+    Password (enter to generate new): ghp_ipQrStuVwxYz1a2b3cdEF10ghI689kLaMnOp
+    Notes: Never Expires
+    Do you want to add custom fields [y/N]: y
+    Field Name: Domain
+    Value for Domain: github.com
+    Field Name: Type
+    Value for Type: Auth Token
+    Field Name:
+    Created new entry with id: 6
+
+    $ varuh -l 6
+    ID: 6
+    Title: Github token
+    User: mydev
+    URL: https://github.com/mydev/myproject
+    Password: ghp_ipQrStuVwxYz1a2b3cdEF10ghI689kLaMnOp
+    Notes: Never Expires
+    Domain: github.com
+    Type: Auth Token
+    Modified: 2021-21-13 00:07:18
 
 
 For more on listing see the [Listing and Searching](#listing-and-searching) section below.
 
 ## Edit an entry
 
-	$ varuh -E 1
-	Current Title: My Website Login
-	New Title: My Blog Login
-	Current URL: http://mywebsite.name
-	New URL: myblog.name
-	Current Username: mememe
-	New Username: meblog
-	Current Password: lTzC2z9kRppnYsYl
-	New Password ([y/Y] to generate new, enter will keep old one): 
-	Current Notes: Website uses Nginx auth
-	New Notes: Website uses Apache
-	Do you want to add custom fields [y/N]:
-	Updated entry.
-
-	$ varuh -l 1 -s
-	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-	ID: 1
-	Title: My Blog Login
-	User: meblog
-	URL: http://myblog.name
-	Password: myblog123
-	Notes: Website uses Apache
-	Modified: 2021-21-09 23:15:29
-	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    $ varuh -E 1
+    Current Title: My Website Login
+    New Title: My Blog Login
+    Current URL: http://mywebsite.name
+    New URL: myblog.name
+    Current Username: mememe
+    New Username: meblog
+    Current Password: lTzC2z9kRppnYsYl
+    New Password ([y/Y] to generate new, enter will keep old one): 
+    Current Notes: Website uses Nginx auth
+    New Notes: Website uses Apache
+    Do you want to add custom fields [y/N]:
+    Updated entry.
+
+    $ varuh -l 1 -s
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    ID: 1
+    Title: My Blog Login
+    User: meblog
+    URL: http://myblog.name
+    Password: myblog123
+    Notes: Website uses Apache
+    Modified: 2021-21-09 23:15:29
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 ## Edit an entry with custom fields
 
 When you edit an entry with custom fields, you get the option to change the name of the fields or delete the fields entirely.
 
-	$ varuh -E 6
-	Current Title: Github token
-	New Title:
-	Current URL: https://github.com/mydev/myproject
-	New URL:
-	Current Username: mydev
-	New Username: 
-	Current Password: ghp_ipQrStuVwxYz1a2b3cdEF10ghI689kLaMnOp
-	New Password ([y/Y] to generate new, enter will keep old one): 
-	Current Notes: Never Expires
-	New Notes:
-	Editing/deleting custom fields
-	Field Name: Domain
-		New Field Name (Enter to keep, "x" to delete): x
-	Field Name: Type
-		New Field Name (Enter to keep, "x" to delete): Token Type
-	Field Value: Auth Token
+    $ varuh -E 6
+    Current Title: Github token
+    New Title:
+    Current URL: https://github.com/mydev/myproject
+    New URL:
+    Current Username: mydev
+    New Username: 
+    Current Password: ghp_ipQrStuVwxYz1a2b3cdEF10ghI689kLaMnOp
+    New Password ([y/Y] to generate new, enter will keep old one): 
+    Current Notes: Never Expires
+    New Notes:
+    Editing/deleting custom fields
+    Field Name: Domain
+        New Field Name (Enter to keep, "x" to delete): x
+    Field Name: Type
+        New Field Name (Enter to keep, "x" to delete): Token Type
+    Field Value: Auth Token
         New Field Value (Enter to keep): 
-	Do you want to add custom fields [y/N]: 
-	Created 1 custom entries for entry: 21.
-	Updated entry.
-
-	$ varuh -l 6 -s
-	ID: 6
-	Title: Github token
-	User: mydev
-	URL: https://github.com/mydev/myproject
-	Password: ghp_ipQrStuVwxYz1a2b3cdEF10ghI689kLaMnOp
-	Notes: Never Expires
-	Token Type: Auth Token
-	Modified: 2021-21-13 00:16:41
+    Do you want to add custom fields [y/N]: 
+    Created 1 custom entries for entry: 21.
+    Updated entry.
+
+    $ varuh -l 6 -s
+    ID: 6
+    Title: Github token
+    User: mydev
+    URL: https://github.com/mydev/myproject
+    Password: ghp_ipQrStuVwxYz1a2b3cdEF10ghI689kLaMnOp
+    Notes: Never Expires
+    Token Type: Auth Token
+    Modified: 2021-21-13 00:16:41
 
 (*-s* turns on visible passwords)
 
@@ -265,30 +266,59 @@ When you edit an entry with custom fields, you get the option to change the name
 
 To clone (copy) an entry,
 
-	$ $ varuh -C 1
-	Cloned to new entry, id: 3
+    $ $ varuh -C 1
+    Cloned to new entry, id: 3
 
 ## Remove an entry
 
-	$ varuh -R 1
-	Entry with id 1 was removed from the database
+    $ varuh -R 1
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    Title: My Website Login
+    User: mememe
+    URL: https://mywebsite.name
+    Modified: 2021-21-09 23:12:35
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    Please confirm removal [Y/n]: 
+    Entry with id 1 was removed from the database
 
 It is an error if the id does not exist.
 
-	$ varuh -R 4
-	No entry with id 4 was found
+    $ varuh -R 4
+    No entry with id 4 was found
+
+## Remove a range of entries
+
+You can remove a range of entry ids from id1-id2 using the following command.
+
+    $ varuh -R id1-id2
+
+Example:
+
+    $ varuh -R 1-4
+
+This will remove entries from 1 to 4 inclusive, asking for confirmation from the user every time.
+
+## Removal without confirmation
+
+If you are very sure, you can avoid the confirmation prompt by passing the `-y` flag which will remove the entry without confirmation.
+
+    $ varuh -R 2 -y
+    ...
+    ...
+    ...
+    Entry with id 2 was removed from the database
 
 ## Switch to a new database
 
 Once a database is active, creating another one automatically encrypts the current one and makes the new one the active database. The automatic encryption happens only if the configuration flag `auto_encrypt` is turned on (See section [Configuration](#configuration) below).
 
-	$ varuh -I mysecrets
-	Encrytping current database - /home/anand/mypasswds
-	Password: 
-	Password again: 
-	Encryption complete.
-	Created new database - mysecrets
-	Updating active db path - /home/anand/mysecrets
+    $ varuh -I mysecrets
+    Encrytping current database - /home/anand/mypasswds
+    Password: 
+    Password again: 
+    Encryption complete.
+    Created new database - mysecrets
+    Updating active db path - /home/anand/mysecrets
 
 The previous database is now encrypted with the configured block cipher using the password. Please make sure you remember the password.
 
@@ -296,48 +326,48 @@ The previous database is now encrypted with the configured block cipher using th
 
 If you want to switch back to a previous database, you can use the `-U` option. The same process is repeated with the current database getting encrypted and the older one getting decrypted.
 
-	$ varuh -U mypasswds
-	Encrypting current active database - /home/anand/mysecrets
-	Password: 
-	Password again: 
-	Encryption complete.
-	Database /home/anand/mypasswds is encrypted, decrypting it
-	Password: 
-	Decryption complete.
-	Switched active database successfully.
-	
+    $ varuh -U mypasswds
+    Encrypting current active database - /home/anand/mysecrets
+    Password: 
+    Password again: 
+    Encryption complete.
+    Database /home/anand/mypasswds is encrypted, decrypting it
+    Password: 
+    Decryption complete.
+    Switched active database successfully.
+    
 ## Manual encryption and decryption
 
 You can manually encrypt the current database using the `-e` option.
 
-	$ varuh -e
-	Password: 
-	Password again: 
-	Encryption complete.
+    $ varuh -e
+    Password: 
+    Password again: 
+    Encryption complete.
 
 Note that once you encrypt the active database, you cannot use the listings any more unless it is decrypted.
 
-	$ varuh -l 2
-	No decrypted active database found.
+    $ varuh -l 2
+    No decrypted active database found.
 
 Manually decrypt the database using `-d` option.
 
-	$ varuh -d mypasswds 
-	Password: 
-	Decryption complete.
+    $ varuh -d mypasswds 
+    Password: 
+    Decryption complete.
 
 Now the database is active again and you can see the listings.
 
-	$ varuh -l 3
-	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-	ID: 2
-	Title: My Blog Login
-	User: myblog.name
-	URL: http://meblog
-	Password: *********
-	Notes: Website uses Apache
-	Modified: 2021-21-09 23:21:32
-	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    $ varuh -l 3
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    ID: 2
+    Title: My Blog Login
+    User: myblog.name
+    URL: http://meblog
+    Password: *********
+    Notes: Website uses Apache
+    Modified: 2021-21-09 23:21:32
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 ## Always on encryption
 
@@ -345,20 +375,20 @@ If the config param `encrypt_on` is set to `true` along with `auto_encrypt` (def
 
 ### Example
 
-	$ varuh -f my -s
-	Password: 
-	Decryption complete.
-	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-	ID: 2
-	Title: MY LOCAL BANK
-	User: banklogin
-	URL: https://my.localbank.com
-	Password: bankpass123
-	Notes: 
-	Modified: 2021-21-18 12:44:10
-	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-	Encryption complete.
+    $ varuh -f my -s
+    Password: 
+    Decryption complete.
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    ID: 2
+    Title: MY LOCAL BANK
+    User: banklogin
+    URL: https://my.localbank.com
+    Password: bankpass123
+    Notes: 
+    Modified: 2021-21-18 12:44:10
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+    Encryption complete.
 
 In this mode, your data is provided maximum safety as the database remains decrypted only for a short while on the disk while the data is being read and once done is encrypted back again.
 
@@ -369,79 +399,79 @@ Listing and Searching
 
 To list an entry using its id,
 
-	$ varuh -l 8
-	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-	ID: 8
-	Title: Google account
-	User: anandpillai@alumni.iitm.ac.in
-	URL: 
-	Password: ***********
-	Notes: 
-	Modified: 2021-21-25 15:02:50
-	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    $ varuh -l 8
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    ID: 8
+    Title: Google account
+    User: anandpillai@alumni.iitm.ac.in
+    URL: 
+    Password: ***********
+    Notes: 
+    Modified: 2021-21-25 15:02:50
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 ## To search an entry
 
 An entry can be searched on its title, username, URL or notes. Search is case-insensitive.
 
-	$ varuh -f google
-	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-	ID: 8
-	Title: Google account
-	User: anandpillai@alumni.iitm.ac.in
-	URL: 
-	Password: **********
-	Notes: 
-	Modified: 2021-21-25 15:02:50
-	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-	ID: 9
-	Title: Google account
-	User: xyz@gmail.com
-	URL: 
-	Password: ********
-	Notes: 
-	Modified: 2021-21-25 15:05:36
-	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-	ID: 10
-	Title: Google account
-	User: somethingaboutme@gmail.com
-	URL: 
-	Password: ***********
-	Notes: 
-	Modified: 2021-21-25 15:09:51
-	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    $ varuh -f google
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    ID: 8
+    Title: Google account
+    User: anandpillai@alumni.iitm.ac.in
+    URL: 
+    Password: **********
+    Notes: 
+    Modified: 2021-21-25 15:02:50
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    ID: 9
+    Title: Google account
+    User: xyz@gmail.com
+    URL: 
+    Password: ********
+    Notes: 
+    Modified: 2021-21-25 15:05:36
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    ID: 10
+    Title: Google account
+    User: somethingaboutme@gmail.com
+    URL: 
+    Password: ***********
+    Notes: 
+    Modified: 2021-21-25 15:09:51
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 ## To list all entries
 
 To list all entries, use the option `-a`.
 
-	$ varuh -a
-	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-	ID: 1
-	Title: My Bank #1
-	User: myusername1
-	URL: https://mysuperbank1.com
-	Password: ***********
-	Notes: 
-	Modified: 2021-21-15 15:40:29
-	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-	ID: 2
-	Title: My Digital Locker #1
-	User: mylockerusername
-	URL: https://mysuperlocker1.com
-	Password: **********
-	Notes: 
-	Modified: 2021-21-18 12:44:10
-	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-	ID: 3
-	Title: My Bank Login #2
-	User: mybankname2
-	URL: https://myaveragebank.com
-	Password: **********
-	Notes: 
-	Modified: 2021-21-19 14:16:33
-	+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-	...
+    $ varuh -a
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    ID: 1
+    Title: My Bank #1
+    User: myusername1
+    URL: https://mysuperbank1.com
+    Password: ***********
+    Notes: 
+    Modified: 2021-21-15 15:40:29
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    ID: 2
+    Title: My Digital Locker #1
+    User: mylockerusername
+    URL: https://mysuperlocker1.com
+    Password: **********
+    Notes: 
+    Modified: 2021-21-18 12:44:10
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    ID: 3
+    Title: My Bank Login #2
+    User: mybankname2
+    URL: https://myaveragebank.com
+    Password: **********
+    Notes: 
+    Modified: 2021-21-19 14:16:33
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    ...
 
 By default the listing is in ascending ID order. This can be changed in the configuration (see below).
 
@@ -457,8 +487,8 @@ This is useful to copy the password to a password input field in the browser for
 
 ## See current active database path
 
-	$ varuh -p
-	/home/anand/mypasswds
+    $ varuh -p
+    /home/anand/mypasswds
 
 Export
 ======
@@ -472,37 +502,37 @@ Export
 
 To export use the `-x` option. The type of file is automatically figured out from the filename extension.
 
-	$ varuh -x passwds.csv
-	!WARNING: Passwords are stored in plain-text!
-	Exported 14 records to passwds.csv .
-	Exported to passwds.csv.
+    $ varuh -x passwds.csv
+    !WARNING: Passwords are stored in plain-text!
+    Exported 14 records to passwds.csv .
+    Exported to passwds.csv.
 
-	$ varuh -x passwds.html
-	Exported to passwds.html.
+    $ varuh -x passwds.html
+    Exported to passwds.html.
 
 PDF export is supported if `pandoc` is installed along with the required `pdflatex` packages. The following command (on `Debian` and derived systems) should install the required dependencies.
 
-	$ sudo apt-get install pandoc texlive-latex-base texlive-fonts-recommended texlive-fonts-extra texlive-latex-extra texlive-xetex lmodern -y
+    $ sudo apt-get install pandoc texlive-latex-base texlive-fonts-recommended texlive-fonts-extra texlive-latex-extra texlive-xetex lmodern -y
 
 Then,
 
-	$ varuh -x passwds.pdf
-	pdftk not found, PDF won't be secure!
+    $ varuh -x passwds.pdf
+    pdftk not found, PDF won't be secure!
 
-	File passwds.pdf created without password.
-	Exported to passwds.pdf.
+    File passwds.pdf created without password.
+    Exported to passwds.pdf.
 
 PDF files are exported in landscape mode with 150 dpi and 600 columns. To avoid the data not fitting into one page the fields `Notes` and `URL` are not exported.
 
 If `pdftk` is installed, the PDF files will be encrypted with an (optional) password.
 
-	$ sudo apt-get install pdftk -y
+    $ sudo apt-get install pdftk -y
 
-	$ varuh -x passwds.pdf
-	PDF Encryption Password: ******
-	File passwds.pdf created without password.
-	Added password to passwds.pdf.
-	Exported to passwds.pdf.
+    $ varuh -x passwds.pdf
+    PDF Encryption Password: ******
+    File passwds.pdf created without password.
+    Added password to passwds.pdf.
+    Exported to passwds.pdf.
 
 Misc
 ====
@@ -513,14 +543,14 @@ Generate a strong password of length ranging from 12 - 16.
 
 A `strong` password is defined as a cryptographically secure string contaning at least one upper-case letter, one punctuation character and one number.
 
-	$ varuh -g
-	7%zv/uzIgpqexJ
+    $ varuh -g
+    7%zv/uzIgpqexJ
 
-	By passing the `-c` option, the password is also copied to the clipboard.
+    By passing the `-c` option, the password is also copied to the clipboard.
 
-	$ varuh -g -c 
-	y6UpD$~uBI#8
-	Password copied to clipboard
+    $ varuh -g -c 
+    y6UpD$~uBI#8
+    Password copied to clipboard
 
 
 Configuration
@@ -530,19 +560,19 @@ Configuration
 
 The config file is named *config.json*. It looks as follows.
 
-	`{
-		"active_db": "/home/anand/mypasswds",
-		"cipher": "aes",
-		"auto_encrypt": true,
-		"visible_passwords": false,
-		"encrypt_on": true,
-		"path": "/home/anand/.config/varuh/config.json",
-		"list_order": "id,asc",
-		"delimiter": "+",
-		"color": "default",
-		"bgcolor": "bgblack"
-	}
-	`
+    `{
+        "active_db": "/home/anand/mypasswds",
+        "cipher": "aes",
+        "auto_encrypt": true,
+        "visible_passwords": false,
+        "encrypt_on": true,
+        "path": "/home/anand/.config/varuh/config.json",
+        "list_order": "id,asc",
+        "delimiter": "+",
+        "color": "default",
+        "bgcolor": "bgblack"
+    }
+    `
 You can modify the following variables.
 
 1. `auto_encrypt` - Set this to true to enable automatic encryption/decryption when switching databases. Otherwise you have to do this manually. The default is `true`.
@@ -555,7 +585,7 @@ You can modify the following variables.
    * `title` - Uses the `Title` field.
    * `username` - Uses the `User` field.
 
-	Always specify this configuration as `<field>,<order>`. Supported `<order>` values are `asc` and `desc`.
+    Always specify this configuration as `<field>,<order>`. Supported `<order>` values are `asc` and `desc`.
 1. `delimiter` - This modifies the delimiter string when printing a listing. Only one character is allowed.
 1. `color` - The foreground color of the text when printing listings.
 1. `bgcolor` - The background color of the text when printing listings.

From 1e5a00be5cafb42ec2ddba726c7d98ffcb9b6211 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Tue, 14 Dec 2021 10:35:53 +0530
Subject: [PATCH 30/58] ref issue #21 - Added assume-yes option for removal

---
 actions.go | 1816 ++++++++++++++++++++++++++--------------------------
 1 file changed, 910 insertions(+), 906 deletions(-)

diff --git a/actions.go b/actions.go
index 9bec025..35c8ae2 100644
--- a/actions.go
+++ b/actions.go
@@ -2,1127 +2,1131 @@
 package main
 
 import (
-    "bufio"
-    "encoding/csv"
-    "errors"
-    "fmt"
-    "os"
-    "os/exec"
-    "os/signal"
-    "path/filepath"
-    "strconv"
-    "strings"
-    "syscall"
+	"bufio"
+	"encoding/csv"
+	"errors"
+	"fmt"
+	"os"
+	"os/exec"
+	"os/signal"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"syscall"
 )
 
 type CustomEntry struct {
-    fieldName  string
-    fieldValue string
+	fieldName  string
+	fieldValue string
 }
 
 // Wrappers (closures) for functions accepting strings as input for in/out encryption
 func WrapperMaxKryptStringFunc(fn actionFunc) actionFunc {
 
-    return func(inputStr string) error {
-        var maxKrypt bool
-        var defaultDB string
-        var encPasswd string
-        var err error
+	return func(inputStr string) error {
+		var maxKrypt bool
+		var defaultDB string
+		var encPasswd string
+		var err error
 
-        maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
+		maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
 
-        // If max krypt on - then autodecrypt on call and auto encrypt after call
-        if maxKrypt {
-            err, encPasswd = decryptDatabase(defaultDB)
-            if err != nil {
-                return err
-            }
+		// If max krypt on - then autodecrypt on call and auto encrypt after call
+		if maxKrypt {
+			err, encPasswd = decryptDatabase(defaultDB)
+			if err != nil {
+				return err
+			}
 
-            sigChan := make(chan os.Signal, 1)
-            signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
+			sigChan := make(chan os.Signal, 1)
+			signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
 
-            go func() {
-                sig := <-sigChan
-                fmt.Println("Received signal", sig)
-                // Reencrypt
-                encryptDatabase(defaultDB, &encPasswd)
-                os.Exit(1)
-            }()
-        }
+			go func() {
+				sig := <-sigChan
+				fmt.Println("Received signal", sig)
+				// Reencrypt
+				encryptDatabase(defaultDB, &encPasswd)
+				os.Exit(1)
+			}()
+		}
 
-        err = fn(inputStr)
+		err = fn(inputStr)
 
-        // If max krypt on - then autodecrypt on call and auto encrypt after call
-        if maxKrypt {
-            encryptDatabase(defaultDB, &encPasswd)
-        }
+		// If max krypt on - then autodecrypt on call and auto encrypt after call
+		if maxKrypt {
+			encryptDatabase(defaultDB, &encPasswd)
+		}
 
-        return err
-    }
+		return err
+	}
 
 }
 
 // Wrappers (closures) for functions accepting no input for in/out encryption
 func WrapperMaxKryptVoidFunc(fn voidFunc) voidFunc {
 
-    return func() error {
-        var maxKrypt bool
-        var defaultDB string
-        var encPasswd string
-        var err error
+	return func() error {
+		var maxKrypt bool
+		var defaultDB string
+		var encPasswd string
+		var err error
 
-        maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
+		maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
 
-        // If max krypt on - then autodecrypt on call and auto encrypt after call
-        if maxKrypt {
-            err, encPasswd = decryptDatabase(defaultDB)
-            if err != nil {
-                return err
-            }
+		// If max krypt on - then autodecrypt on call and auto encrypt after call
+		if maxKrypt {
+			err, encPasswd = decryptDatabase(defaultDB)
+			if err != nil {
+				return err
+			}
 
-            sigChan := make(chan os.Signal, 1)
-            signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
+			sigChan := make(chan os.Signal, 1)
+			signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
 
-            go func() {
-                sig := <-sigChan
-                fmt.Println("Received signal", sig)
-                // Reencrypt
-                encryptDatabase(defaultDB, &encPasswd)
-                os.Exit(1)
-            }()
-        }
+			go func() {
+				sig := <-sigChan
+				fmt.Println("Received signal", sig)
+				// Reencrypt
+				encryptDatabase(defaultDB, &encPasswd)
+				os.Exit(1)
+			}()
+		}
 
-        err = fn()
+		err = fn()
 
-        // If max krypt on - then autodecrypt on call and auto encrypt after call
-        if maxKrypt {
-            encryptDatabase(defaultDB, &encPasswd)
-        }
+		// If max krypt on - then autodecrypt on call and auto encrypt after call
+		if maxKrypt {
+			encryptDatabase(defaultDB, &encPasswd)
+		}
 
-        return err
-    }
+		return err
+	}
 
 }
 
 // Print the current active database path
 func showActiveDatabasePath() error {
 
-    err, settings := getOrCreateLocalConfig(APP)
-
-    if err != nil {
-        fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
-        return err
-    }
-
-    if settings != nil {
-        if settings.ActiveDB != "" {
-            fmt.Printf("%s\n", settings.ActiveDB)
-        } else {
-            fmt.Println("No active database")
-        }
-        return nil
-    } else {
-        fmt.Printf("Error - null config\n")
-        return errors.New("null config")
-    }
+	err, settings := getOrCreateLocalConfig(APP)
+
+	if err != nil {
+		fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
+		return err
+	}
+
+	if settings != nil {
+		if settings.ActiveDB != "" {
+			fmt.Printf("%s\n", settings.ActiveDB)
+		} else {
+			fmt.Println("No active database")
+		}
+		return nil
+	} else {
+		fmt.Printf("Error - null config\n")
+		return errors.New("null config")
+	}
 }
 
 // Set the current active database path
 func setActiveDatabasePath(dbPath string) error {
 
-    var fullPath string
-    var activeEncrypted bool
-    var newEncrypted bool
-
-    err, settings := getOrCreateLocalConfig(APP)
-
-    if err != nil {
-        fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
-        return err
-    }
-
-    if settings != nil {
-        var flag bool
-
-        if _, err = os.Stat(dbPath); os.IsNotExist(err) {
-            fmt.Printf("Error - path %s does not exist\n", dbPath)
-            return err
-        }
-
-        fullPath, _ = filepath.Abs(dbPath)
-
-        if fullPath == settings.ActiveDB {
-            fmt.Printf("Current database is \"%s\" - nothing to do\n", fullPath)
-            return nil
-        }
-
-        if _, flag = isFileEncrypted(settings.ActiveDB); flag {
-            activeEncrypted = true
-        }
-
-        if _, flag = isFileEncrypted(fullPath); flag {
-            newEncrypted = true
-        }
-
-        // If autoencrypt is true - encrypt current DB automatically
-        if settings.AutoEncrypt {
-            if !activeEncrypted {
-                fmt.Printf("Encrypting current active database - %s\n", settings.ActiveDB)
-                err = encryptActiveDatabase()
-                if err == nil {
-                    activeEncrypted = true
-                }
-            }
-
-            if newEncrypted {
-                // Decrypt new database if it is encrypted
-                fmt.Printf("Database %s is encrypted, decrypting it\n", fullPath)
-                err, _ = decryptDatabase(fullPath)
-                if err != nil {
-                    fmt.Printf("Decryption Error - \"%s\", not switching databases\n", err.Error())
-                    return err
-                } else {
-                    newEncrypted = false
-                }
-            }
-        }
-
-        if !activeEncrypted {
-            // Use should manually encrypt before switching
-            fmt.Println("Auto-encrypt disabled, encrypt existing database before switching to new.")
-            return nil
-        }
-
-        if newEncrypted {
-            // Use should manually decrypt before switching
-            fmt.Println("Auto-encrypt disabled, decrypt new database manually before switching.")
-            return nil
-        }
-
-        settings.ActiveDB = fullPath
-        err = updateSettings(settings, settings.ConfigPath)
-        if err == nil {
-            fmt.Println("Switched active database successfully.")
-        } else {
-            fmt.Printf("Error updating settings - \"%s\"\n", err.Error())
-        }
-
-        return err
-
-    } else {
-        fmt.Printf("Error - null config\n")
-        return errors.New("null config")
-    }
+	var fullPath string
+	var activeEncrypted bool
+	var newEncrypted bool
+
+	err, settings := getOrCreateLocalConfig(APP)
+
+	if err != nil {
+		fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
+		return err
+	}
+
+	if settings != nil {
+		var flag bool
+
+		if _, err = os.Stat(dbPath); os.IsNotExist(err) {
+			fmt.Printf("Error - path %s does not exist\n", dbPath)
+			return err
+		}
+
+		fullPath, _ = filepath.Abs(dbPath)
+
+		if fullPath == settings.ActiveDB {
+			fmt.Printf("Current database is \"%s\" - nothing to do\n", fullPath)
+			return nil
+		}
+
+		if _, flag = isFileEncrypted(settings.ActiveDB); flag {
+			activeEncrypted = true
+		}
+
+		if _, flag = isFileEncrypted(fullPath); flag {
+			newEncrypted = true
+		}
+
+		// If autoencrypt is true - encrypt current DB automatically
+		if settings.AutoEncrypt {
+			if !activeEncrypted {
+				fmt.Printf("Encrypting current active database - %s\n", settings.ActiveDB)
+				err = encryptActiveDatabase()
+				if err == nil {
+					activeEncrypted = true
+				}
+			}
+
+			if newEncrypted {
+				// Decrypt new database if it is encrypted
+				fmt.Printf("Database %s is encrypted, decrypting it\n", fullPath)
+				err, _ = decryptDatabase(fullPath)
+				if err != nil {
+					fmt.Printf("Decryption Error - \"%s\", not switching databases\n", err.Error())
+					return err
+				} else {
+					newEncrypted = false
+				}
+			}
+		}
+
+		if !activeEncrypted {
+			// Use should manually encrypt before switching
+			fmt.Println("Auto-encrypt disabled, encrypt existing database before switching to new.")
+			return nil
+		}
+
+		if newEncrypted {
+			// Use should manually decrypt before switching
+			fmt.Println("Auto-encrypt disabled, decrypt new database manually before switching.")
+			return nil
+		}
+
+		settings.ActiveDB = fullPath
+		err = updateSettings(settings, settings.ConfigPath)
+		if err == nil {
+			fmt.Println("Switched active database successfully.")
+		} else {
+			fmt.Printf("Error updating settings - \"%s\"\n", err.Error())
+		}
+
+		return err
+
+	} else {
+		fmt.Printf("Error - null config\n")
+		return errors.New("null config")
+	}
 }
 
 // Text menu driven function to add a new entry
 func addNewEntry() error {
 
-    var userName string
-    var title string
-    var url string
-    var notes string
-    var passwd string
-    var err error
-    var customEntries []CustomEntry
-
-    if err = checkActiveDatabase(); err != nil {
-        return err
-    }
-
-    reader := bufio.NewReader(os.Stdin)
-    title = readInput(reader, "Title")
-    url = readInput(reader, "URL")
-
-    if len(url) > 0 && !strings.HasPrefix(strings.ToLower(url), "http://") && !strings.HasPrefix(strings.ToLower(url), "https://") {
-        url = "http://" + url
-    }
-
-    userName = readInput(reader, "Username")
-
-    fmt.Printf("Password (enter to generate new): ")
-    err, passwd = readPassword()
-
-    if len(passwd) == 0 {
-        fmt.Printf("\nGenerating password ...")
-        err, passwd = generateStrongPassword()
-        fmt.Printf("done")
-    }
-    //  fmt.Printf("Password => %s\n", passwd)
-
-    notes = readInput(reader, "\nNotes")
-
-    // Title and username/password are mandatory
-    if len(title) == 0 {
-        fmt.Printf("Error - valid Title required\n")
-        return errors.New("invalid input")
-    }
-    if len(userName) == 0 {
-        fmt.Printf("Error - valid Username required\n")
-        return errors.New("invalid input")
-    }
-    if len(passwd) == 0 {
-        fmt.Printf("Error - valid Password required\n")
-        return errors.New("invalid input")
-    }
-
-    customEntries = addCustomFields(reader)
-
-    // Trim spaces
-    err = addNewDatabaseEntry(title, userName, url, passwd, notes, customEntries)
-
-    if err != nil {
-        fmt.Printf("Error adding entry - \"%s\"\n", err.Error())
-    }
-
-    return err
+	var userName string
+	var title string
+	var url string
+	var notes string
+	var passwd string
+	var err error
+	var customEntries []CustomEntry
+
+	if err = checkActiveDatabase(); err != nil {
+		return err
+	}
+
+	reader := bufio.NewReader(os.Stdin)
+	title = readInput(reader, "Title")
+	url = readInput(reader, "URL")
+
+	if len(url) > 0 && !strings.HasPrefix(strings.ToLower(url), "http://") && !strings.HasPrefix(strings.ToLower(url), "https://") {
+		url = "http://" + url
+	}
+
+	userName = readInput(reader, "Username")
+
+	fmt.Printf("Password (enter to generate new): ")
+	err, passwd = readPassword()
+
+	if len(passwd) == 0 {
+		fmt.Printf("\nGenerating password ...")
+		err, passwd = generateStrongPassword()
+		fmt.Printf("done")
+	}
+	//  fmt.Printf("Password => %s\n", passwd)
+
+	notes = readInput(reader, "\nNotes")
+
+	// Title and username/password are mandatory
+	if len(title) == 0 {
+		fmt.Printf("Error - valid Title required\n")
+		return errors.New("invalid input")
+	}
+	if len(userName) == 0 {
+		fmt.Printf("Error - valid Username required\n")
+		return errors.New("invalid input")
+	}
+	if len(passwd) == 0 {
+		fmt.Printf("Error - valid Password required\n")
+		return errors.New("invalid input")
+	}
+
+	customEntries = addCustomFields(reader)
+
+	// Trim spaces
+	err = addNewDatabaseEntry(title, userName, url, passwd, notes, customEntries)
+
+	if err != nil {
+		fmt.Printf("Error adding entry - \"%s\"\n", err.Error())
+	}
+
+	return err
 }
 
 // Function to update existing custom entries and add new ones
 // The bool part of the return value indicates whether to take action
 func addOrUpdateCustomFields(reader *bufio.Reader, entry *Entry) ([]CustomEntry, bool) {
 
-    var customEntries []ExtendedEntry
-    var editedCustomEntries []CustomEntry
-    var newCustomEntries []CustomEntry
-    var flag bool
+	var customEntries []ExtendedEntry
+	var editedCustomEntries []CustomEntry
+	var newCustomEntries []CustomEntry
+	var flag bool
 
-    customEntries = getExtendedEntries(entry)
+	customEntries = getExtendedEntries(entry)
 
-    if len(customEntries) > 0 {
+	if len(customEntries) > 0 {
 
-        fmt.Println("Editing/deleting custom fields")
-        for _, customEntry := range customEntries {
-            var fieldName string
-            var fieldValue string
+		fmt.Println("Editing/deleting custom fields")
+		for _, customEntry := range customEntries {
+			var fieldName string
+			var fieldValue string
 
-            fmt.Println("Field Name: " + customEntry.FieldName)
-            fieldName = readInput(reader, "\tNew Field Name (Enter to keep, \"x\" to delete)")
-            if strings.ToLower(strings.TrimSpace(fieldName)) == "x" {
-                fmt.Println("Deleting field " + fieldName)
-            } else {
-                if strings.TrimSpace(fieldName) == "" {
-                    fieldName = customEntry.FieldName
-                }
+			fmt.Println("Field Name: " + customEntry.FieldName)
+			fieldName = readInput(reader, "\tNew Field Name (Enter to keep, \"x\" to delete)")
+			if strings.ToLower(strings.TrimSpace(fieldName)) == "x" {
+				fmt.Println("Deleting field " + fieldName)
+			} else {
+				if strings.TrimSpace(fieldName) == "" {
+					fieldName = customEntry.FieldName
+				}
 
-                fmt.Println("Field Value: " + customEntry.FieldValue)
-                fieldValue = readInput(reader, "\tNew Field Value (Enter to keep)")
-                if strings.TrimSpace(fieldValue) == "" {
-                    fieldValue = customEntry.FieldValue
-                }
+				fmt.Println("Field Value: " + customEntry.FieldValue)
+				fieldValue = readInput(reader, "\tNew Field Value (Enter to keep)")
+				if strings.TrimSpace(fieldValue) == "" {
+					fieldValue = customEntry.FieldValue
+				}
 
-                editedCustomEntries = append(editedCustomEntries, CustomEntry{fieldName, fieldValue})
-            }
-        }
-    }
+				editedCustomEntries = append(editedCustomEntries, CustomEntry{fieldName, fieldValue})
+			}
+		}
+	}
 
-    newCustomEntries = addCustomFields(reader)
+	newCustomEntries = addCustomFields(reader)
 
-    editedCustomEntries = append(editedCustomEntries, newCustomEntries...)
+	editedCustomEntries = append(editedCustomEntries, newCustomEntries...)
 
-    // Cases where length == 0
-    // 1. Existing entries - all deleted
-    flag = len(customEntries) > 0 || len(editedCustomEntries) > 0
+	// Cases where length == 0
+	// 1. Existing entries - all deleted
+	flag = len(customEntries) > 0 || len(editedCustomEntries) > 0
 
-    return editedCustomEntries, flag
+	return editedCustomEntries, flag
 }
 
 // Function to add custom fields to an entry
 func addCustomFields(reader *bufio.Reader) []CustomEntry {
 
-    // Custom fields
-    var custom string
-    var customEntries []CustomEntry
+	// Custom fields
+	var custom string
+	var customEntries []CustomEntry
 
-    custom = readInput(reader, "Do you want to add custom fields [y/N]")
-    if strings.ToLower(custom) == "y" {
+	custom = readInput(reader, "Do you want to add custom fields [y/N]")
+	if strings.ToLower(custom) == "y" {
 
-        fmt.Println("Keep entering custom field name followed by the value. Press return with no input once done.")
-        for true {
-            var customFieldName string
-            var customFieldValue string
+		fmt.Println("Keep entering custom field name followed by the value. Press return with no input once done.")
+		for true {
+			var customFieldName string
+			var customFieldValue string
 
-            customFieldName = strings.TrimSpace(readInput(reader, "Field Name"))
-            if customFieldName != "" {
-                customFieldValue = strings.TrimSpace(readInput(reader, "Value for "+customFieldName))
-            }
+			customFieldName = strings.TrimSpace(readInput(reader, "Field Name"))
+			if customFieldName != "" {
+				customFieldValue = strings.TrimSpace(readInput(reader, "Value for "+customFieldName))
+			}
 
-            if customFieldName == "" && customFieldValue == "" {
-                break
-            }
+			if customFieldName == "" && customFieldValue == "" {
+				break
+			}
 
-            customEntries = append(customEntries, CustomEntry{customFieldName, customFieldValue})
-        }
-    }
+			customEntries = append(customEntries, CustomEntry{customFieldName, customFieldValue})
+		}
+	}
 
-    return customEntries
+	return customEntries
 }
 
 // Edit a current entry by id
 func editCurrentEntry(idString string) error {
 
-    var userName string
-    var title string
-    var url string
-    var notes string
-    var passwd string
-    var err error
-    var entry *Entry
-    var id int
+	var userName string
+	var title string
+	var url string
+	var notes string
+	var passwd string
+	var err error
+	var entry *Entry
+	var id int
 
-    if err = checkActiveDatabase(); err != nil {
-        return err
-    }
+	if err = checkActiveDatabase(); err != nil {
+		return err
+	}
 
-    id, _ = strconv.Atoi(idString)
+	id, _ = strconv.Atoi(idString)
 
-    err, entry = getEntryById(id)
-    if err != nil || entry == nil {
-        fmt.Printf("No entry found for id %d\n", id)
-        return err
-    }
+	err, entry = getEntryById(id)
+	if err != nil || entry == nil {
+		fmt.Printf("No entry found for id %d\n", id)
+		return err
+	}
 
-    reader := bufio.NewReader(os.Stdin)
+	reader := bufio.NewReader(os.Stdin)
 
-    fmt.Printf("Current Title: %s\n", entry.Title)
-    title = readInput(reader, "New Title")
+	fmt.Printf("Current Title: %s\n", entry.Title)
+	title = readInput(reader, "New Title")
 
-    fmt.Printf("Current URL: %s\n", entry.Url)
-    url = readInput(reader, "New URL")
+	fmt.Printf("Current URL: %s\n", entry.Url)
+	url = readInput(reader, "New URL")
 
-    if len(url) > 0 && !strings.HasPrefix(strings.ToLower(url), "http://") && !strings.HasPrefix(strings.ToLower(url), "https://") {
-        url = "http://" + url
-    }
+	if len(url) > 0 && !strings.HasPrefix(strings.ToLower(url), "http://") && !strings.HasPrefix(strings.ToLower(url), "https://") {
+		url = "http://" + url
+	}
 
-    fmt.Printf("Current Username: %s\n", entry.User)
-    userName = readInput(reader, "New Username")
+	fmt.Printf("Current Username: %s\n", entry.User)
+	userName = readInput(reader, "New Username")
 
-    fmt.Printf("Current Password: %s\n", entry.Password)
-    fmt.Printf("New Password ([y/Y] to generate new, enter will keep old one): ")
-    err, passwd = readPassword()
+	fmt.Printf("Current Password: %s\n", entry.Password)
+	fmt.Printf("New Password ([y/Y] to generate new, enter will keep old one): ")
+	err, passwd = readPassword()
 
-    if strings.ToLower(passwd) == "y" {
-        fmt.Printf("\nGenerating new password ...")
-        err, passwd = generateStrongPassword()
-    }
-    //  fmt.Printf("Password => %s\n", passwd)
+	if strings.ToLower(passwd) == "y" {
+		fmt.Printf("\nGenerating new password ...")
+		err, passwd = generateStrongPassword()
+	}
+	//  fmt.Printf("Password => %s\n", passwd)
 
-    fmt.Printf("\nCurrent Notes: %s\n", entry.Notes)
-    notes = readInput(reader, "New Notes")
+	fmt.Printf("\nCurrent Notes: %s\n", entry.Notes)
+	notes = readInput(reader, "New Notes")
 
-    customEntries, flag := addOrUpdateCustomFields(reader, entry)
+	customEntries, flag := addOrUpdateCustomFields(reader, entry)
 
-    // Update
-    err = updateDatabaseEntry(entry, title, userName, url, passwd, notes, customEntries, flag)
-    if err != nil {
-        fmt.Printf("Error updating entry - \"%s\"\n", err.Error())
-    }
+	// Update
+	err = updateDatabaseEntry(entry, title, userName, url, passwd, notes, customEntries, flag)
+	if err != nil {
+		fmt.Printf("Error updating entry - \"%s\"\n", err.Error())
+	}
 
-    return err
+	return err
 }
 
 // List current entry by id
 func listCurrentEntry(idString string) error {
 
-    var id int
-    var err error
-    var entry *Entry
+	var id int
+	var err error
+	var entry *Entry
 
-    if err = checkActiveDatabase(); err != nil {
-        return err
-    }
+	if err = checkActiveDatabase(); err != nil {
+		return err
+	}
 
-    id, _ = strconv.Atoi(idString)
+	id, _ = strconv.Atoi(idString)
 
-    //  fmt.Printf("Listing current entry - %d\n", id)
-    err, entry = getEntryById(id)
-    if err != nil || entry == nil {
-        fmt.Printf("No entry found for id %d\n", id)
-        return err
-    }
+	//  fmt.Printf("Listing current entry - %d\n", id)
+	err, entry = getEntryById(id)
+	if err != nil || entry == nil {
+		fmt.Printf("No entry found for id %d\n", id)
+		return err
+	}
 
-    err = printEntry(entry, true)
+	err = printEntry(entry, true)
 
-    if err == nil && settingsRider.CopyPassword {
-        //      fmt.Printf("Copying password " + entry.Password + " to clipboard\n")
-        copyPasswordToClipboard(entry.Password)
-    }
+	if err == nil && settingsRider.CopyPassword {
+		//      fmt.Printf("Copying password " + entry.Password + " to clipboard\n")
+		copyPasswordToClipboard(entry.Password)
+	}
 
-    return err
+	return err
 }
 
 // List all entries
 func listAllEntries() error {
 
-    var err error
-    var maxKrypt bool
-    var defaultDB string
-    var passwd string
-
-    maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
-
-    // If max krypt on - then autodecrypt on call and auto encrypt after call
-    if maxKrypt {
-        err, passwd = decryptDatabase(defaultDB)
-        if err != nil {
-            return err
-        }
-    }
-
-    if err = checkActiveDatabase(); err != nil {
-        return err
-    }
-
-    err, settings := getOrCreateLocalConfig(APP)
-
-    if err != nil {
-        fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
-        return err
-    }
-
-    orderKeys := strings.Split(settings.ListOrder, ",")
-    err, entries := iterateEntries(orderKeys[0], orderKeys[1])
-
-    if err == nil {
-        if len(entries) > 0 {
-            fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
-            printDelim(settings.Delim, settings.Color)
-            for _, entry := range entries {
-                printEntry(&entry, false)
-            }
-        } else {
-            fmt.Println("No entries.")
-        }
-    } else {
-        fmt.Printf("Error fetching entries: \"%s\"\n", err.Error())
-        return err
-    }
-
-    // If max krypt on - then autodecrypt on call and auto encrypt after call
-    if maxKrypt {
-        err = encryptDatabase(defaultDB, &passwd)
-    }
-
-    return err
+	var err error
+	var maxKrypt bool
+	var defaultDB string
+	var passwd string
+
+	maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
+
+	// If max krypt on - then autodecrypt on call and auto encrypt after call
+	if maxKrypt {
+		err, passwd = decryptDatabase(defaultDB)
+		if err != nil {
+			return err
+		}
+	}
+
+	if err = checkActiveDatabase(); err != nil {
+		return err
+	}
+
+	err, settings := getOrCreateLocalConfig(APP)
+
+	if err != nil {
+		fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
+		return err
+	}
+
+	orderKeys := strings.Split(settings.ListOrder, ",")
+	err, entries := iterateEntries(orderKeys[0], orderKeys[1])
+
+	if err == nil {
+		if len(entries) > 0 {
+			fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
+			printDelim(settings.Delim, settings.Color)
+			for _, entry := range entries {
+				printEntry(&entry, false)
+			}
+		} else {
+			fmt.Println("No entries.")
+		}
+	} else {
+		fmt.Printf("Error fetching entries: \"%s\"\n", err.Error())
+		return err
+	}
+
+	// If max krypt on - then autodecrypt on call and auto encrypt after call
+	if maxKrypt {
+		err = encryptDatabase(defaultDB, &passwd)
+	}
+
+	return err
 }
 
 // Find current entry by term - prints all matches
 func findCurrentEntry(term string) error {
 
-    var err error
-    var entries []Entry
-
-    if err = checkActiveDatabase(); err != nil {
-        return err
-    }
-
-    err, entries = searchDatabaseEntry(term)
-    if err != nil || len(entries) == 0 {
-        fmt.Printf("Entry for query \"%s\" not found\n", term)
-        return err
-    } else {
-        var delim bool
-        var pcopy bool
-
-        if len(entries) == 1 {
-            delim = true
-            pcopy = true
-            // Single entry means copy password can be enabled
-        } else {
-            _, settings := getOrCreateLocalConfig(APP)
-            fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
-            printDelim(settings.Delim, settings.Color)
-        }
-
-        for _, entry := range entries {
-            printEntry(&entry, delim)
-        }
-
-        if pcopy && settingsRider.CopyPassword {
-            // Single entry
-            copyPasswordToClipboard(entries[0].Password)
-        }
-    }
-
-    return err
+	var err error
+	var entries []Entry
+
+	if err = checkActiveDatabase(); err != nil {
+		return err
+	}
+
+	err, entries = searchDatabaseEntry(term)
+	if err != nil || len(entries) == 0 {
+		fmt.Printf("Entry for query \"%s\" not found\n", term)
+		return err
+	} else {
+		var delim bool
+		var pcopy bool
+
+		if len(entries) == 1 {
+			delim = true
+			pcopy = true
+			// Single entry means copy password can be enabled
+		} else {
+			_, settings := getOrCreateLocalConfig(APP)
+			fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
+			printDelim(settings.Delim, settings.Color)
+		}
+
+		for _, entry := range entries {
+			printEntry(&entry, delim)
+		}
+
+		if pcopy && settingsRider.CopyPassword {
+			// Single entry
+			copyPasswordToClipboard(entries[0].Password)
+		}
+	}
+
+	return err
 }
 
 // Remove a range of entries <id1>-<id2> say 10-14
 func removeMultipleEntries(idRangeEntry string) error {
 
-    var err error
-    var idRange []string
-    var id1, id2 int
+	var err error
+	var idRange []string
+	var id1, id2 int
 
-    idRange = strings.Split(idRangeEntry, "-")
+	idRange = strings.Split(idRangeEntry, "-")
 
-    if len(idRange) != 2 {
-        fmt.Println("Invalid id range - " + idRangeEntry)
-        return errors.New("Invalid id range - " + idRangeEntry)
-    }
+	if len(idRange) != 2 {
+		fmt.Println("Invalid id range - " + idRangeEntry)
+		return errors.New("Invalid id range - " + idRangeEntry)
+	}
 
-    id1, _ = strconv.Atoi(idRange[0])
-    id2, _ = strconv.Atoi(idRange[1])
+	id1, _ = strconv.Atoi(idRange[0])
+	id2, _ = strconv.Atoi(idRange[1])
 
-    if id1 >= id2 {
-        fmt.Println("Invalid id range - " + idRangeEntry)
-        return errors.New("Invalid id range - " + idRangeEntry)
-    }
+	if id1 >= id2 {
+		fmt.Println("Invalid id range - " + idRangeEntry)
+		return errors.New("Invalid id range - " + idRangeEntry)
+	}
 
-    for idNum := id1; idNum <= id2; idNum++ {
-        err = removeCurrentEntry(fmt.Sprintf("%d", idNum))
-    }
+	for idNum := id1; idNum <= id2; idNum++ {
+		err = removeCurrentEntry(fmt.Sprintf("%d", idNum))
+	}
 
-    return err
+	return err
 }
 
 // Remove current entry by id
 func removeCurrentEntry(idString string) error {
 
-    var err error
-    var entry *Entry
-    var id int
-    var response string
-
-    if err = checkActiveDatabase(); err != nil {
-        return err
-    }
-
-    if strings.Contains(idString, "-") {
-        return removeMultipleEntries(idString)
-    }
-
-    id, _ = strconv.Atoi(idString)
-
-    err, entry = getEntryById(id)
-    if err != nil || entry == nil {
-        fmt.Printf("No entry with id %d was found\n", id)
-        return err
-    }
-
-    printEntryMinimal(entry, true)
-
-    response = readInput(bufio.NewReader(os.Stdin), "Please confirm removal [Y/n]: ")
-
-    if strings.ToLower(response) != "n" {
-        // Drop from the database
-        err = removeDatabaseEntry(entry)
-        if err == nil {
-            fmt.Printf("Entry with id %d was removed from the database\n", id)
-        }
-    } else {
-        fmt.Println("Removal of entry cancelled by user.")
-    }
-
-    return err
+	var err error
+	var entry *Entry
+	var id int
+	var response string
+
+	if err = checkActiveDatabase(); err != nil {
+		return err
+	}
+
+	if strings.Contains(idString, "-") {
+		return removeMultipleEntries(idString)
+	}
+
+	id, _ = strconv.Atoi(idString)
+
+	err, entry = getEntryById(id)
+	if err != nil || entry == nil {
+		fmt.Printf("No entry with id %d was found\n", id)
+		return err
+	}
+
+	printEntryMinimal(entry, true)
+
+	if !settingsRider.AssumeYes {
+		response = readInput(bufio.NewReader(os.Stdin), "Please confirm removal [Y/n]: ")
+	} else {
+		response = "y"
+	}
+
+	if strings.ToLower(response) != "n" {
+		// Drop from the database
+		err = removeDatabaseEntry(entry)
+		if err == nil {
+			fmt.Printf("Entry with id %d was removed from the database\n", id)
+		}
+	} else {
+		fmt.Println("Removal of entry cancelled by user.")
+	}
+
+	return err
 }
 
 // Copy current entry by id into new entry
 func copyCurrentEntry(idString string) error {
 
-    var err error
-    var entry *Entry
-    var id int
+	var err error
+	var entry *Entry
+	var id int
 
-    if err = checkActiveDatabase(); err != nil {
-        return err
-    }
+	if err = checkActiveDatabase(); err != nil {
+		return err
+	}
 
-    id, _ = strconv.Atoi(idString)
+	id, _ = strconv.Atoi(idString)
 
-    err, entry = getEntryById(id)
-    if err != nil || entry == nil {
-        fmt.Printf("No entry with id %d was found\n", id)
-        return err
-    }
+	err, entry = getEntryById(id)
+	if err != nil || entry == nil {
+		fmt.Printf("No entry with id %d was found\n", id)
+		return err
+	}
 
-    err, _ = cloneEntry(entry)
-    if err != nil {
-        fmt.Printf("Error cloning entry: \"%s\"\n", err.Error())
-        return err
-    }
+	err, _ = cloneEntry(entry)
+	if err != nil {
+		fmt.Printf("Error cloning entry: \"%s\"\n", err.Error())
+		return err
+	}
 
-    return err
+	return err
 }
 
 // Encrypt the active database
 func encryptActiveDatabase() error {
 
-    var err error
-    var dbPath string
+	var err error
+	var dbPath string
 
-    if err = checkActiveDatabase(); err != nil {
-        return err
-    }
+	if err = checkActiveDatabase(); err != nil {
+		return err
+	}
 
-    err, dbPath = getActiveDatabase()
-    if err != nil {
-        fmt.Printf("Error getting active database path - \"%s\"\n", err.Error())
-        return err
-    }
+	err, dbPath = getActiveDatabase()
+	if err != nil {
+		fmt.Printf("Error getting active database path - \"%s\"\n", err.Error())
+		return err
+	}
 
-    return encryptDatabase(dbPath, nil)
+	return encryptDatabase(dbPath, nil)
 }
 
 // Encrypt the database using AES
 func encryptDatabase(dbPath string, givenPasswd *string) error {
 
-    var err error
-    var passwd string
-    var passwd2 string
-
-    // If password is given, use it
-    if givenPasswd != nil {
-        passwd = *givenPasswd
-    }
-
-    if len(passwd) == 0 {
-        fmt.Printf("Password: ")
-        err, passwd = readPassword()
-
-        if err == nil {
-            fmt.Printf("\nPassword again: ")
-            err, passwd2 = readPassword()
-            if err == nil {
-                if passwd != passwd2 {
-                    fmt.Println("\nPassword mismatch.")
-                    return errors.New("mismatched passwords")
-                }
-            }
-        }
-
-        if err != nil {
-            fmt.Printf("Error reading password - \"%s\"\n", err.Error())
-            return err
-        }
-    }
-
-    //  err = encryptFileAES(dbPath, passwd)
-    _, settings := getOrCreateLocalConfig(APP)
-
-    switch settings.Cipher {
-    case "aes":
-        err = encryptFileAES(dbPath, passwd)
-    case "xchacha", "chacha", "xchachapoly":
-        err = encryptFileXChachaPoly(dbPath, passwd)
-    default:
-        fmt.Println("No cipher set, defaulting to AES")
-        err = encryptFileAES(dbPath, passwd)
-    }
-
-    if err == nil {
-        fmt.Println("\nEncryption complete.")
-    }
-
-    return err
+	var err error
+	var passwd string
+	var passwd2 string
+
+	// If password is given, use it
+	if givenPasswd != nil {
+		passwd = *givenPasswd
+	}
+
+	if len(passwd) == 0 {
+		fmt.Printf("Password: ")
+		err, passwd = readPassword()
+
+		if err == nil {
+			fmt.Printf("\nPassword again: ")
+			err, passwd2 = readPassword()
+			if err == nil {
+				if passwd != passwd2 {
+					fmt.Println("\nPassword mismatch.")
+					return errors.New("mismatched passwords")
+				}
+			}
+		}
+
+		if err != nil {
+			fmt.Printf("Error reading password - \"%s\"\n", err.Error())
+			return err
+		}
+	}
+
+	//  err = encryptFileAES(dbPath, passwd)
+	_, settings := getOrCreateLocalConfig(APP)
+
+	switch settings.Cipher {
+	case "aes":
+		err = encryptFileAES(dbPath, passwd)
+	case "xchacha", "chacha", "xchachapoly":
+		err = encryptFileXChachaPoly(dbPath, passwd)
+	default:
+		fmt.Println("No cipher set, defaulting to AES")
+		err = encryptFileAES(dbPath, passwd)
+	}
+
+	if err == nil {
+		fmt.Println("\nEncryption complete.")
+	}
+
+	return err
 }
 
 // Decrypt an encrypted database
 func decryptDatabase(dbPath string) (error, string) {
 
-    var err error
-    var passwd string
-    var flag bool
+	var err error
+	var passwd string
+	var flag bool
 
-    if err, flag = isFileEncrypted(dbPath); !flag {
-        fmt.Println(err.Error())
-        return err, ""
-    }
+	if err, flag = isFileEncrypted(dbPath); !flag {
+		fmt.Println(err.Error())
+		return err, ""
+	}
 
-    fmt.Printf("Password: ")
-    err, passwd = readPassword()
+	fmt.Printf("Password: ")
+	err, passwd = readPassword()
 
-    if err != nil {
-        fmt.Printf("\nError reading password - \"%s\"\n", err.Error())
-        return err, ""
-    }
+	if err != nil {
+		fmt.Printf("\nError reading password - \"%s\"\n", err.Error())
+		return err, ""
+	}
 
-    _, settings := getOrCreateLocalConfig(APP)
+	_, settings := getOrCreateLocalConfig(APP)
 
-    switch settings.Cipher {
-    case "aes":
-        err = decryptFileAES(dbPath, passwd)
-    case "xchacha", "chacha", "xchachapoly":
-        err = decryptFileXChachaPoly(dbPath, passwd)
-    default:
-        fmt.Println("No cipher set, defaulting to AES")
-        err = decryptFileAES(dbPath, passwd)
-    }
+	switch settings.Cipher {
+	case "aes":
+		err = decryptFileAES(dbPath, passwd)
+	case "xchacha", "chacha", "xchachapoly":
+		err = decryptFileXChachaPoly(dbPath, passwd)
+	default:
+		fmt.Println("No cipher set, defaulting to AES")
+		err = decryptFileAES(dbPath, passwd)
+	}
 
-    if err == nil {
-        fmt.Println("\nDecryption complete.")
-    }
+	if err == nil {
+		fmt.Println("\nDecryption complete.")
+	}
 
-    return err, passwd
+	return err, passwd
 }
 
 // Export data to a varity of file types
 func exportToFile(fileName string) error {
 
-    var err error
-    var maxKrypt bool
-    var defaultDB string
-    var passwd string
-
-    ext := strings.ToLower(filepath.Ext(fileName))
-
-    maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
-
-    if ext == ".csv" || ext == ".md" || ext == ".html" || ext == ".pdf" {
-        // If max krypt on - then autodecrypt on call and auto encrypt after call
-        if maxKrypt {
-            err, passwd = decryptDatabase(defaultDB)
-            if err != nil {
-                return err
-            }
-        }
-    }
-
-    switch ext {
-    case ".csv":
-        err = exportToCsv(fileName)
-    case ".md":
-        err = exportToMarkdown(fileName)
-    case ".html":
-        err = exportToHTML(fileName)
-    case ".pdf":
-        err = exportToPDF(fileName)
-    default:
-        fmt.Printf("Error - extn %s not supported\n", ext)
-        return fmt.Errorf("format %s not supported", ext)
-    }
-
-    if err != nil {
-        fmt.Printf("Error exporting to \"%s\" - \"%s\"\n", fileName, err.Error())
-        return err
-    } else {
-        if _, err = os.Stat(fileName); err == nil {
-            fmt.Printf("Exported to %s.\n", fileName)
-            // Chmod 600
-            os.Chmod(fileName, 0600)
-
-            // If max krypt on - then autodecrypt on call and auto encrypt after call
-            if maxKrypt {
-                err = encryptDatabase(defaultDB, &passwd)
-            }
-
-            return err
-        }
-    }
-
-    return err
+	var err error
+	var maxKrypt bool
+	var defaultDB string
+	var passwd string
+
+	ext := strings.ToLower(filepath.Ext(fileName))
+
+	maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
+
+	if ext == ".csv" || ext == ".md" || ext == ".html" || ext == ".pdf" {
+		// If max krypt on - then autodecrypt on call and auto encrypt after call
+		if maxKrypt {
+			err, passwd = decryptDatabase(defaultDB)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	switch ext {
+	case ".csv":
+		err = exportToCsv(fileName)
+	case ".md":
+		err = exportToMarkdown(fileName)
+	case ".html":
+		err = exportToHTML(fileName)
+	case ".pdf":
+		err = exportToPDF(fileName)
+	default:
+		fmt.Printf("Error - extn %s not supported\n", ext)
+		return fmt.Errorf("format %s not supported", ext)
+	}
+
+	if err != nil {
+		fmt.Printf("Error exporting to \"%s\" - \"%s\"\n", fileName, err.Error())
+		return err
+	} else {
+		if _, err = os.Stat(fileName); err == nil {
+			fmt.Printf("Exported to %s.\n", fileName)
+			// Chmod 600
+			os.Chmod(fileName, 0600)
+
+			// If max krypt on - then autodecrypt on call and auto encrypt after call
+			if maxKrypt {
+				err = encryptDatabase(defaultDB, &passwd)
+			}
+
+			return err
+		}
+	}
+
+	return err
 }
 
 // Export current database to markdown
 func exportToMarkdown(fileName string) error {
 
-    var err error
-    var dataArray [][]string
-    var fh *os.File
-    var maxLengths [7]int
-    var headers []string = []string{" ID ", " Title ", " User ", " URL ", " Password ", " Notes ", " Modified "}
-
-    err, dataArray = entriesToStringArray(false)
-
-    if err != nil {
-        fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
-        return err
-    }
-
-    for _, record := range dataArray {
-        for idx, field := range record {
-
-            if len(field) > maxLengths[idx] {
-                maxLengths[idx] = len(field)
-            }
-        }
-    }
-
-    //  fmt.Printf("%+v\n", maxLengths)
-    fh, err = os.Create(fileName)
-    if err != nil {
-        fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
-        return err
-    }
-
-    defer fh.Close()
-
-    writer := bufio.NewWriter(fh)
-
-    // Write markdown header
-    for idx, length := range maxLengths {
-        delta := length - len(headers[idx])
-        //      fmt.Printf("%d\n", delta)
-        if delta > 0 {
-            for i := 0; i < delta+2; i++ {
-                headers[idx] += " "
-            }
-        }
-    }
-
-    writer.WriteString(" |" + strings.Join(headers, "|") + "|\n")
-
-    // Write line separator
-    writer.WriteString(" | ")
-    for _, length := range maxLengths {
-
-        for i := 0; i < length; i++ {
-            writer.WriteString("-")
-        }
-        writer.WriteString(" | ")
-    }
-    writer.WriteString("\n")
-
-    // Write records
-    for _, record := range dataArray {
-        writer.WriteString(" | ")
-        for _, field := range record {
-            writer.WriteString(field + " | ")
-        }
-        writer.WriteString("\n")
-    }
-
-    writer.Flush()
-
-    return nil
+	var err error
+	var dataArray [][]string
+	var fh *os.File
+	var maxLengths [7]int
+	var headers []string = []string{" ID ", " Title ", " User ", " URL ", " Password ", " Notes ", " Modified "}
+
+	err, dataArray = entriesToStringArray(false)
+
+	if err != nil {
+		fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
+		return err
+	}
+
+	for _, record := range dataArray {
+		for idx, field := range record {
+
+			if len(field) > maxLengths[idx] {
+				maxLengths[idx] = len(field)
+			}
+		}
+	}
+
+	//  fmt.Printf("%+v\n", maxLengths)
+	fh, err = os.Create(fileName)
+	if err != nil {
+		fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
+		return err
+	}
+
+	defer fh.Close()
+
+	writer := bufio.NewWriter(fh)
+
+	// Write markdown header
+	for idx, length := range maxLengths {
+		delta := length - len(headers[idx])
+		//      fmt.Printf("%d\n", delta)
+		if delta > 0 {
+			for i := 0; i < delta+2; i++ {
+				headers[idx] += " "
+			}
+		}
+	}
+
+	writer.WriteString(" |" + strings.Join(headers, "|") + "|\n")
+
+	// Write line separator
+	writer.WriteString(" | ")
+	for _, length := range maxLengths {
+
+		for i := 0; i < length; i++ {
+			writer.WriteString("-")
+		}
+		writer.WriteString(" | ")
+	}
+	writer.WriteString("\n")
+
+	// Write records
+	for _, record := range dataArray {
+		writer.WriteString(" | ")
+		for _, field := range record {
+			writer.WriteString(field + " | ")
+		}
+		writer.WriteString("\n")
+	}
+
+	writer.Flush()
+
+	return nil
 
 }
 
 // This needs pandoc and pdflatex support
 func exportToPDF(fileName string) error {
 
-    var err error
-    var tmpFile string
-    var passwd string
-    var pdfTkFound bool
-
-    cmd := exec.Command("which", "pandoc")
-    if _, err = cmd.Output(); err != nil {
-        return errors.New("pandoc not found")
-    }
-
-    cmd = exec.Command("which", "pdftk")
-    if _, err = cmd.Output(); err != nil {
-        fmt.Printf("pdftk not found, PDF won't be secure!\n")
-    } else {
-        pdfTkFound = true
-    }
-
-    if pdfTkFound {
-        fmt.Printf("PDF Encryption Password: ")
-        err, passwd = readPassword()
-    }
-
-    tmpFile = randomFileName(os.TempDir(), ".tmp")
-    //  fmt.Printf("Temp file => %s\n", tmpFile)
-    err = exportToMarkdownLimited(tmpFile)
-
-    if err == nil {
-        var args []string = []string{"-o", fileName, "-f", "markdown", "-V", "geometry:landscape", "--columns=600", "--pdf-engine", "xelatex", "--dpi=150", tmpFile}
-
-        cmd = exec.Command("pandoc", args...)
-        _, err = cmd.Output()
-        // Remove tmpfile
-        os.Remove(tmpFile)
-
-        // If the file is generated, encrypt it if pdfTkFound
-        if _, err = os.Stat(fileName); err == nil {
-            fmt.Printf("\nFile %s created without password.\n", fileName)
-
-            if pdfTkFound && len(passwd) > 0 {
-                tmpFile = randomFileName(".", ".pdf")
-                //              fmt.Printf("pdf file => %s\n", tmpFile)
-                args = []string{fileName, "output", tmpFile, "user_pw", passwd}
-                cmd = exec.Command("pdftk", args...)
-                _, err = cmd.Output()
-
-                if err == nil {
-                    // Copy over
-                    fmt.Printf("Added password to %s.\n", fileName)
-                    os.Remove(fileName)
-                    err = os.Rename(tmpFile, fileName)
-                } else {
-                    fmt.Printf("Error adding password to pdf - \"%s\"\n", err.Error())
-                }
-            }
-        }
-    }
-
-    return err
+	var err error
+	var tmpFile string
+	var passwd string
+	var pdfTkFound bool
+
+	cmd := exec.Command("which", "pandoc")
+	if _, err = cmd.Output(); err != nil {
+		return errors.New("pandoc not found")
+	}
+
+	cmd = exec.Command("which", "pdftk")
+	if _, err = cmd.Output(); err != nil {
+		fmt.Printf("pdftk not found, PDF won't be secure!\n")
+	} else {
+		pdfTkFound = true
+	}
+
+	if pdfTkFound {
+		fmt.Printf("PDF Encryption Password: ")
+		err, passwd = readPassword()
+	}
+
+	tmpFile = randomFileName(os.TempDir(), ".tmp")
+	//  fmt.Printf("Temp file => %s\n", tmpFile)
+	err = exportToMarkdownLimited(tmpFile)
+
+	if err == nil {
+		var args []string = []string{"-o", fileName, "-f", "markdown", "-V", "geometry:landscape", "--columns=600", "--pdf-engine", "xelatex", "--dpi=150", tmpFile}
+
+		cmd = exec.Command("pandoc", args...)
+		_, err = cmd.Output()
+		// Remove tmpfile
+		os.Remove(tmpFile)
+
+		// If the file is generated, encrypt it if pdfTkFound
+		if _, err = os.Stat(fileName); err == nil {
+			fmt.Printf("\nFile %s created without password.\n", fileName)
+
+			if pdfTkFound && len(passwd) > 0 {
+				tmpFile = randomFileName(".", ".pdf")
+				//              fmt.Printf("pdf file => %s\n", tmpFile)
+				args = []string{fileName, "output", tmpFile, "user_pw", passwd}
+				cmd = exec.Command("pdftk", args...)
+				_, err = cmd.Output()
+
+				if err == nil {
+					// Copy over
+					fmt.Printf("Added password to %s.\n", fileName)
+					os.Remove(fileName)
+					err = os.Rename(tmpFile, fileName)
+				} else {
+					fmt.Printf("Error adding password to pdf - \"%s\"\n", err.Error())
+				}
+			}
+		}
+	}
+
+	return err
 
 }
 
 // Export current database to markdown minus the long fields
 func exportToMarkdownLimited(fileName string) error {
 
-    var err error
-    var dataArray [][]string
-    var fh *os.File
-    var maxLengths [5]int
-    var headers []string = []string{" ID ", " Title ", " User ", " Password ", " Modified "}
-
-    err, dataArray = entriesToStringArray(true)
-
-    if err != nil {
-        fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
-        return err
-    }
-
-    for _, record := range dataArray {
-        for idx, field := range record {
-
-            if len(field) > maxLengths[idx] {
-                maxLengths[idx] = len(field)
-            }
-        }
-    }
-
-    //  fmt.Printf("%+v\n", maxLengths)
-    fh, err = os.Create(fileName)
-    if err != nil {
-        fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
-        return err
-    }
-
-    defer fh.Close()
-
-    writer := bufio.NewWriter(fh)
-
-    // Write markdown header
-    for idx, length := range maxLengths {
-        delta := length - len(headers[idx])
-        //      fmt.Printf("%d\n", delta)
-        if delta > 0 {
-            for i := 0; i < delta+2; i++ {
-                headers[idx] += " "
-            }
-        }
-    }
-
-    writer.WriteString(" |" + strings.Join(headers, "|") + "|\n")
-
-    // Write line separator
-    writer.WriteString(" | ")
-    for _, length := range maxLengths {
-
-        for i := 0; i < length; i++ {
-            writer.WriteString("-")
-        }
-        writer.WriteString(" | ")
-    }
-    writer.WriteString("\n")
-
-    // Write records
-    for _, record := range dataArray {
-        writer.WriteString(" | ")
-        for _, field := range record {
-            writer.WriteString(field + " | ")
-        }
-        writer.WriteString("\n")
-    }
-
-    writer.Flush()
-
-    return nil
+	var err error
+	var dataArray [][]string
+	var fh *os.File
+	var maxLengths [5]int
+	var headers []string = []string{" ID ", " Title ", " User ", " Password ", " Modified "}
+
+	err, dataArray = entriesToStringArray(true)
+
+	if err != nil {
+		fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
+		return err
+	}
+
+	for _, record := range dataArray {
+		for idx, field := range record {
+
+			if len(field) > maxLengths[idx] {
+				maxLengths[idx] = len(field)
+			}
+		}
+	}
+
+	//  fmt.Printf("%+v\n", maxLengths)
+	fh, err = os.Create(fileName)
+	if err != nil {
+		fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
+		return err
+	}
+
+	defer fh.Close()
+
+	writer := bufio.NewWriter(fh)
+
+	// Write markdown header
+	for idx, length := range maxLengths {
+		delta := length - len(headers[idx])
+		//      fmt.Printf("%d\n", delta)
+		if delta > 0 {
+			for i := 0; i < delta+2; i++ {
+				headers[idx] += " "
+			}
+		}
+	}
+
+	writer.WriteString(" |" + strings.Join(headers, "|") + "|\n")
+
+	// Write line separator
+	writer.WriteString(" | ")
+	for _, length := range maxLengths {
+
+		for i := 0; i < length; i++ {
+			writer.WriteString("-")
+		}
+		writer.WriteString(" | ")
+	}
+	writer.WriteString("\n")
+
+	// Write records
+	for _, record := range dataArray {
+		writer.WriteString(" | ")
+		for _, field := range record {
+			writer.WriteString(field + " | ")
+		}
+		writer.WriteString("\n")
+	}
+
+	writer.Flush()
+
+	return nil
 
 }
 
 // Export current database to html
 func exportToHTML(fileName string) error {
 
-    var err error
-    var dataArray [][]string
-    var fh *os.File
-    var headers []string = []string{" ID ", " Title ", " User ", " URL ", " Password ", " Notes ", " Modified "}
+	var err error
+	var dataArray [][]string
+	var fh *os.File
+	var headers []string = []string{" ID ", " Title ", " User ", " URL ", " Password ", " Notes ", " Modified "}
 
-    err, dataArray = entriesToStringArray(false)
+	err, dataArray = entriesToStringArray(false)
 
-    if err != nil {
-        fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
-        return err
-    }
+	if err != nil {
+		fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
+		return err
+	}
 
-    //  fmt.Printf("%+v\n", maxLengths)
-    fh, err = os.Create(fileName)
-    if err != nil {
-        fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
-        return err
-    }
+	//  fmt.Printf("%+v\n", maxLengths)
+	fh, err = os.Create(fileName)
+	if err != nil {
+		fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
+		return err
+	}
 
-    defer fh.Close()
+	defer fh.Close()
 
-    writer := bufio.NewWriter(fh)
+	writer := bufio.NewWriter(fh)
 
-    writer.WriteString("<html><body>\n")
-    writer.WriteString("<table cellPadding=\"2\" cellSpacing=\"2\" border=\"1\">\n")
-    writer.WriteString("<theader>\n")
+	writer.WriteString("<html><body>\n")
+	writer.WriteString("<table cellPadding=\"2\" cellSpacing=\"2\" border=\"1\">\n")
+	writer.WriteString("<theader>\n")
 
-    for _, h := range headers {
-        writer.WriteString(fmt.Sprintf("<th>%s</th>", h))
-    }
-    writer.WriteString("</theader>\n")
-    writer.WriteString("<tbody>\n")
+	for _, h := range headers {
+		writer.WriteString(fmt.Sprintf("<th>%s</th>", h))
+	}
+	writer.WriteString("</theader>\n")
+	writer.WriteString("<tbody>\n")
 
-    // Write records
-    for _, record := range dataArray {
-        writer.WriteString("<tr>")
-        for _, field := range record {
-            writer.WriteString(fmt.Sprintf("<td>%s</td>", field))
-        }
-        writer.WriteString("</tr>\n")
-    }
-    writer.WriteString("</tbody>\n")
-    writer.WriteString("</table>\n")
+	// Write records
+	for _, record := range dataArray {
+		writer.WriteString("<tr>")
+		for _, field := range record {
+			writer.WriteString(fmt.Sprintf("<td>%s</td>", field))
+		}
+		writer.WriteString("</tr>\n")
+	}
+	writer.WriteString("</tbody>\n")
+	writer.WriteString("</table>\n")
 
-    writer.WriteString("</body></html>\n")
+	writer.WriteString("</body></html>\n")
 
-    writer.Flush()
+	writer.Flush()
 
-    return nil
+	return nil
 
 }
 
 // Export current database to CSV
 func exportToCsv(fileName string) error {
 
-    var err error
-    var dataArray [][]string
-    var fh *os.File
+	var err error
+	var dataArray [][]string
+	var fh *os.File
 
-    err, dataArray = entriesToStringArray(false)
+	err, dataArray = entriesToStringArray(false)
 
-    if err != nil {
-        fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
-        return err
-    }
+	if err != nil {
+		fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
+		return err
+	}
 
-    fh, err = os.Create(fileName)
-    if err != nil {
-        fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
-        return err
-    }
+	fh, err = os.Create(fileName)
+	if err != nil {
+		fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
+		return err
+	}
 
-    writer := csv.NewWriter(fh)
+	writer := csv.NewWriter(fh)
 
-    // Write header
-    writer.Write([]string{"ID", "Title", "User", "URL", "Password", "Notes", "Modified"})
+	// Write header
+	writer.Write([]string{"ID", "Title", "User", "URL", "Password", "Notes", "Modified"})
 
-    for idx, record := range dataArray {
-        if err = writer.Write(record); err != nil {
-            fmt.Printf("Error writing record #%d to %s - \"%s\"\n", idx+1, fileName, err.Error())
-            break
-        }
-    }
+	for idx, record := range dataArray {
+		if err = writer.Write(record); err != nil {
+			fmt.Printf("Error writing record #%d to %s - \"%s\"\n", idx+1, fileName, err.Error())
+			break
+		}
+	}
 
-    writer.Flush()
+	writer.Flush()
 
-    if err != nil {
-        return err
-    }
+	if err != nil {
+		return err
+	}
 
-    os.Chmod(fileName, 0600)
-    fmt.Printf("!WARNING: Passwords are stored in plain-text!\n")
-    fmt.Printf("Exported %d records to %s .\n", len(dataArray), fileName)
+	os.Chmod(fileName, 0600)
+	fmt.Printf("!WARNING: Passwords are stored in plain-text!\n")
+	fmt.Printf("Exported %d records to %s .\n", len(dataArray), fileName)
 
-    return nil
+	return nil
 }

From d5a4b6033205dfacbc82daab623a6163451f30e0 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Tue, 14 Dec 2021 10:36:02 +0530
Subject: [PATCH 31/58] ref issue #21 - Added assume-yes option for removal

---
 main.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/main.go b/main.go
index 0df1d8f..a182f13 100644
--- a/main.go
+++ b/main.go
@@ -32,7 +32,7 @@ type CmdOption struct {
 
 // Print the program's usage string and exit
 func printUsage() error {
-	//	getopt.Usage()
+	//  getopt.Usage()
 	os.Exit(0)
 
 	return nil
@@ -102,8 +102,9 @@ func performAction(optMap map[string]interface{}) {
 	}
 
 	flagsActionsMap := map[string]voidFunc{
-		"show": setShowPasswords,
-		"copy": setCopyPasswordToClipboard,
+		"show":       setShowPasswords,
+		"copy":       setCopyPasswordToClipboard,
+		"assume-yes": setAssumeYes,
 	}
 
 	// Flag actions - always done
@@ -168,7 +169,7 @@ func initializeCmdLine(parser *argparse.Parser) map[string]interface{} {
 		{"I", "init", "Initialize a new database", "<path>", ""},
 		{"d", "decrypt", "Decrypt password database", "<path>", ""},
 		{"C", "clone", "Clone an entry with <id>", "<id>", ""},
-		{"R", "remove", "Remove an entry with <id>", "<id>", ""},
+		{"R", "remove", "Remove an entry with <id> or <id-range>", "<id>", ""},
 		{"U", "use-db", "Set <path> as active database", "<path>", ""},
 		{"f", "find", "Search entries with <term>", "<term>", ""},
 		{"E", "edit", "Edit entry by <id>", "<id>", ""},
@@ -188,6 +189,7 @@ func initializeCmdLine(parser *argparse.Parser) map[string]interface{} {
 		{"g", "genpass", "Generate a strong password (length: 12 - 16)", "", ""},
 		{"s", "show", "Show passwords when listing entries", "", ""},
 		{"c", "copy", "Copy password to clipboard", "", ""},
+		{"y", "assume-yes", "Assume yes to actions requiring confirmation", "", ""},
 		{"v", "version", "Show version information and exit", "", ""},
 		{"h", "help", "Print this help message and exit", "", ""},
 	}

From 479a806ee92377a107af4a699ee5387b8991a9b4 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Tue, 14 Dec 2021 10:36:16 +0530
Subject: [PATCH 32/58] ref issue #21 - Added assume-yes option for removal

---
 utils.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/utils.go b/utils.go
index abd84f7..774b783 100644
--- a/utils.go
+++ b/utils.go
@@ -22,6 +22,7 @@ const DELIMSIZE int = 69
 type SettingsOverride struct {
 	ShowPasswords bool
 	CopyPassword  bool
+	AssumeYes     bool
 }
 
 // Settings structure for local config
@@ -444,6 +445,11 @@ func setCopyPasswordToClipboard() error {
 	return nil
 }
 
+func setAssumeYes() error {
+	settingsRider.AssumeYes = true
+	return nil
+}
+
 func copyPasswordToClipboard(passwd string) {
 	clipboard.WriteAll(passwd)
 }

From e9e697f0a563e9e0da4a22fa1c9c04fa6a5f79af Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Tue, 14 Dec 2021 15:38:55 +0530
Subject: [PATCH 33/58] ref issue #10 - Search multiple terms using AND
 operator

---
 actions.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/actions.go b/actions.go
index 35c8ae2..14cf150 100644
--- a/actions.go
+++ b/actions.go
@@ -511,12 +511,15 @@ func findCurrentEntry(term string) error {
 
 	var err error
 	var entries []Entry
+	var terms []string
 
 	if err = checkActiveDatabase(); err != nil {
 		return err
 	}
 
-	err, entries = searchDatabaseEntry(term)
+	terms = strings.Split(term, " ")
+
+	err, entries = searchDatabaseEntries(terms, "AND")
 	if err != nil || len(entries) == 0 {
 		fmt.Printf("Entry for query \"%s\" not found\n", term)
 		return err

From 03e5ef01ef476c3a4e32897adfc89f2146f9cd29 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Tue, 14 Dec 2021 15:39:21 +0530
Subject: [PATCH 34/58] ref issue #10 - Search multiple terms using AND
 operator

---
 db.go | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 68 insertions(+), 1 deletion(-)

diff --git a/db.go b/db.go
index 423085f..410e1a0 100644
--- a/db.go
+++ b/db.go
@@ -229,7 +229,7 @@ func addNewDatabaseEntry(title, userName, url, passwd, notes string, customEntri
 
 	err, db = openActiveDatabase()
 	if err == nil && db != nil {
-		//		result := db.Debug().Create(&entry)
+		//      result := db.Debug().Create(&entry)
 		result := db.Create(&entry)
 		if result.Error == nil && result.RowsAffected == 1 {
 			// Add custom fields if given
@@ -341,6 +341,73 @@ func searchDatabaseEntry(term string) (error, []Entry) {
 
 }
 
+// Union of two entry arrays
+func union(entry1 []Entry, entry2 []Entry) []Entry {
+
+	m := make(map[int]bool)
+
+	for _, item := range entry1 {
+		m[item.ID] = true
+	}
+
+	for _, item := range entry2 {
+		if _, ok := m[item.ID]; !ok {
+			entry1 = append(entry1, item)
+		}
+	}
+
+	return entry1
+}
+
+// Intersection of two entry arrays
+func intersection(entry1 []Entry, entry2 []Entry) []Entry {
+
+	var common []Entry
+
+	m := make(map[int]bool)
+
+	for _, item := range entry1 {
+		m[item.ID] = true
+	}
+
+	for _, item := range entry2 {
+		if _, ok := m[item.ID]; ok {
+			common = append(common, item)
+		}
+	}
+
+	return common
+}
+
+// Search database for the given terms and returns matches according to operator
+func searchDatabaseEntries(terms []string, operator string) (error, []Entry) {
+
+	var err error
+	var finalEntries []Entry
+
+	for idx, term := range terms {
+		var entries []Entry
+
+		err, entries = searchDatabaseEntry(term)
+		if err != nil {
+			fmt.Printf("Error searching for term: %s - \"%s\"\n", term, err.Error())
+			return err, entries
+		}
+
+		if idx == 0 {
+			finalEntries = entries
+		} else {
+			if operator == "AND" {
+				finalEntries = intersection(finalEntries, entries)
+			} else if operator == "OR" {
+				finalEntries = union(finalEntries, entries)
+			}
+		}
+	}
+
+	return nil, finalEntries
+}
+
 // Remove a given database entry
 func removeDatabaseEntry(entry *Entry) error {
 

From c3bbb258c126e59942c8b3d0cca5e8f8dbf80674 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Tue, 14 Dec 2021 15:39:47 +0530
Subject: [PATCH 35/58] ref issue #10 - Search multiple terms using AND
 operator

---
 main.go | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/main.go b/main.go
index a182f13..026de6f 100644
--- a/main.go
+++ b/main.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"github.com/pythonhacker/argparse"
 	"os"
+	"strings"
 )
 
 const VERSION = 0.3
@@ -86,13 +87,16 @@ func performAction(optMap map[string]interface{}) {
 		"edit":       WrapperMaxKryptStringFunc(editCurrentEntry),
 		"init":       initNewDatabase,
 		"list-entry": WrapperMaxKryptStringFunc(listCurrentEntry),
-		"find":       WrapperMaxKryptStringFunc(findCurrentEntry),
 		"remove":     WrapperMaxKryptStringFunc(removeCurrentEntry),
 		"clone":      WrapperMaxKryptStringFunc(copyCurrentEntry),
 		"use-db":     setActiveDatabasePath,
 		"export":     exportToFile,
 	}
 
+	stringListActionsMap := map[string]actionFunc{
+		"find": WrapperMaxKryptStringFunc(findCurrentEntry),
+	}
+
 	stringActions2Map := map[string]actionFunc2{
 		"decrypt": decryptDatabase,
 	}
@@ -146,6 +150,18 @@ func performAction(optMap map[string]interface{}) {
 		}
 	}
 
+	for key, mappedFunc := range stringListActionsMap {
+		if len(*optMap[key].(*[]string)) > 0 {
+
+			var vals = *(optMap[key].(*[]string))
+			// Convert to single string
+			var singleVal = strings.Join(vals, " ")
+			mappedFunc(singleVal)
+			flag = true
+			break
+		}
+	}
+
 	if flag {
 		return
 	}
@@ -171,7 +187,6 @@ func initializeCmdLine(parser *argparse.Parser) map[string]interface{} {
 		{"C", "clone", "Clone an entry with <id>", "<id>", ""},
 		{"R", "remove", "Remove an entry with <id> or <id-range>", "<id>", ""},
 		{"U", "use-db", "Set <path> as active database", "<path>", ""},
-		{"f", "find", "Search entries with <term>", "<term>", ""},
 		{"E", "edit", "Edit entry by <id>", "<id>", ""},
 		{"l", "list-entry", "List entry by <id>", "<id>", ""},
 		{"x", "export", "Export all entries to <filename>", "<filename>", ""},
@@ -181,6 +196,14 @@ func initializeCmdLine(parser *argparse.Parser) map[string]interface{} {
 		optMap[opt.Long] = parser.String(opt.Short, opt.Long, &argparse.Options{Help: opt.Help, Path: opt.Path})
 	}
 
+	stringListOptions := []CmdOption{
+		{"f", "find", "Search entries with terms", "<t1> <t2> ...", ""},
+	}
+
+	for _, opt := range stringListOptions {
+		optMap[opt.Long] = parser.StringList(opt.Short, opt.Long, &argparse.Options{Help: opt.Help, Path: opt.Path})
+	}
+
 	boolOptions := []CmdOption{
 		{"e", "encrypt", "Encrypt the current database", "", ""},
 		{"A", "add", "Add a new entry", "", ""},

From 3624934f5e437b3e1c5c25142b1ad52363f70ef4 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Tue, 14 Dec 2021 15:43:30 +0530
Subject: [PATCH 36/58] ref issue #10 - Added readme entry for searching with
 multiple terms

---
 README.md | 68 +++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 44 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 970efa3..512d257 100644
--- a/README.md
+++ b/README.md
@@ -69,38 +69,39 @@ The binary will be installed in `/usr/local/bin` folder.
 Usage
 =====
 
-    $ ./varuh -h
+    $ varuh -h
     usage: varuh [-h|--help] [-I|--init "<value>"] [-d|--decrypt "<value>"]
                  [-C|--clone "<value>"] [-R|--remove "<value>"] [-U|--use-db
-                 "<value>"] [-f|--find "<value>"] [-E|--edit "<value>"]
-                 [-l|--list-entry "<value>"] [-x|--export "<value>"] [-e|--encrypt]
-                 [-A|--add] [-p|--path] [-a|--list-all] [-g|--genpass] [-s|--show]
-                 [-c|--copy] [-y|--assume-yes] [-v|--version]
+                 "<value>"] [-E|--edit "<value>"] [-l|--list-entry "<value>"]
+                 [-x|--export "<value>"] [-f|--find "<value>" [-f|--find "<value>"
+                 ...]] [-e|--encrypt] [-A|--add] [-p|--path] [-a|--list-all]
+                 [-g|--genpass] [-s|--show] [-c|--copy] [-y|--assume-yes]
+                 [-v|--version]
 
                  Password manager for the command line for Unix like operating
                  systems
 
     Options:
 
-      -h  --help                   Print help information
-      -I  --init        <path>     Initialize a new database
-      -d  --decrypt     <path>     Decrypt password database
-      -C  --clone       <id>       Clone an entry with <id>
-      -R  --remove      <id>       Remove an entry with <id> or <id-range>
-      -U  --use-db      <path>     Set <path> as active database
-      -f  --find        <term>     Search entries with <term>
-      -E  --edit        <id>       Edit entry by <id>
-      -l  --list-entry  <id>       List entry by <id>
-      -x  --export      <filename> Export all entries to <filename>
-      -e  --encrypt                Encrypt the current database
-      -A  --add                    Add a new entry
-      -p  --path                   Show current database path
-      -a  --list-all               List all entries in current database
-      -g  --genpass                Generate a strong password (length: 12 - 16)
-      -s  --show                   Show passwords when listing entries
-      -c  --copy                   Copy password to clipboard
-      -y  --assume-yes             Assume yes to actions requiring confirmation
-      -v  --version                Show version information and exit
+      -h  --help                      Print help information
+      -I  --init        <path>        Initialize a new database
+      -d  --decrypt     <path>        Decrypt password database
+      -C  --clone       <id>          Clone an entry with <id>
+      -R  --remove      <id>          Remove an entry with <id> or <id-range>
+      -U  --use-db      <path>        Set <path> as active database
+      -E  --edit        <id>          Edit entry by <id>
+      -l  --list-entry  <id>          List entry by <id>
+      -x  --export      <filename>    Export all entries to <filename>
+      -f  --find        <t1> <t2> ... Search entries with terms
+      -e  --encrypt                   Encrypt the current database
+      -A  --add                       Add a new entry
+      -p  --path                      Show current database path
+      -a  --list-all                  List all entries in current database
+      -g  --genpass                   Generate a strong password (length: 12 - 16)
+      -s  --show                      Show passwords when listing entries
+      -c  --copy                      Copy password to clipboard
+      -y  --assume-yes                Assume yes to actions requiring confirmation
+      -v  --version                   Show version information and exit
 
 
     AUTHORS
@@ -441,6 +442,25 @@ An entry can be searched on its title, username, URL or notes. Search is case-in
     Modified: 2021-21-25 15:09:51
     +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
+
+## To search using multiple terms
+
+The `-f` option supports multiple terms, so you can specify this more than one time to narrow a search down to a specific entry.
+
+    $ varuh -f google -f anand
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    ID: 8
+    Title: Google account
+    User: anandpillai@alumni.iitm.ac.in
+    URL: 
+    Password: **********
+    Notes: 
+    Modified: 2021-21-25 15:02:50
+    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+    $ varuh -f google -f priya
+    Entry for "google priya" not found
+
 ## To list all entries
 
 To list all entries, use the option `-a`.

From e0ec7ac47a2c44a0eb5df1d05e552622d4124102 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 2 Jan 2022 13:17:36 +0530
Subject: [PATCH 37/58] fixed bugs issue #32 #33 #34 - added migrate option and
 tag as a regular field - issues #30 #31

---
 db.go | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 60 insertions(+), 4 deletions(-)

diff --git a/db.go b/db.go
index 410e1a0..fa2f75a 100644
--- a/db.go
+++ b/db.go
@@ -22,6 +22,7 @@ type Entry struct {
 	Url       string    `gorm:"column:url"`
 	Password  string    `gorm:"column:password"`
 	Notes     string    `gorm:"column:notes"`
+	Tags      string    `gorm:"column:tags"`
 	Timestamp time.Time `gorm:"type:timestamp;default:(datetime('now','localtime'))"` // sqlite3
 }
 
@@ -56,6 +57,16 @@ func (e1 *Entry) Copy(e2 *Entry) {
 	}
 }
 
+// Clone an entry
+func (e1 *ExtendedEntry) Copy(e2 *ExtendedEntry) {
+
+	if e2 != nil {
+		e1.FieldName = e2.FieldName
+		e1.FieldValue = e2.FieldValue
+		e1.EntryID = e2.EntryID
+	}
+}
+
 // Create a new database
 func openDatabase(filePath string) (error, *gorm.DB) {
 
@@ -219,13 +230,15 @@ func replaceCustomEntries(db *gorm.DB, entry *Entry, updatedEntries []CustomEntr
 }
 
 // Add a new entry to current database
-func addNewDatabaseEntry(title, userName, url, passwd, notes string, customEntries []CustomEntry) error {
+func addNewDatabaseEntry(title, userName, url, passwd, tags string,
+	notes string, customEntries []CustomEntry) error {
 
 	var entry Entry
 	var err error
 	var db *gorm.DB
 
-	entry = Entry{Title: title, User: userName, Url: url, Password: passwd, Notes: notes}
+	entry = Entry{Title: title, User: userName, Url: url, Password: passwd, Tags: strings.TrimSpace(tags),
+		Notes: notes}
 
 	err, db = openActiveDatabase()
 	if err == nil && db != nil {
@@ -247,13 +260,20 @@ func addNewDatabaseEntry(title, userName, url, passwd, notes string, customEntri
 }
 
 // Update current database entry with new values
-func updateDatabaseEntry(entry *Entry, title, userName, url, passwd, notes string, customEntries []CustomEntry, flag bool) error {
+func updateDatabaseEntry(entry *Entry, title, userName, url, passwd, tags string,
+	notes string, customEntries []CustomEntry, flag bool) error {
 
 	var updateMap map[string]interface{}
 
 	updateMap = make(map[string]interface{})
 
-	keyValMap := map[string]string{"title": title, "user": userName, "url": url, "password": passwd, "notes": notes}
+	keyValMap := map[string]string{
+		"title":    title,
+		"user":     userName,
+		"url":      url,
+		"password": passwd,
+		"notes":    notes,
+		"tags":     tags}
 
 	for key, val := range keyValMap {
 		if len(val) > 0 {
@@ -416,11 +436,22 @@ func removeDatabaseEntry(entry *Entry) error {
 
 	err, db = openActiveDatabase()
 	if err == nil && db != nil {
+		var exEntries []ExtendedEntry
+
 		res := db.Delete(entry)
 		if res.Error != nil {
 			return res.Error
 		}
 
+		// Delete extended entries if any
+		exEntries = getExtendedEntries(entry)
+		if len(exEntries) > 0 {
+			res = db.Delete(exEntries)
+			if res.Error != nil {
+				return res.Error
+			}
+		}
+
 		return nil
 	}
 
@@ -450,6 +481,31 @@ func cloneEntry(entry *Entry) (error, *Entry) {
 	return err, nil
 }
 
+// Clone extended entries for an entry and return error code
+func cloneExtendedEntries(entry *Entry, exEntries []ExtendedEntry) error {
+
+	var err error
+	var db *gorm.DB
+
+	err, db = openActiveDatabase()
+	if err == nil && db != nil {
+		for _, exEntry := range exEntries {
+			var exEntryNew ExtendedEntry
+
+			exEntryNew.Copy(&exEntry)
+			// Update the ID!
+			exEntryNew.EntryID = entry.ID
+
+			result := db.Create(&exEntryNew)
+			if result.Error != nil {
+				return result.Error
+			}
+		}
+	}
+
+	return err
+}
+
 // Return an iterator over all entries using the given order query keys
 func iterateEntries(orderKey string, order string) (error, []Entry) {
 

From 90787455d8e777b52bd393f18557fd4ee200e9de Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 2 Jan 2022 13:17:47 +0530
Subject: [PATCH 38/58] fixed bugs issue #32 #33 #34 - added migrate option and
 tag as a regular field - issues #30 #31

---
 actions.go | 114 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 97 insertions(+), 17 deletions(-)

diff --git a/actions.go b/actions.go
index 14cf150..09c94ca 100644
--- a/actions.go
+++ b/actions.go
@@ -6,6 +6,7 @@ import (
 	"encoding/csv"
 	"errors"
 	"fmt"
+	"gorm.io/gorm"
 	"os"
 	"os/exec"
 	"os/signal"
@@ -175,14 +176,19 @@ func setActiveDatabasePath(dbPath string) error {
 			}
 
 			if newEncrypted {
-				// Decrypt new database if it is encrypted
-				fmt.Printf("Database %s is encrypted, decrypting it\n", fullPath)
-				err, _ = decryptDatabase(fullPath)
-				if err != nil {
-					fmt.Printf("Decryption Error - \"%s\", not switching databases\n", err.Error())
-					return err
+				if !settings.AutoEncrypt {
+					// Decrypt new database if it is encrypted
+					fmt.Printf("Database %s is encrypted, decrypting it\n", fullPath)
+					err, _ = decryptDatabase(fullPath)
+					if err != nil {
+						fmt.Printf("Decryption Error - \"%s\", not switching databases\n", err.Error())
+						return err
+					} else {
+						newEncrypted = false
+					}
 				} else {
-					newEncrypted = false
+					// New database is encrypted and autoencrypt is set - so keep it like that
+					// fmt.Printf("Database %s is already encrypted, nothing to do\n", fullPath)
 				}
 			}
 		}
@@ -193,7 +199,7 @@ func setActiveDatabasePath(dbPath string) error {
 			return nil
 		}
 
-		if newEncrypted {
+		if newEncrypted && !settings.AutoEncrypt {
 			// Use should manually decrypt before switching
 			fmt.Println("Auto-encrypt disabled, decrypt new database manually before switching.")
 			return nil
@@ -223,6 +229,7 @@ func addNewEntry() error {
 	var url string
 	var notes string
 	var passwd string
+	var tags string
 	var err error
 	var customEntries []CustomEntry
 
@@ -250,7 +257,8 @@ func addNewEntry() error {
 	}
 	//  fmt.Printf("Password => %s\n", passwd)
 
-	notes = readInput(reader, "\nNotes")
+	tags = readInput(reader, "\nTags (separated by space): ")
+	notes = readInput(reader, "Notes")
 
 	// Title and username/password are mandatory
 	if len(title) == 0 {
@@ -269,7 +277,7 @@ func addNewEntry() error {
 	customEntries = addCustomFields(reader)
 
 	// Trim spaces
-	err = addNewDatabaseEntry(title, userName, url, passwd, notes, customEntries)
+	err = addNewDatabaseEntry(title, userName, url, passwd, tags, notes, customEntries)
 
 	if err != nil {
 		fmt.Printf("Error adding entry - \"%s\"\n", err.Error())
@@ -299,7 +307,7 @@ func addOrUpdateCustomFields(reader *bufio.Reader, entry *Entry) ([]CustomEntry,
 			fmt.Println("Field Name: " + customEntry.FieldName)
 			fieldName = readInput(reader, "\tNew Field Name (Enter to keep, \"x\" to delete)")
 			if strings.ToLower(strings.TrimSpace(fieldName)) == "x" {
-				fmt.Println("Deleting field " + fieldName)
+				fmt.Println("Deleting field: " + customEntry.FieldName)
 			} else {
 				if strings.TrimSpace(fieldName) == "" {
 					fieldName = customEntry.FieldName
@@ -365,6 +373,7 @@ func editCurrentEntry(idString string) error {
 	var title string
 	var url string
 	var notes string
+	var tags string
 	var passwd string
 	var err error
 	var entry *Entry
@@ -407,13 +416,16 @@ func editCurrentEntry(idString string) error {
 	}
 	//  fmt.Printf("Password => %s\n", passwd)
 
+	fmt.Printf("\nCurrent Tags: %s\n", entry.Tags)
+	tags = readInput(reader, "New Tags")
+
 	fmt.Printf("\nCurrent Notes: %s\n", entry.Notes)
 	notes = readInput(reader, "New Notes")
 
 	customEntries, flag := addOrUpdateCustomFields(reader, entry)
 
 	// Update
-	err = updateDatabaseEntry(entry, title, userName, url, passwd, notes, customEntries, flag)
+	err = updateDatabaseEntry(entry, title, userName, url, passwd, tags, notes, customEntries, flag)
 	if err != nil {
 		fmt.Printf("Error updating entry - \"%s\"\n", err.Error())
 	}
@@ -629,6 +641,9 @@ func copyCurrentEntry(idString string) error {
 
 	var err error
 	var entry *Entry
+	var entryNew *Entry
+	var exEntries []ExtendedEntry
+
 	var id int
 
 	if err = checkActiveDatabase(); err != nil {
@@ -643,12 +658,24 @@ func copyCurrentEntry(idString string) error {
 		return err
 	}
 
-	err, _ = cloneEntry(entry)
+	err, entryNew = cloneEntry(entry)
 	if err != nil {
 		fmt.Printf("Error cloning entry: \"%s\"\n", err.Error())
 		return err
 	}
 
+	exEntries = getExtendedEntries(entry)
+
+	if len(exEntries) > 0 {
+		fmt.Printf("%d extended entries found\n", len(exEntries))
+
+		err = cloneExtendedEntries(entryNew, exEntries)
+		if err != nil {
+			fmt.Printf("Error cloning extended entries: \"%s\"\n", err.Error())
+			return err
+		}
+	}
+
 	return err
 }
 
@@ -684,11 +711,11 @@ func encryptDatabase(dbPath string, givenPasswd *string) error {
 	}
 
 	if len(passwd) == 0 {
-		fmt.Printf("Password: ")
+		fmt.Printf("Encryption Password: ")
 		err, passwd = readPassword()
 
 		if err == nil {
-			fmt.Printf("\nPassword again: ")
+			fmt.Printf("\nEncryption Password again: ")
 			err, passwd2 = readPassword()
 			if err == nil {
 				if passwd != passwd2 {
@@ -736,7 +763,7 @@ func decryptDatabase(dbPath string) (error, string) {
 		return err, ""
 	}
 
-	fmt.Printf("Password: ")
+	fmt.Printf("Decryption Password: ")
 	err, passwd = readPassword()
 
 	if err != nil {
@@ -757,12 +784,65 @@ func decryptDatabase(dbPath string) (error, string) {
 	}
 
 	if err == nil {
-		fmt.Println("\nDecryption complete.")
+		fmt.Println("...decryption complete.")
 	}
 
 	return err, passwd
 }
 
+// Migrate an existing database to the new schema
+func migrateDatabase(dbPath string) error {
+
+	var err error
+	var flag bool
+	var passwd string
+	var db *gorm.DB
+
+	if _, err = os.Stat(dbPath); os.IsNotExist(err) {
+		fmt.Printf("Error - path %s does not exist\n", dbPath)
+		return err
+	}
+
+	if err, flag = isFileEncrypted(dbPath); flag {
+		err, passwd = decryptDatabase(dbPath)
+	}
+
+	if err != nil {
+		return err
+	}
+
+	err, db = openDatabase(dbPath)
+
+	if err != nil {
+		fmt.Printf("Error opening database path - %s: %s\n", dbPath, err.Error())
+		return err
+	}
+
+	fmt.Println("Migrating tables ...")
+	err = db.AutoMigrate(&Entry{})
+
+	if err != nil {
+		fmt.Printf("Error migrating table \"entries\" - %s: %s\n", dbPath, err.Error())
+		return err
+	}
+
+	err = db.AutoMigrate(&ExtendedEntry{})
+
+	if err != nil {
+		fmt.Printf("Error migrating table \"exentries\" - %s: %s\n", dbPath, err.Error())
+		return err
+	}
+
+	if flag {
+		// File was encrypted - encrypt it again
+		encryptDatabase(dbPath, &passwd)
+	}
+
+	fmt.Println("Migration successful.")
+
+	return nil
+}
+
 // Export data to a varity of file types
 func exportToFile(fileName string) error {
 

From 6eee3225f68d7f516a25245a9e58106a35d8c88b Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 2 Jan 2022 13:17:58 +0530
Subject: [PATCH 39/58] fixed bugs issue #32 #33 #34 - added migrate option and
 tag as a regular field - issues #30 #31

---
 utils.go | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/utils.go b/utils.go
index 774b783..57c3ac8 100644
--- a/utils.go
+++ b/utils.go
@@ -213,6 +213,22 @@ func rewriteBaseFile(path string, contents []byte, mode fs.FileMode) (error, str
 	return err, origFile
 }
 
+// Rewrite the contents of the file with the new contents
+func rewriteFile(path string, contents []byte, mode fs.FileMode) (error, string) {
+
+	var err error
+
+	// Overwrite it
+	err = os.WriteFile(path, contents, 0644)
+
+	if err == nil {
+		// Chmod it
+		os.Chmod(path, mode)
+	}
+
+	return err, path
+}
+
 // Get color codes for console colors
 func getColor(code string) string {
 
@@ -317,7 +333,13 @@ func printEntry(entry *Entry, delim bool) error {
 		}
 		fmt.Printf("Password: %s\n", strings.Join(asterisks, ""))
 	}
-	fmt.Printf("Notes: %s\n", entry.Notes)
+
+	if len(entry.Tags) > 0 {
+		fmt.Printf("Tags: %s\n", entry.Tags)
+	}
+	if len(entry.Notes) > 0 {
+		fmt.Printf("Notes: %s\n", entry.Notes)
+	}
 	// Query extended entries
 	customEntries = getExtendedEntries(entry)
 

From 6c2130749338e938784c4cf1a66b69f1004e5738 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 2 Jan 2022 13:18:20 +0530
Subject: [PATCH 40/58] fixed bugs issue #32 #33 #34 - added migrate option and
 tag as a regular field - issues #30 #31

---
 crypto.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crypto.go b/crypto.go
index 2c9ac69..c1744b7 100644
--- a/crypto.go
+++ b/crypto.go
@@ -278,7 +278,7 @@ func decryptFileAES(encDbPath string, password string) error {
 		return err
 	}
 
-	err, origFile = rewriteBaseFile(encDbPath, plainText, 0600)
+	err, origFile = rewriteFile(encDbPath, plainText, 0600)
 
 	if err != nil {
 		fmt.Printf("Error writing decrypted data to %s - \"%s\"\n", origFile, err.Error())
@@ -425,8 +425,8 @@ func decryptFileXChachaPoly(encDbPath string, password string) error {
 		return err
 	}
 
-	//	err = os.WriteFile("test.sqlite3", plainText, 0600)
-	err, origFile = rewriteBaseFile(encDbPath, plainText, 0600)
+	//	err = os.WriteFile("test.sqlite3", oplainText, 0600)
+	err, origFile = rewriteFile(encDbPath, plainText, 0600)
 
 	if err != nil {
 		fmt.Printf("Error writing decrypted data to %s - \"%s\"\n", origFile, err.Error())

From 8fdf80354f89a70ed85e368ea7abe7c40e227591 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 2 Jan 2022 13:19:02 +0530
Subject: [PATCH 41/58] ref issue #30 #31 - added new options to migrate
 existing database and to add tag as regular field

---
 main.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/main.go b/main.go
index 026de6f..4557b28 100644
--- a/main.go
+++ b/main.go
@@ -91,6 +91,7 @@ func performAction(optMap map[string]interface{}) {
 		"clone":      WrapperMaxKryptStringFunc(copyCurrentEntry),
 		"use-db":     setActiveDatabasePath,
 		"export":     exportToFile,
+		"migrate":    migrateDatabase,
 	}
 
 	stringListActionsMap := map[string]actionFunc{
@@ -190,6 +191,7 @@ func initializeCmdLine(parser *argparse.Parser) map[string]interface{} {
 		{"E", "edit", "Edit entry by <id>", "<id>", ""},
 		{"l", "list-entry", "List entry by <id>", "<id>", ""},
 		{"x", "export", "Export all entries to <filename>", "<filename>", ""},
+		{"m", "migrate", "Migrate a database to latest schema", "<path>", ""},
 	}
 
 	for _, opt := range stringOptions {

From f5bc4a80d83832941916aabd949c9e6ef482f032 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 2 Jan 2022 13:19:50 +0530
Subject: [PATCH 42/58] ref issue #30 #31 #32 #33 #34 - upped version to 0.4

---
 main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.go b/main.go
index 4557b28..1cee5e4 100644
--- a/main.go
+++ b/main.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 )
 
-const VERSION = 0.3
+const VERSION = 0.4
 const APP = "varuh"
 
 const AUTHOR_INFO = `

From 78c17d5e73fe82c3210d5b17a798e51eb0e74df4 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 2 Jan 2022 13:25:59 +0530
Subject: [PATCH 43/58] ref i- updated copyright

---
 main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.go b/main.go
index 1cee5e4..c1ce900 100644
--- a/main.go
+++ b/main.go
@@ -14,7 +14,7 @@ const APP = "varuh"
 
 const AUTHOR_INFO = `
 AUTHORS
-    Copyright (C) 2021 Anand B Pillai <abpillai@gmail.com>
+    Copyright (C) 2022 Anand B Pillai <abpillai@gmail.com>
 `
 
 type actionFunc func(string) error

From 791ba801356fdfdd4519b7a779b78c1e7e8fe104 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 2 Jan 2022 13:40:04 +0530
Subject: [PATCH 44/58] updated default delim to '>'

---
 utils.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils.go b/utils.go
index 57c3ac8..8c57d62 100644
--- a/utils.go
+++ b/utils.go
@@ -123,7 +123,7 @@ func getOrCreateLocalConfig(app string) (error, *Settings) {
 
 	} else {
 		//      fmt.Printf("Creating default configuration ...")
-		settings = Settings{"", "aes", true, true, false, configFile, "id,asc", "+", "default", "bgblack"}
+		settings = Settings{"", "aes", true, true, false, configFile, "id,asc", ">", "default", "bgblack"}
 
 		if err = writeSettings(&settings, configFile); err == nil {
 			// fmt.Println(" ...done")

From f04a6ea29957bac7aa467fe5ec363f5904609737 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 2 Jan 2022 13:44:41 +0530
Subject: [PATCH 45/58] ref issue #30 - Updated README with tags and migration
 and a few other things

---
 README.md | 113 ++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 71 insertions(+), 42 deletions(-)

diff --git a/README.md b/README.md
index 512d257..118e7f7 100644
--- a/README.md
+++ b/README.md
@@ -69,43 +69,44 @@ The binary will be installed in `/usr/local/bin` folder.
 Usage
 =====
 
-    $ varuh -h
-    usage: varuh [-h|--help] [-I|--init "<value>"] [-d|--decrypt "<value>"]
-                 [-C|--clone "<value>"] [-R|--remove "<value>"] [-U|--use-db
-                 "<value>"] [-E|--edit "<value>"] [-l|--list-entry "<value>"]
-                 [-x|--export "<value>"] [-f|--find "<value>" [-f|--find "<value>"
-                 ...]] [-e|--encrypt] [-A|--add] [-p|--path] [-a|--list-all]
-                 [-g|--genpass] [-s|--show] [-c|--copy] [-y|--assume-yes]
-                 [-v|--version]
-
-                 Password manager for the command line for Unix like operating
-                 systems
-
-    Options:
-
-      -h  --help                      Print help information
-      -I  --init        <path>        Initialize a new database
-      -d  --decrypt     <path>        Decrypt password database
-      -C  --clone       <id>          Clone an entry with <id>
-      -R  --remove      <id>          Remove an entry with <id> or <id-range>
-      -U  --use-db      <path>        Set <path> as active database
-      -E  --edit        <id>          Edit entry by <id>
-      -l  --list-entry  <id>          List entry by <id>
-      -x  --export      <filename>    Export all entries to <filename>
-      -f  --find        <t1> <t2> ... Search entries with terms
-      -e  --encrypt                   Encrypt the current database
-      -A  --add                       Add a new entry
-      -p  --path                      Show current database path
-      -a  --list-all                  List all entries in current database
-      -g  --genpass                   Generate a strong password (length: 12 - 16)
-      -s  --show                      Show passwords when listing entries
-      -c  --copy                      Copy password to clipboard
-      -y  --assume-yes                Assume yes to actions requiring confirmation
-      -v  --version                   Show version information and exit
-
-
-    AUTHORS
-        Copyright (C) 2021 Anand B Pillai <abpillai@gmail.com>
+	$ varuh -h
+	usage: varuh [-h|--help] [-I|--init "<value>"] [-d|--decrypt "<value>"]
+				 [-C|--clone "<value>"] [-R|--remove "<value>"] [-U|--use-db
+				 "<value>"] [-E|--edit "<value>"] [-l|--list-entry "<value>"]
+				 [-x|--export "<value>"] [-m|--migrate "<value>"] [-f|--find
+				 "<value>" [-f|--find "<value>" ...]] [-e|--encrypt] [-A|--add]
+				 [-p|--path] [-a|--list-all] [-g|--genpass] [-s|--show] [-c|--copy]
+				 [-y|--assume-yes] [-v|--version]
+
+				 Password manager for the command line for Unix like operating
+				 systems
+
+	Options:
+
+	  -h  --help                      Print help information
+	  -I  --init        <path>        Initialize a new database
+	  -d  --decrypt     <path>        Decrypt password database
+	  -C  --clone       <id>          Clone an entry with <id>
+	  -R  --remove      <id>          Remove an entry with <id> or <id-range>
+	  -U  --use-db      <path>        Set <path> as active database
+	  -E  --edit        <id>          Edit entry by <id>
+	  -l  --list-entry  <id>          List entry by <id>
+	  -x  --export      <filename>    Export all entries to <filename>
+	  -m  --migrate     <path>        Migrate a database to latest schema
+	  -f  --find        <t1> <t2> ... Search entries with terms
+	  -e  --encrypt                   Encrypt the current database
+	  -A  --add                       Add a new entry
+	  -p  --path                      Show current database path
+	  -a  --list-all                  List all entries in current database
+	  -g  --genpass                   Generate a strong password (length: 12 - 16)
+	  -s  --show                      Show passwords when listing entries
+	  -c  --copy                      Copy password to clipboard
+	  -y  --assume-yes                Assume yes to actions requiring confirmation
+	  -v  --version                   Show version information and exit
+
+
+	AUTHORS
+		Copyright (C) 2022 Anand B Pillai <abpillai@gmail.com>
 
 
 Encryption and Security
@@ -149,6 +150,7 @@ The password database is created and is active now. You can start adding entries
     Username: mememe
     Password (enter to generate new): 
     Generating password ...done
+	Tags (separated by space): testing test website
     Notes: Website uses Nginx auth
     Do you want to add custom fields [y/N]: 
     Created new entry with id: 1
@@ -162,6 +164,7 @@ You can now list the entry with one of the list options.
     User: mememe
     URL: http://mywebsite.name
     Password: ****************
+	Tags: testing test website
     Notes: Website uses Nginx auth
     Modified: 2021-21-09 23:12:35
     +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -175,6 +178,7 @@ From version 0.3 onwards, custom fields are supported.
     URL: https://github.com/mydev/myproject
     Username: mydev
     Password (enter to generate new): ghp_ipQrStuVwxYz1a2b3cdEF10ghI689kLaMnOp
+	Tags (separated by space): token github
     Notes: Never Expires
     Do you want to add custom fields [y/N]: y
     Field Name: Domain
@@ -190,12 +194,12 @@ From version 0.3 onwards, custom fields are supported.
     User: mydev
     URL: https://github.com/mydev/myproject
     Password: ghp_ipQrStuVwxYz1a2b3cdEF10ghI689kLaMnOp
+	Tags: token github
     Notes: Never Expires
     Domain: github.com
     Type: Auth Token
     Modified: 2021-21-13 00:07:18
 
-
 For more on listing see the [Listing and Searching](#listing-and-searching) section below.
 
 ## Edit an entry
@@ -208,7 +212,9 @@ For more on listing see the [Listing and Searching](#listing-and-searching) sect
     Current Username: mememe
     New Username: meblog
     Current Password: lTzC2z9kRppnYsYl
-    New Password ([y/Y] to generate new, enter will keep old one): 
+    New Password ([y/Y] to generate new, enter will keep old one):
+	Current Tags: testing test website
+	New Tags: 
     Current Notes: Website uses Nginx auth
     New Notes: Website uses Apache
     Do you want to add custom fields [y/N]:
@@ -221,6 +227,7 @@ For more on listing see the [Listing and Searching](#listing-and-searching) sect
     User: meblog
     URL: http://myblog.name
     Password: myblog123
+	Tags: testing test website
     Notes: Website uses Apache
     Modified: 2021-21-09 23:15:29
     +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -242,7 +249,8 @@ When you edit an entry with custom fields, you get the option to change the name
     New Notes:
     Editing/deleting custom fields
     Field Name: Domain
-        New Field Name (Enter to keep, "x" to delete): x
+		New Field Name (Enter to keep, "x" to delete): x
+	Deleting field: Domain
     Field Name: Type
         New Field Name (Enter to keep, "x" to delete): Token Type
     Field Value: Auth Token
@@ -257,6 +265,7 @@ When you edit an entry with custom fields, you get the option to change the name
     User: mydev
     URL: https://github.com/mydev/myproject
     Password: ghp_ipQrStuVwxYz1a2b3cdEF10ghI689kLaMnOp
+	Tags: token github
     Notes: Never Expires
     Token Type: Auth Token
     Modified: 2021-21-13 00:16:41
@@ -336,7 +345,25 @@ If you want to switch back to a previous database, you can use the `-U` option.
     Password: 
     Decryption complete.
     Switched active database successfully.
-    
+
+## Database Migration
+
+(New in version 0.4)
+
+When new features are added - sometimes new fields would be required to be added in the database schema. To make sure your old databases work with the new features in such cases, the `--migrate` option can be used to migrate your existing databases.
+
+	$ ./varuh -m /home/anand/mypasswds
+	Password:
+	Decryption complete.
+	Migrating tables ...
+
+	Encryption complete.
+	Migration successful.
+
+For migration you need to provide the database path - even for the active database. Once migrated, you can continue to use your database as before.
+
+NOTE: It is suggested to make a backup copy of your current active database before migration.
+
 ## Manual encryption and decryption
 
 You can manually encrypt the current database using the `-e` option.
@@ -366,6 +393,7 @@ Now the database is active again and you can see the listings.
     User: myblog.name
     URL: http://meblog
     Password: *********
+	Tags: test testing website
     Notes: Website uses Apache
     Modified: 2021-21-09 23:21:32
     +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -385,6 +413,7 @@ If the config param `encrypt_on` is set to `true` along with `auto_encrypt` (def
     User: banklogin
     URL: https://my.localbank.com
     Password: bankpass123
+	Tags: bank banking finance
     Notes: 
     Modified: 2021-21-18 12:44:10
     +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -588,7 +617,7 @@ The config file is named *config.json*. It looks as follows.
         "encrypt_on": true,
         "path": "/home/anand/.config/varuh/config.json",
         "list_order": "id,asc",
-        "delimiter": "+",
+        "delimiter": ">",
         "color": "default",
         "bgcolor": "bgblack"
     }

From f81a7ee0ac44f2b43c2a8d93480e48eb0697eeca Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 2 Jan 2022 13:45:49 +0530
Subject: [PATCH 46/58] ref issue #30 - Updated separator string

---
 README.md | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 118e7f7..49d22e9 100644
--- a/README.md
+++ b/README.md
@@ -158,7 +158,7 @@ The password database is created and is active now. You can start adding entries
 You can now list the entry with one of the list options.
 
     $ varuh -l 1
-    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
     ID: 1
     Title: My Website Login
     User: mememe
@@ -167,7 +167,7 @@ You can now list the entry with one of the list options.
 	Tags: testing test website
     Notes: Website uses Nginx auth
     Modified: 2021-21-09 23:12:35
-    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 ## Add an entry with custom fields
 
@@ -221,7 +221,7 @@ For more on listing see the [Listing and Searching](#listing-and-searching) sect
     Updated entry.
 
     $ varuh -l 1 -s
-    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
     ID: 1
     Title: My Blog Login
     User: meblog
@@ -230,7 +230,7 @@ For more on listing see the [Listing and Searching](#listing-and-searching) sect
 	Tags: testing test website
     Notes: Website uses Apache
     Modified: 2021-21-09 23:15:29
-    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 ## Edit an entry with custom fields
 
@@ -282,12 +282,12 @@ To clone (copy) an entry,
 ## Remove an entry
 
     $ varuh -R 1
-    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
     Title: My Website Login
     User: mememe
     URL: https://mywebsite.name
     Modified: 2021-21-09 23:12:35
-    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
     Please confirm removal [Y/n]: 
     Entry with id 1 was removed from the database
 
@@ -387,7 +387,7 @@ Manually decrypt the database using `-d` option.
 Now the database is active again and you can see the listings.
 
     $ varuh -l 3
-    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
     ID: 2
     Title: My Blog Login
     User: myblog.name
@@ -396,7 +396,7 @@ Now the database is active again and you can see the listings.
 	Tags: test testing website
     Notes: Website uses Apache
     Modified: 2021-21-09 23:21:32
-    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 ## Always on encryption
 
@@ -407,7 +407,7 @@ If the config param `encrypt_on` is set to `true` along with `auto_encrypt` (def
     $ varuh -f my -s
     Password: 
     Decryption complete.
-    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
     ID: 2
     Title: MY LOCAL BANK
     User: banklogin
@@ -416,7 +416,7 @@ If the config param `encrypt_on` is set to `true` along with `auto_encrypt` (def
 	Tags: bank banking finance
     Notes: 
     Modified: 2021-21-18 12:44:10
-    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
     Encryption complete.
 
@@ -430,7 +430,7 @@ Listing and Searching
 To list an entry using its id,
 
     $ varuh -l 8
-    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
     ID: 8
     Title: Google account
     User: anandpillai@alumni.iitm.ac.in
@@ -438,14 +438,14 @@ To list an entry using its id,
     Password: ***********
     Notes: 
     Modified: 2021-21-25 15:02:50
-    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 ## To search an entry
 
 An entry can be searched on its title, username, URL or notes. Search is case-insensitive.
 
     $ varuh -f google
-    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
     ID: 8
     Title: Google account
     User: anandpillai@alumni.iitm.ac.in
@@ -453,7 +453,7 @@ An entry can be searched on its title, username, URL or notes. Search is case-in
     Password: **********
     Notes: 
     Modified: 2021-21-25 15:02:50
-    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
     ID: 9
     Title: Google account
     User: xyz@gmail.com
@@ -461,7 +461,7 @@ An entry can be searched on its title, username, URL or notes. Search is case-in
     Password: ********
     Notes: 
     Modified: 2021-21-25 15:05:36
-    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
     ID: 10
     Title: Google account
     User: somethingaboutme@gmail.com
@@ -469,7 +469,7 @@ An entry can be searched on its title, username, URL or notes. Search is case-in
     Password: ***********
     Notes: 
     Modified: 2021-21-25 15:09:51
-    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 
 ## To search using multiple terms
@@ -477,7 +477,7 @@ An entry can be searched on its title, username, URL or notes. Search is case-in
 The `-f` option supports multiple terms, so you can specify this more than one time to narrow a search down to a specific entry.
 
     $ varuh -f google -f anand
-    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
     ID: 8
     Title: Google account
     User: anandpillai@alumni.iitm.ac.in
@@ -485,7 +485,7 @@ The `-f` option supports multiple terms, so you can specify this more than one t
     Password: **********
     Notes: 
     Modified: 2021-21-25 15:02:50
-    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
     $ varuh -f google -f priya
     Entry for "google priya" not found
@@ -495,7 +495,7 @@ The `-f` option supports multiple terms, so you can specify this more than one t
 To list all entries, use the option `-a`.
 
     $ varuh -a
-    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
     ID: 1
     Title: My Bank #1
     User: myusername1
@@ -503,7 +503,7 @@ To list all entries, use the option `-a`.
     Password: ***********
     Notes: 
     Modified: 2021-21-15 15:40:29
-    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
     ID: 2
     Title: My Digital Locker #1
     User: mylockerusername
@@ -511,7 +511,7 @@ To list all entries, use the option `-a`.
     Password: **********
     Notes: 
     Modified: 2021-21-18 12:44:10
-    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
     ID: 3
     Title: My Bank Login #2
     User: mybankname2
@@ -519,7 +519,7 @@ To list all entries, use the option `-a`.
     Password: **********
     Notes: 
     Modified: 2021-21-19 14:16:33
-    +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+    >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
     ...
 
 By default the listing is in ascending ID order. This can be changed in the configuration (see below).

From 397eea14328af055248149871e97718c2693802e Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Sun, 2 Jan 2022 13:49:02 +0530
Subject: [PATCH 47/58] doc fixes

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 49d22e9..01631aa 100644
--- a/README.md
+++ b/README.md
@@ -244,7 +244,9 @@ When you edit an entry with custom fields, you get the option to change the name
     Current Username: mydev
     New Username: 
     Current Password: ghp_ipQrStuVwxYz1a2b3cdEF10ghI689kLaMnOp
-    New Password ([y/Y] to generate new, enter will keep old one): 
+    New Password ([y/Y] to generate new, enter will keep old one):
+	Current Tags: token github
+	New Tags: 	
     Current Notes: Never Expires
     New Notes:
     Editing/deleting custom fields
@@ -350,7 +352,7 @@ If you want to switch back to a previous database, you can use the `-U` option.
 
 (New in version 0.4)
 
-When new features are added - sometimes new fields would be required to be added in the database schema. To make sure your old databases work with the new features in such cases, the `--migrate` option can be used to migrate your existing databases.
+When new features are added - sometimes new fields would be required to be added in the database schema. To make sure your old databases work with the new features in such cases, the `-m/--migrate` option can be used to migrate your existing databases.
 
 	$ ./varuh -m /home/anand/mypasswds
 	Password:

From 668258f076a76e7c797f5d9f9e07364590640f92 Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Mon, 3 Jan 2022 18:41:58 +0530
Subject: [PATCH 48/58] ref issue #28 - Enhanced schema for entries table plus
 new address table for new types

---
 db.go | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 74 insertions(+), 5 deletions(-)

diff --git a/db.go b/db.go
index fa2f75a..3bb5b23 100644
--- a/db.go
+++ b/db.go
@@ -17,7 +17,23 @@ import (
 // Structure representing an entry in the db
 type Entry struct {
 	ID        int       `gorm:"column:id;autoIncrement;primaryKey"`
+	Type      string    `gorm:"column:type"`  // Type of entry - password (default), card, identity etc
 	Title     string    `gorm:"column:title"`
+    Name      string    `gorm:"column:name"` // Card holder name/ID card name - for types cards/identity
+	Company   string    `gorm:"column:company"` // Company name of person  - for type identity and
+                                             	// Credit card company for type CC
+	Number    string    `gorm:"column:number"`  // Number type - CC number for credit cards
+	                                            // ID card number for identity types
+	SecurityCode string  `gorm:"security_code"` // CVV number/security code for CC type
+	ExpiryMonth string   `gorm:"expiry_month"` // CC or Identity document expiry month
+	ExpiryDay string     `gorm:"expiry_day"`   // Identity document expiry day
+	ExpiryYear string    `gorm:"expiry_year"`  // CC or Identity document expiry year
+	FirstName  string    `gorm:"column:first_name"` // first name - for ID card types
+	MiddleName string    `gorm:"column:middle_name"` // middle name - for ID card types
+	LastName   string    `gorm:"column:last_name"` // last name - for ID card types	
+	Email      string    `gorm:"email"` // Email - for ID card types
+	PhoneNumber string   `gorm:"phone_number"` // Phone number - for ID card types
+
 	User      string    `gorm:"column:user"`
 	Url       string    `gorm:"column:url"`
 	Password  string    `gorm:"column:password"`
@@ -45,15 +61,68 @@ func (ex *ExtendedEntry) TableName() string {
 	return "exentries"
 }
 
+type Address struct {
+	ID     int   `gorm:"column:id;autoIncrement;primaryKey"`
+	Number string `gorm:"column:number"` // Flat or building number
+	Building string `gorm:"column:building"` // Apartment or building or society name
+	Street  string `gorm:"column:street"` // Street address
+	Locality string `gorm:"column:locality"` // Name of the locality e.g: Whitefield
+	Area     string `gorm:"column:area"` // Name of the larger area e.g: East Bangalore
+	City     string `gorm:"column:city"` // Name of the city e.g: Bangalore
+	State   string  `gorm:"column:state"` // Name of the state e.g: Karnataka
+	Country string  `gorm:"column:country"` // Name of the country e.g: India
+
+	Landmark string `gorm:"column:landmark"` // Name of landmark if any
+	ZipCode string  `gorm:"column:zipcode"` // PIN/ZIP code
+	Type    string  `gorm:"column:type"` // Type of address: Home/Work/Business
+
+	Entry   Entry `gorm:"foreignKey:EntryID"`
+	EntryID int	
+}
+
+func (ad *Address) TableName() string {
+	return "address"
+}
+
 // Clone an entry
 func (e1 *Entry) Copy(e2 *Entry) {
 
 	if e2 != nil {
-		e1.Title = e2.Title
-		e1.User = e2.User
-		e1.Url = e2.Url
-		e1.Password = e2.Password
-		e1.Notes = e2.Notes
+		switch (e2.Type) {
+		case "password":
+			e1.Title = e2.Title
+			e1.User = e2.User
+			e1.Url = e2.Url
+			e1.Password = e2.Password
+			e1.Notes = e2.Notes
+			e1.Tags = e2.Tags
+			e1.Type = e2.Type
+		case "card":
+			e1.Title = e2.Title
+			e1.Name = e2.Name // card holder name
+			e1.Company = e2.Company
+			e1.Number = e2.Number
+			e1.SecurityCode = e2.SecurityCode
+			e1.ExpiryMonth = e2.ExpiryMonth
+			e1.ExpiryYear = e2.ExpiryYear
+			e1.Tags = e2.Tags
+			e1.Notes = e2.Notes
+			e1.Type = e2.Type			
+		case "identity":
+			e1.Title = e2.Title
+			e1.Name = e2.Name 
+			e1.Company = e2.Company
+			e1.FirstName = e2.FirstName
+			e1.LastName = e2.LastName			
+			e1.MiddleName = e2.MiddleName
+			e1.User = e2.User
+			e1.Email = e2.Email
+			e1.PhoneNumber = e2.PhoneNumber
+			e1.Number = e2.Number
+			e1.Notes = e2.Notes
+			e1.Tags = e2.Tags
+			e1.Type = e2.Type
+		}
 	}
 }
 

From f391ae917013b826b9f48031a40d9c0d8e68f82f Mon Sep 17 00:00:00 2001
From: Anand <anand.pillai@ventur8.io>
Date: Mon, 3 Jan 2022 18:43:52 +0530
Subject: [PATCH 49/58] ref issue #28 - added active field

---
 db.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db.go b/db.go
index 3bb5b23..62359e6 100644
--- a/db.go
+++ b/db.go
@@ -34,6 +34,7 @@ type Entry struct {
 	Email      string    `gorm:"email"` // Email - for ID card types
 	PhoneNumber string   `gorm:"phone_number"` // Phone number - for ID card types
 
+	Active    bool       `gorm:"active;default:true"` // Is the id card/CC active ?
 	User      string    `gorm:"column:user"`
 	Url       string    `gorm:"column:url"`
 	Password  string    `gorm:"column:password"`

From 7fd1032bc6f93b863a8c64facc12cc50f37cee2b Mon Sep 17 00:00:00 2001
From: Anand Balachandran Pillai <a.pillai@drishti.com>
Date: Sun, 14 Aug 2022 11:02:24 +0530
Subject: [PATCH 50/58] ref issue #42 - search on tags as well

---
 db.go | 805 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 401 insertions(+), 404 deletions(-)

diff --git a/db.go b/db.go
index fa2f75a..2d73af3 100644
--- a/db.go
+++ b/db.go
@@ -2,586 +2,583 @@
 package main
 
 import (
-	"database/sql"
-	"fmt"
-	"gorm.io/driver/sqlite"
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"time"
+    "database/sql"
+    "fmt"
+    "gorm.io/driver/sqlite"
+    "gorm.io/gorm"
+    "gorm.io/gorm/logger"
+    "os"
+    "path/filepath"
+    "strconv"
+    "strings"
+    "time"
 )
 
 // Structure representing an entry in the db
 type Entry struct {
-	ID        int       `gorm:"column:id;autoIncrement;primaryKey"`
-	Title     string    `gorm:"column:title"`
-	User      string    `gorm:"column:user"`
-	Url       string    `gorm:"column:url"`
-	Password  string    `gorm:"column:password"`
-	Notes     string    `gorm:"column:notes"`
-	Tags      string    `gorm:"column:tags"`
-	Timestamp time.Time `gorm:"type:timestamp;default:(datetime('now','localtime'))"` // sqlite3
+    ID        int       `gorm:"column:id;autoIncrement;primaryKey"`
+    Title     string    `gorm:"column:title"`
+    User      string    `gorm:"column:user"`
+    Url       string    `gorm:"column:url"`
+    Password  string    `gorm:"column:password"`
+    Notes     string    `gorm:"column:notes"`
+    Tags      string    `gorm:"column:tags"`
+    Timestamp time.Time `gorm:"type:timestamp;default:(datetime('now','localtime'))"` // sqlite3
 }
 
 func (e *Entry) TableName() string {
-	return "entries"
+    return "entries"
 }
 
 // Structure representing an extended entry in the db - for custom fields
 type ExtendedEntry struct {
-	ID         int       `gorm:"column:id;autoIncrement;primaryKey"`
-	FieldName  string    `gorm:"column:field_name"`
-	FieldValue string    `gorm:"column:field_value"`
-	Timestamp  time.Time `gorm:"type:timestamp;default:(datetime('now','localtime'))"` // sqlite3
+    ID         int       `gorm:"column:id;autoIncrement;primaryKey"`
+    FieldName  string    `gorm:"column:field_name"`
+    FieldValue string    `gorm:"column:field_value"`
+    Timestamp  time.Time `gorm:"type:timestamp;default:(datetime('now','localtime'))"` // sqlite3
 
-	Entry   Entry `gorm:"foreignKey:EntryID"`
-	EntryID int
+    Entry   Entry `gorm:"foreignKey:EntryID"`
+    EntryID int
 }
 
 func (ex *ExtendedEntry) TableName() string {
-	return "exentries"
+    return "exentries"
 }
 
 // Clone an entry
 func (e1 *Entry) Copy(e2 *Entry) {
 
-	if e2 != nil {
-		e1.Title = e2.Title
-		e1.User = e2.User
-		e1.Url = e2.Url
-		e1.Password = e2.Password
-		e1.Notes = e2.Notes
-	}
+    if e2 != nil {
+        e1.Title = e2.Title
+        e1.User = e2.User
+        e1.Url = e2.Url
+        e1.Password = e2.Password
+        e1.Notes = e2.Notes
+    }
 }
 
 // Clone an entry
 func (e1 *ExtendedEntry) Copy(e2 *ExtendedEntry) {
 
-	if e2 != nil {
-		e1.FieldName = e2.FieldName
-		e1.FieldValue = e2.FieldValue
-		e1.EntryID = e2.EntryID
-	}
+    if e2 != nil {
+        e1.FieldName = e2.FieldName
+        e1.FieldValue = e2.FieldValue
+        e1.EntryID = e2.EntryID
+    }
 }
 
 // Create a new database
 func openDatabase(filePath string) (error, *gorm.DB) {
 
-	db, err := gorm.Open(sqlite.Open(filePath), &gorm.Config{
-		Logger: logger.Default.LogMode(logger.Silent),
-	})
-	return err, db
+    db, err := gorm.Open(sqlite.Open(filePath), &gorm.Config{
+        Logger: logger.Default.LogMode(logger.Silent),
+    })
+    return err, db
 }
 
 // Create a new table for Entries in the database
 func createNewEntry(db *gorm.DB) error {
-	return db.AutoMigrate(&Entry{})
+    return db.AutoMigrate(&Entry{})
 }
 
 // Create a new table for Extended Entries in the database
 func createNewExEntry(db *gorm.DB) error {
-	return db.AutoMigrate(&ExtendedEntry{})
+    return db.AutoMigrate(&ExtendedEntry{})
 }
 
 // Init new database including tables
 func initNewDatabase(dbPath string) error {
 
-	var err error
-	var db *gorm.DB
-	var absPath string
-
-	if hasActiveDatabase() {
-		// Has an active database - encrypt it before creating new one
-		_, activeDbPath := getActiveDatabase()
-		absPath, _ = filepath.Abs(dbPath)
-
-		if absPath == activeDbPath {
-			fmt.Printf("Database already exists and is active - %s\n", dbPath)
-			return nil
-		} else {
-			// TBD
-			fmt.Printf("Encrytping current database - %s\n", activeDbPath)
-			encryptDatabase(activeDbPath, nil)
-		}
-	}
-
-	if _, err = os.Stat(dbPath); err == nil {
-		// filePath exists, remove it
-		os.Remove(dbPath)
-	}
-
-	err, db = openDatabase(dbPath)
-	if err != nil {
-		fmt.Printf("Error creating new database - \"%s\"\n", err.Error())
-		return err
-	}
-
-	err = createNewEntry(db)
-	if err != nil {
-		fmt.Printf("Error creating schema - \"%s\"\n", err.Error())
-		return err
-	}
-
-	err = createNewExEntry(db)
-	if err != nil {
-		fmt.Printf("Error creating schema - \"%s\"\n", err.Error())
-		return err
-	}
-
-	fmt.Printf("Created new database - %s\n", dbPath)
-
-	// Update config
-	absPath, err = filepath.Abs(dbPath)
-	// Chmod it
-	os.Chmod(absPath, 0600)
-
-	if err == nil {
-		fmt.Printf("Updating active db path - %s\n", absPath)
-		updateActiveDbPath(absPath)
-	} else {
-		fmt.Printf("Error - %s\n", err.Error())
-		return err
-	}
-
-	return nil
+    var err error
+    var db *gorm.DB
+    var absPath string
+
+    if hasActiveDatabase() {
+        // Has an active database - encrypt it before creating new one
+        _, activeDbPath := getActiveDatabase()
+        absPath, _ = filepath.Abs(dbPath)
+
+        if absPath == activeDbPath {
+            fmt.Printf("Database already exists and is active - %s\n", dbPath)
+            return nil
+        } else {
+            // TBD
+            fmt.Printf("Encrytping current database - %s\n", activeDbPath)
+            encryptDatabase(activeDbPath, nil)
+        }
+    }
+
+    if _, err = os.Stat(dbPath); err == nil {
+        // filePath exists, remove it
+        os.Remove(dbPath)
+    }
+
+    err, db = openDatabase(dbPath)
+    if err != nil {
+        fmt.Printf("Error creating new database - \"%s\"\n", err.Error())
+        return err
+    }
+
+    err = createNewEntry(db)
+    if err != nil {
+        fmt.Printf("Error creating schema - \"%s\"\n", err.Error())
+        return err
+    }
+
+    err = createNewExEntry(db)
+    if err != nil {
+        fmt.Printf("Error creating schema - \"%s\"\n", err.Error())
+        return err
+    }
+
+    fmt.Printf("Created new database - %s\n", dbPath)
+
+    // Update config
+    absPath, err = filepath.Abs(dbPath)
+    // Chmod it
+    os.Chmod(absPath, 0600)
+
+    if err == nil {
+        fmt.Printf("Updating active db path - %s\n", absPath)
+        updateActiveDbPath(absPath)
+    } else {
+        fmt.Printf("Error - %s\n", err.Error())
+        return err
+    }
+
+    return nil
 }
 
 // Open currently active database
 func openActiveDatabase() (error, *gorm.DB) {
 
-	var dbPath string
-	var err error
+    var dbPath string
+    var err error
 
-	err, dbPath = getActiveDatabase()
-	if err != nil {
-		fmt.Printf("Error getting active database path - %s\n", err.Error())
-		return err, nil
-	}
+    err, dbPath = getActiveDatabase()
+    if err != nil {
+        fmt.Printf("Error getting active database path - %s\n", err.Error())
+        return err, nil
+    }
 
-	err, db := openDatabase(dbPath)
-	if err != nil {
-		fmt.Printf("Error opening active database path - %s: %s\n", dbPath, err.Error())
-		return err, nil
-	}
+    err, db := openDatabase(dbPath)
+    if err != nil {
+        fmt.Printf("Error opening active database path - %s: %s\n", dbPath, err.Error())
+        return err, nil
+    }
 
-	return nil, db
+    return nil, db
 }
 
 // Add custom entries to a database entry
 func addCustomEntries(db *gorm.DB, entry *Entry, customEntries []CustomEntry) error {
 
-	var count int
-	var err error
+    var count int
+    var err error
 
-	err = createNewExEntry(db)
-	if err != nil {
-		fmt.Printf("Error creating schema - \"%s\"\n", err.Error())
-		return err
-	}
+    err = createNewExEntry(db)
+    if err != nil {
+        fmt.Printf("Error creating schema - \"%s\"\n", err.Error())
+        return err
+    }
 
-	for _, customEntry := range customEntries {
-		var exEntry ExtendedEntry
+    for _, customEntry := range customEntries {
+        var exEntry ExtendedEntry
 
-		exEntry = ExtendedEntry{FieldName: customEntry.fieldName, FieldValue: customEntry.fieldValue,
-			EntryID: entry.ID}
+        exEntry = ExtendedEntry{FieldName: customEntry.fieldName, FieldValue: customEntry.fieldValue,
+            EntryID: entry.ID}
 
-		resultEx := db.Create(&exEntry)
-		if resultEx.Error == nil && resultEx.RowsAffected == 1 {
-			count += 1
-		}
-	}
+        resultEx := db.Create(&exEntry)
+        if resultEx.Error == nil && resultEx.RowsAffected == 1 {
+            count += 1
+        }
+    }
 
-	fmt.Printf("Created %d custom entries for entry: %d.\n", count, entry.ID)
-	return nil
+    fmt.Printf("Created %d custom entries for entry: %d.\n", count, entry.ID)
+    return nil
 }
 
 // Replace custom entries to a database entry (Drop existing and add fresh)
 func replaceCustomEntries(db *gorm.DB, entry *Entry, updatedEntries []CustomEntry) error {
 
-	var count int
-	var err error
-	var customEntries []ExtendedEntry
+    var count int
+    var err error
+    var customEntries []ExtendedEntry
 
-	err = createNewExEntry(db)
-	if err != nil {
-		fmt.Printf("Error creating schema - \"%s\"\n", err.Error())
-		return err
-	}
+    err = createNewExEntry(db)
+    if err != nil {
+        fmt.Printf("Error creating schema - \"%s\"\n", err.Error())
+        return err
+    }
 
-	db.Where("entry_id = ?", entry.ID).Delete(&customEntries)
+    db.Where("entry_id = ?", entry.ID).Delete(&customEntries)
 
-	for _, customEntry := range updatedEntries {
-		var exEntry ExtendedEntry
+    for _, customEntry := range updatedEntries {
+        var exEntry ExtendedEntry
 
-		exEntry = ExtendedEntry{FieldName: customEntry.fieldName, FieldValue: customEntry.fieldValue,
-			EntryID: entry.ID}
+        exEntry = ExtendedEntry{FieldName: customEntry.fieldName, FieldValue: customEntry.fieldValue,
+            EntryID: entry.ID}
 
-		resultEx := db.Create(&exEntry)
-		if resultEx.Error == nil && resultEx.RowsAffected == 1 {
-			count += 1
-		}
-	}
+        resultEx := db.Create(&exEntry)
+        if resultEx.Error == nil && resultEx.RowsAffected == 1 {
+            count += 1
+        }
+    }
 
-	fmt.Printf("Created %d custom entries for entry: %d.\n", count, entry.ID)
-	return nil
+    fmt.Printf("Created %d custom entries for entry: %d.\n", count, entry.ID)
+    return nil
 }
 
 // Add a new entry to current database
 func addNewDatabaseEntry(title, userName, url, passwd, tags string,
-	notes string, customEntries []CustomEntry) error {
-
-	var entry Entry
-	var err error
-	var db *gorm.DB
-
-	entry = Entry{Title: title, User: userName, Url: url, Password: passwd, Tags: strings.TrimSpace(tags),
-		Notes: notes}
-
-	err, db = openActiveDatabase()
-	if err == nil && db != nil {
-		//      result := db.Debug().Create(&entry)
-		result := db.Create(&entry)
-		if result.Error == nil && result.RowsAffected == 1 {
-			// Add custom fields if given
-			fmt.Printf("Created new entry with id: %d.\n", entry.ID)
-			if len(customEntries) > 0 {
-				return addCustomEntries(db, &entry, customEntries)
-			}
-			return nil
-		} else if result.Error != nil {
-			return result.Error
-		}
-	}
-
-	return err
+    notes string, customEntries []CustomEntry) error {
+
+    var entry Entry
+    var err error
+    var db *gorm.DB
+
+    entry = Entry{Title: title, User: userName, Url: url, Password: passwd, Tags: strings.TrimSpace(tags),
+        Notes: notes}
+
+    err, db = openActiveDatabase()
+    if err == nil && db != nil {
+        //      result := db.Debug().Create(&entry)
+        result := db.Create(&entry)
+        if result.Error == nil && result.RowsAffected == 1 {
+            // Add custom fields if given
+            fmt.Printf("Created new entry with id: %d.\n", entry.ID)
+            if len(customEntries) > 0 {
+                return addCustomEntries(db, &entry, customEntries)
+            }
+            return nil
+        } else if result.Error != nil {
+            return result.Error
+        }
+    }
+
+    return err
 }
 
 // Update current database entry with new values
 func updateDatabaseEntry(entry *Entry, title, userName, url, passwd, tags string,
-	notes string, customEntries []CustomEntry, flag bool) error {
-
-	var updateMap map[string]interface{}
-
-	updateMap = make(map[string]interface{})
-
-	keyValMap := map[string]string{
-		"title":    title,
-		"user":     userName,
-		"url":      url,
-		"password": passwd,
-		"notes":    notes,
-		"tags":     tags}
-
-	for key, val := range keyValMap {
-		if len(val) > 0 {
-			updateMap[key] = val
-		}
-	}
-
-	if len(updateMap) == 0 && !flag {
-		fmt.Printf("Nothing to update\n")
-		return nil
-	}
-
-	// Update timestamp also
-	updateMap["timestamp"] = time.Now()
-
-	err, db := openActiveDatabase()
-
-	if err == nil && db != nil {
-		result := db.Model(entry).Updates(updateMap)
-		if result.Error != nil {
-			return result.Error
-		}
-
-		if flag {
-			replaceCustomEntries(db, entry, customEntries)
-		}
-		fmt.Println("Updated entry.")
-		return nil
-	}
-
-	return err
+    notes string, customEntries []CustomEntry, flag bool) error {
+
+    var updateMap map[string]interface{}
+
+    updateMap = make(map[string]interface{})
+
+    keyValMap := map[string]string{
+        "title":    title,
+        "user":     userName,
+        "url":      url,
+        "password": passwd,
+        "notes":    notes,
+        "tags":     tags}
+
+    for key, val := range keyValMap {
+        if len(val) > 0 {
+            updateMap[key] = val
+        }
+    }
+
+    if len(updateMap) == 0 && !flag {
+        fmt.Printf("Nothing to update\n")
+        return nil
+    }
+
+    // Update timestamp also
+    updateMap["timestamp"] = time.Now()
+
+    err, db := openActiveDatabase()
+
+    if err == nil && db != nil {
+        result := db.Model(entry).Updates(updateMap)
+        if result.Error != nil {
+            return result.Error
+        }
+
+        if flag {
+            replaceCustomEntries(db, entry, customEntries)
+        }
+        fmt.Println("Updated entry.")
+        return nil
+    }
+
+    return err
 }
 
 // Find entry given the id
 func getEntryById(id int) (error, *Entry) {
 
-	var entry Entry
-	var err error
-	var db *gorm.DB
-
-	err, db = openActiveDatabase()
-	if err == nil && db != nil {
-		result := db.First(&entry, id)
-		if result.Error == nil {
-			return nil, &entry
-		} else {
-			return result.Error, nil
-		}
-	}
-
-	return err, nil
+    var entry Entry
+    var err error
+    var db *gorm.DB
+
+    err, db = openActiveDatabase()
+    if err == nil && db != nil {
+        result := db.First(&entry, id)
+        if result.Error == nil {
+            return nil, &entry
+        } else {
+            return result.Error, nil
+        }
+    }
+
+    return err, nil
 }
 
 // Search database for the given string and return all matches
 func searchDatabaseEntry(term string) (error, []Entry) {
 
-	var entries []Entry
-	var err error
-	var db *gorm.DB
-	var searchTerm string
+    var entries []Entry
+    var err error
+    var db *gorm.DB
+    var searchTerm string
 
-	err, db = openActiveDatabase()
-	if err == nil && db != nil {
-		var conditions []string
-		var condition string
+    err, db = openActiveDatabase()
+    if err == nil && db != nil {
+        searchTerm = fmt.Sprintf("%%%s%%", term)
+        // Search on fields title, user, url and notes and tags.
+        query := db.Debug().Where(fmt.Sprintf("title like \"%s\"", searchTerm))
 
-		searchTerm = fmt.Sprintf("%%%s%%", term)
-		// Search on fields title, user, url and notes
-		for _, field := range []string{"title", "user", "url", "notes"} {
-			conditions = append(conditions, field+" like ?")
-		}
+        for _, field := range[]string{"user", "url", "notes", "tags"} {
+            query = query.Or(fmt.Sprintf("%s like \"%s\"", field, searchTerm))
+        }
+        
+        res := query.Find(&entries)
 
-		condition = strings.Join(conditions, " OR ")
-		query := db.Where(condition, searchTerm, searchTerm, searchTerm, searchTerm)
-		res := query.Find(&entries)
+        if res.Error != nil {
+            return res.Error, nil
+        }
 
-		if res.Error != nil {
-			return res.Error, nil
-		}
+        return nil, entries
+    }
 
-		return nil, entries
-	}
-
-	return err, entries
+    return err, entries
 
 }
 
 // Union of two entry arrays
 func union(entry1 []Entry, entry2 []Entry) []Entry {
 
-	m := make(map[int]bool)
+    m := make(map[int]bool)
 
-	for _, item := range entry1 {
-		m[item.ID] = true
-	}
+    for _, item := range entry1 {
+        m[item.ID] = true
+    }
 
-	for _, item := range entry2 {
-		if _, ok := m[item.ID]; !ok {
-			entry1 = append(entry1, item)
-		}
-	}
+    for _, item := range entry2 {
+        if _, ok := m[item.ID]; !ok {
+            entry1 = append(entry1, item)
+        }
+    }
 
-	return entry1
+    return entry1
 }
 
 // Intersection of two entry arrays
 func intersection(entry1 []Entry, entry2 []Entry) []Entry {
 
-	var common []Entry
+    var common []Entry
 
-	m := make(map[int]bool)
+    m := make(map[int]bool)
 
-	for _, item := range entry1 {
-		m[item.ID] = true
-	}
+    for _, item := range entry1 {
+        m[item.ID] = true
+    }
 
-	for _, item := range entry2 {
-		if _, ok := m[item.ID]; ok {
-			common = append(common, item)
-		}
-	}
+    for _, item := range entry2 {
+        if _, ok := m[item.ID]; ok {
+            common = append(common, item)
+        }
+    }
 
-	return common
+    return common
 }
 
 // Search database for the given terms and returns matches according to operator
 func searchDatabaseEntries(terms []string, operator string) (error, []Entry) {
 
-	var err error
-	var finalEntries []Entry
-
-	for idx, term := range terms {
-		var entries []Entry
-
-		err, entries = searchDatabaseEntry(term)
-		if err != nil {
-			fmt.Printf("Error searching for term: %s - \"%s\"\n", term, err.Error())
-			return err, entries
-		}
-
-		if idx == 0 {
-			finalEntries = entries
-		} else {
-			if operator == "AND" {
-				finalEntries = intersection(finalEntries, entries)
-			} else if operator == "OR" {
-				finalEntries = union(finalEntries, entries)
-			}
-		}
-	}
-
-	return nil, finalEntries
+    var err error
+    var finalEntries []Entry
+
+    for idx, term := range terms {
+        var entries []Entry
+
+        err, entries = searchDatabaseEntry(term)
+        if err != nil {
+            fmt.Printf("Error searching for term: %s - \"%s\"\n", term, err.Error())
+            return err, entries
+        }
+
+        if idx == 0 {
+            finalEntries = entries
+        } else {
+            if operator == "AND" {
+                finalEntries = intersection(finalEntries, entries)
+            } else if operator == "OR" {
+                finalEntries = union(finalEntries, entries)
+            }
+        }
+    }
+
+    return nil, finalEntries
 }
 
 // Remove a given database entry
 func removeDatabaseEntry(entry *Entry) error {
 
-	var err error
-	var db *gorm.DB
+    var err error
+    var db *gorm.DB
 
-	err, db = openActiveDatabase()
-	if err == nil && db != nil {
-		var exEntries []ExtendedEntry
+    err, db = openActiveDatabase()
+    if err == nil && db != nil {
+        var exEntries []ExtendedEntry
 
-		res := db.Delete(entry)
-		if res.Error != nil {
-			return res.Error
-		}
+        res := db.Delete(entry)
+        if res.Error != nil {
+            return res.Error
+        }
 
-		// Delete extended entries if any
-		exEntries = getExtendedEntries(entry)
-		if len(exEntries) > 0 {
-			res = db.Delete(exEntries)
-			if res.Error != nil {
-				return res.Error
-			}
-		}
+        // Delete extended entries if any
+        exEntries = getExtendedEntries(entry)
+        if len(exEntries) > 0 {
+            res = db.Delete(exEntries)
+            if res.Error != nil {
+                return res.Error
+            }
+        }
 
-		return nil
-	}
+        return nil
+    }
 
-	return err
+    return err
 }
 
 // Clone an entry and return cloned entry
 func cloneEntry(entry *Entry) (error, *Entry) {
 
-	var entryNew Entry
-	var err error
-	var db *gorm.DB
+    var entryNew Entry
+    var err error
+    var db *gorm.DB
 
-	err, db = openActiveDatabase()
-	if err == nil && db != nil {
-		entryNew.Copy(entry)
+    err, db = openActiveDatabase()
+    if err == nil && db != nil {
+        entryNew.Copy(entry)
 
-		result := db.Create(&entryNew)
-		if result.Error == nil && result.RowsAffected == 1 {
-			fmt.Printf("Cloned to new entry, id: %d.\n", entryNew.ID)
-			return nil, &entryNew
-		} else if result.Error != nil {
-			return result.Error, nil
-		}
-	}
+        result := db.Create(&entryNew)
+        if result.Error == nil && result.RowsAffected == 1 {
+            fmt.Printf("Cloned to new entry, id: %d.\n", entryNew.ID)
+            return nil, &entryNew
+        } else if result.Error != nil {
+            return result.Error, nil
+        }
+    }
 
-	return err, nil
+    return err, nil
 }
 
 // Clone extended entries for an entry and return error code
 func cloneExtendedEntries(entry *Entry, exEntries []ExtendedEntry) error {
 
-	var err error
-	var db *gorm.DB
+    var err error
+    var db *gorm.DB
 
-	err, db = openActiveDatabase()
-	if err == nil && db != nil {
-		for _, exEntry := range exEntries {
-			var exEntryNew ExtendedEntry
+    err, db = openActiveDatabase()
+    if err == nil && db != nil {
+        for _, exEntry := range exEntries {
+            var exEntryNew ExtendedEntry
 
-			exEntryNew.Copy(&exEntry)
-			// Update the ID!
-			exEntryNew.EntryID = entry.ID
+            exEntryNew.Copy(&exEntry)
+            // Update the ID!
+            exEntryNew.EntryID = entry.ID
 
-			result := db.Create(&exEntryNew)
-			if result.Error != nil {
-				return result.Error
-			}
-		}
-	}
+            result := db.Create(&exEntryNew)
+            if result.Error != nil {
+                return result.Error
+            }
+        }
+    }
 
-	return err
+    return err
 }
 
 // Return an iterator over all entries using the given order query keys
 func iterateEntries(orderKey string, order string) (error, []Entry) {
 
-	var err error
-	var db *gorm.DB
-	var entries []Entry
+    var err error
+    var db *gorm.DB
+    var entries []Entry
 
-	err, db = openActiveDatabase()
+    err, db = openActiveDatabase()
 
-	if err == nil && db != nil {
-		var rows *sql.Rows
+    if err == nil && db != nil {
+        var rows *sql.Rows
 
-		rows, err = db.Model(&Entry{}).Order(fmt.Sprintf("%s %s", orderKey, order)).Rows()
-		for rows.Next() {
-			var entry Entry
+        rows, err = db.Model(&Entry{}).Order(fmt.Sprintf("%s %s", orderKey, order)).Rows()
+        for rows.Next() {
+            var entry Entry
 
-			db.ScanRows(rows, &entry)
-			entries = append(entries, entry)
-		}
+            db.ScanRows(rows, &entry)
+            entries = append(entries, entry)
+        }
 
-		return nil, entries
-	}
+        return nil, entries
+    }
 
-	return err, nil
+    return err, nil
 }
 
 // Export all entries to string array
 func entriesToStringArray(skipLongFields bool) (error, [][]string) {
 
-	var err error
-	var db *gorm.DB
-	var dataArray [][]string
+    var err error
+    var db *gorm.DB
+    var dataArray [][]string
 
-	err, db = openActiveDatabase()
+    err, db = openActiveDatabase()
 
-	if err == nil && db != nil {
-		var rows *sql.Rows
-		var count int64
+    if err == nil && db != nil {
+        var rows *sql.Rows
+        var count int64
 
-		db.Model(&Entry{}).Count(&count)
+        db.Model(&Entry{}).Count(&count)
 
-		dataArray = make([][]string, 0, count)
+        dataArray = make([][]string, 0, count)
 
-		rows, err = db.Model(&Entry{}).Order("id asc").Rows()
-		for rows.Next() {
-			var entry Entry
-			var entryData []string
+        rows, err = db.Model(&Entry{}).Order("id asc").Rows()
+        for rows.Next() {
+            var entry Entry
+            var entryData []string
 
-			db.ScanRows(rows, &entry)
+            db.ScanRows(rows, &entry)
 
-			if skipLongFields {
-				// Skip Notes
-				entryData = []string{strconv.Itoa(entry.ID), entry.Title, entry.User, entry.Password, entry.Timestamp.Format("2006-06-02 15:04:05")}
-			} else {
-				entryData = []string{strconv.Itoa(entry.ID), entry.Title, entry.User, entry.Url, entry.Password, entry.Notes, entry.Timestamp.Format("2006-06-02 15:04:05")}
-			}
+            if skipLongFields {
+                // Skip Notes
+                entryData = []string{strconv.Itoa(entry.ID), entry.Title, entry.User, entry.Password, entry.Timestamp.Format("2006-06-02 15:04:05")}
+            } else {
+                entryData = []string{strconv.Itoa(entry.ID), entry.Title, entry.User, entry.Url, entry.Password, entry.Notes, entry.Timestamp.Format("2006-06-02 15:04:05")}
+            }
 
-			dataArray = append(dataArray, entryData)
-		}
-	}
+            dataArray = append(dataArray, entryData)
+        }
+    }
 
-	return err, dataArray
+    return err, dataArray
 }
 
 // Get extended entries associated to an entry
 func getExtendedEntries(entry *Entry) []ExtendedEntry {
 
-	var err error
-	var db *gorm.DB
-	var customEntries []ExtendedEntry
+    var err error
+    var db *gorm.DB
+    var customEntries []ExtendedEntry
 
-	err, db = openActiveDatabase()
+    err, db = openActiveDatabase()
 
-	if err == nil && db != nil {
-		db.Where("entry_id = ?", entry.ID).Find(&customEntries)
-	}
+    if err == nil && db != nil {
+        db.Where("entry_id = ?", entry.ID).Find(&customEntries)
+    }
 
-	return customEntries
+    return customEntries
 }

From a3c1420942e888b2b4701cef5a96b4e4b58ddb04 Mon Sep 17 00:00:00 2001
From: Anand Balachandran Pillai <a.pillai@drishti.com>
Date: Sun, 14 Aug 2022 11:02:47 +0530
Subject: [PATCH 51/58] ref issue #42 - turn off debug

---
 db.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db.go b/db.go
index 2d73af3..a444b71 100644
--- a/db.go
+++ b/db.go
@@ -339,7 +339,7 @@ func searchDatabaseEntry(term string) (error, []Entry) {
     if err == nil && db != nil {
         searchTerm = fmt.Sprintf("%%%s%%", term)
         // Search on fields title, user, url and notes and tags.
-        query := db.Debug().Where(fmt.Sprintf("title like \"%s\"", searchTerm))
+        query := db.Where(fmt.Sprintf("title like \"%s\"", searchTerm))
 
         for _, field := range[]string{"user", "url", "notes", "tags"} {
             query = query.Or(fmt.Sprintf("%s like \"%s\"", field, searchTerm))

From 067c24de309a4db8ca6fef10b83d7e1bdd8e4310 Mon Sep 17 00:00:00 2001
From: Anand Balachandran Pillai <anandpillai@letterboxes.org>
Date: Sun, 14 Aug 2022 11:11:09 +0530
Subject: [PATCH 52/58] Adding github actions

---
 .github/workflows/build.yaml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 .github/workflows/build.yaml

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
new file mode 100644
index 0000000..20e8343
--- /dev/null
+++ b/.github/workflows/build.yaml
@@ -0,0 +1,21 @@
+name: build
+on: [push]
+jobs:
+  varuh build
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "\U0001f389 The job was automatically triggered by a ${{ github.event_name }} event."
+      - run: echo "\U0001f427 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
+      - run: echo "\U0001f50e The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
+      - name: Check out repository code
+        uses: actions/checkout@v3
+      - run: echo "\U0001f4a1 The ${{ github.repository }} repository has been cloned to the runner."
+      - run: echo "\U0001f5a5\ufe0f The workflow is now ready to test your code on the runner."
+      - name: List files in the repository
+        run: |
+          ls ${{ github.workspace }}
+      - run: echo "\U0001f34f This job's status is ${{ job.status }}."
+      - name: Build code
+        run: |
+          make 
+          

From 0383a2dfd64d232e1bf0372881d9b6fbfb35a8e3 Mon Sep 17 00:00:00 2001
From: Anand Balachandran Pillai <anandpillai@letterboxes.org>
Date: Sun, 14 Aug 2022 11:14:07 +0530
Subject: [PATCH 53/58] Fixing actions

---
 .github/workflows/build.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 20e8343..53bb578 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,7 +1,7 @@
 name: build
 on: [push]
 jobs:
-  varuh build
+  varuh-build:
     runs-on: ubuntu-latest
     steps:
       - run: echo "\U0001f389 The job was automatically triggered by a ${{ github.event_name }} event."
@@ -17,5 +17,4 @@ jobs:
       - run: echo "\U0001f34f This job's status is ${{ job.status }}."
       - name: Build code
         run: |
-          make 
-          
+          make          

From 936c8a070682c34de389166bf810c948ba706c51 Mon Sep 17 00:00:00 2001
From: Anand Balachandran Pillai <anandpillai@letterboxes.org>
Date: Sun, 14 Aug 2022 11:17:46 +0530
Subject: [PATCH 54/58] Fixing build

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 53bb578..d25d263 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -17,4 +17,4 @@ jobs:
       - run: echo "\U0001f34f This job's status is ${{ job.status }}."
       - name: Build code
         run: |
-          make          
+          cd ${{ github.workspace }} && make

From c3da6109fb135887b3356aa3792c4b2061be1a57 Mon Sep 17 00:00:00 2001
From: Anand Balachandran Pillai <a.pillai@drishti.com>
Date: Mon, 15 Aug 2022 00:35:38 +0530
Subject: [PATCH 55/58] ref issue 28 - added support for card type data

---
 actions.go | 2027 +++++++++++++++++++++++++++-------------------------
 db.go      |   56 +-
 go.mod     |    2 +-
 go.sum     |    6 +-
 main.go    |  394 +++++-----
 utils.go   |  819 ++++++++++++---------
 6 files changed, 1816 insertions(+), 1488 deletions(-)

diff --git a/actions.go b/actions.go
index 09c94ca..f149966 100644
--- a/actions.go
+++ b/actions.go
@@ -2,1214 +2,1299 @@
 package main
 
 import (
-	"bufio"
-	"encoding/csv"
-	"errors"
-	"fmt"
-	"gorm.io/gorm"
-	"os"
-	"os/exec"
-	"os/signal"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"syscall"
+    "bufio"
+    "encoding/csv"
+    "errors"
+    "fmt"
+    "gorm.io/gorm"
+    "os"
+    "os/exec"
+    "os/signal"
+    "path/filepath"
+    "strconv"
+    "strings"
+    "syscall"
 )
 
 type CustomEntry struct {
-	fieldName  string
-	fieldValue string
+    fieldName  string
+    fieldValue string
 }
 
 // Wrappers (closures) for functions accepting strings as input for in/out encryption
 func WrapperMaxKryptStringFunc(fn actionFunc) actionFunc {
 
-	return func(inputStr string) error {
-		var maxKrypt bool
-		var defaultDB string
-		var encPasswd string
-		var err error
+    return func(inputStr string) error {
+        var maxKrypt bool
+        var defaultDB string
+        var encPasswd string
+        var err error
 
-		maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
+        maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
 
-		// If max krypt on - then autodecrypt on call and auto encrypt after call
-		if maxKrypt {
-			err, encPasswd = decryptDatabase(defaultDB)
-			if err != nil {
-				return err
-			}
+        // If max krypt on - then autodecrypt on call and auto encrypt after call
+        if maxKrypt {
+            err, encPasswd = decryptDatabase(defaultDB)
+            if err != nil {
+                return err
+            }
 
-			sigChan := make(chan os.Signal, 1)
-			signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
+            sigChan := make(chan os.Signal, 1)
+            signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
 
-			go func() {
-				sig := <-sigChan
-				fmt.Println("Received signal", sig)
-				// Reencrypt
-				encryptDatabase(defaultDB, &encPasswd)
-				os.Exit(1)
-			}()
-		}
+            go func() {
+                sig := <-sigChan
+                fmt.Println("Received signal", sig)
+                // Reencrypt
+                encryptDatabase(defaultDB, &encPasswd)
+                os.Exit(1)
+            }()
+        }
 
-		err = fn(inputStr)
+        err = fn(inputStr)
 
-		// If max krypt on - then autodecrypt on call and auto encrypt after call
-		if maxKrypt {
-			encryptDatabase(defaultDB, &encPasswd)
-		}
+        // If max krypt on - then autodecrypt on call and auto encrypt after call
+        if maxKrypt {
+            encryptDatabase(defaultDB, &encPasswd)
+        }
 
-		return err
-	}
+        return err
+    }
 
 }
 
 // Wrappers (closures) for functions accepting no input for in/out encryption
 func WrapperMaxKryptVoidFunc(fn voidFunc) voidFunc {
 
-	return func() error {
-		var maxKrypt bool
-		var defaultDB string
-		var encPasswd string
-		var err error
+    return func() error {
+        var maxKrypt bool
+        var defaultDB string
+        var encPasswd string
+        var err error
 
-		maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
+        maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
 
-		// If max krypt on - then autodecrypt on call and auto encrypt after call
-		if maxKrypt {
-			err, encPasswd = decryptDatabase(defaultDB)
-			if err != nil {
-				return err
-			}
+        // If max krypt on - then autodecrypt on call and auto encrypt after call
+        if maxKrypt {
+            err, encPasswd = decryptDatabase(defaultDB)
+            if err != nil {
+                return err
+            }
 
-			sigChan := make(chan os.Signal, 1)
-			signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
+            sigChan := make(chan os.Signal, 1)
+            signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
 
-			go func() {
-				sig := <-sigChan
-				fmt.Println("Received signal", sig)
-				// Reencrypt
-				encryptDatabase(defaultDB, &encPasswd)
-				os.Exit(1)
-			}()
-		}
+            go func() {
+                sig := <-sigChan
+                fmt.Println("Received signal", sig)
+                // Reencrypt
+                encryptDatabase(defaultDB, &encPasswd)
+                os.Exit(1)
+            }()
+        }
 
-		err = fn()
+        err = fn()
 
-		// If max krypt on - then autodecrypt on call and auto encrypt after call
-		if maxKrypt {
-			encryptDatabase(defaultDB, &encPasswd)
-		}
+        // If max krypt on - then autodecrypt on call and auto encrypt after call
+        if maxKrypt {
+            encryptDatabase(defaultDB, &encPasswd)
+        }
 
-		return err
-	}
+        return err
+    }
 
 }
 
 // Print the current active database path
 func showActiveDatabasePath() error {
 
-	err, settings := getOrCreateLocalConfig(APP)
-
-	if err != nil {
-		fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
-		return err
-	}
-
-	if settings != nil {
-		if settings.ActiveDB != "" {
-			fmt.Printf("%s\n", settings.ActiveDB)
-		} else {
-			fmt.Println("No active database")
-		}
-		return nil
-	} else {
-		fmt.Printf("Error - null config\n")
-		return errors.New("null config")
-	}
+    err, settings := getOrCreateLocalConfig(APP)
+
+    if err != nil {
+        fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
+        return err
+    }
+
+    if settings != nil {
+        if settings.ActiveDB != "" {
+            fmt.Printf("%s\n", settings.ActiveDB)
+        } else {
+            fmt.Println("No active database")
+        }
+        return nil
+    } else {
+        fmt.Printf("Error - null config\n")
+        return errors.New("null config")
+    }
 }
 
 // Set the current active database path
 func setActiveDatabasePath(dbPath string) error {
 
-	var fullPath string
-	var activeEncrypted bool
-	var newEncrypted bool
-
-	err, settings := getOrCreateLocalConfig(APP)
-
-	if err != nil {
-		fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
-		return err
-	}
-
-	if settings != nil {
-		var flag bool
-
-		if _, err = os.Stat(dbPath); os.IsNotExist(err) {
-			fmt.Printf("Error - path %s does not exist\n", dbPath)
-			return err
-		}
-
-		fullPath, _ = filepath.Abs(dbPath)
-
-		if fullPath == settings.ActiveDB {
-			fmt.Printf("Current database is \"%s\" - nothing to do\n", fullPath)
-			return nil
-		}
-
-		if _, flag = isFileEncrypted(settings.ActiveDB); flag {
-			activeEncrypted = true
-		}
-
-		if _, flag = isFileEncrypted(fullPath); flag {
-			newEncrypted = true
-		}
-
-		// If autoencrypt is true - encrypt current DB automatically
-		if settings.AutoEncrypt {
-			if !activeEncrypted {
-				fmt.Printf("Encrypting current active database - %s\n", settings.ActiveDB)
-				err = encryptActiveDatabase()
-				if err == nil {
-					activeEncrypted = true
-				}
-			}
-
-			if newEncrypted {
-				if !settings.AutoEncrypt {
-					// Decrypt new database if it is encrypted
-					fmt.Printf("Database %s is encrypted, decrypting it\n", fullPath)
-					err, _ = decryptDatabase(fullPath)
-					if err != nil {
-						fmt.Printf("Decryption Error - \"%s\", not switching databases\n", err.Error())
-						return err
-					} else {
-						newEncrypted = false
-					}
-				} else {
-					// New database is encrypted and autoencrypt is set - so keep it like that
-					// fmt.Printf("Database %s is already encrypted, nothing to do\n", fullPath)
-				}
-			}
-		}
-
-		if !activeEncrypted {
-			// Use should manually encrypt before switching
-			fmt.Println("Auto-encrypt disabled, encrypt existing database before switching to new.")
-			return nil
-		}
-
-		if newEncrypted && !settings.AutoEncrypt {
-			// Use should manually decrypt before switching
-			fmt.Println("Auto-encrypt disabled, decrypt new database manually before switching.")
-			return nil
-		}
-
-		settings.ActiveDB = fullPath
-		err = updateSettings(settings, settings.ConfigPath)
-		if err == nil {
-			fmt.Println("Switched active database successfully.")
-		} else {
-			fmt.Printf("Error updating settings - \"%s\"\n", err.Error())
-		}
-
-		return err
-
-	} else {
-		fmt.Printf("Error - null config\n")
-		return errors.New("null config")
-	}
+    var fullPath string
+    var activeEncrypted bool
+    var newEncrypted bool
+
+    err, settings := getOrCreateLocalConfig(APP)
+
+    if err != nil {
+        fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
+        return err
+    }
+
+    if settings != nil {
+        var flag bool
+
+        if _, err = os.Stat(dbPath); os.IsNotExist(err) {
+            fmt.Printf("Error - path %s does not exist\n", dbPath)
+            return err
+        }
+
+        fullPath, _ = filepath.Abs(dbPath)
+
+        if fullPath == settings.ActiveDB {
+            fmt.Printf("Current database is \"%s\" - nothing to do\n", fullPath)
+            return nil
+        }
+
+        if _, flag = isFileEncrypted(settings.ActiveDB); flag {
+            activeEncrypted = true
+        }
+
+        if _, flag = isFileEncrypted(fullPath); flag {
+            newEncrypted = true
+        }
+
+        // If autoencrypt is true - encrypt current DB automatically
+        if settings.AutoEncrypt {
+            if !activeEncrypted {
+                fmt.Printf("Encrypting current active database - %s\n", settings.ActiveDB)
+                err = encryptActiveDatabase()
+                if err == nil {
+                    activeEncrypted = true
+                }
+            }
+
+            if newEncrypted {
+                if !settings.AutoEncrypt {
+                    // Decrypt new database if it is encrypted
+                    fmt.Printf("Database %s is encrypted, decrypting it\n", fullPath)
+                    err, _ = decryptDatabase(fullPath)
+                    if err != nil {
+                        fmt.Printf("Decryption Error - \"%s\", not switching databases\n", err.Error())
+                        return err
+                    } else {
+                        newEncrypted = false
+                    }
+                } else {
+                    // New database is encrypted and autoencrypt is set - so keep it like that
+                    // fmt.Printf("Database %s is already encrypted, nothing to do\n", fullPath)
+                }
+            }
+        }
+
+        if !activeEncrypted {
+            // Use should manually encrypt before switching
+            fmt.Println("Auto-encrypt disabled, encrypt existing database before switching to new.")
+            return nil
+        }
+
+        if newEncrypted && !settings.AutoEncrypt {
+            // Use should manually decrypt before switching
+            fmt.Println("Auto-encrypt disabled, decrypt new database manually before switching.")
+            return nil
+        }
+
+        settings.ActiveDB = fullPath
+        err = updateSettings(settings, settings.ConfigPath)
+        if err == nil {
+            fmt.Println("Switched active database successfully.")
+        } else {
+            fmt.Printf("Error updating settings - \"%s\"\n", err.Error())
+        }
+
+        return err
+
+    } else {
+        fmt.Printf("Error - null config\n")
+        return errors.New("null config")
+    }
 }
 
+
+// Text menu driven function to add a new entry for a card type
+func addNewCardEntry() error {
+
+    var cardHolder string
+    var cardName string
+    var cardNumber string
+    var cardCvv string
+    var cardPin string
+    var cardIssuer string
+    var cardClass string
+    var cardExpiry string
+    
+    var notes string
+    var tags string
+    var err error
+    var customEntries []CustomEntry
+
+    if err = checkActiveDatabase(); err != nil {
+        return err
+    }
+
+    reader := bufio.NewReader(os.Stdin)
+    cardNumber = readInput(reader, "Card Number")  
+    cardClass, err = detectCardType(cardNumber)
+
+    if err != nil {
+        fmt.Printf("Error - %s\n", err.Error())
+        return err
+    } else {
+        fmt.Printf("<Card type is %s>\n", cardClass)
+    }
+
+    cardHolder = readInput(reader, "Name on the Card")
+    cardExpiry = readInput(reader, "Expiry Date as mm/dd")
+
+    // expiry has to be in the form of <month>/<year>
+    if !checkValidExpiry(cardExpiry) {
+        return errors.New("Invalid Expiry Date")
+    }
+
+    fmt.Printf("CVV: ") 
+    err, cardCvv = readPassword()    
+    
+    if !validateCvv(cardCvv, cardClass) {
+        fmt.Printf("\nError - Invalid CVV for %s\n", cardClass)
+        return errors.New(fmt.Sprintf("Error - Invalid CVV for %s\n", cardClass))
+    }
+        
+    fmt.Printf("\nCard PIN: ")
+    err, cardPin = readPassword()
+
+    if !validateCardPin(cardPin) {
+        fmt.Printf("\nError - Invalid PIN")
+        return errors.New("Error - Invalid PIN")
+    }
+
+    cardIssuer = readInput(reader, "\nIssuing Bank")
+    cardName = readInput(reader, "A name for this Card")    
+    // Name cant be blank
+    if len(cardName) == 0 {
+        fmt.Printf("Error - name cant be blank")
+        return errors.New("Empty card name")
+    }
+
+    tags = readInput(reader, "\nTags (separated by space): ")
+    notes = readInput(reader, "Notes")
+
+    customEntries = addCustomFields(reader)
+
+    err = addNewDatabaseCardEntry(cardName, cardNumber, cardHolder, cardIssuer,
+        cardClass, cardCvv, cardPin, cardExpiry, notes, tags, customEntries)
+
+    if err != nil {
+        fmt.Printf("Error adding entry - \"%s\"\n", err.Error())
+    }
+    
+    return err
+}
+
+
 // Text menu driven function to add a new entry
 func addNewEntry() error {
 
-	var userName string
-	var title string
-	var url string
-	var notes string
-	var passwd string
-	var tags string
-	var err error
-	var customEntries []CustomEntry
-
-	if err = checkActiveDatabase(); err != nil {
-		return err
-	}
-
-	reader := bufio.NewReader(os.Stdin)
-	title = readInput(reader, "Title")
-	url = readInput(reader, "URL")
-
-	if len(url) > 0 && !strings.HasPrefix(strings.ToLower(url), "http://") && !strings.HasPrefix(strings.ToLower(url), "https://") {
-		url = "http://" + url
-	}
-
-	userName = readInput(reader, "Username")
-
-	fmt.Printf("Password (enter to generate new): ")
-	err, passwd = readPassword()
-
-	if len(passwd) == 0 {
-		fmt.Printf("\nGenerating password ...")
-		err, passwd = generateStrongPassword()
-		fmt.Printf("done")
-	}
-	//  fmt.Printf("Password => %s\n", passwd)
-
-	tags = readInput(reader, "\nTags (separated by space): ")
-	notes = readInput(reader, "Notes")
-
-	// Title and username/password are mandatory
-	if len(title) == 0 {
-		fmt.Printf("Error - valid Title required\n")
-		return errors.New("invalid input")
-	}
-	if len(userName) == 0 {
-		fmt.Printf("Error - valid Username required\n")
-		return errors.New("invalid input")
-	}
-	if len(passwd) == 0 {
-		fmt.Printf("Error - valid Password required\n")
-		return errors.New("invalid input")
-	}
-
-	customEntries = addCustomFields(reader)
-
-	// Trim spaces
-	err = addNewDatabaseEntry(title, userName, url, passwd, tags, notes, customEntries)
-
-	if err != nil {
-		fmt.Printf("Error adding entry - \"%s\"\n", err.Error())
-	}
-
-	return err
+    var userName string
+    var title string
+    var url string
+    var notes string
+    var passwd string
+    var tags string
+    var err error
+    var customEntries []CustomEntry
+
+    if err = checkActiveDatabase(); err != nil {
+        return err
+    }
+
+    if settingsRider.Type == "card" {
+        return addNewCardEntry()
+    }
+    
+    reader := bufio.NewReader(os.Stdin)
+    title = readInput(reader, "Title")
+    url = readInput(reader, "URL")
+    if len(url) > 0 && !strings.HasPrefix(strings.ToLower(url), "http://") && !strings.HasPrefix(strings.ToLower(url), "https://") {
+        url = "http://" + url
+    }
+
+    userName = readInput(reader, "Username")
+
+    fmt.Printf("Password (enter to generate new): ")
+    err, passwd = readPassword()
+
+    if len(passwd) == 0 {
+        fmt.Printf("\nGenerating password ...")
+        err, passwd = generateStrongPassword()
+        fmt.Printf("done")
+    }
+    //  fmt.Printf("Password => %s\n", passwd)
+
+    tags = readInput(reader, "\nTags (separated by space): ")
+    notes = readInput(reader, "Notes")
+
+    // Title and username/password are mandatory
+    if len(title) == 0 {
+        fmt.Printf("Error - valid Title required\n")
+        return errors.New("invalid input")
+    }
+    if len(userName) == 0 {
+        fmt.Printf("Error - valid Username required\n")
+        return errors.New("invalid input")
+    }
+    if len(passwd) == 0 {
+        fmt.Printf("Error - valid Password required\n")
+        return errors.New("invalid input")
+    }
+
+    customEntries = addCustomFields(reader)
+
+    // Trim spaces
+    err = addNewDatabaseEntry(title, userName, url, passwd, tags, notes, customEntries)
+
+    if err != nil {
+        fmt.Printf("Error adding entry - \"%s\"\n", err.Error())
+    }
+
+    return err
 }
 
 // Function to update existing custom entries and add new ones
 // The bool part of the return value indicates whether to take action
 func addOrUpdateCustomFields(reader *bufio.Reader, entry *Entry) ([]CustomEntry, bool) {
 
-	var customEntries []ExtendedEntry
-	var editedCustomEntries []CustomEntry
-	var newCustomEntries []CustomEntry
-	var flag bool
+    var customEntries []ExtendedEntry
+    var editedCustomEntries []CustomEntry
+    var newCustomEntries []CustomEntry
+    var flag bool
 
-	customEntries = getExtendedEntries(entry)
+    customEntries = getExtendedEntries(entry)
 
-	if len(customEntries) > 0 {
+    if len(customEntries) > 0 {
 
-		fmt.Println("Editing/deleting custom fields")
-		for _, customEntry := range customEntries {
-			var fieldName string
-			var fieldValue string
+        fmt.Println("Editing/deleting custom fields")
+        for _, customEntry := range customEntries {
+            var fieldName string
+            var fieldValue string
 
-			fmt.Println("Field Name: " + customEntry.FieldName)
-			fieldName = readInput(reader, "\tNew Field Name (Enter to keep, \"x\" to delete)")
-			if strings.ToLower(strings.TrimSpace(fieldName)) == "x" {
-				fmt.Println("Deleting field: " + customEntry.FieldName)
-			} else {
-				if strings.TrimSpace(fieldName) == "" {
-					fieldName = customEntry.FieldName
-				}
+            fmt.Println("Field Name: " + customEntry.FieldName)
+            fieldName = readInput(reader, "\tNew Field Name (Enter to keep, \"x\" to delete)")
+            if strings.ToLower(strings.TrimSpace(fieldName)) == "x" {
+                fmt.Println("Deleting field: " + customEntry.FieldName)
+            } else {
+                if strings.TrimSpace(fieldName) == "" {
+                    fieldName = customEntry.FieldName
+                }
 
-				fmt.Println("Field Value: " + customEntry.FieldValue)
-				fieldValue = readInput(reader, "\tNew Field Value (Enter to keep)")
-				if strings.TrimSpace(fieldValue) == "" {
-					fieldValue = customEntry.FieldValue
-				}
+                fmt.Println("Field Value: " + customEntry.FieldValue)
+                fieldValue = readInput(reader, "\tNew Field Value (Enter to keep)")
+                if strings.TrimSpace(fieldValue) == "" {
+                    fieldValue = customEntry.FieldValue
+                }
 
-				editedCustomEntries = append(editedCustomEntries, CustomEntry{fieldName, fieldValue})
-			}
-		}
-	}
+                editedCustomEntries = append(editedCustomEntries, CustomEntry{fieldName, fieldValue})
+            }
+        }
+    }
 
-	newCustomEntries = addCustomFields(reader)
+    newCustomEntries = addCustomFields(reader)
 
-	editedCustomEntries = append(editedCustomEntries, newCustomEntries...)
+    editedCustomEntries = append(editedCustomEntries, newCustomEntries...)
 
-	// Cases where length == 0
-	// 1. Existing entries - all deleted
-	flag = len(customEntries) > 0 || len(editedCustomEntries) > 0
+    // Cases where length == 0
+    // 1. Existing entries - all deleted
+    flag = len(customEntries) > 0 || len(editedCustomEntries) > 0
 
-	return editedCustomEntries, flag
+    return editedCustomEntries, flag
 }
 
 // Function to add custom fields to an entry
 func addCustomFields(reader *bufio.Reader) []CustomEntry {
 
-	// Custom fields
-	var custom string
-	var customEntries []CustomEntry
+    // Custom fields
+    var custom string
+    var customEntries []CustomEntry
 
-	custom = readInput(reader, "Do you want to add custom fields [y/N]")
-	if strings.ToLower(custom) == "y" {
+    custom = readInput(reader, "Do you want to add custom fields [y/N]")
+    if strings.ToLower(custom) == "y" {
 
-		fmt.Println("Keep entering custom field name followed by the value. Press return with no input once done.")
-		for true {
-			var customFieldName string
-			var customFieldValue string
+        fmt.Println("Keep entering custom field name followed by the value. Press return with no input once done.")
+        for true {
+            var customFieldName string
+            var customFieldValue string
 
-			customFieldName = strings.TrimSpace(readInput(reader, "Field Name"))
-			if customFieldName != "" {
-				customFieldValue = strings.TrimSpace(readInput(reader, "Value for "+customFieldName))
-			}
+            customFieldName = strings.TrimSpace(readInput(reader, "Field Name"))
+            if customFieldName != "" {
+                customFieldValue = strings.TrimSpace(readInput(reader, "Value for "+customFieldName))
+            }
 
-			if customFieldName == "" && customFieldValue == "" {
-				break
-			}
+            if customFieldName == "" && customFieldValue == "" {
+                break
+            }
 
-			customEntries = append(customEntries, CustomEntry{customFieldName, customFieldValue})
-		}
-	}
+            customEntries = append(customEntries, CustomEntry{customFieldName, customFieldValue})
+        }
+    }
 
-	return customEntries
+    return customEntries
 }
 
 // Edit a current entry by id
 func editCurrentEntry(idString string) error {
 
-	var userName string
-	var title string
-	var url string
-	var notes string
-	var tags string
-	var passwd string
-	var err error
-	var entry *Entry
-	var id int
+    var userName string
+    var title string
+    var url string
+    var notes string
+    var tags string
+    var passwd string
+    var err error
+    var entry *Entry
+    var id int
 
-	if err = checkActiveDatabase(); err != nil {
-		return err
-	}
+    if err = checkActiveDatabase(); err != nil {
+        return err
+    }
 
-	id, _ = strconv.Atoi(idString)
+    id, _ = strconv.Atoi(idString)
 
-	err, entry = getEntryById(id)
-	if err != nil || entry == nil {
-		fmt.Printf("No entry found for id %d\n", id)
-		return err
-	}
+    err, entry = getEntryById(id)
+    if err != nil || entry == nil {
+        fmt.Printf("No entry found for id %d\n", id)
+        return err
+    }
 
-	reader := bufio.NewReader(os.Stdin)
+    reader := bufio.NewReader(os.Stdin)
 
-	fmt.Printf("Current Title: %s\n", entry.Title)
-	title = readInput(reader, "New Title")
+    fmt.Printf("Current Title: %s\n", entry.Title)
+    title = readInput(reader, "New Title")
 
-	fmt.Printf("Current URL: %s\n", entry.Url)
-	url = readInput(reader, "New URL")
+    fmt.Printf("Current URL: %s\n", entry.Url)
+    url = readInput(reader, "New URL")
 
-	if len(url) > 0 && !strings.HasPrefix(strings.ToLower(url), "http://") && !strings.HasPrefix(strings.ToLower(url), "https://") {
-		url = "http://" + url
-	}
+    if len(url) > 0 && !strings.HasPrefix(strings.ToLower(url), "http://") && !strings.HasPrefix(strings.ToLower(url), "https://") {
+        url = "http://" + url
+    }
 
-	fmt.Printf("Current Username: %s\n", entry.User)
-	userName = readInput(reader, "New Username")
+    fmt.Printf("Current Username: %s\n", entry.User)
+    userName = readInput(reader, "New Username")
 
-	fmt.Printf("Current Password: %s\n", entry.Password)
-	fmt.Printf("New Password ([y/Y] to generate new, enter will keep old one): ")
-	err, passwd = readPassword()
+    fmt.Printf("Current Password: %s\n", entry.Password)
+    fmt.Printf("New Password ([y/Y] to generate new, enter will keep old one): ")
+    err, passwd = readPassword()
 
-	if strings.ToLower(passwd) == "y" {
-		fmt.Printf("\nGenerating new password ...")
-		err, passwd = generateStrongPassword()
-	}
-	//  fmt.Printf("Password => %s\n", passwd)
+    if strings.ToLower(passwd) == "y" {
+        fmt.Printf("\nGenerating new password ...")
+        err, passwd = generateStrongPassword()
+    }
+    //  fmt.Printf("Password => %s\n", passwd)
 
-	fmt.Printf("\nCurrent Tags: %s\n", entry.Tags)
-	tags = readInput(reader, "New Tags")
+    fmt.Printf("\nCurrent Tags: %s\n", entry.Tags)
+    tags = readInput(reader, "New Tags")
 
-	fmt.Printf("\nCurrent Notes: %s\n", entry.Notes)
-	notes = readInput(reader, "New Notes")
+    fmt.Printf("\nCurrent Notes: %s\n", entry.Notes)
+    notes = readInput(reader, "New Notes")
 
-	customEntries, flag := addOrUpdateCustomFields(reader, entry)
+    customEntries, flag := addOrUpdateCustomFields(reader, entry)
 
-	// Update
-	err = updateDatabaseEntry(entry, title, userName, url, passwd, tags, notes, customEntries, flag)
-	if err != nil {
-		fmt.Printf("Error updating entry - \"%s\"\n", err.Error())
-	}
+    // Update
+    err = updateDatabaseEntry(entry, title, userName, url, passwd, tags, notes, customEntries, flag)
+    if err != nil {
+        fmt.Printf("Error updating entry - \"%s\"\n", err.Error())
+    }
 
-	return err
+    return err
 }
 
 // List current entry by id
 func listCurrentEntry(idString string) error {
 
-	var id int
-	var err error
-	var entry *Entry
+    var id int
+    var err error
+    var entry *Entry
 
-	if err = checkActiveDatabase(); err != nil {
-		return err
-	}
+    if err = checkActiveDatabase(); err != nil {
+        return err
+    }
 
-	id, _ = strconv.Atoi(idString)
+    id, _ = strconv.Atoi(idString)
 
-	//  fmt.Printf("Listing current entry - %d\n", id)
-	err, entry = getEntryById(id)
-	if err != nil || entry == nil {
-		fmt.Printf("No entry found for id %d\n", id)
-		return err
-	}
+    //  fmt.Printf("Listing current entry - %d\n", id)
+    err, entry = getEntryById(id)
+    if err != nil || entry == nil {
+        fmt.Printf("No entry found for id %d\n", id)
+        return err
+    }
 
-	err = printEntry(entry, true)
+    err = printEntry(entry, true)
 
-	if err == nil && settingsRider.CopyPassword {
-		//      fmt.Printf("Copying password " + entry.Password + " to clipboard\n")
-		copyPasswordToClipboard(entry.Password)
-	}
+    if err == nil && settingsRider.CopyPassword {
+        //      fmt.Printf("Copying password " + entry.Password + " to clipboard\n")
+        copyPasswordToClipboard(entry.Password)
+    }
 
-	return err
+    return err
 }
 
 // List all entries
 func listAllEntries() error {
 
-	var err error
-	var maxKrypt bool
-	var defaultDB string
-	var passwd string
-
-	maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
-
-	// If max krypt on - then autodecrypt on call and auto encrypt after call
-	if maxKrypt {
-		err, passwd = decryptDatabase(defaultDB)
-		if err != nil {
-			return err
-		}
-	}
-
-	if err = checkActiveDatabase(); err != nil {
-		return err
-	}
-
-	err, settings := getOrCreateLocalConfig(APP)
-
-	if err != nil {
-		fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
-		return err
-	}
-
-	orderKeys := strings.Split(settings.ListOrder, ",")
-	err, entries := iterateEntries(orderKeys[0], orderKeys[1])
-
-	if err == nil {
-		if len(entries) > 0 {
-			fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
-			printDelim(settings.Delim, settings.Color)
-			for _, entry := range entries {
-				printEntry(&entry, false)
-			}
-		} else {
-			fmt.Println("No entries.")
-		}
-	} else {
-		fmt.Printf("Error fetching entries: \"%s\"\n", err.Error())
-		return err
-	}
-
-	// If max krypt on - then autodecrypt on call and auto encrypt after call
-	if maxKrypt {
-		err = encryptDatabase(defaultDB, &passwd)
-	}
-
-	return err
+    var err error
+    var maxKrypt bool
+    var defaultDB string
+    var passwd string
+
+    maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
+
+    // If max krypt on - then autodecrypt on call and auto encrypt after call
+    if maxKrypt {
+        err, passwd = decryptDatabase(defaultDB)
+        if err != nil {
+            return err
+        }
+    }
+
+    if err = checkActiveDatabase(); err != nil {
+        return err
+    }
+
+    err, settings := getOrCreateLocalConfig(APP)
+
+    if err != nil {
+        fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
+        return err
+    }
+
+    orderKeys := strings.Split(settings.ListOrder, ",")
+    err, entries := iterateEntries(orderKeys[0], orderKeys[1])
+
+    if err == nil {
+        if len(entries) > 0 {
+            fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
+            printDelim(settings.Delim, settings.Color)
+            for _, entry := range entries {
+                printEntry(&entry, false)
+            }
+        } else {
+            fmt.Println("No entries.")
+        }
+    } else {
+        fmt.Printf("Error fetching entries: \"%s\"\n", err.Error())
+        return err
+    }
+
+    // If max krypt on - then autodecrypt on call and auto encrypt after call
+    if maxKrypt {
+        err = encryptDatabase(defaultDB, &passwd)
+    }
+
+    return err
 }
 
 // Find current entry by term - prints all matches
 func findCurrentEntry(term string) error {
 
-	var err error
-	var entries []Entry
-	var terms []string
-
-	if err = checkActiveDatabase(); err != nil {
-		return err
-	}
-
-	terms = strings.Split(term, " ")
-
-	err, entries = searchDatabaseEntries(terms, "AND")
-	if err != nil || len(entries) == 0 {
-		fmt.Printf("Entry for query \"%s\" not found\n", term)
-		return err
-	} else {
-		var delim bool
-		var pcopy bool
-
-		if len(entries) == 1 {
-			delim = true
-			pcopy = true
-			// Single entry means copy password can be enabled
-		} else {
-			_, settings := getOrCreateLocalConfig(APP)
-			fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
-			printDelim(settings.Delim, settings.Color)
-		}
-
-		for _, entry := range entries {
-			printEntry(&entry, delim)
-		}
-
-		if pcopy && settingsRider.CopyPassword {
-			// Single entry
-			copyPasswordToClipboard(entries[0].Password)
-		}
-	}
-
-	return err
+    var err error
+    var entries []Entry
+    var terms []string
+
+    if err = checkActiveDatabase(); err != nil {
+        return err
+    }
+
+    terms = strings.Split(term, " ")
+
+    err, entries = searchDatabaseEntries(terms, "AND")
+    if err != nil || len(entries) == 0 {
+        fmt.Printf("Entry for query \"%s\" not found\n", term)
+        return err
+    } else {
+        var delim bool
+        var pcopy bool
+
+        if len(entries) == 1 {
+            delim = true
+            pcopy = true
+            // Single entry means copy password can be enabled
+        } else {
+            _, settings := getOrCreateLocalConfig(APP)
+            fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
+            printDelim(settings.Delim, settings.Color)
+        }
+
+        for _, entry := range entries {
+            printEntry(&entry, delim)
+        }
+
+        if pcopy && settingsRider.CopyPassword {
+            // Single entry
+            copyPasswordToClipboard(entries[0].Password)
+        }
+    }
+
+    return err
 }
 
 // Remove a range of entries <id1>-<id2> say 10-14
 func removeMultipleEntries(idRangeEntry string) error {
 
-	var err error
-	var idRange []string
-	var id1, id2 int
+    var err error
+    var idRange []string
+    var id1, id2 int
 
-	idRange = strings.Split(idRangeEntry, "-")
+    idRange = strings.Split(idRangeEntry, "-")
 
-	if len(idRange) != 2 {
-		fmt.Println("Invalid id range - " + idRangeEntry)
-		return errors.New("Invalid id range - " + idRangeEntry)
-	}
+    if len(idRange) != 2 {
+        fmt.Println("Invalid id range - " + idRangeEntry)
+        return errors.New("Invalid id range - " + idRangeEntry)
+    }
 
-	id1, _ = strconv.Atoi(idRange[0])
-	id2, _ = strconv.Atoi(idRange[1])
+    id1, _ = strconv.Atoi(idRange[0])
+    id2, _ = strconv.Atoi(idRange[1])
 
-	if id1 >= id2 {
-		fmt.Println("Invalid id range - " + idRangeEntry)
-		return errors.New("Invalid id range - " + idRangeEntry)
-	}
+    if id1 >= id2 {
+        fmt.Println("Invalid id range - " + idRangeEntry)
+        return errors.New("Invalid id range - " + idRangeEntry)
+    }
 
-	for idNum := id1; idNum <= id2; idNum++ {
-		err = removeCurrentEntry(fmt.Sprintf("%d", idNum))
-	}
+    for idNum := id1; idNum <= id2; idNum++ {
+        err = removeCurrentEntry(fmt.Sprintf("%d", idNum))
+    }
 
-	return err
+    return err
 }
 
 // Remove current entry by id
 func removeCurrentEntry(idString string) error {
 
-	var err error
-	var entry *Entry
-	var id int
-	var response string
-
-	if err = checkActiveDatabase(); err != nil {
-		return err
-	}
-
-	if strings.Contains(idString, "-") {
-		return removeMultipleEntries(idString)
-	}
-
-	id, _ = strconv.Atoi(idString)
-
-	err, entry = getEntryById(id)
-	if err != nil || entry == nil {
-		fmt.Printf("No entry with id %d was found\n", id)
-		return err
-	}
-
-	printEntryMinimal(entry, true)
-
-	if !settingsRider.AssumeYes {
-		response = readInput(bufio.NewReader(os.Stdin), "Please confirm removal [Y/n]: ")
-	} else {
-		response = "y"
-	}
-
-	if strings.ToLower(response) != "n" {
-		// Drop from the database
-		err = removeDatabaseEntry(entry)
-		if err == nil {
-			fmt.Printf("Entry with id %d was removed from the database\n", id)
-		}
-	} else {
-		fmt.Println("Removal of entry cancelled by user.")
-	}
-
-	return err
+    var err error
+    var entry *Entry
+    var id int
+    var response string
+
+    if err = checkActiveDatabase(); err != nil {
+        return err
+    }
+
+    if strings.Contains(idString, "-") {
+        return removeMultipleEntries(idString)
+    }
+
+    id, _ = strconv.Atoi(idString)
+
+    err, entry = getEntryById(id)
+    if err != nil || entry == nil {
+        fmt.Printf("No entry with id %d was found\n", id)
+        return err
+    }
+
+    printEntryMinimal(entry, true)
+
+    if !settingsRider.AssumeYes {
+        response = readInput(bufio.NewReader(os.Stdin), "Please confirm removal [Y/n]: ")
+    } else {
+        response = "y"
+    }
+
+    if strings.ToLower(response) != "n" {
+        // Drop from the database
+        err = removeDatabaseEntry(entry)
+        if err == nil {
+            fmt.Printf("Entry with id %d was removed from the database\n", id)
+        }
+    } else {
+        fmt.Println("Removal of entry cancelled by user.")
+    }
+
+    return err
 }
 
 // Copy current entry by id into new entry
 func copyCurrentEntry(idString string) error {
 
-	var err error
-	var entry *Entry
-	var entryNew *Entry
-	var exEntries []ExtendedEntry
+    var err error
+    var entry *Entry
+    var entryNew *Entry
+    var exEntries []ExtendedEntry
 
-	var id int
+    var id int
 
-	if err = checkActiveDatabase(); err != nil {
-		return err
-	}
+    if err = checkActiveDatabase(); err != nil {
+        return err
+    }
 
-	id, _ = strconv.Atoi(idString)
+    id, _ = strconv.Atoi(idString)
 
-	err, entry = getEntryById(id)
-	if err != nil || entry == nil {
-		fmt.Printf("No entry with id %d was found\n", id)
-		return err
-	}
+    err, entry = getEntryById(id)
+    if err != nil || entry == nil {
+        fmt.Printf("No entry with id %d was found\n", id)
+        return err
+    }
 
-	err, entryNew = cloneEntry(entry)
-	if err != nil {
-		fmt.Printf("Error cloning entry: \"%s\"\n", err.Error())
-		return err
-	}
+    err, entryNew = cloneEntry(entry)
+    if err != nil {
+        fmt.Printf("Error cloning entry: \"%s\"\n", err.Error())
+        return err
+    }
 
-	exEntries = getExtendedEntries(entry)
+    exEntries = getExtendedEntries(entry)
 
-	if len(exEntries) > 0 {
-		fmt.Printf("%d extended entries found\n", len(exEntries))
+    if len(exEntries) > 0 {
+        fmt.Printf("%d extended entries found\n", len(exEntries))
 
-		err = cloneExtendedEntries(entryNew, exEntries)
-		if err != nil {
-			fmt.Printf("Error cloning extended entries: \"%s\"\n", err.Error())
-			return err
-		}
-	}
+        err = cloneExtendedEntries(entryNew, exEntries)
+        if err != nil {
+            fmt.Printf("Error cloning extended entries: \"%s\"\n", err.Error())
+            return err
+        }
+    }
 
-	return err
+    return err
 }
 
 // Encrypt the active database
 func encryptActiveDatabase() error {
 
-	var err error
-	var dbPath string
+    var err error
+    var dbPath string
 
-	if err = checkActiveDatabase(); err != nil {
-		return err
-	}
+    if err = checkActiveDatabase(); err != nil {
+        return err
+    }
 
-	err, dbPath = getActiveDatabase()
-	if err != nil {
-		fmt.Printf("Error getting active database path - \"%s\"\n", err.Error())
-		return err
-	}
+    err, dbPath = getActiveDatabase()
+    if err != nil {
+        fmt.Printf("Error getting active database path - \"%s\"\n", err.Error())
+        return err
+    }
 
-	return encryptDatabase(dbPath, nil)
+    return encryptDatabase(dbPath, nil)
 }
 
 // Encrypt the database using AES
 func encryptDatabase(dbPath string, givenPasswd *string) error {
 
-	var err error
-	var passwd string
-	var passwd2 string
-
-	// If password is given, use it
-	if givenPasswd != nil {
-		passwd = *givenPasswd
-	}
-
-	if len(passwd) == 0 {
-		fmt.Printf("Encryption Password: ")
-		err, passwd = readPassword()
-
-		if err == nil {
-			fmt.Printf("\nEncryption Password again: ")
-			err, passwd2 = readPassword()
-			if err == nil {
-				if passwd != passwd2 {
-					fmt.Println("\nPassword mismatch.")
-					return errors.New("mismatched passwords")
-				}
-			}
-		}
-
-		if err != nil {
-			fmt.Printf("Error reading password - \"%s\"\n", err.Error())
-			return err
-		}
-	}
-
-	//  err = encryptFileAES(dbPath, passwd)
-	_, settings := getOrCreateLocalConfig(APP)
-
-	switch settings.Cipher {
-	case "aes":
-		err = encryptFileAES(dbPath, passwd)
-	case "xchacha", "chacha", "xchachapoly":
-		err = encryptFileXChachaPoly(dbPath, passwd)
-	default:
-		fmt.Println("No cipher set, defaulting to AES")
-		err = encryptFileAES(dbPath, passwd)
-	}
-
-	if err == nil {
-		fmt.Println("\nEncryption complete.")
-	}
-
-	return err
+    var err error
+    var passwd string
+    var passwd2 string
+
+    // If password is given, use it
+    if givenPasswd != nil {
+        passwd = *givenPasswd
+    }
+
+    if len(passwd) == 0 {
+        fmt.Printf("Encryption Password: ")
+        err, passwd = readPassword()
+
+        if err == nil {
+            fmt.Printf("\nEncryption Password again: ")
+            err, passwd2 = readPassword()
+            if err == nil {
+                if passwd != passwd2 {
+                    fmt.Println("\nPassword mismatch.")
+                    return errors.New("mismatched passwords")
+                }
+            }
+        }
+
+        if err != nil {
+            fmt.Printf("Error reading password - \"%s\"\n", err.Error())
+            return err
+        }
+    }
+
+    //  err = encryptFileAES(dbPath, passwd)
+    _, settings := getOrCreateLocalConfig(APP)
+
+    switch settings.Cipher {
+    case "aes":
+        err = encryptFileAES(dbPath, passwd)
+    case "xchacha", "chacha", "xchachapoly":
+        err = encryptFileXChachaPoly(dbPath, passwd)
+    default:
+        fmt.Println("No cipher set, defaulting to AES")
+        err = encryptFileAES(dbPath, passwd)
+    }
+
+    if err == nil {
+        fmt.Println("\nEncryption complete.")
+    }
+
+    return err
 }
 
 // Decrypt an encrypted database
 func decryptDatabase(dbPath string) (error, string) {
 
-	var err error
-	var passwd string
-	var flag bool
+    var err error
+    var passwd string
+    var flag bool
 
-	if err, flag = isFileEncrypted(dbPath); !flag {
-		fmt.Println(err.Error())
-		return err, ""
-	}
+    if err, flag = isFileEncrypted(dbPath); !flag {
+        fmt.Println(err.Error())
+        return err, ""
+    }
 
-	fmt.Printf("Decryption Password: ")
-	err, passwd = readPassword()
+    fmt.Printf("Decryption Password: ")
+    err, passwd = readPassword()
 
-	if err != nil {
-		fmt.Printf("\nError reading password - \"%s\"\n", err.Error())
-		return err, ""
-	}
+    if err != nil {
+        fmt.Printf("\nError reading password - \"%s\"\n", err.Error())
+        return err, ""
+    }
 
-	_, settings := getOrCreateLocalConfig(APP)
+    _, settings := getOrCreateLocalConfig(APP)
 
-	switch settings.Cipher {
-	case "aes":
-		err = decryptFileAES(dbPath, passwd)
-	case "xchacha", "chacha", "xchachapoly":
-		err = decryptFileXChachaPoly(dbPath, passwd)
-	default:
-		fmt.Println("No cipher set, defaulting to AES")
-		err = decryptFileAES(dbPath, passwd)
-	}
+    switch settings.Cipher {
+    case "aes":
+        err = decryptFileAES(dbPath, passwd)
+    case "xchacha", "chacha", "xchachapoly":
+        err = decryptFileXChachaPoly(dbPath, passwd)
+    default:
+        fmt.Println("No cipher set, defaulting to AES")
+        err = decryptFileAES(dbPath, passwd)
+    }
 
-	if err == nil {
-		fmt.Println("...decryption complete.")
-	}
+    if err == nil {
+        fmt.Println("...decryption complete.")
+    }
 
-	return err, passwd
+    return err, passwd
 }
 
 // Migrate an existing database to the new schema
 func migrateDatabase(dbPath string) error {
 
-	var err error
-	var flag bool
-	var passwd string
-	var db *gorm.DB
+    var err error
+    var flag bool
+    var passwd string
+    var db *gorm.DB
 
-	if _, err = os.Stat(dbPath); os.IsNotExist(err) {
-		fmt.Printf("Error - path %s does not exist\n", dbPath)
-		return err
-	}
+    if _, err = os.Stat(dbPath); os.IsNotExist(err) {
+        fmt.Printf("Error - path %s does not exist\n", dbPath)
+        return err
+    }
 
-	if err, flag = isFileEncrypted(dbPath); flag {
-		err, passwd = decryptDatabase(dbPath)
-	}
+    if err, flag = isFileEncrypted(dbPath); flag {
+        err, passwd = decryptDatabase(dbPath)
+        if err != nil {
+            fmt.Printf("Error decrypting - %s: %s\n", dbPath, err.Error())       
+            return err
+        }
+    }
 
-	if err != nil {
-		return err
-	}
 
-	err, db = openDatabase(dbPath)
+    err, db = openDatabase(dbPath)
 
-	if err != nil {
-		fmt.Printf("Error opening database path - %s: %s\n", dbPath, err.Error())
-		return err
-	}
+    if err != nil {
+        fmt.Printf("Error opening database path - %s: %s\n", dbPath, err.Error())
+        return err
+    }
 
-	fmt.Println("Migrating tables ...")
-	err = db.AutoMigrate(&Entry{})
+    fmt.Println("Migrating tables ...")
+    err = db.AutoMigrate(&Entry{})
 
-	if err != nil {
-		fmt.Printf("Error migrating table \"entries\" - %s: %s\n", dbPath, err.Error())
-		return err
-	}
+    if err != nil {
+        fmt.Printf("Error migrating table \"entries\" - %s: %s\n", dbPath, err.Error())
+        return err
+    }
 
-	err = db.AutoMigrate(&ExtendedEntry{})
+    err = db.AutoMigrate(&ExtendedEntry{})
 
-	if err != nil {
-		fmt.Printf("Error migrating table \"exentries\" - %s: %s\n", dbPath, err.Error())
-		return err
-	}
+    if err != nil {
+        fmt.Printf("Error migrating table \"exentries\" - %s: %s\n", dbPath, err.Error())
+        return err
+    }
 
-	if flag {
-		// File was encrypted - encrypt it again
-		encryptDatabase(dbPath, &passwd)
-	}
+    if flag {
+        // File was encrypted - encrypt it again
+        encryptDatabase(dbPath, &passwd)
+    }
 
-	fmt.Println("Migration successful.")
+    fmt.Println("Migration successful.")
 
-	return nil
+    return nil
 }
 
 // Export data to a varity of file types
 func exportToFile(fileName string) error {
 
-	var err error
-	var maxKrypt bool
-	var defaultDB string
-	var passwd string
-
-	ext := strings.ToLower(filepath.Ext(fileName))
-
-	maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
-
-	if ext == ".csv" || ext == ".md" || ext == ".html" || ext == ".pdf" {
-		// If max krypt on - then autodecrypt on call and auto encrypt after call
-		if maxKrypt {
-			err, passwd = decryptDatabase(defaultDB)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	switch ext {
-	case ".csv":
-		err = exportToCsv(fileName)
-	case ".md":
-		err = exportToMarkdown(fileName)
-	case ".html":
-		err = exportToHTML(fileName)
-	case ".pdf":
-		err = exportToPDF(fileName)
-	default:
-		fmt.Printf("Error - extn %s not supported\n", ext)
-		return fmt.Errorf("format %s not supported", ext)
-	}
-
-	if err != nil {
-		fmt.Printf("Error exporting to \"%s\" - \"%s\"\n", fileName, err.Error())
-		return err
-	} else {
-		if _, err = os.Stat(fileName); err == nil {
-			fmt.Printf("Exported to %s.\n", fileName)
-			// Chmod 600
-			os.Chmod(fileName, 0600)
-
-			// If max krypt on - then autodecrypt on call and auto encrypt after call
-			if maxKrypt {
-				err = encryptDatabase(defaultDB, &passwd)
-			}
-
-			return err
-		}
-	}
-
-	return err
+    var err error
+    var maxKrypt bool
+    var defaultDB string
+    var passwd string
+
+    ext := strings.ToLower(filepath.Ext(fileName))
+
+    maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
+
+    if ext == ".csv" || ext == ".md" || ext == ".html" || ext == ".pdf" {
+        // If max krypt on - then autodecrypt on call and auto encrypt after call
+        if maxKrypt {
+            err, passwd = decryptDatabase(defaultDB)
+            if err != nil {
+                return err
+            }
+        }
+    }
+
+    switch ext {
+    case ".csv":
+        err = exportToCsv(fileName)
+    case ".md":
+        err = exportToMarkdown(fileName)
+    case ".html":
+        err = exportToHTML(fileName)
+    case ".pdf":
+        err = exportToPDF(fileName)
+    default:
+        fmt.Printf("Error - extn %s not supported\n", ext)
+        return fmt.Errorf("format %s not supported", ext)
+    }
+
+    if err != nil {
+        fmt.Printf("Error exporting to \"%s\" - \"%s\"\n", fileName, err.Error())
+        return err
+    } else {
+        if _, err = os.Stat(fileName); err == nil {
+            fmt.Printf("Exported to %s.\n", fileName)
+            // Chmod 600
+            os.Chmod(fileName, 0600)
+
+            // If max krypt on - then autodecrypt on call and auto encrypt after call
+            if maxKrypt {
+                err = encryptDatabase(defaultDB, &passwd)
+            }
+
+            return err
+        }
+    }
+
+    return err
 }
 
 // Export current database to markdown
 func exportToMarkdown(fileName string) error {
 
-	var err error
-	var dataArray [][]string
-	var fh *os.File
-	var maxLengths [7]int
-	var headers []string = []string{" ID ", " Title ", " User ", " URL ", " Password ", " Notes ", " Modified "}
-
-	err, dataArray = entriesToStringArray(false)
-
-	if err != nil {
-		fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
-		return err
-	}
-
-	for _, record := range dataArray {
-		for idx, field := range record {
-
-			if len(field) > maxLengths[idx] {
-				maxLengths[idx] = len(field)
-			}
-		}
-	}
-
-	//  fmt.Printf("%+v\n", maxLengths)
-	fh, err = os.Create(fileName)
-	if err != nil {
-		fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
-		return err
-	}
-
-	defer fh.Close()
-
-	writer := bufio.NewWriter(fh)
-
-	// Write markdown header
-	for idx, length := range maxLengths {
-		delta := length - len(headers[idx])
-		//      fmt.Printf("%d\n", delta)
-		if delta > 0 {
-			for i := 0; i < delta+2; i++ {
-				headers[idx] += " "
-			}
-		}
-	}
-
-	writer.WriteString(" |" + strings.Join(headers, "|") + "|\n")
-
-	// Write line separator
-	writer.WriteString(" | ")
-	for _, length := range maxLengths {
-
-		for i := 0; i < length; i++ {
-			writer.WriteString("-")
-		}
-		writer.WriteString(" | ")
-	}
-	writer.WriteString("\n")
-
-	// Write records
-	for _, record := range dataArray {
-		writer.WriteString(" | ")
-		for _, field := range record {
-			writer.WriteString(field + " | ")
-		}
-		writer.WriteString("\n")
-	}
-
-	writer.Flush()
-
-	return nil
+    var err error
+    var dataArray [][]string
+    var fh *os.File
+    var maxLengths [7]int
+    var headers []string = []string{" ID ", " Title ", " User ", " URL ", " Password ", " Notes ", " Modified "}
+
+    err, dataArray = entriesToStringArray(false)
+
+    if err != nil {
+        fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
+        return err
+    }
+
+    for _, record := range dataArray {
+        for idx, field := range record {
+
+            if len(field) > maxLengths[idx] {
+                maxLengths[idx] = len(field)
+            }
+        }
+    }
+
+    //  fmt.Printf("%+v\n", maxLengths)
+    fh, err = os.Create(fileName)
+    if err != nil {
+        fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
+        return err
+    }
+
+    defer fh.Close()
+
+    writer := bufio.NewWriter(fh)
+
+    // Write markdown header
+    for idx, length := range maxLengths {
+        delta := length - len(headers[idx])
+        //      fmt.Printf("%d\n", delta)
+        if delta > 0 {
+            for i := 0; i < delta+2; i++ {
+                headers[idx] += " "
+            }
+        }
+    }
+
+    writer.WriteString(" |" + strings.Join(headers, "|") + "|\n")
+
+    // Write line separator
+    writer.WriteString(" | ")
+    for _, length := range maxLengths {
+
+        for i := 0; i < length; i++ {
+            writer.WriteString("-")
+        }
+        writer.WriteString(" | ")
+    }
+    writer.WriteString("\n")
+
+    // Write records
+    for _, record := range dataArray {
+        writer.WriteString(" | ")
+        for _, field := range record {
+            writer.WriteString(field + " | ")
+        }
+        writer.WriteString("\n")
+    }
+
+    writer.Flush()
+
+    return nil
 
 }
 
 // This needs pandoc and pdflatex support
 func exportToPDF(fileName string) error {
 
-	var err error
-	var tmpFile string
-	var passwd string
-	var pdfTkFound bool
-
-	cmd := exec.Command("which", "pandoc")
-	if _, err = cmd.Output(); err != nil {
-		return errors.New("pandoc not found")
-	}
-
-	cmd = exec.Command("which", "pdftk")
-	if _, err = cmd.Output(); err != nil {
-		fmt.Printf("pdftk not found, PDF won't be secure!\n")
-	} else {
-		pdfTkFound = true
-	}
-
-	if pdfTkFound {
-		fmt.Printf("PDF Encryption Password: ")
-		err, passwd = readPassword()
-	}
-
-	tmpFile = randomFileName(os.TempDir(), ".tmp")
-	//  fmt.Printf("Temp file => %s\n", tmpFile)
-	err = exportToMarkdownLimited(tmpFile)
-
-	if err == nil {
-		var args []string = []string{"-o", fileName, "-f", "markdown", "-V", "geometry:landscape", "--columns=600", "--pdf-engine", "xelatex", "--dpi=150", tmpFile}
-
-		cmd = exec.Command("pandoc", args...)
-		_, err = cmd.Output()
-		// Remove tmpfile
-		os.Remove(tmpFile)
-
-		// If the file is generated, encrypt it if pdfTkFound
-		if _, err = os.Stat(fileName); err == nil {
-			fmt.Printf("\nFile %s created without password.\n", fileName)
-
-			if pdfTkFound && len(passwd) > 0 {
-				tmpFile = randomFileName(".", ".pdf")
-				//              fmt.Printf("pdf file => %s\n", tmpFile)
-				args = []string{fileName, "output", tmpFile, "user_pw", passwd}
-				cmd = exec.Command("pdftk", args...)
-				_, err = cmd.Output()
-
-				if err == nil {
-					// Copy over
-					fmt.Printf("Added password to %s.\n", fileName)
-					os.Remove(fileName)
-					err = os.Rename(tmpFile, fileName)
-				} else {
-					fmt.Printf("Error adding password to pdf - \"%s\"\n", err.Error())
-				}
-			}
-		}
-	}
-
-	return err
+    var err error
+    var tmpFile string
+    var passwd string
+    var pdfTkFound bool
+
+    cmd := exec.Command("which", "pandoc")
+    if _, err = cmd.Output(); err != nil {
+        return errors.New("pandoc not found")
+    }
+
+    cmd = exec.Command("which", "pdftk")
+    if _, err = cmd.Output(); err != nil {
+        fmt.Printf("pdftk not found, PDF won't be secure!\n")
+    } else {
+        pdfTkFound = true
+    }
+
+    if pdfTkFound {
+        fmt.Printf("PDF Encryption Password: ")
+        err, passwd = readPassword()
+    }
+
+    tmpFile = randomFileName(os.TempDir(), ".tmp")
+    //  fmt.Printf("Temp file => %s\n", tmpFile)
+    err = exportToMarkdownLimited(tmpFile)
+
+    if err == nil {
+        var args []string = []string{"-o", fileName, "-f", "markdown", "-V", "geometry:landscape", "--columns=600", "--pdf-engine", "xelatex", "--dpi=150", tmpFile}
+
+        cmd = exec.Command("pandoc", args...)
+        _, err = cmd.Output()
+        // Remove tmpfile
+        os.Remove(tmpFile)
+
+        // If the file is generated, encrypt it if pdfTkFound
+        if _, err = os.Stat(fileName); err == nil {
+            fmt.Printf("\nFile %s created without password.\n", fileName)
+
+            if pdfTkFound && len(passwd) > 0 {
+                tmpFile = randomFileName(".", ".pdf")
+                //              fmt.Printf("pdf file => %s\n", tmpFile)
+                args = []string{fileName, "output", tmpFile, "user_pw", passwd}
+                cmd = exec.Command("pdftk", args...)
+                _, err = cmd.Output()
+
+                if err == nil {
+                    // Copy over
+                    fmt.Printf("Added password to %s.\n", fileName)
+                    os.Remove(fileName)
+                    err = os.Rename(tmpFile, fileName)
+                } else {
+                    fmt.Printf("Error adding password to pdf - \"%s\"\n", err.Error())
+                }
+            }
+        }
+    }
+
+    return err
 
 }
 
 // Export current database to markdown minus the long fields
 func exportToMarkdownLimited(fileName string) error {
 
-	var err error
-	var dataArray [][]string
-	var fh *os.File
-	var maxLengths [5]int
-	var headers []string = []string{" ID ", " Title ", " User ", " Password ", " Modified "}
-
-	err, dataArray = entriesToStringArray(true)
-
-	if err != nil {
-		fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
-		return err
-	}
-
-	for _, record := range dataArray {
-		for idx, field := range record {
-
-			if len(field) > maxLengths[idx] {
-				maxLengths[idx] = len(field)
-			}
-		}
-	}
-
-	//  fmt.Printf("%+v\n", maxLengths)
-	fh, err = os.Create(fileName)
-	if err != nil {
-		fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
-		return err
-	}
-
-	defer fh.Close()
-
-	writer := bufio.NewWriter(fh)
-
-	// Write markdown header
-	for idx, length := range maxLengths {
-		delta := length - len(headers[idx])
-		//      fmt.Printf("%d\n", delta)
-		if delta > 0 {
-			for i := 0; i < delta+2; i++ {
-				headers[idx] += " "
-			}
-		}
-	}
-
-	writer.WriteString(" |" + strings.Join(headers, "|") + "|\n")
-
-	// Write line separator
-	writer.WriteString(" | ")
-	for _, length := range maxLengths {
-
-		for i := 0; i < length; i++ {
-			writer.WriteString("-")
-		}
-		writer.WriteString(" | ")
-	}
-	writer.WriteString("\n")
-
-	// Write records
-	for _, record := range dataArray {
-		writer.WriteString(" | ")
-		for _, field := range record {
-			writer.WriteString(field + " | ")
-		}
-		writer.WriteString("\n")
-	}
-
-	writer.Flush()
-
-	return nil
+    var err error
+    var dataArray [][]string
+    var fh *os.File
+    var maxLengths [5]int
+    var headers []string = []string{" ID ", " Title ", " User ", " Password ", " Modified "}
+
+    err, dataArray = entriesToStringArray(true)
+
+    if err != nil {
+        fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
+        return err
+    }
+
+    for _, record := range dataArray {
+        for idx, field := range record {
+
+            if len(field) > maxLengths[idx] {
+                maxLengths[idx] = len(field)
+            }
+        }
+    }
+
+    //  fmt.Printf("%+v\n", maxLengths)
+    fh, err = os.Create(fileName)
+    if err != nil {
+        fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
+        return err
+    }
+
+    defer fh.Close()
+
+    writer := bufio.NewWriter(fh)
+
+    // Write markdown header
+    for idx, length := range maxLengths {
+        delta := length - len(headers[idx])
+        //      fmt.Printf("%d\n", delta)
+        if delta > 0 {
+            for i := 0; i < delta+2; i++ {
+                headers[idx] += " "
+            }
+        }
+    }
+
+    writer.WriteString(" |" + strings.Join(headers, "|") + "|\n")
+
+    // Write line separator
+    writer.WriteString(" | ")
+    for _, length := range maxLengths {
+
+        for i := 0; i < length; i++ {
+            writer.WriteString("-")
+        }
+        writer.WriteString(" | ")
+    }
+    writer.WriteString("\n")
+
+    // Write records
+    for _, record := range dataArray {
+        writer.WriteString(" | ")
+        for _, field := range record {
+            writer.WriteString(field + " | ")
+        }
+        writer.WriteString("\n")
+    }
+
+    writer.Flush()
+
+    return nil
 
 }
 
 // Export current database to html
 func exportToHTML(fileName string) error {
 
-	var err error
-	var dataArray [][]string
-	var fh *os.File
-	var headers []string = []string{" ID ", " Title ", " User ", " URL ", " Password ", " Notes ", " Modified "}
+    var err error
+    var dataArray [][]string
+    var fh *os.File
+    var headers []string = []string{" ID ", " Title ", " User ", " URL ", " Password ", " Notes ", " Modified "}
 
-	err, dataArray = entriesToStringArray(false)
+    err, dataArray = entriesToStringArray(false)
 
-	if err != nil {
-		fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
-		return err
-	}
+    if err != nil {
+        fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
+        return err
+    }
 
-	//  fmt.Printf("%+v\n", maxLengths)
-	fh, err = os.Create(fileName)
-	if err != nil {
-		fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
-		return err
-	}
+    //  fmt.Printf("%+v\n", maxLengths)
+    fh, err = os.Create(fileName)
+    if err != nil {
+        fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
+        return err
+    }
 
-	defer fh.Close()
+    defer fh.Close()
 
-	writer := bufio.NewWriter(fh)
+    writer := bufio.NewWriter(fh)
 
-	writer.WriteString("<html><body>\n")
-	writer.WriteString("<table cellPadding=\"2\" cellSpacing=\"2\" border=\"1\">\n")
-	writer.WriteString("<theader>\n")
+    writer.WriteString("<html><body>\n")
+    writer.WriteString("<table cellPadding=\"2\" cellSpacing=\"2\" border=\"1\">\n")
+    writer.WriteString("<theader>\n")
 
-	for _, h := range headers {
-		writer.WriteString(fmt.Sprintf("<th>%s</th>", h))
-	}
-	writer.WriteString("</theader>\n")
-	writer.WriteString("<tbody>\n")
+    for _, h := range headers {
+        writer.WriteString(fmt.Sprintf("<th>%s</th>", h))
+    }
+    writer.WriteString("</theader>\n")
+    writer.WriteString("<tbody>\n")
 
-	// Write records
-	for _, record := range dataArray {
-		writer.WriteString("<tr>")
-		for _, field := range record {
-			writer.WriteString(fmt.Sprintf("<td>%s</td>", field))
-		}
-		writer.WriteString("</tr>\n")
-	}
-	writer.WriteString("</tbody>\n")
-	writer.WriteString("</table>\n")
+    // Write records
+    for _, record := range dataArray {
+        writer.WriteString("<tr>")
+        for _, field := range record {
+            writer.WriteString(fmt.Sprintf("<td>%s</td>", field))
+        }
+        writer.WriteString("</tr>\n")
+    }
+    writer.WriteString("</tbody>\n")
+    writer.WriteString("</table>\n")
 
-	writer.WriteString("</body></html>\n")
+    writer.WriteString("</body></html>\n")
 
-	writer.Flush()
+    writer.Flush()
 
-	return nil
+    return nil
 
 }
 
 // Export current database to CSV
 func exportToCsv(fileName string) error {
 
-	var err error
-	var dataArray [][]string
-	var fh *os.File
+    var err error
+    var dataArray [][]string
+    var fh *os.File
 
-	err, dataArray = entriesToStringArray(false)
+    err, dataArray = entriesToStringArray(false)
 
-	if err != nil {
-		fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
-		return err
-	}
+    if err != nil {
+        fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
+        return err
+    }
 
-	fh, err = os.Create(fileName)
-	if err != nil {
-		fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
-		return err
-	}
+    fh, err = os.Create(fileName)
+    if err != nil {
+        fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
+        return err
+    }
 
-	writer := csv.NewWriter(fh)
+    writer := csv.NewWriter(fh)
 
-	// Write header
-	writer.Write([]string{"ID", "Title", "User", "URL", "Password", "Notes", "Modified"})
+    // Write header
+    writer.Write([]string{"ID", "Title", "User", "URL", "Password", "Notes", "Modified"})
 
-	for idx, record := range dataArray {
-		if err = writer.Write(record); err != nil {
-			fmt.Printf("Error writing record #%d to %s - \"%s\"\n", idx+1, fileName, err.Error())
-			break
-		}
-	}
+    for idx, record := range dataArray {
+        if err = writer.Write(record); err != nil {
+            fmt.Printf("Error writing record #%d to %s - \"%s\"\n", idx+1, fileName, err.Error())
+            break
+        }
+    }
 
-	writer.Flush()
+    writer.Flush()
 
-	if err != nil {
-		return err
-	}
+    if err != nil {
+        return err
+    }
 
-	os.Chmod(fileName, 0600)
-	fmt.Printf("!WARNING: Passwords are stored in plain-text!\n")
-	fmt.Printf("Exported %d records to %s .\n", len(dataArray), fileName)
+    os.Chmod(fileName, 0600)
+    fmt.Printf("!WARNING: Passwords are stored in plain-text!\n")
+    fmt.Printf("Exported %d records to %s .\n", len(dataArray), fileName)
 
-	return nil
+    return nil
 }
diff --git a/db.go b/db.go
index a444b71..2b62c57 100644
--- a/db.go
+++ b/db.go
@@ -17,15 +17,22 @@ import (
 // Structure representing an entry in the db
 type Entry struct {
     ID        int       `gorm:"column:id;autoIncrement;primaryKey"`
-    Title     string    `gorm:"column:title"`
-    User      string    `gorm:"column:user"`
-    Url       string    `gorm:"column:url"`
-    Password  string    `gorm:"column:password"`
+    Title     string    `gorm:"column:title"`  // For card type this -> Card Name
+    User      string    `gorm:"column:user"`   // For card type this -> Card Holder Name
+    Url       string    `gorm:"column:url"`    // For card type this -> Card Number
+    Password  string    `gorm:"column:password"` // For card type this -> CVV number
+    Pin       string    `gorm:"column:pin"` // For card type this -> card pin
+    ExpiryDate string   `gorm:"colum:expiry_date"` // For card type this -> Card expiry date
+    Issuer     string   `gorm:"column:issuer"`    // For card type this -> Issuing bank
+    Class      string   `gorm:"column:class"`    // For card type this -> visa/mastercard/amex etc
+    
     Notes     string    `gorm:"column:notes"`
     Tags      string    `gorm:"column:tags"`
+    Type      string    `gorm:"column:type"`  // Entry type, default/card/ID
     Timestamp time.Time `gorm:"type:timestamp;default:(datetime('now','localtime'))"` // sqlite3
 }
 
+    
 func (e *Entry) TableName() string {
     return "entries"
 }
@@ -259,6 +266,47 @@ func addNewDatabaseEntry(title, userName, url, passwd, tags string,
     return err
 }
 
+// Add a new card entry to current database
+func addNewDatabaseCardEntry(cardName, cardNumber, cardHolder, cardIssuer, cardClass,
+    cardCvv, cardPin, cardExpiry, notes, tags string, customEntries []CustomEntry) error {
+
+    var entry Entry
+    var err error
+    var db *gorm.DB
+
+    entry = Entry{
+        Title: cardName,
+        User: cardHolder,
+        Url: cardNumber,
+        Password: cardCvv,
+        Pin: cardPin,
+        Issuer: cardIssuer,
+        Class: cardClass,
+        ExpiryDate: cardExpiry,
+        Type: "card",
+        Tags: strings.TrimSpace(tags),
+        Notes: notes}
+
+    err, db = openActiveDatabase()
+    if err == nil && db != nil {
+        //      result := db.Debug().Create(&entry)
+        result := db.Create(&entry)
+        if result.Error == nil && result.RowsAffected == 1 {
+            // Add custom fields if given
+            fmt.Printf("Created new entry with id: %d.\n", entry.ID)
+            if len(customEntries) > 0 {
+                return addCustomEntries(db, &entry, customEntries)
+            }
+            return nil
+        } else if result.Error != nil {
+            return result.Error
+        }
+    }
+
+    return err
+}
+
+
 // Update current database entry with new values
 func updateDatabaseEntry(entry *Entry, title, userName, url, passwd, tags string,
     notes string, customEntries []CustomEntry, flag bool) error {
diff --git a/go.mod b/go.mod
index f320c0a..7417d0e 100644
--- a/go.mod
+++ b/go.mod
@@ -3,9 +3,9 @@ module varuh
 go 1.16
 
 require (
-	github.com/akamensky/argparse v1.3.1
 	github.com/atotto/clipboard v0.1.4
 	github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f
+	github.com/polyglothacker/creditcard v0.0.0-20220814132008-214952378026
 	github.com/pythonhacker/argparse v1.3.2
 	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
 	gorm.io/driver/sqlite v1.2.3
diff --git a/go.sum b/go.sum
index b6161ad..8e58640 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,3 @@
-github.com/akamensky/argparse v1.3.1 h1:kP6+OyvR0fuBH6UhbE6yh/nskrDEIQgEA1SUXDPjx4g=
-github.com/akamensky/argparse v1.3.1/go.mod h1:S5kwC7IuDcEr5VeXtGPRVZ5o/FdhcMlQz4IZQuw64xA=
 github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
 github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -15,9 +13,12 @@ github.com/mattn/go-sqlite3 v1.14.9 h1:10HX2Td0ocZpYEjhilsuo6WWtUqttj2Kb0KtD86/K
 github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/polyglothacker/creditcard v0.0.0-20220814132008-214952378026 h1:UGQ0EYOPlnXlhGGTlRXIqGhKViXU7Ro+EIl+S+Ui8AY=
+github.com/polyglothacker/creditcard v0.0.0-20220814132008-214952378026/go.mod h1:F7aq1XexOpEd3ipbid3ZwJkijRyBf5p1EBVU5MycFb8=
 github.com/pythonhacker/argparse v1.3.2 h1:JOojnYFHk7oap+MQiFgiPAHlzvhJfqukErLneWaHR/M=
 github.com/pythonhacker/argparse v1.3.2/go.mod h1:gdUstTr/g1ojhRwrF9gKFOVLwsNfwarBg8aCQRjtvo8=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
@@ -31,6 +32,7 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gorm.io/driver/sqlite v1.2.3 h1:OwKm0xRAnsZMWAl5BtXJ9BsXAZHIt802DOTVMQuzWN8=
diff --git a/main.go b/main.go
index c1ce900..2f878b5 100644
--- a/main.go
+++ b/main.go
@@ -3,10 +3,10 @@
 package main
 
 import (
-	"fmt"
-	"github.com/pythonhacker/argparse"
-	"os"
-	"strings"
+    "fmt"
+    "github.com/pythonhacker/argparse"
+    "os"
+    "strings"
 )
 
 const VERSION = 0.4
@@ -21,231 +21,245 @@ type actionFunc func(string) error
 type actionFunc2 func(string) (error, string)
 type voidFunc func() error
 type voidFunc2 func() (error, string)
+type settingFunc func(string) 
 
 // Structure to keep the options data
 type CmdOption struct {
-	Short   string
-	Long    string
-	Help    string
-	Path    string
-	Default string
+    Short   string
+    Long    string
+    Help    string
+    Path    string
+    Default string
 }
 
 // Print the program's usage string and exit
 func printUsage() error {
-	//  getopt.Usage()
-	os.Exit(0)
+    //  getopt.Usage()
+    os.Exit(0)
 
-	return nil
+    return nil
 }
 
 // Print the program's version info and exit
 func printVersionInfo() error {
-	fmt.Printf("%s version %.2f\n", APP, VERSION)
-	os.Exit(0)
+    fmt.Printf("%s version %.2f\n", APP, VERSION)
+    os.Exit(0)
 
-	return nil
+    return nil
 }
 
 // Command-line wrapper to generateRandomPassword
 func genPass() (error, string) {
-	var err error
-	var passwd string
+    var err error
+    var passwd string
 
-	err, passwd = generateStrongPassword()
+    err, passwd = generateStrongPassword()
 
-	if err != nil {
-		fmt.Printf("Error generating password - \"%s\"\n", err.Error())
-		return err, ""
-	}
+    if err != nil {
+        fmt.Printf("Error generating password - \"%s\"\n", err.Error())
+        return err, ""
+    }
 
-	fmt.Println(passwd)
+    fmt.Println(passwd)
 
-	if settingsRider.CopyPassword {
-		copyPasswordToClipboard(passwd)
-		fmt.Println("Password copied to clipboard")
-	}
+    if settingsRider.CopyPassword {
+        copyPasswordToClipboard(passwd)
+        fmt.Println("Password copied to clipboard")
+    }
 
-	return nil, passwd
+    return nil, passwd
 }
 
 // // Perform an action by using the command line options map
 func performAction(optMap map[string]interface{}) {
 
-	var flag bool
-
-	boolActionsMap := map[string]voidFunc{
-		"add":      WrapperMaxKryptVoidFunc(addNewEntry),
-		"version":  printVersionInfo,
-		"help":     printUsage,
-		"path":     showActiveDatabasePath,
-		"list-all": WrapperMaxKryptVoidFunc(listAllEntries),
-		"encrypt":  encryptActiveDatabase,
-	}
-
-	stringActionsMap := map[string]actionFunc{
-		"edit":       WrapperMaxKryptStringFunc(editCurrentEntry),
-		"init":       initNewDatabase,
-		"list-entry": WrapperMaxKryptStringFunc(listCurrentEntry),
-		"remove":     WrapperMaxKryptStringFunc(removeCurrentEntry),
-		"clone":      WrapperMaxKryptStringFunc(copyCurrentEntry),
-		"use-db":     setActiveDatabasePath,
-		"export":     exportToFile,
-		"migrate":    migrateDatabase,
-	}
-
-	stringListActionsMap := map[string]actionFunc{
-		"find": WrapperMaxKryptStringFunc(findCurrentEntry),
-	}
-
-	stringActions2Map := map[string]actionFunc2{
-		"decrypt": decryptDatabase,
-	}
-
-	flagsActions2Map := map[string]voidFunc2{
-		"genpass": genPass,
-	}
-
-	flagsActionsMap := map[string]voidFunc{
-		"show":       setShowPasswords,
-		"copy":       setCopyPasswordToClipboard,
-		"assume-yes": setAssumeYes,
-	}
-
-	// Flag actions - always done
-	for key, mappedFunc := range flagsActionsMap {
-		if *optMap[key].(*bool) {
-			mappedFunc()
-		}
-	}
-
-	// Flag 2 actions
-	for key, mappedFunc := range flagsActions2Map {
-		if *optMap[key].(*bool) {
-			mappedFunc()
-			flag = true
-			break
-		}
-	}
-
-	// One of bool or string actions
-	for key, mappedFunc := range boolActionsMap {
-		if *optMap[key].(*bool) {
-			mappedFunc()
-			flag = true
-			break
-		}
-	}
-
-	if flag {
-		return
-	}
-
-	for key, mappedFunc := range stringActionsMap {
-		if *optMap[key].(*string) != "" {
-
-			var val = *(optMap[key].(*string))
-			mappedFunc(val)
-			flag = true
-			break
-		}
-	}
-
-	for key, mappedFunc := range stringListActionsMap {
-		if len(*optMap[key].(*[]string)) > 0 {
-
-			var vals = *(optMap[key].(*[]string))
-			// Convert to single string
-			var singleVal = strings.Join(vals, " ")
-			mappedFunc(singleVal)
-			flag = true
-			break
-		}
-	}
-
-	if flag {
-		return
-	}
-
-	for key, mappedFunc := range stringActions2Map {
-		if *optMap[key].(*string) != "" {
-			var val = *(optMap[key].(*string))
-			mappedFunc(val)
-			break
-		}
-	}
+    var flag bool
+
+    boolActionsMap := map[string]voidFunc{
+        "add":      WrapperMaxKryptVoidFunc(addNewEntry),
+        "version":  printVersionInfo,
+        "help":     printUsage,
+        "path":     showActiveDatabasePath,
+        "list-all": WrapperMaxKryptVoidFunc(listAllEntries),
+        "encrypt":  encryptActiveDatabase,
+    }
+
+    stringActionsMap := map[string]actionFunc{
+        "edit":       WrapperMaxKryptStringFunc(editCurrentEntry),
+        "init":       initNewDatabase,
+        "list-entry": WrapperMaxKryptStringFunc(listCurrentEntry),
+        "remove":     WrapperMaxKryptStringFunc(removeCurrentEntry),
+        "clone":      WrapperMaxKryptStringFunc(copyCurrentEntry),
+        "use-db":     setActiveDatabasePath,
+        "export":     exportToFile,
+        "migrate":    migrateDatabase,
+    }
+
+    stringListActionsMap := map[string]actionFunc{
+        "find": WrapperMaxKryptStringFunc(findCurrentEntry),
+    }
+
+    stringActions2Map := map[string]actionFunc2{
+        "decrypt": decryptDatabase,
+    }
+
+    flagsActions2Map := map[string]voidFunc2{
+        "genpass": genPass,
+    }
+
+    flagsActionsMap := map[string]voidFunc{
+        "show":       setShowPasswords,
+        "copy":       setCopyPasswordToClipboard,
+        "assume-yes": setAssumeYes,
+    }
+
+    flagsSettingsMap := map[string]settingFunc{
+        "type": setType,
+    }
+    
+    // Flag actions - always done
+    for key, mappedFunc := range flagsActionsMap {
+        if *optMap[key].(*bool) {
+            mappedFunc()
+        }
+    }
+
+    // Flag 2 actions
+    for key, mappedFunc := range flagsActions2Map {
+        if *optMap[key].(*bool) {
+            mappedFunc()
+            flag = true
+            break
+        }
+    }
+
+    // Settings
+    for key, mappedFunc := range flagsSettingsMap {
+        if *optMap[key].(*string) != ""{
+            var val = *(optMap[key].(*string))
+            mappedFunc(val)         
+        }
+    }   
+
+    // One of bool or string actions
+    for key, mappedFunc := range boolActionsMap {
+        if *optMap[key].(*bool) {
+            mappedFunc()
+            flag = true
+            break
+        }
+    }
+
+    if flag {
+        return
+    }
+
+    for key, mappedFunc := range stringActionsMap {
+        if *optMap[key].(*string) != "" {
+
+            var val = *(optMap[key].(*string))
+            mappedFunc(val)
+            flag = true
+            break
+        }
+    }
+
+    for key, mappedFunc := range stringListActionsMap {
+        if len(*optMap[key].(*[]string)) > 0 {
+
+            var vals = *(optMap[key].(*[]string))
+            // Convert to single string
+            var singleVal = strings.Join(vals, " ")
+            mappedFunc(singleVal)
+            flag = true
+            break
+        }
+    }
+
+    if flag {
+        return
+    }
+
+    for key, mappedFunc := range stringActions2Map {
+        if *optMap[key].(*string) != "" {
+            var val = *(optMap[key].(*string))
+            mappedFunc(val)
+            break
+        }
+    }
 
 }
 
 func initializeCmdLine(parser *argparse.Parser) map[string]interface{} {
-	var optMap map[string]interface{}
-
-	optMap = make(map[string]interface{})
-
-	stringOptions := []CmdOption{
-		{"I", "init", "Initialize a new database", "<path>", ""},
-		{"d", "decrypt", "Decrypt password database", "<path>", ""},
-		{"C", "clone", "Clone an entry with <id>", "<id>", ""},
-		{"R", "remove", "Remove an entry with <id> or <id-range>", "<id>", ""},
-		{"U", "use-db", "Set <path> as active database", "<path>", ""},
-		{"E", "edit", "Edit entry by <id>", "<id>", ""},
-		{"l", "list-entry", "List entry by <id>", "<id>", ""},
-		{"x", "export", "Export all entries to <filename>", "<filename>", ""},
-		{"m", "migrate", "Migrate a database to latest schema", "<path>", ""},
-	}
-
-	for _, opt := range stringOptions {
-		optMap[opt.Long] = parser.String(opt.Short, opt.Long, &argparse.Options{Help: opt.Help, Path: opt.Path})
-	}
-
-	stringListOptions := []CmdOption{
-		{"f", "find", "Search entries with terms", "<t1> <t2> ...", ""},
-	}
-
-	for _, opt := range stringListOptions {
-		optMap[opt.Long] = parser.StringList(opt.Short, opt.Long, &argparse.Options{Help: opt.Help, Path: opt.Path})
-	}
-
-	boolOptions := []CmdOption{
-		{"e", "encrypt", "Encrypt the current database", "", ""},
-		{"A", "add", "Add a new entry", "", ""},
-		{"p", "path", "Show current database path", "", ""},
-		{"a", "list-all", "List all entries in current database", "", ""},
-		{"g", "genpass", "Generate a strong password (length: 12 - 16)", "", ""},
-		{"s", "show", "Show passwords when listing entries", "", ""},
-		{"c", "copy", "Copy password to clipboard", "", ""},
-		{"y", "assume-yes", "Assume yes to actions requiring confirmation", "", ""},
-		{"v", "version", "Show version information and exit", "", ""},
-		{"h", "help", "Print this help message and exit", "", ""},
-	}
-
-	for _, opt := range boolOptions {
-		optMap[opt.Long] = parser.Flag(string(opt.Short), opt.Long, &argparse.Options{Help: opt.Help})
-	}
-
-	return optMap
+    var optMap map[string]interface{}
+
+    optMap = make(map[string]interface{})
+
+    stringOptions := []CmdOption{
+        {"I", "init", "Initialize a new database", "<path>", ""},
+        {"d", "decrypt", "Decrypt password database", "<path>", ""},
+        {"C", "clone", "Clone an entry with <id>", "<id>", ""},
+        {"R", "remove", "Remove an entry with <id> or <id-range>", "<id>", ""},
+        {"U", "use-db", "Set <path> as active database", "<path>", ""},
+        {"E", "edit", "Edit entry by <id>", "<id>", ""},
+        {"l", "list-entry", "List entry by <id>", "<id>", ""},
+        {"x", "export", "Export all entries to <filename>", "<filename>", ""},
+        {"m", "migrate", "Migrate a database to latest schema", "<path>", ""},
+        {"t", "type", "Specify type when adding a new entry", "<type>", ""},
+    }
+
+    for _, opt := range stringOptions {
+        optMap[opt.Long] = parser.String(opt.Short, opt.Long, &argparse.Options{Help: opt.Help, Path: opt.Path})
+    }
+
+    stringListOptions := []CmdOption{
+        {"f", "find", "Search entries with terms", "<t1> <t2> ...", ""},
+    }
+
+    for _, opt := range stringListOptions {
+        optMap[opt.Long] = parser.StringList(opt.Short, opt.Long, &argparse.Options{Help: opt.Help, Path: opt.Path})
+    }
+
+    boolOptions := []CmdOption{
+        {"e", "encrypt", "Encrypt the current database", "", ""},
+        {"A", "add", "Add a new entry", "", ""},
+        {"p", "path", "Show current database path", "", ""},
+        {"a", "list-all", "List all entries in current database", "", ""},
+        {"g", "genpass", "Generate a strong password (length: 12 - 16)", "", ""},
+        {"s", "show", "Show passwords when listing entries", "", ""},
+        {"c", "copy", "Copy password to clipboard", "", ""},
+        {"y", "assume-yes", "Assume yes to actions requiring confirmation", "", ""},
+        {"v", "version", "Show version information and exit", "", ""},
+        {"h", "help", "Print this help message and exit", "", ""},
+    }
+
+    for _, opt := range boolOptions {
+        optMap[opt.Long] = parser.Flag(string(opt.Short), opt.Long, &argparse.Options{Help: opt.Help})
+    }
+
+    return optMap
 }
 
 // Main routine
 func main() {
-	if len(os.Args) == 1 {
-		os.Args = append(os.Args, "-h")
-	}
+    if len(os.Args) == 1 {
+        os.Args = append(os.Args, "-h")
+    }
 
-	parser := argparse.NewParser("varuh",
-		"Password manager for the command line for Unix like operating systems",
-		AUTHOR_INFO,
-	)
+    parser := argparse.NewParser("varuh",
+        "Password manager for the command line for Unix like operating systems",
+        AUTHOR_INFO,
+    )
 
-	optMap := initializeCmdLine(parser)
+    optMap := initializeCmdLine(parser)
 
-	err := parser.Parse(os.Args)
+    err := parser.Parse(os.Args)
 
-	if err != nil {
-		fmt.Println(parser.Usage(err))
-	}
+    if err != nil {
+        fmt.Println(parser.Usage(err))
+    }
 
-	getOrCreateLocalConfig(APP)
+    getOrCreateLocalConfig(APP)
 
-	performAction(optMap)
+    performAction(optMap)
 }
diff --git a/utils.go b/utils.go
index 8c57d62..7adca13 100644
--- a/utils.go
+++ b/utils.go
@@ -2,47 +2,52 @@
 package main
 
 import (
-	"bufio"
-	"encoding/hex"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"github.com/atotto/clipboard"
-	"github.com/kirsle/configdir"
-	"golang.org/x/crypto/ssh/terminal"
-	"io/fs"
-	"os"
-	"path/filepath"
-	"strings"
+    "bufio"
+    "time"
+    "regexp"
+    "encoding/hex"
+    "encoding/json"
+    "errors"
+    "fmt"
+    "github.com/atotto/clipboard"
+    "github.com/kirsle/configdir"
+    "golang.org/x/crypto/ssh/terminal"
+    "io/fs"
+    "os"
+    "path/filepath"
+    "strings"
+    "strconv"
+    "github.com/polyglothacker/creditcard"
 )
 
 const DELIMSIZE int = 69
 
 // Over-ride settings via cmd line
 type SettingsOverride struct {
-	ShowPasswords bool
-	CopyPassword  bool
-	AssumeYes     bool
+    ShowPasswords bool
+    CopyPassword  bool
+    AssumeYes     bool
+    Type          string // Type of entity to add
 }
 
 // Settings structure for local config
 type Settings struct {
-	ActiveDB      string `json:"active_db"`
-	Cipher        string `json:"cipher"`
-	AutoEncrypt   bool   `json:"auto_encrypt"`
-	KeepEncrypted bool   `json:"encrypt_on"`
-	ShowPasswords bool   `json:"visible_passwords"`
-	ConfigPath    string `json:"path"`
-	// Key to order listings when using -a option
-	// Valid values are
-	// 1. timestamp,{desc,asc}
-	// 2. title,{desc,asc}
-	// 3. username, {desc,asc}
-	// 4. id, {desc,asc{
-	ListOrder string `json:"list_order"`
-	Delim     string `json:"delimiter"`
-	Color     string `json:"color"`   // fg color to print
-	BgColor   string `json:"bgcolor"` // bg color to print
+    ActiveDB      string `json:"active_db"`
+    Cipher        string `json:"cipher"`
+    AutoEncrypt   bool   `json:"auto_encrypt"`
+    KeepEncrypted bool   `json:"encrypt_on"`
+    ShowPasswords bool   `json:"visible_passwords"`
+    ConfigPath    string `json:"path"`
+    // Key to order listings when using -a option
+    // Valid values are
+    // 1. timestamp,{desc,asc}
+    // 2. title,{desc,asc}
+    // 3. username, {desc,asc}
+    // 4. id, {desc,asc{
+    ListOrder string `json:"list_order"`
+    Delim     string `json:"delimiter"`
+    Color     string `json:"color"`   // fg color to print
+    BgColor   string `json:"bgcolor"` // bg color to print
 }
 
 // Global settings override
@@ -51,434 +56,608 @@ var settingsRider SettingsOverride
 // Write settings to disk
 func writeSettings(settings *Settings, configFile string) error {
 
-	fh, err := os.Create(configFile)
-	if err != nil {
-		fmt.Printf("Error generating configuration file %s - \"%s\"\n", configFile, err.Error())
-		return err
-	}
+    fh, err := os.Create(configFile)
+    if err != nil {
+        fmt.Printf("Error generating configuration file %s - \"%s\"\n", configFile, err.Error())
+        return err
+    }
 
-	defer fh.Close()
+    defer fh.Close()
 
-	encoder := json.NewEncoder(fh)
-	encoder.SetIndent("", "\t")
-	err = encoder.Encode(&settings)
+    encoder := json.NewEncoder(fh)
+    encoder.SetIndent("", "\t")
+    err = encoder.Encode(&settings)
 
-	return err
+    return err
 }
 
 // Write updated settings to disk
 func updateSettings(settings *Settings, configFile string) error {
 
-	fh, err := os.OpenFile(configFile, os.O_RDWR, 0644)
-	if err != nil {
-		fmt.Printf("Error opening config file %s - \"%s\"\n", configFile, err.Error())
-		return err
-	}
+    fh, err := os.OpenFile(configFile, os.O_RDWR, 0644)
+    if err != nil {
+        fmt.Printf("Error opening config file %s - \"%s\"\n", configFile, err.Error())
+        return err
+    }
 
-	defer fh.Close()
+    defer fh.Close()
 
-	encoder := json.NewEncoder(fh)
-	encoder.SetIndent("", "\t")
-	err = encoder.Encode(&settings)
+    encoder := json.NewEncoder(fh)
+    encoder.SetIndent("", "\t")
+    err = encoder.Encode(&settings)
 
-	if err != nil {
-		fmt.Printf("Error updating config %s - \"%s\"\n", configFile, err.Error())
-		return err
-	}
+    if err != nil {
+        fmt.Printf("Error updating config %s - \"%s\"\n", configFile, err.Error())
+        return err
+    }
 
-	return err
+    return err
 }
 
 // Make the per-user configuration folder and return local settings
 func getOrCreateLocalConfig(app string) (error, *Settings) {
 
-	var settings Settings
-	var configPath string
-	var configFile string
-	var err error
-	var fh *os.File
-
-	configPath = configdir.LocalConfig(app)
-	err = configdir.MakePath(configPath) // Ensure it exists.
-	if err != nil {
-		return err, nil
-	}
-
-	configFile = filepath.Join(configPath, "config.json")
-	//  fmt.Printf("Config file, path => %s %s\n", configFile, configPath)
-
-	if _, err = os.Stat(configFile); err == nil {
-		fh, err = os.Open(configFile)
-		if err != nil {
-			return err, nil
-		}
-
-		defer fh.Close()
-
-		decoder := json.NewDecoder(fh)
-		err = decoder.Decode(&settings)
-		if err != nil {
-			return err, nil
-		}
-
-	} else {
-		//      fmt.Printf("Creating default configuration ...")
-		settings = Settings{"", "aes", true, true, false, configFile, "id,asc", ">", "default", "bgblack"}
-
-		if err = writeSettings(&settings, configFile); err == nil {
-			// fmt.Println(" ...done")
-		} else {
-			return err, nil
-		}
-	}
-
-	return nil, &settings
+    var settings Settings
+    var configPath string
+    var configFile string
+    var err error
+    var fh *os.File
+
+    configPath = configdir.LocalConfig(app)
+    err = configdir.MakePath(configPath) // Ensure it exists.
+    if err != nil {
+        return err, nil
+    }
+
+    configFile = filepath.Join(configPath, "config.json")
+    //  fmt.Printf("Config file, path => %s %s\n", configFile, configPath)
+
+    if _, err = os.Stat(configFile); err == nil {
+        fh, err = os.Open(configFile)
+        if err != nil {
+            return err, nil
+        }
+
+        defer fh.Close()
+
+        decoder := json.NewDecoder(fh)
+        err = decoder.Decode(&settings)
+        if err != nil {
+            return err, nil
+        }
+
+    } else {
+        //      fmt.Printf("Creating default configuration ...")
+        settings = Settings{"", "aes", true, true, false, configFile, "id,asc", ">", "default", "bgblack"}
+
+        if err = writeSettings(&settings, configFile); err == nil {
+            // fmt.Println(" ...done")
+        } else {
+            return err, nil
+        }
+    }
+
+    return nil, &settings
 }
 
 // Return if there is an active, decrypted database
 func hasActiveDatabase() bool {
 
-	err, settings := getOrCreateLocalConfig(APP)
-	if err == nil && settings.ActiveDB != "" {
-		if _, err := os.Stat(settings.ActiveDB); err == nil {
-			if _, flag := isFileEncrypted(settings.ActiveDB); !flag {
-				return true
-			}
-			return false
-		}
-	}
-
-	if err != nil {
-		fmt.Printf("Error parsing local config - \"%s\"\n", err.Error())
-	}
-
-	return false
+    err, settings := getOrCreateLocalConfig(APP)
+    if err == nil && settings.ActiveDB != "" {
+        if _, err := os.Stat(settings.ActiveDB); err == nil {
+            if _, flag := isFileEncrypted(settings.ActiveDB); !flag {
+                return true
+            }
+            return false
+        }
+    }
+
+    if err != nil {
+        fmt.Printf("Error parsing local config - \"%s\"\n", err.Error())
+    }
+
+    return false
 }
 
 // Get the current active database
 func getActiveDatabase() (error, string) {
 
-	err, settings := getOrCreateLocalConfig(APP)
-	if err == nil && settings.ActiveDB != "" {
-		if _, err := os.Stat(settings.ActiveDB); err == nil {
-			return nil, settings.ActiveDB
-		}
-	}
+    err, settings := getOrCreateLocalConfig(APP)
+    if err == nil && settings.ActiveDB != "" {
+        if _, err := os.Stat(settings.ActiveDB); err == nil {
+            return nil, settings.ActiveDB
+        }
+    }
 
-	if err != nil {
-		fmt.Printf("Error parsing local config - \"%s\"\n", err.Error())
-	}
+    if err != nil {
+        fmt.Printf("Error parsing local config - \"%s\"\n", err.Error())
+    }
 
-	return err, ""
+    return err, ""
 }
 
 // Update the active db path
 func updateActiveDbPath(dbPath string) error {
 
-	_, settings := getOrCreateLocalConfig(APP)
+    _, settings := getOrCreateLocalConfig(APP)
 
-	if settings != nil {
-		settings.ActiveDB = dbPath
-	}
+    if settings != nil {
+        settings.ActiveDB = dbPath
+    }
 
-	return updateSettings(settings, settings.ConfigPath)
+    return updateSettings(settings, settings.ConfigPath)
 
 }
 
 // Read the password from console without echoing
 func readPassword() (error, string) {
 
-	var passwd []byte
-	var err error
+    var passwd []byte
+    var err error
 
-	passwd, err = terminal.ReadPassword(int(os.Stdin.Fd()))
-	return err, string(passwd)
+    passwd, err = terminal.ReadPassword(int(os.Stdin.Fd()))
+    return err, string(passwd)
 }
 
 // Rewrite the contents of the base file (path minus extension) with the new contents
 func rewriteBaseFile(path string, contents []byte, mode fs.FileMode) (error, string) {
 
-	var err error
-	var origFile string
+    var err error
+    var origFile string
 
-	origFile = strings.TrimSuffix(path, filepath.Ext(path))
-	// Overwrite it
-	err = os.WriteFile(origFile, contents, 0644)
+    origFile = strings.TrimSuffix(path, filepath.Ext(path))
+    // Overwrite it
+    err = os.WriteFile(origFile, contents, 0644)
 
-	if err == nil {
-		// Chmod it
-		os.Chmod(origFile, mode)
-	}
+    if err == nil {
+        // Chmod it
+        os.Chmod(origFile, mode)
+    }
 
-	return err, origFile
+    return err, origFile
 }
 
 // Rewrite the contents of the file with the new contents
 func rewriteFile(path string, contents []byte, mode fs.FileMode) (error, string) {
 
-	var err error
+    var err error
 
-	// Overwrite it
-	err = os.WriteFile(path, contents, 0644)
+    // Overwrite it
+    err = os.WriteFile(path, contents, 0644)
 
-	if err == nil {
-		// Chmod it
-		os.Chmod(path, mode)
-	}
+    if err == nil {
+        // Chmod it
+        os.Chmod(path, mode)
+    }
 
-	return err, path
+    return err, path
 }
 
 // Get color codes for console colors
 func getColor(code string) string {
 
-	colors := map[string]string{
-		"black":   "\x1b[30m",
-		"blue":    "\x1B[34m",
-		"red":     "\x1B[31m",
-		"green":   "\x1B[32m",
-		"yellow":  "\x1B[33m",
-		"magenta": "\x1B[35m",
-		"cyan":    "\x1B[36m",
-		"white":   "\x1B[37m",
-
-		// From https://gist.github.com/abritinthebay/d80eb99b2726c83feb0d97eab95206c4
-		// esoteric options
-		"bright":     "\x1b[1m",
-		"dim":        "\x1b[2m",
-		"underscore": "\x1b[4m",
-		"blink":      "\x1b[5m",
-		"reverse":    "\x1b[7m",
-		"hidden":     "\x1b[8m",
-
-		// background color options
-		"bgblack":   "\x1b[40m",
-		"bgred":     "\x1b[41m",
-		"bggreen":   "\x1b[42m",
-		"bgyellow":  "\x1b[43m",
-		"bgblue":    "\x1b[44m",
-		"bgmagenta": "\x1b[45m",
-		"bgcyan":    "\x1b[46m",
-		"bgwhite":   "\x1b[47m",
-
-		// reset color code
-		"reset":   "\x1B[0m",
-		"default": "\x1B[0m",
-	}
-
-	if color, ok := colors[code]; ok {
-		return color
-	} else {
-		return colors["default"]
-	}
+    colors := map[string]string{
+        "black":   "\x1b[30m",
+        "blue":    "\x1B[34m",
+        "red":     "\x1B[31m",
+        "green":   "\x1B[32m",
+        "yellow":  "\x1B[33m",
+        "magenta": "\x1B[35m",
+        "cyan":    "\x1B[36m",
+        "white":   "\x1B[37m",
+
+        // From https://gist.github.com/abritinthebay/d80eb99b2726c83feb0d97eab95206c4
+        // esoteric options
+        "bright":     "\x1b[1m",
+        "dim":        "\x1b[2m",
+        "underscore": "\x1b[4m",
+        "blink":      "\x1b[5m",
+        "reverse":    "\x1b[7m",
+        "hidden":     "\x1b[8m",
+
+        // background color options
+        "bgblack":   "\x1b[40m",
+        "bgred":     "\x1b[41m",
+        "bggreen":   "\x1b[42m",
+        "bgyellow":  "\x1b[43m",
+        "bgblue":    "\x1b[44m",
+        "bgmagenta": "\x1b[45m",
+        "bgcyan":    "\x1b[46m",
+        "bgwhite":   "\x1b[47m",
+
+        // reset color code
+        "reset":   "\x1B[0m",
+        "default": "\x1B[0m",
+    }
+
+    if color, ok := colors[code]; ok {
+        return color
+    } else {
+        return colors["default"]
+    }
 
 }
 
 // Print the delimiter line for listings
 func printDelim(delimChar string, color string) {
 
-	var delims []string
+    var delims []string
 
-	if color == "underscore" {
-		// Override delimieter to space
-		delimChar = " "
-	}
+    if color == "underscore" {
+        // Override delimieter to space
+        delimChar = " "
+    }
 
-	if len(delimChar) > 1 {
-		// slice it - take only the first
-		delimChar = string(delimChar[0])
-	}
-	for i := 0; i < DELIMSIZE; i++ {
-		delims = append(delims, delimChar)
-	}
+    if len(delimChar) > 1 {
+        // slice it - take only the first
+        delimChar = string(delimChar[0])
+    }
+    for i := 0; i < DELIMSIZE; i++ {
+        delims = append(delims, delimChar)
+    }
 
-	fmt.Println(strings.Join(delims, ""))
+    fmt.Println(strings.Join(delims, ""))
 }
 
-// Print an entry to the console
-func printEntry(entry *Entry, delim bool) error {
-
-	var err error
-	var settings *Settings
-	var customEntries []ExtendedEntry
-
-	err, settings = getOrCreateLocalConfig(APP)
-
-	if err != nil {
-		fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
-		return err
-	}
-
-	fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
-	if strings.HasPrefix(settings.BgColor, "bg") {
-		fmt.Printf("%s", getColor(strings.ToLower(settings.BgColor)))
-	}
-
-	if delim {
-		printDelim(settings.Delim, settings.Color)
-	}
+// Print a card entry to the console
+func printCardEntry(entry *Entry, settings* Settings, delim bool) error {
+
+    var customEntries []ExtendedEntry
+
+    fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
+    if strings.HasPrefix(settings.BgColor, "bg") {
+        fmt.Printf("%s", getColor(strings.ToLower(settings.BgColor)))
+    }
+
+    if delim {
+        printDelim(settings.Delim, settings.Color)
+    }
+
+    fmt.Printf("ID: %d\n", entry.ID)
+    fmt.Printf("Card Name: %s\n", entry.Title)
+    fmt.Printf("Card Holder: %s\n", entry.User)
+    fmt.Printf("Card Number: %s\n", entry.Url)
+    fmt.Printf("Card Type: %s\n", entry.Class)  
+
+    if entry.Issuer != "" {
+        fmt.Printf("Issuing Bank: %s\n", entry.Issuer)
+    }
+
+    fmt.Println()
+    
+    fmt.Printf("Expiry Date: %s\n", entry.ExpiryDate)    
+
+    if settings.ShowPasswords || settingsRider.ShowPasswords {
+        fmt.Printf("Card CVV: %s\n", entry.Password)
+        fmt.Printf("Card PIN: %s\n", entry.Pin)        
+    } else {
+        var asterisks1 []string
+        var asterisks2 []string     
+        var i int
+        
+        for i = 0; i < len(entry.Password); i++ {
+            asterisks1 = append(asterisks1, "*")
+        }
+        fmt.Printf("Card CVV: %s\n", strings.Join(asterisks1, ""))
+
+        for i = 0; i < len(entry.Pin); i++ {
+            asterisks2 = append(asterisks2, "*")
+        }
+        fmt.Printf("Card PIN: %s\n", strings.Join(asterisks2, ""))      
+    }
+
+    if len(entry.Tags) > 0 {
+        fmt.Printf("\nTags: %s\n", entry.Tags)
+    }
+    if len(entry.Notes) > 0 {
+        fmt.Printf("Notes: %s\n", entry.Notes)
+    }
+    // Query extended entries
+    customEntries = getExtendedEntries(entry)
+
+    if len(customEntries) > 0 {
+        for _, customEntry := range customEntries {
+            fmt.Printf("%s: %s\n", customEntry.FieldName, customEntry.FieldValue)
+        }
+    }
+
+    fmt.Printf("Modified: %s\n", entry.Timestamp.Format("2006-06-02 15:04:05"))
+
+    printDelim(settings.Delim, settings.Color)
+
+    // Reset
+    fmt.Printf("%s", getColor("default"))
+
+    return nil
 
-	fmt.Printf("ID: %d\n", entry.ID)
-	fmt.Printf("Title: %s\n", entry.Title)
-	fmt.Printf("User: %s\n", entry.User)
-	fmt.Printf("URL: %s\n", entry.Url)
-
-	if settings.ShowPasswords || settingsRider.ShowPasswords {
-		fmt.Printf("Password: %s\n", entry.Password)
-	} else {
-		var asterisks []string
-
-		for i := 0; i < len(entry.Password); i++ {
-			asterisks = append(asterisks, "*")
-		}
-		fmt.Printf("Password: %s\n", strings.Join(asterisks, ""))
-	}
-
-	if len(entry.Tags) > 0 {
-		fmt.Printf("Tags: %s\n", entry.Tags)
-	}
-	if len(entry.Notes) > 0 {
-		fmt.Printf("Notes: %s\n", entry.Notes)
-	}
-	// Query extended entries
-	customEntries = getExtendedEntries(entry)
-
-	if len(customEntries) > 0 {
-		for _, customEntry := range customEntries {
-			fmt.Printf("%s: %s\n", customEntry.FieldName, customEntry.FieldValue)
-		}
-	}
-
-	fmt.Printf("Modified: %s\n", entry.Timestamp.Format("2006-06-02 15:04:05"))
-
-	printDelim(settings.Delim, settings.Color)
+}
 
-	// Reset
-	fmt.Printf("%s", getColor("default"))
+// Print an entry to the console
+func printEntry(entry *Entry, delim bool) error {
 
-	return nil
+    var err error
+    var settings *Settings
+    var customEntries []ExtendedEntry
+
+    err, settings = getOrCreateLocalConfig(APP)
+
+    if err != nil {
+        fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
+        return err
+    }
+
+    if entry.Type == "card" {
+        return printCardEntry(entry, settings, delim)
+    }
+    
+    fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
+    if strings.HasPrefix(settings.BgColor, "bg") {
+        fmt.Printf("%s", getColor(strings.ToLower(settings.BgColor)))
+    }
+
+    if delim {
+        printDelim(settings.Delim, settings.Color)
+    }
+
+    fmt.Printf("ID: %d\n", entry.ID)
+    fmt.Printf("Title: %s\n", entry.Title)
+    fmt.Printf("User: %s\n", entry.User)
+    fmt.Printf("URL: %s\n", entry.Url)
+
+    if settings.ShowPasswords || settingsRider.ShowPasswords {
+        fmt.Printf("Password: %s\n", entry.Password)
+    } else {
+        var asterisks []string
+
+        for i := 0; i < len(entry.Password); i++ {
+            asterisks = append(asterisks, "*")
+        }
+        fmt.Printf("Password: %s\n", strings.Join(asterisks, ""))
+    }
+
+    if len(entry.Tags) > 0 {
+        fmt.Printf("Tags: %s\n", entry.Tags)
+    }
+    if len(entry.Notes) > 0 {
+        fmt.Printf("Notes: %s\n", entry.Notes)
+    }
+    // Query extended entries
+    customEntries = getExtendedEntries(entry)
+
+    if len(customEntries) > 0 {
+        for _, customEntry := range customEntries {
+            fmt.Printf("%s: %s\n", customEntry.FieldName, customEntry.FieldValue)
+        }
+    }
+
+    fmt.Printf("Modified: %s\n", entry.Timestamp.Format("2006-06-02 15:04:05"))
+
+    printDelim(settings.Delim, settings.Color)
+
+    // Reset
+    fmt.Printf("%s", getColor("default"))
+
+    return nil
 
 }
 
 // Print an entry to the console with minimal data
 func printEntryMinimal(entry *Entry, delim bool) error {
 
-	var err error
-	var settings *Settings
+    var err error
+    var settings *Settings
 
-	err, settings = getOrCreateLocalConfig(APP)
+    err, settings = getOrCreateLocalConfig(APP)
 
-	if err != nil {
-		fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
-		return err
-	}
+    if err != nil {
+        fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
+        return err
+    }
 
-	fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
-	if strings.HasPrefix(settings.BgColor, "bg") {
-		fmt.Printf("%s", getColor(strings.ToLower(settings.BgColor)))
-	}
+    fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
+    if strings.HasPrefix(settings.BgColor, "bg") {
+        fmt.Printf("%s", getColor(strings.ToLower(settings.BgColor)))
+    }
 
-	if delim {
-		printDelim(settings.Delim, settings.Color)
-	}
+    if delim {
+        printDelim(settings.Delim, settings.Color)
+    }
 
-	fmt.Printf("Title: %s\n", entry.Title)
-	fmt.Printf("User: %s\n", entry.User)
-	fmt.Printf("URL: %s\n", entry.Url)
-	fmt.Printf("Modified: %s\n", entry.Timestamp.Format("2006-06-02 15:04:05"))
+    fmt.Printf("Title: %s\n", entry.Title)
+    fmt.Printf("User: %s\n", entry.User)
+    fmt.Printf("URL: %s\n", entry.Url)
+    fmt.Printf("Modified: %s\n", entry.Timestamp.Format("2006-06-02 15:04:05"))
 
-	printDelim(settings.Delim, settings.Color)
+    printDelim(settings.Delim, settings.Color)
 
-	// Reset
-	fmt.Printf("%s", getColor("default"))
+    // Reset
+    fmt.Printf("%s", getColor("default"))
 
-	return nil
+    return nil
 
 }
 
 // Read user input and return entered value
 func readInput(reader *bufio.Reader, prompt string) string {
 
-	var input string
-	fmt.Printf(prompt + ": ")
-	input, _ = reader.ReadString('\n')
+    var input string
+    fmt.Printf(prompt + ": ")
+    input, _ = reader.ReadString('\n')
 
-	return strings.TrimSpace(input)
+    return strings.TrimSpace(input)
 }
 
 // Check for an active, decrypted database
 func checkActiveDatabase() error {
 
-	if !hasActiveDatabase() {
-		fmt.Printf("No decrypted active database found.\n")
-		return errors.New("no active database")
-	}
+    if !hasActiveDatabase() {
+        fmt.Printf("No decrypted active database found.\n")
+        return errors.New("no active database")
+    }
 
-	return nil
+    return nil
 }
 
 // Return true if active database is encrypted
 func isActiveDatabaseEncrypted() bool {
 
-	err, settings := getOrCreateLocalConfig(APP)
-	if err == nil && settings.ActiveDB != "" {
-		if _, err := os.Stat(settings.ActiveDB); err == nil {
-			if _, flag := isFileEncrypted(settings.ActiveDB); flag {
-				return true
-			}
-		}
-	}
+    err, settings := getOrCreateLocalConfig(APP)
+    if err == nil && settings.ActiveDB != "" {
+        if _, err := os.Stat(settings.ActiveDB); err == nil {
+            if _, flag := isFileEncrypted(settings.ActiveDB); flag {
+                return true
+            }
+        }
+    }
 
-	return false
+    return false
 }
 
 // Return true if always encrypt is on
 func isEncryptOn() bool {
 
-	_, settings := getOrCreateLocalConfig(APP)
-	return settings.KeepEncrypted
+    _, settings := getOrCreateLocalConfig(APP)
+    return settings.KeepEncrypted
 }
 
 // Combination of above 2 logic plus auto encryption on (a play on CryptOn)
 func isActiveDatabaseEncryptedAndMaxKryptOn() (bool, string) {
 
-	err, settings := getOrCreateLocalConfig(APP)
-	if err == nil && settings.ActiveDB != "" {
-		if _, err := os.Stat(settings.ActiveDB); err == nil {
-			if _, flag := isFileEncrypted(settings.ActiveDB); flag && settings.KeepEncrypted && settings.AutoEncrypt {
-				return true, settings.ActiveDB
-			}
-		}
-	}
+    err, settings := getOrCreateLocalConfig(APP)
+    if err == nil && settings.ActiveDB != "" {
+        if _, err := os.Stat(settings.ActiveDB); err == nil {
+            if _, flag := isFileEncrypted(settings.ActiveDB); flag && settings.KeepEncrypted && settings.AutoEncrypt {
+                return true, settings.ActiveDB
+            }
+        }
+    }
 
-	return false, ""
+    return false, ""
 }
 
 // (Temporarily) enable showing of passwords
 func setShowPasswords() error {
-	//  fmt.Printf("Setting show passwords to true\n")
-	settingsRider.ShowPasswords = true
-	return nil
+    //  fmt.Printf("Setting show passwords to true\n")
+    settingsRider.ShowPasswords = true
+    return nil
 }
 
 // Copy the password to clipboard - only for single listings or single search results
 func setCopyPasswordToClipboard() error {
-	settingsRider.CopyPassword = true
-	return nil
+    settingsRider.CopyPassword = true
+    return nil
 }
 
 func setAssumeYes() error {
-	settingsRider.AssumeYes = true
-	return nil
+    settingsRider.AssumeYes = true
+    return nil
+}
+
+func setType(_type string) {
+    settingsRider.Type = _type
 }
 
 func copyPasswordToClipboard(passwd string) {
-	clipboard.WriteAll(passwd)
+    clipboard.WriteAll(passwd)
 }
 
 // Generate a random file name
 func randomFileName(folder string, suffix string) string {
 
-	_, name := generateRandomBytes(16)
-	return filepath.Join(folder, hex.EncodeToString(name)+suffix)
+    _, name := generateRandomBytes(16)
+    return filepath.Join(folder, hex.EncodeToString(name)+suffix)
+}
+
+// Detect card type from card number
+func detectCardType(cardNum string) (string, error) {
+
+    var cardTypeIndex creditcard.CardType
+    var err error
+    
+    card := creditcard.Card{
+        Type: "N/A",
+        Number: cardNum,
+        ExpiryMonth: 12,
+        ExpiryYear: 99,
+        CVV: "999",
+    }
+
+    cardTypeIndex, err = card.DetermineCardType()
+    if err != nil {
+        return "", err
+    }
+
+    return creditcard.CardTypeNames[cardTypeIndex], nil
+}
+
+// Validate CVV
+func validateCvv(cardCvv string, cardClass string) bool {
+
+    var matched bool
+    
+    // Amex CVV is 4 digits, rest are 3
+    if cardClass == "American Express" {
+        if matched, _ = regexp.Match(`^\d{4}$`, []byte(cardCvv)); matched {
+            return matched
+        }
+    } else {
+        if matched, _ = regexp.Match(`^\d{3}$`, []byte(cardCvv)); matched {
+            return matched
+        }
+    }
+
+    return false
+}
+
+func validateCardPin(cardPin string) bool {
+
+    // A PIN is 4 digits or more
+    if matched, _ := regexp.Match(`^\d{4,}$`, []byte(cardPin)); matched {
+        return matched
+    }   
+
+    return false
+}
+
+// Verify if the expiry date is in the form mm/dd
+func checkValidExpiry(expiryDate string) bool {
+    
+    pieces := strings.Split(expiryDate, "/")
+    
+    if len(pieces) == 2 {
+        // Sofar, so good
+        var month int
+        var year int
+        var err error
+
+        month, err = strconv.Atoi(pieces[0])
+        if err != nil {
+            fmt.Printf("Error parsing month: %s: \"%s\"\n", month, err.Error())
+            return false
+        }
+        year, err = strconv.Atoi(pieces[1])
+        if err != nil {
+            fmt.Printf("Error parsing year: %s: \"%s\"\n", year, err.Error())
+            return false
+        }       
+
+        // Month should be in range 1 -> 12
+        if month < 1 || month > 12 {
+            fmt.Printf("Error: invalid value for month - %d!\n", month)
+            return false            
+        }
+        // Year should be >= current year
+        currYear, _ := strconv.Atoi(strconv.Itoa(time.Now().Year())[2:])
+        if year < currYear {
+            fmt.Printf("Error: year should be >= %d\n", currYear)
+            return false            
+        }           
+        
+        return true
+    } else {
+        fmt.Println("Error: invalid input")
+        return false
+    }
+    
 }

From 96d816feb24163a1e8f9d9ecb9d90ff85dc04f05 Mon Sep 17 00:00:00 2001
From: Anand Balachandran Pillai <a.pillai@drishti.com>
Date: Mon, 15 Aug 2022 00:53:39 +0530
Subject: [PATCH 56/58] ref issue 28 - pretty print card numbers

---
 actions.go |  3 +--
 utils.go   | 23 ++++++++++++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/actions.go b/actions.go
index f149966..6f75697 100644
--- a/actions.go
+++ b/actions.go
@@ -274,8 +274,7 @@ func addNewCardEntry() error {
     err, cardPin = readPassword()
 
     if !validateCardPin(cardPin) {
-        fmt.Printf("\nError - Invalid PIN")
-        return errors.New("Error - Invalid PIN")
+        fmt.Printf("\n<Warning - Empty PIN!>")
     }
 
     cardIssuer = readInput(reader, "\nIssuing Bank")
diff --git a/utils.go b/utils.go
index 7adca13..9e4069a 100644
--- a/utils.go
+++ b/utils.go
@@ -300,6 +300,27 @@ func printDelim(delimChar string, color string) {
     fmt.Println(strings.Join(delims, ""))
 }
 
+// Prettify credit/debit card numbers
+func prettifyCardNumber(cardNumber string) string {
+
+    // Amex cards are 15 digits - group as 4, 6, 5
+    // Any 16 digits - group as 4/4/4/4
+    var numbers []string
+
+    if len(cardNumber) == 15 {
+        numbers = append(numbers, cardNumber[0:4])
+        numbers = append(numbers, cardNumber[4:10])
+        numbers = append(numbers, cardNumber[10:15])     
+    } else if len(cardNumber) == 16 {
+        numbers = append(numbers, cardNumber[0:4])
+        numbers = append(numbers, cardNumber[4:8])
+        numbers = append(numbers, cardNumber[8:12])
+        numbers = append(numbers, cardNumber[12:16])             
+    }
+
+    return strings.Join(numbers, " ")
+}
+
 // Print a card entry to the console
 func printCardEntry(entry *Entry, settings* Settings, delim bool) error {
 
@@ -317,7 +338,7 @@ func printCardEntry(entry *Entry, settings* Settings, delim bool) error {
     fmt.Printf("ID: %d\n", entry.ID)
     fmt.Printf("Card Name: %s\n", entry.Title)
     fmt.Printf("Card Holder: %s\n", entry.User)
-    fmt.Printf("Card Number: %s\n", entry.Url)
+    fmt.Printf("Card Number: %s\n", prettifyCardNumber(entry.Url))
     fmt.Printf("Card Type: %s\n", entry.Class)  
 
     if entry.Issuer != "" {

From 43e7a3281ba1a68a4056a738e1bf96f1732541d2 Mon Sep 17 00:00:00 2001
From: Anand <anandpillai@letterboxes.org>
Date: Sat, 19 Aug 2023 22:33:04 +0530
Subject: [PATCH 57/58] edit card entries correctly, print type of entry

---
 actions.go      | 1903 ++++++++++++++++++++---------------------------
 db.go           | 1031 +++++++++++++------------
 export.go       |  383 ++++++++++
 main.go         |  408 +++++-----
 test/testpgp.go |   27 +-
 utils.go        |  924 +++++++++++------------
 6 files changed, 2401 insertions(+), 2275 deletions(-)
 create mode 100644 export.go

diff --git a/actions.go b/actions.go
index 6f75697..7b024b4 100644
--- a/actions.go
+++ b/actions.go
@@ -2,1298 +2,989 @@
 package main
 
 import (
-    "bufio"
-    "encoding/csv"
-    "errors"
-    "fmt"
-    "gorm.io/gorm"
-    "os"
-    "os/exec"
-    "os/signal"
-    "path/filepath"
-    "strconv"
-    "strings"
-    "syscall"
+	"bufio"
+	"errors"
+	"fmt"
+	"gorm.io/gorm"
+	"os"
+	"os/signal"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"syscall"
 )
 
 type CustomEntry struct {
-    fieldName  string
-    fieldValue string
+	fieldName  string
+	fieldValue string
 }
 
 // Wrappers (closures) for functions accepting strings as input for in/out encryption
 func WrapperMaxKryptStringFunc(fn actionFunc) actionFunc {
 
-    return func(inputStr string) error {
-        var maxKrypt bool
-        var defaultDB string
-        var encPasswd string
-        var err error
+	return func(inputStr string) error {
+		var maxKrypt bool
+		var defaultDB string
+		var encPasswd string
+		var err error
 
-        maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
+		maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
 
-        // If max krypt on - then autodecrypt on call and auto encrypt after call
-        if maxKrypt {
-            err, encPasswd = decryptDatabase(defaultDB)
-            if err != nil {
-                return err
-            }
+		// If max krypt on - then autodecrypt on call and auto encrypt after call
+		if maxKrypt {
+			err, encPasswd = decryptDatabase(defaultDB)
+			if err != nil {
+				return err
+			}
 
-            sigChan := make(chan os.Signal, 1)
-            signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
+			sigChan := make(chan os.Signal, 1)
+			signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
 
-            go func() {
-                sig := <-sigChan
-                fmt.Println("Received signal", sig)
-                // Reencrypt
-                encryptDatabase(defaultDB, &encPasswd)
-                os.Exit(1)
-            }()
-        }
+			go func() {
+				sig := <-sigChan
+				fmt.Println("Received signal", sig)
+				// Reencrypt
+				encryptDatabase(defaultDB, &encPasswd)
+				os.Exit(1)
+			}()
+		}
 
-        err = fn(inputStr)
+		err = fn(inputStr)
 
-        // If max krypt on - then autodecrypt on call and auto encrypt after call
-        if maxKrypt {
-            encryptDatabase(defaultDB, &encPasswd)
-        }
+		// If max krypt on - then autodecrypt on call and auto encrypt after call
+		if maxKrypt {
+			encryptDatabase(defaultDB, &encPasswd)
+		}
 
-        return err
-    }
+		return err
+	}
 
 }
 
 // Wrappers (closures) for functions accepting no input for in/out encryption
 func WrapperMaxKryptVoidFunc(fn voidFunc) voidFunc {
 
-    return func() error {
-        var maxKrypt bool
-        var defaultDB string
-        var encPasswd string
-        var err error
+	return func() error {
+		var maxKrypt bool
+		var defaultDB string
+		var encPasswd string
+		var err error
 
-        maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
+		maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
 
-        // If max krypt on - then autodecrypt on call and auto encrypt after call
-        if maxKrypt {
-            err, encPasswd = decryptDatabase(defaultDB)
-            if err != nil {
-                return err
-            }
+		// If max krypt on - then autodecrypt on call and auto encrypt after call
+		if maxKrypt {
+			err, encPasswd = decryptDatabase(defaultDB)
+			if err != nil {
+				return err
+			}
 
-            sigChan := make(chan os.Signal, 1)
-            signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
+			sigChan := make(chan os.Signal, 1)
+			signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
 
-            go func() {
-                sig := <-sigChan
-                fmt.Println("Received signal", sig)
-                // Reencrypt
-                encryptDatabase(defaultDB, &encPasswd)
-                os.Exit(1)
-            }()
-        }
+			go func() {
+				sig := <-sigChan
+				fmt.Println("Received signal", sig)
+				// Reencrypt
+				encryptDatabase(defaultDB, &encPasswd)
+				os.Exit(1)
+			}()
+		}
 
-        err = fn()
+		err = fn()
 
-        // If max krypt on - then autodecrypt on call and auto encrypt after call
-        if maxKrypt {
-            encryptDatabase(defaultDB, &encPasswd)
-        }
+		// If max krypt on - then autodecrypt on call and auto encrypt after call
+		if maxKrypt {
+			encryptDatabase(defaultDB, &encPasswd)
+		}
 
-        return err
-    }
+		return err
+	}
 
 }
 
 // Print the current active database path
 func showActiveDatabasePath() error {
 
-    err, settings := getOrCreateLocalConfig(APP)
-
-    if err != nil {
-        fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
-        return err
-    }
-
-    if settings != nil {
-        if settings.ActiveDB != "" {
-            fmt.Printf("%s\n", settings.ActiveDB)
-        } else {
-            fmt.Println("No active database")
-        }
-        return nil
-    } else {
-        fmt.Printf("Error - null config\n")
-        return errors.New("null config")
-    }
+	err, settings := getOrCreateLocalConfig(APP)
+
+	if err != nil {
+		fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
+		return err
+	}
+
+	if settings != nil {
+		if settings.ActiveDB != "" {
+			fmt.Printf("%s\n", settings.ActiveDB)
+		} else {
+			fmt.Println("No active database")
+		}
+		return nil
+	} else {
+		fmt.Printf("Error - null config\n")
+		return errors.New("null config")
+	}
 }
 
 // Set the current active database path
 func setActiveDatabasePath(dbPath string) error {
 
-    var fullPath string
-    var activeEncrypted bool
-    var newEncrypted bool
-
-    err, settings := getOrCreateLocalConfig(APP)
-
-    if err != nil {
-        fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
-        return err
-    }
-
-    if settings != nil {
-        var flag bool
-
-        if _, err = os.Stat(dbPath); os.IsNotExist(err) {
-            fmt.Printf("Error - path %s does not exist\n", dbPath)
-            return err
-        }
-
-        fullPath, _ = filepath.Abs(dbPath)
-
-        if fullPath == settings.ActiveDB {
-            fmt.Printf("Current database is \"%s\" - nothing to do\n", fullPath)
-            return nil
-        }
-
-        if _, flag = isFileEncrypted(settings.ActiveDB); flag {
-            activeEncrypted = true
-        }
-
-        if _, flag = isFileEncrypted(fullPath); flag {
-            newEncrypted = true
-        }
-
-        // If autoencrypt is true - encrypt current DB automatically
-        if settings.AutoEncrypt {
-            if !activeEncrypted {
-                fmt.Printf("Encrypting current active database - %s\n", settings.ActiveDB)
-                err = encryptActiveDatabase()
-                if err == nil {
-                    activeEncrypted = true
-                }
-            }
-
-            if newEncrypted {
-                if !settings.AutoEncrypt {
-                    // Decrypt new database if it is encrypted
-                    fmt.Printf("Database %s is encrypted, decrypting it\n", fullPath)
-                    err, _ = decryptDatabase(fullPath)
-                    if err != nil {
-                        fmt.Printf("Decryption Error - \"%s\", not switching databases\n", err.Error())
-                        return err
-                    } else {
-                        newEncrypted = false
-                    }
-                } else {
-                    // New database is encrypted and autoencrypt is set - so keep it like that
-                    // fmt.Printf("Database %s is already encrypted, nothing to do\n", fullPath)
-                }
-            }
-        }
-
-        if !activeEncrypted {
-            // Use should manually encrypt before switching
-            fmt.Println("Auto-encrypt disabled, encrypt existing database before switching to new.")
-            return nil
-        }
-
-        if newEncrypted && !settings.AutoEncrypt {
-            // Use should manually decrypt before switching
-            fmt.Println("Auto-encrypt disabled, decrypt new database manually before switching.")
-            return nil
-        }
-
-        settings.ActiveDB = fullPath
-        err = updateSettings(settings, settings.ConfigPath)
-        if err == nil {
-            fmt.Println("Switched active database successfully.")
-        } else {
-            fmt.Printf("Error updating settings - \"%s\"\n", err.Error())
-        }
-
-        return err
-
-    } else {
-        fmt.Printf("Error - null config\n")
-        return errors.New("null config")
-    }
+	var fullPath string
+	var activeEncrypted bool
+	var newEncrypted bool
+
+	err, settings := getOrCreateLocalConfig(APP)
+
+	if err != nil {
+		fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
+		return err
+	}
+
+	if settings != nil {
+		var flag bool
+
+		if _, err = os.Stat(dbPath); os.IsNotExist(err) {
+			fmt.Printf("Error - path %s does not exist\n", dbPath)
+			return err
+		}
+
+		fullPath, _ = filepath.Abs(dbPath)
+
+		if fullPath == settings.ActiveDB {
+			fmt.Printf("Current database is \"%s\" - nothing to do\n", fullPath)
+			return nil
+		}
+
+		if _, flag = isFileEncrypted(settings.ActiveDB); flag {
+			activeEncrypted = true
+		}
+
+		if _, flag = isFileEncrypted(fullPath); flag {
+			newEncrypted = true
+		}
+
+		// If autoencrypt is true - encrypt current DB automatically
+		if settings.AutoEncrypt {
+			if !activeEncrypted {
+				fmt.Printf("Encrypting current active database - %s\n", settings.ActiveDB)
+				err = encryptActiveDatabase()
+				if err == nil {
+					activeEncrypted = true
+				}
+			}
+
+			if newEncrypted {
+				if !settings.AutoEncrypt {
+					// Decrypt new database if it is encrypted
+					fmt.Printf("Database %s is encrypted, decrypting it\n", fullPath)
+					err, _ = decryptDatabase(fullPath)
+					if err != nil {
+						fmt.Printf("Decryption Error - \"%s\", not switching databases\n", err.Error())
+						return err
+					} else {
+						newEncrypted = false
+					}
+				} else {
+					// New database is encrypted and autoencrypt is set - so keep it like that
+					// fmt.Printf("Database %s is already encrypted, nothing to do\n", fullPath)
+				}
+			}
+		}
+
+		if !activeEncrypted {
+			// Use should manually encrypt before switching
+			fmt.Println("Auto-encrypt disabled, encrypt existing database before switching to new.")
+			return nil
+		}
+
+		if newEncrypted && !settings.AutoEncrypt {
+			// Use should manually decrypt before switching
+			fmt.Println("Auto-encrypt disabled, decrypt new database manually before switching.")
+			return nil
+		}
+
+		settings.ActiveDB = fullPath
+		err = updateSettings(settings, settings.ConfigPath)
+		if err == nil {
+			fmt.Println("Switched active database successfully.")
+		} else {
+			fmt.Printf("Error updating settings - \"%s\"\n", err.Error())
+		}
+
+		return err
+
+	} else {
+		fmt.Printf("Error - null config\n")
+		return errors.New("null config")
+	}
 }
 
-
 // Text menu driven function to add a new entry for a card type
 func addNewCardEntry() error {
 
-    var cardHolder string
-    var cardName string
-    var cardNumber string
-    var cardCvv string
-    var cardPin string
-    var cardIssuer string
-    var cardClass string
-    var cardExpiry string
-    
-    var notes string
-    var tags string
-    var err error
-    var customEntries []CustomEntry
-
-    if err = checkActiveDatabase(); err != nil {
-        return err
-    }
-
-    reader := bufio.NewReader(os.Stdin)
-    cardNumber = readInput(reader, "Card Number")  
-    cardClass, err = detectCardType(cardNumber)
-
-    if err != nil {
-        fmt.Printf("Error - %s\n", err.Error())
-        return err
-    } else {
-        fmt.Printf("<Card type is %s>\n", cardClass)
-    }
-
-    cardHolder = readInput(reader, "Name on the Card")
-    cardExpiry = readInput(reader, "Expiry Date as mm/dd")
-
-    // expiry has to be in the form of <month>/<year>
-    if !checkValidExpiry(cardExpiry) {
-        return errors.New("Invalid Expiry Date")
-    }
-
-    fmt.Printf("CVV: ") 
-    err, cardCvv = readPassword()    
-    
-    if !validateCvv(cardCvv, cardClass) {
-        fmt.Printf("\nError - Invalid CVV for %s\n", cardClass)
-        return errors.New(fmt.Sprintf("Error - Invalid CVV for %s\n", cardClass))
-    }
-        
-    fmt.Printf("\nCard PIN: ")
-    err, cardPin = readPassword()
-
-    if !validateCardPin(cardPin) {
-        fmt.Printf("\n<Warning - Empty PIN!>")
-    }
-
-    cardIssuer = readInput(reader, "\nIssuing Bank")
-    cardName = readInput(reader, "A name for this Card")    
-    // Name cant be blank
-    if len(cardName) == 0 {
-        fmt.Printf("Error - name cant be blank")
-        return errors.New("Empty card name")
-    }
-
-    tags = readInput(reader, "\nTags (separated by space): ")
-    notes = readInput(reader, "Notes")
-
-    customEntries = addCustomFields(reader)
-
-    err = addNewDatabaseCardEntry(cardName, cardNumber, cardHolder, cardIssuer,
-        cardClass, cardCvv, cardPin, cardExpiry, notes, tags, customEntries)
-
-    if err != nil {
-        fmt.Printf("Error adding entry - \"%s\"\n", err.Error())
-    }
-    
-    return err
+	var cardHolder string
+	var cardName string
+	var cardNumber string
+	var cardCvv string
+	var cardPin string
+	var cardIssuer string
+	var cardClass string
+	var cardExpiry string
+
+	var notes string
+	var tags string
+	var err error
+	var customEntries []CustomEntry
+
+	if err = checkActiveDatabase(); err != nil {
+		return err
+	}
+
+	reader := bufio.NewReader(os.Stdin)
+	cardNumber = readInput(reader, "Card Number")
+	cardClass, err = detectCardType(cardNumber)
+
+	if err != nil {
+		fmt.Printf("Error - %s\n", err.Error())
+		return err
+	} else {
+		fmt.Printf("<Card type is %s>\n", cardClass)
+	}
+
+	cardHolder = readInput(reader, "Name on the Card")
+	cardExpiry = readInput(reader, "Expiry Date as mm/dd")
+
+	// expiry has to be in the form of <month>/<year>
+	if !checkValidExpiry(cardExpiry) {
+		return errors.New("Invalid Expiry Date")
+	}
+
+	fmt.Printf("CVV: ")
+	err, cardCvv = readPassword()
+
+	if !validateCvv(cardCvv, cardClass) {
+		fmt.Printf("\nError - Invalid CVV for %s\n", cardClass)
+		return errors.New(fmt.Sprintf("Error - Invalid CVV for %s\n", cardClass))
+	}
+
+	fmt.Printf("\nCard PIN: ")
+	err, cardPin = readPassword()
+
+	if !validateCardPin(cardPin) {
+		fmt.Printf("\n<Warning - Empty PIN!>")
+	}
+
+	cardIssuer = readInput(reader, "\nIssuing Bank")
+	cardName = readInput(reader, "A name for this Card")
+	// Name cant be blank
+	if len(cardName) == 0 {
+		fmt.Printf("Error - name cant be blank")
+		return errors.New("Empty card name")
+	}
+
+	tags = readInput(reader, "\nTags (separated by space): ")
+	notes = readInput(reader, "Notes")
+
+	customEntries = addCustomFields(reader)
+
+	err = addNewDatabaseCardEntry(cardName, cardNumber, cardHolder, cardIssuer,
+		cardClass, cardCvv, cardPin, cardExpiry, notes, tags, customEntries)
+
+	if err != nil {
+		fmt.Printf("Error adding entry - \"%s\"\n", err.Error())
+	}
+
+	return err
 }
 
-
 // Text menu driven function to add a new entry
 func addNewEntry() error {
 
-    var userName string
-    var title string
-    var url string
-    var notes string
-    var passwd string
-    var tags string
-    var err error
-    var customEntries []CustomEntry
-
-    if err = checkActiveDatabase(); err != nil {
-        return err
-    }
-
-    if settingsRider.Type == "card" {
-        return addNewCardEntry()
-    }
-    
-    reader := bufio.NewReader(os.Stdin)
-    title = readInput(reader, "Title")
-    url = readInput(reader, "URL")
-    if len(url) > 0 && !strings.HasPrefix(strings.ToLower(url), "http://") && !strings.HasPrefix(strings.ToLower(url), "https://") {
-        url = "http://" + url
-    }
-
-    userName = readInput(reader, "Username")
-
-    fmt.Printf("Password (enter to generate new): ")
-    err, passwd = readPassword()
-
-    if len(passwd) == 0 {
-        fmt.Printf("\nGenerating password ...")
-        err, passwd = generateStrongPassword()
-        fmt.Printf("done")
-    }
-    //  fmt.Printf("Password => %s\n", passwd)
-
-    tags = readInput(reader, "\nTags (separated by space): ")
-    notes = readInput(reader, "Notes")
-
-    // Title and username/password are mandatory
-    if len(title) == 0 {
-        fmt.Printf("Error - valid Title required\n")
-        return errors.New("invalid input")
-    }
-    if len(userName) == 0 {
-        fmt.Printf("Error - valid Username required\n")
-        return errors.New("invalid input")
-    }
-    if len(passwd) == 0 {
-        fmt.Printf("Error - valid Password required\n")
-        return errors.New("invalid input")
-    }
-
-    customEntries = addCustomFields(reader)
-
-    // Trim spaces
-    err = addNewDatabaseEntry(title, userName, url, passwd, tags, notes, customEntries)
-
-    if err != nil {
-        fmt.Printf("Error adding entry - \"%s\"\n", err.Error())
-    }
-
-    return err
+	var userName string
+	var title string
+	var url string
+	var notes string
+	var passwd string
+	var tags string
+	var err error
+	var customEntries []CustomEntry
+
+	if err = checkActiveDatabase(); err != nil {
+		return err
+	}
+
+	if settingsRider.Type == "card" {
+		return addNewCardEntry()
+	}
+
+	reader := bufio.NewReader(os.Stdin)
+	title = readInput(reader, "Title")
+	url = readInput(reader, "URL")
+	if len(url) > 0 && !strings.HasPrefix(strings.ToLower(url), "http://") && !strings.HasPrefix(strings.ToLower(url), "https://") {
+		url = "http://" + url
+	}
+
+	userName = readInput(reader, "Username")
+
+	fmt.Printf("Password (enter to generate new): ")
+	err, passwd = readPassword()
+
+	if len(passwd) == 0 {
+		fmt.Printf("\nGenerating password ...")
+		err, passwd = generateStrongPassword()
+		fmt.Printf("done")
+	}
+	//  fmt.Printf("Password => %s\n", passwd)
+
+	tags = readInput(reader, "\nTags (separated by space): ")
+	notes = readInput(reader, "Notes")
+
+	// Title and username/password are mandatory
+	if len(title) == 0 {
+		fmt.Printf("Error - valid Title required\n")
+		return errors.New("invalid input")
+	}
+	if len(userName) == 0 {
+		fmt.Printf("Error - valid Username required\n")
+		return errors.New("invalid input")
+	}
+	if len(passwd) == 0 {
+		fmt.Printf("Error - valid Password required\n")
+		return errors.New("invalid input")
+	}
+
+	customEntries = addCustomFields(reader)
+
+	// Trim spaces
+	err = addNewDatabaseEntry(title, userName, url, passwd, tags, notes, customEntries)
+
+	if err != nil {
+		fmt.Printf("Error adding entry - \"%s\"\n", err.Error())
+	}
+
+	return err
 }
 
 // Function to update existing custom entries and add new ones
 // The bool part of the return value indicates whether to take action
 func addOrUpdateCustomFields(reader *bufio.Reader, entry *Entry) ([]CustomEntry, bool) {
 
-    var customEntries []ExtendedEntry
-    var editedCustomEntries []CustomEntry
-    var newCustomEntries []CustomEntry
-    var flag bool
+	var customEntries []ExtendedEntry
+	var editedCustomEntries []CustomEntry
+	var newCustomEntries []CustomEntry
+	var flag bool
 
-    customEntries = getExtendedEntries(entry)
+	customEntries = getExtendedEntries(entry)
 
-    if len(customEntries) > 0 {
+	if len(customEntries) > 0 {
 
-        fmt.Println("Editing/deleting custom fields")
-        for _, customEntry := range customEntries {
-            var fieldName string
-            var fieldValue string
+		fmt.Println("Editing/deleting custom fields")
+		for _, customEntry := range customEntries {
+			var fieldName string
+			var fieldValue string
 
-            fmt.Println("Field Name: " + customEntry.FieldName)
-            fieldName = readInput(reader, "\tNew Field Name (Enter to keep, \"x\" to delete)")
-            if strings.ToLower(strings.TrimSpace(fieldName)) == "x" {
-                fmt.Println("Deleting field: " + customEntry.FieldName)
-            } else {
-                if strings.TrimSpace(fieldName) == "" {
-                    fieldName = customEntry.FieldName
-                }
+			fmt.Println("Field Name: " + customEntry.FieldName)
+			fieldName = readInput(reader, "\tNew Field Name (Enter to keep, \"x\" to delete)")
+			if strings.ToLower(strings.TrimSpace(fieldName)) == "x" {
+				fmt.Println("Deleting field: " + customEntry.FieldName)
+			} else {
+				if strings.TrimSpace(fieldName) == "" {
+					fieldName = customEntry.FieldName
+				}
 
-                fmt.Println("Field Value: " + customEntry.FieldValue)
-                fieldValue = readInput(reader, "\tNew Field Value (Enter to keep)")
-                if strings.TrimSpace(fieldValue) == "" {
-                    fieldValue = customEntry.FieldValue
-                }
+				fmt.Println("Field Value: " + customEntry.FieldValue)
+				fieldValue = readInput(reader, "\tNew Field Value (Enter to keep)")
+				if strings.TrimSpace(fieldValue) == "" {
+					fieldValue = customEntry.FieldValue
+				}
 
-                editedCustomEntries = append(editedCustomEntries, CustomEntry{fieldName, fieldValue})
-            }
-        }
-    }
+				editedCustomEntries = append(editedCustomEntries, CustomEntry{fieldName, fieldValue})
+			}
+		}
+	}
 
-    newCustomEntries = addCustomFields(reader)
+	newCustomEntries = addCustomFields(reader)
 
-    editedCustomEntries = append(editedCustomEntries, newCustomEntries...)
+	editedCustomEntries = append(editedCustomEntries, newCustomEntries...)
 
-    // Cases where length == 0
-    // 1. Existing entries - all deleted
-    flag = len(customEntries) > 0 || len(editedCustomEntries) > 0
+	// Cases where length == 0
+	// 1. Existing entries - all deleted
+	flag = len(customEntries) > 0 || len(editedCustomEntries) > 0
 
-    return editedCustomEntries, flag
+	return editedCustomEntries, flag
 }
 
 // Function to add custom fields to an entry
 func addCustomFields(reader *bufio.Reader) []CustomEntry {
 
-    // Custom fields
-    var custom string
-    var customEntries []CustomEntry
+	// Custom fields
+	var custom string
+	var customEntries []CustomEntry
+
+	custom = readInput(reader, "Do you want to add custom fields [y/N]")
+	if strings.ToLower(custom) == "y" {
 
-    custom = readInput(reader, "Do you want to add custom fields [y/N]")
-    if strings.ToLower(custom) == "y" {
+		fmt.Println("Keep entering custom field name followed by the value. Press return with no input once done.")
+		for true {
+			var customFieldName string
+			var customFieldValue string
 
-        fmt.Println("Keep entering custom field name followed by the value. Press return with no input once done.")
-        for true {
-            var customFieldName string
-            var customFieldValue string
+			customFieldName = strings.TrimSpace(readInput(reader, "Field Name"))
+			if customFieldName != "" {
+				customFieldValue = strings.TrimSpace(readInput(reader, "Value for "+customFieldName))
+			}
 
-            customFieldName = strings.TrimSpace(readInput(reader, "Field Name"))
-            if customFieldName != "" {
-                customFieldValue = strings.TrimSpace(readInput(reader, "Value for "+customFieldName))
-            }
+			if customFieldName == "" && customFieldValue == "" {
+				break
+			}
 
-            if customFieldName == "" && customFieldValue == "" {
-                break
-            }
+			customEntries = append(customEntries, CustomEntry{customFieldName, customFieldValue})
+		}
+	}
 
-            customEntries = append(customEntries, CustomEntry{customFieldName, customFieldValue})
-        }
-    }
+	return customEntries
+}
 
-    return customEntries
+// Edit a card entry by id
+func editCurrentCardEntry(entry *Entry) error {
+	var klass string
+	var err error
+	var flag bool
+	var customEntries []CustomEntry
+
+	reader := bufio.NewReader(os.Stdin)
+
+	fmt.Printf("Card Title: %s\n", entry.Title)
+	title := readInput(reader, "New Card Title")
+	fmt.Printf("Name on Card: %s\n", entry.User)
+	name := readInput(reader, "New Name on Card")
+	fmt.Printf("Card Number: %s\n", entry.Url)
+	number := readInput(reader, "New Card Number")
+	if number != "" {
+		klass, err = detectCardType(number)
+
+		if err != nil {
+			fmt.Printf("Error - %s\n", err.Error())
+			return err
+		} else {
+			fmt.Printf("<Card type is %s>\n", klass)
+		}
+	}
+
+	fmt.Printf("Card CVV: %s\n", entry.Password)
+	fmt.Printf("New Card CVV: ")
+	err, cvv := readPassword()
+
+	if cvv != "" && !validateCvv(cvv, klass) {
+		fmt.Printf("\nError - Invalid CVV for %s\n", klass)
+		return errors.New(fmt.Sprintf("Error - Invalid CVV for %s\n", klass))
+	}
+	fmt.Printf("\nCard PIN: %s\n", entry.Pin)
+	fmt.Printf("New Card PIN: ")
+	err, pin := readPassword()
+
+	if pin != "" && !validateCardPin(pin) {
+		fmt.Printf("\n<Warning - Empty PIN!>")
+	}
+	fmt.Printf("\nCard Expiry Date: %s\n", entry.ExpiryDate)
+	expiryDate := readInput(reader, "New Card Expiry Date (as mm/dd): ")
+	// expiry has to be in the form of <month>/<year>
+	if expiryDate != "" && !checkValidExpiry(expiryDate) {
+		return errors.New("Invalid Expiry Date")
+	}
+	tags := readInput(reader, "\nTags (separated by space): ")
+	notes := readInput(reader, "Notes")
+
+	customEntries, flag = addOrUpdateCustomFields(reader, entry)
+
+	// Update
+	err = updateDatabaseCardEntry(entry, title, number, name,
+		klass, cvv, pin, expiryDate, notes, tags, customEntries, flag)
+
+	if err != nil {
+		fmt.Printf("Error adding entry - \"%s\"\n", err.Error())
+	}
+
+	return nil
 }
 
 // Edit a current entry by id
 func editCurrentEntry(idString string) error {
 
-    var userName string
-    var title string
-    var url string
-    var notes string
-    var tags string
-    var passwd string
-    var err error
-    var entry *Entry
-    var id int
+	var userName string
+	var title string
+	var url string
+	var notes string
+	var tags string
+	var passwd string
+	var err error
+	var entry *Entry
+	var id int
+
+	if err = checkActiveDatabase(); err != nil {
+		return err
+	}
 
-    if err = checkActiveDatabase(); err != nil {
-        return err
-    }
+	id, _ = strconv.Atoi(idString)
 
-    id, _ = strconv.Atoi(idString)
+	err, entry = getEntryById(id)
+	if err != nil || entry == nil {
+		fmt.Printf("No entry found for id %d\n", id)
+		return err
+	}
 
-    err, entry = getEntryById(id)
-    if err != nil || entry == nil {
-        fmt.Printf("No entry found for id %d\n", id)
-        return err
-    }
+	if entry.Type == "card" {
+		return editCurrentCardEntry(entry)
+	}
 
-    reader := bufio.NewReader(os.Stdin)
+	reader := bufio.NewReader(os.Stdin)
 
-    fmt.Printf("Current Title: %s\n", entry.Title)
-    title = readInput(reader, "New Title")
+	fmt.Printf("Current Title: %s\n", entry.Title)
+	title = readInput(reader, "New Title")
 
-    fmt.Printf("Current URL: %s\n", entry.Url)
-    url = readInput(reader, "New URL")
+	fmt.Printf("Current URL: %s\n", entry.Url)
+	url = readInput(reader, "New URL")
 
-    if len(url) > 0 && !strings.HasPrefix(strings.ToLower(url), "http://") && !strings.HasPrefix(strings.ToLower(url), "https://") {
-        url = "http://" + url
-    }
+	if len(url) > 0 && !strings.HasPrefix(strings.ToLower(url), "http://") && !strings.HasPrefix(strings.ToLower(url), "https://") {
+		url = "http://" + url
+	}
 
-    fmt.Printf("Current Username: %s\n", entry.User)
-    userName = readInput(reader, "New Username")
+	fmt.Printf("Current Username: %s\n", entry.User)
+	userName = readInput(reader, "New Username")
 
-    fmt.Printf("Current Password: %s\n", entry.Password)
-    fmt.Printf("New Password ([y/Y] to generate new, enter will keep old one): ")
-    err, passwd = readPassword()
+	fmt.Printf("Current Password: %s\n", entry.Password)
+	fmt.Printf("New Password ([y/Y] to generate new, enter will keep old one): ")
+	err, passwd = readPassword()
 
-    if strings.ToLower(passwd) == "y" {
-        fmt.Printf("\nGenerating new password ...")
-        err, passwd = generateStrongPassword()
-    }
-    //  fmt.Printf("Password => %s\n", passwd)
+	if strings.ToLower(passwd) == "y" {
+		fmt.Printf("\nGenerating new password ...")
+		err, passwd = generateStrongPassword()
+	}
+	//  fmt.Printf("Password => %s\n", passwd)
 
-    fmt.Printf("\nCurrent Tags: %s\n", entry.Tags)
-    tags = readInput(reader, "New Tags")
+	fmt.Printf("\nCurrent Tags: %s\n", entry.Tags)
+	tags = readInput(reader, "New Tags")
 
-    fmt.Printf("\nCurrent Notes: %s\n", entry.Notes)
-    notes = readInput(reader, "New Notes")
+	fmt.Printf("\nCurrent Notes: %s\n", entry.Notes)
+	notes = readInput(reader, "New Notes")
 
-    customEntries, flag := addOrUpdateCustomFields(reader, entry)
+	customEntries, flag := addOrUpdateCustomFields(reader, entry)
 
-    // Update
-    err = updateDatabaseEntry(entry, title, userName, url, passwd, tags, notes, customEntries, flag)
-    if err != nil {
-        fmt.Printf("Error updating entry - \"%s\"\n", err.Error())
-    }
+	// Update
+	err = updateDatabaseEntry(entry, title, userName, url, passwd, tags, notes, customEntries, flag)
+	if err != nil {
+		fmt.Printf("Error updating entry - \"%s\"\n", err.Error())
+	}
 
-    return err
+	return err
 }
 
 // List current entry by id
 func listCurrentEntry(idString string) error {
 
-    var id int
-    var err error
-    var entry *Entry
+	var id int
+	var err error
+	var entry *Entry
 
-    if err = checkActiveDatabase(); err != nil {
-        return err
-    }
+	if err = checkActiveDatabase(); err != nil {
+		return err
+	}
 
-    id, _ = strconv.Atoi(idString)
+	id, _ = strconv.Atoi(idString)
 
-    //  fmt.Printf("Listing current entry - %d\n", id)
-    err, entry = getEntryById(id)
-    if err != nil || entry == nil {
-        fmt.Printf("No entry found for id %d\n", id)
-        return err
-    }
+	//  fmt.Printf("Listing current entry - %d\n", id)
+	err, entry = getEntryById(id)
+	if err != nil || entry == nil {
+		fmt.Printf("No entry found for id %d\n", id)
+		return err
+	}
 
-    err = printEntry(entry, true)
+	err = printEntry(entry, true)
 
-    if err == nil && settingsRider.CopyPassword {
-        //      fmt.Printf("Copying password " + entry.Password + " to clipboard\n")
-        copyPasswordToClipboard(entry.Password)
-    }
+	if err == nil && settingsRider.CopyPassword {
+		//      fmt.Printf("Copying password " + entry.Password + " to clipboard\n")
+		copyPasswordToClipboard(entry.Password)
+	}
 
-    return err
+	return err
 }
 
 // List all entries
 func listAllEntries() error {
 
-    var err error
-    var maxKrypt bool
-    var defaultDB string
-    var passwd string
-
-    maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
-
-    // If max krypt on - then autodecrypt on call and auto encrypt after call
-    if maxKrypt {
-        err, passwd = decryptDatabase(defaultDB)
-        if err != nil {
-            return err
-        }
-    }
-
-    if err = checkActiveDatabase(); err != nil {
-        return err
-    }
-
-    err, settings := getOrCreateLocalConfig(APP)
-
-    if err != nil {
-        fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
-        return err
-    }
-
-    orderKeys := strings.Split(settings.ListOrder, ",")
-    err, entries := iterateEntries(orderKeys[0], orderKeys[1])
-
-    if err == nil {
-        if len(entries) > 0 {
-            fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
-            printDelim(settings.Delim, settings.Color)
-            for _, entry := range entries {
-                printEntry(&entry, false)
-            }
-        } else {
-            fmt.Println("No entries.")
-        }
-    } else {
-        fmt.Printf("Error fetching entries: \"%s\"\n", err.Error())
-        return err
-    }
-
-    // If max krypt on - then autodecrypt on call and auto encrypt after call
-    if maxKrypt {
-        err = encryptDatabase(defaultDB, &passwd)
-    }
-
-    return err
+	var err error
+	var maxKrypt bool
+	var defaultDB string
+	var passwd string
+
+	maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
+
+	// If max krypt on - then autodecrypt on call and auto encrypt after call
+	if maxKrypt {
+		err, passwd = decryptDatabase(defaultDB)
+		if err != nil {
+			return err
+		}
+	}
+
+	if err = checkActiveDatabase(); err != nil {
+		return err
+	}
+
+	err, settings := getOrCreateLocalConfig(APP)
+
+	if err != nil {
+		fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
+		return err
+	}
+
+	orderKeys := strings.Split(settings.ListOrder, ",")
+	err, entries := iterateEntries(orderKeys[0], orderKeys[1])
+
+	if err == nil {
+		if len(entries) > 0 {
+			fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
+			printDelim(settings.Delim, settings.Color)
+			for _, entry := range entries {
+				printEntry(&entry, false)
+			}
+		} else {
+			fmt.Println("No entries.")
+		}
+	} else {
+		fmt.Printf("Error fetching entries: \"%s\"\n", err.Error())
+		return err
+	}
+
+	// If max krypt on - then autodecrypt on call and auto encrypt after call
+	if maxKrypt {
+		err = encryptDatabase(defaultDB, &passwd)
+	}
+
+	return err
 }
 
 // Find current entry by term - prints all matches
 func findCurrentEntry(term string) error {
 
-    var err error
-    var entries []Entry
-    var terms []string
-
-    if err = checkActiveDatabase(); err != nil {
-        return err
-    }
-
-    terms = strings.Split(term, " ")
-
-    err, entries = searchDatabaseEntries(terms, "AND")
-    if err != nil || len(entries) == 0 {
-        fmt.Printf("Entry for query \"%s\" not found\n", term)
-        return err
-    } else {
-        var delim bool
-        var pcopy bool
-
-        if len(entries) == 1 {
-            delim = true
-            pcopy = true
-            // Single entry means copy password can be enabled
-        } else {
-            _, settings := getOrCreateLocalConfig(APP)
-            fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
-            printDelim(settings.Delim, settings.Color)
-        }
-
-        for _, entry := range entries {
-            printEntry(&entry, delim)
-        }
-
-        if pcopy && settingsRider.CopyPassword {
-            // Single entry
-            copyPasswordToClipboard(entries[0].Password)
-        }
-    }
-
-    return err
+	var err error
+	var entries []Entry
+	var terms []string
+
+	if err = checkActiveDatabase(); err != nil {
+		return err
+	}
+
+	terms = strings.Split(term, " ")
+
+	err, entries = searchDatabaseEntries(terms, "AND")
+	if err != nil || len(entries) == 0 {
+		fmt.Printf("Entry for query \"%s\" not found\n", term)
+		return err
+	} else {
+		var delim bool
+		var pcopy bool
+
+		if len(entries) == 1 {
+			delim = true
+			pcopy = true
+			// Single entry means copy password can be enabled
+		} else {
+			_, settings := getOrCreateLocalConfig(APP)
+			fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
+			printDelim(settings.Delim, settings.Color)
+		}
+
+		for _, entry := range entries {
+			printEntry(&entry, delim)
+		}
+
+		if pcopy && settingsRider.CopyPassword {
+			// Single entry
+			copyPasswordToClipboard(entries[0].Password)
+		}
+	}
+
+	return err
 }
 
 // Remove a range of entries <id1>-<id2> say 10-14
 func removeMultipleEntries(idRangeEntry string) error {
 
-    var err error
-    var idRange []string
-    var id1, id2 int
+	var err error
+	var idRange []string
+	var id1, id2 int
 
-    idRange = strings.Split(idRangeEntry, "-")
+	idRange = strings.Split(idRangeEntry, "-")
 
-    if len(idRange) != 2 {
-        fmt.Println("Invalid id range - " + idRangeEntry)
-        return errors.New("Invalid id range - " + idRangeEntry)
-    }
+	if len(idRange) != 2 {
+		fmt.Println("Invalid id range - " + idRangeEntry)
+		return errors.New("Invalid id range - " + idRangeEntry)
+	}
 
-    id1, _ = strconv.Atoi(idRange[0])
-    id2, _ = strconv.Atoi(idRange[1])
+	id1, _ = strconv.Atoi(idRange[0])
+	id2, _ = strconv.Atoi(idRange[1])
 
-    if id1 >= id2 {
-        fmt.Println("Invalid id range - " + idRangeEntry)
-        return errors.New("Invalid id range - " + idRangeEntry)
-    }
+	if id1 >= id2 {
+		fmt.Println("Invalid id range - " + idRangeEntry)
+		return errors.New("Invalid id range - " + idRangeEntry)
+	}
 
-    for idNum := id1; idNum <= id2; idNum++ {
-        err = removeCurrentEntry(fmt.Sprintf("%d", idNum))
-    }
+	for idNum := id1; idNum <= id2; idNum++ {
+		err = removeCurrentEntry(fmt.Sprintf("%d", idNum))
+	}
 
-    return err
+	return err
 }
 
 // Remove current entry by id
 func removeCurrentEntry(idString string) error {
 
-    var err error
-    var entry *Entry
-    var id int
-    var response string
-
-    if err = checkActiveDatabase(); err != nil {
-        return err
-    }
-
-    if strings.Contains(idString, "-") {
-        return removeMultipleEntries(idString)
-    }
-
-    id, _ = strconv.Atoi(idString)
-
-    err, entry = getEntryById(id)
-    if err != nil || entry == nil {
-        fmt.Printf("No entry with id %d was found\n", id)
-        return err
-    }
-
-    printEntryMinimal(entry, true)
-
-    if !settingsRider.AssumeYes {
-        response = readInput(bufio.NewReader(os.Stdin), "Please confirm removal [Y/n]: ")
-    } else {
-        response = "y"
-    }
-
-    if strings.ToLower(response) != "n" {
-        // Drop from the database
-        err = removeDatabaseEntry(entry)
-        if err == nil {
-            fmt.Printf("Entry with id %d was removed from the database\n", id)
-        }
-    } else {
-        fmt.Println("Removal of entry cancelled by user.")
-    }
-
-    return err
+	var err error
+	var entry *Entry
+	var id int
+	var response string
+
+	if err = checkActiveDatabase(); err != nil {
+		return err
+	}
+
+	if strings.Contains(idString, "-") {
+		return removeMultipleEntries(idString)
+	}
+
+	id, _ = strconv.Atoi(idString)
+
+	err, entry = getEntryById(id)
+	if err != nil || entry == nil {
+		fmt.Printf("No entry with id %d was found\n", id)
+		return err
+	}
+
+	printEntryMinimal(entry, true)
+
+	if !settingsRider.AssumeYes {
+		response = readInput(bufio.NewReader(os.Stdin), "Please confirm removal [Y/n]: ")
+	} else {
+		response = "y"
+	}
+
+	if strings.ToLower(response) != "n" {
+		// Drop from the database
+		err = removeDatabaseEntry(entry)
+		if err == nil {
+			fmt.Printf("Entry with id %d was removed from the database\n", id)
+		}
+	} else {
+		fmt.Println("Removal of entry cancelled by user.")
+	}
+
+	return err
 }
 
 // Copy current entry by id into new entry
 func copyCurrentEntry(idString string) error {
 
-    var err error
-    var entry *Entry
-    var entryNew *Entry
-    var exEntries []ExtendedEntry
+	var err error
+	var entry *Entry
+	var entryNew *Entry
+	var exEntries []ExtendedEntry
 
-    var id int
+	var id int
 
-    if err = checkActiveDatabase(); err != nil {
-        return err
-    }
+	if err = checkActiveDatabase(); err != nil {
+		return err
+	}
 
-    id, _ = strconv.Atoi(idString)
+	id, _ = strconv.Atoi(idString)
 
-    err, entry = getEntryById(id)
-    if err != nil || entry == nil {
-        fmt.Printf("No entry with id %d was found\n", id)
-        return err
-    }
+	err, entry = getEntryById(id)
+	if err != nil || entry == nil {
+		fmt.Printf("No entry with id %d was found\n", id)
+		return err
+	}
 
-    err, entryNew = cloneEntry(entry)
-    if err != nil {
-        fmt.Printf("Error cloning entry: \"%s\"\n", err.Error())
-        return err
-    }
+	err, entryNew = cloneEntry(entry)
+	if err != nil {
+		fmt.Printf("Error cloning entry: \"%s\"\n", err.Error())
+		return err
+	}
 
-    exEntries = getExtendedEntries(entry)
+	exEntries = getExtendedEntries(entry)
 
-    if len(exEntries) > 0 {
-        fmt.Printf("%d extended entries found\n", len(exEntries))
+	if len(exEntries) > 0 {
+		fmt.Printf("%d extended entries found\n", len(exEntries))
 
-        err = cloneExtendedEntries(entryNew, exEntries)
-        if err != nil {
-            fmt.Printf("Error cloning extended entries: \"%s\"\n", err.Error())
-            return err
-        }
-    }
+		err = cloneExtendedEntries(entryNew, exEntries)
+		if err != nil {
+			fmt.Printf("Error cloning extended entries: \"%s\"\n", err.Error())
+			return err
+		}
+	}
 
-    return err
+	return err
 }
 
 // Encrypt the active database
 func encryptActiveDatabase() error {
 
-    var err error
-    var dbPath string
+	var err error
+	var dbPath string
 
-    if err = checkActiveDatabase(); err != nil {
-        return err
-    }
+	if err = checkActiveDatabase(); err != nil {
+		return err
+	}
 
-    err, dbPath = getActiveDatabase()
-    if err != nil {
-        fmt.Printf("Error getting active database path - \"%s\"\n", err.Error())
-        return err
-    }
+	err, dbPath = getActiveDatabase()
+	if err != nil {
+		fmt.Printf("Error getting active database path - \"%s\"\n", err.Error())
+		return err
+	}
 
-    return encryptDatabase(dbPath, nil)
+	return encryptDatabase(dbPath, nil)
 }
 
 // Encrypt the database using AES
 func encryptDatabase(dbPath string, givenPasswd *string) error {
 
-    var err error
-    var passwd string
-    var passwd2 string
-
-    // If password is given, use it
-    if givenPasswd != nil {
-        passwd = *givenPasswd
-    }
-
-    if len(passwd) == 0 {
-        fmt.Printf("Encryption Password: ")
-        err, passwd = readPassword()
-
-        if err == nil {
-            fmt.Printf("\nEncryption Password again: ")
-            err, passwd2 = readPassword()
-            if err == nil {
-                if passwd != passwd2 {
-                    fmt.Println("\nPassword mismatch.")
-                    return errors.New("mismatched passwords")
-                }
-            }
-        }
-
-        if err != nil {
-            fmt.Printf("Error reading password - \"%s\"\n", err.Error())
-            return err
-        }
-    }
-
-    //  err = encryptFileAES(dbPath, passwd)
-    _, settings := getOrCreateLocalConfig(APP)
-
-    switch settings.Cipher {
-    case "aes":
-        err = encryptFileAES(dbPath, passwd)
-    case "xchacha", "chacha", "xchachapoly":
-        err = encryptFileXChachaPoly(dbPath, passwd)
-    default:
-        fmt.Println("No cipher set, defaulting to AES")
-        err = encryptFileAES(dbPath, passwd)
-    }
-
-    if err == nil {
-        fmt.Println("\nEncryption complete.")
-    }
-
-    return err
+	var err error
+	var passwd string
+	var passwd2 string
+
+	// If password is given, use it
+	if givenPasswd != nil {
+		passwd = *givenPasswd
+	}
+
+	if len(passwd) == 0 {
+		fmt.Printf("Encryption Password: ")
+		err, passwd = readPassword()
+
+		if err == nil {
+			fmt.Printf("\nEncryption Password again: ")
+			err, passwd2 = readPassword()
+			if err == nil {
+				if passwd != passwd2 {
+					fmt.Println("\nPassword mismatch.")
+					return errors.New("mismatched passwords")
+				}
+			}
+		}
+
+		if err != nil {
+			fmt.Printf("Error reading password - \"%s\"\n", err.Error())
+			return err
+		}
+	}
+
+	//  err = encryptFileAES(dbPath, passwd)
+	_, settings := getOrCreateLocalConfig(APP)
+
+	switch settings.Cipher {
+	case "aes":
+		err = encryptFileAES(dbPath, passwd)
+	case "xchacha", "chacha", "xchachapoly":
+		err = encryptFileXChachaPoly(dbPath, passwd)
+	default:
+		fmt.Println("No cipher set, defaulting to AES")
+		err = encryptFileAES(dbPath, passwd)
+	}
+
+	if err == nil {
+		fmt.Println("\nEncryption complete.")
+	}
+
+	return err
 }
 
 // Decrypt an encrypted database
 func decryptDatabase(dbPath string) (error, string) {
 
-    var err error
-    var passwd string
-    var flag bool
+	var err error
+	var passwd string
+	var flag bool
 
-    if err, flag = isFileEncrypted(dbPath); !flag {
-        fmt.Println(err.Error())
-        return err, ""
-    }
+	if err, flag = isFileEncrypted(dbPath); !flag {
+		fmt.Println(err.Error())
+		return err, ""
+	}
 
-    fmt.Printf("Decryption Password: ")
-    err, passwd = readPassword()
+	fmt.Printf("Decryption Password: ")
+	err, passwd = readPassword()
 
-    if err != nil {
-        fmt.Printf("\nError reading password - \"%s\"\n", err.Error())
-        return err, ""
-    }
+	if err != nil {
+		fmt.Printf("\nError reading password - \"%s\"\n", err.Error())
+		return err, ""
+	}
 
-    _, settings := getOrCreateLocalConfig(APP)
+	_, settings := getOrCreateLocalConfig(APP)
 
-    switch settings.Cipher {
-    case "aes":
-        err = decryptFileAES(dbPath, passwd)
-    case "xchacha", "chacha", "xchachapoly":
-        err = decryptFileXChachaPoly(dbPath, passwd)
-    default:
-        fmt.Println("No cipher set, defaulting to AES")
-        err = decryptFileAES(dbPath, passwd)
-    }
+	switch settings.Cipher {
+	case "aes":
+		err = decryptFileAES(dbPath, passwd)
+	case "xchacha", "chacha", "xchachapoly":
+		err = decryptFileXChachaPoly(dbPath, passwd)
+	default:
+		fmt.Println("No cipher set, defaulting to AES")
+		err = decryptFileAES(dbPath, passwd)
+	}
 
-    if err == nil {
-        fmt.Println("...decryption complete.")
-    }
+	if err == nil {
+		fmt.Println("...decryption complete.")
+	}
 
-    return err, passwd
+	return err, passwd
 }
 
 // Migrate an existing database to the new schema
 func migrateDatabase(dbPath string) error {
 
-    var err error
-    var flag bool
-    var passwd string
-    var db *gorm.DB
-
-    if _, err = os.Stat(dbPath); os.IsNotExist(err) {
-        fmt.Printf("Error - path %s does not exist\n", dbPath)
-        return err
-    }
-
-    if err, flag = isFileEncrypted(dbPath); flag {
-        err, passwd = decryptDatabase(dbPath)
-        if err != nil {
-            fmt.Printf("Error decrypting - %s: %s\n", dbPath, err.Error())       
-            return err
-        }
-    }
-
-
-    err, db = openDatabase(dbPath)
-
-    if err != nil {
-        fmt.Printf("Error opening database path - %s: %s\n", dbPath, err.Error())
-        return err
-    }
-
-    fmt.Println("Migrating tables ...")
-    err = db.AutoMigrate(&Entry{})
-
-    if err != nil {
-        fmt.Printf("Error migrating table \"entries\" - %s: %s\n", dbPath, err.Error())
-        return err
-    }
-
-    err = db.AutoMigrate(&ExtendedEntry{})
-
-    if err != nil {
-        fmt.Printf("Error migrating table \"exentries\" - %s: %s\n", dbPath, err.Error())
-        return err
-    }
-
-    if flag {
-        // File was encrypted - encrypt it again
-        encryptDatabase(dbPath, &passwd)
-    }
-
-    fmt.Println("Migration successful.")
-
-    return nil
-}
-
-// Export data to a varity of file types
-func exportToFile(fileName string) error {
-
-    var err error
-    var maxKrypt bool
-    var defaultDB string
-    var passwd string
-
-    ext := strings.ToLower(filepath.Ext(fileName))
-
-    maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
-
-    if ext == ".csv" || ext == ".md" || ext == ".html" || ext == ".pdf" {
-        // If max krypt on - then autodecrypt on call and auto encrypt after call
-        if maxKrypt {
-            err, passwd = decryptDatabase(defaultDB)
-            if err != nil {
-                return err
-            }
-        }
-    }
-
-    switch ext {
-    case ".csv":
-        err = exportToCsv(fileName)
-    case ".md":
-        err = exportToMarkdown(fileName)
-    case ".html":
-        err = exportToHTML(fileName)
-    case ".pdf":
-        err = exportToPDF(fileName)
-    default:
-        fmt.Printf("Error - extn %s not supported\n", ext)
-        return fmt.Errorf("format %s not supported", ext)
-    }
-
-    if err != nil {
-        fmt.Printf("Error exporting to \"%s\" - \"%s\"\n", fileName, err.Error())
-        return err
-    } else {
-        if _, err = os.Stat(fileName); err == nil {
-            fmt.Printf("Exported to %s.\n", fileName)
-            // Chmod 600
-            os.Chmod(fileName, 0600)
-
-            // If max krypt on - then autodecrypt on call and auto encrypt after call
-            if maxKrypt {
-                err = encryptDatabase(defaultDB, &passwd)
-            }
-
-            return err
-        }
-    }
-
-    return err
-}
-
-// Export current database to markdown
-func exportToMarkdown(fileName string) error {
-
-    var err error
-    var dataArray [][]string
-    var fh *os.File
-    var maxLengths [7]int
-    var headers []string = []string{" ID ", " Title ", " User ", " URL ", " Password ", " Notes ", " Modified "}
-
-    err, dataArray = entriesToStringArray(false)
-
-    if err != nil {
-        fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
-        return err
-    }
-
-    for _, record := range dataArray {
-        for idx, field := range record {
-
-            if len(field) > maxLengths[idx] {
-                maxLengths[idx] = len(field)
-            }
-        }
-    }
-
-    //  fmt.Printf("%+v\n", maxLengths)
-    fh, err = os.Create(fileName)
-    if err != nil {
-        fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
-        return err
-    }
-
-    defer fh.Close()
-
-    writer := bufio.NewWriter(fh)
-
-    // Write markdown header
-    for idx, length := range maxLengths {
-        delta := length - len(headers[idx])
-        //      fmt.Printf("%d\n", delta)
-        if delta > 0 {
-            for i := 0; i < delta+2; i++ {
-                headers[idx] += " "
-            }
-        }
-    }
-
-    writer.WriteString(" |" + strings.Join(headers, "|") + "|\n")
-
-    // Write line separator
-    writer.WriteString(" | ")
-    for _, length := range maxLengths {
-
-        for i := 0; i < length; i++ {
-            writer.WriteString("-")
-        }
-        writer.WriteString(" | ")
-    }
-    writer.WriteString("\n")
-
-    // Write records
-    for _, record := range dataArray {
-        writer.WriteString(" | ")
-        for _, field := range record {
-            writer.WriteString(field + " | ")
-        }
-        writer.WriteString("\n")
-    }
-
-    writer.Flush()
-
-    return nil
-
-}
-
-// This needs pandoc and pdflatex support
-func exportToPDF(fileName string) error {
-
-    var err error
-    var tmpFile string
-    var passwd string
-    var pdfTkFound bool
-
-    cmd := exec.Command("which", "pandoc")
-    if _, err = cmd.Output(); err != nil {
-        return errors.New("pandoc not found")
-    }
-
-    cmd = exec.Command("which", "pdftk")
-    if _, err = cmd.Output(); err != nil {
-        fmt.Printf("pdftk not found, PDF won't be secure!\n")
-    } else {
-        pdfTkFound = true
-    }
-
-    if pdfTkFound {
-        fmt.Printf("PDF Encryption Password: ")
-        err, passwd = readPassword()
-    }
-
-    tmpFile = randomFileName(os.TempDir(), ".tmp")
-    //  fmt.Printf("Temp file => %s\n", tmpFile)
-    err = exportToMarkdownLimited(tmpFile)
-
-    if err == nil {
-        var args []string = []string{"-o", fileName, "-f", "markdown", "-V", "geometry:landscape", "--columns=600", "--pdf-engine", "xelatex", "--dpi=150", tmpFile}
-
-        cmd = exec.Command("pandoc", args...)
-        _, err = cmd.Output()
-        // Remove tmpfile
-        os.Remove(tmpFile)
-
-        // If the file is generated, encrypt it if pdfTkFound
-        if _, err = os.Stat(fileName); err == nil {
-            fmt.Printf("\nFile %s created without password.\n", fileName)
-
-            if pdfTkFound && len(passwd) > 0 {
-                tmpFile = randomFileName(".", ".pdf")
-                //              fmt.Printf("pdf file => %s\n", tmpFile)
-                args = []string{fileName, "output", tmpFile, "user_pw", passwd}
-                cmd = exec.Command("pdftk", args...)
-                _, err = cmd.Output()
-
-                if err == nil {
-                    // Copy over
-                    fmt.Printf("Added password to %s.\n", fileName)
-                    os.Remove(fileName)
-                    err = os.Rename(tmpFile, fileName)
-                } else {
-                    fmt.Printf("Error adding password to pdf - \"%s\"\n", err.Error())
-                }
-            }
-        }
-    }
-
-    return err
-
-}
-
-// Export current database to markdown minus the long fields
-func exportToMarkdownLimited(fileName string) error {
-
-    var err error
-    var dataArray [][]string
-    var fh *os.File
-    var maxLengths [5]int
-    var headers []string = []string{" ID ", " Title ", " User ", " Password ", " Modified "}
-
-    err, dataArray = entriesToStringArray(true)
-
-    if err != nil {
-        fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
-        return err
-    }
-
-    for _, record := range dataArray {
-        for idx, field := range record {
-
-            if len(field) > maxLengths[idx] {
-                maxLengths[idx] = len(field)
-            }
-        }
-    }
-
-    //  fmt.Printf("%+v\n", maxLengths)
-    fh, err = os.Create(fileName)
-    if err != nil {
-        fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
-        return err
-    }
-
-    defer fh.Close()
-
-    writer := bufio.NewWriter(fh)
-
-    // Write markdown header
-    for idx, length := range maxLengths {
-        delta := length - len(headers[idx])
-        //      fmt.Printf("%d\n", delta)
-        if delta > 0 {
-            for i := 0; i < delta+2; i++ {
-                headers[idx] += " "
-            }
-        }
-    }
-
-    writer.WriteString(" |" + strings.Join(headers, "|") + "|\n")
-
-    // Write line separator
-    writer.WriteString(" | ")
-    for _, length := range maxLengths {
-
-        for i := 0; i < length; i++ {
-            writer.WriteString("-")
-        }
-        writer.WriteString(" | ")
-    }
-    writer.WriteString("\n")
-
-    // Write records
-    for _, record := range dataArray {
-        writer.WriteString(" | ")
-        for _, field := range record {
-            writer.WriteString(field + " | ")
-        }
-        writer.WriteString("\n")
-    }
-
-    writer.Flush()
-
-    return nil
-
-}
-
-// Export current database to html
-func exportToHTML(fileName string) error {
-
-    var err error
-    var dataArray [][]string
-    var fh *os.File
-    var headers []string = []string{" ID ", " Title ", " User ", " URL ", " Password ", " Notes ", " Modified "}
-
-    err, dataArray = entriesToStringArray(false)
-
-    if err != nil {
-        fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
-        return err
-    }
-
-    //  fmt.Printf("%+v\n", maxLengths)
-    fh, err = os.Create(fileName)
-    if err != nil {
-        fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
-        return err
-    }
-
-    defer fh.Close()
-
-    writer := bufio.NewWriter(fh)
-
-    writer.WriteString("<html><body>\n")
-    writer.WriteString("<table cellPadding=\"2\" cellSpacing=\"2\" border=\"1\">\n")
-    writer.WriteString("<theader>\n")
-
-    for _, h := range headers {
-        writer.WriteString(fmt.Sprintf("<th>%s</th>", h))
-    }
-    writer.WriteString("</theader>\n")
-    writer.WriteString("<tbody>\n")
-
-    // Write records
-    for _, record := range dataArray {
-        writer.WriteString("<tr>")
-        for _, field := range record {
-            writer.WriteString(fmt.Sprintf("<td>%s</td>", field))
-        }
-        writer.WriteString("</tr>\n")
-    }
-    writer.WriteString("</tbody>\n")
-    writer.WriteString("</table>\n")
-
-    writer.WriteString("</body></html>\n")
-
-    writer.Flush()
-
-    return nil
-
-}
-
-// Export current database to CSV
-func exportToCsv(fileName string) error {
+	var err error
+	var flag bool
+	var passwd string
+	var db *gorm.DB
 
-    var err error
-    var dataArray [][]string
-    var fh *os.File
+	if _, err = os.Stat(dbPath); os.IsNotExist(err) {
+		fmt.Printf("Error - path %s does not exist\n", dbPath)
+		return err
+	}
 
-    err, dataArray = entriesToStringArray(false)
+	if err, flag = isFileEncrypted(dbPath); flag {
+		err, passwd = decryptDatabase(dbPath)
+		if err != nil {
+			fmt.Printf("Error decrypting - %s: %s\n", dbPath, err.Error())
+			return err
+		}
+	}
 
-    if err != nil {
-        fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
-        return err
-    }
+	err, db = openDatabase(dbPath)
 
-    fh, err = os.Create(fileName)
-    if err != nil {
-        fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
-        return err
-    }
+	if err != nil {
+		fmt.Printf("Error opening database path - %s: %s\n", dbPath, err.Error())
+		return err
+	}
 
-    writer := csv.NewWriter(fh)
+	fmt.Println("Migrating tables ...")
+	err = db.AutoMigrate(&Entry{})
 
-    // Write header
-    writer.Write([]string{"ID", "Title", "User", "URL", "Password", "Notes", "Modified"})
+	if err != nil {
+		fmt.Printf("Error migrating table \"entries\" - %s: %s\n", dbPath, err.Error())
+		return err
+	}
 
-    for idx, record := range dataArray {
-        if err = writer.Write(record); err != nil {
-            fmt.Printf("Error writing record #%d to %s - \"%s\"\n", idx+1, fileName, err.Error())
-            break
-        }
-    }
+	err = db.AutoMigrate(&ExtendedEntry{})
 
-    writer.Flush()
+	if err != nil {
+		fmt.Printf("Error migrating table \"exentries\" - %s: %s\n", dbPath, err.Error())
+		return err
+	}
 
-    if err != nil {
-        return err
-    }
+	if flag {
+		// File was encrypted - encrypt it again
+		encryptDatabase(dbPath, &passwd)
+	}
 
-    os.Chmod(fileName, 0600)
-    fmt.Printf("!WARNING: Passwords are stored in plain-text!\n")
-    fmt.Printf("Exported %d records to %s .\n", len(dataArray), fileName)
+	fmt.Println("Migration successful.")
 
-    return nil
+	return nil
 }
diff --git a/db.go b/db.go
index ba29379..1b413cb 100644
--- a/db.go
+++ b/db.go
@@ -2,100 +2,99 @@
 package main
 
 import (
-    "database/sql"
-    "fmt"
-    "gorm.io/driver/sqlite"
-    "gorm.io/gorm"
-    "gorm.io/gorm/logger"
-    "os"
-    "path/filepath"
-    "strconv"
-    "strings"
-    "time"
+	"database/sql"
+	"fmt"
+	"gorm.io/driver/sqlite"
+	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"time"
 )
 
 // Structure representing an entry in the db
 type Entry struct {
-    ID        int       `gorm:"column:id;autoIncrement;primaryKey"`
-    Title     string    `gorm:"column:title"`  // For card type this -> Card Name
-    User      string    `gorm:"column:user"`   // For card type this -> Card Holder Name
-    Url       string    `gorm:"column:url"`    // For card type this -> Card Number
-    Password  string    `gorm:"column:password"` // For card type this -> CVV number
-    Pin       string    `gorm:"column:pin"` // For card type this -> card pin
-    ExpiryDate string   `gorm:"colum:expiry_date"` // For card type this -> Card expiry date
-    Issuer     string   `gorm:"column:issuer"`    // For card type this -> Issuing bank
-    Class      string   `gorm:"column:class"`    // For card type this -> visa/mastercard/amex etc
-    
-    Notes     string    `gorm:"column:notes"`
-    Tags      string    `gorm:"column:tags"`
-    Type      string    `gorm:"column:type"`  // Entry type, default/card/ID
-    Timestamp time.Time `gorm:"type:timestamp;default:(datetime('now','localtime'))"` // sqlite3
-
-// 	ID        int       `gorm:"column:id;autoIncrement;primaryKey"`
-// 	Type      string    `gorm:"column:type"`  // Type of entry - password (default), card, identity etc
-// 	Title     string    `gorm:"column:title"`
-//     Name      string    `gorm:"column:name"` // Card holder name/ID card name - for types cards/identity
-//   	Company   string    `gorm:"column:company"` // Company name of person  - for type identity and
-//                                              	// Credit card company for type CC
-// 	Number    string    `gorm:"column:number"`  // Number type - CC number for credit cards
-// 	                                            // ID card number for identity types
-// 	SecurityCode string  `gorm:"security_code"` // CVV number/security code for CC type
-// 	ExpiryMonth string   `gorm:"expiry_month"` // CC or Identity document expiry month
-// 	ExpiryDay string     `gorm:"expiry_day"`   // Identity document expiry day
-// 	ExpiryYear string    `gorm:"expiry_year"`  // CC or Identity document expiry year
-// 	FirstName  string    `gorm:"column:first_name"` // first name - for ID card types
-// 	MiddleName string    `gorm:"column:middle_name"` // middle name - for ID card types
-// 	LastName   string    `gorm:"column:last_name"` // last name - for ID card types	
-// 	Email      string    `gorm:"email"` // Email - for ID card types
-// 	PhoneNumber string   `gorm:"phone_number"` // Phone number - for ID card types
-
-// 	Active    bool       `gorm:"active;default:true"` // Is the id card/CC active ?
-// 	User      string    `gorm:"column:user"`
-// 	Url       string    `gorm:"column:url"`
-// 	Password  string    `gorm:"column:password"`
-// 	Notes     string    `gorm:"column:notes"`
-// 	Tags      string    `gorm:"column:tags"`
-// 	Timestamp time.Time `gorm:"type:timestamp;default:(datetime('now','localtime'))"` // sqlite3
+	ID         int    `gorm:"column:id;autoIncrement;primaryKey"`
+	Title      string `gorm:"column:title"`      // For card type this -> Card Name
+	User       string `gorm:"column:user"`       // For card type this -> Card Holder Name
+	Url        string `gorm:"column:url"`        // For card type this -> Card Number
+	Password   string `gorm:"column:password"`   // For card type this -> CVV number
+	Pin        string `gorm:"column:pin"`        // For card type this -> card pin
+	ExpiryDate string `gorm:"colum:expiry_date"` // For card type this -> Card expiry date
+	Issuer     string `gorm:"column:issuer"`     // For card type this -> Issuing bank
+	Class      string `gorm:"column:class"`      // For card type this -> visa/mastercard/amex etc
+
+	Notes     string    `gorm:"column:notes"`
+	Tags      string    `gorm:"column:tags"`
+	Type      string    `gorm:"column:type"`                                          // Entry type, default/card/ID
+	Timestamp time.Time `gorm:"type:timestamp;default:(datetime('now','localtime'))"` // sqlite3
+
+	// 	ID        int       `gorm:"column:id;autoIncrement;primaryKey"`
+	// 	Type      string    `gorm:"column:type"`  // Type of entry - password (default), card, identity etc
+	// 	Title     string    `gorm:"column:title"`
+	//     Name      string    `gorm:"column:name"` // Card holder name/ID card name - for types cards/identity
+	//   	Company   string    `gorm:"column:company"` // Company name of person  - for type identity and
+	//                                              	// Credit card company for type CC
+	// 	Number    string    `gorm:"column:number"`  // Number type - CC number for credit cards
+	// 	                                            // ID card number for identity types
+	// 	SecurityCode string  `gorm:"security_code"` // CVV number/security code for CC type
+	// 	ExpiryMonth string   `gorm:"expiry_month"` // CC or Identity document expiry month
+	// 	ExpiryDay string     `gorm:"expiry_day"`   // Identity document expiry day
+	// 	ExpiryYear string    `gorm:"expiry_year"`  // CC or Identity document expiry year
+	// 	FirstName  string    `gorm:"column:first_name"` // first name - for ID card types
+	// 	MiddleName string    `gorm:"column:middle_name"` // middle name - for ID card types
+	// 	LastName   string    `gorm:"column:last_name"` // last name - for ID card types
+	// 	Email      string    `gorm:"email"` // Email - for ID card types
+	// 	PhoneNumber string   `gorm:"phone_number"` // Phone number - for ID card types
+
+	// 	Active    bool       `gorm:"active;default:true"` // Is the id card/CC active ?
+	// 	User      string    `gorm:"column:user"`
+	// 	Url       string    `gorm:"column:url"`
+	// 	Password  string    `gorm:"column:password"`
+	// 	Notes     string    `gorm:"column:notes"`
+	// 	Tags      string    `gorm:"column:tags"`
+	// 	Timestamp time.Time `gorm:"type:timestamp;default:(datetime('now','localtime'))"` // sqlite3
 
 }
 
-    
 func (e *Entry) TableName() string {
-    return "entries"
+	return "entries"
 }
 
 // Structure representing an extended entry in the db - for custom fields
 type ExtendedEntry struct {
-    ID         int       `gorm:"column:id;autoIncrement;primaryKey"`
-    FieldName  string    `gorm:"column:field_name"`
-    FieldValue string    `gorm:"column:field_value"`
-    Timestamp  time.Time `gorm:"type:timestamp;default:(datetime('now','localtime'))"` // sqlite3
+	ID         int       `gorm:"column:id;autoIncrement;primaryKey"`
+	FieldName  string    `gorm:"column:field_name"`
+	FieldValue string    `gorm:"column:field_value"`
+	Timestamp  time.Time `gorm:"type:timestamp;default:(datetime('now','localtime'))"` // sqlite3
 
-    Entry   Entry `gorm:"foreignKey:EntryID"`
-    EntryID int
+	Entry   Entry `gorm:"foreignKey:EntryID"`
+	EntryID int
 }
 
 func (ex *ExtendedEntry) TableName() string {
-    return "exentries"
+	return "exentries"
 }
 
 type Address struct {
-	ID     int   `gorm:"column:id;autoIncrement;primaryKey"`
-	Number string `gorm:"column:number"` // Flat or building number
+	ID       int    `gorm:"column:id;autoIncrement;primaryKey"`
+	Number   string `gorm:"column:number"`   // Flat or building number
 	Building string `gorm:"column:building"` // Apartment or building or society name
-	Street  string `gorm:"column:street"` // Street address
+	Street   string `gorm:"column:street"`   // Street address
 	Locality string `gorm:"column:locality"` // Name of the locality e.g: Whitefield
-	Area     string `gorm:"column:area"` // Name of the larger area e.g: East Bangalore
-	City     string `gorm:"column:city"` // Name of the city e.g: Bangalore
-	State   string  `gorm:"column:state"` // Name of the state e.g: Karnataka
-	Country string  `gorm:"column:country"` // Name of the country e.g: India
+	Area     string `gorm:"column:area"`     // Name of the larger area e.g: East Bangalore
+	City     string `gorm:"column:city"`     // Name of the city e.g: Bangalore
+	State    string `gorm:"column:state"`    // Name of the state e.g: Karnataka
+	Country  string `gorm:"column:country"`  // Name of the country e.g: India
 
 	Landmark string `gorm:"column:landmark"` // Name of landmark if any
-	ZipCode string  `gorm:"column:zipcode"` // PIN/ZIP code
-	Type    string  `gorm:"column:type"` // Type of address: Home/Work/Business
+	ZipCode  string `gorm:"column:zipcode"`  // PIN/ZIP code
+	Type     string `gorm:"column:type"`     // Type of address: Home/Work/Business
 
 	Entry   Entry `gorm:"foreignKey:EntryID"`
-	EntryID int	
+	EntryID int
 }
 
 func (ad *Address) TableName() string {
@@ -106,7 +105,7 @@ func (ad *Address) TableName() string {
 func (e1 *Entry) Copy(e2 *Entry) {
 
 	if e2 != nil {
-		switch (e2.Type) {
+		switch e2.Type {
 		case "password":
 			e1.Title = e2.Title
 			e1.User = e2.User
@@ -124,21 +123,21 @@ func (e1 *Entry) Copy(e2 *Entry) {
 			e1.ExpiryDate = e2.ExpiryDate
 			e1.Tags = e2.Tags
 			e1.Notes = e2.Notes
-			e1.Type = e2.Type			
-		// case "identity":
-		// 	e1.Title = e2.Title
-		// 	e1.Name = e2.Name 
-		// 	e1.Company = e2.Company
-		// 	e1.FirstName = e2.FirstName
-		// 	e1.LastName = e2.LastName			
-		// 	e1.MiddleName = e2.MiddleName
-		// 	e1.User = e2.User
-		// 	e1.Email = e2.Email
-		// 	e1.PhoneNumber = e2.PhoneNumber
-		// 	e1.Number = e2.Number
-		// 	e1.Notes = e2.Notes
-		// 	e1.Tags = e2.Tags
-		// 	e1.Type = e2.Type
+			e1.Type = e2.Type
+			// case "identity":
+			// 	e1.Title = e2.Title
+			// 	e1.Name = e2.Name
+			// 	e1.Company = e2.Company
+			// 	e1.FirstName = e2.FirstName
+			// 	e1.LastName = e2.LastName
+			// 	e1.MiddleName = e2.MiddleName
+			// 	e1.User = e2.User
+			// 	e1.Email = e2.Email
+			// 	e1.PhoneNumber = e2.PhoneNumber
+			// 	e1.Number = e2.Number
+			// 	e1.Notes = e2.Notes
+			// 	e1.Tags = e2.Tags
+			// 	e1.Type = e2.Type
 		}
 	}
 }
@@ -146,566 +145,618 @@ func (e1 *Entry) Copy(e2 *Entry) {
 // Clone an entry
 func (e1 *ExtendedEntry) Copy(e2 *ExtendedEntry) {
 
-    if e2 != nil {
-        e1.FieldName = e2.FieldName
-        e1.FieldValue = e2.FieldValue
-        e1.EntryID = e2.EntryID
-    }
+	if e2 != nil {
+		e1.FieldName = e2.FieldName
+		e1.FieldValue = e2.FieldValue
+		e1.EntryID = e2.EntryID
+	}
 }
 
 // Create a new database
 func openDatabase(filePath string) (error, *gorm.DB) {
 
-    db, err := gorm.Open(sqlite.Open(filePath), &gorm.Config{
-        Logger: logger.Default.LogMode(logger.Silent),
-    })
-    return err, db
+	db, err := gorm.Open(sqlite.Open(filePath), &gorm.Config{
+		Logger: logger.Default.LogMode(logger.Silent),
+	})
+	return err, db
 }
 
 // Create a new table for Entries in the database
 func createNewEntry(db *gorm.DB) error {
-    return db.AutoMigrate(&Entry{})
+	return db.AutoMigrate(&Entry{})
 }
 
 // Create a new table for Extended Entries in the database
 func createNewExEntry(db *gorm.DB) error {
-    return db.AutoMigrate(&ExtendedEntry{})
+	return db.AutoMigrate(&ExtendedEntry{})
 }
 
 // Init new database including tables
 func initNewDatabase(dbPath string) error {
 
-    var err error
-    var db *gorm.DB
-    var absPath string
-
-    if hasActiveDatabase() {
-        // Has an active database - encrypt it before creating new one
-        _, activeDbPath := getActiveDatabase()
-        absPath, _ = filepath.Abs(dbPath)
-
-        if absPath == activeDbPath {
-            fmt.Printf("Database already exists and is active - %s\n", dbPath)
-            return nil
-        } else {
-            // TBD
-            fmt.Printf("Encrytping current database - %s\n", activeDbPath)
-            encryptDatabase(activeDbPath, nil)
-        }
-    }
-
-    if _, err = os.Stat(dbPath); err == nil {
-        // filePath exists, remove it
-        os.Remove(dbPath)
-    }
-
-    err, db = openDatabase(dbPath)
-    if err != nil {
-        fmt.Printf("Error creating new database - \"%s\"\n", err.Error())
-        return err
-    }
-
-    err = createNewEntry(db)
-    if err != nil {
-        fmt.Printf("Error creating schema - \"%s\"\n", err.Error())
-        return err
-    }
-
-    err = createNewExEntry(db)
-    if err != nil {
-        fmt.Printf("Error creating schema - \"%s\"\n", err.Error())
-        return err
-    }
-
-    fmt.Printf("Created new database - %s\n", dbPath)
-
-    // Update config
-    absPath, err = filepath.Abs(dbPath)
-    // Chmod it
-    os.Chmod(absPath, 0600)
-
-    if err == nil {
-        fmt.Printf("Updating active db path - %s\n", absPath)
-        updateActiveDbPath(absPath)
-    } else {
-        fmt.Printf("Error - %s\n", err.Error())
-        return err
-    }
-
-    return nil
+	var err error
+	var db *gorm.DB
+	var absPath string
+
+	if hasActiveDatabase() {
+		// Has an active database - encrypt it before creating new one
+		_, activeDbPath := getActiveDatabase()
+		absPath, _ = filepath.Abs(dbPath)
+
+		if absPath == activeDbPath {
+			fmt.Printf("Database already exists and is active - %s\n", dbPath)
+			return nil
+		} else {
+			// TBD
+			fmt.Printf("Encrytping current database - %s\n", activeDbPath)
+			encryptDatabase(activeDbPath, nil)
+		}
+	}
+
+	if _, err = os.Stat(dbPath); err == nil {
+		// filePath exists, remove it
+		os.Remove(dbPath)
+	}
+
+	err, db = openDatabase(dbPath)
+	if err != nil {
+		fmt.Printf("Error creating new database - \"%s\"\n", err.Error())
+		return err
+	}
+
+	err = createNewEntry(db)
+	if err != nil {
+		fmt.Printf("Error creating schema - \"%s\"\n", err.Error())
+		return err
+	}
+
+	err = createNewExEntry(db)
+	if err != nil {
+		fmt.Printf("Error creating schema - \"%s\"\n", err.Error())
+		return err
+	}
+
+	fmt.Printf("Created new database - %s\n", dbPath)
+
+	// Update config
+	absPath, err = filepath.Abs(dbPath)
+	// Chmod it
+	os.Chmod(absPath, 0600)
+
+	if err == nil {
+		fmt.Printf("Updating active db path - %s\n", absPath)
+		updateActiveDbPath(absPath)
+	} else {
+		fmt.Printf("Error - %s\n", err.Error())
+		return err
+	}
+
+	return nil
 }
 
 // Open currently active database
 func openActiveDatabase() (error, *gorm.DB) {
 
-    var dbPath string
-    var err error
+	var dbPath string
+	var err error
 
-    err, dbPath = getActiveDatabase()
-    if err != nil {
-        fmt.Printf("Error getting active database path - %s\n", err.Error())
-        return err, nil
-    }
+	err, dbPath = getActiveDatabase()
+	if err != nil {
+		fmt.Printf("Error getting active database path - %s\n", err.Error())
+		return err, nil
+	}
 
-    err, db := openDatabase(dbPath)
-    if err != nil {
-        fmt.Printf("Error opening active database path - %s: %s\n", dbPath, err.Error())
-        return err, nil
-    }
+	err, db := openDatabase(dbPath)
+	if err != nil {
+		fmt.Printf("Error opening active database path - %s: %s\n", dbPath, err.Error())
+		return err, nil
+	}
 
-    return nil, db
+	return nil, db
 }
 
 // Add custom entries to a database entry
 func addCustomEntries(db *gorm.DB, entry *Entry, customEntries []CustomEntry) error {
 
-    var count int
-    var err error
+	var count int
+	var err error
 
-    err = createNewExEntry(db)
-    if err != nil {
-        fmt.Printf("Error creating schema - \"%s\"\n", err.Error())
-        return err
-    }
+	err = createNewExEntry(db)
+	if err != nil {
+		fmt.Printf("Error creating schema - \"%s\"\n", err.Error())
+		return err
+	}
 
-    for _, customEntry := range customEntries {
-        var exEntry ExtendedEntry
+	for _, customEntry := range customEntries {
+		var exEntry ExtendedEntry
 
-        exEntry = ExtendedEntry{FieldName: customEntry.fieldName, FieldValue: customEntry.fieldValue,
-            EntryID: entry.ID}
+		exEntry = ExtendedEntry{FieldName: customEntry.fieldName, FieldValue: customEntry.fieldValue,
+			EntryID: entry.ID}
 
-        resultEx := db.Create(&exEntry)
-        if resultEx.Error == nil && resultEx.RowsAffected == 1 {
-            count += 1
-        }
-    }
+		resultEx := db.Create(&exEntry)
+		if resultEx.Error == nil && resultEx.RowsAffected == 1 {
+			count += 1
+		}
+	}
 
-    fmt.Printf("Created %d custom entries for entry: %d.\n", count, entry.ID)
-    return nil
+	fmt.Printf("Created %d custom entries for entry: %d.\n", count, entry.ID)
+	return nil
 }
 
 // Replace custom entries to a database entry (Drop existing and add fresh)
 func replaceCustomEntries(db *gorm.DB, entry *Entry, updatedEntries []CustomEntry) error {
 
-    var count int
-    var err error
-    var customEntries []ExtendedEntry
+	var count int
+	var err error
+	var customEntries []ExtendedEntry
 
-    err = createNewExEntry(db)
-    if err != nil {
-        fmt.Printf("Error creating schema - \"%s\"\n", err.Error())
-        return err
-    }
+	err = createNewExEntry(db)
+	if err != nil {
+		fmt.Printf("Error creating schema - \"%s\"\n", err.Error())
+		return err
+	}
 
-    db.Where("entry_id = ?", entry.ID).Delete(&customEntries)
+	db.Where("entry_id = ?", entry.ID).Delete(&customEntries)
 
-    for _, customEntry := range updatedEntries {
-        var exEntry ExtendedEntry
+	for _, customEntry := range updatedEntries {
+		var exEntry ExtendedEntry
 
-        exEntry = ExtendedEntry{FieldName: customEntry.fieldName, FieldValue: customEntry.fieldValue,
-            EntryID: entry.ID}
+		exEntry = ExtendedEntry{FieldName: customEntry.fieldName, FieldValue: customEntry.fieldValue,
+			EntryID: entry.ID}
 
-        resultEx := db.Create(&exEntry)
-        if resultEx.Error == nil && resultEx.RowsAffected == 1 {
-            count += 1
-        }
-    }
+		resultEx := db.Create(&exEntry)
+		if resultEx.Error == nil && resultEx.RowsAffected == 1 {
+			count += 1
+		}
+	}
 
-    fmt.Printf("Created %d custom entries for entry: %d.\n", count, entry.ID)
-    return nil
+	fmt.Printf("Created %d custom entries for entry: %d.\n", count, entry.ID)
+	return nil
 }
 
 // Add a new entry to current database
 func addNewDatabaseEntry(title, userName, url, passwd, tags string,
-    notes string, customEntries []CustomEntry) error {
-
-    var entry Entry
-    var err error
-    var db *gorm.DB
-
-    entry = Entry{Title: title, User: userName, Url: url, Password: passwd, Tags: strings.TrimSpace(tags),
-        Notes: notes}
-
-    err, db = openActiveDatabase()
-    if err == nil && db != nil {
-        //      result := db.Debug().Create(&entry)
-        result := db.Create(&entry)
-        if result.Error == nil && result.RowsAffected == 1 {
-            // Add custom fields if given
-            fmt.Printf("Created new entry with id: %d.\n", entry.ID)
-            if len(customEntries) > 0 {
-                return addCustomEntries(db, &entry, customEntries)
-            }
-            return nil
-        } else if result.Error != nil {
-            return result.Error
-        }
-    }
-
-    return err
+	notes string, customEntries []CustomEntry) error {
+
+	var entry Entry
+	var err error
+	var db *gorm.DB
+
+	entry = Entry{Title: title, User: userName, Url: url, Password: passwd, Tags: strings.TrimSpace(tags),
+		Notes: notes}
+
+	err, db = openActiveDatabase()
+	if err == nil && db != nil {
+		//      result := db.Debug().Create(&entry)
+		result := db.Create(&entry)
+		if result.Error == nil && result.RowsAffected == 1 {
+			// Add custom fields if given
+			fmt.Printf("Created new entry with id: %d.\n", entry.ID)
+			if len(customEntries) > 0 {
+				return addCustomEntries(db, &entry, customEntries)
+			}
+			return nil
+		} else if result.Error != nil {
+			return result.Error
+		}
+	}
+
+	return err
+}
+
+func updateDatabaseCardEntry(entry *Entry, cardName, cardNumber, cardHolder, cardClass,
+	cardCvv, cardPin, cardExpiry, notes, tags string, customEntries []CustomEntry,
+	flag bool) error {
+
+	var updateMap map[string]interface{}
+	updateMap = make(map[string]interface{})
+
+	keyValMap := map[string]string{
+		"title":    cardName,
+		"user":     cardHolder,
+		"url":      cardNumber,
+		"password": cardCvv,
+		"pin":      cardPin,
+		// Issuer has to be the same
+		"class":       cardClass,
+		"expiry_date": cardExpiry,
+		"tags":        strings.TrimSpace(tags),
+		"notes":       notes,
+	}
+
+	for key, val := range keyValMap {
+		if len(val) > 0 {
+			updateMap[key] = val
+		}
+	}
+	fmt.Printf("%+v\n", updateMap)
+
+	if len(updateMap) == 0 && !flag {
+		fmt.Printf("Nothing to update\n")
+		return nil
+	}
+
+	// Update timestamp also
+	updateMap["timestamp"] = time.Now()
+
+	err, db := openActiveDatabase()
+
+	if err == nil && db != nil {
+		result := db.Model(entry).Updates(updateMap)
+		if result.Error != nil {
+			return result.Error
+		}
+
+		if flag {
+			replaceCustomEntries(db, entry, customEntries)
+		}
+		fmt.Println("Updated entry.")
+		return nil
+	}
+
+	return err
 }
 
 // Add a new card entry to current database
 func addNewDatabaseCardEntry(cardName, cardNumber, cardHolder, cardIssuer, cardClass,
-    cardCvv, cardPin, cardExpiry, notes, tags string, customEntries []CustomEntry) error {
-
-    var entry Entry
-    var err error
-    var db *gorm.DB
-
-    entry = Entry{
-        Title: cardName,
-        User: cardHolder,
-        Url: cardNumber,
-        Password: cardCvv,
-        Pin: cardPin,
-        Issuer: cardIssuer,
-        Class: cardClass,
-        ExpiryDate: cardExpiry,
-        Type: "card",
-        Tags: strings.TrimSpace(tags),
-        Notes: notes}
-
-    err, db = openActiveDatabase()
-    if err == nil && db != nil {
-        //      result := db.Debug().Create(&entry)
-        result := db.Create(&entry)
-        if result.Error == nil && result.RowsAffected == 1 {
-            // Add custom fields if given
-            fmt.Printf("Created new entry with id: %d.\n", entry.ID)
-            if len(customEntries) > 0 {
-                return addCustomEntries(db, &entry, customEntries)
-            }
-            return nil
-        } else if result.Error != nil {
-            return result.Error
-        }
-    }
-
-    return err
-}
+	cardCvv, cardPin, cardExpiry, notes, tags string, customEntries []CustomEntry) error {
+
+	var entry Entry
+	var err error
+	var db *gorm.DB
+
+	entry = Entry{
+		Title:      cardName,
+		User:       cardHolder,
+		Url:        cardNumber,
+		Password:   cardCvv,
+		Pin:        cardPin,
+		Issuer:     cardIssuer,
+		Class:      cardClass,
+		ExpiryDate: cardExpiry,
+		Type:       "card",
+		Tags:       strings.TrimSpace(tags),
+		Notes:      notes}
+
+	err, db = openActiveDatabase()
+	if err == nil && db != nil {
+		//      result := db.Debug().Create(&entry)
+		result := db.Create(&entry)
+		if result.Error == nil && result.RowsAffected == 1 {
+			// Add custom fields if given
+			fmt.Printf("Created new entry with id: %d.\n", entry.ID)
+			if len(customEntries) > 0 {
+				return addCustomEntries(db, &entry, customEntries)
+			}
+			return nil
+		} else if result.Error != nil {
+			return result.Error
+		}
+	}
 
+	return err
+}
 
 // Update current database entry with new values
 func updateDatabaseEntry(entry *Entry, title, userName, url, passwd, tags string,
-    notes string, customEntries []CustomEntry, flag bool) error {
-
-    var updateMap map[string]interface{}
-
-    updateMap = make(map[string]interface{})
-
-    keyValMap := map[string]string{
-        "title":    title,
-        "user":     userName,
-        "url":      url,
-        "password": passwd,
-        "notes":    notes,
-        "tags":     tags}
-
-    for key, val := range keyValMap {
-        if len(val) > 0 {
-            updateMap[key] = val
-        }
-    }
-
-    if len(updateMap) == 0 && !flag {
-        fmt.Printf("Nothing to update\n")
-        return nil
-    }
-
-    // Update timestamp also
-    updateMap["timestamp"] = time.Now()
-
-    err, db := openActiveDatabase()
-
-    if err == nil && db != nil {
-        result := db.Model(entry).Updates(updateMap)
-        if result.Error != nil {
-            return result.Error
-        }
-
-        if flag {
-            replaceCustomEntries(db, entry, customEntries)
-        }
-        fmt.Println("Updated entry.")
-        return nil
-    }
-
-    return err
+	notes string, customEntries []CustomEntry, flag bool) error {
+
+	var updateMap map[string]interface{}
+
+	updateMap = make(map[string]interface{})
+
+	keyValMap := map[string]string{
+		"title":    title,
+		"user":     userName,
+		"url":      url,
+		"password": passwd,
+		"notes":    notes,
+		"tags":     tags}
+
+	for key, val := range keyValMap {
+		if len(val) > 0 {
+			updateMap[key] = val
+		}
+	}
+
+	if len(updateMap) == 0 && !flag {
+		fmt.Printf("Nothing to update\n")
+		return nil
+	}
+
+	// Update timestamp also
+	updateMap["timestamp"] = time.Now()
+
+	err, db := openActiveDatabase()
+
+	if err == nil && db != nil {
+		result := db.Model(entry).Updates(updateMap)
+		if result.Error != nil {
+			return result.Error
+		}
+
+		if flag {
+			replaceCustomEntries(db, entry, customEntries)
+		}
+		fmt.Println("Updated entry.")
+		return nil
+	}
+
+	return err
 }
 
 // Find entry given the id
 func getEntryById(id int) (error, *Entry) {
 
-    var entry Entry
-    var err error
-    var db *gorm.DB
-
-    err, db = openActiveDatabase()
-    if err == nil && db != nil {
-        result := db.First(&entry, id)
-        if result.Error == nil {
-            return nil, &entry
-        } else {
-            return result.Error, nil
-        }
-    }
-
-    return err, nil
+	var entry Entry
+	var err error
+	var db *gorm.DB
+
+	err, db = openActiveDatabase()
+	if err == nil && db != nil {
+		result := db.First(&entry, id)
+		if result.Error == nil {
+			return nil, &entry
+		} else {
+			return result.Error, nil
+		}
+	}
+
+	return err, nil
 }
 
 // Search database for the given string and return all matches
 func searchDatabaseEntry(term string) (error, []Entry) {
 
-    var entries []Entry
-    var err error
-    var db *gorm.DB
-    var searchTerm string
+	var entries []Entry
+	var err error
+	var db *gorm.DB
+	var searchTerm string
+
+	err, db = openActiveDatabase()
+	if err == nil && db != nil {
+		searchTerm = fmt.Sprintf("%%%s%%", term)
+		// Search on fields title, user, url and notes and tags.
+		query := db.Where(fmt.Sprintf("title like \"%s\"", searchTerm))
 
-    err, db = openActiveDatabase()
-    if err == nil && db != nil {
-        searchTerm = fmt.Sprintf("%%%s%%", term)
-        // Search on fields title, user, url and notes and tags.
-        query := db.Where(fmt.Sprintf("title like \"%s\"", searchTerm))
+		for _, field := range []string{"user", "url", "notes", "tags"} {
+			query = query.Or(fmt.Sprintf("%s like \"%s\"", field, searchTerm))
+		}
 
-        for _, field := range[]string{"user", "url", "notes", "tags"} {
-            query = query.Or(fmt.Sprintf("%s like \"%s\"", field, searchTerm))
-        }
-        
-        res := query.Find(&entries)
+		res := query.Find(&entries)
 
-        if res.Error != nil {
-            return res.Error, nil
-        }
+		if res.Error != nil {
+			return res.Error, nil
+		}
 
-        return nil, entries
-    }
+		return nil, entries
+	}
 
-    return err, entries
+	return err, entries
 
 }
 
 // Union of two entry arrays
 func union(entry1 []Entry, entry2 []Entry) []Entry {
 
-    m := make(map[int]bool)
+	m := make(map[int]bool)
 
-    for _, item := range entry1 {
-        m[item.ID] = true
-    }
+	for _, item := range entry1 {
+		m[item.ID] = true
+	}
 
-    for _, item := range entry2 {
-        if _, ok := m[item.ID]; !ok {
-            entry1 = append(entry1, item)
-        }
-    }
+	for _, item := range entry2 {
+		if _, ok := m[item.ID]; !ok {
+			entry1 = append(entry1, item)
+		}
+	}
 
-    return entry1
+	return entry1
 }
 
 // Intersection of two entry arrays
 func intersection(entry1 []Entry, entry2 []Entry) []Entry {
 
-    var common []Entry
+	var common []Entry
 
-    m := make(map[int]bool)
+	m := make(map[int]bool)
 
-    for _, item := range entry1 {
-        m[item.ID] = true
-    }
+	for _, item := range entry1 {
+		m[item.ID] = true
+	}
 
-    for _, item := range entry2 {
-        if _, ok := m[item.ID]; ok {
-            common = append(common, item)
-        }
-    }
+	for _, item := range entry2 {
+		if _, ok := m[item.ID]; ok {
+			common = append(common, item)
+		}
+	}
 
-    return common
+	return common
 }
 
 // Search database for the given terms and returns matches according to operator
 func searchDatabaseEntries(terms []string, operator string) (error, []Entry) {
 
-    var err error
-    var finalEntries []Entry
-
-    for idx, term := range terms {
-        var entries []Entry
-
-        err, entries = searchDatabaseEntry(term)
-        if err != nil {
-            fmt.Printf("Error searching for term: %s - \"%s\"\n", term, err.Error())
-            return err, entries
-        }
-
-        if idx == 0 {
-            finalEntries = entries
-        } else {
-            if operator == "AND" {
-                finalEntries = intersection(finalEntries, entries)
-            } else if operator == "OR" {
-                finalEntries = union(finalEntries, entries)
-            }
-        }
-    }
-
-    return nil, finalEntries
+	var err error
+	var finalEntries []Entry
+
+	for idx, term := range terms {
+		var entries []Entry
+
+		err, entries = searchDatabaseEntry(term)
+		if err != nil {
+			fmt.Printf("Error searching for term: %s - \"%s\"\n", term, err.Error())
+			return err, entries
+		}
+
+		if idx == 0 {
+			finalEntries = entries
+		} else {
+			if operator == "AND" {
+				finalEntries = intersection(finalEntries, entries)
+			} else if operator == "OR" {
+				finalEntries = union(finalEntries, entries)
+			}
+		}
+	}
+
+	return nil, finalEntries
 }
 
 // Remove a given database entry
 func removeDatabaseEntry(entry *Entry) error {
 
-    var err error
-    var db *gorm.DB
+	var err error
+	var db *gorm.DB
 
-    err, db = openActiveDatabase()
-    if err == nil && db != nil {
-        var exEntries []ExtendedEntry
+	err, db = openActiveDatabase()
+	if err == nil && db != nil {
+		var exEntries []ExtendedEntry
 
-        res := db.Delete(entry)
-        if res.Error != nil {
-            return res.Error
-        }
+		res := db.Delete(entry)
+		if res.Error != nil {
+			return res.Error
+		}
 
-        // Delete extended entries if any
-        exEntries = getExtendedEntries(entry)
-        if len(exEntries) > 0 {
-            res = db.Delete(exEntries)
-            if res.Error != nil {
-                return res.Error
-            }
-        }
+		// Delete extended entries if any
+		exEntries = getExtendedEntries(entry)
+		if len(exEntries) > 0 {
+			res = db.Delete(exEntries)
+			if res.Error != nil {
+				return res.Error
+			}
+		}
 
-        return nil
-    }
+		return nil
+	}
 
-    return err
+	return err
 }
 
 // Clone an entry and return cloned entry
 func cloneEntry(entry *Entry) (error, *Entry) {
 
-    var entryNew Entry
-    var err error
-    var db *gorm.DB
+	var entryNew Entry
+	var err error
+	var db *gorm.DB
 
-    err, db = openActiveDatabase()
-    if err == nil && db != nil {
-        entryNew.Copy(entry)
+	err, db = openActiveDatabase()
+	if err == nil && db != nil {
+		entryNew.Copy(entry)
 
-        result := db.Create(&entryNew)
-        if result.Error == nil && result.RowsAffected == 1 {
-            fmt.Printf("Cloned to new entry, id: %d.\n", entryNew.ID)
-            return nil, &entryNew
-        } else if result.Error != nil {
-            return result.Error, nil
-        }
-    }
+		result := db.Create(&entryNew)
+		if result.Error == nil && result.RowsAffected == 1 {
+			fmt.Printf("Cloned to new entry, id: %d.\n", entryNew.ID)
+			return nil, &entryNew
+		} else if result.Error != nil {
+			return result.Error, nil
+		}
+	}
 
-    return err, nil
+	return err, nil
 }
 
 // Clone extended entries for an entry and return error code
 func cloneExtendedEntries(entry *Entry, exEntries []ExtendedEntry) error {
 
-    var err error
-    var db *gorm.DB
+	var err error
+	var db *gorm.DB
 
-    err, db = openActiveDatabase()
-    if err == nil && db != nil {
-        for _, exEntry := range exEntries {
-            var exEntryNew ExtendedEntry
+	err, db = openActiveDatabase()
+	if err == nil && db != nil {
+		for _, exEntry := range exEntries {
+			var exEntryNew ExtendedEntry
 
-            exEntryNew.Copy(&exEntry)
-            // Update the ID!
-            exEntryNew.EntryID = entry.ID
+			exEntryNew.Copy(&exEntry)
+			// Update the ID!
+			exEntryNew.EntryID = entry.ID
 
-            result := db.Create(&exEntryNew)
-            if result.Error != nil {
-                return result.Error
-            }
-        }
-    }
+			result := db.Create(&exEntryNew)
+			if result.Error != nil {
+				return result.Error
+			}
+		}
+	}
 
-    return err
+	return err
 }
 
 // Return an iterator over all entries using the given order query keys
 func iterateEntries(orderKey string, order string) (error, []Entry) {
 
-    var err error
-    var db *gorm.DB
-    var entries []Entry
+	var err error
+	var db *gorm.DB
+	var entries []Entry
 
-    err, db = openActiveDatabase()
+	err, db = openActiveDatabase()
 
-    if err == nil && db != nil {
-        var rows *sql.Rows
+	if err == nil && db != nil {
+		var rows *sql.Rows
 
-        rows, err = db.Model(&Entry{}).Order(fmt.Sprintf("%s %s", orderKey, order)).Rows()
-        for rows.Next() {
-            var entry Entry
+		rows, err = db.Model(&Entry{}).Order(fmt.Sprintf("%s %s", orderKey, order)).Rows()
+		for rows.Next() {
+			var entry Entry
 
-            db.ScanRows(rows, &entry)
-            entries = append(entries, entry)
-        }
+			db.ScanRows(rows, &entry)
+			entries = append(entries, entry)
+		}
 
-        return nil, entries
-    }
+		return nil, entries
+	}
 
-    return err, nil
+	return err, nil
 }
 
 // Export all entries to string array
 func entriesToStringArray(skipLongFields bool) (error, [][]string) {
 
-    var err error
-    var db *gorm.DB
-    var dataArray [][]string
+	var err error
+	var db *gorm.DB
+	var dataArray [][]string
 
-    err, db = openActiveDatabase()
+	err, db = openActiveDatabase()
 
-    if err == nil && db != nil {
-        var rows *sql.Rows
-        var count int64
+	if err == nil && db != nil {
+		var rows *sql.Rows
+		var count int64
 
-        db.Model(&Entry{}).Count(&count)
+		db.Model(&Entry{}).Count(&count)
 
-        dataArray = make([][]string, 0, count)
+		dataArray = make([][]string, 0, count)
 
-        rows, err = db.Model(&Entry{}).Order("id asc").Rows()
-        for rows.Next() {
-            var entry Entry
-            var entryData []string
+		rows, err = db.Model(&Entry{}).Order("id asc").Rows()
+		for rows.Next() {
+			var entry Entry
+			var entryData []string
 
-            db.ScanRows(rows, &entry)
+			db.ScanRows(rows, &entry)
 
-            if skipLongFields {
-                // Skip Notes
-                entryData = []string{strconv.Itoa(entry.ID), entry.Title, entry.User, entry.Password, entry.Timestamp.Format("2006-06-02 15:04:05")}
-            } else {
-                entryData = []string{strconv.Itoa(entry.ID), entry.Title, entry.User, entry.Url, entry.Password, entry.Notes, entry.Timestamp.Format("2006-06-02 15:04:05")}
-            }
+			if skipLongFields {
+				// Skip Notes
+				entryData = []string{strconv.Itoa(entry.ID), entry.Title, entry.User, entry.Password, entry.Timestamp.Format("2006-06-02 15:04:05")}
+			} else {
+				entryData = []string{strconv.Itoa(entry.ID), entry.Title, entry.User, entry.Url, entry.Password, entry.Notes, entry.Timestamp.Format("2006-06-02 15:04:05")}
+			}
 
-            dataArray = append(dataArray, entryData)
-        }
-    }
+			dataArray = append(dataArray, entryData)
+		}
+	}
 
-    return err, dataArray
+	return err, dataArray
 }
 
 // Get extended entries associated to an entry
 func getExtendedEntries(entry *Entry) []ExtendedEntry {
 
-    var err error
-    var db *gorm.DB
-    var customEntries []ExtendedEntry
+	var err error
+	var db *gorm.DB
+	var customEntries []ExtendedEntry
 
-    err, db = openActiveDatabase()
+	err, db = openActiveDatabase()
 
-    if err == nil && db != nil {
-        db.Where("entry_id = ?", entry.ID).Find(&customEntries)
-    }
+	if err == nil && db != nil {
+		db.Where("entry_id = ?", entry.ID).Find(&customEntries)
+	}
 
-    return customEntries
+	return customEntries
 }
diff --git a/export.go b/export.go
new file mode 100644
index 0000000..30442b6
--- /dev/null
+++ b/export.go
@@ -0,0 +1,383 @@
+package main
+
+import (
+	"bufio"
+	"encoding/csv"
+	"errors"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+)
+
+// Export data to a varity of file types
+func exportToFile(fileName string) error {
+
+	var err error
+	var maxKrypt bool
+	var defaultDB string
+	var passwd string
+
+	ext := strings.ToLower(filepath.Ext(fileName))
+
+	maxKrypt, defaultDB = isActiveDatabaseEncryptedAndMaxKryptOn()
+
+	if ext == ".csv" || ext == ".md" || ext == ".html" || ext == ".pdf" {
+		// If max krypt on - then autodecrypt on call and auto encrypt after call
+		if maxKrypt {
+			err, passwd = decryptDatabase(defaultDB)
+			if err != nil {
+				return err
+			}
+		}
+	}
+
+	switch ext {
+	case ".csv":
+		err = exportToCsv(fileName)
+	case ".md":
+		err = exportToMarkdown(fileName)
+	case ".html":
+		err = exportToHTML(fileName)
+	case ".pdf":
+		err = exportToPDF(fileName)
+	default:
+		fmt.Printf("Error - extn %s not supported\n", ext)
+		return fmt.Errorf("format %s not supported", ext)
+	}
+
+	if err != nil {
+		fmt.Printf("Error exporting to \"%s\" - \"%s\"\n", fileName, err.Error())
+		return err
+	} else {
+		if _, err = os.Stat(fileName); err == nil {
+			fmt.Printf("Exported to %s.\n", fileName)
+			// Chmod 600
+			os.Chmod(fileName, 0600)
+
+			// If max krypt on - then autodecrypt on call and auto encrypt after call
+			if maxKrypt {
+				err = encryptDatabase(defaultDB, &passwd)
+			}
+
+			return err
+		}
+	}
+
+	return err
+}
+
+// Export current database to markdown
+func exportToMarkdown(fileName string) error {
+
+	var err error
+	var dataArray [][]string
+	var fh *os.File
+	var maxLengths [7]int
+	var headers []string = []string{" ID ", " Title ", " User ", " URL ", " Password ", " Notes ", " Modified "}
+
+	err, dataArray = entriesToStringArray(false)
+
+	if err != nil {
+		fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
+		return err
+	}
+
+	for _, record := range dataArray {
+		for idx, field := range record {
+
+			if len(field) > maxLengths[idx] {
+				maxLengths[idx] = len(field)
+			}
+		}
+	}
+
+	//  fmt.Printf("%+v\n", maxLengths)
+	fh, err = os.Create(fileName)
+	if err != nil {
+		fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
+		return err
+	}
+
+	defer fh.Close()
+
+	writer := bufio.NewWriter(fh)
+
+	// Write markdown header
+	for idx, length := range maxLengths {
+		delta := length - len(headers[idx])
+		//      fmt.Printf("%d\n", delta)
+		if delta > 0 {
+			for i := 0; i < delta+2; i++ {
+				headers[idx] += " "
+			}
+		}
+	}
+
+	writer.WriteString(" |" + strings.Join(headers, "|") + "|\n")
+
+	// Write line separator
+	writer.WriteString(" | ")
+	for _, length := range maxLengths {
+
+		for i := 0; i < length; i++ {
+			writer.WriteString("-")
+		}
+		writer.WriteString(" | ")
+	}
+	writer.WriteString("\n")
+
+	// Write records
+	for _, record := range dataArray {
+		writer.WriteString(" | ")
+		for _, field := range record {
+			writer.WriteString(field + " | ")
+		}
+		writer.WriteString("\n")
+	}
+
+	writer.Flush()
+
+	return nil
+
+}
+
+// This needs pandoc and pdflatex support
+func exportToPDF(fileName string) error {
+
+	var err error
+	var tmpFile string
+	var passwd string
+	var pdfTkFound bool
+
+	cmd := exec.Command("which", "pandoc")
+	if _, err = cmd.Output(); err != nil {
+		return errors.New("pandoc not found")
+	}
+
+	cmd = exec.Command("which", "pdftk")
+	if _, err = cmd.Output(); err != nil {
+		fmt.Printf("pdftk not found, PDF won't be secure!\n")
+	} else {
+		pdfTkFound = true
+	}
+
+	if pdfTkFound {
+		fmt.Printf("PDF Encryption Password: ")
+		err, passwd = readPassword()
+	}
+
+	tmpFile = randomFileName(os.TempDir(), ".tmp")
+	//  fmt.Printf("Temp file => %s\n", tmpFile)
+	err = exportToMarkdownLimited(tmpFile)
+
+	if err == nil {
+		var args []string = []string{"-o", fileName, "-f", "markdown", "-V", "geometry:landscape", "--columns=600", "--pdf-engine", "xelatex", "--dpi=150", tmpFile}
+
+		cmd = exec.Command("pandoc", args...)
+		_, err = cmd.Output()
+		// Remove tmpfile
+		os.Remove(tmpFile)
+
+		// If the file is generated, encrypt it if pdfTkFound
+		if _, err = os.Stat(fileName); err == nil {
+			fmt.Printf("\nFile %s created without password.\n", fileName)
+
+			if pdfTkFound && len(passwd) > 0 {
+				tmpFile = randomFileName(".", ".pdf")
+				//              fmt.Printf("pdf file => %s\n", tmpFile)
+				args = []string{fileName, "output", tmpFile, "user_pw", passwd}
+				cmd = exec.Command("pdftk", args...)
+				_, err = cmd.Output()
+
+				if err == nil {
+					// Copy over
+					fmt.Printf("Added password to %s.\n", fileName)
+					os.Remove(fileName)
+					err = os.Rename(tmpFile, fileName)
+				} else {
+					fmt.Printf("Error adding password to pdf - \"%s\"\n", err.Error())
+				}
+			}
+		}
+	}
+
+	return err
+
+}
+
+// Export current database to markdown minus the long fields
+func exportToMarkdownLimited(fileName string) error {
+
+	var err error
+	var dataArray [][]string
+	var fh *os.File
+	var maxLengths [5]int
+	var headers []string = []string{" ID ", " Title ", " User ", " Password ", " Modified "}
+
+	err, dataArray = entriesToStringArray(true)
+
+	if err != nil {
+		fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
+		return err
+	}
+
+	for _, record := range dataArray {
+		for idx, field := range record {
+
+			if len(field) > maxLengths[idx] {
+				maxLengths[idx] = len(field)
+			}
+		}
+	}
+
+	//  fmt.Printf("%+v\n", maxLengths)
+	fh, err = os.Create(fileName)
+	if err != nil {
+		fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
+		return err
+	}
+
+	defer fh.Close()
+
+	writer := bufio.NewWriter(fh)
+
+	// Write markdown header
+	for idx, length := range maxLengths {
+		delta := length - len(headers[idx])
+		//      fmt.Printf("%d\n", delta)
+		if delta > 0 {
+			for i := 0; i < delta+2; i++ {
+				headers[idx] += " "
+			}
+		}
+	}
+
+	writer.WriteString(" |" + strings.Join(headers, "|") + "|\n")
+
+	// Write line separator
+	writer.WriteString(" | ")
+	for _, length := range maxLengths {
+
+		for i := 0; i < length; i++ {
+			writer.WriteString("-")
+		}
+		writer.WriteString(" | ")
+	}
+	writer.WriteString("\n")
+
+	// Write records
+	for _, record := range dataArray {
+		writer.WriteString(" | ")
+		for _, field := range record {
+			writer.WriteString(field + " | ")
+		}
+		writer.WriteString("\n")
+	}
+
+	writer.Flush()
+
+	return nil
+
+}
+
+// Export current database to html
+func exportToHTML(fileName string) error {
+
+	var err error
+	var dataArray [][]string
+	var fh *os.File
+	var headers []string = []string{" ID ", " Title ", " User ", " URL ", " Password ", " Notes ", " Modified "}
+
+	err, dataArray = entriesToStringArray(false)
+
+	if err != nil {
+		fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
+		return err
+	}
+
+	//  fmt.Printf("%+v\n", maxLengths)
+	fh, err = os.Create(fileName)
+	if err != nil {
+		fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
+		return err
+	}
+
+	defer fh.Close()
+
+	writer := bufio.NewWriter(fh)
+
+	writer.WriteString("<html><body>\n")
+	writer.WriteString("<table cellPadding=\"2\" cellSpacing=\"2\" border=\"1\">\n")
+	writer.WriteString("<theader>\n")
+
+	for _, h := range headers {
+		writer.WriteString(fmt.Sprintf("<th>%s</th>", h))
+	}
+	writer.WriteString("</theader>\n")
+	writer.WriteString("<tbody>\n")
+
+	// Write records
+	for _, record := range dataArray {
+		writer.WriteString("<tr>")
+		for _, field := range record {
+			writer.WriteString(fmt.Sprintf("<td>%s</td>", field))
+		}
+		writer.WriteString("</tr>\n")
+	}
+	writer.WriteString("</tbody>\n")
+	writer.WriteString("</table>\n")
+
+	writer.WriteString("</body></html>\n")
+
+	writer.Flush()
+
+	return nil
+
+}
+
+// Export current database to CSV
+func exportToCsv(fileName string) error {
+
+	var err error
+	var dataArray [][]string
+	var fh *os.File
+
+	err, dataArray = entriesToStringArray(false)
+
+	if err != nil {
+		fmt.Printf("Error exporting entries to string array - \"%s\"\n", err.Error())
+		return err
+	}
+
+	fh, err = os.Create(fileName)
+	if err != nil {
+		fmt.Printf("Cannt open \"%s\" for writing - \"%s\"\n", fileName, err.Error())
+		return err
+	}
+
+	writer := csv.NewWriter(fh)
+
+	// Write header
+	writer.Write([]string{"ID", "Title", "User", "URL", "Password", "Notes", "Modified"})
+
+	for idx, record := range dataArray {
+		if err = writer.Write(record); err != nil {
+			fmt.Printf("Error writing record #%d to %s - \"%s\"\n", idx+1, fileName, err.Error())
+			break
+		}
+	}
+
+	writer.Flush()
+
+	if err != nil {
+		return err
+	}
+
+	os.Chmod(fileName, 0600)
+	fmt.Printf("!WARNING: Passwords are stored in plain-text!\n")
+	fmt.Printf("Exported %d records to %s .\n", len(dataArray), fileName)
+
+	return nil
+}
diff --git a/main.go b/main.go
index 2f878b5..0078724 100644
--- a/main.go
+++ b/main.go
@@ -3,10 +3,10 @@
 package main
 
 import (
-    "fmt"
-    "github.com/pythonhacker/argparse"
-    "os"
-    "strings"
+	"fmt"
+	"github.com/pythonhacker/argparse"
+	"os"
+	"strings"
 )
 
 const VERSION = 0.4
@@ -21,245 +21,245 @@ type actionFunc func(string) error
 type actionFunc2 func(string) (error, string)
 type voidFunc func() error
 type voidFunc2 func() (error, string)
-type settingFunc func(string) 
+type settingFunc func(string)
 
 // Structure to keep the options data
 type CmdOption struct {
-    Short   string
-    Long    string
-    Help    string
-    Path    string
-    Default string
+	Short   string
+	Long    string
+	Help    string
+	Path    string
+	Default string
 }
 
 // Print the program's usage string and exit
 func printUsage() error {
-    //  getopt.Usage()
-    os.Exit(0)
+	//  getopt.Usage()
+	os.Exit(0)
 
-    return nil
+	return nil
 }
 
 // Print the program's version info and exit
 func printVersionInfo() error {
-    fmt.Printf("%s version %.2f\n", APP, VERSION)
-    os.Exit(0)
+	fmt.Printf("%s version %.2f\n", APP, VERSION)
+	os.Exit(0)
 
-    return nil
+	return nil
 }
 
 // Command-line wrapper to generateRandomPassword
 func genPass() (error, string) {
-    var err error
-    var passwd string
+	var err error
+	var passwd string
 
-    err, passwd = generateStrongPassword()
+	err, passwd = generateStrongPassword()
 
-    if err != nil {
-        fmt.Printf("Error generating password - \"%s\"\n", err.Error())
-        return err, ""
-    }
+	if err != nil {
+		fmt.Printf("Error generating password - \"%s\"\n", err.Error())
+		return err, ""
+	}
 
-    fmt.Println(passwd)
+	fmt.Println(passwd)
 
-    if settingsRider.CopyPassword {
-        copyPasswordToClipboard(passwd)
-        fmt.Println("Password copied to clipboard")
-    }
+	if settingsRider.CopyPassword {
+		copyPasswordToClipboard(passwd)
+		fmt.Println("Password copied to clipboard")
+	}
 
-    return nil, passwd
+	return nil, passwd
 }
 
 // // Perform an action by using the command line options map
 func performAction(optMap map[string]interface{}) {
 
-    var flag bool
-
-    boolActionsMap := map[string]voidFunc{
-        "add":      WrapperMaxKryptVoidFunc(addNewEntry),
-        "version":  printVersionInfo,
-        "help":     printUsage,
-        "path":     showActiveDatabasePath,
-        "list-all": WrapperMaxKryptVoidFunc(listAllEntries),
-        "encrypt":  encryptActiveDatabase,
-    }
-
-    stringActionsMap := map[string]actionFunc{
-        "edit":       WrapperMaxKryptStringFunc(editCurrentEntry),
-        "init":       initNewDatabase,
-        "list-entry": WrapperMaxKryptStringFunc(listCurrentEntry),
-        "remove":     WrapperMaxKryptStringFunc(removeCurrentEntry),
-        "clone":      WrapperMaxKryptStringFunc(copyCurrentEntry),
-        "use-db":     setActiveDatabasePath,
-        "export":     exportToFile,
-        "migrate":    migrateDatabase,
-    }
-
-    stringListActionsMap := map[string]actionFunc{
-        "find": WrapperMaxKryptStringFunc(findCurrentEntry),
-    }
-
-    stringActions2Map := map[string]actionFunc2{
-        "decrypt": decryptDatabase,
-    }
-
-    flagsActions2Map := map[string]voidFunc2{
-        "genpass": genPass,
-    }
-
-    flagsActionsMap := map[string]voidFunc{
-        "show":       setShowPasswords,
-        "copy":       setCopyPasswordToClipboard,
-        "assume-yes": setAssumeYes,
-    }
-
-    flagsSettingsMap := map[string]settingFunc{
-        "type": setType,
-    }
-    
-    // Flag actions - always done
-    for key, mappedFunc := range flagsActionsMap {
-        if *optMap[key].(*bool) {
-            mappedFunc()
-        }
-    }
-
-    // Flag 2 actions
-    for key, mappedFunc := range flagsActions2Map {
-        if *optMap[key].(*bool) {
-            mappedFunc()
-            flag = true
-            break
-        }
-    }
-
-    // Settings
-    for key, mappedFunc := range flagsSettingsMap {
-        if *optMap[key].(*string) != ""{
-            var val = *(optMap[key].(*string))
-            mappedFunc(val)         
-        }
-    }   
-
-    // One of bool or string actions
-    for key, mappedFunc := range boolActionsMap {
-        if *optMap[key].(*bool) {
-            mappedFunc()
-            flag = true
-            break
-        }
-    }
-
-    if flag {
-        return
-    }
-
-    for key, mappedFunc := range stringActionsMap {
-        if *optMap[key].(*string) != "" {
-
-            var val = *(optMap[key].(*string))
-            mappedFunc(val)
-            flag = true
-            break
-        }
-    }
-
-    for key, mappedFunc := range stringListActionsMap {
-        if len(*optMap[key].(*[]string)) > 0 {
-
-            var vals = *(optMap[key].(*[]string))
-            // Convert to single string
-            var singleVal = strings.Join(vals, " ")
-            mappedFunc(singleVal)
-            flag = true
-            break
-        }
-    }
-
-    if flag {
-        return
-    }
-
-    for key, mappedFunc := range stringActions2Map {
-        if *optMap[key].(*string) != "" {
-            var val = *(optMap[key].(*string))
-            mappedFunc(val)
-            break
-        }
-    }
+	var flag bool
+
+	boolActionsMap := map[string]voidFunc{
+		"add":      WrapperMaxKryptVoidFunc(addNewEntry),
+		"version":  printVersionInfo,
+		"help":     printUsage,
+		"path":     showActiveDatabasePath,
+		"list-all": WrapperMaxKryptVoidFunc(listAllEntries),
+		"encrypt":  encryptActiveDatabase,
+	}
+
+	stringActionsMap := map[string]actionFunc{
+		"edit":       WrapperMaxKryptStringFunc(editCurrentEntry),
+		"init":       initNewDatabase,
+		"list-entry": WrapperMaxKryptStringFunc(listCurrentEntry),
+		"remove":     WrapperMaxKryptStringFunc(removeCurrentEntry),
+		"clone":      WrapperMaxKryptStringFunc(copyCurrentEntry),
+		"use-db":     setActiveDatabasePath,
+		"export":     exportToFile,
+		"migrate":    migrateDatabase,
+	}
+
+	stringListActionsMap := map[string]actionFunc{
+		"find": WrapperMaxKryptStringFunc(findCurrentEntry),
+	}
+
+	stringActions2Map := map[string]actionFunc2{
+		"decrypt": decryptDatabase,
+	}
+
+	flagsActions2Map := map[string]voidFunc2{
+		"genpass": genPass,
+	}
+
+	flagsActionsMap := map[string]voidFunc{
+		"show":       setShowPasswords,
+		"copy":       setCopyPasswordToClipboard,
+		"assume-yes": setAssumeYes,
+	}
+
+	flagsSettingsMap := map[string]settingFunc{
+		"type": setType,
+	}
+
+	// Flag actions - always done
+	for key, mappedFunc := range flagsActionsMap {
+		if *optMap[key].(*bool) {
+			mappedFunc()
+		}
+	}
+
+	// Flag 2 actions
+	for key, mappedFunc := range flagsActions2Map {
+		if *optMap[key].(*bool) {
+			mappedFunc()
+			flag = true
+			break
+		}
+	}
+
+	// Settings
+	for key, mappedFunc := range flagsSettingsMap {
+		if *optMap[key].(*string) != "" {
+			var val = *(optMap[key].(*string))
+			mappedFunc(val)
+		}
+	}
+
+	// One of bool or string actions
+	for key, mappedFunc := range boolActionsMap {
+		if *optMap[key].(*bool) {
+			mappedFunc()
+			flag = true
+			break
+		}
+	}
+
+	if flag {
+		return
+	}
+
+	for key, mappedFunc := range stringActionsMap {
+		if *optMap[key].(*string) != "" {
+
+			var val = *(optMap[key].(*string))
+			mappedFunc(val)
+			flag = true
+			break
+		}
+	}
+
+	for key, mappedFunc := range stringListActionsMap {
+		if len(*optMap[key].(*[]string)) > 0 {
+
+			var vals = *(optMap[key].(*[]string))
+			// Convert to single string
+			var singleVal = strings.Join(vals, " ")
+			mappedFunc(singleVal)
+			flag = true
+			break
+		}
+	}
+
+	if flag {
+		return
+	}
+
+	for key, mappedFunc := range stringActions2Map {
+		if *optMap[key].(*string) != "" {
+			var val = *(optMap[key].(*string))
+			mappedFunc(val)
+			break
+		}
+	}
 
 }
 
 func initializeCmdLine(parser *argparse.Parser) map[string]interface{} {
-    var optMap map[string]interface{}
-
-    optMap = make(map[string]interface{})
-
-    stringOptions := []CmdOption{
-        {"I", "init", "Initialize a new database", "<path>", ""},
-        {"d", "decrypt", "Decrypt password database", "<path>", ""},
-        {"C", "clone", "Clone an entry with <id>", "<id>", ""},
-        {"R", "remove", "Remove an entry with <id> or <id-range>", "<id>", ""},
-        {"U", "use-db", "Set <path> as active database", "<path>", ""},
-        {"E", "edit", "Edit entry by <id>", "<id>", ""},
-        {"l", "list-entry", "List entry by <id>", "<id>", ""},
-        {"x", "export", "Export all entries to <filename>", "<filename>", ""},
-        {"m", "migrate", "Migrate a database to latest schema", "<path>", ""},
-        {"t", "type", "Specify type when adding a new entry", "<type>", ""},
-    }
-
-    for _, opt := range stringOptions {
-        optMap[opt.Long] = parser.String(opt.Short, opt.Long, &argparse.Options{Help: opt.Help, Path: opt.Path})
-    }
-
-    stringListOptions := []CmdOption{
-        {"f", "find", "Search entries with terms", "<t1> <t2> ...", ""},
-    }
-
-    for _, opt := range stringListOptions {
-        optMap[opt.Long] = parser.StringList(opt.Short, opt.Long, &argparse.Options{Help: opt.Help, Path: opt.Path})
-    }
-
-    boolOptions := []CmdOption{
-        {"e", "encrypt", "Encrypt the current database", "", ""},
-        {"A", "add", "Add a new entry", "", ""},
-        {"p", "path", "Show current database path", "", ""},
-        {"a", "list-all", "List all entries in current database", "", ""},
-        {"g", "genpass", "Generate a strong password (length: 12 - 16)", "", ""},
-        {"s", "show", "Show passwords when listing entries", "", ""},
-        {"c", "copy", "Copy password to clipboard", "", ""},
-        {"y", "assume-yes", "Assume yes to actions requiring confirmation", "", ""},
-        {"v", "version", "Show version information and exit", "", ""},
-        {"h", "help", "Print this help message and exit", "", ""},
-    }
-
-    for _, opt := range boolOptions {
-        optMap[opt.Long] = parser.Flag(string(opt.Short), opt.Long, &argparse.Options{Help: opt.Help})
-    }
-
-    return optMap
+	var optMap map[string]interface{}
+
+	optMap = make(map[string]interface{})
+
+	stringOptions := []CmdOption{
+		{"I", "init", "Initialize a new database", "<path>", ""},
+		{"d", "decrypt", "Decrypt password database", "<path>", ""},
+		{"C", "clone", "Clone an entry with <id>", "<id>", ""},
+		{"R", "remove", "Remove an entry with <id> or <id-range>", "<id>", ""},
+		{"U", "use-db", "Set <path> as active database", "<path>", ""},
+		{"E", "edit", "Edit entry by <id>", "<id>", ""},
+		{"l", "list-entry", "List entry by <id>", "<id>", ""},
+		{"x", "export", "Export all entries to <filename>", "<filename>", ""},
+		{"m", "migrate", "Migrate a database to latest schema", "<path>", ""},
+		{"t", "type", "Specify type when adding a new entry", "<type>", ""},
+	}
+
+	for _, opt := range stringOptions {
+		optMap[opt.Long] = parser.String(opt.Short, opt.Long, &argparse.Options{Help: opt.Help, Path: opt.Path})
+	}
+
+	stringListOptions := []CmdOption{
+		{"f", "find", "Search entries with terms", "<t1> <t2> ...", ""},
+	}
+
+	for _, opt := range stringListOptions {
+		optMap[opt.Long] = parser.StringList(opt.Short, opt.Long, &argparse.Options{Help: opt.Help, Path: opt.Path})
+	}
+
+	boolOptions := []CmdOption{
+		{"e", "encrypt", "Encrypt the current database", "", ""},
+		{"A", "add", "Add a new entry", "", ""},
+		{"p", "path", "Show current database path", "", ""},
+		{"a", "list-all", "List all entries in current database", "", ""},
+		{"g", "genpass", "Generate a strong password (length: 12 - 16)", "", ""},
+		{"s", "show", "Show passwords when listing entries", "", ""},
+		{"c", "copy", "Copy password to clipboard", "", ""},
+		{"y", "assume-yes", "Assume yes to actions requiring confirmation", "", ""},
+		{"v", "version", "Show version information and exit", "", ""},
+		{"h", "help", "Print this help message and exit", "", ""},
+	}
+
+	for _, opt := range boolOptions {
+		optMap[opt.Long] = parser.Flag(string(opt.Short), opt.Long, &argparse.Options{Help: opt.Help})
+	}
+
+	return optMap
 }
 
 // Main routine
 func main() {
-    if len(os.Args) == 1 {
-        os.Args = append(os.Args, "-h")
-    }
+	if len(os.Args) == 1 {
+		os.Args = append(os.Args, "-h")
+	}
 
-    parser := argparse.NewParser("varuh",
-        "Password manager for the command line for Unix like operating systems",
-        AUTHOR_INFO,
-    )
+	parser := argparse.NewParser("varuh",
+		"Password manager for the command line for Unix like operating systems",
+		AUTHOR_INFO,
+	)
 
-    optMap := initializeCmdLine(parser)
+	optMap := initializeCmdLine(parser)
 
-    err := parser.Parse(os.Args)
+	err := parser.Parse(os.Args)
 
-    if err != nil {
-        fmt.Println(parser.Usage(err))
-    }
+	if err != nil {
+		fmt.Println(parser.Usage(err))
+	}
 
-    getOrCreateLocalConfig(APP)
+	getOrCreateLocalConfig(APP)
 
-    performAction(optMap)
+	performAction(optMap)
 }
diff --git a/test/testpgp.go b/test/testpgp.go
index 4adb384..844fe03 100644
--- a/test/testpgp.go
+++ b/test/testpgp.go
@@ -3,26 +3,25 @@
 package main
 
 import (
-	"os"
-	"os/user"
-	"fmt"
 	"bytes"
+	"fmt"
+	"golang.org/x/crypto/openpgp"
 	"io/ioutil"
+	"os"
+	"os/user"
 	"path/filepath"
-	"golang.org/x/crypto/openpgp"
 )
 
-
 func main() {
 
 	currUser, _ := user.Current()
 	secretText := "These are the nuclear launch codes - A/B/C/D"
 	path, err := filepath.Abs(filepath.Join(currUser.HomeDir, ".gnupg/pubring.kbx"))
 	fmt.Println(path)
-	
+
 	fh, _ := os.Open(path)
 	defer fh.Close()
-	
+
 	entityList, err := openpgp.ReadArmoredKeyRing(fh)
 	if err != nil {
 		fmt.Println("1")
@@ -34,7 +33,7 @@ func main() {
 
 	_, err = w.Write([]byte(secretText))
 	if err != nil {
-		fmt.Println("2")		
+		fmt.Println("2")
 		panic(err)
 	}
 
@@ -44,16 +43,16 @@ func main() {
 	}
 
 	data, err := ioutil.ReadAll(buf)
-    if err != nil {
-		fmt.Println("3")		
+	if err != nil {
+		fmt.Println("3")
 		panic(err)
-    }
-	
+	}
+
 	//    encStr := base64.StdEncoding.EncodeToString(bytes)
-	
+
 	err = os.WriteFile("test.gpg", data, 0644)
 	if err != nil {
-		fmt.Println("4")		
+		fmt.Println("4")
 		panic(err)
 	}
 }
diff --git a/utils.go b/utils.go
index 9e4069a..bd51a07 100644
--- a/utils.go
+++ b/utils.go
@@ -2,52 +2,52 @@
 package main
 
 import (
-    "bufio"
-    "time"
-    "regexp"
-    "encoding/hex"
-    "encoding/json"
-    "errors"
-    "fmt"
-    "github.com/atotto/clipboard"
-    "github.com/kirsle/configdir"
-    "golang.org/x/crypto/ssh/terminal"
-    "io/fs"
-    "os"
-    "path/filepath"
-    "strings"
-    "strconv"
-    "github.com/polyglothacker/creditcard"
+	"bufio"
+	"encoding/hex"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"github.com/atotto/clipboard"
+	"github.com/kirsle/configdir"
+	"github.com/polyglothacker/creditcard"
+	"golang.org/x/crypto/ssh/terminal"
+	"io/fs"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strconv"
+	"strings"
+	"time"
 )
 
 const DELIMSIZE int = 69
 
 // Over-ride settings via cmd line
 type SettingsOverride struct {
-    ShowPasswords bool
-    CopyPassword  bool
-    AssumeYes     bool
-    Type          string // Type of entity to add
+	ShowPasswords bool
+	CopyPassword  bool
+	AssumeYes     bool
+	Type          string // Type of entity to add
 }
 
 // Settings structure for local config
 type Settings struct {
-    ActiveDB      string `json:"active_db"`
-    Cipher        string `json:"cipher"`
-    AutoEncrypt   bool   `json:"auto_encrypt"`
-    KeepEncrypted bool   `json:"encrypt_on"`
-    ShowPasswords bool   `json:"visible_passwords"`
-    ConfigPath    string `json:"path"`
-    // Key to order listings when using -a option
-    // Valid values are
-    // 1. timestamp,{desc,asc}
-    // 2. title,{desc,asc}
-    // 3. username, {desc,asc}
-    // 4. id, {desc,asc{
-    ListOrder string `json:"list_order"`
-    Delim     string `json:"delimiter"`
-    Color     string `json:"color"`   // fg color to print
-    BgColor   string `json:"bgcolor"` // bg color to print
+	ActiveDB      string `json:"active_db"`
+	Cipher        string `json:"cipher"`
+	AutoEncrypt   bool   `json:"auto_encrypt"`
+	KeepEncrypted bool   `json:"encrypt_on"`
+	ShowPasswords bool   `json:"visible_passwords"`
+	ConfigPath    string `json:"path"`
+	// Key to order listings when using -a option
+	// Valid values are
+	// 1. timestamp,{desc,asc}
+	// 2. title,{desc,asc}
+	// 3. username, {desc,asc}
+	// 4. id, {desc,asc{
+	ListOrder string `json:"list_order"`
+	Delim     string `json:"delimiter"`
+	Color     string `json:"color"`   // fg color to print
+	BgColor   string `json:"bgcolor"` // bg color to print
 }
 
 // Global settings override
@@ -56,629 +56,631 @@ var settingsRider SettingsOverride
 // Write settings to disk
 func writeSettings(settings *Settings, configFile string) error {
 
-    fh, err := os.Create(configFile)
-    if err != nil {
-        fmt.Printf("Error generating configuration file %s - \"%s\"\n", configFile, err.Error())
-        return err
-    }
+	fh, err := os.Create(configFile)
+	if err != nil {
+		fmt.Printf("Error generating configuration file %s - \"%s\"\n", configFile, err.Error())
+		return err
+	}
 
-    defer fh.Close()
+	defer fh.Close()
 
-    encoder := json.NewEncoder(fh)
-    encoder.SetIndent("", "\t")
-    err = encoder.Encode(&settings)
+	encoder := json.NewEncoder(fh)
+	encoder.SetIndent("", "\t")
+	err = encoder.Encode(&settings)
 
-    return err
+	return err
 }
 
 // Write updated settings to disk
 func updateSettings(settings *Settings, configFile string) error {
 
-    fh, err := os.OpenFile(configFile, os.O_RDWR, 0644)
-    if err != nil {
-        fmt.Printf("Error opening config file %s - \"%s\"\n", configFile, err.Error())
-        return err
-    }
+	fh, err := os.OpenFile(configFile, os.O_RDWR, 0644)
+	if err != nil {
+		fmt.Printf("Error opening config file %s - \"%s\"\n", configFile, err.Error())
+		return err
+	}
 
-    defer fh.Close()
+	defer fh.Close()
 
-    encoder := json.NewEncoder(fh)
-    encoder.SetIndent("", "\t")
-    err = encoder.Encode(&settings)
+	encoder := json.NewEncoder(fh)
+	encoder.SetIndent("", "\t")
+	err = encoder.Encode(&settings)
 
-    if err != nil {
-        fmt.Printf("Error updating config %s - \"%s\"\n", configFile, err.Error())
-        return err
-    }
+	if err != nil {
+		fmt.Printf("Error updating config %s - \"%s\"\n", configFile, err.Error())
+		return err
+	}
 
-    return err
+	return err
 }
 
 // Make the per-user configuration folder and return local settings
 func getOrCreateLocalConfig(app string) (error, *Settings) {
 
-    var settings Settings
-    var configPath string
-    var configFile string
-    var err error
-    var fh *os.File
+	var settings Settings
+	var configPath string
+	var configFile string
+	var err error
+	var fh *os.File
 
-    configPath = configdir.LocalConfig(app)
-    err = configdir.MakePath(configPath) // Ensure it exists.
-    if err != nil {
-        return err, nil
-    }
+	configPath = configdir.LocalConfig(app)
+	err = configdir.MakePath(configPath) // Ensure it exists.
+	if err != nil {
+		return err, nil
+	}
 
-    configFile = filepath.Join(configPath, "config.json")
-    //  fmt.Printf("Config file, path => %s %s\n", configFile, configPath)
+	configFile = filepath.Join(configPath, "config.json")
+	//  fmt.Printf("Config file, path => %s %s\n", configFile, configPath)
 
-    if _, err = os.Stat(configFile); err == nil {
-        fh, err = os.Open(configFile)
-        if err != nil {
-            return err, nil
-        }
+	if _, err = os.Stat(configFile); err == nil {
+		fh, err = os.Open(configFile)
+		if err != nil {
+			return err, nil
+		}
 
-        defer fh.Close()
+		defer fh.Close()
 
-        decoder := json.NewDecoder(fh)
-        err = decoder.Decode(&settings)
-        if err != nil {
-            return err, nil
-        }
+		decoder := json.NewDecoder(fh)
+		err = decoder.Decode(&settings)
+		if err != nil {
+			return err, nil
+		}
 
-    } else {
-        //      fmt.Printf("Creating default configuration ...")
-        settings = Settings{"", "aes", true, true, false, configFile, "id,asc", ">", "default", "bgblack"}
+	} else {
+		//      fmt.Printf("Creating default configuration ...")
+		settings = Settings{"", "aes", true, true, false, configFile, "id,asc", ">", "default", "bgblack"}
 
-        if err = writeSettings(&settings, configFile); err == nil {
-            // fmt.Println(" ...done")
-        } else {
-            return err, nil
-        }
-    }
+		if err = writeSettings(&settings, configFile); err == nil {
+			// fmt.Println(" ...done")
+		} else {
+			return err, nil
+		}
+	}
 
-    return nil, &settings
+	return nil, &settings
 }
 
 // Return if there is an active, decrypted database
 func hasActiveDatabase() bool {
 
-    err, settings := getOrCreateLocalConfig(APP)
-    if err == nil && settings.ActiveDB != "" {
-        if _, err := os.Stat(settings.ActiveDB); err == nil {
-            if _, flag := isFileEncrypted(settings.ActiveDB); !flag {
-                return true
-            }
-            return false
-        }
-    }
+	err, settings := getOrCreateLocalConfig(APP)
+	if err == nil && settings.ActiveDB != "" {
+		if _, err := os.Stat(settings.ActiveDB); err == nil {
+			if _, flag := isFileEncrypted(settings.ActiveDB); !flag {
+				return true
+			}
+			return false
+		}
+	}
 
-    if err != nil {
-        fmt.Printf("Error parsing local config - \"%s\"\n", err.Error())
-    }
+	if err != nil {
+		fmt.Printf("Error parsing local config - \"%s\"\n", err.Error())
+	}
 
-    return false
+	return false
 }
 
 // Get the current active database
 func getActiveDatabase() (error, string) {
 
-    err, settings := getOrCreateLocalConfig(APP)
-    if err == nil && settings.ActiveDB != "" {
-        if _, err := os.Stat(settings.ActiveDB); err == nil {
-            return nil, settings.ActiveDB
-        }
-    }
+	err, settings := getOrCreateLocalConfig(APP)
+	if err == nil && settings.ActiveDB != "" {
+		if _, err := os.Stat(settings.ActiveDB); err == nil {
+			return nil, settings.ActiveDB
+		}
+	}
 
-    if err != nil {
-        fmt.Printf("Error parsing local config - \"%s\"\n", err.Error())
-    }
+	if err != nil {
+		fmt.Printf("Error parsing local config - \"%s\"\n", err.Error())
+	}
 
-    return err, ""
+	return err, ""
 }
 
 // Update the active db path
 func updateActiveDbPath(dbPath string) error {
 
-    _, settings := getOrCreateLocalConfig(APP)
+	_, settings := getOrCreateLocalConfig(APP)
 
-    if settings != nil {
-        settings.ActiveDB = dbPath
-    }
+	if settings != nil {
+		settings.ActiveDB = dbPath
+	}
 
-    return updateSettings(settings, settings.ConfigPath)
+	return updateSettings(settings, settings.ConfigPath)
 
 }
 
 // Read the password from console without echoing
 func readPassword() (error, string) {
 
-    var passwd []byte
-    var err error
+	var passwd []byte
+	var err error
 
-    passwd, err = terminal.ReadPassword(int(os.Stdin.Fd()))
-    return err, string(passwd)
+	passwd, err = terminal.ReadPassword(int(os.Stdin.Fd()))
+	return err, string(passwd)
 }
 
 // Rewrite the contents of the base file (path minus extension) with the new contents
 func rewriteBaseFile(path string, contents []byte, mode fs.FileMode) (error, string) {
 
-    var err error
-    var origFile string
+	var err error
+	var origFile string
 
-    origFile = strings.TrimSuffix(path, filepath.Ext(path))
-    // Overwrite it
-    err = os.WriteFile(origFile, contents, 0644)
+	origFile = strings.TrimSuffix(path, filepath.Ext(path))
+	// Overwrite it
+	err = os.WriteFile(origFile, contents, 0644)
 
-    if err == nil {
-        // Chmod it
-        os.Chmod(origFile, mode)
-    }
+	if err == nil {
+		// Chmod it
+		os.Chmod(origFile, mode)
+	}
 
-    return err, origFile
+	return err, origFile
 }
 
 // Rewrite the contents of the file with the new contents
 func rewriteFile(path string, contents []byte, mode fs.FileMode) (error, string) {
 
-    var err error
+	var err error
 
-    // Overwrite it
-    err = os.WriteFile(path, contents, 0644)
+	// Overwrite it
+	err = os.WriteFile(path, contents, 0644)
 
-    if err == nil {
-        // Chmod it
-        os.Chmod(path, mode)
-    }
+	if err == nil {
+		// Chmod it
+		os.Chmod(path, mode)
+	}
 
-    return err, path
+	return err, path
 }
 
 // Get color codes for console colors
 func getColor(code string) string {
 
-    colors := map[string]string{
-        "black":   "\x1b[30m",
-        "blue":    "\x1B[34m",
-        "red":     "\x1B[31m",
-        "green":   "\x1B[32m",
-        "yellow":  "\x1B[33m",
-        "magenta": "\x1B[35m",
-        "cyan":    "\x1B[36m",
-        "white":   "\x1B[37m",
-
-        // From https://gist.github.com/abritinthebay/d80eb99b2726c83feb0d97eab95206c4
-        // esoteric options
-        "bright":     "\x1b[1m",
-        "dim":        "\x1b[2m",
-        "underscore": "\x1b[4m",
-        "blink":      "\x1b[5m",
-        "reverse":    "\x1b[7m",
-        "hidden":     "\x1b[8m",
-
-        // background color options
-        "bgblack":   "\x1b[40m",
-        "bgred":     "\x1b[41m",
-        "bggreen":   "\x1b[42m",
-        "bgyellow":  "\x1b[43m",
-        "bgblue":    "\x1b[44m",
-        "bgmagenta": "\x1b[45m",
-        "bgcyan":    "\x1b[46m",
-        "bgwhite":   "\x1b[47m",
-
-        // reset color code
-        "reset":   "\x1B[0m",
-        "default": "\x1B[0m",
-    }
-
-    if color, ok := colors[code]; ok {
-        return color
-    } else {
-        return colors["default"]
-    }
+	colors := map[string]string{
+		"black":   "\x1b[30m",
+		"blue":    "\x1B[34m",
+		"red":     "\x1B[31m",
+		"green":   "\x1B[32m",
+		"yellow":  "\x1B[33m",
+		"magenta": "\x1B[35m",
+		"cyan":    "\x1B[36m",
+		"white":   "\x1B[37m",
+
+		// From https://gist.github.com/abritinthebay/d80eb99b2726c83feb0d97eab95206c4
+		// esoteric options
+		"bright":     "\x1b[1m",
+		"dim":        "\x1b[2m",
+		"underscore": "\x1b[4m",
+		"blink":      "\x1b[5m",
+		"reverse":    "\x1b[7m",
+		"hidden":     "\x1b[8m",
+
+		// background color options
+		"bgblack":   "\x1b[40m",
+		"bgred":     "\x1b[41m",
+		"bggreen":   "\x1b[42m",
+		"bgyellow":  "\x1b[43m",
+		"bgblue":    "\x1b[44m",
+		"bgmagenta": "\x1b[45m",
+		"bgcyan":    "\x1b[46m",
+		"bgwhite":   "\x1b[47m",
+
+		// reset color code
+		"reset":   "\x1B[0m",
+		"default": "\x1B[0m",
+	}
+
+	if color, ok := colors[code]; ok {
+		return color
+	} else {
+		return colors["default"]
+	}
 
 }
 
 // Print the delimiter line for listings
 func printDelim(delimChar string, color string) {
 
-    var delims []string
+	var delims []string
 
-    if color == "underscore" {
-        // Override delimieter to space
-        delimChar = " "
-    }
+	if color == "underscore" {
+		// Override delimieter to space
+		delimChar = " "
+	}
 
-    if len(delimChar) > 1 {
-        // slice it - take only the first
-        delimChar = string(delimChar[0])
-    }
-    for i := 0; i < DELIMSIZE; i++ {
-        delims = append(delims, delimChar)
-    }
+	if len(delimChar) > 1 {
+		// slice it - take only the first
+		delimChar = string(delimChar[0])
+	}
+	for i := 0; i < DELIMSIZE; i++ {
+		delims = append(delims, delimChar)
+	}
 
-    fmt.Println(strings.Join(delims, ""))
+	fmt.Println(strings.Join(delims, ""))
 }
 
 // Prettify credit/debit card numbers
 func prettifyCardNumber(cardNumber string) string {
 
-    // Amex cards are 15 digits - group as 4, 6, 5
-    // Any 16 digits - group as 4/4/4/4
-    var numbers []string
+	// Amex cards are 15 digits - group as 4, 6, 5
+	// Any 16 digits - group as 4/4/4/4
+	var numbers []string
 
-    if len(cardNumber) == 15 {
-        numbers = append(numbers, cardNumber[0:4])
-        numbers = append(numbers, cardNumber[4:10])
-        numbers = append(numbers, cardNumber[10:15])     
-    } else if len(cardNumber) == 16 {
-        numbers = append(numbers, cardNumber[0:4])
-        numbers = append(numbers, cardNumber[4:8])
-        numbers = append(numbers, cardNumber[8:12])
-        numbers = append(numbers, cardNumber[12:16])             
-    }
+	if len(cardNumber) == 15 {
+		numbers = append(numbers, cardNumber[0:4])
+		numbers = append(numbers, cardNumber[4:10])
+		numbers = append(numbers, cardNumber[10:15])
+	} else if len(cardNumber) == 16 {
+		numbers = append(numbers, cardNumber[0:4])
+		numbers = append(numbers, cardNumber[4:8])
+		numbers = append(numbers, cardNumber[8:12])
+		numbers = append(numbers, cardNumber[12:16])
+	}
 
-    return strings.Join(numbers, " ")
+	return strings.Join(numbers, " ")
 }
 
 // Print a card entry to the console
-func printCardEntry(entry *Entry, settings* Settings, delim bool) error {
-
-    var customEntries []ExtendedEntry
-
-    fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
-    if strings.HasPrefix(settings.BgColor, "bg") {
-        fmt.Printf("%s", getColor(strings.ToLower(settings.BgColor)))
-    }
-
-    if delim {
-        printDelim(settings.Delim, settings.Color)
-    }
-
-    fmt.Printf("ID: %d\n", entry.ID)
-    fmt.Printf("Card Name: %s\n", entry.Title)
-    fmt.Printf("Card Holder: %s\n", entry.User)
-    fmt.Printf("Card Number: %s\n", prettifyCardNumber(entry.Url))
-    fmt.Printf("Card Type: %s\n", entry.Class)  
-
-    if entry.Issuer != "" {
-        fmt.Printf("Issuing Bank: %s\n", entry.Issuer)
-    }
-
-    fmt.Println()
-    
-    fmt.Printf("Expiry Date: %s\n", entry.ExpiryDate)    
-
-    if settings.ShowPasswords || settingsRider.ShowPasswords {
-        fmt.Printf("Card CVV: %s\n", entry.Password)
-        fmt.Printf("Card PIN: %s\n", entry.Pin)        
-    } else {
-        var asterisks1 []string
-        var asterisks2 []string     
-        var i int
-        
-        for i = 0; i < len(entry.Password); i++ {
-            asterisks1 = append(asterisks1, "*")
-        }
-        fmt.Printf("Card CVV: %s\n", strings.Join(asterisks1, ""))
-
-        for i = 0; i < len(entry.Pin); i++ {
-            asterisks2 = append(asterisks2, "*")
-        }
-        fmt.Printf("Card PIN: %s\n", strings.Join(asterisks2, ""))      
-    }
-
-    if len(entry.Tags) > 0 {
-        fmt.Printf("\nTags: %s\n", entry.Tags)
-    }
-    if len(entry.Notes) > 0 {
-        fmt.Printf("Notes: %s\n", entry.Notes)
-    }
-    // Query extended entries
-    customEntries = getExtendedEntries(entry)
-
-    if len(customEntries) > 0 {
-        for _, customEntry := range customEntries {
-            fmt.Printf("%s: %s\n", customEntry.FieldName, customEntry.FieldValue)
-        }
-    }
-
-    fmt.Printf("Modified: %s\n", entry.Timestamp.Format("2006-06-02 15:04:05"))
-
-    printDelim(settings.Delim, settings.Color)
-
-    // Reset
-    fmt.Printf("%s", getColor("default"))
-
-    return nil
+func printCardEntry(entry *Entry, settings *Settings, delim bool) error {
+
+	var customEntries []ExtendedEntry
+
+	fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
+	if strings.HasPrefix(settings.BgColor, "bg") {
+		fmt.Printf("%s", getColor(strings.ToLower(settings.BgColor)))
+	}
+
+	if delim {
+		printDelim(settings.Delim, settings.Color)
+	}
+
+	fmt.Printf("[Type: card]\n")
+	fmt.Printf("ID: %d\n", entry.ID)
+	fmt.Printf("Card Name: %s\n", entry.Title)
+	fmt.Printf("Card Holder: %s\n", entry.User)
+	fmt.Printf("Card Number: %s\n", prettifyCardNumber(entry.Url))
+	fmt.Printf("Card Type: %s\n", entry.Class)
+
+	if entry.Issuer != "" {
+		fmt.Printf("Issuing Bank: %s\n", entry.Issuer)
+	}
+
+	fmt.Println()
+
+	fmt.Printf("Expiry Date: %s\n", entry.ExpiryDate)
+
+	if settings.ShowPasswords || settingsRider.ShowPasswords {
+		fmt.Printf("Card CVV: %s\n", entry.Password)
+		fmt.Printf("Card PIN: %s\n", entry.Pin)
+	} else {
+		var asterisks1 []string
+		var asterisks2 []string
+		var i int
+
+		for i = 0; i < len(entry.Password); i++ {
+			asterisks1 = append(asterisks1, "*")
+		}
+		fmt.Printf("Card CVV: %s\n", strings.Join(asterisks1, ""))
+
+		for i = 0; i < len(entry.Pin); i++ {
+			asterisks2 = append(asterisks2, "*")
+		}
+		fmt.Printf("Card PIN: %s\n", strings.Join(asterisks2, ""))
+	}
+
+	if len(entry.Tags) > 0 {
+		fmt.Printf("\nTags: %s\n", entry.Tags)
+	}
+	if len(entry.Notes) > 0 {
+		fmt.Printf("Notes: %s\n", entry.Notes)
+	}
+	// Query extended entries
+	customEntries = getExtendedEntries(entry)
+
+	if len(customEntries) > 0 {
+		for _, customEntry := range customEntries {
+			fmt.Printf("%s: %s\n", customEntry.FieldName, customEntry.FieldValue)
+		}
+	}
+
+	fmt.Printf("Modified: %s\n", entry.Timestamp.Format("2006-01-02 15:04:05"))
+
+	printDelim(settings.Delim, settings.Color)
+
+	// Reset
+	fmt.Printf("%s", getColor("default"))
+
+	return nil
 
 }
 
 // Print an entry to the console
 func printEntry(entry *Entry, delim bool) error {
 
-    var err error
-    var settings *Settings
-    var customEntries []ExtendedEntry
+	var err error
+	var settings *Settings
+	var customEntries []ExtendedEntry
 
-    err, settings = getOrCreateLocalConfig(APP)
+	err, settings = getOrCreateLocalConfig(APP)
 
-    if err != nil {
-        fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
-        return err
-    }
+	if err != nil {
+		fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
+		return err
+	}
 
-    if entry.Type == "card" {
-        return printCardEntry(entry, settings, delim)
-    }
-    
-    fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
-    if strings.HasPrefix(settings.BgColor, "bg") {
-        fmt.Printf("%s", getColor(strings.ToLower(settings.BgColor)))
-    }
+	if entry.Type == "card" {
+		return printCardEntry(entry, settings, delim)
+	}
 
-    if delim {
-        printDelim(settings.Delim, settings.Color)
-    }
+	fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
+	if strings.HasPrefix(settings.BgColor, "bg") {
+		fmt.Printf("%s", getColor(strings.ToLower(settings.BgColor)))
+	}
 
-    fmt.Printf("ID: %d\n", entry.ID)
-    fmt.Printf("Title: %s\n", entry.Title)
-    fmt.Printf("User: %s\n", entry.User)
-    fmt.Printf("URL: %s\n", entry.Url)
+	if delim {
+		printDelim(settings.Delim, settings.Color)
+	}
 
-    if settings.ShowPasswords || settingsRider.ShowPasswords {
-        fmt.Printf("Password: %s\n", entry.Password)
-    } else {
-        var asterisks []string
+	fmt.Printf("[Type: password]\n")
+	fmt.Printf("ID: %d\n", entry.ID)
+	fmt.Printf("Title: %s\n", entry.Title)
+	fmt.Printf("User: %s\n", entry.User)
+	fmt.Printf("URL: %s\n", entry.Url)
 
-        for i := 0; i < len(entry.Password); i++ {
-            asterisks = append(asterisks, "*")
-        }
-        fmt.Printf("Password: %s\n", strings.Join(asterisks, ""))
-    }
+	if settings.ShowPasswords || settingsRider.ShowPasswords {
+		fmt.Printf("Password: %s\n", entry.Password)
+	} else {
+		var asterisks []string
 
-    if len(entry.Tags) > 0 {
-        fmt.Printf("Tags: %s\n", entry.Tags)
-    }
-    if len(entry.Notes) > 0 {
-        fmt.Printf("Notes: %s\n", entry.Notes)
-    }
-    // Query extended entries
-    customEntries = getExtendedEntries(entry)
+		for i := 0; i < len(entry.Password); i++ {
+			asterisks = append(asterisks, "*")
+		}
+		fmt.Printf("Password: %s\n", strings.Join(asterisks, ""))
+	}
 
-    if len(customEntries) > 0 {
-        for _, customEntry := range customEntries {
-            fmt.Printf("%s: %s\n", customEntry.FieldName, customEntry.FieldValue)
-        }
-    }
+	if len(entry.Tags) > 0 {
+		fmt.Printf("Tags: %s\n", entry.Tags)
+	}
+	if len(entry.Notes) > 0 {
+		fmt.Printf("Notes: %s\n", entry.Notes)
+	}
+	// Query extended entries
+	customEntries = getExtendedEntries(entry)
 
-    fmt.Printf("Modified: %s\n", entry.Timestamp.Format("2006-06-02 15:04:05"))
+	if len(customEntries) > 0 {
+		for _, customEntry := range customEntries {
+			fmt.Printf("%s: %s\n", customEntry.FieldName, customEntry.FieldValue)
+		}
+	}
 
-    printDelim(settings.Delim, settings.Color)
+	fmt.Printf("Modified: %s\n", entry.Timestamp.Format("2006-01-02 15:04:05"))
 
-    // Reset
-    fmt.Printf("%s", getColor("default"))
+	printDelim(settings.Delim, settings.Color)
 
-    return nil
+	// Reset
+	fmt.Printf("%s", getColor("default"))
+
+	return nil
 
 }
 
 // Print an entry to the console with minimal data
 func printEntryMinimal(entry *Entry, delim bool) error {
 
-    var err error
-    var settings *Settings
+	var err error
+	var settings *Settings
 
-    err, settings = getOrCreateLocalConfig(APP)
+	err, settings = getOrCreateLocalConfig(APP)
 
-    if err != nil {
-        fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
-        return err
-    }
+	if err != nil {
+		fmt.Printf("Error parsing config - \"%s\"\n", err.Error())
+		return err
+	}
 
-    fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
-    if strings.HasPrefix(settings.BgColor, "bg") {
-        fmt.Printf("%s", getColor(strings.ToLower(settings.BgColor)))
-    }
+	fmt.Printf("%s", getColor(strings.ToLower(settings.Color)))
+	if strings.HasPrefix(settings.BgColor, "bg") {
+		fmt.Printf("%s", getColor(strings.ToLower(settings.BgColor)))
+	}
 
-    if delim {
-        printDelim(settings.Delim, settings.Color)
-    }
+	if delim {
+		printDelim(settings.Delim, settings.Color)
+	}
 
-    fmt.Printf("Title: %s\n", entry.Title)
-    fmt.Printf("User: %s\n", entry.User)
-    fmt.Printf("URL: %s\n", entry.Url)
-    fmt.Printf("Modified: %s\n", entry.Timestamp.Format("2006-06-02 15:04:05"))
+	fmt.Printf("Title: %s\n", entry.Title)
+	fmt.Printf("User: %s\n", entry.User)
+	fmt.Printf("URL: %s\n", entry.Url)
+	fmt.Printf("Modified: %s\n", entry.Timestamp.Format("2006-01-02 15:04:05"))
 
-    printDelim(settings.Delim, settings.Color)
+	printDelim(settings.Delim, settings.Color)
 
-    // Reset
-    fmt.Printf("%s", getColor("default"))
+	// Reset
+	fmt.Printf("%s", getColor("default"))
 
-    return nil
+	return nil
 
 }
 
 // Read user input and return entered value
 func readInput(reader *bufio.Reader, prompt string) string {
 
-    var input string
-    fmt.Printf(prompt + ": ")
-    input, _ = reader.ReadString('\n')
+	var input string
+	fmt.Printf(prompt + ": ")
+	input, _ = reader.ReadString('\n')
 
-    return strings.TrimSpace(input)
+	return strings.TrimSpace(input)
 }
 
 // Check for an active, decrypted database
 func checkActiveDatabase() error {
 
-    if !hasActiveDatabase() {
-        fmt.Printf("No decrypted active database found.\n")
-        return errors.New("no active database")
-    }
+	if !hasActiveDatabase() {
+		fmt.Printf("No decrypted active database found.\n")
+		return errors.New("no active database")
+	}
 
-    return nil
+	return nil
 }
 
 // Return true if active database is encrypted
 func isActiveDatabaseEncrypted() bool {
 
-    err, settings := getOrCreateLocalConfig(APP)
-    if err == nil && settings.ActiveDB != "" {
-        if _, err := os.Stat(settings.ActiveDB); err == nil {
-            if _, flag := isFileEncrypted(settings.ActiveDB); flag {
-                return true
-            }
-        }
-    }
+	err, settings := getOrCreateLocalConfig(APP)
+	if err == nil && settings.ActiveDB != "" {
+		if _, err := os.Stat(settings.ActiveDB); err == nil {
+			if _, flag := isFileEncrypted(settings.ActiveDB); flag {
+				return true
+			}
+		}
+	}
 
-    return false
+	return false
 }
 
 // Return true if always encrypt is on
 func isEncryptOn() bool {
 
-    _, settings := getOrCreateLocalConfig(APP)
-    return settings.KeepEncrypted
+	_, settings := getOrCreateLocalConfig(APP)
+	return settings.KeepEncrypted
 }
 
 // Combination of above 2 logic plus auto encryption on (a play on CryptOn)
 func isActiveDatabaseEncryptedAndMaxKryptOn() (bool, string) {
 
-    err, settings := getOrCreateLocalConfig(APP)
-    if err == nil && settings.ActiveDB != "" {
-        if _, err := os.Stat(settings.ActiveDB); err == nil {
-            if _, flag := isFileEncrypted(settings.ActiveDB); flag && settings.KeepEncrypted && settings.AutoEncrypt {
-                return true, settings.ActiveDB
-            }
-        }
-    }
+	err, settings := getOrCreateLocalConfig(APP)
+	if err == nil && settings.ActiveDB != "" {
+		if _, err := os.Stat(settings.ActiveDB); err == nil {
+			if _, flag := isFileEncrypted(settings.ActiveDB); flag && settings.KeepEncrypted && settings.AutoEncrypt {
+				return true, settings.ActiveDB
+			}
+		}
+	}
 
-    return false, ""
+	return false, ""
 }
 
 // (Temporarily) enable showing of passwords
 func setShowPasswords() error {
-    //  fmt.Printf("Setting show passwords to true\n")
-    settingsRider.ShowPasswords = true
-    return nil
+	//  fmt.Printf("Setting show passwords to true\n")
+	settingsRider.ShowPasswords = true
+	return nil
 }
 
 // Copy the password to clipboard - only for single listings or single search results
 func setCopyPasswordToClipboard() error {
-    settingsRider.CopyPassword = true
-    return nil
+	settingsRider.CopyPassword = true
+	return nil
 }
 
 func setAssumeYes() error {
-    settingsRider.AssumeYes = true
-    return nil
+	settingsRider.AssumeYes = true
+	return nil
 }
 
 func setType(_type string) {
-    settingsRider.Type = _type
+	settingsRider.Type = _type
 }
 
 func copyPasswordToClipboard(passwd string) {
-    clipboard.WriteAll(passwd)
+	clipboard.WriteAll(passwd)
 }
 
 // Generate a random file name
 func randomFileName(folder string, suffix string) string {
 
-    _, name := generateRandomBytes(16)
-    return filepath.Join(folder, hex.EncodeToString(name)+suffix)
+	_, name := generateRandomBytes(16)
+	return filepath.Join(folder, hex.EncodeToString(name)+suffix)
 }
 
 // Detect card type from card number
 func detectCardType(cardNum string) (string, error) {
 
-    var cardTypeIndex creditcard.CardType
-    var err error
-    
-    card := creditcard.Card{
-        Type: "N/A",
-        Number: cardNum,
-        ExpiryMonth: 12,
-        ExpiryYear: 99,
-        CVV: "999",
-    }
+	var cardTypeIndex creditcard.CardType
+	var err error
+
+	card := creditcard.Card{
+		Type:        "N/A",
+		Number:      cardNum,
+		ExpiryMonth: 12,
+		ExpiryYear:  99,
+		CVV:         "999",
+	}
 
-    cardTypeIndex, err = card.DetermineCardType()
-    if err != nil {
-        return "", err
-    }
+	cardTypeIndex, err = card.DetermineCardType()
+	if err != nil {
+		return "", err
+	}
 
-    return creditcard.CardTypeNames[cardTypeIndex], nil
+	return creditcard.CardTypeNames[cardTypeIndex], nil
 }
 
 // Validate CVV
 func validateCvv(cardCvv string, cardClass string) bool {
 
-    var matched bool
-    
-    // Amex CVV is 4 digits, rest are 3
-    if cardClass == "American Express" {
-        if matched, _ = regexp.Match(`^\d{4}$`, []byte(cardCvv)); matched {
-            return matched
-        }
-    } else {
-        if matched, _ = regexp.Match(`^\d{3}$`, []byte(cardCvv)); matched {
-            return matched
-        }
-    }
+	var matched bool
+
+	// Amex CVV is 4 digits, rest are 3
+	if cardClass == "American Express" {
+		if matched, _ = regexp.Match(`^\d{4}$`, []byte(cardCvv)); matched {
+			return matched
+		}
+	} else {
+		if matched, _ = regexp.Match(`^\d{3}$`, []byte(cardCvv)); matched {
+			return matched
+		}
+	}
 
-    return false
+	return false
 }
 
 func validateCardPin(cardPin string) bool {
 
-    // A PIN is 4 digits or more
-    if matched, _ := regexp.Match(`^\d{4,}$`, []byte(cardPin)); matched {
-        return matched
-    }   
+	// A PIN is 4 digits or more
+	if matched, _ := regexp.Match(`^\d{4,}$`, []byte(cardPin)); matched {
+		return matched
+	}
 
-    return false
+	return false
 }
 
 // Verify if the expiry date is in the form mm/dd
 func checkValidExpiry(expiryDate string) bool {
-    
-    pieces := strings.Split(expiryDate, "/")
-    
-    if len(pieces) == 2 {
-        // Sofar, so good
-        var month int
-        var year int
-        var err error
-
-        month, err = strconv.Atoi(pieces[0])
-        if err != nil {
-            fmt.Printf("Error parsing month: %s: \"%s\"\n", month, err.Error())
-            return false
-        }
-        year, err = strconv.Atoi(pieces[1])
-        if err != nil {
-            fmt.Printf("Error parsing year: %s: \"%s\"\n", year, err.Error())
-            return false
-        }       
-
-        // Month should be in range 1 -> 12
-        if month < 1 || month > 12 {
-            fmt.Printf("Error: invalid value for month - %d!\n", month)
-            return false            
-        }
-        // Year should be >= current year
-        currYear, _ := strconv.Atoi(strconv.Itoa(time.Now().Year())[2:])
-        if year < currYear {
-            fmt.Printf("Error: year should be >= %d\n", currYear)
-            return false            
-        }           
-        
-        return true
-    } else {
-        fmt.Println("Error: invalid input")
-        return false
-    }
-    
+
+	pieces := strings.Split(expiryDate, "/")
+
+	if len(pieces) == 2 {
+		// Sofar, so good
+		var month int
+		var year int
+		var err error
+
+		month, err = strconv.Atoi(pieces[0])
+		if err != nil {
+			fmt.Printf("Error parsing month: %s: \"%s\"\n", month, err.Error())
+			return false
+		}
+		year, err = strconv.Atoi(pieces[1])
+		if err != nil {
+			fmt.Printf("Error parsing year: %s: \"%s\"\n", year, err.Error())
+			return false
+		}
+
+		// Month should be in range 1 -> 12
+		if month < 1 || month > 12 {
+			fmt.Printf("Error: invalid value for month - %d!\n", month)
+			return false
+		}
+		// Year should be >= current year
+		currYear, _ := strconv.Atoi(strconv.Itoa(time.Now().Year())[2:])
+		if year < currYear {
+			fmt.Printf("Error: year should be >= %d\n", currYear)
+			return false
+		}
+
+		return true
+	} else {
+		fmt.Println("Error: invalid input")
+		return false
+	}
+
 }

From 55a225b090bccee31ab22840313466bcb9d73f39 Mon Sep 17 00:00:00 2001
From: Anand <anandpillai@letterboxes.org>
Date: Sun, 20 Aug 2023 09:43:12 +0530
Subject: [PATCH 58/58] formatting fixes, utility functions

---
 db.go    | 30 +++++++++++++++++------------
 utils.go | 58 +++++++++++++++++++++++++++++++++++---------------------
 2 files changed, 54 insertions(+), 34 deletions(-)

diff --git a/db.go b/db.go
index 1b413cb..37b554b 100644
--- a/db.go
+++ b/db.go
@@ -360,16 +360,17 @@ func updateDatabaseCardEntry(entry *Entry, cardName, cardNumber, cardHolder, car
 		// Issuer has to be the same
 		"class":       cardClass,
 		"expiry_date": cardExpiry,
-		"tags":        strings.TrimSpace(tags),
+		"tags":        tags,
 		"notes":       notes,
 	}
 
 	for key, val := range keyValMap {
+		val := strings.TrimSpace(val)
 		if len(val) > 0 {
 			updateMap[key] = val
 		}
 	}
-	fmt.Printf("%+v\n", updateMap)
+	//	fmt.Printf("%+v\n", updateMap)
 
 	if len(updateMap) == 0 && !flag {
 		fmt.Printf("Nothing to update\n")
@@ -405,18 +406,23 @@ func addNewDatabaseCardEntry(cardName, cardNumber, cardHolder, cardIssuer, cardC
 	var err error
 	var db *gorm.DB
 
+	fields := MapString([]string{cardName, cardHolder, cardNumber, cardCvv,
+		cardPin, cardIssuer, cardClass, cardExpiry, tags, notes},
+		strings.TrimSpace)
+
 	entry = Entry{
-		Title:      cardName,
-		User:       cardHolder,
-		Url:        cardNumber,
-		Password:   cardCvv,
-		Pin:        cardPin,
-		Issuer:     cardIssuer,
-		Class:      cardClass,
-		ExpiryDate: cardExpiry,
+		Title:      fields[0],
+		User:       fields[1],
+		Url:        fields[2],
+		Password:   fields[3],
+		Pin:        fields[4],
+		Issuer:     fields[5],
+		Class:      fields[6],
+		ExpiryDate: fields[7],
 		Type:       "card",
-		Tags:       strings.TrimSpace(tags),
-		Notes:      notes}
+		Tags:       fields[8],
+		Notes:      fields[9],
+	}
 
 	err, db = openActiveDatabase()
 	if err == nil && db != nil {
diff --git a/utils.go b/utils.go
index bd51a07..4289065 100644
--- a/utils.go
+++ b/utils.go
@@ -53,6 +53,26 @@ type Settings struct {
 // Global settings override
 var settingsRider SettingsOverride
 
+// Map a function to an array of strings
+func MapString(vs []string, f func(string) string) []string {
+	vsm := make([]string, len(vs))
+	for i, v := range vs {
+		vsm[i] = f(v)
+	}
+	return vsm
+}
+
+// Print a secret
+func hideSecret(secret string) string {
+	var stars []string
+
+	for i := 0; i < len(secret); i++ {
+		stars = append(stars, "*")
+	}
+
+	return strings.Join(stars, "")
+}
+
 // Write settings to disk
 func writeSettings(settings *Settings, configFile string) error {
 
@@ -307,6 +327,8 @@ func prettifyCardNumber(cardNumber string) string {
 	// Any 16 digits - group as 4/4/4/4
 	var numbers []string
 
+	// Remove spaces in between
+	cardNumber = strings.Join(strings.Split(cardNumber, " "), "")
 	if len(cardNumber) == 15 {
 		numbers = append(numbers, cardNumber[0:4])
 		numbers = append(numbers, cardNumber[4:10])
@@ -347,26 +369,26 @@ func printCardEntry(entry *Entry, settings *Settings, delim bool) error {
 	}
 
 	fmt.Println()
-
 	fmt.Printf("Expiry Date: %s\n", entry.ExpiryDate)
 
+	passwd := strings.TrimSpace(entry.Password)
+	pin := strings.TrimSpace(entry.Pin)
 	if settings.ShowPasswords || settingsRider.ShowPasswords {
-		fmt.Printf("Card CVV: %s\n", entry.Password)
-		fmt.Printf("Card PIN: %s\n", entry.Pin)
-	} else {
-		var asterisks1 []string
-		var asterisks2 []string
-		var i int
 
-		for i = 0; i < len(entry.Password); i++ {
-			asterisks1 = append(asterisks1, "*")
+		if len(passwd) > 0 {
+			fmt.Printf("Card CVV: %s\n", passwd)
+		}
+		if len(pin) > 0 {
+			fmt.Printf("Card PIN: %s\n", pin)
 		}
-		fmt.Printf("Card CVV: %s\n", strings.Join(asterisks1, ""))
+	} else {
 
-		for i = 0; i < len(entry.Pin); i++ {
-			asterisks2 = append(asterisks2, "*")
+		if len(passwd) > 0 {
+			fmt.Printf("Card CVV: %s\n", hideSecret(passwd))
+		}
+		if len(pin) > 0 {
+			fmt.Printf("Card PIN: %s\n", hideSecret(passwd))
 		}
-		fmt.Printf("Card PIN: %s\n", strings.Join(asterisks2, ""))
 	}
 
 	if len(entry.Tags) > 0 {
@@ -377,7 +399,6 @@ func printCardEntry(entry *Entry, settings *Settings, delim bool) error {
 	}
 	// Query extended entries
 	customEntries = getExtendedEntries(entry)
-
 	if len(customEntries) > 0 {
 		for _, customEntry := range customEntries {
 			fmt.Printf("%s: %s\n", customEntry.FieldName, customEntry.FieldValue)
@@ -385,9 +406,7 @@ func printCardEntry(entry *Entry, settings *Settings, delim bool) error {
 	}
 
 	fmt.Printf("Modified: %s\n", entry.Timestamp.Format("2006-01-02 15:04:05"))
-
 	printDelim(settings.Delim, settings.Color)
-
 	// Reset
 	fmt.Printf("%s", getColor("default"))
 
@@ -431,12 +450,7 @@ func printEntry(entry *Entry, delim bool) error {
 	if settings.ShowPasswords || settingsRider.ShowPasswords {
 		fmt.Printf("Password: %s\n", entry.Password)
 	} else {
-		var asterisks []string
-
-		for i := 0; i < len(entry.Password); i++ {
-			asterisks = append(asterisks, "*")
-		}
-		fmt.Printf("Password: %s\n", strings.Join(asterisks, ""))
+		fmt.Printf("Password: %s\n", hideSecret(entry.Password))
 	}
 
 	if len(entry.Tags) > 0 {