From 04b32dcd02ee34322b967904c373598dc72162c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=A4felfinger?= Date: Mon, 8 Apr 2019 23:56:01 +0200 Subject: [PATCH] Fixed some warnings provided by jetbrains goland IDE --- internal/app/appContext.go | 16 ++--- internal/pkg/category/category_test.go | 12 ++-- internal/pkg/category/piwigo_mock_test.go | 71 +------------------ internal/pkg/datastore/datastore.go | 10 +-- internal/pkg/images/delete_test.go | 2 +- internal/pkg/images/piwigo_mock_test.go | 71 +------------------ .../pkg/images/synchronizeLocalFiles_test.go | 2 +- internal/pkg/images/synchronizePiwigo_test.go | 4 +- internal/pkg/piwigo/picture.go | 20 +++--- internal/pkg/piwigo/piwigoContext.go | 66 ++++++++--------- 10 files changed, 69 insertions(+), 205 deletions(-) diff --git a/internal/app/appContext.go b/internal/app/appContext.go index c90414f..d01539c 100644 --- a/internal/app/appContext.go +++ b/internal/app/appContext.go @@ -20,9 +20,9 @@ type appContext struct { localRootPath string } -func (c *appContext) UseMetadataStore(connectionString string) error { +func (c *appContext) useMetadataStore(connectionString string) error { if connectionString == "" { - return errors.New("missing connectionString to use metadata store!") + return errors.New("missing connectionString to use metadata store") } logrus.Infof("Using SQL Lite data store with '%s'", connectionString) @@ -32,17 +32,17 @@ func (c *appContext) UseMetadataStore(connectionString string) error { return err } -func (c *appContext) UsePiwigo(url string, user string, password string) error { +func (c *appContext) usePiwigo(url string, user string, password string) error { if url == "" { - return errors.New("missing piwigo url!") + return errors.New("missing piwigo url") } if user == "" { - return errors.New("missing piwigo user!") + return errors.New("missing piwigo user") } if password == "" { - return errors.New("missing piwigo password!") + return errors.New("missing piwigo password") } c.piwigo = new(piwigo.PiwigoContext) @@ -56,7 +56,7 @@ func newAppContext() (*appContext, error) { context.localRootPath = *imagesRootPath if *sqliteDb != "" { - err := context.UseMetadataStore(*sqliteDb) + err := context.useMetadataStore(*sqliteDb) if err != nil { return nil, err } @@ -64,7 +64,7 @@ func newAppContext() (*appContext, error) { logrus.Warnln("No persistence configured. Skipping metadata storage. This might affect performance on large collections!") } - err := context.UsePiwigo(*piwigoUrl, *piwigoUser, *piwigoPassword) + err := context.usePiwigo(*piwigoUrl, *piwigoUser, *piwigoPassword) return context, err } diff --git a/internal/pkg/category/category_test.go b/internal/pkg/category/category_test.go index d5a0e4d..7ab1e40 100644 --- a/internal/pkg/category/category_test.go +++ b/internal/pkg/category/category_test.go @@ -15,7 +15,7 @@ import ( "time" ) -//go:generate mockgen -destination=./piwigo_mock_test.go -package=category git.haefelfinger.net/piwigo/PiwigoDirectoryUploader/internal/pkg/piwigo PiwigoApi,PiwigoCategoryApi,PiwigoImageApi +//go:generate mockgen -destination=./piwigo_mock_test.go -package=category git.haefelfinger.net/piwigo/PiwigoDirectoryUploader/internal/pkg/piwigo PiwigoCategoryApi,PiwigoImageApi //go:generate mockgen -destination=./datastore_mock_test.go -package=category git.haefelfinger.net/piwigo/PiwigoDirectoryUploader/internal/pkg/datastore CategoryProvider func Test_updatePiwigoCategoriesFromServer_adds_new_categories(t *testing.T) { @@ -320,7 +320,7 @@ func createDbSubCategory() datastore.CategoryData { return category } -func createDbCategoriesFrom(categories map[string]*piwigo.PiwigoCategory) []datastore.CategoryData { +func createDbCategoriesFrom(categories map[string]*piwigo.Category) []datastore.CategoryData { var dbCategories []datastore.CategoryData for _, cat := range categories { dbCat := datastore.CategoryData{ @@ -335,20 +335,20 @@ func createDbCategoriesFrom(categories map[string]*piwigo.PiwigoCategory) []data return dbCategories } -func createTwoServerCategories() map[string]*piwigo.PiwigoCategory { - piwigoCategory1 := piwigo.PiwigoCategory{ +func createTwoServerCategories() map[string]*piwigo.Category { + piwigoCategory1 := piwigo.Category{ Id: 1, Name: "2019", Key: "2019", ParentId: 0, } - piwigoCategory2 := piwigo.PiwigoCategory{ + piwigoCategory2 := piwigo.Category{ Id: 2, Name: "SubCategory", Key: "2019/SubCategory", ParentId: 1, } - piwigoCategories := make(map[string]*piwigo.PiwigoCategory) + piwigoCategories := make(map[string]*piwigo.Category) piwigoCategories[piwigoCategory1.Key] = &piwigoCategory1 piwigoCategories[piwigoCategory2.Key] = &piwigoCategory2 return piwigoCategories diff --git a/internal/pkg/category/piwigo_mock_test.go b/internal/pkg/category/piwigo_mock_test.go index d910329..d4709f1 100644 --- a/internal/pkg/category/piwigo_mock_test.go +++ b/internal/pkg/category/piwigo_mock_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: git.haefelfinger.net/piwigo/PiwigoDirectoryUploader/internal/pkg/piwigo (interfaces: PiwigoApi,PiwigoCategoryApi,PiwigoImageApi) +// Source: git.haefelfinger.net/piwigo/PiwigoDirectoryUploader/internal/pkg/piwigo (interfaces: PiwigoCategoryApi,PiwigoImageApi) // Package category is a generated GoMock package. package category @@ -10,71 +10,6 @@ import ( reflect "reflect" ) -// MockPiwigoApi is a mock of PiwigoApi interface -type MockPiwigoApi struct { - ctrl *gomock.Controller - recorder *MockPiwigoApiMockRecorder -} - -// MockPiwigoApiMockRecorder is the mock recorder for MockPiwigoApi -type MockPiwigoApiMockRecorder struct { - mock *MockPiwigoApi -} - -// NewMockPiwigoApi creates a new mock instance -func NewMockPiwigoApi(ctrl *gomock.Controller) *MockPiwigoApi { - mock := &MockPiwigoApi{ctrl: ctrl} - mock.recorder = &MockPiwigoApiMockRecorder{mock} - return mock -} - -// EXPECT returns an object that allows the caller to indicate expected use -func (m *MockPiwigoApi) EXPECT() *MockPiwigoApiMockRecorder { - return m.recorder -} - -// Initialize mocks base method -func (m *MockPiwigoApi) Initialize(arg0, arg1, arg2 string, arg3 int) error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Initialize", arg0, arg1, arg2, arg3) - ret0, _ := ret[0].(error) - return ret0 -} - -// Initialize indicates an expected call of Initialize -func (mr *MockPiwigoApiMockRecorder) Initialize(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Initialize", reflect.TypeOf((*MockPiwigoApi)(nil).Initialize), arg0, arg1, arg2, arg3) -} - -// Login mocks base method -func (m *MockPiwigoApi) Login() error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Login") - ret0, _ := ret[0].(error) - return ret0 -} - -// Login indicates an expected call of Login -func (mr *MockPiwigoApiMockRecorder) Login() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Login", reflect.TypeOf((*MockPiwigoApi)(nil).Login)) -} - -// Logout mocks base method -func (m *MockPiwigoApi) Logout() error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Logout") - ret0, _ := ret[0].(error) - return ret0 -} - -// Logout indicates an expected call of Logout -func (mr *MockPiwigoApiMockRecorder) Logout() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Logout", reflect.TypeOf((*MockPiwigoApi)(nil).Logout)) -} - // MockPiwigoCategoryApi is a mock of PiwigoCategoryApi interface type MockPiwigoCategoryApi struct { ctrl *gomock.Controller @@ -114,10 +49,10 @@ func (mr *MockPiwigoCategoryApiMockRecorder) CreateCategory(arg0, arg1 interface } // GetAllCategories mocks base method -func (m *MockPiwigoCategoryApi) GetAllCategories() (map[string]*piwigo.PiwigoCategory, error) { +func (m *MockPiwigoCategoryApi) GetAllCategories() (map[string]*piwigo.Category, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetAllCategories") - ret0, _ := ret[0].(map[string]*piwigo.PiwigoCategory) + ret0, _ := ret[0].(map[string]*piwigo.Category) ret1, _ := ret[1].(error) return ret0, ret1 } diff --git a/internal/pkg/datastore/datastore.go b/internal/pkg/datastore/datastore.go index 961cf9a..706eef9 100644 --- a/internal/pkg/datastore/datastore.go +++ b/internal/pkg/datastore/datastore.go @@ -14,7 +14,7 @@ import ( "time" ) -var ErrorRecordNotFound = errors.New("Record not found") +var ErrorRecordNotFound = errors.New("record not found") type CategoryData struct { CategoryId int @@ -72,7 +72,7 @@ func NewLocalDataStore() *LocalDataStore { func (d *LocalDataStore) Initialize(connectionString string) error { if connectionString == "" { - return errors.New("connection string could not be empty.") + return errors.New("connection string could not be empty") } d.connectionString = connectionString @@ -137,7 +137,7 @@ func (d *LocalDataStore) ImageMetadataAll() ([]ImageMetaData, error) { } defer rows.Close() - images := []ImageMetaData{} + var images []ImageMetaData for rows.Next() { img := &ImageMetaData{} err = readImageMetadataFromRow(rows, img) @@ -166,7 +166,7 @@ func (d *LocalDataStore) ImageMetadataToDelete() ([]ImageMetaData, error) { } defer rows.Close() - images := []ImageMetaData{} + var images []ImageMetaData for rows.Next() { img := &ImageMetaData{} err = readImageMetadataFromRow(rows, img) @@ -195,7 +195,7 @@ func (d *LocalDataStore) ImageMetadataToUpload() ([]ImageMetaData, error) { } defer rows.Close() - images := []ImageMetaData{} + var images []ImageMetaData for rows.Next() { img := &ImageMetaData{} err = readImageMetadataFromRow(rows, img) diff --git a/internal/pkg/images/delete_test.go b/internal/pkg/images/delete_test.go index 9b69afb..6d16fcc 100644 --- a/internal/pkg/images/delete_test.go +++ b/internal/pkg/images/delete_test.go @@ -59,7 +59,7 @@ func Test_deleteImages_should_not_call_anything_if_no_images_are_marked_for_dele mockCtrl := gomock.NewController(t) defer mockCtrl.Finish() - images := []datastore.ImageMetaData{} + var images []datastore.ImageMetaData dbmock := NewMockImageMetadataProvider(mockCtrl) dbmock.EXPECT().ImageMetadataToDelete().Times(1).Return(images, nil) diff --git a/internal/pkg/images/piwigo_mock_test.go b/internal/pkg/images/piwigo_mock_test.go index dbe713f..371399e 100644 --- a/internal/pkg/images/piwigo_mock_test.go +++ b/internal/pkg/images/piwigo_mock_test.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: git.haefelfinger.net/piwigo/PiwigoDirectoryUploader/internal/pkg/piwigo (interfaces: PiwigoApi,PiwigoCategoryApi,PiwigoImageApi) +// Source: git.haefelfinger.net/piwigo/PiwigoDirectoryUploader/internal/pkg/piwigo (interfaces: PiwigoCategoryApi,PiwigoImageApi) // Package images is a generated GoMock package. package images @@ -10,71 +10,6 @@ import ( reflect "reflect" ) -// MockPiwigoApi is a mock of PiwigoApi interface -type MockPiwigoApi struct { - ctrl *gomock.Controller - recorder *MockPiwigoApiMockRecorder -} - -// MockPiwigoApiMockRecorder is the mock recorder for MockPiwigoApi -type MockPiwigoApiMockRecorder struct { - mock *MockPiwigoApi -} - -// NewMockPiwigoApi creates a new mock instance -func NewMockPiwigoApi(ctrl *gomock.Controller) *MockPiwigoApi { - mock := &MockPiwigoApi{ctrl: ctrl} - mock.recorder = &MockPiwigoApiMockRecorder{mock} - return mock -} - -// EXPECT returns an object that allows the caller to indicate expected use -func (m *MockPiwigoApi) EXPECT() *MockPiwigoApiMockRecorder { - return m.recorder -} - -// Initialize mocks base method -func (m *MockPiwigoApi) Initialize(arg0, arg1, arg2 string, arg3 int) error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Initialize", arg0, arg1, arg2, arg3) - ret0, _ := ret[0].(error) - return ret0 -} - -// Initialize indicates an expected call of Initialize -func (mr *MockPiwigoApiMockRecorder) Initialize(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Initialize", reflect.TypeOf((*MockPiwigoApi)(nil).Initialize), arg0, arg1, arg2, arg3) -} - -// Login mocks base method -func (m *MockPiwigoApi) Login() error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Login") - ret0, _ := ret[0].(error) - return ret0 -} - -// Login indicates an expected call of Login -func (mr *MockPiwigoApiMockRecorder) Login() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Login", reflect.TypeOf((*MockPiwigoApi)(nil).Login)) -} - -// Logout mocks base method -func (m *MockPiwigoApi) Logout() error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Logout") - ret0, _ := ret[0].(error) - return ret0 -} - -// Logout indicates an expected call of Logout -func (mr *MockPiwigoApiMockRecorder) Logout() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Logout", reflect.TypeOf((*MockPiwigoApi)(nil).Logout)) -} - // MockPiwigoCategoryApi is a mock of PiwigoCategoryApi interface type MockPiwigoCategoryApi struct { ctrl *gomock.Controller @@ -114,10 +49,10 @@ func (mr *MockPiwigoCategoryApiMockRecorder) CreateCategory(arg0, arg1 interface } // GetAllCategories mocks base method -func (m *MockPiwigoCategoryApi) GetAllCategories() (map[string]*piwigo.PiwigoCategory, error) { +func (m *MockPiwigoCategoryApi) GetAllCategories() (map[string]*piwigo.Category, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetAllCategories") - ret0, _ := ret[0].(map[string]*piwigo.PiwigoCategory) + ret0, _ := ret[0].(map[string]*piwigo.Category) ret1, _ := ret[1].(error) return ret0, ret1 } diff --git a/internal/pkg/images/synchronizeLocalFiles_test.go b/internal/pkg/images/synchronizeLocalFiles_test.go index d3d2a57..f910fa7 100644 --- a/internal/pkg/images/synchronizeLocalFiles_test.go +++ b/internal/pkg/images/synchronizeLocalFiles_test.go @@ -5,7 +5,7 @@ package images -//go:generate mockgen -destination=./piwigo_mock_test.go -package=images git.haefelfinger.net/piwigo/PiwigoDirectoryUploader/internal/pkg/piwigo PiwigoApi,PiwigoCategoryApi,PiwigoImageApi +//go:generate mockgen -destination=./piwigo_mock_test.go -package=images git.haefelfinger.net/piwigo/PiwigoDirectoryUploader/internal/pkg/piwigo PiwigoCategoryApi,PiwigoImageApi //go:generate mockgen -destination=./datastore_mock_test.go -package=images git.haefelfinger.net/piwigo/PiwigoDirectoryUploader/internal/pkg/datastore ImageMetadataProvider,CategoryProvider import ( diff --git a/internal/pkg/images/synchronizePiwigo_test.go b/internal/pkg/images/synchronizePiwigo_test.go index 797e365..694a2c3 100644 --- a/internal/pkg/images/synchronizePiwigo_test.go +++ b/internal/pkg/images/synchronizePiwigo_test.go @@ -36,7 +36,7 @@ func Test_checkPiwigoForChangedImages_with_empty_list(t *testing.T) { mockCtrl := gomock.NewController(t) defer mockCtrl.Finish() - images := []datastore.ImageMetaData{} + var images []datastore.ImageMetaData dbmock := NewMockImageMetadataProvider(mockCtrl) dbmock.EXPECT().ImageMetadataToUpload().Return(images, nil) @@ -106,7 +106,7 @@ func Test_updatePiwigoIdIfAlreadyUploaded_without_images_to_upload(t *testing.T) mockCtrl := gomock.NewController(t) defer mockCtrl.Finish() - images := []datastore.ImageMetaData{} + var images []datastore.ImageMetaData dbmock := NewMockImageMetadataProvider(mockCtrl) dbmock.EXPECT().ImageMetadataToUpload().Return(images, nil) diff --git a/internal/pkg/piwigo/picture.go b/internal/pkg/piwigo/picture.go index 2f72aa4..9a8ebef 100644 --- a/internal/pkg/piwigo/picture.go +++ b/internal/pkg/piwigo/picture.go @@ -18,7 +18,7 @@ import ( ) const ( - ImageStateInvalid = -1 + imageStateInvalid = -1 ImageStateUptodate = 0 ImageStateDifferent = 1 ) @@ -71,11 +71,11 @@ func uploadImageChunk(context *PiwigoContext, base64chunk string, md5sum string, logrus.Tracef("Uploading chunk %d of file with sum %s", position, md5sum) - var uploadChunkResponse uploadChunkResponse - err := context.executePiwigoRequest(formData, &uploadChunkResponse) + var response uploadChunkResponse + err := context.executePiwigoRequest(formData, &response) if err != nil { - logrus.Errorf("Got state %s while uploading chunk %d of %s", uploadChunkResponse.Status, position, md5sum) - return errors.New(fmt.Sprintf("Got state %s while uploading chunk %d of %s", uploadChunkResponse.Status, position, md5sum)) + logrus.Errorf("Got state %s while uploading chunk %d of %s", response.Status, position, md5sum) + return errors.New(fmt.Sprintf("Got state %s while uploading chunk %d of %s", response.Status, position, md5sum)) } return nil @@ -97,12 +97,12 @@ func uploadImageFinal(context *PiwigoContext, piwigoId int, originalFilename str logrus.Debugf("Finalizing upload of file %s with sum %s to category %d", originalFilename, md5sum, categoryId) - var fileAddResponse fileAddResponse - err := context.executePiwigoRequest(formData, &fileAddResponse) + var response fileAddResponse + err := context.executePiwigoRequest(formData, &response) if err != nil { - logrus.Errorf("Got state %s while adding image %s", fileAddResponse.Status, originalFilename) - return 0, errors.New(fmt.Sprintf("Got state %s while adding image %s", fileAddResponse.Status, originalFilename)) + logrus.Errorf("Got state %s while adding image %s", response.Status, originalFilename) + return 0, errors.New(fmt.Sprintf("Got state %s while adding image %s", response.Status, originalFilename)) } - return fileAddResponse.Result.ImageID, nil + return response.Result.ImageID, nil } diff --git a/internal/pkg/piwigo/piwigoContext.go b/internal/pkg/piwigo/piwigoContext.go index e394b98..4982b80 100644 --- a/internal/pkg/piwigo/piwigoContext.go +++ b/internal/pkg/piwigo/piwigoContext.go @@ -18,12 +18,6 @@ import ( "strings" ) -type PiwigoApi interface { - Initialize(baseUrl string, username string, password string, chunkSizeInKB int) error - Login() error - Logout() error -} - type PiwigoCategoryApi interface { GetAllCategories() (map[string]*PiwigoCategory, error) CreateCategory(parentId int, name string) (int, error) @@ -46,7 +40,7 @@ type PiwigoContext struct { func (context *PiwigoContext) Initialize(baseUrl string, username string, password string) error { if baseUrl == "" { - return errors.New("Please provide a valid piwigo server base URL") + return errors.New("please provide a valid piwigo server base URL") } _, err := url.Parse(baseUrl) if err != nil { @@ -54,7 +48,7 @@ func (context *PiwigoContext) Initialize(baseUrl string, username string, passwo } if username == "" { - return errors.New("Please provide a valid username for the given piwigo server.") + return errors.New("please provide a valid username for the given piwigo server") } context.url = fmt.Sprintf("%s/ws.php?format=json", baseUrl) @@ -78,15 +72,15 @@ func (context *PiwigoContext) Login() error { formData.Set("username", context.username) formData.Set("password", context.password) - var loginResponse loginResponse - err := context.executePiwigoRequest(formData, &loginResponse) + var response loginResponse + err := context.executePiwigoRequest(formData, &response) if err != nil { - errorMessage := fmt.Sprintf("Login failed: %d - %s", loginResponse.ErrorNumber, loginResponse.Message) + errorMessage := fmt.Sprintf("Login failed: %d - %s", response.ErrorNumber, response.Message) logrus.Errorln(errorMessage) return errors.New(errorMessage) } - logrus.Infof("Login succeeded: %s", loginResponse.Status) + logrus.Infof("Login succeeded: %s", response.Status) return context.initializeUploadChunkSize() } @@ -96,8 +90,8 @@ func (context *PiwigoContext) Logout() error { formData := url.Values{} formData.Set("method", "pwg.session.logout") - var logoutResponse logoutResponse - err := context.executePiwigoRequest(formData, &logoutResponse) + var response logoutResponse + err := context.executePiwigoRequest(formData, &response) if err != nil { logrus.Errorf("Logout from %s failed", context.url) return err @@ -113,15 +107,15 @@ func (context *PiwigoContext) getStatus() (*getStatusResponse, error) { formData := url.Values{} formData.Set("method", "pwg.session.getStatus") - var getStatusResponse getStatusResponse - err := context.executePiwigoRequest(formData, &getStatusResponse) + var response getStatusResponse + err := context.executePiwigoRequest(formData, &response) if err != nil { errorMessage := fmt.Sprintln("Could not get session state from server") logrus.Errorln(errorMessage) return nil, errors.New(errorMessage) } - return &getStatusResponse, nil + return &response, nil } func (context *PiwigoContext) GetAllCategories() (map[string]*PiwigoCategory, error) { @@ -129,15 +123,15 @@ func (context *PiwigoContext) GetAllCategories() (map[string]*PiwigoCategory, er formData.Set("method", "pwg.categories.getList") formData.Set("recursive", "true") - var getCategoryListResponse getCategoryListResponse - err := context.executePiwigoRequest(formData, &getCategoryListResponse) + var response getCategoryListResponse + err := context.executePiwigoRequest(formData, &response) if err != nil { logrus.Errorf("Got error while loading categories: %s", err) - return nil, errors.New("Could not load categories") + return nil, errors.New("could not load categories") } logrus.Infof("Successfully got all categories") - categories := buildCategoryMap(&getCategoryListResponse) + categories := buildCategoryMap(&response) buildCategoryKeys(categories) categoryLookups := buildLookupMap(categories) @@ -154,15 +148,15 @@ func (context *PiwigoContext) CreateCategory(parentId int, name string) (int, er formData.Set("parent", fmt.Sprint(parentId)) } - var createCategoryResponse createCategoryResponse - err := context.executePiwigoRequest(formData, &createCategoryResponse) + var response createCategoryResponse + err := context.executePiwigoRequest(formData, &response) if err != nil { logrus.Errorln(err) return 0, err } - logrus.Infof("Successfully created category %s with id %d", name, createCategoryResponse.Result.ID) - return createCategoryResponse.Result.ID, nil + logrus.Infof("Successfully created category %s with id %d", name, response.Result.ID) + return response.Result.ID, nil } func (context *PiwigoContext) ImageCheckFile(piwigoId int, md5sum string) (int, error) { @@ -173,13 +167,13 @@ func (context *PiwigoContext) ImageCheckFile(piwigoId int, md5sum string) (int, logrus.Tracef("Checking if file %s - %d needs to be uploaded", md5sum, piwigoId) - var checkFilesResponse checkFilesResponse - err := context.executePiwigoRequest(formData, &checkFilesResponse) + var response checkFilesResponse + err := context.executePiwigoRequest(formData, &response) if err != nil { - return ImageStateInvalid, err + return imageStateInvalid, err } - if checkFilesResponse.Result["file"] == "equals" { + if response.Result["file"] == "equals" { return ImageStateUptodate, nil } return ImageStateDifferent, nil @@ -212,13 +206,13 @@ func (context *PiwigoContext) imagesExistOnPiwigoBatch(md5sums []string, existRe logrus.Tracef("Looking up if files exist: %s", md5sumList) - var imageExistResponse imageExistResponse - err := context.executePiwigoRequest(formData, &imageExistResponse) + var response imageExistResponse + err := context.executePiwigoRequest(formData, &response) if err != nil { return err } - for key, value := range imageExistResponse.Result { + for key, value := range response.Result { if value == "" { logrus.Tracef("Missing file with md5sum: %s", key) existResults[key] = 0 @@ -238,7 +232,7 @@ func (context *PiwigoContext) imagesExistOnPiwigoBatch(md5sums []string, existRe func (context *PiwigoContext) UploadImage(piwigoId int, filePath string, md5sum string, category int) (int, error) { if context.chunkSizeInKB <= 0 { - return 0, errors.New("Uploadchunk size is less or equal to zero. 512 is a recommendet value to begin with.") + return 0, errors.New("uploadchunk size is less or equal to zero. 512 is a recommendet value to begin with") } fileInfo, err := os.Stat(filePath) @@ -284,8 +278,8 @@ func (context *PiwigoContext) DeleteImages(imageIds []int) error { formData.Set("image_id", joinedIds) formData.Set("pwg_token", pwgToken) - var deleteResponse deleteResponse - return context.executePiwigoRequest(formData, &deleteResponse) + var response deleteResponse + return context.executePiwigoRequest(formData, &response) } func (context *PiwigoContext) getPiwigoToken() (string, error) { @@ -299,7 +293,7 @@ func (context *PiwigoContext) getPiwigoToken() (string, error) { } pwgToken := status.Result.PwgToken if pwgToken == "" { - return "", errors.New("Did not get a valid piwigo token. Could not delete the images.") + return "", errors.New("did not get a valid piwigo token. Could not delete the images") } return pwgToken, nil }