reorganize

internal/piwigo/categories.go

@@ -4,66 +4,56 @@ import (
 	"errors"
 	"fmt"
 	"net/url"
+
+	"github.com/celogeek/piwigo-cli/internal/piwigo/piwigotools"
 )
 
 type CategoriesResult struct {
-	Categories `json:"categories"`
+	Categories piwigotools.Categories `json:"categories"`
 }
 
-type Categories []Category
+func (p *Piwigo) Categories() (piwigotools.Categories, error) {
+	var result CategoriesResult
 
-type Category struct {
+	if err := p.Post("pwg.categories.getList", &url.Values{
-	Id          int    `json:"id"`
-	Name        string `json:"name"`
-	ImagesCount int    `json:"nb_images"`
-	Url         string `json:"url"`
-}
-
-func (p *Piwigo) Categories() (map[int]Category, error) {
-	var categories CategoriesResult
-
-	err := p.Post("pwg.categories.getList", &url.Values{
 		"fullname":  []string{"true"},
 		"recursive": []string{"true"},
-	}, &categories)
+	}, &result); err != nil {
+		return nil, err
+	}
+	return result.Categories, nil
+}
+
+func (p *Piwigo) CategoryFromId() (map[int]piwigotools.Category, error) {
+	categories, err := p.Categories()
 	if err != nil {
 		return nil, err
 	}
-
+	result := map[int]piwigotools.Category{}
-	result := map[int]Category{}
+	for _, category := range categories {
-
-	for _, category := range categories.Categories {
 		result[category.Id] = category
 	}
 	return result, nil
 }
 
-func (c Categories) Names() []string {
+func (p *Piwigo) CategoryFromName(catId int) (map[string]piwigotools.Category, error) {
-	names := []string{}
+	var results CategoriesResult
-	for _, category := range c {
-		names = append(names, category.Name)
-	}
-	return names
-}
-
-func (p *Piwigo) CategoriesId(catId int) (map[string]int, error) {
-	var categories CategoriesResult
 
 	err := p.Post("pwg.categories.getList", &url.Values{
 		"cat_id": []string{fmt.Sprint(catId)},
-	}, &categories)
+	}, &results)
 	if err != nil {
 		return nil, err
 	}
 
-	categoriesId := make(map[string]int)
+	categoriesId := map[string]piwigotools.Category{}
 	ok := false
-	for _, category := range categories.Categories {
+	for _, category := range results.Categories {
 		switch category.Id {
 		case catId:
 			ok = true
 		default:
-			categoriesId[category.Name] = category.Id
+			categoriesId[category.Name] = category
 		}
 	}
 	if !ok {

internal/piwigo/derivatives.go

@@ -1,9 +0,0 @@
-package piwigo
-
-type Derivatives map[string]Derivative
-
-type Derivative struct {
-	Height int    `json:"height"`
-	Width  int    `json:"width"`
-	Url    string `json:"url"`
-}

internal/piwigo/files.go

@@ -8,9 +8,15 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/celogeek/piwigo-cli/internal/piwigo/piwigotools"
 	"golang.org/x/text/unicode/norm"
 )
 
+type FileUploadResult struct {
+	ImageId int    `json:"image_id"`
+	Url     string `json:"url"`
+}
+
 func (p *Piwigo) FileExists(md5 string) bool {
 	var resp map[string]*string
 
@@ -19,11 +25,10 @@ func (p *Piwigo) FileExists(md5 string) bool {
 	}, &resp); err != nil {
 		return false
 	}
-
 	return resp[md5] != nil
 }
 
-func (p *Piwigo) CheckUploadFile(file *FileToUpload, stat *FileToUploadStat) (err error) {
+func (p *Piwigo) CheckUploadFile(file *piwigotools.FileToUpload, stat *piwigotools.FileToUploadStat) (err error) {
 	if !file.Checked() {
 		if file.MD5() == "" {
 			stat.Fail()
@@ -46,13 +51,13 @@ func (p *Piwigo) CheckUploadFile(file *FileToUpload, stat *FileToUploadStat) (er
 	return nil
 }
 
-func (p *Piwigo) Upload(file *FileToUpload, stat *FileToUploadStat, nbJobs int, hasVideoJS bool) {
+func (p *Piwigo) Upload(file *piwigotools.FileToUpload, stat *piwigotools.FileToUploadStat, nbJobs int, hasVideoJS bool) {
 	err := p.CheckUploadFile(file, stat)
 	if err != nil {
 		return
 	}
 	wg := &sync.WaitGroup{}
-	chunks, err := Base64Chunker(file.FullPath())
+	chunks, err := piwigotools.Base64Chunker(file.FullPath())
 	if err != nil {
 		stat.Error("Base64Chunker", file.FullPath(), err)
 		return
@@ -70,7 +75,7 @@ func (p *Piwigo) Upload(file *FileToUpload, stat *FileToUploadStat, nbJobs int,
 
 	// lock this process for committing the file
 
-	exif, _ := Exif(file.FullPath())
+	exif, _ := piwigotools.Exif(file.FullPath())
 	var resp *FileUploadResult
 	data := &url.Values{}
 	data.Set("original_sum", file.MD5())
@@ -109,7 +114,7 @@ func (p *Piwigo) Upload(file *FileToUpload, stat *FileToUploadStat, nbJobs int,
 	stat.Done()
 }
 
-func (p *Piwigo) UploadChunk(file *FileToUpload, chunks chan *Base64ChunkResult, wg *sync.WaitGroup, stat *FileToUploadStat, ok *bool) {
+func (p *Piwigo) UploadChunk(file *piwigotools.FileToUpload, chunks chan *piwigotools.Base64Chunk, wg *sync.WaitGroup, stat *piwigotools.FileToUploadStat, ok *bool) {
 	defer wg.Done()
 	for chunk := range chunks {
 		var err error
@@ -139,9 +144,9 @@ func (p *Piwigo) ScanTree(
 	rootPath string,
 	parentCategoryId int,
 	level int,
-	filter *UploadFileType,
+	filter *piwigotools.UploadFileType,
-	stat *FileToUploadStat,
+	stat *piwigotools.FileToUploadStat,
-	files chan *FileToUpload,
+	files chan *piwigotools.FileToUpload,
 ) {
 	if level == 0 {
 		defer close(files)
@@ -152,7 +157,7 @@ func (p *Piwigo) ScanTree(
 		return
 	}
 
-	categoriesId, err := p.CategoriesId(parentCategoryId)
+	categoryFromName, err := p.CategoryFromName(parentCategoryId)
 	if err != nil {
 		stat.Error("ScanTree CategoriesId", rootPath, err)
 		return
@@ -168,26 +173,23 @@ func (p *Piwigo) ScanTree(
 		switch dir.IsDir() {
 		case true: // Directory
 			dirname := norm.NFC.String(dir.Name())
-			categoryId, ok := categoriesId[dirname]
+			category, ok := categoryFromName[dirname]
 			if !ok {
-				var resp struct {
+				category = piwigotools.Category{}
-					Id int `json:"id"`
-				}
 				p.mu.Lock()
 				err = p.Post("pwg.categories.add", &url.Values{
 					"name":   []string{strings.ReplaceAll(dirname, "'", `\'`)},
 					"parent": []string{fmt.Sprint(parentCategoryId)},
-				}, &resp)
+				}, &category)
 				p.mu.Unlock()
 				if err != nil {
 					stat.Error("ScanTree Categories Add", rootPath, err)
 					return
 				}
-				categoryId = resp.Id
 			}
-			p.ScanTree(filepath.Join(rootPath, dirname), categoryId, level+1, filter, stat, files)
+			p.ScanTree(filepath.Join(rootPath, dirname), category.Id, level+1, filter, stat, files)
 		case false: // File
-			file := &FileToUpload{
+			file := &piwigotools.FileToUpload{
 				Dir:        rootPath,
 				Name:       dir.Name(),
 				CategoryId: parentCategoryId,
@@ -202,7 +204,7 @@ func (p *Piwigo) ScanTree(
 
 }
 
-func (p *Piwigo) CheckFiles(filesToCheck chan *FileToUpload, files chan *FileToUpload, stat *FileToUploadStat, nbJobs int) {
+func (p *Piwigo) CheckFiles(filesToCheck chan *piwigotools.FileToUpload, files chan *piwigotools.FileToUpload, stat *piwigotools.FileToUploadStat, nbJobs int) {
 	defer close(files)
 
 	wg := &sync.WaitGroup{}
@@ -224,8 +226,8 @@ func (p *Piwigo) CheckFiles(filesToCheck chan *FileToUpload, files chan *FileToU
 }
 
 func (p *Piwigo) UploadFiles(
-	files chan *FileToUpload,
+	files chan *piwigotools.FileToUpload,
-	stat *FileToUploadStat,
+	stat *piwigotools.FileToUploadStat,
 	hasVideoJS bool,
 	nbJobs int,
 	nbJobsChunk int,

internal/piwigo/helper.go

@@ -1,96 +0,0 @@
-package piwigo
-
-import (
-	"bytes"
-	"crypto/md5"
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net/url"
-	"os"
-	"strings"
-)
-
-var CHUNK_SIZE int64 = 1 * 1024 * 1024
-var CHUNK_BUFF_SIZE int64 = 32 * 1024
-var CHUNK_BUFF_COUNT = CHUNK_SIZE / CHUNK_BUFF_SIZE
-
-func DumpResponse(v interface{}) (err error) {
-	b, err := json.MarshalIndent(v, "", "  ")
-	if err == nil {
-		fmt.Println(string(b))
-	}
-	return
-}
-
-func ArgsToForm(args []string) (*url.Values, error) {
-	params := &url.Values{}
-	for _, arg := range args {
-		r := strings.SplitN(arg, "=", 2)
-		if len(r) != 2 {
-			return nil, errors.New("args should be key=value")
-		}
-		params.Add(r[0], strings.ReplaceAll(r[1], "'", `\'`))
-	}
-	return params, nil
-}
-
-func Md5File(filename string) (result string, err error) {
-	file, err := os.Open(filename)
-	if err != nil {
-		return
-	}
-	defer file.Close()
-
-	hash := md5.New()
-	_, err = io.Copy(hash, file)
-	if err != nil {
-		return
-	}
-	result = fmt.Sprintf("%x", hash.Sum(nil))
-	return
-}
-
-type Base64ChunkResult struct {
-	Position int64
-	Size     int64
-	Buffer   bytes.Buffer
-}
-
-func Base64Chunker(filename string) (out chan *Base64ChunkResult, err error) {
-	f, err := os.Open(filename)
-	if err != nil {
-		return
-	}
-
-	out = make(chan *Base64ChunkResult, 8)
-	go func() {
-		b := make([]byte, CHUNK_BUFF_SIZE)
-		defer f.Close()
-		defer close(out)
-		ok := false
-		for position := int64(0); !ok; position += 1 {
-			bf := &Base64ChunkResult{
-				Position: position,
-			}
-			b64 := base64.NewEncoder(base64.StdEncoding, &bf.Buffer)
-			for i := int64(0); i < CHUNK_BUFF_COUNT; i++ {
-				n, _ := f.Read(b)
-				if n == 0 {
-					ok = true
-					break
-				}
-				bf.Size += int64(n)
-				b64.Write(b[:n])
-			}
-			b64.Close()
-			if bf.Size > 0 {
-				out <- bf
-			}
-		}
-	}()
-
-	return
-}

internal/piwigo/images.go

@@ -1,19 +0,0 @@
-package piwigo
-
-type ImagesDetails struct {
-	Id            int         `json:"id"`
-	Md5           string      `json:"md5sum"`
-	Name          string      `json:"name"`
-	DateAvailable TimeResult  `json:"date_available"`
-	DateCreation  TimeResult  `json:"date_creation"`
-	LastModified  TimeResult  `json:"lastmodified"`
-	Width         int         `json:"width"`
-	Height        int         `json:"height"`
-	Url           string      `json:"page_url"`
-	ImageUrl      string      `json:"element_url"`
-	Filename      string      `json:"file"`
-	Filesize      int64       `json:"filesize"`
-	Categories    Categories  `json:"categories"`
-	Tags          Tags        `json:"tags"`
-	Derivatives   Derivatives `json:"derivatives"`
-}

internal/piwigo/info.go

@@ -1,8 +0,0 @@
-package piwigo
-
-type Infos []Info
-
-type Info struct {
-	Name  string      `json:"name"`
-	Value interface{} `json:"value"`
-}

internal/piwigo/login.go

@@ -3,15 +3,17 @@ package piwigo
 import (
 	"errors"
 	"net/url"
+
+	"github.com/celogeek/piwigo-cli/internal/piwigo/piwigotools"
 )
 
 type StatusResponse struct {
-	User           string         `json:"username"`
+	User           string                     `json:"username"`
-	Role           string         `json:"status"`
+	Role           string                     `json:"status"`
-	Version        string         `json:"version"`
+	Version        string                     `json:"version"`
-	Token          string         `json:"pwg_token"`
+	Token          string                     `json:"pwg_token"`
-	UploadFileType UploadFileType `json:"upload_file_types"`
+	UploadFileType piwigotools.UploadFileType `json:"upload_file_types"`
-	Plugins        ActivePlugin   `json:"plugins"`
+	Plugins        piwigotools.ActivePlugin   `json:"plugins"`
 }
 
 func (p *Piwigo) GetStatus() (*StatusResponse, error) {

internal/piwigo/methods.go

@@ -1,45 +0,0 @@
-package piwigo
-
-import (
-	"encoding/json"
-)
-
-type Methods []string
-
-type MethodParams []MethodParam
-
-type MethodParam struct {
-	Name         string      `json:"name"`
-	Optional     bool        `json:"optional"`
-	Type         string      `json:"type"`
-	AcceptArray  bool        `json:"acceptArray"`
-	DefaultValue interface{} `json:"defaultValue"`
-	MaxValue     interface{} `json:"maxValue"`
-	Info         string      `json:"info"`
-}
-
-type MethodOptions struct {
-	Admin    bool `json:"admin_only"`
-	PostOnly bool `json:"post_only"`
-}
-
-func (j *MethodOptions) UnmarshalJSON(data []byte) error {
-	var r interface{}
-	if err := json.Unmarshal(data, &r); err != nil {
-		return err
-	}
-
-	switch r := r.(type) {
-	case map[string]interface{}:
-		j.Admin, _ = r["admin_only"].(bool)
-		j.PostOnly, _ = r["post_only"].(bool)
-	}
-	return nil
-}
-
-type MethodDetails struct {
-	Name        string        `json:"name"`
-	Description string        `json:"description"`
-	Options     MethodOptions `json:"options"`
-	Parameters  MethodParams  `json:"params"`
-}

internal/piwigo/piwigo.go

@@ -10,10 +10,3 @@ type Piwigo struct {
 
 	mu sync.Mutex
 }
-
-type PiwigoResult struct {
-	Stat       string      `json:"stat"`
-	Err        int         `json:"err"`
-	ErrMessage string      `json:"message"`
-	Result     interface{} `json:"result"`
-}

internal/piwigo/piwigotools/active_plugin.go

@@ -1,4 +1,4 @@
-package piwigo
+package piwigotools
 
 import (
 	"encoding/json"

internal/piwigo/piwigotools/base64.go

@@ -0,0 +1,53 @@
+package piwigotools
+
+import (
+	"bytes"
+	"encoding/base64"
+	"os"
+)
+
+var CHUNK_SIZE int64 = 1 * 1024 * 1024
+var CHUNK_BUFF_SIZE int64 = 32 * 1024
+var CHUNK_BUFF_COUNT = CHUNK_SIZE / CHUNK_BUFF_SIZE
+
+type Base64Chunk struct {
+	Position int64
+	Size     int64
+	Buffer   bytes.Buffer
+}
+
+func Base64Chunker(filename string) (out chan *Base64Chunk, err error) {
+	f, err := os.Open(filename)
+	if err != nil {
+		return
+	}
+
+	out = make(chan *Base64Chunk, 8)
+	go func() {
+		b := make([]byte, CHUNK_BUFF_SIZE)
+		defer f.Close()
+		defer close(out)
+		ok := false
+		for position := int64(0); !ok; position += 1 {
+			bf := &Base64Chunk{
+				Position: position,
+			}
+			b64 := base64.NewEncoder(base64.StdEncoding, &bf.Buffer)
+			for i := int64(0); i < CHUNK_BUFF_COUNT; i++ {
+				n, _ := f.Read(b)
+				if n == 0 {
+					ok = true
+					break
+				}
+				bf.Size += int64(n)
+				b64.Write(b[:n])
+			}
+			b64.Close()
+			if bf.Size > 0 {
+				out <- bf
+			}
+		}
+	}()
+
+	return
+}

internal/piwigo/piwigotools/categories.go

@@ -0,0 +1,18 @@
+package piwigotools
+
+type Categories []Category
+
+type Category struct {
+	Id          int    `json:"id"`
+	Name        string `json:"name"`
+	ImagesCount int    `json:"nb_images"`
+	Url         string `json:"url"`
+}
+
+func (c *Categories) Names() []string {
+	names := []string{}
+	for _, category := range *c {
+		names = append(names, category.Name)
+	}
+	return names
+}

internal/piwigo/piwigotools/dump.go

@@ -0,0 +1,14 @@
+package piwigotools
+
+import (
+	"encoding/json"
+	"fmt"
+)
+
+func DumpResponse(v interface{}) (err error) {
+	b, err := json.MarshalIndent(v, "", "  ")
+	if err == nil {
+		fmt.Println(string(b))
+	}
+	return
+}

internal/piwigo/piwigotools/exif.go

@@ -1,4 +1,4 @@
-package piwigo
+package piwigotools
 
 import (
 	"fmt"

internal/piwigo/piwigotools/file_to_upload.go

@@ -1,4 +1,4 @@
-package piwigo
+package piwigotools
 
 import (
 	"os"
@@ -6,11 +6,6 @@ import (
 	"strings"
 )
 
-type FileUploadResult struct {
-	ImageId int    `json:"image_id"`
-	Url     string `json:"url"`
-}
-
 type FileToUpload struct {
 	Dir        string
 	Name       string

internal/piwigo/piwigotools/file_to_upload_stat.go

@@ -1,4 +1,4 @@
-package piwigo
+package piwigotools
 
 import (
 	"fmt"

internal/piwigo/piwigotools/image_details.go

@@ -0,0 +1,23 @@
+package piwigotools
+
+type ImageDetails struct {
+	Id            int        `json:"id"`
+	Md5           string     `json:"md5sum"`
+	Name          string     `json:"name"`
+	DateAvailable TimeResult `json:"date_available"`
+	DateCreation  TimeResult `json:"date_creation"`
+	LastModified  TimeResult `json:"lastmodified"`
+	Width         int        `json:"width"`
+	Height        int        `json:"height"`
+	Url           string     `json:"page_url"`
+	ImageUrl      string     `json:"element_url"`
+	Filename      string     `json:"file"`
+	Filesize      int64      `json:"filesize"`
+	Categories    Categories `json:"categories"`
+	Tags          Tags       `json:"tags"`
+	Derivatives   map[string]struct {
+		Height int    `json:"height"`
+		Width  int    `json:"width"`
+		Url    string `json:"url"`
+	} `json:"derivatives"`
+}

internal/piwigo/piwigotools/md5.go

@@ -0,0 +1,24 @@
+package piwigotools
+
+import (
+	"crypto/md5"
+	"fmt"
+	"io"
+	"os"
+)
+
+func Md5File(filename string) (result string, err error) {
+	file, err := os.Open(filename)
+	if err != nil {
+		return
+	}
+	defer file.Close()
+
+	hash := md5.New()
+	_, err = io.Copy(hash, file)
+	if err != nil {
+		return
+	}
+	result = fmt.Sprintf("%x", hash.Sum(nil))
+	return
+}

internal/piwigo/piwigotools/tags.go

@@ -1,4 +1,4 @@
-package piwigo
+package piwigotools
 
 import (
 	"fmt"

internal/piwigo/piwigotools/time_result.go

@@ -1,4 +1,4 @@
-package piwigo
+package piwigotools
 
 import (
 	"fmt"

internal/piwigo/piwigotools/upload_file_type.go

@@ -1,4 +1,4 @@
-package piwigo
+package piwigotools
 
 import (
 	"encoding/json"

internal/piwigo/post.go

@@ -8,8 +8,17 @@ import (
 	"net/url"
 	"os"
 	"strings"
+
+	"github.com/celogeek/piwigo-cli/internal/piwigo/piwigotools"
 )
 
+type PiwigoResult struct {
+	Stat       string      `json:"stat"`
+	Err        int         `json:"err"`
+	ErrMessage string      `json:"message"`
+	Result     interface{} `json:"result"`
+}
+
 func (p *Piwigo) BuildUrl(method string) (string, error) {
 
 	Url, err := url.Parse(p.Url)
@@ -89,7 +98,7 @@ func (p *Piwigo) Post(method string, form *url.Values, resp interface{}) error {
 			return err
 		}
 
-		DumpResponse(RawResult)
+		piwigotools.DumpResponse(RawResult)
 	}
 
 	if Result.Stat != "ok" {

internal/piwigocli/categories_list.go

@@ -1,7 +1,6 @@
 package piwigocli
 
 import (
-	"net/url"
 	"os"
 	"regexp"
 
@@ -13,10 +12,6 @@ type CategoriesListCommand struct {
 	Filter string `short:"x" long:"filter" description:"Regexp filter"`
 }
 
-type GetCategoriesListResponse struct {
-	Categories piwigo.Categories `json:"categories"`
-}
-
 func (c *CategoriesListCommand) Execute(args []string) error {
 	p := piwigo.Piwigo{}
 	if err := p.LoadConfig(); err != nil {
@@ -28,12 +23,8 @@ func (c *CategoriesListCommand) Execute(args []string) error {
 		return err
 	}
 
-	var resp GetCategoriesListResponse
+	categories, err := p.Categories()
-
+	if err != nil {
-	if err := p.Post("pwg.categories.getList", &url.Values{
-		"recursive": []string{"true"},
-		"fullname":  []string{"true"},
-	}, &resp); err != nil {
 		return err
 	}
 
@@ -44,7 +35,7 @@ func (c *CategoriesListCommand) Execute(args []string) error {
 
 	t := table.NewWriter()
 	t.AppendHeader(table.Row{"Id", "Name", "Images", "Url"})
-	for _, category := range resp.Categories {
+	for _, category := range categories {
 		if filter.MatchString(category.Name) {
 			t.AppendRow(table.Row{
 				category.Id,

internal/piwigocli/general.go

@@ -12,7 +12,14 @@ type GetInfosCommand struct {
 }
 
 type GetInfosResponse struct {
-	Infos piwigo.Infos `json:"infos"`
+	Infos Infos `json:"infos"`
+}
+
+type Infos []Info
+
+type Info struct {
+	Name  string      `json:"name"`
+	Value interface{} `json:"value"`
 }
 
 var getInfosCommand GetInfosCommand

internal/piwigocli/images.go

@@ -2,7 +2,7 @@ package piwigocli
 
 type ImagesGroup struct {
 	List       ImagesListCommand       `command:"list" description:"List of images"`
-	Details    ImagesDetailsCommand    `command:"details" description:"Details of the images"`
+	Details    ImageDetailsCommand     `command:"details" description:"Details of the images"`
 	Upload     ImagesUploadCommand     `command:"upload" description:"Upload of an images"`
 	UploadTree ImagesUploadTreeCommand `command:"upload-tree" description:"Upload of a directory of images"`
 }

internal/piwigocli/images_details.go

@@ -7,16 +7,15 @@ import (
 	"strings"
 
 	"github.com/celogeek/piwigo-cli/internal/piwigo"
+	"github.com/celogeek/piwigo-cli/internal/piwigo/piwigotools"
 	"github.com/jedib0t/go-pretty/v6/table"
 )
 
-type ImagesDetailsCommand struct {
+type ImageDetailsCommand struct {
 	Id string `short:"i" long:"id" description:"ID of the images" required:"true"`
 }
 
-type GetImagesDetailsResponse piwigo.ImagesDetails
+func (c *ImageDetailsCommand) Execute(args []string) error {
-
-func (c *ImagesDetailsCommand) Execute(args []string) error {
 	p := piwigo.Piwigo{}
 	if err := p.LoadConfig(); err != nil {
 		return err
@@ -27,7 +26,7 @@ func (c *ImagesDetailsCommand) Execute(args []string) error {
 		return err
 	}
 
-	var resp GetImagesDetailsResponse
+	var resp piwigotools.ImageDetails
 	if err := p.Post("pwg.images.getInfo", &url.Values{
 		"image_id": []string{c.Id},
 	}, &resp); err != nil {

internal/piwigocli/images_list.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"github.com/celogeek/piwigo-cli/internal/piwigo"
+	"github.com/celogeek/piwigo-cli/internal/piwigo/piwigotools"
 	"github.com/schollz/progressbar/v3"
 )
 
@@ -19,7 +20,7 @@ type ImagesListCommand struct {
 }
 
 type ImagesListResult struct {
-	Images []*piwigo.ImagesDetails `json:"images"`
+	Images []*piwigotools.ImageDetails `json:"images"`
 	Paging struct {
 		Count   int `json:"count"`
 		Page    int `json:"page"`
@@ -39,7 +40,7 @@ func (c *ImagesListCommand) Execute(args []string) error {
 		return err
 	}
 
-	categories, err := p.Categories()
+	categories, err := p.CategoryFromId()
 	if err != nil {
 		return err
 	}

internal/piwigocli/images_upload.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/celogeek/piwigo-cli/internal/piwigo"
+	"github.com/celogeek/piwigo-cli/internal/piwigo/piwigotools"
 	"github.com/schollz/progressbar/v3"
 )
 
@@ -33,13 +34,13 @@ func (c *ImagesUploadCommand) Execute(args []string) error {
 
 	_, hasVideoJS := status.Plugins["piwigo-videojs"]
 
-	file := &piwigo.FileToUpload{
+	file := &piwigotools.FileToUpload{
 		Dir:        filepath.Dir(c.Filename),
 		Name:       filepath.Base(c.Filename),
 		CategoryId: c.CategoryId,
 	}
 
-	stat := &piwigo.FileToUploadStat{
+	stat := &piwigotools.FileToUploadStat{
 		Progress: progressbar.DefaultBytes(1, "..."),
 	}
 	defer stat.Close()

internal/piwigocli/images_upload_tree.go

@@ -2,6 +2,7 @@ package piwigocli
 
 import (
 	"github.com/celogeek/piwigo-cli/internal/piwigo"
+	"github.com/celogeek/piwigo-cli/internal/piwigo/piwigotools"
 	"github.com/schollz/progressbar/v3"
 )
 
@@ -23,13 +24,13 @@ func (c *ImagesUploadTreeCommand) Execute(args []string) error {
 	}
 	_, hasVideoJS := status.Plugins["piwigo-videojs"]
 
-	stat := &piwigo.FileToUploadStat{
+	stat := &piwigotools.FileToUploadStat{
 		Progress: progressbar.DefaultBytes(1, "..."),
 	}
 
 	defer stat.Close()
-	filesToCheck := make(chan *piwigo.FileToUpload, 1000)
+	filesToCheck := make(chan *piwigotools.FileToUpload, 1000)
-	files := make(chan *piwigo.FileToUpload, 1000)
+	files := make(chan *piwigotools.FileToUpload, 1000)
 
 	go p.ScanTree(c.Dirname, c.CategoryId, 0, &status.UploadFileType, stat, filesToCheck)
 	go p.CheckFiles(filesToCheck, files, stat, 8)

internal/piwigocli/method_details.go

@@ -14,8 +14,6 @@ type MethodDetailsCommand struct {
 	MethodName string `short:"m" long:"method-name" description:"Method name to details"`
 }
 
-type MethodDetailsResult piwigo.MethodDetails
-
 func (c *MethodDetailsCommand) Execute(args []string) error {
 	p := piwigo.Piwigo{}
 	if err := p.LoadConfig(); err != nil {
@@ -27,7 +25,7 @@ func (c *MethodDetailsCommand) Execute(args []string) error {
 		return err
 	}
 
-	var result MethodDetailsResult
+	var result MethodDetails
 
 	if err := p.Post("reflection.getMethodDetails", &url.Values{
 		"methodName": []string{c.MethodName},

internal/piwigocli/method_list.go

@@ -1,6 +1,7 @@
 package piwigocli
 
 import (
+	"encoding/json"
 	"os"
 	"regexp"
 
@@ -13,7 +14,47 @@ type MethodListCommand struct {
 }
 
 type MethodListResult struct {
-	Methods piwigo.Methods `json:"methods"`
+	Methods Methods `json:"methods"`
+}
+
+type Methods []string
+
+type MethodParams []MethodParam
+
+type MethodParam struct {
+	Name         string      `json:"name"`
+	Optional     bool        `json:"optional"`
+	Type         string      `json:"type"`
+	AcceptArray  bool        `json:"acceptArray"`
+	DefaultValue interface{} `json:"defaultValue"`
+	MaxValue     interface{} `json:"maxValue"`
+	Info         string      `json:"info"`
+}
+
+type MethodOptions struct {
+	Admin    bool `json:"admin_only"`
+	PostOnly bool `json:"post_only"`
+}
+
+func (j *MethodOptions) UnmarshalJSON(data []byte) error {
+	var r interface{}
+	if err := json.Unmarshal(data, &r); err != nil {
+		return err
+	}
+
+	switch r := r.(type) {
+	case map[string]interface{}:
+		j.Admin, _ = r["admin_only"].(bool)
+		j.PostOnly, _ = r["post_only"].(bool)
+	}
+	return nil
+}
+
+type MethodDetails struct {
+	Name        string        `json:"name"`
+	Description string        `json:"description"`
+	Options     MethodOptions `json:"options"`
+	Parameters  MethodParams  `json:"params"`
 }
 
 func (c *MethodListCommand) Execute(args []string) error {

internal/piwigocli/method_try.go

@@ -1,7 +1,12 @@
 package piwigocli
 
 import (
+	"errors"
+	"net/url"
+	"strings"
+
 	"github.com/celogeek/piwigo-cli/internal/piwigo"
+	"github.com/celogeek/piwigo-cli/internal/piwigo/piwigotools"
 )
 
 type MethodTryCommand struct {
@@ -20,19 +25,31 @@ func (c *MethodTryCommand) Execute(args []string) error {
 	}
 
 	var result interface{}
-	params, err := piwigo.ArgsToForm(args)
+	params, err := ArgsToForm(args)
 	if err != nil {
 		return err
 	}
 
 	if err := p.Post(c.MethodName, params, &result); err != nil {
-		piwigo.DumpResponse(params)
+		piwigotools.DumpResponse(params)
 		return err
 	}
 
-	piwigo.DumpResponse(map[string]interface{}{
+	piwigotools.DumpResponse(map[string]interface{}{
 		"params": params,
 		"result": result,
 	})
 	return nil
 }
+
+func ArgsToForm(args []string) (*url.Values, error) {
+	params := &url.Values{}
+	for _, arg := range args {
+		r := strings.SplitN(arg, "=", 2)
+		if len(r) != 2 {
+			return nil, errors.New("args should be key=value")
+		}
+		params.Add(r[0], strings.ReplaceAll(r[1], "'", `\'`))
+	}
+	return params, nil
+}