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

fixed variable shadowing warnings

Browse Source
This commit is contained in:
Philipp Häfelfinger 2019-04-09 00:16:31 +02:00
parent 4debc22f5c
commit acea32d0b1
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/pkg/category/category.go
View File

@ -78,7 +78,8 @@ func updatePiwigoCategoriesFromServer(piwigoApi piwigo.CategoryApi, db datastore
} }
for _, pwgCat := range categories { for _, pwgCat := range categories {
dbCat, err := db.GetCategoryByPiwigoId(pwgCat.Id) var dbCat datastore.CategoryData
dbCat, err = db.GetCategoryByPiwigoId(pwgCat.Id)
if err == datastore.ErrorRecordNotFound { if err == datastore.ErrorRecordNotFound {
logrus.Debugf("Adding category %s", pwgCat.Key) logrus.Debugf("Adding category %s", pwgCat.Key)
dbCat = datastore.CategoryData{ dbCat = datastore.CategoryData{
@ -125,7 +126,8 @@ func createMissingCategories(piwigoApi piwigo.CategoryApi, db datastore.Category
for _, category := range missingCategories { for _, category := range missingCategories {
logrus.Infof("Creating category %s", category.Key) logrus.Infof("Creating category %s", category.Key)
parentId, err := getParentId(category, db) var parentId int
parentId, err = getParentId(category, db)
if err != nil { if err != nil {
return err return err
} }

7
internal/pkg/images/synchronizeLocalFiles.go
View File

@ -83,7 +83,8 @@ func checkFileForChangesWorker(workQueue <-chan localFileStructure.FilesystemNod
metadata.FullImagePath = file.Path metadata.FullImagePath = file.Path
metadata.CategoryPath = filepath.Dir(file.Key) metadata.CategoryPath = filepath.Dir(file.Key)
category, err := categoryDb.GetCategoryByKey(metadata.CategoryPath) var category datastore.CategoryData
category, err = categoryDb.GetCategoryByKey(metadata.CategoryPath)
if err == nil { if err == nil {
metadata.CategoryPiwigoId = category.PiwigoId metadata.CategoryPiwigoId = category.PiwigoId
} else { } else {
@ -127,10 +128,10 @@ func synchronizeLocalImageMetadataFindFilesToDelete(imageDb datastore.ImageMetad
} }
for _, img := range images { for _, img := range images {
if _, err := os.Stat(img.FullImagePath); os.IsNotExist(err) { if _, err = os.Stat(img.FullImagePath); os.IsNotExist(err) {
img.UploadRequired = false img.UploadRequired = false
img.DeleteRequired = true img.DeleteRequired = true
err := imageDb.SaveImageMetadata(img) err = imageDb.SaveImageMetadata(img)
if err != nil { if err != nil {
return err return err
} }

3
internal/pkg/images/synchronizePiwigo.go
View File

@ -98,7 +98,8 @@ func checkPiwigoForChangedImages(provider datastore.ImageMetadataProvider, piwig
if img.PiwigoId == 0 { if img.PiwigoId == 0 {
continue continue
} }
state, err := piwigoCtx.ImageCheckFile(img.PiwigoId, img.Md5Sum) var state int
state, err = piwigoCtx.ImageCheckFile(img.PiwigoId, img.Md5Sum)
if err != nil { if err != nil {
logrus.Warnf("Error during file change check of file %s", img.FullImagePath) logrus.Warnf("Error during file change check of file %s", img.FullImagePath)
continue continue

2
internal/pkg/localFileStructure/checksumCalculator.go
View File

@ -22,7 +22,7 @@ func CalculateFileCheckSums(filePath string) (string, error) {
defer file.Close() defer file.Close()
hash := md5.New() hash := md5.New()
if _, err := io.Copy(hash, file); err != nil { if _, err = io.Copy(hash, file); err != nil {
logrus.Errorf("Could calculate md5 sum of file %s", filePath) logrus.Errorf("Could calculate md5 sum of file %s", filePath)
return "", err return "", err
} }

5
internal/pkg/piwigo/serverContext.go
View File

@ -217,7 +217,8 @@ func (context *ServerContext) imagesExistOnPiwigoBatch(md5sums []string, existRe
logrus.Tracef("Missing file with md5sum: %s", key) logrus.Tracef("Missing file with md5sum: %s", key)
existResults[key] = 0 existResults[key] = 0
} else { } else {
piwigoId, err := strconv.Atoi(value) var piwigoId int
piwigoId, err = strconv.Atoi(value)
if err != nil { if err != nil {
logrus.Warnf("could not parse piwigoid of file %s", key) logrus.Warnf("could not parse piwigoid of file %s", key)
continue continue
@ -328,7 +329,7 @@ func (context *ServerContext) executePiwigoRequest(formData url.Values, decodedR
} }
defer response.Body.Close() defer response.Body.Close()
if err := json.NewDecoder(response.Body).Decode(decodedResponse); err != nil { if err = json.NewDecoder(response.Body).Decode(decodedResponse); err != nil {
logrus.Errorln(err) logrus.Errorln(err)
return err return err
} }