Merge pull request #68 from notwithering/master

add sequence support

.gitignore

@@ -22,10 +22,16 @@ _cgo_export.*
 
 _testmain.go
 
+# Build Directory
+build
+
 # Binaries
 *.exe
-boltbrowser
+/boltbrowser
+/boltbrowser.*
 
 # Test Database
 test.db
 *.db
+
+

README.md

@@ -3,9 +3,9 @@ boltbrowser
 
 A CLI Browser for BoltDB Files
 
-![Image of About Screen](http://bullercodeworks.com/boltbrowser/ss2.png)
+![Image of About Screen](https://git.bullercodeworks.com/brian/boltbrowser/raw/branch/master/build/aboutscreen.png)
 
-![Image of Main Browser](http://bullercodeworks.com/boltbrowser/ss1.png)
+![Image of Main Browser](https://git.bullercodeworks.com/brian/boltbrowser/raw/branch/master/build/mainscreen.png)
 
 Installing
 ----------
@@ -20,13 +20,7 @@ Then you'll have `boltbrowser` in your path.
 
 Pre-built Binaries
 ------------------
-Here are pre-built binaries:
-* [Linux 64-bit](https://git.bullercodeworks.com/attachments/29367198-79f9-4fb3-9a66-f71a0e605006)
-* [Linux 32-bit](https://git.bullercodeworks.com/attachments/ba8b9116-a013-431d-b266-66dfa16f2a88)
-* [Linux Arm](https://git.bullercodeworks.com/attachments/795108a6-79e3-4723-b9a8-83803bc27f20)
-* [Windows 64-bit](https://git.bullercodeworks.com/attachments/649993d9-bf2c-46ea-98dd-1994f1c73020)
-* [Windows 32-bit](https://git.bullercodeworks.com/attachments/c1662c27-524c-465a-8739-b021fb15066b)
-* [Mac OS](https://git.bullercodeworks.com/attachments/10270b6f-9316-446d-8ab4-4022142323b3)
+Pre-build binaries are available on the [Releases Page](https://github.com/br0xen/boltbrowser/releases).
 
 Usage
 -----

go.mod

@@ -1,11 +1,14 @@
 module github.com/br0xen/boltbrowser
 
 require (
-	github.com/boltdb/bolt v1.3.1
 	github.com/br0xen/termbox-util v0.0.0-20170904143325-de1d4c83380e
-	github.com/mattn/go-runewidth v0.0.4 // indirect
-	github.com/nsf/termbox-go v0.0.0-20180819125858-b66b20ab708e
-	golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed // indirect
+	github.com/nsf/termbox-go v1.1.1
+	go.etcd.io/bbolt v1.4.3
 )
 
-go 1.13
+require (
+	github.com/mattn/go-runewidth v0.0.9 // indirect
+	golang.org/x/sys v0.29.0 // indirect
+)
+
+go 1.23

go.sum

@@ -1,10 +1,18 @@
-github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
-github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
 github.com/br0xen/termbox-util v0.0.0-20170904143325-de1d4c83380e h1:PF4gYXcZfTbAoAk5DPZcvjmq8gyg4gpcmWdT8W+0X1c=
 github.com/br0xen/termbox-util v0.0.0-20170904143325-de1d4c83380e/go.mod h1:x9wJlgOj74OFTOBwXOuO8pBguW37EgYNx51Dbjkfzo4=
-github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
-github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
-github.com/nsf/termbox-go v0.0.0-20180819125858-b66b20ab708e h1:fvw0uluMptljaRKSU8459cJ4bmi3qUYyMs5kzpic2fY=
-github.com/nsf/termbox-go v0.0.0-20180819125858-b66b20ab708e/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ=
-golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed h1:5TJcLJn2a55mJjzYk0yOoqN8X1OdvBDUnaZaKKyQtkY=
-golang.org/x/sys v0.0.0-20191002091554-b397fe3ad8ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
+github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/nsf/termbox-go v1.1.1 h1:nksUPLCb73Q++DwbYUBEglYBRPZyoXJdrj5L+TkjyZY=
+github.com/nsf/termbox-go v1.1.1/go.mod h1:T0cTdVuOwf7pHQNtfhnEbzHbcNyCEcVU4YPpouCbVxo=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
+go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
+go.etcd.io/bbolt v1.4.3 h1:dEadXpI6G79deX5prL3QRNP6JB8UxVkqo4UPnHaNXJo=
+go.etcd.io/bbolt v1.4.3/go.mod h1:tKQlpPaYCVFctUIgFKFnAlvbmB3tpy1vkTnDWohtc0E=
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

internal/boltbrowser/bolt_model.go

@@ -1,4 +1,4 @@
-package main
+package boltbrowser
 
 import (
 	"errors"
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/boltdb/bolt"
+	"go.etcd.io/bbolt"
 )
 
 /*
@@ -27,6 +27,7 @@ type BoltBucket struct {
 	expanded  bool
 	errorFlag bool
 	isRoot    bool
+	sequence  uint64
 }
 
 /*
@@ -268,11 +269,12 @@ func (bd *BoltDB) syncOpenBuckets(shadow *BoltDB) {
 func (bd *BoltDB) refreshDatabase() *BoltDB {
 	// Reload the database into memBolt
 	memBolt = new(BoltDB)
-	db.View(func(tx *bolt.Tx) error {
-		err := tx.ForEach(func(nm []byte, b *bolt.Bucket) error {
+	db.View(func(tx *bbolt.Tx) error {
+		err := tx.ForEach(func(nm []byte, b *bbolt.Bucket) error {
 			bb, err := readBucket(b)
 			if err == nil {
 				bb.name = string(nm)
+				bb.sequence = b.Sequence()
 				bb.expanded = false
 				memBolt.buckets = append(memBolt.buckets, *bb)
 				return nil
@@ -406,7 +408,7 @@ func deleteKey(path []string) error {
 	if AppArgs.ReadOnly {
 		return errors.New("DB is in Read-Only Mode")
 	}
-	err := db.Update(func(tx *bolt.Tx) error {
+	err := db.Update(func(tx *bbolt.Tx) error {
 		// len(b.path)-1 is the key we need to delete,
 		// the rest are buckets leading to that key
 		if len(path) == 1 {
@@ -442,7 +444,7 @@ func deleteKey(path []string) error {
 	return err
 }
 
-func readBucket(b *bolt.Bucket) (*BoltBucket, error) {
+func readBucket(b *bbolt.Bucket) (*BoltBucket, error) {
 	bb := new(BoltBucket)
 	if b == nil {
 		return nil, errors.New("No bucket passed")
@@ -453,6 +455,7 @@ func readBucket(b *bolt.Bucket) (*BoltBucket, error) {
 			tb.parent = bb
 			if err == nil {
 				tb.name = string(k)
+				tb.sequence = b.Bucket(k).Sequence()
 				bb.buckets = append(bb.buckets, *tb)
 			}
 		} else {
@@ -471,7 +474,7 @@ func renameBucket(path []string, name string) error {
 		return nil
 	}
 	var bb *BoltBucket // For caching the current bucket
-	err := db.View(func(tx *bolt.Tx) error {
+	err := db.View(func(tx *bbolt.Tx) error {
 		// len(b.path)-1 is the key we need to delete,
 		// the rest are buckets leading to that key
 		b := tx.Bucket([]byte(path[0]))
@@ -525,7 +528,7 @@ func updatePairKey(path []string, k string) error {
 	if AppArgs.ReadOnly {
 		return errors.New("DB is in Read-Only Mode")
 	}
-	err := db.Update(func(tx *bolt.Tx) error {
+	err := db.Update(func(tx *bbolt.Tx) error {
 		// len(b.path)-1 is the key for the pair we're updating,
 		// the rest are buckets leading to that key
 		b := tx.Bucket([]byte(path[0]))
@@ -561,7 +564,7 @@ func updatePairValue(path []string, v string) error {
 	if AppArgs.ReadOnly {
 		return errors.New("DB is in Read-Only Mode")
 	}
-	err := db.Update(func(tx *bolt.Tx) error {
+	err := db.Update(func(tx *bbolt.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]))
@@ -587,12 +590,40 @@ func updatePairValue(path []string, v string) error {
 	return err
 }
 
+func updateBucketSequence(path []string, seq uint64) error {
+	if AppArgs.ReadOnly {
+		return errors.New("DB is in Read-Only Mode")
+	}
+	err := db.Update(func(tx *bbolt.Tx) error {
+		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:] {
+					b = b.Bucket([]byte(path[i+1]))
+					if b == nil {
+						return errors.New("updateBucketSequence: Invalid Path")
+					}
+				}
+			}
+			// Now update the sequence
+			err := b.SetSequence(seq)
+			return err
+		}
+		return errors.New("updateBucketSequence: Invalid Path")
+	})
+	return err
+}
+
 func insertBucket(path []string, n string) error {
 	if AppArgs.ReadOnly {
 		return errors.New("DB is in Read-Only Mode")
 	}
 	// Inserts a new bucket named 'n' at 'path'
-	err := db.Update(func(tx *bolt.Tx) error {
+	err := db.Update(func(tx *bbolt.Tx) error {
 		if len(path) == 0 || path[0] == "" {
 			// insert at root
 			_, err := tx.CreateBucket([]byte(n))
@@ -632,7 +663,7 @@ func insertPair(path []string, k string, v string) error {
 		return errors.New("DB is in Read-Only Mode")
 	}
 	// Insert a new pair k => v at path
-	err := db.Update(func(tx *bolt.Tx) error {
+	err := db.Update(func(tx *bbolt.Tx) error {
 		if len(path) == 0 {
 			// We cannot insert a pair at root
 			return errors.New("insertPair: Cannot insert pair at root")
@@ -663,7 +694,7 @@ func insertPair(path []string, k string, v string) error {
 }
 
 func exportValue(path []string, fName string) error {
-	return db.View(func(tx *bolt.Tx) error {
+	return db.View(func(tx *bbolt.Tx) error {
 		// len(b.path)-1 is the key whose value we want to export
 		// the rest are buckets leading to that key
 		b := tx.Bucket([]byte(path[0]))
@@ -682,14 +713,14 @@ 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")
 	})
 }
 
 func exportJSON(path []string, fName string) error {
-	return db.View(func(tx *bolt.Tx) error {
+	return db.View(func(tx *bbolt.Tx) error {
 		// len(b.path)-1 is the key whose value we want to export
 		// the rest are buckets leading to that key
 		b := tx.Bucket([]byte(path[0]))
@@ -719,7 +750,7 @@ func exportJSON(path []string, fName string) error {
 	})
 }
 
-func genJSONString(b *bolt.Bucket) string {
+func genJSONString(b *bbolt.Bucket) string {
 	ret := "{"
 	b.ForEach(func(k, v []byte) error {
 		ret = fmt.Sprintf("%s\"%s\":", ret, string(k))
@@ -756,3 +787,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 *bbolt.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")
+	})
+}

internal/boltbrowser/cursor.go

@@ -1,4 +1,4 @@
-package main
+package boltbrowser
 
 type Cursor struct {
 	x int

internal/boltbrowser/main.go

@@ -0,0 +1,79 @@
+package boltbrowser
+
+import (
+	"fmt"
+	"os"
+	"time"
+
+	"github.com/nsf/termbox-go"
+	"go.etcd.io/bbolt"
+)
+
+var ProgramName = "boltbrowser"
+var VersionNum = 2.0
+
+var AppArgs Args
+var databaseFiles []string
+var db *bbolt.DB
+var memBolt *BoltDB
+
+var currentFilename string
+
+const DefaultDBOpenTimeout = time.Second
+
+type Args struct {
+	DBOpenTimeout time.Duration
+	ReadOnly      bool
+	NoValue       bool
+}
+
+func DefaultArgs() Args {
+	return Args{
+		DBOpenTimeout: DefaultDBOpenTimeout,
+	}
+}
+
+func Main(args Args, files []string) error {
+	// Set the global args. This is done to convert main package into a library with minimal changes.
+	AppArgs, databaseFiles = args, files
+
+	var err error
+	err = termbox.Init()
+	if err != nil {
+		return err
+	}
+	defer termbox.Close()
+	style := defaultStyle()
+	termbox.SetOutputMode(termbox.Output256)
+
+	for _, databaseFile := range databaseFiles {
+		currentFilename = databaseFile
+		db, err = bbolt.Open(databaseFile, 0600, &bbolt.Options{Timeout: AppArgs.DBOpenTimeout})
+		if err == bbolt.ErrTimeout {
+			termbox.Close()
+			fmt.Printf("File %s is locked. Make sure it's not used by another app and try again\n", databaseFile)
+			os.Exit(1)
+		} else if err != nil {
+			if len(databaseFiles) > 1 {
+				mainLoop(nil, style)
+				continue
+			} else {
+				termbox.Close()
+				fmt.Printf("Error reading file: %q\n", err.Error())
+				os.Exit(1)
+			}
+		}
+
+		// First things first, load the database into memory
+		memBolt.refreshDatabase()
+		if AppArgs.ReadOnly {
+			// If we're opening it in readonly mode, close it now
+			db.Close()
+		}
+
+		// Kick off the UI loop
+		mainLoop(memBolt, style)
+		defer db.Close()
+	}
+	return nil
+}

internal/boltbrowser/mainloop.go

@@ -1,6 +1,7 @@
+//go:build !windows
 // +build !windows
 
-package main
+package boltbrowser
 
 import (
 	"os"

internal/boltbrowser/mainloop_windows.go

@@ -1,5 +1,6 @@
-// +build windows
-package main
+//go:build windows
+
+package boltbrowser
 
 // Windows doesn't support process backgrounding like *nix.
 // So we have a separate loop for it.

internal/boltbrowser/screen.go

@@ -1,4 +1,4 @@
-package main
+package boltbrowser
 
 import "github.com/nsf/termbox-go"
 

internal/boltbrowser/screen_about.go

@@ -1,9 +1,9 @@
-package main
+package boltbrowser
 
 import (
 	"fmt"
 
-	"github.com/br0xen/termbox-util"
+	termboxUtil "github.com/br0xen/termbox-util"
 	"github.com/nsf/termbox-go"
 )
 
@@ -108,12 +108,12 @@ func (screen *AboutScreen) drawScreen(style Style) {
 	commands2 := []Command{
 		{"p,P", "create pair/at parent"},
 		{"b,B", "create bucket/at parent"},
-		{"e", "edit value of pair"},
+		{"e", "edit pair value/bucket sequence"},
 		{"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"},

internal/boltbrowser/screen_browser.go

@@ -1,9 +1,10 @@
-package main
+package boltbrowser
 
 import (
 	"encoding/json"
 	"fmt"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"time"
 
@@ -54,6 +55,7 @@ const (
 	modeChangeKey     = 33  // 0000 0010 0001
 	modeChangeVal     = 34  // 0000 0010 0010
 	modeFilter        = 35  // 0100 0010 0011
+	modeChangeSeq     = 36  // 0100 0010 0100
 	modeInsert        = 64  // 0000 0100 0000
 	modeInsertBucket  = 65  // 0000 0100 0001
 	modeInsertPair    = 68  // 0000 0100 0100
@@ -61,9 +63,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 +91,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
 }
@@ -154,7 +157,7 @@ func (screen *BrowserScreen) handleBrowseKeyEvent(event termbox.Event) int {
 	} else if event.Ch == 'e' {
 		b, p, _ := screen.db.getGenericFromPath(screen.currentPath)
 		if b != nil {
-			screen.setMessage("Cannot edit a bucket, did you mean to (r)ename?")
+			screen.startEditBucketSequence()
 		} else if p != nil {
 			screen.startEditItem()
 		}
@@ -204,11 +207,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
 }
@@ -238,6 +244,21 @@ func (screen *BrowserScreen) handleInputKeyEvent(event termbox.Event) int {
 						screen.setMessage("Bucket Renamed!")
 						screen.refreshDatabase()
 					}
+				} else if screen.mode == modeChangeSeq {
+					newSeqStr := screen.inputModal.GetValue()
+
+					newSeq, err := strconv.ParseUint(newSeqStr, 10, 64)
+					if err != nil {
+						screen.setMessage("Invalid sequence value.")
+					} else {
+						if err := updateBucketSequence(screen.currentPath, newSeq); err != nil {
+							screen.setMessage("Error occurred updating Sequence.")
+						} else {
+							b.sequence = newSeq
+							screen.setMessage("Sequence updated!")
+							screen.refreshDatabase()
+						}
+					}
 				}
 			} else if p != nil {
 				if screen.mode == modeChangeKey {
@@ -374,7 +395,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 +404,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()
@@ -611,6 +641,8 @@ func (screen *BrowserScreen) buildRightPane(style Style) {
 				Line{fmt.Sprintf("Buckets: %d", len(b.buckets)), style.defaultFg, style.defaultBg})
 			screen.rightPaneBuffer = append(screen.rightPaneBuffer,
 				Line{fmt.Sprintf("Pairs: %d", len(b.pairs)), style.defaultFg, style.defaultBg})
+			screen.rightPaneBuffer = append(screen.rightPaneBuffer,
+				Line{fmt.Sprintf("Sequence: %d", b.sequence), style.defaultFg, style.defaultBg})
 		} else if p != nil {
 			screen.rightPaneBuffer = append(screen.rightPaneBuffer,
 				Line{fmt.Sprintf("Path: %s", strings.Join(stringifyPath(p.GetPath()), " → ")), style.defaultFg, style.defaultBg})
@@ -762,6 +794,23 @@ func (screen *BrowserScreen) startFilter() bool {
 	return false
 }
 
+func (screen *BrowserScreen) startEditBucketSequence() bool {
+	b, _, e := screen.db.getGenericFromPath(screen.currentPath)
+	if e == 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("Set sequence for '%s'", b.name), inpW, termboxUtil.AlignCenter))
+		mod.SetValue(strconv.Itoa(int(b.sequence)))
+		mod.Show()
+		screen.inputModal = mod
+		screen.mode = modeChangeSeq
+		return true
+	}
+	return false
+}
+
 func (screen *BrowserScreen) startEditItem() bool {
 	_, p, e := screen.db.getGenericFromPath(screen.currentPath)
 	if e == nil {
@@ -907,7 +956,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 +979,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()

internal/boltbrowser/stringify.go

@@ -1,4 +1,4 @@
-package main
+package boltbrowser
 
 import (
 	"encoding/binary"

internal/boltbrowser/style.go

@@ -1,4 +1,4 @@
-package main
+package boltbrowser
 
 import "github.com/nsf/termbox-go"
 

main.go

@@ -7,33 +7,20 @@ import (
 	"strings"
 	"time"
 
-	"github.com/boltdb/bolt"
-	"github.com/nsf/termbox-go"
+	"github.com/br0xen/boltbrowser/pkg/boltbrowser"
 )
 
-var ProgramName = "boltbrowser"
-var VersionNum = 2.0
-
-var databaseFiles []string
-var db *bolt.DB
-var memBolt *BoltDB
-
-var currentFilename string
-
-const DefaultDBOpenTimeout = time.Second
-
-var AppArgs struct {
-	DBOpenTimeout time.Duration
-	ReadOnly      bool
-	NoValue       bool
+func main() {
+	args := boltbrowser.DefaultArgs()
+	files := parseArgs(&args)
+	err := boltbrowser.Main(args, files)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, err.Error())
+		os.Exit(1)
+	}
 }
 
-func init() {
-	AppArgs.DBOpenTimeout = DefaultDBOpenTimeout
-	AppArgs.ReadOnly = false
-}
-
-func parseArgs() {
+func parseArgs(args *boltbrowser.Args) (databaseFiles []string) {
 	var err error
 	if len(os.Args) == 1 {
 		printUsage(nil)
@@ -51,10 +38,10 @@ func parseArgs() {
 			key, val := pts[0], pts[1]
 			switch key {
 			case "-timeout":
-				AppArgs.DBOpenTimeout, err = time.ParseDuration(val)
+				args.DBOpenTimeout, err = time.ParseDuration(val)
 				if err != nil {
 					// See if we can successfully parse by adding a 's'
-					AppArgs.DBOpenTimeout, err = time.ParseDuration(val + "s")
+					args.DBOpenTimeout, err = time.ParseDuration(val + "s")
 				}
 				// If err is still not nil, print usage
 				if err != nil {
@@ -62,11 +49,11 @@ func parseArgs() {
 				}
 			case "-readonly", "-ro":
 				if val == "true" {
-					AppArgs.ReadOnly = true
+					args.ReadOnly = true
 				}
 			case "-no-value":
 				if val == "true" {
-					AppArgs.NoValue = true
+					args.NoValue = true
 				}
 			case "-help":
 				printUsage(nil)
@@ -77,9 +64,9 @@ func parseArgs() {
 			// Single-word arguments
 			switch parms[i] {
 			case "-readonly", "-ro":
-				AppArgs.ReadOnly = true
+				args.ReadOnly = true
 			case "-no-value":
-				AppArgs.NoValue = true
+				args.NoValue = true
 			case "-help":
 				printUsage(nil)
 			default:
@@ -87,58 +74,15 @@ func parseArgs() {
 			}
 		}
 	}
+	return
 }
 
 func printUsage(err error) {
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
 	}
-	fmt.Fprintf(os.Stderr, "Usage: %s [OPTIONS] <filename(s)>\nOptions:\n", ProgramName)
+	fmt.Fprintf(os.Stderr, "Usage: boltbrowser [OPTIONS] <filename(s)>\nOptions:\n")
 	fmt.Fprintf(os.Stderr, "  -timeout=duration\n        DB file open timeout (default 1s)\n")
 	fmt.Fprintf(os.Stderr, "  -ro, -readonly   \n        Open the DB in read-only mode\n")
 	fmt.Fprintf(os.Stderr, "  -no-value        \n        Do not display a value in left pane\n")
 }
-
-func main() {
-	var err error
-
-	parseArgs()
-
-	err = termbox.Init()
-	if err != nil {
-		panic(err)
-	}
-	defer termbox.Close()
-	style := defaultStyle()
-	termbox.SetOutputMode(termbox.Output256)
-
-	for _, databaseFile := range databaseFiles {
-		currentFilename = databaseFile
-		db, err = bolt.Open(databaseFile, 0600, &bolt.Options{Timeout: AppArgs.DBOpenTimeout})
-		if err == bolt.ErrTimeout {
-			termbox.Close()
-			fmt.Printf("File %s is locked. Make sure it's not used by another app and try again\n", databaseFile)
-			os.Exit(1)
-		} else if err != nil {
-			if len(databaseFiles) > 1 {
-				mainLoop(nil, style)
-				continue
-			} else {
-				termbox.Close()
-				fmt.Printf("Error reading file: %q\n", err.Error())
-				os.Exit(1)
-			}
-		}
-
-		// First things first, load the database into memory
-		memBolt.refreshDatabase()
-		if AppArgs.ReadOnly {
-			// If we're opening it in readonly mode, close it now
-			db.Close()
-		}
-
-		// Kick off the UI loop
-		mainLoop(memBolt, style)
-		defer db.Close()
-	}
-}

pkg/boltbrowser/boltbrowser.go

@@ -0,0 +1,9 @@
+package boltbrowser
+
+import internal "github.com/br0xen/boltbrowser/internal/boltbrowser"
+
+type Args = internal.Args
+
+var DefaultArgs = internal.DefaultArgs
+
+var Main = internal.Main