|
|
|
@ -150,7 +150,6 @@ func (g *Gui) LoadJSON() {
|
|
|
|
log.Println(fmt.Sprintf("can't open file: %s", err))
|
|
|
|
log.Println(fmt.Sprintf("can't open file: %s", err))
|
|
|
|
return err
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
defer file.Close()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
i, err := UnMarshalJSON(file)
|
|
|
|
i, err := UnMarshalJSON(file)
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
@ -216,7 +215,7 @@ func (g *Gui) SaveJSONToFile(file string) error {
|
|
|
|
enc := json.NewEncoder(&buf)
|
|
|
|
enc := json.NewEncoder(&buf)
|
|
|
|
enc.SetIndent("", " ")
|
|
|
|
enc.SetIndent("", " ")
|
|
|
|
|
|
|
|
|
|
|
|
if err := enc.Encode(g.MakeJSON(g.Tree.OriginRoot)); err != nil {
|
|
|
|
if err := enc.Encode(g.makeJSON(g.Tree.GetRoot())); err != nil {
|
|
|
|
log.Println(fmt.Sprintf("can't marshal json: %s", err))
|
|
|
|
log.Println(fmt.Sprintf("can't marshal json: %s", err))
|
|
|
|
return err
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -229,7 +228,7 @@ func (g *Gui) SaveJSONToFile(file string) error {
|
|
|
|
return nil
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func (g *Gui) MakeJSON(node *tview.TreeNode) interface{} {
|
|
|
|
func (g *Gui) makeJSON(node *tview.TreeNode) interface{} {
|
|
|
|
ref := node.GetReference().(Reference)
|
|
|
|
ref := node.GetReference().(Reference)
|
|
|
|
children := node.GetChildren()
|
|
|
|
children := node.GetChildren()
|
|
|
|
|
|
|
|
|
|
|
|
@ -237,25 +236,22 @@ func (g *Gui) MakeJSON(node *tview.TreeNode) interface{} {
|
|
|
|
case Object:
|
|
|
|
case Object:
|
|
|
|
i := make(map[string]interface{})
|
|
|
|
i := make(map[string]interface{})
|
|
|
|
for _, n := range children {
|
|
|
|
for _, n := range children {
|
|
|
|
i[n.GetText()] = g.MakeJSON(n)
|
|
|
|
i[n.GetText()] = g.makeJSON(n)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return i
|
|
|
|
return i
|
|
|
|
case Array:
|
|
|
|
case Array:
|
|
|
|
var i []interface{}
|
|
|
|
var i []interface{}
|
|
|
|
for _, n := range children {
|
|
|
|
for _, n := range children {
|
|
|
|
i = append(i, g.MakeJSON(n))
|
|
|
|
i = append(i, g.makeJSON(n))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return i
|
|
|
|
return i
|
|
|
|
case Key:
|
|
|
|
case Key:
|
|
|
|
if len(node.GetChildren()) == 0 {
|
|
|
|
|
|
|
|
return ""
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
v := node.GetChildren()[0]
|
|
|
|
v := node.GetChildren()[0]
|
|
|
|
if v.GetReference().(Reference).JSONType == Value {
|
|
|
|
if v.GetReference().(Reference).JSONType == Value {
|
|
|
|
return g.parseValue(v)
|
|
|
|
return g.parseValue(v)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return map[string]interface{}{
|
|
|
|
return map[string]interface{}{
|
|
|
|
node.GetText(): g.MakeJSON(v),
|
|
|
|
node.GetText(): g.makeJSON(v),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -343,14 +339,14 @@ func (g *Gui) NaviPanel() {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func (g *Gui) EditWithEditor() {
|
|
|
|
func (g *Gui) EditWithEditor() {
|
|
|
|
g.App.Suspend(func() {
|
|
|
|
|
|
|
|
f, err := ioutil.TempFile("", "tson")
|
|
|
|
f, err := ioutil.TempFile("", "tson")
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
log.Println(fmt.Sprintf("can't create temp file: %s", err))
|
|
|
|
log.Println(fmt.Sprintf("can't create temp file: %s", err))
|
|
|
|
g.Message(err.Error(), "main", func() {})
|
|
|
|
g.Message(err.Error(), "main", func() {})
|
|
|
|
return
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
f.Close()
|
|
|
|
|
|
|
|
|
|
|
|
defer os.RemoveAll(f.Name())
|
|
|
|
|
|
|
|
|
|
|
|
if err := g.SaveJSONToFile(f.Name()); err != nil {
|
|
|
|
if err := g.SaveJSONToFile(f.Name()); err != nil {
|
|
|
|
log.Println(fmt.Sprintf("can't write to temp file: %s", err))
|
|
|
|
log.Println(fmt.Sprintf("can't write to temp file: %s", err))
|
|
|
|
@ -358,21 +354,15 @@ func (g *Gui) EditWithEditor() {
|
|
|
|
return
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if b := g.App.Suspend(func() {
|
|
|
|
editor := os.Getenv("EDITOR")
|
|
|
|
editor := os.Getenv("EDITOR")
|
|
|
|
if editor == "" {
|
|
|
|
if editor == "" {
|
|
|
|
msg := fmt.Sprint("$EDITOR is empty")
|
|
|
|
log.Println(fmt.Sprintf("$EDITOR is empty: %s", err))
|
|
|
|
log.Println(msg)
|
|
|
|
g.Message(err.Error(), "main", func() {})
|
|
|
|
g.Message(msg, "main", func() {})
|
|
|
|
|
|
|
|
return
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var args []string
|
|
|
|
cmd := exec.Command(editor, f.Name())
|
|
|
|
if editor == "vim" {
|
|
|
|
|
|
|
|
args = append(args, []string{"-c", "set ft=json", f.Name()}...)
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
args = append(args, f.Name())
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
cmd := exec.Command(editor, args...)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Start the command with a pty.
|
|
|
|
// Start the command with a pty.
|
|
|
|
ptmx, err := pty.Start(cmd)
|
|
|
|
ptmx, err := pty.Start(cmd)
|
|
|
|
@ -381,11 +371,7 @@ func (g *Gui) EditWithEditor() {
|
|
|
|
return
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Make sure to close the pty at the end.
|
|
|
|
// Make sure to close the pty at the end.
|
|
|
|
defer func() {
|
|
|
|
defer func() { _ = ptmx.Close() }() // Best effort.
|
|
|
|
if err := ptmx.Close(); err != nil {
|
|
|
|
|
|
|
|
log.Printf("can't close pty: %s", err)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Handle pty size.
|
|
|
|
// Handle pty size.
|
|
|
|
ch := make(chan os.Signal, 1)
|
|
|
|
ch := make(chan os.Signal, 1)
|
|
|
|
@ -406,23 +392,14 @@ func (g *Gui) EditWithEditor() {
|
|
|
|
g.Message(err.Error(), "main", func() {})
|
|
|
|
g.Message(err.Error(), "main", func() {})
|
|
|
|
return
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
defer func() {
|
|
|
|
defer func() { _ = terminal.Restore(int(os.Stdin.Fd()), oldState) }() // Best effort.
|
|
|
|
if err := terminal.Restore(int(os.Stdin.Fd()), oldState); err != nil {
|
|
|
|
|
|
|
|
log.Printf("can't restore terminal: %s", err)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Copy stdin to the pty and the pty to stdout.
|
|
|
|
// Copy stdin to the pty and the pty to stdout.
|
|
|
|
go io.Copy(ptmx, os.Stdin)
|
|
|
|
go func() {
|
|
|
|
io.Copy(os.Stdout, ptmx)
|
|
|
|
io.Copy(ptmx, os.Stdin)
|
|
|
|
|
|
|
|
}()
|
|
|
|
|
|
|
|
|
|
|
|
f, err = os.Open(f.Name())
|
|
|
|
io.Copy(os.Stdout, ptmx)
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
log.Println(fmt.Sprintf("can't open file: %s", err))
|
|
|
|
|
|
|
|
g.Message(err.Error(), "main", func() {})
|
|
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
defer f.Close()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
i, err := UnMarshalJSON(f)
|
|
|
|
i, err := UnMarshalJSON(f)
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
@ -431,9 +408,12 @@ func (g *Gui) EditWithEditor() {
|
|
|
|
return
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
os.RemoveAll(f.Name())
|
|
|
|
|
|
|
|
g.Tree.UpdateView(g, i)
|
|
|
|
g.Tree.UpdateView(g, i)
|
|
|
|
})
|
|
|
|
}); !b {
|
|
|
|
|
|
|
|
log.Println(fmt.Sprintf("can't edit: %s", err))
|
|
|
|
|
|
|
|
g.Message(err.Error(), "main", func() {})
|
|
|
|
|
|
|
|
return
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func UnMarshalJSON(in io.Reader) (interface{}, error) {
|
|
|
|
func UnMarshalJSON(in io.Reader) (interface{}, error) {
|
|
|
|
|