From ab21f99955a4e773cb4879785b0742dda2324be4 Mon Sep 17 00:00:00 2001 From: James Hewitt Date: Fri, 12 May 2023 14:22:33 +0100 Subject: [PATCH 1/2] Don't add a newline when exporting values --- bolt_model.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bolt_model.go b/bolt_model.go index 3fb8c2d..87781e1 100644 --- a/bolt_model.go +++ b/bolt_model.go @@ -682,7 +682,7 @@ func exportValue(path []string, fName string) error { } bk := []byte(path[len(path)-1]) v := b.Get(bk) - return writeToFile(fName, string(v)+"\n", os.O_CREATE|os.O_WRONLY|os.O_TRUNC) + return writeToFile(fName, string(v), os.O_CREATE|os.O_WRONLY|os.O_TRUNC) } return errors.New("exportValue: Invalid Bucket") }) From 8a508a45ee803ca3cae56567a10d2cabe0b871d3 Mon Sep 17 00:00:00 2001 From: James Hewitt Date: Fri, 12 May 2023 14:27:33 +0100 Subject: [PATCH 2/2] Add support to importing of value from a file --- bolt_model.go | 33 +++++++++++++++++++++++++++ screen_about.go | 4 ++-- screen_browser.go | 57 ++++++++++++++++++++++++++++++++++++----------- 3 files changed, 79 insertions(+), 15 deletions(-) diff --git a/bolt_model.go b/bolt_model.go index 87781e1..9941daa 100644 --- a/bolt_model.go +++ b/bolt_model.go @@ -756,3 +756,36 @@ func writeToFile(fn, s string, mode int) error { } return nil } + +func importValue(path []string, fName string) error { + if AppArgs.ReadOnly { + return errors.New("DB is in Read-Only Mode") + } + return db.Update(func(tx *bolt.Tx) error { + // len(b.GetPath())-1 is the key for the pair we're updating, + // the rest are buckets leading to that key + b := tx.Bucket([]byte(path[0])) + if b == nil { + // Invalid path, try for the root bucket + b = tx.Cursor().Bucket() + } + if b != nil { + if len(path) > 0 { + for i := range path[1 : len(path)-1] { + b = b.Bucket([]byte(path[i+1])) + if b == nil { + return errors.New("updatePairValue: Invalid Path") + } + } + } + // Now update the last key in the path + bk := []byte(path[len(path)-1]) + v, err := os.ReadFile(fName) + if err != nil { + return err + } + return b.Put(bk, v) + } + return errors.New("importValue: Invalid Bucket") + }) +} diff --git a/screen_about.go b/screen_about.go index e072fe1..90a12cd 100644 --- a/screen_about.go +++ b/screen_about.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/br0xen/termbox-util" + termboxUtil "github.com/br0xen/termbox-util" "github.com/nsf/termbox-go" ) @@ -111,9 +111,9 @@ func (screen *AboutScreen) drawScreen(style Style) { {"e", "edit value of pair"}, {"r", "rename pair/bucket"}, {"", ""}, - {"", ""}, {"D", "delete item"}, {"x,X", "export as string/json to file"}, + {"i", "import file to value of pair"}, {"", ""}, {"?", "this screen"}, {"q", "quit program"}, diff --git a/screen_browser.go b/screen_browser.go index 3328f52..aeb26cf 100644 --- a/screen_browser.go +++ b/screen_browser.go @@ -61,9 +61,10 @@ const ( modeInsertPairVal = 70 // 0000 0100 0110 modeDelete = 256 // 0001 0000 0000 modeModToParent = 8 // 0000 0000 1000 - modeExport = 512 // 0010 0000 0000 - modeExportValue = 513 // 0010 0000 0001 - modeExportJSON = 514 // 0010 0000 0010 + modeIO = 512 // 0010 0000 0000 + modeIOExportValue = 513 // 0010 0000 0001 + modeIOExportJSON = 514 // 0010 0000 0010 + modeIOImportValue = 516 // 0010 0000 0100 ) /* @@ -88,8 +89,8 @@ func (screen *BrowserScreen) handleKeyEvent(event termbox.Event) int { return screen.handleInsertKeyEvent(event) } else if screen.mode == modeDelete { return screen.handleDeleteKeyEvent(event) - } else if screen.mode&modeExport == modeExport { - return screen.handleExportKeyEvent(event) + } else if screen.mode&modeIO == modeIO { + return screen.handleIOKeyEvent(event) } return BrowserScreenIndex } @@ -204,11 +205,14 @@ func (screen *BrowserScreen) handleBrowseKeyEvent(event termbox.Event) int { } else if event.Ch == 'D' { screen.startDeleteItem() } else if event.Ch == 'x' { - // Export Value + // Export Value to a file screen.startExportValue() } else if event.Ch == 'X' { // Export Key/Value (or Bucket) as JSON screen.startExportJSON() + } else if event.Ch == 'i' { + // Import value from a file + screen.startImportValue() } return BrowserScreenIndex } @@ -374,7 +378,7 @@ func (screen *BrowserScreen) handleInsertKeyEvent(event termbox.Event) int { return BrowserScreenIndex } -func (screen *BrowserScreen) handleExportKeyEvent(event termbox.Event) int { +func (screen *BrowserScreen) handleIOKeyEvent(event termbox.Event) int { if event.Key == termbox.KeyEsc { screen.mode = modeBrowse screen.inputModal.Clear() @@ -383,24 +387,33 @@ func (screen *BrowserScreen) handleExportKeyEvent(event termbox.Event) int { if screen.inputModal.IsDone() { b, p, _ := screen.db.getGenericFromPath(screen.currentPath) fileName := screen.inputModal.GetValue() - if screen.mode&modeExportValue == modeExportValue { + if screen.mode&modeIOExportValue == modeIOExportValue { // Exporting the value if p != nil { if err := exportValue(screen.currentPath, fileName); err != nil { - //screen.setMessage("Error Exporting to file " + fileName + ".") + //screen.setMessage("Error exporting to file " + fileName + ".") screen.setMessage(err.Error()) } else { screen.setMessage("Value exported to file: " + fileName) } } - } else if screen.mode&modeExportJSON == modeExportJSON { + } else if screen.mode&modeIOExportJSON == modeIOExportJSON { if b != nil || p != nil { if exportJSON(screen.currentPath, fileName) != nil { - screen.setMessage("Error Exporting to file " + fileName + ".") + screen.setMessage("Error exporting to file " + fileName + ".") } else { screen.setMessage("Value exported to file: " + fileName) } } + } else if screen.mode&modeIOImportValue == modeIOImportValue { + if p != nil { + if err := importValue(screen.currentPath, fileName); err != nil { + screen.setMessage(err.Error()) + } else { + screen.setMessage("Value imported from file: " + fileName) + screen.refreshDatabase() + } + } } screen.mode = modeBrowse screen.inputModal.Clear() @@ -907,7 +920,7 @@ func (screen *BrowserScreen) startExportValue() bool { mod.SetValue("") mod.Show() screen.inputModal = mod - screen.mode = modeExportValue + screen.mode = modeIOExportValue return true } screen.setMessage("Couldn't do string export on " + screen.currentPath[len(screen.currentPath)-1] + "(did you mean 'X'?)") @@ -930,12 +943,30 @@ func (screen *BrowserScreen) startExportJSON() bool { } mod.Show() screen.inputModal = mod - screen.mode = modeExportJSON + screen.mode = modeIOExportJSON return true } return false } +func (screen *BrowserScreen) startImportValue() bool { + _, p, e := screen.db.getGenericFromPath(screen.currentPath) + if e == nil && p != nil { + w, h := termbox.Size() + inpW, inpH := (w / 2), 6 + inpX, inpY := ((w / 2) - (inpW / 2)), ((h / 2) - inpH) + mod := termboxUtil.CreateInputModal("", inpX, inpY, inpW, inpH, termbox.ColorWhite, termbox.ColorBlack) + mod.SetTitle(termboxUtil.AlignText(fmt.Sprintf("Import value of '%s' from:", p.key), inpW, termboxUtil.AlignCenter)) + mod.SetValue("") + mod.Show() + screen.inputModal = mod + screen.mode = modeIOImportValue + return true + } + screen.setMessage("Couldn't do import on " + screen.currentPath[len(screen.currentPath)-1] + ", must be a pair.") + return false +} + func (screen *BrowserScreen) setMessage(msg string) { screen.message = msg screen.messageTime = time.Now()