Rooba
/
stash
mirror of https://github.com/stashapp/stash.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Lint fixes (#5476) 

* Fix lint errors
* Bump lint action version
This commit is contained in:
WithoutPants 2024-11-13 09:47:29 +11:00 committed by GitHub
parent a18c538c1f
commit 64fed3553a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/golangci-lint.yml vendored
View File

@ -38,7 +38,7 @@ jobs:
run: docker exec -t build /bin/bash -c "make generate-backend" run: docker exec -t build /bin/bash -c "make generate-backend"
- name: Run golangci-lint - name: Run golangci-lint
uses: golangci/golangci-lint-action@v3 uses: golangci/golangci-lint-action@v6
with: with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
version: latest version: latest

12
pkg/sqlite/criterion_handlers.go
View File

@ -285,20 +285,20 @@ func resolutionCriterionHandler(resolution *models.ResolutionCriterionInput, hei
addJoinFn(f) addJoinFn(f)
} }
min := resolution.Value.GetMinResolution() mn := resolution.Value.GetMinResolution()
max := resolution.Value.GetMaxResolution() mx := resolution.Value.GetMaxResolution()
widthHeight := fmt.Sprintf("MIN(%s, %s)", widthColumn, heightColumn) widthHeight := fmt.Sprintf("MIN(%s, %s)", widthColumn, heightColumn)
switch resolution.Modifier { switch resolution.Modifier {
case models.CriterionModifierEquals: case models.CriterionModifierEquals:
f.addWhere(fmt.Sprintf("%s BETWEEN %d AND %d", widthHeight, min, max)) f.addWhere(fmt.Sprintf("%s BETWEEN %d AND %d", widthHeight, mn, mx))
case models.CriterionModifierNotEquals: case models.CriterionModifierNotEquals:
f.addWhere(fmt.Sprintf("%s NOT BETWEEN %d AND %d", widthHeight, min, max)) f.addWhere(fmt.Sprintf("%s NOT BETWEEN %d AND %d", widthHeight, mn, mx))
case models.CriterionModifierLessThan: case models.CriterionModifierLessThan:
f.addWhere(fmt.Sprintf("%s < %d", widthHeight, min)) f.addWhere(fmt.Sprintf("%s < %d", widthHeight, mn))
case models.CriterionModifierGreaterThan: case models.CriterionModifierGreaterThan:
f.addWhere(fmt.Sprintf("%s > %d", widthHeight, max)) f.addWhere(fmt.Sprintf("%s > %d", widthHeight, mx))
} }
} }
} }

12
pkg/sqlite/gallery_filter.go
View File

@ -414,20 +414,20 @@ func (qb *galleryFilterHandler) averageResolutionCriterionHandler(resolution *mo
f.addLeftJoin("images_files", "", "images.id = images_files.image_id") f.addLeftJoin("images_files", "", "images.id = images_files.image_id")
f.addLeftJoin("image_files", "", "images_files.file_id = image_files.file_id") f.addLeftJoin("image_files", "", "images_files.file_id = image_files.file_id")
min := resolution.Value.GetMinResolution() mn := resolution.Value.GetMinResolution()
max := resolution.Value.GetMaxResolution() mx := resolution.Value.GetMaxResolution()
const widthHeight = "avg(MIN(image_files.width, image_files.height))" const widthHeight = "avg(MIN(image_files.width, image_files.height))"
switch resolution.Modifier { switch resolution.Modifier {
case models.CriterionModifierEquals: case models.CriterionModifierEquals:
f.addHaving(fmt.Sprintf("%s BETWEEN %d AND %d", widthHeight, min, max)) f.addHaving(fmt.Sprintf("%s BETWEEN %d AND %d", widthHeight, mn, mx))
case models.CriterionModifierNotEquals: case models.CriterionModifierNotEquals:
f.addHaving(fmt.Sprintf("%s NOT BETWEEN %d AND %d", widthHeight, min, max)) f.addHaving(fmt.Sprintf("%s NOT BETWEEN %d AND %d", widthHeight, mn, mx))
case models.CriterionModifierLessThan: case models.CriterionModifierLessThan:
f.addHaving(fmt.Sprintf("%s < %d", widthHeight, min)) f.addHaving(fmt.Sprintf("%s < %d", widthHeight, mn))
case models.CriterionModifierGreaterThan: case models.CriterionModifierGreaterThan:
f.addHaving(fmt.Sprintf("%s > %d", widthHeight, max)) f.addHaving(fmt.Sprintf("%s > %d", widthHeight, mx))
} }
} }
} }

8
pkg/utils/vtt.go
View File

@ -26,12 +26,12 @@ func GetVTTTime(fracSeconds float64) string {
return "00:00:00.000" return "00:00:00.000"
} }
var msec, sec, min, hour int var msec, sec, mnt, hour int
msec = int(fracSeconds * 1000) msec = int(fracSeconds * 1000)
sec, msec = norm(sec, msec, 1000) sec, msec = norm(sec, msec, 1000)
min, sec = norm(min, sec, 60) mnt, sec = norm(mnt, sec, 60)
hour, min = norm(hour, min, 60) hour, mnt = norm(hour, mnt, 60)
return fmt.Sprintf("%02d:%02d:%02d.%03d", hour, min, sec, msec) return fmt.Sprintf("%02d:%02d:%02d.%03d", hour, mnt, sec, msec)
} }