brian
/
boltbrowser
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Making some progress

This commit is contained in:
Brian Buller 2015-05-12 16:04:49 -05:00
parent d3fcd82542
commit 32a8c82b51
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bolt_model.go
View File

@ -277,6 +277,11 @@ func (bd *BoltDB) refreshDatabase() *BoltDB {
return memBolt return memBolt
} }
func (b *BoltBucket) GetPath() []string {
b.path[len(b.path)-1] = b.name
return b.path
}
func (b *BoltBucket) buildVisiblePathSlice(prefix []string) ([]string, error) { func (b *BoltBucket) buildVisiblePathSlice(prefix []string) ([]string, error) {
var ret_slice []string var ret_slice []string
var ret_err error var ret_err error
@ -296,7 +301,7 @@ func (b *BoltBucket) buildVisiblePathSlice(prefix []string) ([]string, error) {
} }
// Add Pairs // Add Pairs
for i := range b.pairs { for i := range b.pairs {
ret_slice = append(ret_slice, strings.Join(prefix, "/")+b.pairs[i].key) ret_slice = append(ret_slice, strings.Join(prefix, "/")+"/"+b.pairs[i].key)
} }
} }
return ret_slice, ret_err return ret_slice, ret_err
@ -437,7 +442,7 @@ func updatePairValue(path []string, v string) error {
// len(b.path)-1 is the key we need to delete, the rest are buckets leading to that key // 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])) b := tx.Bucket([]byte(path[0]))
if b != nil { if b != nil {
if len(path) > 1 { if len(path) > 0 {
for i := range path[1 : len(path)-1] { for i := range path[1 : len(path)-1] {
b = b.Bucket([]byte(path[i+1])) b = b.Bucket([]byte(path[i+1]))
if b == nil { if b == nil {
@ -495,16 +500,16 @@ func insertBucket(path []string, n string) error {
func insertPair(path []string, k string, v string) error { func insertPair(path []string, k string, v string) error {
// Insert a new pair k => v at path // Insert a new pair k => v at path
err := db.Update(func(tx *bolt.Tx) error { err := db.Update(func(tx *bolt.Tx) error {
if len(path) == 1 { if len(path) == 0 {
// We cannot insert a pair at root // We cannot insert a pair at root
return errors.New("insertPair: Cannot insert pair at root.") return errors.New("insertPair: Cannot insert pair at root.")
} else if len(path) > 1 { } else {
var err error var err error
b := tx.Bucket([]byte(path[0])) b := tx.Bucket([]byte(path[0]))
if b != nil { if b != nil {
if len(path) > 2 { if len(path) > 0 {
for i := range path[1 : len(path)-2] { for i := 1; i < len(path)-1; i++ {
b = b.Bucket([]byte(path[i+1])) b = b.Bucket([]byte(path[i]))
if b == nil { if b == nil {
return fmt.Errorf("insertPair: %s", err) return fmt.Errorf("insertPair: %s", err)
} }

41
screen_browser.go
View File

@ -246,13 +246,9 @@ func (screen *BrowserScreen) handleInsertKeyEvent(event termbox.Event) int {
} }
insert_path = screen.current_path insert_path = screen.current_path
// where are we inserting? // where are we inserting?
//var parent *BoltBucket
if p != nil { if p != nil {
// If we're sitting on a pair, we have to go to it's parent // If we're sitting on a pair, we have to go to it's parent
screen.mode = screen.mode | MODE_MOD_TO_PARENT screen.mode = screen.mode | MODE_MOD_TO_PARENT
// parent = p.parent
//} else if b != nil {
// parent = b.parent
} }
if screen.mode&MODE_MOD_TO_PARENT == MODE_MOD_TO_PARENT { if screen.mode&MODE_MOD_TO_PARENT == MODE_MOD_TO_PARENT {
if len(screen.current_path) > 1 { if len(screen.current_path) > 1 {
@ -273,14 +269,17 @@ func (screen *BrowserScreen) handleInsertKeyEvent(event termbox.Event) int {
screen.mode = MODE_BROWSE screen.mode = MODE_BROWSE
screen.input_modal.Clear() screen.input_modal.Clear()
} else if screen.mode&MODE_INSERT_PAIR == MODE_INSERT_PAIR { } else if screen.mode&MODE_INSERT_PAIR == MODE_INSERT_PAIR {
// insertPair(insert_path, screen.message = "Add new pair: " + new_val
if screen.mode&MODE_INSERT_PAIR_KEY == MODE_INSERT_PAIR_KEY { err := insertPair(insert_path, new_val, "")
screen.input_modal.SetText("New Pair Value:") if err != nil {
screen.mode = MODE_INSERT_PAIR | MODE_INSERT_PAIR_VAL screen.message = fmt.Sprintf("%s => %s", err, insert_path)
screen.input_modal.Show() screen.refreshDatabase()
} else if screen.mode&MODE_INSERT_PAIR_VAL == MODE_INSERT_PAIR_VAL {
screen.mode = MODE_BROWSE screen.mode = MODE_BROWSE
screen.input_modal.Clear() screen.input_modal.Clear()
} else {
screen.current_path = append(screen.current_path, new_val)
screen.refreshDatabase()
screen.startEditItem()
} }
} }
} }
@ -434,7 +433,7 @@ func (screen *BrowserScreen) drawRightPane(style Style) {
start_x := (w / 2) + 2 start_x := (w / 2) + 2
start_y := 2 start_y := 2
if b != nil { if b != nil {
termbox_util.DrawStringAtPoint(fmt.Sprintf("Path: %s", strings.Join(b.path, "/")), start_x, start_y, style.default_fg, style.default_bg) termbox_util.DrawStringAtPoint(fmt.Sprintf("Path: %s", strings.Join(b.GetPath(), "/")), start_x, start_y, style.default_fg, style.default_bg)
termbox_util.DrawStringAtPoint(fmt.Sprintf("Buckets: %d", len(b.buckets)), start_x, start_y+1, style.default_fg, style.default_bg) termbox_util.DrawStringAtPoint(fmt.Sprintf("Buckets: %d", len(b.buckets)), start_x, start_y+1, style.default_fg, style.default_bg)
termbox_util.DrawStringAtPoint(fmt.Sprintf("Pairs: %d", len(b.pairs)), start_x, start_y+2, style.default_fg, style.default_bg) termbox_util.DrawStringAtPoint(fmt.Sprintf("Pairs: %d", len(b.pairs)), start_x, start_y+2, style.default_fg, style.default_bg)
} else if p != nil { } else if p != nil {
@ -471,7 +470,7 @@ func (screen *BrowserScreen) drawBucket(bkt *BoltBucket, style Style, y int) int
used_lines := 0 used_lines := 0
bucket_fg := style.default_fg bucket_fg := style.default_fg
bucket_bg := style.default_bg bucket_bg := style.default_bg
if comparePaths(screen.current_path, bkt.path) { if comparePaths(screen.current_path, bkt.GetPath()) {
bucket_fg = style.cursor_fg bucket_fg = style.cursor_fg
bucket_bg = style.cursor_bg bucket_bg = style.cursor_bg
} }
@ -572,7 +571,7 @@ func (screen *BrowserScreen) startEditItem() bool {
func (screen *BrowserScreen) startInsertItemAtParent(tp BoltType) bool { func (screen *BrowserScreen) startInsertItemAtParent(tp BoltType) bool {
w, h := termbox.Size() w, h := termbox.Size()
inp_w, inp_h := (w / 2), 6 inp_w, inp_h := (w / 2), 7
inp_x, inp_y := ((w / 2) - (inp_w / 2)), ((h / 2) - inp_h) inp_x, inp_y := ((w / 2) - (inp_w / 2)), ((h / 2) - inp_h)
mod := termbox_util.CreateInputModal("", inp_x, inp_y, inp_w, inp_h, termbox.ColorWhite, termbox.ColorBlack) mod := termbox_util.CreateInputModal("", inp_x, inp_y, inp_w, inp_h, termbox.ColorWhite, termbox.ColorBlack)
screen.input_modal = mod screen.input_modal = mod
@ -593,7 +592,6 @@ func (screen *BrowserScreen) startInsertItemAtParent(tp BoltType) bool {
return true return true
} else if tp == TYPE_PAIR { } else if tp == TYPE_PAIR {
mod.SetTitle(termbox_util.AlignText("Create Pair at "+ins_path, inp_w, termbox_util.ALIGN_CENTER)) mod.SetTitle(termbox_util.AlignText("Create Pair at "+ins_path, inp_w, termbox_util.ALIGN_CENTER))
mod.SetText("New Pair Key:")
mod.Show() mod.Show()
screen.mode = MODE_INSERT_PAIR | MODE_MOD_TO_PARENT screen.mode = MODE_INSERT_PAIR | MODE_MOD_TO_PARENT
return true return true
@ -603,16 +601,8 @@ func (screen *BrowserScreen) startInsertItemAtParent(tp BoltType) bool {
} }
func (screen *BrowserScreen) startInsertItem(tp BoltType) bool { func (screen *BrowserScreen) startInsertItem(tp BoltType) bool {
_, p, e := screen.db.getGenericFromPath(screen.current_path)
if e != nil {
return false
}
if p != nil {
// if the current path is at a pair, we _must_ go to the parent
return screen.startInsertItemAtParent(tp)
}
w, h := termbox.Size() w, h := termbox.Size()
inp_w, inp_h := (w / 2), 6 inp_w, inp_h := (w / 2), 7
inp_x, inp_y := ((w / 2) - (inp_w / 2)), ((h / 2) - inp_h) inp_x, inp_y := ((w / 2) - (inp_w / 2)), ((h / 2) - inp_h)
mod := termbox_util.CreateInputModal("", inp_x, inp_y, inp_w, inp_h, termbox.ColorWhite, termbox.ColorBlack) mod := termbox_util.CreateInputModal("", inp_x, inp_y, inp_w, inp_h, termbox.ColorWhite, termbox.ColorBlack)
screen.input_modal = mod screen.input_modal = mod
@ -622,6 +612,11 @@ func (screen *BrowserScreen) startInsertItem(tp BoltType) bool {
screen.mode = MODE_INSERT_BUCKET screen.mode = MODE_INSERT_BUCKET
mod.Show() mod.Show()
return true return true
} else if tp == TYPE_PAIR {
mod.SetTitle(termbox_util.AlignText("Create Pair at "+ins_path, inp_w, termbox_util.ALIGN_CENTER))
mod.Show()
screen.mode = MODE_INSERT_PAIR
return true
} }
return false return false
} }