Image improvements (#847)

* Fix image performer filtering
* Add performer images tab
* Add studio images tab
* Rename interface
* Add tag images tab
* Add path filtering for images
* Show image stats on stats page
* Fix incorrect scan counts after timeout
* Add gallery filters
* Relax scene gallery selector
This commit is contained in:
WithoutPants
2020-10-20 10:11:15 +11:00
committed by GitHub
parent 80199f79f3
commit 8eda72ad89
31 changed files with 463 additions and 169 deletions

View File

@@ -7,7 +7,6 @@ import (
"github.com/jmoiron/sqlx"
"github.com/stashapp/stash/pkg/database"
"github.com/stashapp/stash/pkg/utils"
)
const imageTable = "images"
@@ -234,12 +233,8 @@ func (qb *ImageQueryBuilder) Count() (int, error) {
return runCountQuery(buildCountQuery("SELECT images.id FROM images"), nil)
}
func (qb *ImageQueryBuilder) SizeCount() (string, error) {
sum, err := runSumQuery("SELECT SUM(size) as sum FROM images", nil)
if err != nil {
return "0 B", err
}
return utils.HumanizeBytes(sum), err
func (qb *ImageQueryBuilder) Size() (uint64, error) {
return runSumQuery("SELECT SUM(size) as sum FROM images", nil)
}
func (qb *ImageQueryBuilder) CountByStudioID(studioID int) (int, error) {
@@ -283,6 +278,8 @@ func (qb *ImageQueryBuilder) Query(imageFilter *ImageFilterType, findFilter *Fin
query.addArg(thisArgs...)
}
query.handleStringCriterionInput(imageFilter.Path, "images.path")
if rating := imageFilter.Rating; rating != nil {
clause, count := getIntCriterionWhereClause("images.rating", *imageFilter.Rating)
query.addWhere(clause)