Merge EditEntryNote into EditEntryField

main.go

@@ -93,16 +93,7 @@ func main() {
 					case "url", "-l":
 						field = 2
 					case "note", "-n":
-						if argsCount == 4 {
+						field = 3
-							cli.EditEntryNote(targetLocation, true)
-						} else {
-							switch args[4] {
-							case "show", "-s":
-								cli.EditEntryNote(targetLocation, false)
-							default:
-								cli.EditEntryNote(targetLocation, true)
-							}
-						}
 					case "rename", "-r":
 						cli.RenameCli(targetLocation)
 					default:

src/cli/edit.go

@@ -35,21 +35,9 @@ func EditEntryField(targetLocation string, hidePassword bool, field int) {
 		unencryptedEntry[field] = input("Username:")
 	case 2:
 		unencryptedEntry[field] = input("URL:")
-	}
+	case 3: // edit notes fields
-
+		// store note and non-note data separately
-	// write and preview the modified entry
-	writeEntryCLI(targetLocation, unencryptedEntry, hidePassword)
-}
-
-// EditEntryNote edits the note of an entry at targetLocation (user input)
-func EditEntryNote(targetLocation string, hidePassword bool) {
-	// fetch old entry data (with all required lines present)
-	unencryptedEntry := backend.GetOldEntryData(targetLocation, 2)
-
-	// store non-note data separately
 		nonNoteData := unencryptedEntry[:3]
-
-	// store note data separately
 		noteData := unencryptedEntry[3:]
 
 		// edit the note
@@ -59,6 +47,7 @@ func EditEntryNote(targetLocation string, hidePassword bool) {
 			os.Exit(1)
 		}
 		unencryptedEntry = append(nonNoteData, editedNote...)
+	}
 
 	// write and preview the modified entry
 	writeEntryCLI(targetLocation, unencryptedEntry, hidePassword)