move piwigocli from internal to cmd

cmd/piwigo-cli/categories.go

@@ -1,4 +1,4 @@
-package piwigocli
+package main
 
 type CategoriesGroup struct {
 	List CategoriesListCommand `command:"list" description:"List categories"`

cmd/piwigo-cli/categories_list.go

@@ -1,4 +1,4 @@
-package piwigocli
+package main
 
 import (
 	"os"

cmd/piwigo-cli/general.go

@@ -1,4 +1,4 @@
-package piwigocli
+package main
 
 import (
 	"net/url"

cmd/piwigo-cli/images.go

@@ -1,4 +1,4 @@
-package piwigocli
+package main
 
 type ImagesGroup struct {
 	List       ImagesListCommand       `command:"list" description:"List of images"`

cmd/piwigo-cli/images_details.go

@@ -1,4 +1,4 @@
-package piwigocli
+package main
 
 import (
 	"fmt"

cmd/piwigo-cli/images_list.go

@@ -1,4 +1,4 @@
-package piwigocli
+package main
 
 import (
 	"fmt"

cmd/piwigo-cli/images_upload.go

@@ -1,4 +1,4 @@
-package piwigocli
+package main
 
 import (
 	"errors"

cmd/piwigo-cli/images_upload_tree.go

@@ -1,4 +1,4 @@
-package piwigocli
+package main
 
 import (
 	"github.com/celogeek/piwigo-cli/internal/piwigo"

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() {
+type Options struct {
-	piwigocli.Run()
+}
+
+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)
+		}
+	}
 }

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"`

cmd/piwigo-cli/method_details.go

@@ -1,4 +1,4 @@
-package piwigocli
+package main
 
 import (
 	"fmt"

cmd/piwigo-cli/method_list.go

@@ -1,4 +1,4 @@
-package piwigocli
+package main
 
 import (
 	"encoding/json"

cmd/piwigo-cli/method_try.go

@@ -1,4 +1,4 @@
-package piwigocli
+package main
 
 import (
 	"errors"

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"`

cmd/piwigo-cli/session_login.go

@@ -1,4 +1,4 @@
-package piwigocli
+package main
 
 import (
 	"fmt"

cmd/piwigo-cli/session_status.go

@@ -1,4 +1,4 @@
-package piwigocli
+package main
 
 import (
 	"os"

internal/piwigo/piwigotools/tree.go

@@ -14,8 +14,8 @@ type Tree interface {
 }
 
 type node struct {
-	Name     string
+	Name  string
-	children map[string]*node
+	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 {
+	if t.Nodes == nil {
-		t.children = map[string]*node{}
+		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) {

internal/piwigocli/main.go

@@ -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)
-		}
-	}
-}