Merge branch 'master' of ssh://git.bullercodeworks.com:2200/brian/boltbrowser
This commit is contained in:
commit
b0aec79fcd
1
.gitignore
vendored
1
.gitignore
vendored
@ -28,6 +28,7 @@ build
|
||||
# Binaries
|
||||
*.exe
|
||||
boltbrowser
|
||||
boltbrowser.*
|
||||
|
||||
# Test Database
|
||||
test.db
|
||||
|
12
README.md
12
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
|
||||
-----
|
||||
|
@ -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")
|
||||
})
|
||||
@ -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")
|
||||
})
|
||||
}
|
||||
|
BIN
build/aboutscreen.png
Normal file
BIN
build/aboutscreen.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 29 KiB |
BIN
build/mainscreen.png
Normal file
BIN
build/mainscreen.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 18 KiB |
11
go.mod
11
go.mod
@ -3,9 +3,12 @@ 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 1.13
|
||||
require (
|
||||
github.com/mattn/go-runewidth v0.0.9 // indirect
|
||||
golang.org/x/sys v0.6.0 // indirect
|
||||
)
|
||||
|
||||
go 1.20
|
||||
|
12
go.sum
12
go.sum
@ -2,9 +2,9 @@ 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/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=
|
||||
golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
|
||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
|
@ -1,4 +1,5 @@
|
||||
// +build windows
|
||||
//go:build windows
|
||||
|
||||
package main
|
||||
|
||||
// Windows doesn't support process backgrounding like *nix.
|
||||
|
@ -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"},
|
||||
|
@ -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()
|
||||
|
Loading…
Reference in New Issue
Block a user