piwigo/PiwigoDirectoryUploader
2
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

renamed PiwigoCategory to Category as the package name is duplicated

Browse Source
This commit is contained in:
Philipp Häfelfinger 2019-04-08 23:59:58 +02:00
parent 04b32dcd02
commit 6bde70cef8
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/pkg/piwigo/category.go
View File

@ -11,15 +11,15 @@ import (
"os" "os"
) )
type PiwigoCategory struct { type Category struct {
Id int Id int
ParentId int ParentId int
Name string Name string
Key string Key string
} }
func buildLookupMap(categories map[int]*PiwigoCategory) map[string]*PiwigoCategory { func buildLookupMap(categories map[int]*Category) map[string]*Category {
categoryLookups := map[string]*PiwigoCategory{} categoryLookups := map[string]*Category{}
for _, category := range categories { for _, category := range categories {
logrus.Debugf("Loaded existing category %s", category.Key) logrus.Debugf("Loaded existing category %s", category.Key)
categoryLookups[category.Key] = category categoryLookups[category.Key] = category
@ -27,15 +27,15 @@ func buildLookupMap(categories map[int]*PiwigoCategory) map[string]*PiwigoCatego
return categoryLookups return categoryLookups
} }
func buildCategoryMap(statusResponse *getCategoryListResponse) map[int]*PiwigoCategory { func buildCategoryMap(statusResponse *getCategoryListResponse) map[int]*Category {
categories := map[int]*PiwigoCategory{} categories := map[int]*Category{}
for _, category := range statusResponse.Result.Categories { for _, category := range statusResponse.Result.Categories {
categories[category.ID] = &PiwigoCategory{Id: category.ID, ParentId: category.IDUppercat, Name: category.Name, Key: category.Name} categories[category.ID] = &Category{Id: category.ID, ParentId: category.IDUppercat, Name: category.Name, Key: category.Name}
} }
return categories return categories
} }
func buildCategoryKeys(categories map[int]*PiwigoCategory) { func buildCategoryKeys(categories map[int]*Category) {
for _, category := range categories { for _, category := range categories {
if category.ParentId == 0 { if category.ParentId == 0 {
category.Key = category.Name category.Key = category.Name

4
internal/pkg/piwigo/piwigoContext.go
View File

@ -19,7 +19,7 @@ import (
) )
type PiwigoCategoryApi interface { type PiwigoCategoryApi interface {
GetAllCategories() (map[string]*PiwigoCategory, error) GetAllCategories() (map[string]*Category, error)
CreateCategory(parentId int, name string) (int, error) CreateCategory(parentId int, name string) (int, error)
} }
@ -118,7 +118,7 @@ func (context *PiwigoContext) getStatus() (*getStatusResponse, error) {
return &response, nil return &response, nil
} }
func (context *PiwigoContext) GetAllCategories() (map[string]*PiwigoCategory, error) { func (context *PiwigoContext) GetAllCategories() (map[string]*Category, error) {
formData := url.Values{} formData := url.Values{}
formData.Set("method", "pwg.categories.getList") formData.Set("method", "pwg.categories.getList")
formData.Set("recursive", "true") formData.Set("recursive", "true")