From ade03260e2ed817cf6d12fa2c6d0c2bdee218c10 Mon Sep 17 00:00:00 2001 From: celogeek <65178+celogeek@users.noreply.github.com> Date: Fri, 31 Dec 2021 17:46:31 +0100 Subject: [PATCH] fetch tags --- cmd/piwigo-cli/images_tag.go | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/cmd/piwigo-cli/images_tag.go b/cmd/piwigo-cli/images_tag.go index df9f37a..b05d312 100644 --- a/cmd/piwigo-cli/images_tag.go +++ b/cmd/piwigo-cli/images_tag.go @@ -26,14 +26,23 @@ func (c *ImagesTagCommand) Execute(args []string) error { return err } - var resp piwigotools.ImageDetails + var imgDetails piwigotools.ImageDetails if err := p.Post("pwg.images.getInfo", &url.Values{ "image_id": []string{fmt.Sprint(c.Id)}, - }, &resp); err != nil { + }, &imgDetails); err != nil { return err } - img, err := resp.Preview(25) + var tags struct { + Tags piwigotools.Tags `json:"tags"` + } + if err := p.Post("pwg.tags.getAdminList", &url.Values{ + "image_id": []string{fmt.Sprint(c.Id)}, + }, &tags); err != nil { + return err + } + + img, err := imgDetails.Preview(25) if err != nil { return err } @@ -41,12 +50,12 @@ func (c *ImagesTagCommand) Execute(args []string) error { fmt.Println(img) t := table.NewWriter() t.AppendRows([]table.Row{ - {"Name", resp.Name}, - {"Url", resp.Url}, - {"CreatedAt", resp.DateCreation}, - {"Size", fmt.Sprintf("%d x %d", resp.Width, resp.Height)}, - {"Categories", strings.Join(resp.Categories.Names(), "\n")}, - {"Tags", strings.Join(resp.Tags.NamesWithAgeAt(resp.DateCreation), "\n")}, + {"Name", imgDetails.Name}, + {"Url", imgDetails.Url}, + {"CreatedAt", imgDetails.DateCreation}, + {"Size", fmt.Sprintf("%d x %d", imgDetails.Width, imgDetails.Height)}, + {"Categories", strings.Join(imgDetails.Categories.Names(), "\n")}, + {"Tags", strings.Join(imgDetails.Tags.NamesWithAgeAt(&imgDetails.DateCreation), "\n")}, }) t.SetOutputMirror(os.Stdout)