Moved command execution to main lib
This commit is contained in:
Arnas Udovic
parent
662973c4df
commit
b9f777568e
5 changed files with 25 additions and 256 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -22,4 +22,5 @@
|
|||
go.work
|
||||
|
||||
zordfsdb
|
||||
zordfsdb-client
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ Client for zordfsdb database.
|
|||
* ADD [path] - add abcex indexed object to list. Will return index
|
||||
* INFO [path] - get all info about property/object/list
|
||||
* TREE [path] - draw db part in path with values
|
||||
* TEMPLATE [path] [template] - set template to list for object creation
|
||||
* HELP - will print this help
|
||||
* QUIT - exit the shell
|
||||
|
||||
|
|
@ -32,3 +33,4 @@ KEYS(\K), GET(\G), INC(\I), DEC(\D), NOW(\N), DEL(\R), SAVE(\S), CREATE(\C), ADD
|
|||
- colors
|
||||
- SAVE - refresh
|
||||
- et_on_list_obj (???)
|
||||
- command list from main lib
|
||||
|
|
|
|||
4
go.mod
4
go.mod
|
|
@ -2,6 +2,6 @@ module g.arns.lt/zordsdavini/zordfsdb-client
|
|||
|
||||
go 1.23.0
|
||||
|
||||
require g.arns.lt/zordsdavini/zordfsdb v1.0.2
|
||||
require g.arns.lt/zordsdavini/zordfsdb v1.0.10
|
||||
|
||||
require g.arns.lt/zordsdavini/abcex v1.0.2 // indirect
|
||||
require g.arns.lt/zordsdavini/abcex/v4 v4.0.4 // indirect
|
||||
|
|
|
|||
12
go.sum
12
go.sum
|
|
@ -1,9 +1,9 @@
|
|||
g.arns.lt/zordsdavini/abcex v1.0.1 h1:ZN/xSDQb8CiR9+jXHYp+tUtGILMeRu9PvvqhypZDkyI=
|
||||
g.arns.lt/zordsdavini/abcex v1.0.1/go.mod h1:YRcJgts3XZwI+LEkngpfUab3DkUAW387Irpr43hIym8=
|
||||
g.arns.lt/zordsdavini/abcex v1.0.2 h1:Q5+3J9NlHVnWGePetEAoDh/pUypkRTgcRrP13iy9y4s=
|
||||
g.arns.lt/zordsdavini/abcex v1.0.2/go.mod h1:YRcJgts3XZwI+LEkngpfUab3DkUAW387Irpr43hIym8=
|
||||
g.arns.lt/zordsdavini/zordfsdb v1.0.2 h1:J2rTJa5rbG2RiSv3uQ6G8Y8LdUiZ/rPMlsdo6ilwXv8=
|
||||
g.arns.lt/zordsdavini/zordfsdb v1.0.2/go.mod h1:gq30YNjz3yIMdI4cA5e5mK90V4Yns5NAsbwi6s8Bf3Q=
|
||||
g.arns.lt/zordsdavini/abcex/v4 v4.0.4 h1:idjvgkCjrjZfDxLyOcX7lCIdIndISDAkj77VCvhu8/c=
|
||||
g.arns.lt/zordsdavini/abcex/v4 v4.0.4/go.mod h1:/+//gYSUtJrdsmTtWNoffRO4xD1BuPRUMGW4ynet7iE=
|
||||
g.arns.lt/zordsdavini/zordfsdb v1.0.9 h1:MB0kbxxcu1pwDIIrbsObmTgOuJdEq0eunbo+2Ym9Yt8=
|
||||
g.arns.lt/zordsdavini/zordfsdb v1.0.9/go.mod h1:CpFWjby+GB/+mrJFTsCDJHS5UCWHty6Y7Pf/Ui7IR90=
|
||||
g.arns.lt/zordsdavini/zordfsdb v1.0.10 h1:UqCUvBNS+AsCIZ2uC2JoXkjmbHtIAJWMU7jSk39Jpvw=
|
||||
g.arns.lt/zordsdavini/zordfsdb v1.0.10/go.mod h1:CpFWjby+GB/+mrJFTsCDJHS5UCWHty6Y7Pf/Ui7IR90=
|
||||
github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=
|
||||
github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w=
|
||||
golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
|
||||
|
|
|
|||
262
main.go
262
main.go
|
|
@ -1,3 +1,11 @@
|
|||
// Copyright (C) 2025 Arns Udovič <zordsdavini@arns.lt>
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
|
|
@ -29,7 +37,10 @@ func main() {
|
|||
}
|
||||
|
||||
if len(executeCommand) > 0 {
|
||||
ExecuteCommand(db, executeCommand)
|
||||
err = db.ExecuteCommands(executeCommand, &lastPath, &lastKey)
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
}
|
||||
} else {
|
||||
reader := bufio.NewReader(os.Stdin)
|
||||
fmt.Println("ZordFsDB Shell")
|
||||
|
|
@ -79,255 +90,10 @@ KEYS(\K), GET(\G), INC(\I), DEC(\D), NOW(\N), DEL(\R), SAVE(\S), CREATE(\C), ADD
|
|||
continue
|
||||
}
|
||||
|
||||
ExecuteCommand(db, text)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func ExecuteCommand(db zordfsdb.DB, commands string) error {
|
||||
for _, command := range strings.Split(commands, ";") {
|
||||
command = strings.Trim(command, " ")
|
||||
parts := strings.Split(command, " ")
|
||||
if len(parts) > 1 {
|
||||
if lastPath != "" {
|
||||
if parts[1] == "_" {
|
||||
parts[1] = lastPath
|
||||
} else {
|
||||
parts[1] = strings.Replace(parts[1], "_.", lastPath+".", 1)
|
||||
}
|
||||
}
|
||||
|
||||
if lastKey != "" {
|
||||
parts[1] = strings.Replace(parts[1], "$", lastKey, 1)
|
||||
}
|
||||
|
||||
lastPath = parts[1]
|
||||
}
|
||||
|
||||
switch strings.ToUpper(parts[0]) {
|
||||
case "KEYS":
|
||||
case "\\K":
|
||||
kpath := "."
|
||||
if !(len(parts) == 1 || len(parts[1]) == 0) {
|
||||
kpath = parts[1]
|
||||
}
|
||||
|
||||
fmt.Printf("{%s} KEYS: ", kpath)
|
||||
fmt.Println(db.Keys(kpath))
|
||||
fmt.Println("")
|
||||
break
|
||||
|
||||
case "INFO":
|
||||
case "\\?":
|
||||
if len(parts) == 1 || len(parts[1]) == 0 {
|
||||
return fmt.Errorf("err format: INFO [path]\n")
|
||||
}
|
||||
|
||||
node, ok := db.GetNode(parts[1])
|
||||
if !ok {
|
||||
fmt.Println("No path found.")
|
||||
fmt.Println("")
|
||||
} else {
|
||||
fmt.Printf("{%s} INFO\n-----------------\n", parts[1])
|
||||
ntype := "property"
|
||||
if node.List {
|
||||
ntype = "list"
|
||||
} else if node.Object {
|
||||
ntype = "object"
|
||||
}
|
||||
fmt.Println("type:", ntype)
|
||||
if ntype == "property" {
|
||||
fmt.Println("value:", node.Value)
|
||||
} else {
|
||||
fmt.Println("keys:", db.Keys(parts[1]))
|
||||
}
|
||||
|
||||
fmt.Println("")
|
||||
}
|
||||
break
|
||||
|
||||
case "TREE":
|
||||
case "\\T":
|
||||
if len(parts) == 1 || len(parts[1]) == 0 || parts[1] == "." {
|
||||
fmt.Printf("TREE\n-----------------\n\\\n")
|
||||
printNodeTree(&db, 1)
|
||||
fmt.Println("")
|
||||
break
|
||||
}
|
||||
|
||||
node, ok := db.GetNode(parts[1])
|
||||
if !ok {
|
||||
return fmt.Errorf("err format: TREE [path]\n")
|
||||
} else {
|
||||
fmt.Printf("{%s} TREE\n-----------------\n", parts[1])
|
||||
if !node.List && !node.Object {
|
||||
fmt.Printf("%s: %s\n\n", node.Key, node.Value)
|
||||
break
|
||||
}
|
||||
|
||||
fmt.Println(node.Key)
|
||||
printNodeTree(&node, 1)
|
||||
}
|
||||
|
||||
fmt.Println("")
|
||||
break
|
||||
|
||||
case "GET":
|
||||
case "\\G":
|
||||
if len(parts) == 1 || len(parts[1]) == 0 {
|
||||
return fmt.Errorf("err format: GET [path]\n")
|
||||
}
|
||||
|
||||
value, ok := db.Get(parts[1])
|
||||
if !ok {
|
||||
fmt.Println("No value found.")
|
||||
fmt.Println("")
|
||||
} else {
|
||||
fmt.Printf("{%s} VALUE: ", parts[1])
|
||||
fmt.Println(value)
|
||||
fmt.Println("")
|
||||
}
|
||||
break
|
||||
|
||||
case "INC":
|
||||
case "\\I":
|
||||
if len(parts) == 1 || len(parts[1]) == 0 {
|
||||
return fmt.Errorf("err format: INC [path]\n")
|
||||
}
|
||||
|
||||
ok := db.Inc(parts[1])
|
||||
if !ok {
|
||||
fmt.Println("No value found.")
|
||||
fmt.Println("")
|
||||
} else {
|
||||
fmt.Printf("{%s} INC OK\n", parts[1])
|
||||
fmt.Println("")
|
||||
}
|
||||
break
|
||||
|
||||
case "DEC":
|
||||
case "\\D":
|
||||
if len(parts) == 1 || len(parts[1]) == 0 {
|
||||
return fmt.Errorf("err format: DEC [path]\n")
|
||||
}
|
||||
|
||||
ok := db.Dec(parts[1])
|
||||
if !ok {
|
||||
fmt.Println("No value found.")
|
||||
fmt.Println("")
|
||||
} else {
|
||||
fmt.Printf("{%s} DEC OK\n", parts[1])
|
||||
fmt.Println("")
|
||||
}
|
||||
break
|
||||
|
||||
case "NOW":
|
||||
case "\\N":
|
||||
if len(parts) == 1 || len(parts[1]) == 0 {
|
||||
return fmt.Errorf("err format: NOW [path]\n")
|
||||
}
|
||||
|
||||
ok := db.Now(parts[1])
|
||||
if !ok {
|
||||
fmt.Println("No value found.")
|
||||
fmt.Println("")
|
||||
} else {
|
||||
fmt.Printf("{%s} NOW OK\n", parts[1])
|
||||
fmt.Println("")
|
||||
}
|
||||
break
|
||||
|
||||
case "DEL":
|
||||
case "\\R":
|
||||
if len(parts) == 1 || len(parts[1]) == 0 {
|
||||
return fmt.Errorf("err format: DEL [path]\n")
|
||||
}
|
||||
|
||||
ok := db.Del(parts[1])
|
||||
if !ok {
|
||||
fmt.Println("No value/object found.")
|
||||
fmt.Println("")
|
||||
} else {
|
||||
fmt.Printf("{%s} DELETED\n", parts[1])
|
||||
fmt.Println("")
|
||||
}
|
||||
break
|
||||
|
||||
case "SAVE":
|
||||
case "\\S":
|
||||
if len(parts) < 3 || len(parts[1]) == 0 {
|
||||
return fmt.Errorf("err format: SAVE [path] [value|long value]\n")
|
||||
}
|
||||
|
||||
value := strings.Trim(strings.Join(parts[2:], " "), "\"")
|
||||
|
||||
ok := db.Save(parts[1], value)
|
||||
if !ok {
|
||||
fmt.Println("No value found.")
|
||||
fmt.Println("")
|
||||
} else {
|
||||
fmt.Printf("{%s} SAVED\n", parts[1])
|
||||
fmt.Println("")
|
||||
}
|
||||
db.Refresh()
|
||||
break
|
||||
|
||||
case "CREATE":
|
||||
case "\\C":
|
||||
if len(parts) == 1 || len(parts[1]) == 0 {
|
||||
return fmt.Errorf("err format: CREATE [path]\n")
|
||||
}
|
||||
|
||||
ok := db.CreateNode(parts[1])
|
||||
if !ok {
|
||||
fmt.Println("No path found.")
|
||||
fmt.Println("")
|
||||
} else {
|
||||
fmt.Printf("{%s} CREATED\n", parts[1])
|
||||
fmt.Println("")
|
||||
}
|
||||
break
|
||||
|
||||
case "ADD":
|
||||
case "\\A":
|
||||
if len(parts) == 1 || len(parts[1]) == 0 {
|
||||
return fmt.Errorf("err format: ADD [path]\n")
|
||||
}
|
||||
|
||||
id, err := db.AddObject(parts[1])
|
||||
err := db.ExecuteCommands(text, &lastPath, &lastKey)
|
||||
if err != nil {
|
||||
fmt.Println("No path found.")
|
||||
fmt.Println("")
|
||||
} else {
|
||||
fmt.Printf("{%s} ADDED with ID: %s\n", parts[1], id)
|
||||
fmt.Println("")
|
||||
lastKey = id
|
||||
fmt.Println(err)
|
||||
}
|
||||
break
|
||||
|
||||
default:
|
||||
fmt.Println("err[00] unknown command, try HELP")
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func printNodeTree(node zordfsdb.GetNodes, i int) {
|
||||
for key, child := range node.GetNodes() {
|
||||
j := i - 1
|
||||
for j > 0 {
|
||||
fmt.Printf("│ ")
|
||||
j--
|
||||
}
|
||||
|
||||
fmt.Printf("├── %s", key)
|
||||
if !child.List && !child.Object {
|
||||
fmt.Printf(": %s\n", child.Value)
|
||||
} else {
|
||||
fmt.Println("")
|
||||
printNodeTree(&child, i+1)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue