formatting fixes, utility functions

Author: pythonhacker

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 {

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,17 +399,14 @@ 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)
 		}
 	}
 
 	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 {