save config, create subcommand

internal/piwigo/config.go

@@ -0,0 +1,60 @@
+package piwigo
+
+import (
+	"encoding/json"
+	"fmt"
+	"os"
+)
+
+func (p *Piwigo) ConfigPath() (configPath string, err error) {
+	configDir, err := os.UserConfigDir()
+	if err == nil {
+		configPath = fmt.Sprintf("%s/piwigo-cli", configDir)
+	}
+	return
+}
+
+func (p *Piwigo) CreateConfigDir() (configPath string, err error) {
+	configPath, err = p.ConfigPath()
+	if err != nil {
+		return
+	}
+
+	err = os.MkdirAll(configPath, os.FileMode(0700))
+	return
+}
+
+func (p *Piwigo) SaveConfig() (err error) {
+	configPath, err := p.CreateConfigDir()
+	if err != nil {
+		return
+	}
+
+	configFile := fmt.Sprintf("%s/config.json", configPath)
+
+	b, err := json.MarshalIndent(p, "", "  ")
+	if err != nil {
+		return err
+	}
+
+	err = os.WriteFile(configFile, b, os.FileMode(0700))
+	return err
+}
+
+func (p *Piwigo) LoadConfig() (err error) {
+	configPath, err := p.ConfigPath()
+	if err != nil {
+		return
+	}
+
+	configFile := fmt.Sprintf("%s/config.json", configPath)
+	b, err := os.ReadFile(configFile)
+	if os.IsNotExist(err) {
+		err = nil
+		return
+	}
+	if err != nil {
+		err = json.Unmarshal(b, p)
+	}
+	return
+}

internal/piwigo/post.go

@@ -8,58 +8,45 @@ import (
 	"net/url"
 )
 
-type Piwigo struct {
+func (p *Piwigo) BuildUrl(method string) (string, error) {
-	Url    string
-	Token  string
-	Method string
-}
 
-type PiwigoResult struct {
+	Url, err := url.Parse(p.Url)
-	Stat       string      `json:"stat"`
+	if err != nil {
-	Err        int         `json:"err"`
+		return "", err
-	ErrMessage string      `json:"message"`
-	Result     interface{} `json:"result"`
-}
-
-func (p *Piwigo) BuildUrl() (string, error) {
-
-	Url, Err := url.Parse(p.Url)
-	if Err != nil {
-		return "", Err
 	}
 	Url.Path += "/ws.php"
 	q := Url.Query()
 	q.Set("format", "json")
-	q.Set("method", p.Method)
+	q.Set("method", method)
 	Url.RawQuery = q.Encode()
 	return Url.String(), nil
 }
 
-func (p *Piwigo) Post(req *url.Values, resp interface{}) error {
+func (p *Piwigo) Post(method string, req *url.Values, resp interface{}) error {
-	Url, Err := p.BuildUrl()
+	Url, err := p.BuildUrl(method)
-	if Err != nil {
+	if err != nil {
-		return Err
+		return err
 	}
 
-	r, Err := http.PostForm(Url, *req)
+	r, err := http.PostForm(Url, *req)
-	if Err != nil {
+	if err != nil {
-		return Err
+		return err
 	}
 
 	defer r.Body.Close()
 
-	b, Err := ioutil.ReadAll(r.Body)
+	b, err := ioutil.ReadAll(r.Body)
-	if Err != nil {
+	if err != nil {
-		return Err
+		return err
 	}
 
 	Result := PiwigoResult{
 		Result: resp,
 	}
 
-	Err = json.Unmarshal(b, &Result)
+	err = json.Unmarshal(b, &Result)
-	if Err != nil {
+	if err != nil {
-		return Err
+		return err
 	}
 
 	if Result.Stat != "ok" {

internal/piwigo/struct.go

@@ -0,0 +1,13 @@
+package piwigo
+
+type Piwigo struct {
+	Url   string `json:"url"`
+	Token string `json:"token"`
+}
+
+type PiwigoResult struct {
+	Stat       string      `json:"stat"`
+	Err        int         `json:"err"`
+	ErrMessage string      `json:"message"`
+	Result     interface{} `json:"result"`
+}

session.go

@@ -13,33 +13,43 @@ type LoginCommand struct {
 	Password string `short:"p" long:"password" description:"Password"`
 }
 
-var loginCommand LoginCommand
+type StatusCommand struct {
+}
+
+type SessionGroup struct {
+	Login  LoginCommand  `command:"login" description:"Initialize a connection to a piwigo instance"`
+	Status StatusCommand `command:"status" description:"Get the status of your session"`
+}
+
+var sessionGroup SessionGroup
 
 func (c *LoginCommand) Execute(args []string) error {
 	fmt.Printf("Login on %s...\n", c.Url)
 
 	Piwigo := piwigo.Piwigo{
 		Url: c.Url,
-		Method: "pwg.session.login",
 	}
 
 	result := false
 
-	if Err := Piwigo.Post(&url.Values{
+	err := Piwigo.Post("pwg.session.login", &url.Values{
 		"username": []string{c.Login},
 		"password": []string{c.Password},
-	}, &result); Err != nil {
+	}, &result)
-		return Err
+	if err != nil {
+		return err
 	}
 
-	fmt.Printf("Token: %s\n", Piwigo.Token)
+	err = Piwigo.SaveConfig()
+	if err != nil {
+		return err
+	}
+
+	fmt.Println("Login succeed!")
 
 	return nil
 }
 
 func init() {
-	parser.AddCommand("login",
+	parser.AddCommand("session", "Session management", "", &sessionGroup)
-		"Initialize a connection to a piwigo instance",
-		"Initialize a connection to a piwigo instance",
-		&loginCommand)
 }