diff --git a/internal/piwigocli/categories.go b/cmd/piwigo-cli/categories.go similarity index 93% rename from internal/piwigocli/categories.go rename to cmd/piwigo-cli/categories.go index 990cf28..26d3db2 100644 --- a/internal/piwigocli/categories.go +++ b/cmd/piwigo-cli/categories.go @@ -1,4 +1,4 @@ -package piwigocli +package main type CategoriesGroup struct { List CategoriesListCommand `command:"list" description:"List categories"` diff --git a/internal/piwigocli/categories_list.go b/cmd/piwigo-cli/categories_list.go similarity index 98% rename from internal/piwigocli/categories_list.go rename to cmd/piwigo-cli/categories_list.go index e8b78f6..be2292a 100644 --- a/internal/piwigocli/categories_list.go +++ b/cmd/piwigo-cli/categories_list.go @@ -1,4 +1,4 @@ -package piwigocli +package main import ( "os" diff --git a/internal/piwigocli/general.go b/cmd/piwigo-cli/general.go similarity index 98% rename from internal/piwigocli/general.go rename to cmd/piwigo-cli/general.go index ee27ea0..8c3b86a 100644 --- a/internal/piwigocli/general.go +++ b/cmd/piwigo-cli/general.go @@ -1,4 +1,4 @@ -package piwigocli +package main import ( "net/url" diff --git a/internal/piwigocli/images.go b/cmd/piwigo-cli/images.go similarity index 96% rename from internal/piwigocli/images.go rename to cmd/piwigo-cli/images.go index 2c729c0..520e1f4 100644 --- a/internal/piwigocli/images.go +++ b/cmd/piwigo-cli/images.go @@ -1,4 +1,4 @@ -package piwigocli +package main type ImagesGroup struct { List ImagesListCommand `command:"list" description:"List of images"` diff --git a/internal/piwigocli/images_details.go b/cmd/piwigo-cli/images_details.go similarity index 99% rename from internal/piwigocli/images_details.go rename to cmd/piwigo-cli/images_details.go index 4917f45..ad08e12 100644 --- a/internal/piwigocli/images_details.go +++ b/cmd/piwigo-cli/images_details.go @@ -1,4 +1,4 @@ -package piwigocli +package main import ( "fmt" diff --git a/internal/piwigocli/images_list.go b/cmd/piwigo-cli/images_list.go similarity index 99% rename from internal/piwigocli/images_list.go rename to cmd/piwigo-cli/images_list.go index 9b6fafa..04aae67 100644 --- a/internal/piwigocli/images_list.go +++ b/cmd/piwigo-cli/images_list.go @@ -1,4 +1,4 @@ -package piwigocli +package main import ( "fmt" diff --git a/internal/piwigocli/images_upload.go b/cmd/piwigo-cli/images_upload.go similarity index 98% rename from internal/piwigocli/images_upload.go rename to cmd/piwigo-cli/images_upload.go index eb43009..7e5dcff 100644 --- a/internal/piwigocli/images_upload.go +++ b/cmd/piwigo-cli/images_upload.go @@ -1,4 +1,4 @@ -package piwigocli +package main import ( "errors" diff --git a/internal/piwigocli/images_upload_tree.go b/cmd/piwigo-cli/images_upload_tree.go similarity index 98% rename from internal/piwigocli/images_upload_tree.go rename to cmd/piwigo-cli/images_upload_tree.go index f3a3782..272cb01 100644 --- a/internal/piwigocli/images_upload_tree.go +++ b/cmd/piwigo-cli/images_upload_tree.go @@ -1,4 +1,4 @@ -package piwigocli +package main import ( "github.com/celogeek/piwigo-cli/internal/piwigo" diff --git a/cmd/piwigo-cli/main.go b/cmd/piwigo-cli/main.go index 3c67fbf..a5c559c 100644 --- a/cmd/piwigo-cli/main.go +++ b/cmd/piwigo-cli/main.go @@ -1,9 +1,28 @@ package main import ( - "github.com/celogeek/piwigo-cli/internal/piwigocli" + "os" + + "github.com/jessevdk/go-flags" ) -func main() { - piwigocli.Run() +type Options struct { +} + +var options Options + +var parser = flags.NewParser(&options, flags.Default) + +func main() { + if _, err := parser.Parse(); err != nil { + switch flagsErr := err.(type) { + case flags.ErrorType: + if flagsErr == flags.ErrHelp { + os.Exit(0) + } + os.Exit(1) + default: + os.Exit(1) + } + } } diff --git a/internal/piwigocli/method.go b/cmd/piwigo-cli/method.go similarity index 96% rename from internal/piwigocli/method.go rename to cmd/piwigo-cli/method.go index 7b304aa..fcf97c0 100644 --- a/internal/piwigocli/method.go +++ b/cmd/piwigo-cli/method.go @@ -1,4 +1,4 @@ -package piwigocli +package main type MethodGroup struct { List MethodListCommand `command:"list" description:"List of available methods"` diff --git a/internal/piwigocli/method_details.go b/cmd/piwigo-cli/method_details.go similarity index 98% rename from internal/piwigocli/method_details.go rename to cmd/piwigo-cli/method_details.go index c202662..d26398e 100644 --- a/internal/piwigocli/method_details.go +++ b/cmd/piwigo-cli/method_details.go @@ -1,4 +1,4 @@ -package piwigocli +package main import ( "fmt" diff --git a/internal/piwigocli/method_list.go b/cmd/piwigo-cli/method_list.go similarity index 99% rename from internal/piwigocli/method_list.go rename to cmd/piwigo-cli/method_list.go index 6c097dc..6e5787b 100644 --- a/internal/piwigocli/method_list.go +++ b/cmd/piwigo-cli/method_list.go @@ -1,4 +1,4 @@ -package piwigocli +package main import ( "encoding/json" diff --git a/internal/piwigocli/method_try.go b/cmd/piwigo-cli/method_try.go similarity index 98% rename from internal/piwigocli/method_try.go rename to cmd/piwigo-cli/method_try.go index e0d4e1b..e784763 100644 --- a/internal/piwigocli/method_try.go +++ b/cmd/piwigo-cli/method_try.go @@ -1,4 +1,4 @@ -package piwigocli +package main import ( "errors" diff --git a/internal/piwigocli/session.go b/cmd/piwigo-cli/session.go similarity index 95% rename from internal/piwigocli/session.go rename to cmd/piwigo-cli/session.go index 19853b6..5b7487a 100644 --- a/internal/piwigocli/session.go +++ b/cmd/piwigo-cli/session.go @@ -1,4 +1,4 @@ -package piwigocli +package main type SessionGroup struct { Login SessionLoginCommand `command:"login" description:"Initialize a connection to a piwigo instance"` diff --git a/internal/piwigocli/session_login.go b/cmd/piwigo-cli/session_login.go similarity index 97% rename from internal/piwigocli/session_login.go rename to cmd/piwigo-cli/session_login.go index a35a60a..20ad289 100644 --- a/internal/piwigocli/session_login.go +++ b/cmd/piwigo-cli/session_login.go @@ -1,4 +1,4 @@ -package piwigocli +package main import ( "fmt" diff --git a/internal/piwigocli/session_status.go b/cmd/piwigo-cli/session_status.go similarity index 97% rename from internal/piwigocli/session_status.go rename to cmd/piwigo-cli/session_status.go index 506a026..418baf5 100644 --- a/internal/piwigocli/session_status.go +++ b/cmd/piwigo-cli/session_status.go @@ -1,4 +1,4 @@ -package piwigocli +package main import ( "os" diff --git a/internal/piwigo/piwigotools/tree.go b/internal/piwigo/piwigotools/tree.go index 50e7127..c66aaaa 100644 --- a/internal/piwigo/piwigotools/tree.go +++ b/internal/piwigo/piwigotools/tree.go @@ -14,8 +14,8 @@ type Tree interface { } type node struct { - Name string - children map[string]*node + Name string + Nodes map[string]*node } func NewTree() Tree { @@ -25,13 +25,13 @@ func NewTree() Tree { } func (t *node) Add(name string) Tree { - if t.children == nil { - t.children = map[string]*node{} + if t.Nodes == nil { + t.Nodes = map[string]*node{} } - n, ok := t.children[name] + n, ok := t.Nodes[name] if !ok { n = &node{Name: name} - t.children[name] = n + t.Nodes[name] = n } return n } @@ -44,9 +44,9 @@ func (t *node) AddPath(path string) Tree { } func (t *node) Children() []*node { - childs := make([]*node, len(t.children)) + childs := make([]*node, len(t.Nodes)) i := 0 - for _, n := range t.children { + for _, n := range t.Nodes { childs[i] = n i++ } @@ -57,7 +57,7 @@ func (t *node) Children() []*node { } func (t *node) HasChildren() bool { - return t.children != nil + return t.Nodes != nil } func (t *node) FlatView() (out chan string) { diff --git a/internal/piwigocli/main.go b/internal/piwigocli/main.go deleted file mode 100644 index 82e6896..0000000 --- a/internal/piwigocli/main.go +++ /dev/null @@ -1,28 +0,0 @@ -package piwigocli - -import ( - "os" - - "github.com/jessevdk/go-flags" -) - -type Options struct { -} - -var options Options - -var parser = flags.NewParser(&options, flags.Default) - -func Run() { - if _, err := parser.Parse(); err != nil { - switch flagsErr := err.(type) { - case flags.ErrorType: - if flagsErr == flags.ErrHelp { - os.Exit(0) - } - os.Exit(1) - default: - os.Exit(1) - } - } -}