Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lint fixes #5476

Merged
merged 2 commits into from
Nov 12, 2024
Merged

Lint fixes #5476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1ca048
Fix lint errors
WithoutPants Nov 12, 2024
06b731c
Bump lint action version
WithoutPants Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
run: docker exec -t build /bin/bash -c "make generate-backend"

- name: Run golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v6
with:
# 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
Expand Down
12 changes: 6 additions & 6 deletions pkg/sqlite/criterion_handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,20 +285,20 @@ func resolutionCriterionHandler(resolution *models.ResolutionCriterionInput, hei
addJoinFn(f)
}

min := resolution.Value.GetMinResolution()
max := resolution.Value.GetMaxResolution()
mn := resolution.Value.GetMinResolution()
mx := resolution.Value.GetMaxResolution()

widthHeight := fmt.Sprintf("MIN(%s, %s)", widthColumn, heightColumn)

switch resolution.Modifier {
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:
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:
f.addWhere(fmt.Sprintf("%s < %d", widthHeight, min))
f.addWhere(fmt.Sprintf("%s < %d", widthHeight, mn))
case models.CriterionModifierGreaterThan:
f.addWhere(fmt.Sprintf("%s > %d", widthHeight, max))
f.addWhere(fmt.Sprintf("%s > %d", widthHeight, mx))
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions pkg/sqlite/gallery_filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,20 +414,20 @@ func (qb *galleryFilterHandler) averageResolutionCriterionHandler(resolution *mo
f.addLeftJoin("images_files", "", "images.id = images_files.image_id")
f.addLeftJoin("image_files", "", "images_files.file_id = image_files.file_id")

min := resolution.Value.GetMinResolution()
max := resolution.Value.GetMaxResolution()
mn := resolution.Value.GetMinResolution()
mx := resolution.Value.GetMaxResolution()

const widthHeight = "avg(MIN(image_files.width, image_files.height))"

switch resolution.Modifier {
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:
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:
f.addHaving(fmt.Sprintf("%s < %d", widthHeight, min))
f.addHaving(fmt.Sprintf("%s < %d", widthHeight, mn))
case models.CriterionModifierGreaterThan:
f.addHaving(fmt.Sprintf("%s > %d", widthHeight, max))
f.addHaving(fmt.Sprintf("%s > %d", widthHeight, mx))
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions pkg/utils/vtt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ func GetVTTTime(fracSeconds float64) string {
return "00:00:00.000"
}

var msec, sec, min, hour int
var msec, sec, mnt, hour int
msec = int(fracSeconds * 1000)
sec, msec = norm(sec, msec, 1000)
min, sec = norm(min, sec, 60)
hour, min = norm(hour, min, 60)
mnt, sec = norm(mnt, sec, 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)

}
Loading