reduce repetition of note creation code.

Author: jonhadfield

cmd/sncli/main.go

@@ -921,7 +921,7 @@ func startCLI(args []string) (msg string, useStdOut bool, err error) {
 					Usage: "ignore warning",
 				},
 				cli.BoolFlag{
-					Name:  "settings",
+					Name:  "everything",
 					Usage: "wipe settings also",
 				},
 			},
@@ -934,8 +934,7 @@ func startCLI(args []string) (msg string, useStdOut bool, err error) {
 				useStdOut = opts.useStdOut
 
 				var session cache.Session
-				var email string
-				session, email, err = cache.GetSession(opts.useSession, opts.sessKey, opts.server, opts.debug)
+				session, _, err = cache.GetSession(opts.useSession, opts.sessKey, opts.server, opts.debug)
 				if err != nil {
 					return err
 				}
@@ -948,17 +947,18 @@ func startCLI(args []string) (msg string, useStdOut bool, err error) {
 
 				session.CacheDBPath = cacheDBPath
 				wipeConfig := sncli.WipeConfig{
-					Session:  &session,
-					Settings: c.Bool("settings"),
-					Debug:    opts.debug,
+					Session:    &session,
+					UseStdOut:  useStdOut,
+					Everything: c.Bool("everything"),
+					Debug:      opts.debug,
 				}
 				var numWiped int
 
 				var proceed bool
 				if c.Bool("yes") {
 					proceed = true
 				} else {
-					fmt.Printf("wipe all items for account %s? ", email)
+					fmt.Printf("wipe all items for account %s? ", session.Session.KeyParams.Identifier)
 					var input string
 					_, err = fmt.Scanln(&input)
 					if err == nil && sncli.StringInSlice(input, []string{"y", "yes"}, false) {

cmd/sncli/main_test.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"strings"
 	"testing"
 	"time"
@@ -127,7 +128,7 @@ func TestDeleteNoteErrorMissingTitle(t *testing.T) {
 func TestTagNotesByTextWithNewTags(t *testing.T) {
 	msg, _, err := startCLI([]string{"sncli", "--debug", "--no-stdout", "add", "note", "--title", "TestNoteOne", "--text", "test note one"})
 	assert.Contains(t, msg, msgAddSuccess)
-	assert.NoError(t, err, err)
+	require.NoError(t, err)
 
 	msg, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "add", "note", "--title", "TestNoteTwo", "--text", "test note two"})
 	assert.NoError(t, err)
@@ -150,7 +151,7 @@ func TestTagNotesByTextWithNewTags(t *testing.T) {
 	assert.NotEmpty(t, msg)
 
 	_, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "delete", "tag", "--title", "testTagOne,testTagTwo"})
-	assert.NoError(t, err, err)
+	require.NoError(t, err)
 	time.Sleep(1 * time.Second)
 }
 
@@ -170,7 +171,7 @@ func TestAddOneNoteGetCount(t *testing.T) {
 	assert.Equal(t, "1", msg)
 
 	_, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "delete", "note", "--title", "testAddOneNoteGetCount Title"})
-	assert.NoError(t, err, err)
+	require.NoError(t, err)
 	time.Sleep(1 * time.Second)
 }
 
@@ -183,7 +184,7 @@ func TestAddOneTagGetCount(t *testing.T) {
 	assert.Equal(t, "1", msg)
 
 	_, _, err = startCLI([]string{"sncli", "--debug", "--no-stdout", "delete", "tag", "--title", "testAddOneTagGetCount Title"})
-	assert.NoError(t, err, err)
+	require.NoError(t, err)
 
 	time.Sleep(1 * time.Second)
 }

export_test.go

@@ -21,13 +21,7 @@ func TestEncryptDecryptWithNewItemsKey(t *testing.T) {
 	require.NotEmpty(t, ik.CreatedAtTimestamp)
 	require.Empty(t, ik.UpdatedAtTimestamp)
 	require.Empty(t, ik.UpdatedAt)
-
-	n := gosn.NewNote()
-	nc := gosn.NewNoteContent()
-	nc.Title = "test title"
-	nc.Text = "test content"
-	n.Content = *nc
-
+	n, _ := gosn.NewNote("test title", "test content", nil)
 	eis := gosn.Items{&n}
 	encItems, err := eis.Encrypt(ik, testSession.MasterKey, testSession.Debug)
 	require.NoError(t, err)
@@ -113,11 +107,8 @@ func TestJSONExportImport(t *testing.T) {
 	allCacheItemsPreExport := len(existingItems)
 	allItemsKeysPreExport := len(testSession.ItemsKeys)
 
-	note := gosn.NewNote()
-	noteContent := gosn.NewNoteContent()
-	note.Content = *noteContent
-	note.Content.SetTitle("Example Title")
-	note.Content.SetText("Some example text")
+	note, _ := gosn.NewNote("Example Title", "Some example text", nil)
+
 	itemsToPut := gosn.Items{
 		&note,
 	}
@@ -218,12 +209,8 @@ func TestJSONExportWipeImportOneNote(t *testing.T) {
 	var existingItems []cache.Item
 	err = gio.DB.All(&existingItems)
 	require.NoError(t, err)
+	note, _ := gosn.NewNote("Example Title", "Some example text", nil)
 
-	note := gosn.NewNote()
-	noteContent := gosn.NewNoteContent()
-	note.Content = *noteContent
-	note.Content.SetTitle("Example Title")
-	note.Content.SetText("Some example text")
 	itemsToPut := gosn.Items{
 		&note,
 	}
@@ -332,15 +319,7 @@ func TestConflictResolution(t *testing.T) {
 	defer cleanUp(*testSession)
 
 	// create and put initial originalNote
-	originalNote := gosn.NewNote()
-	noteContent := gosn.NewNoteContent()
-	originalNote.Content = *noteContent
-	originalNoteTitle := "Example Title"
-	originalNoteText := "Some example text"
-
-	originalNote.Content.SetTitle(originalNoteTitle)
-	originalNote.Content.SetText(originalNoteText)
-
+	originalNote, _ := gosn.NewNote("Example Title", "Some example text", nil)
 	itemsToPut := gosn.Items{
 		&originalNote,
 	}

go.mod

@@ -54,4 +54,4 @@ require (
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
 )
 
-//replace github.com/jonhadfield/gosn-v2 => ../gosn-v2
+replace github.com/jonhadfield/gosn-v2 => ../gosn-v2

main.go

@@ -1,8 +1,11 @@
 package sncli
 
 import (
+	"github.com/briandowns/spinner"
 	"github.com/jonhadfield/gosn-v2"
 	"github.com/jonhadfield/gosn-v2/cache"
+	"os"
+	"time"
 )
 
 const (
@@ -205,9 +208,10 @@ type DeleteNoteConfig struct {
 }
 
 type WipeConfig struct {
-	Session  *cache.Session
-	Debug    bool
-	Settings bool
+	Session    *cache.Session
+	UseStdOut  bool
+	Debug      bool
+	Everything bool
 }
 
 type StatsConfig struct {
@@ -258,5 +262,23 @@ var supportedContentTypes = []string{"Note", "Tag", "SN|Component"}
 
 func (i *WipeConfig) Run() (int, error) {
 	i.Session.RemoveDB()
-	return gosn.DeleteContent(i.Session.Session)
+	if !i.Session.Debug && i.UseStdOut {
+		prefix := HiWhite("wiping ")
+
+		s := spinner.New(spinner.CharSets[14], 100*time.Millisecond, spinner.WithWriter(os.Stdout))
+		if i.UseStdOut {
+			s = spinner.New(spinner.CharSets[14], 100*time.Millisecond, spinner.WithWriter(os.Stderr))
+		}
+
+		s.Prefix = prefix
+		s.Start()
+
+		deleted, err := gosn.DeleteContent(i.Session.Session, i.Everything)
+
+		s.Stop()
+
+		return deleted, err
+	}
+
+	return gosn.DeleteContent(i.Session.Session, i.Everything)
 }

note.go

@@ -96,12 +96,7 @@ func addNote(i addNoteInput) (noteUUID string, err error) {
 			return
 		}
 	} else {
-		noteToAdd = gosn.NewNote()
-		newNoteContent := gosn.NewNoteContent()
-		newNoteContent.Title = i.noteTitle
-		newNoteContent.Text = i.noteText
-		noteToAdd.Content = *newNoteContent
-		noteToAdd.UUID = gosn.GenUUID()
+		noteToAdd, _ = gosn.NewNote(i.noteTitle, i.noteText, nil)
 		noteUUID = noteToAdd.UUID
 	}
 
@@ -220,7 +215,6 @@ func deleteNotes(session *cache.Session, noteTitles []string, noteText string, n
 			})
 		}
 	case noteText != "":
-
 		comparison := "=="
 		if regex {
 			comparison = "~"
@@ -233,7 +227,6 @@ func deleteNotes(session *cache.Session, noteTitles []string, noteText string, n
 			Type:       "Note",
 		})
 	case len(noteUUIDs) > 0:
-
 		for _, uuid := range noteUUIDs {
 			getNotesFilters = append(getNotesFilters, gosn.Filter{
 				Key:        "UUID",
@@ -276,7 +269,6 @@ func deleteNotes(session *cache.Session, noteTitles []string, noteText string, n
 	}
 
 	notes.Filter(itemFilter)
-
 	var notesToDelete gosn.Notes
 
 	for _, item := range notes {

note_test.go

@@ -253,7 +253,7 @@ func TestAddDeleteNoteByUUID(t *testing.T) {
 	}
 
 	err := addNoteConfig.Run()
-	assert.NoError(t, err, err)
+	require.NoError(t, err)
 
 	// get new note
 	filter := gosn.Filter{
@@ -275,7 +275,7 @@ func TestAddDeleteNoteByUUID(t *testing.T) {
 
 	preRes, err = gnc.Run()
 
-	assert.NoError(t, err, err)
+	require.NoError(t, err)
 
 	newItemUUID := preRes[0].GetUUID()
 	deleteNoteConfig := DeleteNoteConfig{
@@ -286,10 +286,10 @@ func TestAddDeleteNoteByUUID(t *testing.T) {
 	var noDeleted int
 	noDeleted, err = deleteNoteConfig.Run()
 	assert.Equal(t, 1, noDeleted)
-	assert.NoError(t, err, err)
+	require.NoError(t, err)
 
 	postRes, err = gnc.Run()
-	assert.NoError(t, err, err)
+	require.NoError(t, err)
 	assert.EqualValues(t, len(postRes), 0, "note was not deleted")
 }
 
@@ -303,7 +303,7 @@ func TestAddDeleteNoteByTitle(t *testing.T) {
 		Title:   "TestNoteOne",
 	}
 	err := addNoteConfig.Run()
-	assert.NoError(t, err, err)
+	assert.NoError(t, err)
 
 	deleteNoteConfig := DeleteNoteConfig{
 		Session:    testSession,
@@ -312,8 +312,8 @@ func TestAddDeleteNoteByTitle(t *testing.T) {
 
 	var noDeleted int
 	noDeleted, err = deleteNoteConfig.Run()
-	assert.Equal(t, noDeleted, 1)
-	assert.NoError(t, err, err)
+	assert.Equal(t, 1, noDeleted)
+	require.NoError(t, err)
 
 	filter := gosn.Filter{
 		Type:       "Note",
@@ -332,7 +332,7 @@ func TestAddDeleteNoteByTitle(t *testing.T) {
 
 	var postRes gosn.Items
 	postRes, err = gnc.Run()
-	assert.NoError(t, err, err)
+	require.NoError(t, err)
 	assert.EqualValues(t, len(postRes), 0, "note was not deleted")
 }
 
@@ -346,7 +346,7 @@ func TestAddDeleteNoteByTitleRegex(t *testing.T) {
 		Title:   "TestNoteOne",
 	}
 	err := addNoteConfig.Run()
-	assert.NoError(t, err, err)
+	require.NoError(t, err)
 
 	// delete note
 	deleteNoteConfig := DeleteNoteConfig{
@@ -358,7 +358,7 @@ func TestAddDeleteNoteByTitleRegex(t *testing.T) {
 	var noDeleted int
 	noDeleted, err = deleteNoteConfig.Run()
 	assert.Equal(t, noDeleted, 1)
-	assert.NoError(t, err, err)
+	require.NoError(t, err)
 
 	// get same note again
 	filter := gosn.Filter{
@@ -378,7 +378,7 @@ func TestAddDeleteNoteByTitleRegex(t *testing.T) {
 	var postRes gosn.Items
 	postRes, err = gnc.Run()
 
-	assert.NoError(t, err, err)
+	require.NoError(t, err)
 	assert.EqualValues(t, len(postRes), 0, "note was not deleted")
 }
 
@@ -458,7 +458,7 @@ func TestCreateOneHundredNotes(t *testing.T) {
 
 func cleanUp(session cache.Session) {
 	session.RemoveDB()
-	_, err := gosn.DeleteContent(session.Session)
+	_, err := gosn.DeleteContent(session.Session, true)
 
 	if err != nil {
 		panic(err)