Social Network Links:
-
+
+
- YouTube @@ -194,6 +212,8 @@ func makeXPathConfig() mappedPerformerScraperConfig { config.mappedConfig["FakeTits"] = makeSimpleAttrConfig(makeCommonXPath("Fake boobs:")) config.mappedConfig["Tattoos"] = makeSimpleAttrConfig(makeCommonXPath("Tattoos:")) config.mappedConfig["Piercings"] = makeSimpleAttrConfig(makeCommonXPath("Piercings:") + "/comment()") + config.mappedConfig["Details"] = makeSimpleAttrConfig(makeCommonXPath("Details:")) + config.mappedConfig["HairColor"] = makeSimpleAttrConfig(makeCommonXPath("Hair Color:")) // special handling for birthdate birthdateAttrConfig := makeSimpleAttrConfig(makeCommonXPath("Date of Birth:")) @@ -233,7 +253,7 @@ func makeXPathConfig() mappedPerformerScraperConfig { config.mappedConfig["Gender"] = genderConfig - // use fixed for height + // use fixed for Country config.mappedConfig["Country"] = mappedScraperAttrConfig{ Fixed: "United States", } @@ -245,6 +265,19 @@ func makeXPathConfig() mappedPerformerScraperConfig { } config.mappedConfig["Height"] = heightConfig + weightConfig := makeSimpleAttrConfig(makeCommonXPath("Weight:")) + weightConvAction := postProcessLbToKg(true) + weightConfig.postProcessActions = []postProcessAction{ + &weightConvAction, + } + config.mappedConfig["Weight"] = weightConfig + + tagConfig := mappedScraperAttrConfig{ + Selector: `//ul[@id="socialmedia"]//a`, + } + config.Tags = make(mappedConfig) + config.Tags["Name"] = tagConfig + return config } @@ -298,7 +331,10 @@ func TestScrapePerformerXPath(t *testing.T) { const tattoos = "None" const piercings = "" const gender = "Female" - const height = "170" + const height = "170" // 5ft7 + const details = "Some girls are so damn hot that they can get you bent out of shape, and you will not even be mad at them for doing so. Well, tawny blonde Mia Malkova can bend her body into any shape she pleases, and that’s sure to satisfy all of the horny cocks and wet pussies out there. This girl has acrobatic and contortionist abilities that could even twist a pretzel into a new knot, which can be very helpful in the ... arrow_drop_down Some girls are so damn hot that they can get you bent out of shape, and you will not even be mad at them for doing so. Well, tawny blonde Mia Malkova can bend her body into any shape she pleases, and that’s sure to satisfy all of the horny cocks and wet pussies out there. This girl has acrobatic and contortionist abilities that could even twist a pretzel into a new knot, which can be very helpful in the VR Porn movies – trust us. Ankles behind her neck and feet over her back so she can kiss her toes, turned, twisted and gyrating, she can fuck any which way she wants (and that ass!), will surely make you fall in love with this hot Virtual Reality Porn slut, as she is one of the finest of them all. Talking about perfection, maybe it’s all the acrobatic work that keeps it in such gorgeous shape? Who cares really, because you just want to take a big bite out of it and never let go. But it’s not all about the body. Mia’s also got a great smile, which might not sound kinky, but believe us, it is a smile that will heat up your innards and drop your pants. Is it her golden skin, her innocent pink lips or that heart-shaped face? There is just too much good stuff going on with Mia Malkova, which is maybe why these past few years have heaped awards upon awards on this Southern California native. Mia came to VR Bangers for her first VR Porn video, so you know she’s only going for top-notch scenes with top-game performers, men, and women. Better hit up that yoga studio if you ever dream of being able to bang a flexible and talented chick like lady Malkova." + const hairColor = "Blonde" + const weight = "57" // 126 lb verifyField(t, performerName, performer.Name, "Name") verifyField(t, gender, performer.Gender, "Gender") @@ -317,6 +353,19 @@ func TestScrapePerformerXPath(t *testing.T) { verifyField(t, tattoos, performer.Tattoos, "Tattoos") verifyField(t, piercings, performer.Piercings, "Piercings") verifyField(t, height, performer.Height, "Height") + verifyField(t, details, performer.Details, "Details") + verifyField(t, hairColor, performer.HairColor, "HairColor") + verifyField(t, weight, performer.Weight, "Weight") + + expectedTagNames := []string{ + "Twitter", + "Facebook", + "YouTube", + "Instagram", + } + for i, expected := range expectedTagNames { + verifyField(t, expected, &performer.Tags[i].Name, "TagName") + } } func TestConcatXPath(t *testing.T) { @@ -758,6 +807,24 @@ func TestLoadInvalidXPath(t *testing.T) { config.process(q, nil) } +type mockGlobalConfig struct{} + +func (mockGlobalConfig) GetScraperUserAgent() string { + return "" +} + +func (mockGlobalConfig) GetScrapersPath() string { + return "" +} + +func (mockGlobalConfig) GetScraperCDPPath() string { + return "" +} + +func (mockGlobalConfig) GetScraperCertCheck() bool { + return false +} + func TestSubScrape(t *testing.T) { retHTML := `
- Rating +
-
+
+
+
@@ -805,7 +872,7 @@ xPathScrapers:
return
}
- globalConfig := GlobalConfig{}
+ globalConfig := mockGlobalConfig{}
performer, err := c.ScrapePerformerURL(ts.URL, nil, globalConfig)
diff --git a/pkg/sqlite/filter.go b/pkg/sqlite/filter.go
index bae383825..d851fb7f0 100644
--- a/pkg/sqlite/filter.go
+++ b/pkg/sqlite/filter.go
@@ -321,6 +321,10 @@ func stringCriterionHandler(c *models.StringCriterionInput, column string) crite
return
}
f.addWhere(fmt.Sprintf("(%s IS NULL OR %[1]s NOT regexp ?)", column), c.Value)
+ case models.CriterionModifierIsNull:
+ f.addWhere("(" + column + " IS NULL OR TRIM(" + column + ") = '')")
+ case models.CriterionModifierNotNull:
+ f.addWhere("(" + column + " IS NOT NULL AND TRIM(" + column + ") != '')")
default:
clause, count := getSimpleCriterionClause(modifier, "?")
@@ -372,6 +376,60 @@ func stringLiteralCriterionHandler(v *string, column string) criterionHandlerFun
}
}
+// handle for MultiCriterion where there is a join table between the new
+// objects
+type joinedMultiCriterionHandlerBuilder struct {
+ // table containing the primary objects
+ primaryTable string
+ // table joining primary and foreign objects
+ joinTable string
+ // alias for join table, if required
+ joinAs string
+ // foreign key of the primary object on the join table
+ primaryFK string
+ // foreign key of the foreign object on the join table
+ foreignFK string
+
+ addJoinTable func(f *filterBuilder)
+}
+
+func (m *joinedMultiCriterionHandlerBuilder) handler(criterion *models.MultiCriterionInput) criterionHandlerFunc {
+ return func(f *filterBuilder) {
+ if criterion != nil && len(criterion.Value) > 0 {
+ var args []interface{}
+ for _, tagID := range criterion.Value {
+ args = append(args, tagID)
+ }
+
+ joinAlias := m.joinAs
+ if joinAlias == "" {
+ joinAlias = m.joinTable
+ }
+
+ whereClause := ""
+ havingClause := ""
+ if criterion.Modifier == models.CriterionModifierIncludes {
+ // includes any of the provided ids
+ m.addJoinTable(f)
+ whereClause = fmt.Sprintf("%s.%s IN %s", joinAlias, m.foreignFK, getInBinding(len(criterion.Value)))
+ } else if criterion.Modifier == models.CriterionModifierIncludesAll {
+ // includes all of the provided ids
+ m.addJoinTable(f)
+ whereClause = fmt.Sprintf("%s.%s IN %s", joinAlias, m.foreignFK, getInBinding(len(criterion.Value)))
+ havingClause = fmt.Sprintf("count(distinct %s.%s) IS %d", joinAlias, m.foreignFK, len(criterion.Value))
+ } else if criterion.Modifier == models.CriterionModifierExcludes {
+ // excludes all of the provided ids
+ // need to use actual join table name for this
+ // not exists (select . from where . = .id and . in )
+ whereClause = fmt.Sprintf("not exists (select %[1]s.%[2]s from %[1]s where %[1]s.%[2]s = %[3]s.id and %[1]s.%[4]s in %[5]s)", m.joinTable, m.primaryFK, m.primaryTable, m.foreignFK, getInBinding(len(criterion.Value)))
+ }
+
+ f.addWhere(whereClause, args...)
+ f.addHaving(havingClause)
+ }
+ }
+}
+
type multiCriterionHandlerBuilder struct {
primaryTable string
foreignTable string
@@ -401,3 +459,23 @@ func (m *multiCriterionHandlerBuilder) handler(criterion *models.MultiCriterionI
}
}
}
+
+type countCriterionHandlerBuilder struct {
+ primaryTable string
+ joinTable string
+ primaryFK string
+}
+
+func (m *countCriterionHandlerBuilder) handler(criterion *models.IntCriterionInput) criterionHandlerFunc {
+ return func(f *filterBuilder) {
+ if criterion != nil {
+ clause, count := getCountCriterionClause(m.primaryTable, m.joinTable, m.primaryFK, *criterion)
+
+ if count == 1 {
+ f.addWhere(clause, criterion.Value)
+ } else {
+ f.addWhere(clause)
+ }
+ }
+ }
+}
diff --git a/pkg/sqlite/filter_internal_test.go b/pkg/sqlite/filter_internal_test.go
index 302aff0db..20ca571e1 100644
--- a/pkg/sqlite/filter_internal_test.go
+++ b/pkg/sqlite/filter_internal_test.go
@@ -594,7 +594,7 @@ func TestStringCriterionHandlerIsNull(t *testing.T) {
}, column))
assert.Len(f.whereClauses, 1)
- assert.Equal(fmt.Sprintf("%[1]s IS NULL", column), f.whereClauses[0].sql)
+ assert.Equal(fmt.Sprintf("(%[1]s IS NULL OR TRIM(%[1]s) = '')", column), f.whereClauses[0].sql)
assert.Len(f.whereClauses[0].args, 0)
}
@@ -609,6 +609,6 @@ func TestStringCriterionHandlerNotNull(t *testing.T) {
}, column))
assert.Len(f.whereClauses, 1)
- assert.Equal(fmt.Sprintf("%[1]s IS NOT NULL", column), f.whereClauses[0].sql)
+ assert.Equal(fmt.Sprintf("(%[1]s IS NOT NULL AND TRIM(%[1]s) != '')", column), f.whereClauses[0].sql)
assert.Len(f.whereClauses[0].args, 0)
}
diff --git a/pkg/sqlite/gallery.go b/pkg/sqlite/gallery.go
index 2f2e8fef7..b366d301d 100644
--- a/pkg/sqlite/gallery.go
+++ b/pkg/sqlite/gallery.go
@@ -159,7 +159,69 @@ func (qb *galleryQueryBuilder) All() ([]*models.Gallery, error) {
return qb.queryGalleries(selectAll("galleries")+qb.getGallerySort(nil), nil)
}
-func (qb *galleryQueryBuilder) Query(galleryFilter *models.GalleryFilterType, findFilter *models.FindFilterType) ([]*models.Gallery, int, error) {
+func (qb *galleryQueryBuilder) validateFilter(galleryFilter *models.GalleryFilterType) error {
+ const and = "AND"
+ const or = "OR"
+ const not = "NOT"
+
+ if galleryFilter.And != nil {
+ if galleryFilter.Or != nil {
+ return illegalFilterCombination(and, or)
+ }
+ if galleryFilter.Not != nil {
+ return illegalFilterCombination(and, not)
+ }
+
+ return qb.validateFilter(galleryFilter.And)
+ }
+
+ if galleryFilter.Or != nil {
+ if galleryFilter.Not != nil {
+ return illegalFilterCombination(or, not)
+ }
+
+ return qb.validateFilter(galleryFilter.Or)
+ }
+
+ if galleryFilter.Not != nil {
+ return qb.validateFilter(galleryFilter.Not)
+ }
+
+ return nil
+}
+
+func (qb *galleryQueryBuilder) makeFilter(galleryFilter *models.GalleryFilterType) *filterBuilder {
+ query := &filterBuilder{}
+
+ if galleryFilter.And != nil {
+ query.and(qb.makeFilter(galleryFilter.And))
+ }
+ if galleryFilter.Or != nil {
+ query.or(qb.makeFilter(galleryFilter.Or))
+ }
+ if galleryFilter.Not != nil {
+ query.not(qb.makeFilter(galleryFilter.Not))
+ }
+
+ query.handleCriterionFunc(boolCriterionHandler(galleryFilter.IsZip, "galleries.zip"))
+ query.handleCriterionFunc(stringCriterionHandler(galleryFilter.Path, "galleries.path"))
+ query.handleCriterionFunc(intCriterionHandler(galleryFilter.Rating, "galleries.rating"))
+ query.handleCriterionFunc(stringCriterionHandler(galleryFilter.URL, "galleries.url"))
+ query.handleCriterionFunc(boolCriterionHandler(galleryFilter.Organized, "galleries.organized"))
+ query.handleCriterionFunc(galleryIsMissingCriterionHandler(qb, galleryFilter.IsMissing))
+ query.handleCriterionFunc(galleryTagsCriterionHandler(qb, galleryFilter.Tags))
+ query.handleCriterionFunc(galleryTagCountCriterionHandler(qb, galleryFilter.TagCount))
+ query.handleCriterionFunc(galleryPerformersCriterionHandler(qb, galleryFilter.Performers))
+ query.handleCriterionFunc(galleryPerformerCountCriterionHandler(qb, galleryFilter.PerformerCount))
+ query.handleCriterionFunc(galleryStudioCriterionHandler(qb, galleryFilter.Studios))
+ query.handleCriterionFunc(galleryPerformerTagsCriterionHandler(qb, galleryFilter.PerformerTags))
+ query.handleCriterionFunc(galleryAverageResolutionCriterionHandler(qb, galleryFilter.AverageResolution))
+ query.handleCriterionFunc(galleryImageCountCriterionHandler(qb, galleryFilter.ImageCount))
+
+ return query
+}
+
+func (qb *galleryQueryBuilder) makeQuery(galleryFilter *models.GalleryFilterType, findFilter *models.FindFilterType) (*queryBuilder, error) {
if galleryFilter == nil {
galleryFilter = &models.GalleryFilterType{}
}
@@ -169,15 +231,7 @@ func (qb *galleryQueryBuilder) Query(galleryFilter *models.GalleryFilterType, fi
query := qb.newQuery()
- query.body = selectDistinctIDs("galleries")
- query.body += `
- left join performers_galleries as performers_join on performers_join.gallery_id = galleries.id
- left join scenes_galleries as scenes_join on scenes_join.gallery_id = galleries.id
- left join studios as studio on studio.id = galleries.studio_id
- left join galleries_tags as tags_join on tags_join.gallery_id = galleries.id
- left join galleries_images as images_join on images_join.gallery_id = galleries.id
- left join images on images_join.image_id = images.id
- `
+ query.body = selectDistinctIDs(galleryTable)
if q := findFilter.Q; q != nil && *q != "" {
searchColumns := []string{"galleries.title", "galleries.path", "galleries.checksum"}
@@ -186,82 +240,24 @@ func (qb *galleryQueryBuilder) Query(galleryFilter *models.GalleryFilterType, fi
query.addArg(thisArgs...)
}
- if zipFilter := galleryFilter.IsZip; zipFilter != nil {
- var favStr string
- if *zipFilter == true {
- favStr = "1"
- } else {
- favStr = "0"
- }
- query.addWhere("galleries.zip = " + favStr)
+ if err := qb.validateFilter(galleryFilter); err != nil {
+ return nil, err
}
+ filter := qb.makeFilter(galleryFilter)
- query.handleStringCriterionInput(galleryFilter.Path, "galleries.path")
- query.handleIntCriterionInput(galleryFilter.Rating, "galleries.rating")
- qb.handleAverageResolutionFilter(&query, galleryFilter.AverageResolution)
-
- if Organized := galleryFilter.Organized; Organized != nil {
- var organized string
- if *Organized == true {
- organized = "1"
- } else {
- organized = "0"
- }
- query.addWhere("galleries.organized = " + organized)
- }
-
- if isMissingFilter := galleryFilter.IsMissing; isMissingFilter != nil && *isMissingFilter != "" {
- switch *isMissingFilter {
- case "scenes":
- query.addWhere("scenes_join.gallery_id IS NULL")
- case "studio":
- query.addWhere("galleries.studio_id IS NULL")
- case "performers":
- query.addWhere("performers_join.gallery_id IS NULL")
- case "date":
- query.addWhere("galleries.date IS \"\" OR galleries.date IS \"0001-01-01\"")
- case "tags":
- query.addWhere("tags_join.gallery_id IS NULL")
- default:
- query.addWhere("galleries." + *isMissingFilter + " IS NULL")
- }
- }
-
- if tagsFilter := galleryFilter.Tags; tagsFilter != nil && len(tagsFilter.Value) > 0 {
- for _, tagID := range tagsFilter.Value {
- query.addArg(tagID)
- }
-
- query.body += " LEFT JOIN tags on tags_join.tag_id = tags.id"
- whereClause, havingClause := getMultiCriterionClause("galleries", "tags", "galleries_tags", "gallery_id", "tag_id", tagsFilter)
- query.addWhere(whereClause)
- query.addHaving(havingClause)
- }
-
- if performersFilter := galleryFilter.Performers; performersFilter != nil && len(performersFilter.Value) > 0 {
- for _, performerID := range performersFilter.Value {
- query.addArg(performerID)
- }
-
- query.body += " LEFT JOIN performers ON performers_join.performer_id = performers.id"
- whereClause, havingClause := getMultiCriterionClause("galleries", "performers", "performers_galleries", "gallery_id", "performer_id", performersFilter)
- query.addWhere(whereClause)
- query.addHaving(havingClause)
- }
-
- if studiosFilter := galleryFilter.Studios; studiosFilter != nil && len(studiosFilter.Value) > 0 {
- for _, studioID := range studiosFilter.Value {
- query.addArg(studioID)
- }
-
- whereClause, havingClause := getMultiCriterionClause("galleries", "studio", "", "", "studio_id", studiosFilter)
- query.addWhere(whereClause)
- query.addHaving(havingClause)
- }
-
- handleGalleryPerformerTagsCriterion(&query, galleryFilter.PerformerTags)
+ query.addFilter(filter)
query.sortAndPagination = qb.getGallerySort(findFilter) + getPagination(findFilter)
+
+ return &query, nil
+}
+
+func (qb *galleryQueryBuilder) Query(galleryFilter *models.GalleryFilterType, findFilter *models.FindFilterType) ([]*models.Gallery, int, error) {
+ query, err := qb.makeQuery(galleryFilter, findFilter)
+ if err != nil {
+ return nil, 0, err
+ }
+
idsResult, countResult, err := query.executeFind()
if err != nil {
return nil, 0, err
@@ -280,93 +276,168 @@ func (qb *galleryQueryBuilder) Query(galleryFilter *models.GalleryFilterType, fi
return galleries, countResult, nil
}
-func (qb *galleryQueryBuilder) handleAverageResolutionFilter(query *queryBuilder, resolutionFilter *models.ResolutionEnum) {
- if resolutionFilter == nil {
- return
+func (qb *galleryQueryBuilder) QueryCount(galleryFilter *models.GalleryFilterType, findFilter *models.FindFilterType) (int, error) {
+ query, err := qb.makeQuery(galleryFilter, findFilter)
+ if err != nil {
+ return 0, err
}
- if resolution := resolutionFilter.String(); resolutionFilter.IsValid() {
- var low int
- var high int
+ return query.executeCount()
+}
- switch resolution {
- case "VERY_LOW":
- high = 240
- case "LOW":
- low = 240
- high = 360
- case "R360P":
- low = 360
- high = 480
- case "STANDARD":
- low = 480
- high = 540
- case "WEB_HD":
- low = 540
- high = 720
- case "STANDARD_HD":
- low = 720
- high = 1080
- case "FULL_HD":
- low = 1080
- high = 1440
- case "QUAD_HD":
- low = 1440
- high = 1920
- case "VR_HD":
- low = 1920
- high = 2160
- case "FOUR_K":
- low = 2160
- high = 2880
- case "FIVE_K":
- low = 2880
- high = 3384
- case "SIX_K":
- low = 3384
- high = 4320
- case "EIGHT_K":
- low = 4320
- }
-
- havingClause := ""
- if low != 0 {
- havingClause = "avg(MIN(images.width, images.height)) >= " + strconv.Itoa(low)
- }
- if high != 0 {
- if havingClause != "" {
- havingClause += " AND "
+func galleryIsMissingCriterionHandler(qb *galleryQueryBuilder, isMissing *string) criterionHandlerFunc {
+ return func(f *filterBuilder) {
+ if isMissing != nil && *isMissing != "" {
+ switch *isMissing {
+ case "scenes":
+ f.addJoin("scenes_galleries", "scenes_join", "scenes_join.gallery_id = galleries.id")
+ f.addWhere("scenes_join.gallery_id IS NULL")
+ case "studio":
+ f.addWhere("galleries.studio_id IS NULL")
+ case "performers":
+ qb.performersRepository().join(f, "performers_join", "galleries.id")
+ f.addWhere("performers_join.gallery_id IS NULL")
+ case "date":
+ f.addWhere("galleries.date IS \"\" OR galleries.date IS \"0001-01-01\"")
+ case "tags":
+ qb.tagsRepository().join(f, "tags_join", "galleries.id")
+ f.addWhere("tags_join.gallery_id IS NULL")
+ default:
+ f.addWhere("(galleries." + *isMissing + " IS NULL OR TRIM(galleries." + *isMissing + ") = '')")
}
- havingClause += "avg(MIN(images.width, images.height)) < " + strconv.Itoa(high)
- }
-
- if havingClause != "" {
- query.addHaving(havingClause)
}
}
}
-func handleGalleryPerformerTagsCriterion(query *queryBuilder, performerTagsFilter *models.MultiCriterionInput) {
- if performerTagsFilter != nil && len(performerTagsFilter.Value) > 0 {
- for _, tagID := range performerTagsFilter.Value {
- query.addArg(tagID)
+func (qb *galleryQueryBuilder) getMultiCriterionHandlerBuilder(foreignTable, joinTable, foreignFK string, addJoinsFunc func(f *filterBuilder)) multiCriterionHandlerBuilder {
+ return multiCriterionHandlerBuilder{
+ primaryTable: galleryTable,
+ foreignTable: foreignTable,
+ joinTable: joinTable,
+ primaryFK: galleryIDColumn,
+ foreignFK: foreignFK,
+ addJoinsFunc: addJoinsFunc,
+ }
+}
+
+func galleryTagsCriterionHandler(qb *galleryQueryBuilder, tags *models.MultiCriterionInput) criterionHandlerFunc {
+ h := joinedMultiCriterionHandlerBuilder{
+ primaryTable: galleryTable,
+ joinTable: galleriesTagsTable,
+ joinAs: "tags_join",
+ primaryFK: galleryIDColumn,
+ foreignFK: tagIDColumn,
+
+ addJoinTable: func(f *filterBuilder) {
+ qb.tagsRepository().join(f, "tags_join", "galleries.id")
+ },
+ }
+
+ return h.handler(tags)
+}
+
+func galleryTagCountCriterionHandler(qb *galleryQueryBuilder, tagCount *models.IntCriterionInput) criterionHandlerFunc {
+ h := countCriterionHandlerBuilder{
+ primaryTable: galleryTable,
+ joinTable: galleriesTagsTable,
+ primaryFK: galleryIDColumn,
+ }
+
+ return h.handler(tagCount)
+}
+
+func galleryPerformersCriterionHandler(qb *galleryQueryBuilder, performers *models.MultiCriterionInput) criterionHandlerFunc {
+ h := joinedMultiCriterionHandlerBuilder{
+ primaryTable: galleryTable,
+ joinTable: performersGalleriesTable,
+ joinAs: "performers_join",
+ primaryFK: galleryIDColumn,
+ foreignFK: performerIDColumn,
+
+ addJoinTable: func(f *filterBuilder) {
+ qb.performersRepository().join(f, "performers_join", "galleries.id")
+ },
+ }
+
+ return h.handler(performers)
+}
+
+func galleryPerformerCountCriterionHandler(qb *galleryQueryBuilder, performerCount *models.IntCriterionInput) criterionHandlerFunc {
+ h := countCriterionHandlerBuilder{
+ primaryTable: galleryTable,
+ joinTable: performersGalleriesTable,
+ primaryFK: galleryIDColumn,
+ }
+
+ return h.handler(performerCount)
+}
+
+func galleryImageCountCriterionHandler(qb *galleryQueryBuilder, imageCount *models.IntCriterionInput) criterionHandlerFunc {
+ h := countCriterionHandlerBuilder{
+ primaryTable: galleryTable,
+ joinTable: galleriesImagesTable,
+ primaryFK: galleryIDColumn,
+ }
+
+ return h.handler(imageCount)
+}
+
+func galleryStudioCriterionHandler(qb *galleryQueryBuilder, studios *models.MultiCriterionInput) criterionHandlerFunc {
+ addJoinsFunc := func(f *filterBuilder) {
+ f.addJoin(studioTable, "studio", "studio.id = galleries.studio_id")
+ }
+ h := qb.getMultiCriterionHandlerBuilder("studio", "", studioIDColumn, addJoinsFunc)
+
+ return h.handler(studios)
+}
+
+func galleryPerformerTagsCriterionHandler(qb *galleryQueryBuilder, performerTagsFilter *models.MultiCriterionInput) criterionHandlerFunc {
+ return func(f *filterBuilder) {
+ if performerTagsFilter != nil && len(performerTagsFilter.Value) > 0 {
+ qb.performersRepository().join(f, "performers_join", "galleries.id")
+ f.addJoin("performers_tags", "performer_tags_join", "performers_join.performer_id = performer_tags_join.performer_id")
+
+ var args []interface{}
+ for _, tagID := range performerTagsFilter.Value {
+ args = append(args, tagID)
+ }
+
+ if performerTagsFilter.Modifier == models.CriterionModifierIncludes {
+ // includes any of the provided ids
+ f.addWhere("performer_tags_join.tag_id IN "+getInBinding(len(performerTagsFilter.Value)), args...)
+ } else if performerTagsFilter.Modifier == models.CriterionModifierIncludesAll {
+ // includes all of the provided ids
+ f.addWhere("performer_tags_join.tag_id IN "+getInBinding(len(performerTagsFilter.Value)), args...)
+ f.addHaving(fmt.Sprintf("count(distinct performer_tags_join.tag_id) IS %d", len(performerTagsFilter.Value)))
+ } else if performerTagsFilter.Modifier == models.CriterionModifierExcludes {
+ f.addWhere(fmt.Sprintf(`not exists
+ (select performers_galleries.performer_id from performers_galleries
+ left join performers_tags on performers_tags.performer_id = performers_galleries.performer_id where
+ performers_galleries.gallery_id = galleries.id AND
+ performers_tags.tag_id in %s)`, getInBinding(len(performerTagsFilter.Value))), args...)
+ }
}
+ }
+}
- query.body += " LEFT JOIN performers_tags AS performer_tags_join on performers_join.performer_id = performer_tags_join.performer_id"
+func galleryAverageResolutionCriterionHandler(qb *galleryQueryBuilder, resolution *models.ResolutionEnum) criterionHandlerFunc {
+ return func(f *filterBuilder) {
+ if resolution != nil && resolution.IsValid() {
+ qb.imagesRepository().join(f, "images_join", "galleries.id")
+ f.addJoin("images", "", "images_join.image_id = images.id")
- if performerTagsFilter.Modifier == models.CriterionModifierIncludes {
- // includes any of the provided ids
- query.addWhere("performer_tags_join.tag_id IN " + getInBinding(len(performerTagsFilter.Value)))
- } else if performerTagsFilter.Modifier == models.CriterionModifierIncludesAll {
- // includes all of the provided ids
- query.addWhere("performer_tags_join.tag_id IN " + getInBinding(len(performerTagsFilter.Value)))
- query.addHaving(fmt.Sprintf("count(distinct performer_tags_join.tag_id) IS %d", len(performerTagsFilter.Value)))
- } else if performerTagsFilter.Modifier == models.CriterionModifierExcludes {
- query.addWhere(fmt.Sprintf(`not exists
- (select performers_galleries.performer_id from performers_galleries
- left join performers_tags on performers_tags.performer_id = performers_galleries.performer_id where
- performers_galleries.gallery_id = galleries.id AND
- performers_tags.tag_id in %s)`, getInBinding(len(performerTagsFilter.Value))))
+ min := resolution.GetMinResolution()
+ max := resolution.GetMaxResolution()
+
+ const widthHeight = "avg(MIN(images.width, images.height))"
+
+ if min > 0 {
+ f.addHaving(widthHeight + " >= " + strconv.Itoa(min))
+ }
+
+ if max > 0 {
+ f.addHaving(widthHeight + " < " + strconv.Itoa(max))
+ }
}
}
}
@@ -381,7 +452,17 @@ func (qb *galleryQueryBuilder) getGallerySort(findFilter *models.FindFilterType)
sort = findFilter.GetSort("path")
direction = findFilter.GetDirection()
}
- return getSort(sort, direction, "galleries")
+
+ switch sort {
+ case "images_count":
+ return getCountSort(galleryTable, galleriesImagesTable, galleryIDColumn, direction)
+ case "tag_count":
+ return getCountSort(galleryTable, galleriesTagsTable, galleryIDColumn, direction)
+ case "performer_count":
+ return getCountSort(galleryTable, performersGalleriesTable, galleryIDColumn, direction)
+ default:
+ return getSort(sort, direction, "galleries")
+ }
}
func (qb *galleryQueryBuilder) queryGallery(query string, args []interface{}) (*models.Gallery, error) {
diff --git a/pkg/sqlite/gallery_test.go b/pkg/sqlite/gallery_test.go
index f34328ecd..bcc149edf 100644
--- a/pkg/sqlite/gallery_test.go
+++ b/pkg/sqlite/gallery_test.go
@@ -193,6 +193,199 @@ func verifyGalleriesPath(t *testing.T, sqb models.GalleryReader, pathCriterion m
}
}
+func TestGalleryQueryPathOr(t *testing.T) {
+ const gallery1Idx = 1
+ const gallery2Idx = 2
+
+ gallery1Path := getGalleryStringValue(gallery1Idx, "Path")
+ gallery2Path := getGalleryStringValue(gallery2Idx, "Path")
+
+ galleryFilter := models.GalleryFilterType{
+ Path: &models.StringCriterionInput{
+ Value: gallery1Path,
+ Modifier: models.CriterionModifierEquals,
+ },
+ Or: &models.GalleryFilterType{
+ Path: &models.StringCriterionInput{
+ Value: gallery2Path,
+ Modifier: models.CriterionModifierEquals,
+ },
+ },
+ }
+
+ withTxn(func(r models.Repository) error {
+ sqb := r.Gallery()
+
+ galleries := queryGallery(t, sqb, &galleryFilter, nil)
+
+ assert.Len(t, galleries, 2)
+ assert.Equal(t, gallery1Path, galleries[0].Path.String)
+ assert.Equal(t, gallery2Path, galleries[1].Path.String)
+
+ return nil
+ })
+}
+
+func TestGalleryQueryPathAndRating(t *testing.T) {
+ const galleryIdx = 1
+ galleryPath := getGalleryStringValue(galleryIdx, "Path")
+ galleryRating := getRating(galleryIdx)
+
+ galleryFilter := models.GalleryFilterType{
+ Path: &models.StringCriterionInput{
+ Value: galleryPath,
+ Modifier: models.CriterionModifierEquals,
+ },
+ And: &models.GalleryFilterType{
+ Rating: &models.IntCriterionInput{
+ Value: int(galleryRating.Int64),
+ Modifier: models.CriterionModifierEquals,
+ },
+ },
+ }
+
+ withTxn(func(r models.Repository) error {
+ sqb := r.Gallery()
+
+ galleries := queryGallery(t, sqb, &galleryFilter, nil)
+
+ assert.Len(t, galleries, 1)
+ assert.Equal(t, galleryPath, galleries[0].Path.String)
+ assert.Equal(t, galleryRating.Int64, galleries[0].Rating.Int64)
+
+ return nil
+ })
+}
+
+func TestGalleryQueryPathNotRating(t *testing.T) {
+ const galleryIdx = 1
+
+ galleryRating := getRating(galleryIdx)
+
+ pathCriterion := models.StringCriterionInput{
+ Value: "gallery_.*1_Path",
+ Modifier: models.CriterionModifierMatchesRegex,
+ }
+
+ ratingCriterion := models.IntCriterionInput{
+ Value: int(galleryRating.Int64),
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ galleryFilter := models.GalleryFilterType{
+ Path: &pathCriterion,
+ Not: &models.GalleryFilterType{
+ Rating: &ratingCriterion,
+ },
+ }
+
+ withTxn(func(r models.Repository) error {
+ sqb := r.Gallery()
+
+ galleries := queryGallery(t, sqb, &galleryFilter, nil)
+
+ for _, gallery := range galleries {
+ verifyNullString(t, gallery.Path, pathCriterion)
+ ratingCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyInt64(t, gallery.Rating, ratingCriterion)
+ }
+
+ return nil
+ })
+}
+
+func TestGalleryIllegalQuery(t *testing.T) {
+ assert := assert.New(t)
+
+ const galleryIdx = 1
+ subFilter := models.GalleryFilterType{
+ Path: &models.StringCriterionInput{
+ Value: getGalleryStringValue(galleryIdx, "Path"),
+ Modifier: models.CriterionModifierEquals,
+ },
+ }
+
+ galleryFilter := &models.GalleryFilterType{
+ And: &subFilter,
+ Or: &subFilter,
+ }
+
+ withTxn(func(r models.Repository) error {
+ sqb := r.Gallery()
+
+ _, _, err := sqb.Query(galleryFilter, nil)
+ assert.NotNil(err)
+
+ galleryFilter.Or = nil
+ galleryFilter.Not = &subFilter
+ _, _, err = sqb.Query(galleryFilter, nil)
+ assert.NotNil(err)
+
+ galleryFilter.And = nil
+ galleryFilter.Or = &subFilter
+ _, _, err = sqb.Query(galleryFilter, nil)
+ assert.NotNil(err)
+
+ return nil
+ })
+}
+
+func TestGalleryQueryURL(t *testing.T) {
+ const sceneIdx = 1
+ galleryURL := getGalleryStringValue(sceneIdx, urlField)
+
+ urlCriterion := models.StringCriterionInput{
+ Value: galleryURL,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ filter := models.GalleryFilterType{
+ URL: &urlCriterion,
+ }
+
+ verifyFn := func(g *models.Gallery) {
+ t.Helper()
+ verifyNullString(t, g.URL, urlCriterion)
+ }
+
+ verifyGalleryQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyGalleryQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierMatchesRegex
+ urlCriterion.Value = "gallery_.*1_URL"
+ verifyGalleryQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierNotMatchesRegex
+ verifyGalleryQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierIsNull
+ urlCriterion.Value = ""
+ verifyGalleryQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierNotNull
+ verifyGalleryQuery(t, filter, verifyFn)
+}
+
+func verifyGalleryQuery(t *testing.T, filter models.GalleryFilterType, verifyFn func(s *models.Gallery)) {
+ withTxn(func(r models.Repository) error {
+ t.Helper()
+ sqb := r.Gallery()
+
+ galleries := queryGallery(t, sqb, &filter, nil)
+
+ // assume it should find at least one
+ assert.Greater(t, len(galleries), 0)
+
+ for _, gallery := range galleries {
+ verifyFn(gallery)
+ }
+
+ return nil
+ })
+}
+
func TestGalleryQueryRating(t *testing.T) {
const rating = 3
ratingCriterion := models.IntCriterionInput{
@@ -574,6 +767,154 @@ func TestGalleryQueryPerformerTags(t *testing.T) {
})
}
+func TestGalleryQueryTagCount(t *testing.T) {
+ const tagCount = 1
+ tagCountCriterion := models.IntCriterionInput{
+ Value: tagCount,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ verifyGalleriesTagCount(t, tagCountCriterion)
+
+ tagCountCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyGalleriesTagCount(t, tagCountCriterion)
+
+ tagCountCriterion.Modifier = models.CriterionModifierGreaterThan
+ verifyGalleriesTagCount(t, tagCountCriterion)
+
+ tagCountCriterion.Modifier = models.CriterionModifierLessThan
+ verifyGalleriesTagCount(t, tagCountCriterion)
+}
+
+func verifyGalleriesTagCount(t *testing.T, tagCountCriterion models.IntCriterionInput) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Gallery()
+ galleryFilter := models.GalleryFilterType{
+ TagCount: &tagCountCriterion,
+ }
+
+ galleries := queryGallery(t, sqb, &galleryFilter, nil)
+ assert.Greater(t, len(galleries), 0)
+
+ for _, gallery := range galleries {
+ ids, err := sqb.GetTagIDs(gallery.ID)
+ if err != nil {
+ return err
+ }
+ verifyInt(t, len(ids), tagCountCriterion)
+ }
+
+ return nil
+ })
+}
+
+func TestGalleryQueryPerformerCount(t *testing.T) {
+ const performerCount = 1
+ performerCountCriterion := models.IntCriterionInput{
+ Value: performerCount,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ verifyGalleriesPerformerCount(t, performerCountCriterion)
+
+ performerCountCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyGalleriesPerformerCount(t, performerCountCriterion)
+
+ performerCountCriterion.Modifier = models.CriterionModifierGreaterThan
+ verifyGalleriesPerformerCount(t, performerCountCriterion)
+
+ performerCountCriterion.Modifier = models.CriterionModifierLessThan
+ verifyGalleriesPerformerCount(t, performerCountCriterion)
+}
+
+func verifyGalleriesPerformerCount(t *testing.T, performerCountCriterion models.IntCriterionInput) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Gallery()
+ galleryFilter := models.GalleryFilterType{
+ PerformerCount: &performerCountCriterion,
+ }
+
+ galleries := queryGallery(t, sqb, &galleryFilter, nil)
+ assert.Greater(t, len(galleries), 0)
+
+ for _, gallery := range galleries {
+ ids, err := sqb.GetPerformerIDs(gallery.ID)
+ if err != nil {
+ return err
+ }
+ verifyInt(t, len(ids), performerCountCriterion)
+ }
+
+ return nil
+ })
+}
+
+func TestGalleryQueryAverageResolution(t *testing.T) {
+ withTxn(func(r models.Repository) error {
+ qb := r.Gallery()
+ resolution := models.ResolutionEnumLow
+ galleryFilter := models.GalleryFilterType{
+ AverageResolution: &resolution,
+ }
+
+ // not verifying average - just ensure we get at least one
+ galleries := queryGallery(t, qb, &galleryFilter, nil)
+ assert.Greater(t, len(galleries), 0)
+
+ return nil
+ })
+}
+
+func TestGalleryQueryImageCount(t *testing.T) {
+ const imageCount = 0
+ imageCountCriterion := models.IntCriterionInput{
+ Value: imageCount,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ verifyGalleriesImageCount(t, imageCountCriterion)
+
+ imageCountCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyGalleriesImageCount(t, imageCountCriterion)
+
+ imageCountCriterion.Modifier = models.CriterionModifierGreaterThan
+ verifyGalleriesImageCount(t, imageCountCriterion)
+
+ imageCountCriterion.Modifier = models.CriterionModifierLessThan
+ verifyGalleriesImageCount(t, imageCountCriterion)
+}
+
+func verifyGalleriesImageCount(t *testing.T, imageCountCriterion models.IntCriterionInput) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Gallery()
+ galleryFilter := models.GalleryFilterType{
+ ImageCount: &imageCountCriterion,
+ }
+
+ galleries := queryGallery(t, sqb, &galleryFilter, nil)
+ assert.Greater(t, len(galleries), -1)
+
+ for _, gallery := range galleries {
+ pp := 0
+
+ _, count, err := r.Image().Query(&models.ImageFilterType{
+ Galleries: &models.MultiCriterionInput{
+ Value: []string{strconv.Itoa(gallery.ID)},
+ Modifier: models.CriterionModifierIncludes,
+ },
+ }, &models.FindFilterType{
+ PerPage: &pp,
+ })
+ if err != nil {
+ return err
+ }
+ verifyInt(t, count, imageCountCriterion)
+ }
+
+ return nil
+ })
+}
+
// TODO Count
// TODO All
// TODO Query
diff --git a/pkg/sqlite/image.go b/pkg/sqlite/image.go
index adb23004e..51cc0d945 100644
--- a/pkg/sqlite/image.go
+++ b/pkg/sqlite/image.go
@@ -12,35 +12,6 @@ const imageIDColumn = "image_id"
const performersImagesTable = "performers_images"
const imagesTagsTable = "images_tags"
-var imagesForPerformerQuery = selectAll(imageTable) + `
-LEFT JOIN performers_images as performers_join on performers_join.image_id = images.id
-WHERE performers_join.performer_id = ?
-GROUP BY images.id
-`
-
-var countImagesForPerformerQuery = `
-SELECT performer_id FROM performers_images as performers_join
-WHERE performer_id = ?
-GROUP BY image_id
-`
-
-var imagesForStudioQuery = selectAll(imageTable) + `
-JOIN studios ON studios.id = images.studio_id
-WHERE studios.id = ?
-GROUP BY images.id
-`
-var imagesForMovieQuery = selectAll(imageTable) + `
-LEFT JOIN movies_images as movies_join on movies_join.image_id = images.id
-WHERE movies_join.movie_id = ?
-GROUP BY images.id
-`
-
-var countImagesForTagQuery = `
-SELECT tag_id AS id FROM images_tags
-WHERE images_tags.tag_id = ?
-GROUP BY images_tags.image_id
-`
-
var imagesForGalleryQuery = selectAll(imageTable) + `
LEFT JOIN galleries_images as galleries_join on galleries_join.image_id = images.id
WHERE galleries_join.gallery_id = ?
@@ -216,7 +187,69 @@ func (qb *imageQueryBuilder) All() ([]*models.Image, error) {
return qb.queryImages(selectAll(imageTable)+qb.getImageSort(nil), nil)
}
-func (qb *imageQueryBuilder) Query(imageFilter *models.ImageFilterType, findFilter *models.FindFilterType) ([]*models.Image, int, error) {
+func (qb *imageQueryBuilder) validateFilter(imageFilter *models.ImageFilterType) error {
+ const and = "AND"
+ const or = "OR"
+ const not = "NOT"
+
+ if imageFilter.And != nil {
+ if imageFilter.Or != nil {
+ return illegalFilterCombination(and, or)
+ }
+ if imageFilter.Not != nil {
+ return illegalFilterCombination(and, not)
+ }
+
+ return qb.validateFilter(imageFilter.And)
+ }
+
+ if imageFilter.Or != nil {
+ if imageFilter.Not != nil {
+ return illegalFilterCombination(or, not)
+ }
+
+ return qb.validateFilter(imageFilter.Or)
+ }
+
+ if imageFilter.Not != nil {
+ return qb.validateFilter(imageFilter.Not)
+ }
+
+ return nil
+}
+
+func (qb *imageQueryBuilder) makeFilter(imageFilter *models.ImageFilterType) *filterBuilder {
+ query := &filterBuilder{}
+
+ if imageFilter.And != nil {
+ query.and(qb.makeFilter(imageFilter.And))
+ }
+ if imageFilter.Or != nil {
+ query.or(qb.makeFilter(imageFilter.Or))
+ }
+ if imageFilter.Not != nil {
+ query.not(qb.makeFilter(imageFilter.Not))
+ }
+
+ query.handleCriterionFunc(stringCriterionHandler(imageFilter.Path, "images.path"))
+ query.handleCriterionFunc(intCriterionHandler(imageFilter.Rating, "images.rating"))
+ query.handleCriterionFunc(intCriterionHandler(imageFilter.OCounter, "images.o_counter"))
+ query.handleCriterionFunc(boolCriterionHandler(imageFilter.Organized, "images.organized"))
+ query.handleCriterionFunc(resolutionCriterionHandler(imageFilter.Resolution, "images.height", "images.width"))
+ query.handleCriterionFunc(imageIsMissingCriterionHandler(qb, imageFilter.IsMissing))
+
+ query.handleCriterionFunc(imageTagsCriterionHandler(qb, imageFilter.Tags))
+ query.handleCriterionFunc(imageTagCountCriterionHandler(qb, imageFilter.TagCount))
+ query.handleCriterionFunc(imageGalleriesCriterionHandler(qb, imageFilter.Galleries))
+ query.handleCriterionFunc(imagePerformersCriterionHandler(qb, imageFilter.Performers))
+ query.handleCriterionFunc(imagePerformerCountCriterionHandler(qb, imageFilter.PerformerCount))
+ query.handleCriterionFunc(imageStudioCriterionHandler(qb, imageFilter.Studios))
+ query.handleCriterionFunc(imagePerformerTagsCriterionHandler(qb, imageFilter.PerformerTags))
+
+ return query
+}
+
+func (qb *imageQueryBuilder) makeQuery(imageFilter *models.ImageFilterType, findFilter *models.FindFilterType) (*queryBuilder, error) {
if imageFilter == nil {
imageFilter = &models.ImageFilterType{}
}
@@ -227,12 +260,6 @@ func (qb *imageQueryBuilder) Query(imageFilter *models.ImageFilterType, findFilt
query := qb.newQuery()
query.body = selectDistinctIDs(imageTable)
- query.body += `
- left join performers_images as performers_join on performers_join.image_id = images.id
- left join studios as studio on studio.id = images.studio_id
- left join images_tags as tags_join on tags_join.image_id = images.id
- left join galleries_images as galleries_join on galleries_join.image_id = images.id
- `
if q := findFilter.Q; q != nil && *q != "" {
searchColumns := []string{"images.title", "images.path", "images.checksum"}
@@ -241,128 +268,24 @@ func (qb *imageQueryBuilder) Query(imageFilter *models.ImageFilterType, findFilt
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)
- if count == 1 {
- query.addArg(imageFilter.Rating.Value)
- }
+ if err := qb.validateFilter(imageFilter); err != nil {
+ return nil, err
}
+ filter := qb.makeFilter(imageFilter)
- if oCounter := imageFilter.OCounter; oCounter != nil {
- clause, count := getIntCriterionWhereClause("images.o_counter", *imageFilter.OCounter)
- query.addWhere(clause)
- if count == 1 {
- query.addArg(imageFilter.OCounter.Value)
- }
- }
-
- if Organized := imageFilter.Organized; Organized != nil {
- var organized string
- if *Organized == true {
- organized = "1"
- } else {
- organized = "0"
- }
- query.addWhere("images.organized = " + organized)
- }
-
- if resolutionFilter := imageFilter.Resolution; resolutionFilter != nil {
- if resolution := resolutionFilter.String(); resolutionFilter.IsValid() {
- switch resolution {
- case "VERY_LOW":
- query.addWhere("MIN(images.height, images.width) < 240")
- case "LOW":
- query.addWhere("(MIN(images.height, images.width) >= 240 AND MIN(images.height, images.width) < 360)")
- case "R360P":
- query.addWhere("(MIN(images.height, images.width) >= 360 AND MIN(images.height, images.width) < 480)")
- case "STANDARD":
- query.addWhere("(MIN(images.height, images.width) >= 480 AND MIN(images.height, images.width) < 540)")
- case "WEB_HD":
- query.addWhere("(MIN(images.height, images.width) >= 540 AND MIN(images.height, images.width) < 720)")
- case "STANDARD_HD":
- query.addWhere("(MIN(images.height, images.width) >= 720 AND MIN(images.height, images.width) < 1080)")
- case "FULL_HD":
- query.addWhere("(MIN(images.height, images.width) >= 1080 AND MIN(images.height, images.width) < 1440)")
- case "QUAD_HD":
- query.addWhere("(MIN(images.height, images.width) >= 1440 AND MIN(images.height, images.width) < 1920)")
- case "VR_HD":
- query.addWhere("(MIN(images.height, images.width) >= 1920 AND MIN(images.height, images.width) < 2160)")
- case "FOUR_K":
- query.addWhere("(MIN(images.height, images.width) >= 2160 AND MIN(images.height, images.width) < 2880)")
- case "FIVE_K":
- query.addWhere("(MIN(images.height, images.width) >= 2880 AND MIN(images.height, images.width) < 3384)")
- case "SIX_K":
- query.addWhere("(MIN(images.height, images.width) >= 3384 AND MIN(images.height, images.width) < 4320)")
- case "EIGHT_K":
- query.addWhere("MIN(images.height, images.width) >= 4320")
- }
- }
- }
-
- if isMissingFilter := imageFilter.IsMissing; isMissingFilter != nil && *isMissingFilter != "" {
- switch *isMissingFilter {
- case "studio":
- query.addWhere("images.studio_id IS NULL")
- case "performers":
- query.addWhere("performers_join.image_id IS NULL")
- case "galleries":
- query.addWhere("galleries_join.image_id IS NULL")
- case "tags":
- query.addWhere("tags_join.image_id IS NULL")
- default:
- query.addWhere("(images." + *isMissingFilter + " IS NULL OR TRIM(images." + *isMissingFilter + ") = '')")
- }
- }
-
- if tagsFilter := imageFilter.Tags; tagsFilter != nil && len(tagsFilter.Value) > 0 {
- for _, tagID := range tagsFilter.Value {
- query.addArg(tagID)
- }
-
- query.body += " LEFT JOIN tags on tags_join.tag_id = tags.id"
- whereClause, havingClause := getMultiCriterionClause("images", "tags", "images_tags", "image_id", "tag_id", tagsFilter)
- query.addWhere(whereClause)
- query.addHaving(havingClause)
- }
-
- if galleriesFilter := imageFilter.Galleries; galleriesFilter != nil && len(galleriesFilter.Value) > 0 {
- for _, galleryID := range galleriesFilter.Value {
- query.addArg(galleryID)
- }
-
- query.body += " LEFT JOIN galleries ON galleries_join.gallery_id = galleries.id"
- whereClause, havingClause := getMultiCriterionClause("images", "galleries", "galleries_images", "image_id", "gallery_id", galleriesFilter)
- query.addWhere(whereClause)
- query.addHaving(havingClause)
- }
-
- if performersFilter := imageFilter.Performers; performersFilter != nil && len(performersFilter.Value) > 0 {
- for _, performerID := range performersFilter.Value {
- query.addArg(performerID)
- }
-
- query.body += " LEFT JOIN performers ON performers_join.performer_id = performers.id"
- whereClause, havingClause := getMultiCriterionClause("images", "performers", "performers_images", "image_id", "performer_id", performersFilter)
- query.addWhere(whereClause)
- query.addHaving(havingClause)
- }
-
- if studiosFilter := imageFilter.Studios; studiosFilter != nil && len(studiosFilter.Value) > 0 {
- for _, studioID := range studiosFilter.Value {
- query.addArg(studioID)
- }
-
- whereClause, havingClause := getMultiCriterionClause("images", "studio", "", "", "studio_id", studiosFilter)
- query.addWhere(whereClause)
- query.addHaving(havingClause)
- }
-
- handleImagePerformerTagsCriterion(&query, imageFilter.PerformerTags)
+ query.addFilter(filter)
query.sortAndPagination = qb.getImageSort(findFilter) + getPagination(findFilter)
+
+ return &query, nil
+}
+
+func (qb *imageQueryBuilder) Query(imageFilter *models.ImageFilterType, findFilter *models.FindFilterType) ([]*models.Image, int, error) {
+ query, err := qb.makeQuery(imageFilter, findFilter)
+ if err != nil {
+ return nil, 0, err
+ }
+
idsResult, countResult, err := query.executeFind()
if err != nil {
return nil, 0, err
@@ -381,27 +304,144 @@ func (qb *imageQueryBuilder) Query(imageFilter *models.ImageFilterType, findFilt
return images, countResult, nil
}
-func handleImagePerformerTagsCriterion(query *queryBuilder, performerTagsFilter *models.MultiCriterionInput) {
- if performerTagsFilter != nil && len(performerTagsFilter.Value) > 0 {
- for _, tagID := range performerTagsFilter.Value {
- query.addArg(tagID)
+func (qb *imageQueryBuilder) QueryCount(imageFilter *models.ImageFilterType, findFilter *models.FindFilterType) (int, error) {
+ query, err := qb.makeQuery(imageFilter, findFilter)
+ if err != nil {
+ return 0, err
+ }
+
+ return query.executeCount()
+}
+
+func imageIsMissingCriterionHandler(qb *imageQueryBuilder, isMissing *string) criterionHandlerFunc {
+ return func(f *filterBuilder) {
+ if isMissing != nil && *isMissing != "" {
+ switch *isMissing {
+ case "studio":
+ f.addWhere("images.studio_id IS NULL")
+ case "performers":
+ qb.performersRepository().join(f, "performers_join", "images.id")
+ f.addWhere("performers_join.image_id IS NULL")
+ case "galleries":
+ qb.galleriesRepository().join(f, "galleries_join", "images.id")
+ f.addWhere("galleries_join.image_id IS NULL")
+ case "tags":
+ qb.tagsRepository().join(f, "tags_join", "images.id")
+ f.addWhere("tags_join.image_id IS NULL")
+ default:
+ f.addWhere("(images." + *isMissing + " IS NULL OR TRIM(images." + *isMissing + ") = '')")
+ }
}
+ }
+}
- query.body += " LEFT JOIN performers_tags AS performer_tags_join on performers_join.performer_id = performer_tags_join.performer_id"
+func (qb *imageQueryBuilder) getMultiCriterionHandlerBuilder(foreignTable, joinTable, foreignFK string, addJoinsFunc func(f *filterBuilder)) multiCriterionHandlerBuilder {
+ return multiCriterionHandlerBuilder{
+ primaryTable: imageTable,
+ foreignTable: foreignTable,
+ joinTable: joinTable,
+ primaryFK: imageIDColumn,
+ foreignFK: foreignFK,
+ addJoinsFunc: addJoinsFunc,
+ }
+}
- if performerTagsFilter.Modifier == models.CriterionModifierIncludes {
- // includes any of the provided ids
- query.addWhere("performer_tags_join.tag_id IN " + getInBinding(len(performerTagsFilter.Value)))
- } else if performerTagsFilter.Modifier == models.CriterionModifierIncludesAll {
- // includes all of the provided ids
- query.addWhere("performer_tags_join.tag_id IN " + getInBinding(len(performerTagsFilter.Value)))
- query.addHaving(fmt.Sprintf("count(distinct performer_tags_join.tag_id) IS %d", len(performerTagsFilter.Value)))
- } else if performerTagsFilter.Modifier == models.CriterionModifierExcludes {
- query.addWhere(fmt.Sprintf(`not exists
- (select performers_images.performer_id from performers_images
- left join performers_tags on performers_tags.performer_id = performers_images.performer_id where
- performers_images.image_id = images.id AND
- performers_tags.tag_id in %s)`, getInBinding(len(performerTagsFilter.Value))))
+func imageTagsCriterionHandler(qb *imageQueryBuilder, tags *models.MultiCriterionInput) criterionHandlerFunc {
+ h := joinedMultiCriterionHandlerBuilder{
+ primaryTable: imageTable,
+ joinTable: imagesTagsTable,
+ joinAs: "tags_join",
+ primaryFK: imageIDColumn,
+ foreignFK: tagIDColumn,
+
+ addJoinTable: func(f *filterBuilder) {
+ qb.tagsRepository().join(f, "tags_join", "images.id")
+ },
+ }
+
+ return h.handler(tags)
+}
+
+func imageTagCountCriterionHandler(qb *imageQueryBuilder, tagCount *models.IntCriterionInput) criterionHandlerFunc {
+ h := countCriterionHandlerBuilder{
+ primaryTable: imageTable,
+ joinTable: imagesTagsTable,
+ primaryFK: imageIDColumn,
+ }
+
+ return h.handler(tagCount)
+}
+
+func imageGalleriesCriterionHandler(qb *imageQueryBuilder, galleries *models.MultiCriterionInput) criterionHandlerFunc {
+ addJoinsFunc := func(f *filterBuilder) {
+ qb.galleriesRepository().join(f, "galleries_join", "images.id")
+ f.addJoin(galleryTable, "", "galleries_join.gallery_id = galleries.id")
+ }
+ h := qb.getMultiCriterionHandlerBuilder(galleryTable, galleriesImagesTable, galleryIDColumn, addJoinsFunc)
+
+ return h.handler(galleries)
+}
+
+func imagePerformersCriterionHandler(qb *imageQueryBuilder, performers *models.MultiCriterionInput) criterionHandlerFunc {
+ h := joinedMultiCriterionHandlerBuilder{
+ primaryTable: imageTable,
+ joinTable: performersImagesTable,
+ joinAs: "performers_join",
+ primaryFK: imageIDColumn,
+ foreignFK: performerIDColumn,
+
+ addJoinTable: func(f *filterBuilder) {
+ qb.performersRepository().join(f, "performers_join", "images.id")
+ },
+ }
+
+ return h.handler(performers)
+}
+
+func imagePerformerCountCriterionHandler(qb *imageQueryBuilder, performerCount *models.IntCriterionInput) criterionHandlerFunc {
+ h := countCriterionHandlerBuilder{
+ primaryTable: imageTable,
+ joinTable: performersImagesTable,
+ primaryFK: imageIDColumn,
+ }
+
+ return h.handler(performerCount)
+}
+
+func imageStudioCriterionHandler(qb *imageQueryBuilder, studios *models.MultiCriterionInput) criterionHandlerFunc {
+ addJoinsFunc := func(f *filterBuilder) {
+ f.addJoin(studioTable, "studio", "studio.id = images.studio_id")
+ }
+ h := qb.getMultiCriterionHandlerBuilder("studio", "", studioIDColumn, addJoinsFunc)
+
+ return h.handler(studios)
+}
+
+func imagePerformerTagsCriterionHandler(qb *imageQueryBuilder, performerTagsFilter *models.MultiCriterionInput) criterionHandlerFunc {
+ return func(f *filterBuilder) {
+ if performerTagsFilter != nil && len(performerTagsFilter.Value) > 0 {
+ qb.performersRepository().join(f, "performers_join", "images.id")
+ f.addJoin("performers_tags", "performer_tags_join", "performers_join.performer_id = performer_tags_join.performer_id")
+
+ var args []interface{}
+ for _, tagID := range performerTagsFilter.Value {
+ args = append(args, tagID)
+ }
+
+ if performerTagsFilter.Modifier == models.CriterionModifierIncludes {
+ // includes any of the provided ids
+ f.addWhere("performer_tags_join.tag_id IN "+getInBinding(len(performerTagsFilter.Value)), args...)
+ } else if performerTagsFilter.Modifier == models.CriterionModifierIncludesAll {
+ // includes all of the provided ids
+ f.addWhere("performer_tags_join.tag_id IN "+getInBinding(len(performerTagsFilter.Value)), args...)
+ f.addHaving(fmt.Sprintf("count(distinct performer_tags_join.tag_id) IS %d", len(performerTagsFilter.Value)))
+ } else if performerTagsFilter.Modifier == models.CriterionModifierExcludes {
+ f.addWhere(fmt.Sprintf(`not exists
+ (select performers_images.performer_id from performers_images
+ left join performers_tags on performers_tags.performer_id = performers_images.performer_id where
+ performers_images.image_id = images.id AND
+ performers_tags.tag_id in %s)`, getInBinding(len(performerTagsFilter.Value))), args...)
+ }
}
}
}
@@ -412,7 +452,15 @@ func (qb *imageQueryBuilder) getImageSort(findFilter *models.FindFilterType) str
}
sort := findFilter.GetSort("title")
direction := findFilter.GetDirection()
- return getSort(sort, direction, "images")
+
+ switch sort {
+ case "tag_count":
+ return getCountSort(imageTable, imagesTagsTable, imageIDColumn, direction)
+ case "performer_count":
+ return getCountSort(imageTable, performersImagesTable, imageIDColumn, direction)
+ default:
+ return getSort(sort, direction, "images")
+ }
}
func (qb *imageQueryBuilder) queryImage(query string, args []interface{}) (*models.Image, error) {
diff --git a/pkg/sqlite/image_test.go b/pkg/sqlite/image_test.go
index 36077739b..70343f44f 100644
--- a/pkg/sqlite/image_test.go
+++ b/pkg/sqlite/image_test.go
@@ -95,6 +95,12 @@ func imageQueryQ(t *testing.T, sqb models.ImageReader, q string, expectedImageId
image := images[0]
assert.Equal(t, imageIDs[expectedImageIdx], image.ID)
+ count, err := sqb.QueryCount(nil, &filter)
+ if err != nil {
+ t.Errorf("Error querying image: %s", err.Error())
+ }
+ assert.Equal(t, len(images), count)
+
// no Q should return all results
filter.Q = nil
images, _, err = sqb.Query(nil, &filter)
@@ -120,7 +126,7 @@ func TestImageQueryPath(t *testing.T) {
verifyImagePath(t, pathCriterion, totalImages-1)
pathCriterion.Modifier = models.CriterionModifierMatchesRegex
- pathCriterion.Value = "image_.*1_Path"
+ pathCriterion.Value = "image_.*01_Path"
verifyImagePath(t, pathCriterion, 1) // TODO - 2 if zip path is included
pathCriterion.Modifier = models.CriterionModifierNotMatchesRegex
@@ -149,6 +155,143 @@ func verifyImagePath(t *testing.T, pathCriterion models.StringCriterionInput, ex
})
}
+func TestImageQueryPathOr(t *testing.T) {
+ const image1Idx = 1
+ const image2Idx = 2
+
+ image1Path := getImageStringValue(image1Idx, "Path")
+ image2Path := getImageStringValue(image2Idx, "Path")
+
+ imageFilter := models.ImageFilterType{
+ Path: &models.StringCriterionInput{
+ Value: image1Path,
+ Modifier: models.CriterionModifierEquals,
+ },
+ Or: &models.ImageFilterType{
+ Path: &models.StringCriterionInput{
+ Value: image2Path,
+ Modifier: models.CriterionModifierEquals,
+ },
+ },
+ }
+
+ withTxn(func(r models.Repository) error {
+ sqb := r.Image()
+
+ images := queryImages(t, sqb, &imageFilter, nil)
+
+ assert.Len(t, images, 2)
+ assert.Equal(t, image1Path, images[0].Path)
+ assert.Equal(t, image2Path, images[1].Path)
+
+ return nil
+ })
+}
+
+func TestImageQueryPathAndRating(t *testing.T) {
+ const imageIdx = 1
+ imagePath := getImageStringValue(imageIdx, "Path")
+ imageRating := getRating(imageIdx)
+
+ imageFilter := models.ImageFilterType{
+ Path: &models.StringCriterionInput{
+ Value: imagePath,
+ Modifier: models.CriterionModifierEquals,
+ },
+ And: &models.ImageFilterType{
+ Rating: &models.IntCriterionInput{
+ Value: int(imageRating.Int64),
+ Modifier: models.CriterionModifierEquals,
+ },
+ },
+ }
+
+ withTxn(func(r models.Repository) error {
+ sqb := r.Image()
+
+ images := queryImages(t, sqb, &imageFilter, nil)
+
+ assert.Len(t, images, 1)
+ assert.Equal(t, imagePath, images[0].Path)
+ assert.Equal(t, imageRating.Int64, images[0].Rating.Int64)
+
+ return nil
+ })
+}
+
+func TestImageQueryPathNotRating(t *testing.T) {
+ const imageIdx = 1
+
+ imageRating := getRating(imageIdx)
+
+ pathCriterion := models.StringCriterionInput{
+ Value: "image_.*1_Path",
+ Modifier: models.CriterionModifierMatchesRegex,
+ }
+
+ ratingCriterion := models.IntCriterionInput{
+ Value: int(imageRating.Int64),
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ imageFilter := models.ImageFilterType{
+ Path: &pathCriterion,
+ Not: &models.ImageFilterType{
+ Rating: &ratingCriterion,
+ },
+ }
+
+ withTxn(func(r models.Repository) error {
+ sqb := r.Image()
+
+ images := queryImages(t, sqb, &imageFilter, nil)
+
+ for _, image := range images {
+ verifyString(t, image.Path, pathCriterion)
+ ratingCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyInt64(t, image.Rating, ratingCriterion)
+ }
+
+ return nil
+ })
+}
+
+func TestImageIllegalQuery(t *testing.T) {
+ assert := assert.New(t)
+
+ const imageIdx = 1
+ subFilter := models.ImageFilterType{
+ Path: &models.StringCriterionInput{
+ Value: getImageStringValue(imageIdx, "Path"),
+ Modifier: models.CriterionModifierEquals,
+ },
+ }
+
+ imageFilter := &models.ImageFilterType{
+ And: &subFilter,
+ Or: &subFilter,
+ }
+
+ withTxn(func(r models.Repository) error {
+ sqb := r.Image()
+
+ _, _, err := sqb.Query(imageFilter, nil)
+ assert.NotNil(err)
+
+ imageFilter.Or = nil
+ imageFilter.Not = &subFilter
+ _, _, err = sqb.Query(imageFilter, nil)
+ assert.NotNil(err)
+
+ imageFilter.And = nil
+ imageFilter.Or = &subFilter
+ _, _, err = sqb.Query(imageFilter, nil)
+ assert.NotNil(err)
+
+ return nil
+ })
+}
+
func TestImageQueryRating(t *testing.T) {
const rating = 3
ratingCriterion := models.IntCriterionInput{
@@ -443,6 +586,70 @@ func TestImageQueryIsMissingRating(t *testing.T) {
})
}
+func TestImageQueryGallery(t *testing.T) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Image()
+ galleryCriterion := models.MultiCriterionInput{
+ Value: []string{
+ strconv.Itoa(galleryIDs[galleryIdxWithImage]),
+ },
+ Modifier: models.CriterionModifierIncludes,
+ }
+
+ imageFilter := models.ImageFilterType{
+ Galleries: &galleryCriterion,
+ }
+
+ images, _, err := sqb.Query(&imageFilter, nil)
+ if err != nil {
+ t.Errorf("Error querying image: %s", err.Error())
+ }
+
+ assert.Len(t, images, 1)
+
+ // ensure ids are correct
+ for _, image := range images {
+ assert.True(t, image.ID == imageIDs[imageIdxWithGallery])
+ }
+
+ galleryCriterion = models.MultiCriterionInput{
+ Value: []string{
+ strconv.Itoa(galleryIDs[galleryIdx1WithImage]),
+ strconv.Itoa(galleryIDs[galleryIdx2WithImage]),
+ },
+ Modifier: models.CriterionModifierIncludesAll,
+ }
+
+ images, _, err = sqb.Query(&imageFilter, nil)
+ if err != nil {
+ t.Errorf("Error querying image: %s", err.Error())
+ }
+
+ assert.Len(t, images, 1)
+ assert.Equal(t, imageIDs[imageIdxWithTwoGalleries], images[0].ID)
+
+ galleryCriterion = models.MultiCriterionInput{
+ Value: []string{
+ strconv.Itoa(performerIDs[galleryIdx1WithImage]),
+ },
+ Modifier: models.CriterionModifierExcludes,
+ }
+
+ q := getImageStringValue(imageIdxWithTwoGalleries, titleField)
+ findFilter := models.FindFilterType{
+ Q: &q,
+ }
+
+ images, _, err = sqb.Query(&imageFilter, &findFilter)
+ if err != nil {
+ t.Errorf("Error querying image: %s", err.Error())
+ }
+ assert.Len(t, images, 0)
+
+ return nil
+ })
+}
+
func TestImageQueryPerformers(t *testing.T) {
withTxn(func(r models.Repository) error {
sqb := r.Image()
@@ -683,6 +890,88 @@ func TestImageQueryPerformerTags(t *testing.T) {
})
}
+func TestImageQueryTagCount(t *testing.T) {
+ const tagCount = 1
+ tagCountCriterion := models.IntCriterionInput{
+ Value: tagCount,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ verifyImagesTagCount(t, tagCountCriterion)
+
+ tagCountCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyImagesTagCount(t, tagCountCriterion)
+
+ tagCountCriterion.Modifier = models.CriterionModifierGreaterThan
+ verifyImagesTagCount(t, tagCountCriterion)
+
+ tagCountCriterion.Modifier = models.CriterionModifierLessThan
+ verifyImagesTagCount(t, tagCountCriterion)
+}
+
+func verifyImagesTagCount(t *testing.T, tagCountCriterion models.IntCriterionInput) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Image()
+ imageFilter := models.ImageFilterType{
+ TagCount: &tagCountCriterion,
+ }
+
+ images := queryImages(t, sqb, &imageFilter, nil)
+ assert.Greater(t, len(images), 0)
+
+ for _, image := range images {
+ ids, err := sqb.GetTagIDs(image.ID)
+ if err != nil {
+ return err
+ }
+ verifyInt(t, len(ids), tagCountCriterion)
+ }
+
+ return nil
+ })
+}
+
+func TestImageQueryPerformerCount(t *testing.T) {
+ const performerCount = 1
+ performerCountCriterion := models.IntCriterionInput{
+ Value: performerCount,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ verifyImagesPerformerCount(t, performerCountCriterion)
+
+ performerCountCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyImagesPerformerCount(t, performerCountCriterion)
+
+ performerCountCriterion.Modifier = models.CriterionModifierGreaterThan
+ verifyImagesPerformerCount(t, performerCountCriterion)
+
+ performerCountCriterion.Modifier = models.CriterionModifierLessThan
+ verifyImagesPerformerCount(t, performerCountCriterion)
+}
+
+func verifyImagesPerformerCount(t *testing.T, performerCountCriterion models.IntCriterionInput) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Image()
+ imageFilter := models.ImageFilterType{
+ PerformerCount: &performerCountCriterion,
+ }
+
+ images := queryImages(t, sqb, &imageFilter, nil)
+ assert.Greater(t, len(images), 0)
+
+ for _, image := range images {
+ ids, err := sqb.GetPerformerIDs(image.ID)
+ if err != nil {
+ return err
+ }
+ verifyInt(t, len(ids), performerCountCriterion)
+ }
+
+ return nil
+ })
+}
+
func TestImageQuerySorting(t *testing.T) {
withTxn(func(r models.Repository) error {
sort := titleField
diff --git a/pkg/sqlite/movies.go b/pkg/sqlite/movies.go
index 567c8c1b7..cec607c5f 100644
--- a/pkg/sqlite/movies.go
+++ b/pkg/sqlite/movies.go
@@ -122,11 +122,10 @@ func (qb *movieQueryBuilder) Query(movieFilter *models.MovieFilterType, findFilt
movieFilter = &models.MovieFilterType{}
}
- var whereClauses []string
- var havingClauses []string
- var args []interface{}
- body := selectDistinctIDs("movies")
- body += `
+ query := qb.newQuery()
+
+ query.body = selectDistinctIDs("movies")
+ query.body += `
left join movies_scenes as scenes_join on scenes_join.movie_id = movies.id
left join scenes on scenes_join.scene_id = scenes.id
left join studios as studio on studio.id = movies.studio_id
@@ -135,41 +134,43 @@ func (qb *movieQueryBuilder) Query(movieFilter *models.MovieFilterType, findFilt
if q := findFilter.Q; q != nil && *q != "" {
searchColumns := []string{"movies.name"}
clause, thisArgs := getSearchBinding(searchColumns, *q, false)
- whereClauses = append(whereClauses, clause)
- args = append(args, thisArgs...)
+ query.addWhere(clause)
+ query.addArg(thisArgs...)
}
if studiosFilter := movieFilter.Studios; studiosFilter != nil && len(studiosFilter.Value) > 0 {
for _, studioID := range studiosFilter.Value {
- args = append(args, studioID)
+ query.addArg(studioID)
}
whereClause, havingClause := getMultiCriterionClause("movies", "studio", "", "", "studio_id", studiosFilter)
- whereClauses = appendClause(whereClauses, whereClause)
- havingClauses = appendClause(havingClauses, havingClause)
+ query.addWhere(whereClause)
+ query.addHaving(havingClause)
}
if isMissingFilter := movieFilter.IsMissing; isMissingFilter != nil && *isMissingFilter != "" {
switch *isMissingFilter {
case "front_image":
- body += `left join movies_images on movies_images.movie_id = movies.id
+ query.body += `left join movies_images on movies_images.movie_id = movies.id
`
- whereClauses = appendClause(whereClauses, "movies_images.front_image IS NULL")
+ query.addWhere("movies_images.front_image IS NULL")
case "back_image":
- body += `left join movies_images on movies_images.movie_id = movies.id
+ query.body += `left join movies_images on movies_images.movie_id = movies.id
`
- whereClauses = appendClause(whereClauses, "movies_images.back_image IS NULL")
+ query.addWhere("movies_images.back_image IS NULL")
case "scenes":
- body += `left join movies_scenes on movies_scenes.movie_id = movies.id
+ query.body += `left join movies_scenes on movies_scenes.movie_id = movies.id
`
- whereClauses = appendClause(whereClauses, "movies_scenes.scene_id IS NULL")
+ query.addWhere("movies_scenes.scene_id IS NULL")
default:
- whereClauses = appendClause(whereClauses, "movies."+*isMissingFilter+" IS NULL")
+ query.addWhere("movies." + *isMissingFilter + " IS NULL")
}
}
- sortAndPagination := qb.getMovieSort(findFilter) + getPagination(findFilter)
- idsResult, countResult, err := qb.executeFindQuery(body, args, sortAndPagination, whereClauses, havingClauses)
+ query.handleStringCriterionInput(movieFilter.URL, "movies.url")
+
+ query.sortAndPagination = qb.getMovieSort(findFilter) + getPagination(findFilter)
+ idsResult, countResult, err := query.executeFind()
if err != nil {
return nil, 0, err
}
diff --git a/pkg/sqlite/movies_test.go b/pkg/sqlite/movies_test.go
index 235f0184c..5ba543798 100644
--- a/pkg/sqlite/movies_test.go
+++ b/pkg/sqlite/movies_test.go
@@ -119,6 +119,71 @@ func TestMovieQueryStudio(t *testing.T) {
})
}
+func TestMovieQueryURL(t *testing.T) {
+ const sceneIdx = 1
+ movieURL := getMovieStringValue(sceneIdx, urlField)
+
+ urlCriterion := models.StringCriterionInput{
+ Value: movieURL,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ filter := models.MovieFilterType{
+ URL: &urlCriterion,
+ }
+
+ verifyFn := func(n *models.Movie) {
+ t.Helper()
+ verifyNullString(t, n.URL, urlCriterion)
+ }
+
+ verifyMovieQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyMovieQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierMatchesRegex
+ urlCriterion.Value = "movie_.*1_URL"
+ verifyMovieQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierNotMatchesRegex
+ verifyMovieQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierIsNull
+ urlCriterion.Value = ""
+ verifyMovieQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierNotNull
+ verifyMovieQuery(t, filter, verifyFn)
+}
+
+func verifyMovieQuery(t *testing.T, filter models.MovieFilterType, verifyFn func(s *models.Movie)) {
+ withTxn(func(r models.Repository) error {
+ t.Helper()
+ sqb := r.Movie()
+
+ movies := queryMovie(t, sqb, &filter, nil)
+
+ // assume it should find at least one
+ assert.Greater(t, len(movies), 0)
+
+ for _, m := range movies {
+ verifyFn(m)
+ }
+
+ return nil
+ })
+}
+
+func queryMovie(t *testing.T, sqb models.MovieReader, movieFilter *models.MovieFilterType, findFilter *models.FindFilterType) []*models.Movie {
+ movies, _, err := sqb.Query(movieFilter, findFilter)
+ if err != nil {
+ t.Errorf("Error querying movie: %s", err.Error())
+ }
+
+ return movies
+}
+
func TestMovieUpdateMovieImages(t *testing.T) {
if err := withTxn(func(r models.Repository) error {
mqb := r.Movie()
diff --git a/pkg/sqlite/performer.go b/pkg/sqlite/performer.go
index cc85da887..f3ebb01d8 100644
--- a/pkg/sqlite/performer.go
+++ b/pkg/sqlite/performer.go
@@ -4,7 +4,7 @@ import (
"database/sql"
"fmt"
"strconv"
- "time"
+ "strings"
"github.com/stashapp/stash/pkg/models"
)
@@ -173,6 +173,25 @@ func (qb *performerQueryBuilder) All() ([]*models.Performer, error) {
return qb.queryPerformers(selectAll("performers")+qb.getPerformerSort(nil), nil)
}
+func (qb *performerQueryBuilder) QueryForAutoTag(words []string) ([]*models.Performer, error) {
+ // TODO - Query needs to be changed to support queries of this type, and
+ // this method should be removed
+ query := selectAll(performerTable)
+
+ var whereClauses []string
+ var args []interface{}
+
+ for _, w := range words {
+ whereClauses = append(whereClauses, "name like ?")
+ args = append(args, "%"+w+"%")
+ whereClauses = append(whereClauses, "aliases like ?")
+ args = append(args, "%"+w+"%")
+ }
+
+ where := strings.Join(whereClauses, " OR ")
+ return qb.queryPerformers(query+" WHERE "+where, args)
+}
+
func (qb *performerQueryBuilder) Query(performerFilter *models.PerformerFilterType, findFilter *models.FindFilterType) ([]*models.Performer, int, error) {
if performerFilter == nil {
performerFilter = &models.PerformerFilterType{}
@@ -192,7 +211,7 @@ func (qb *performerQueryBuilder) Query(performerFilter *models.PerformerFilterTy
`
if q := findFilter.Q; q != nil && *q != "" {
- searchColumns := []string{"performers.name", "performers.checksum", "performers.birthdate", "performers.ethnicity"}
+ searchColumns := []string{"performers.name", "performers.aliases"}
clause, thisArgs := getSearchBinding(searchColumns, *q, false)
query.addWhere(clause)
query.addArg(thisArgs...)
@@ -209,7 +228,13 @@ func (qb *performerQueryBuilder) Query(performerFilter *models.PerformerFilterTy
}
if birthYear := performerFilter.BirthYear; birthYear != nil {
- clauses, thisArgs := getBirthYearFilterClause(birthYear.Modifier, birthYear.Value)
+ clauses, thisArgs := getYearFilterClause(birthYear.Modifier, birthYear.Value, "birthdate")
+ query.addWhere(clauses...)
+ query.addArg(thisArgs...)
+ }
+
+ if deathYear := performerFilter.DeathYear; deathYear != nil {
+ clauses, thisArgs := getYearFilterClause(deathYear.Modifier, deathYear.Value, "death_date")
query.addWhere(clauses...)
query.addArg(thisArgs...)
}
@@ -233,18 +258,11 @@ func (qb *performerQueryBuilder) Query(performerFilter *models.PerformerFilterTy
query.body += `left join performers_image on performers_image.performer_id = performers.id
`
query.addWhere("performers_image.performer_id IS NULL")
- case "stash_id":
- query.addWhere("performer_stash_ids.performer_id IS NULL")
default:
query.addWhere("(performers." + *isMissingFilter + " IS NULL OR TRIM(performers." + *isMissingFilter + ") = '')")
}
}
- if stashIDFilter := performerFilter.StashID; stashIDFilter != nil {
- query.addWhere("performer_stash_ids.stash_id = ?")
- query.addArg(stashIDFilter)
- }
-
query.handleStringCriterionInput(performerFilter.Ethnicity, tableName+".ethnicity")
query.handleStringCriterionInput(performerFilter.Country, tableName+".country")
query.handleStringCriterionInput(performerFilter.EyeColor, tableName+".eye_color")
@@ -254,6 +272,11 @@ func (qb *performerQueryBuilder) Query(performerFilter *models.PerformerFilterTy
query.handleStringCriterionInput(performerFilter.CareerLength, tableName+".career_length")
query.handleStringCriterionInput(performerFilter.Tattoos, tableName+".tattoos")
query.handleStringCriterionInput(performerFilter.Piercings, tableName+".piercings")
+ query.handleIntCriterionInput(performerFilter.Rating, tableName+".rating")
+ query.handleStringCriterionInput(performerFilter.HairColor, tableName+".hair_color")
+ query.handleStringCriterionInput(performerFilter.URL, tableName+".url")
+ query.handleIntCriterionInput(performerFilter.Weight, tableName+".weight")
+ query.handleStringCriterionInput(performerFilter.StashID, "performer_stash_ids.stash_id")
// TODO - need better handling of aliases
query.handleStringCriterionInput(performerFilter.Aliases, tableName+".aliases")
@@ -270,6 +293,11 @@ func (qb *performerQueryBuilder) Query(performerFilter *models.PerformerFilterTy
query.addHaving(havingClause)
}
+ query.handleCountCriterion(performerFilter.TagCount, performerTable, performersTagsTable, performerIDColumn)
+ query.handleCountCriterion(performerFilter.SceneCount, performerTable, performersScenesTable, performerIDColumn)
+ query.handleCountCriterion(performerFilter.ImageCount, performerTable, performersImagesTable, performerIDColumn)
+ query.handleCountCriterion(performerFilter.GalleryCount, performerTable, performersGalleriesTable, performerIDColumn)
+
query.sortAndPagination = qb.getPerformerSort(findFilter) + getPagination(findFilter)
idsResult, countResult, err := query.executeFind()
if err != nil {
@@ -288,7 +316,7 @@ func (qb *performerQueryBuilder) Query(performerFilter *models.PerformerFilterTy
return performers, countResult, nil
}
-func getBirthYearFilterClause(criterionModifier models.CriterionModifier, value int) ([]string, []interface{}) {
+func getYearFilterClause(criterionModifier models.CriterionModifier, value int, col string) ([]string, []interface{}) {
var clauses []string
var args []interface{}
@@ -300,22 +328,22 @@ func getBirthYearFilterClause(criterionModifier models.CriterionModifier, value
switch modifier {
case "EQUALS":
// between yyyy-01-01 and yyyy-12-31
- clauses = append(clauses, "performers.birthdate >= ?")
- clauses = append(clauses, "performers.birthdate <= ?")
+ clauses = append(clauses, "performers."+col+" >= ?")
+ clauses = append(clauses, "performers."+col+" <= ?")
args = append(args, startOfYear)
args = append(args, endOfYear)
case "NOT_EQUALS":
// outside of yyyy-01-01 to yyyy-12-31
- clauses = append(clauses, "performers.birthdate < ? OR performers.birthdate > ?")
+ clauses = append(clauses, "performers."+col+" < ? OR performers."+col+" > ?")
args = append(args, startOfYear)
args = append(args, endOfYear)
case "GREATER_THAN":
// > yyyy-12-31
- clauses = append(clauses, "performers.birthdate > ?")
+ clauses = append(clauses, "performers."+col+" > ?")
args = append(args, endOfYear)
case "LESS_THAN":
// < yyyy-01-01
- clauses = append(clauses, "performers.birthdate < ?")
+ clauses = append(clauses, "performers."+col+" < ?")
args = append(args, startOfYear)
}
}
@@ -326,33 +354,23 @@ func getBirthYearFilterClause(criterionModifier models.CriterionModifier, value
func getAgeFilterClause(criterionModifier models.CriterionModifier, value int) ([]string, []interface{}) {
var clauses []string
var args []interface{}
+ var clause string
- // get the date at which performer would turn the age specified
- dt := time.Now()
- birthDate := dt.AddDate(-value-1, 0, 0)
- yearAfter := birthDate.AddDate(1, 0, 0)
+ if criterionModifier.IsValid() {
+ switch criterionModifier {
+ case models.CriterionModifierEquals:
+ clause = " == ?"
+ case models.CriterionModifierNotEquals:
+ clause = " != ?"
+ case models.CriterionModifierGreaterThan:
+ clause = " > ?"
+ case models.CriterionModifierLessThan:
+ clause = " < ?"
+ }
- if modifier := criterionModifier.String(); criterionModifier.IsValid() {
- switch modifier {
- case "EQUALS":
- // between birthDate and yearAfter
- clauses = append(clauses, "performers.birthdate >= ?")
- clauses = append(clauses, "performers.birthdate < ?")
- args = append(args, birthDate)
- args = append(args, yearAfter)
- case "NOT_EQUALS":
- // outside of birthDate and yearAfter
- clauses = append(clauses, "performers.birthdate < ? OR performers.birthdate >= ?")
- args = append(args, birthDate)
- args = append(args, yearAfter)
- case "GREATER_THAN":
- // < birthDate
- clauses = append(clauses, "performers.birthdate < ?")
- args = append(args, birthDate)
- case "LESS_THAN":
- // > yearAfter
- clauses = append(clauses, "performers.birthdate >= ?")
- args = append(args, yearAfter)
+ if clause != "" {
+ clauses = append(clauses, "cast(IFNULL(strftime('%Y.%m%d', performers.death_date), strftime('%Y.%m%d', 'now')) - strftime('%Y.%m%d', performers.birthdate) as int)"+clause)
+ args = append(args, value)
}
}
@@ -369,6 +387,11 @@ func (qb *performerQueryBuilder) getPerformerSort(findFilter *models.FindFilterT
sort = findFilter.GetSort("name")
direction = findFilter.GetDirection()
}
+
+ if sort == "tag_count" {
+ return getCountSort(performerTable, performersTagsTable, performerIDColumn, direction)
+ }
+
return getSort(sort, direction, "performers")
}
@@ -441,3 +464,23 @@ func (qb *performerQueryBuilder) GetStashIDs(performerID int) ([]*models.StashID
func (qb *performerQueryBuilder) UpdateStashIDs(performerID int, stashIDs []models.StashID) error {
return qb.stashIDRepository().replace(performerID, stashIDs)
}
+
+func (qb *performerQueryBuilder) FindByStashIDStatus(hasStashID bool, stashboxEndpoint string) ([]*models.Performer, error) {
+ query := selectAll("performers") + `
+ LEFT JOIN performer_stash_ids on performer_stash_ids.performer_id = performers.id
+ `
+
+ if hasStashID {
+ query += `
+ WHERE performer_stash_ids.stash_id IS NOT NULL
+ AND performer_stash_ids.endpoint = ?
+ `
+ } else {
+ query += `
+ WHERE performer_stash_ids.stash_id IS NULL
+ `
+ }
+
+ args := []interface{}{stashboxEndpoint}
+ return qb.queryPerformers(query, args)
+}
diff --git a/pkg/sqlite/performer_test.go b/pkg/sqlite/performer_test.go
index c5c7dc6cd..4d7833b3d 100644
--- a/pkg/sqlite/performer_test.go
+++ b/pkg/sqlite/performer_test.go
@@ -100,6 +100,26 @@ func TestPerformerFindByNames(t *testing.T) {
})
}
+func TestPerformerQueryForAutoTag(t *testing.T) {
+ withTxn(func(r models.Repository) error {
+ tqb := r.Performer()
+
+ name := performerNames[performerIdxWithScene] // find a performer by name
+
+ performers, err := tqb.QueryForAutoTag([]string{name})
+
+ if err != nil {
+ t.Errorf("Error finding performers: %s", err.Error())
+ }
+
+ assert.Len(t, performers, 2)
+ assert.Equal(t, strings.ToLower(performerNames[performerIdxWithScene]), strings.ToLower(performers[0].Name.String))
+ assert.Equal(t, strings.ToLower(performerNames[performerIdxWithScene]), strings.ToLower(performers[1].Name.String))
+
+ return nil
+ })
+}
+
func TestPerformerUpdatePerformerImage(t *testing.T) {
if err := withTxn(func(r models.Repository) error {
qb := r.Performer()
@@ -214,10 +234,16 @@ func verifyPerformerAge(t *testing.T, ageCriterion models.IntCriterionInput) {
now := time.Now()
for _, performer := range performers {
+ cd := now
+
+ if performer.DeathDate.Valid {
+ cd, _ = time.Parse("2006-01-02", performer.DeathDate.String)
+ }
+
bd := performer.Birthdate.String
d, _ := time.Parse("2006-01-02", bd)
- age := now.Year() - d.Year()
- if now.YearDay() < d.YearDay() {
+ age := cd.Year() - d.Year()
+ if cd.YearDay() < d.YearDay() {
age = age - 1
}
@@ -268,6 +294,62 @@ func verifyPerformerCareerLength(t *testing.T, criterion models.StringCriterionI
})
}
+func TestPerformerQueryURL(t *testing.T) {
+ const sceneIdx = 1
+ performerURL := getPerformerStringValue(sceneIdx, urlField)
+
+ urlCriterion := models.StringCriterionInput{
+ Value: performerURL,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ filter := models.PerformerFilterType{
+ URL: &urlCriterion,
+ }
+
+ verifyFn := func(g *models.Performer) {
+ t.Helper()
+ verifyNullString(t, g.URL, urlCriterion)
+ }
+
+ verifyPerformerQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyPerformerQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierMatchesRegex
+ urlCriterion.Value = "performer_.*1_URL"
+ verifyPerformerQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierNotMatchesRegex
+ verifyPerformerQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierIsNull
+ urlCriterion.Value = ""
+ verifyPerformerQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierNotNull
+ verifyPerformerQuery(t, filter, verifyFn)
+}
+
+func verifyPerformerQuery(t *testing.T, filter models.PerformerFilterType, verifyFn func(s *models.Performer)) {
+ withTxn(func(r models.Repository) error {
+ t.Helper()
+ sqb := r.Performer()
+
+ performers := queryPerformers(t, sqb, &filter, nil)
+
+ // assume it should find at least one
+ assert.Greater(t, len(performers), 0)
+
+ for _, p := range performers {
+ verifyFn(p)
+ }
+
+ return nil
+ })
+}
+
func queryPerformers(t *testing.T, qb models.PerformerReader, performerFilter *models.PerformerFilterType, findFilter *models.FindFilterType) []*models.Performer {
performers, _, err := qb.Query(performerFilter, findFilter)
if err != nil {
@@ -331,6 +413,188 @@ func TestPerformerQueryTags(t *testing.T) {
})
}
+func TestPerformerQueryTagCount(t *testing.T) {
+ const tagCount = 1
+ tagCountCriterion := models.IntCriterionInput{
+ Value: tagCount,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ verifyPerformersTagCount(t, tagCountCriterion)
+
+ tagCountCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyPerformersTagCount(t, tagCountCriterion)
+
+ tagCountCriterion.Modifier = models.CriterionModifierGreaterThan
+ verifyPerformersTagCount(t, tagCountCriterion)
+
+ tagCountCriterion.Modifier = models.CriterionModifierLessThan
+ verifyPerformersTagCount(t, tagCountCriterion)
+}
+
+func verifyPerformersTagCount(t *testing.T, tagCountCriterion models.IntCriterionInput) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Performer()
+ performerFilter := models.PerformerFilterType{
+ TagCount: &tagCountCriterion,
+ }
+
+ performers := queryPerformers(t, sqb, &performerFilter, nil)
+ assert.Greater(t, len(performers), 0)
+
+ for _, performer := range performers {
+ ids, err := sqb.GetTagIDs(performer.ID)
+ if err != nil {
+ return err
+ }
+ verifyInt(t, len(ids), tagCountCriterion)
+ }
+
+ return nil
+ })
+}
+
+func TestPerformerQuerySceneCount(t *testing.T) {
+ const sceneCount = 1
+ sceneCountCriterion := models.IntCriterionInput{
+ Value: sceneCount,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ verifyPerformersSceneCount(t, sceneCountCriterion)
+
+ sceneCountCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyPerformersSceneCount(t, sceneCountCriterion)
+
+ sceneCountCriterion.Modifier = models.CriterionModifierGreaterThan
+ verifyPerformersSceneCount(t, sceneCountCriterion)
+
+ sceneCountCriterion.Modifier = models.CriterionModifierLessThan
+ verifyPerformersSceneCount(t, sceneCountCriterion)
+}
+
+func verifyPerformersSceneCount(t *testing.T, sceneCountCriterion models.IntCriterionInput) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Performer()
+ performerFilter := models.PerformerFilterType{
+ SceneCount: &sceneCountCriterion,
+ }
+
+ performers := queryPerformers(t, sqb, &performerFilter, nil)
+ assert.Greater(t, len(performers), 0)
+
+ for _, performer := range performers {
+ ids, err := r.Scene().FindByPerformerID(performer.ID)
+ if err != nil {
+ return err
+ }
+ verifyInt(t, len(ids), sceneCountCriterion)
+ }
+
+ return nil
+ })
+}
+
+func TestPerformerQueryImageCount(t *testing.T) {
+ const imageCount = 1
+ imageCountCriterion := models.IntCriterionInput{
+ Value: imageCount,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ verifyPerformersImageCount(t, imageCountCriterion)
+
+ imageCountCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyPerformersImageCount(t, imageCountCriterion)
+
+ imageCountCriterion.Modifier = models.CriterionModifierGreaterThan
+ verifyPerformersImageCount(t, imageCountCriterion)
+
+ imageCountCriterion.Modifier = models.CriterionModifierLessThan
+ verifyPerformersImageCount(t, imageCountCriterion)
+}
+
+func verifyPerformersImageCount(t *testing.T, imageCountCriterion models.IntCriterionInput) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Performer()
+ performerFilter := models.PerformerFilterType{
+ ImageCount: &imageCountCriterion,
+ }
+
+ performers := queryPerformers(t, sqb, &performerFilter, nil)
+ assert.Greater(t, len(performers), 0)
+
+ for _, performer := range performers {
+ pp := 0
+
+ _, count, err := r.Image().Query(&models.ImageFilterType{
+ Performers: &models.MultiCriterionInput{
+ Value: []string{strconv.Itoa(performer.ID)},
+ Modifier: models.CriterionModifierIncludes,
+ },
+ }, &models.FindFilterType{
+ PerPage: &pp,
+ })
+ if err != nil {
+ return err
+ }
+ verifyInt(t, count, imageCountCriterion)
+ }
+
+ return nil
+ })
+}
+
+func TestPerformerQueryGalleryCount(t *testing.T) {
+ const galleryCount = 1
+ galleryCountCriterion := models.IntCriterionInput{
+ Value: galleryCount,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ verifyPerformersGalleryCount(t, galleryCountCriterion)
+
+ galleryCountCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyPerformersGalleryCount(t, galleryCountCriterion)
+
+ galleryCountCriterion.Modifier = models.CriterionModifierGreaterThan
+ verifyPerformersGalleryCount(t, galleryCountCriterion)
+
+ galleryCountCriterion.Modifier = models.CriterionModifierLessThan
+ verifyPerformersGalleryCount(t, galleryCountCriterion)
+}
+
+func verifyPerformersGalleryCount(t *testing.T, galleryCountCriterion models.IntCriterionInput) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Performer()
+ performerFilter := models.PerformerFilterType{
+ GalleryCount: &galleryCountCriterion,
+ }
+
+ performers := queryPerformers(t, sqb, &performerFilter, nil)
+ assert.Greater(t, len(performers), 0)
+
+ for _, performer := range performers {
+ pp := 0
+
+ _, count, err := r.Gallery().Query(&models.GalleryFilterType{
+ Performers: &models.MultiCriterionInput{
+ Value: []string{strconv.Itoa(performer.ID)},
+ Modifier: models.CriterionModifierIncludes,
+ },
+ }, &models.FindFilterType{
+ PerPage: &pp,
+ })
+ if err != nil {
+ return err
+ }
+ verifyInt(t, count, galleryCountCriterion)
+ }
+
+ return nil
+ })
+}
+
func TestPerformerStashIDs(t *testing.T) {
if err := withTxn(func(r models.Repository) error {
qb := r.Performer()
@@ -353,6 +617,67 @@ func TestPerformerStashIDs(t *testing.T) {
t.Error(err.Error())
}
}
+func TestPerformerQueryRating(t *testing.T) {
+ const rating = 3
+ ratingCriterion := models.IntCriterionInput{
+ Value: rating,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ verifyPerformersRating(t, ratingCriterion)
+
+ ratingCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyPerformersRating(t, ratingCriterion)
+
+ ratingCriterion.Modifier = models.CriterionModifierGreaterThan
+ verifyPerformersRating(t, ratingCriterion)
+
+ ratingCriterion.Modifier = models.CriterionModifierLessThan
+ verifyPerformersRating(t, ratingCriterion)
+
+ ratingCriterion.Modifier = models.CriterionModifierIsNull
+ verifyPerformersRating(t, ratingCriterion)
+
+ ratingCriterion.Modifier = models.CriterionModifierNotNull
+ verifyPerformersRating(t, ratingCriterion)
+}
+
+func verifyPerformersRating(t *testing.T, ratingCriterion models.IntCriterionInput) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Performer()
+ performerFilter := models.PerformerFilterType{
+ Rating: &ratingCriterion,
+ }
+
+ performers := queryPerformers(t, sqb, &performerFilter, nil)
+
+ for _, performer := range performers {
+ verifyInt64(t, performer.Rating, ratingCriterion)
+ }
+
+ return nil
+ })
+}
+
+func TestPerformerQueryIsMissingRating(t *testing.T) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Performer()
+ isMissing := "rating"
+ performerFilter := models.PerformerFilterType{
+ IsMissing: &isMissing,
+ }
+
+ performers := queryPerformers(t, sqb, &performerFilter, nil)
+
+ assert.True(t, len(performers) > 0)
+
+ for _, performer := range performers {
+ assert.True(t, !performer.Rating.Valid)
+ }
+
+ return nil
+ })
+}
// TODO Update
// TODO Destroy
diff --git a/pkg/sqlite/query.go b/pkg/sqlite/query.go
index 82a17cf4f..4c549cdf1 100644
--- a/pkg/sqlite/query.go
+++ b/pkg/sqlite/query.go
@@ -33,6 +33,19 @@ func (qb queryBuilder) executeFind() ([]int, int, error) {
return qb.repository.executeFindQuery(body, qb.args, qb.sortAndPagination, qb.whereClauses, qb.havingClauses)
}
+func (qb queryBuilder) executeCount() (int, error) {
+ if qb.err != nil {
+ return 0, qb.err
+ }
+
+ body := qb.body
+ body += qb.joins.toSQL()
+
+ body = qb.repository.buildQueryBody(body, qb.whereClauses, qb.havingClauses)
+ countQuery := qb.repository.buildCountQuery(body)
+ return qb.repository.runCountQuery(countQuery, qb.args)
+}
+
func (qb *queryBuilder) addWhere(clauses ...string) {
for _, clause := range clauses {
if len(clause) > 0 {
@@ -151,3 +164,15 @@ func (qb *queryBuilder) handleStringCriterionInput(c *models.StringCriterionInpu
}
}
}
+
+func (qb *queryBuilder) handleCountCriterion(countFilter *models.IntCriterionInput, primaryTable, joinTable, primaryFK string) {
+ if countFilter != nil {
+ clause, count := getCountCriterionClause(primaryTable, joinTable, primaryFK, *countFilter)
+
+ if count == 1 {
+ qb.addArg(countFilter.Value)
+ }
+
+ qb.addWhere(clause)
+ }
+}
diff --git a/pkg/sqlite/repository.go b/pkg/sqlite/repository.go
index 681e68376..568d9c30b 100644
--- a/pkg/sqlite/repository.go
+++ b/pkg/sqlite/repository.go
@@ -234,7 +234,7 @@ func (r *repository) querySimple(query string, args []interface{}, out interface
return nil
}
-func (r *repository) executeFindQuery(body string, args []interface{}, sortAndPagination string, whereClauses []string, havingClauses []string) ([]int, int, error) {
+func (r *repository) buildQueryBody(body string, whereClauses []string, havingClauses []string) string {
if len(whereClauses) > 0 {
body = body + " WHERE " + strings.Join(whereClauses, " AND ") // TODO handle AND or OR
}
@@ -243,6 +243,12 @@ func (r *repository) executeFindQuery(body string, args []interface{}, sortAndPa
body = body + " HAVING " + strings.Join(havingClauses, " AND ") // TODO handle AND or OR
}
+ return body
+}
+
+func (r *repository) executeFindQuery(body string, args []interface{}, sortAndPagination string, whereClauses []string, havingClauses []string) ([]int, int, error) {
+ body = r.buildQueryBody(body, whereClauses, havingClauses)
+
countQuery := r.buildCountQuery(body)
idsQuery := body + sortAndPagination
diff --git a/pkg/sqlite/scene.go b/pkg/sqlite/scene.go
index 8dd954322..c3780a573 100644
--- a/pkg/sqlite/scene.go
+++ b/pkg/sqlite/scene.go
@@ -4,9 +4,11 @@ import (
"database/sql"
"fmt"
"strconv"
+ "strings"
"github.com/jmoiron/sqlx"
"github.com/stashapp/stash/pkg/models"
+ "github.com/stashapp/stash/pkg/utils"
)
const sceneTable = "scenes"
@@ -61,6 +63,20 @@ SELECT id FROM scenes
WHERE scenes.oshash is null
`
+var findExactDuplicateQuery = `
+SELECT GROUP_CONCAT(id) as ids
+FROM scenes
+WHERE phash IS NOT NULL
+GROUP BY phash
+HAVING COUNT(*) > 1;
+`
+
+var findAllPhashesQuery = `
+SELECT id, phash
+FROM scenes
+WHERE phash IS NOT NULL
+`
+
type sceneQueryBuilder struct {
repository
}
@@ -286,7 +302,7 @@ func (qb *sceneQueryBuilder) Wall(q *string) ([]*models.Scene, error) {
}
func (qb *sceneQueryBuilder) All() ([]*models.Scene, error) {
- return qb.queryScenes(selectAll(sceneTable)+qb.getSceneSort(nil), nil)
+ return qb.queryScenes(selectAll(sceneTable)+qb.getDefaultSceneSort(), nil)
}
func illegalFilterCombination(type1, type2 string) error {
@@ -345,12 +361,15 @@ func (qb *sceneQueryBuilder) makeFilter(sceneFilter *models.SceneFilterType) *fi
query.handleCriterionFunc(resolutionCriterionHandler(sceneFilter.Resolution, "scenes.height", "scenes.width"))
query.handleCriterionFunc(hasMarkersCriterionHandler(sceneFilter.HasMarkers))
query.handleCriterionFunc(sceneIsMissingCriterionHandler(qb, sceneFilter.IsMissing))
+ query.handleCriterionFunc(stringCriterionHandler(sceneFilter.URL, "scenes.url"))
+ query.handleCriterionFunc(stringCriterionHandler(sceneFilter.StashID, "scene_stash_ids.stash_id"))
query.handleCriterionFunc(sceneTagsCriterionHandler(qb, sceneFilter.Tags))
+ query.handleCriterionFunc(sceneTagCountCriterionHandler(qb, sceneFilter.TagCount))
query.handleCriterionFunc(scenePerformersCriterionHandler(qb, sceneFilter.Performers))
+ query.handleCriterionFunc(scenePerformerCountCriterionHandler(qb, sceneFilter.PerformerCount))
query.handleCriterionFunc(sceneStudioCriterionHandler(qb, sceneFilter.Studios))
query.handleCriterionFunc(sceneMoviesCriterionHandler(qb, sceneFilter.Movies))
- query.handleCriterionFunc(sceneStashIDsHandler(qb, sceneFilter.StashID))
query.handleCriterionFunc(scenePerformerTagsCriterionHandler(qb, sceneFilter.PerformerTags))
return query
@@ -381,9 +400,14 @@ func (qb *sceneQueryBuilder) Query(sceneFilter *models.SceneFilterType, findFilt
}
filter := qb.makeFilter(sceneFilter)
+ if sceneFilter.StashID != nil {
+ qb.stashIDRepository().join(filter, "scene_stash_ids", "scenes.id")
+ }
+
query.addFilter(filter)
- query.sortAndPagination = qb.getSceneSort(findFilter) + getPagination(findFilter)
+ qb.setSceneSort(&query, findFilter)
+ query.sortAndPagination += getPagination(findFilter)
idsResult, countResult, err := query.executeFind()
if err != nil {
@@ -499,9 +523,6 @@ func sceneIsMissingCriterionHandler(qb *sceneQueryBuilder, isMissing *string) cr
case "tags":
qb.tagsRepository().join(f, "tags_join", "scenes.id")
f.addWhere("tags_join.scene_id IS NULL")
- case "stash_id":
- qb.stashIDRepository().join(f, "scene_stash_ids", "scenes.id")
- f.addWhere("scene_stash_ids.scene_id IS NULL")
default:
f.addWhere("(scenes." + *isMissing + " IS NULL OR TRIM(scenes." + *isMissing + ") = '')")
}
@@ -519,6 +540,7 @@ func (qb *sceneQueryBuilder) getMultiCriterionHandlerBuilder(foreignTable, joinT
addJoinsFunc: addJoinsFunc,
}
}
+
func sceneTagsCriterionHandler(qb *sceneQueryBuilder, tags *models.MultiCriterionInput) criterionHandlerFunc {
addJoinsFunc := func(f *filterBuilder) {
qb.tagsRepository().join(f, "tags_join", "scenes.id")
@@ -529,16 +551,42 @@ func sceneTagsCriterionHandler(qb *sceneQueryBuilder, tags *models.MultiCriterio
return h.handler(tags)
}
-func scenePerformersCriterionHandler(qb *sceneQueryBuilder, performers *models.MultiCriterionInput) criterionHandlerFunc {
- addJoinsFunc := func(f *filterBuilder) {
- qb.performersRepository().join(f, "performers_join", "scenes.id")
- f.addJoin("performers", "", "performers_join.performer_id = performers.id")
+func sceneTagCountCriterionHandler(qb *sceneQueryBuilder, tagCount *models.IntCriterionInput) criterionHandlerFunc {
+ h := countCriterionHandlerBuilder{
+ primaryTable: sceneTable,
+ joinTable: scenesTagsTable,
+ primaryFK: sceneIDColumn,
+ }
+
+ return h.handler(tagCount)
+}
+
+func scenePerformersCriterionHandler(qb *sceneQueryBuilder, performers *models.MultiCriterionInput) criterionHandlerFunc {
+ h := joinedMultiCriterionHandlerBuilder{
+ primaryTable: sceneTable,
+ joinTable: performersScenesTable,
+ joinAs: "performers_join",
+ primaryFK: sceneIDColumn,
+ foreignFK: performerIDColumn,
+
+ addJoinTable: func(f *filterBuilder) {
+ qb.performersRepository().join(f, "performers_join", "scenes.id")
+ },
}
- h := qb.getMultiCriterionHandlerBuilder(performerTable, performersScenesTable, performerIDColumn, addJoinsFunc)
return h.handler(performers)
}
+func scenePerformerCountCriterionHandler(qb *sceneQueryBuilder, performerCount *models.IntCriterionInput) criterionHandlerFunc {
+ h := countCriterionHandlerBuilder{
+ primaryTable: sceneTable,
+ joinTable: performersScenesTable,
+ primaryFK: sceneIDColumn,
+ }
+
+ return h.handler(performerCount)
+}
+
func sceneStudioCriterionHandler(qb *sceneQueryBuilder, studios *models.MultiCriterionInput) criterionHandlerFunc {
addJoinsFunc := func(f *filterBuilder) {
f.addJoin("studios", "studio", "studio.id = scenes.studio_id")
@@ -557,15 +605,6 @@ func sceneMoviesCriterionHandler(qb *sceneQueryBuilder, movies *models.MultiCrit
return h.handler(movies)
}
-func sceneStashIDsHandler(qb *sceneQueryBuilder, stashID *string) criterionHandlerFunc {
- return func(f *filterBuilder) {
- if stashID != nil && *stashID != "" {
- qb.stashIDRepository().join(f, "scene_stash_ids", "scenes.id")
- stringLiteralCriterionHandler(stashID, "scene_stash_ids.stash_id")(f)
- }
- }
-}
-
func scenePerformerTagsCriterionHandler(qb *sceneQueryBuilder, performerTagsFilter *models.MultiCriterionInput) criterionHandlerFunc {
return func(f *filterBuilder) {
if performerTagsFilter != nil && len(performerTagsFilter.Value) > 0 {
@@ -585,8 +624,8 @@ func scenePerformerTagsCriterionHandler(qb *sceneQueryBuilder, performerTagsFilt
f.addWhere("performer_tags_join.tag_id IN "+getInBinding(len(performerTagsFilter.Value)), args...)
f.addHaving(fmt.Sprintf("count(distinct performer_tags_join.tag_id) IS %d", len(performerTagsFilter.Value)))
} else if performerTagsFilter.Modifier == models.CriterionModifierExcludes {
- f.addWhere(fmt.Sprintf(`not exists
- (select performers_scenes.performer_id from performers_scenes
+ f.addWhere(fmt.Sprintf(`not exists
+ (select performers_scenes.performer_id from performers_scenes
left join performers_tags on performers_tags.performer_id = performers_scenes.performer_id where
performers_scenes.scene_id = scenes.id AND
performers_tags.tag_id in %s)`, getInBinding(len(performerTagsFilter.Value))), args...)
@@ -611,8 +650,8 @@ func handleScenePerformerTagsCriterion(query *queryBuilder, performerTagsFilter
query.addWhere("performer_tags_join.tag_id IN " + getInBinding(len(performerTagsFilter.Value)))
query.addHaving(fmt.Sprintf("count(distinct performer_tags_join.tag_id) IS %d", len(performerTagsFilter.Value)))
} else if performerTagsFilter.Modifier == models.CriterionModifierExcludes {
- query.addWhere(fmt.Sprintf(`not exists
- (select performers_scenes.performer_id from performers_scenes
+ query.addWhere(fmt.Sprintf(`not exists
+ (select performers_scenes.performer_id from performers_scenes
left join performers_tags on performers_tags.performer_id = performers_scenes.performer_id where
performers_scenes.scene_id = scenes.id AND
performers_tags.tag_id in %s)`, getInBinding(len(performerTagsFilter.Value))))
@@ -620,13 +659,28 @@ func handleScenePerformerTagsCriterion(query *queryBuilder, performerTagsFilter
}
}
-func (qb *sceneQueryBuilder) getSceneSort(findFilter *models.FindFilterType) string {
+func (qb *sceneQueryBuilder) getDefaultSceneSort() string {
+ return " ORDER BY scenes.path, scenes.date ASC "
+}
+
+func (qb *sceneQueryBuilder) setSceneSort(query *queryBuilder, findFilter *models.FindFilterType) {
if findFilter == nil {
- return " ORDER BY scenes.path, scenes.date ASC "
+ query.sortAndPagination += qb.getDefaultSceneSort()
+ return
}
sort := findFilter.GetSort("title")
direction := findFilter.GetDirection()
- return getSort(sort, direction, "scenes")
+ switch sort {
+ case "movie_scene_number":
+ query.join(moviesScenesTable, "movies_join", "scenes.id")
+ query.sortAndPagination += fmt.Sprintf(" ORDER BY movies_join.scene_index %s", getSortDirection(direction))
+ case "tag_count":
+ query.sortAndPagination += getCountSort(sceneTable, scenesTagsTable, sceneIDColumn, direction)
+ case "performer_count":
+ query.sortAndPagination += getCountSort(sceneTable, performersScenesTable, sceneIDColumn, direction)
+ default:
+ query.sortAndPagination += getSort(sort, direction, "scenes")
+ }
}
func (qb *sceneQueryBuilder) queryScene(query string, args []interface{}) (*models.Scene, error) {
@@ -787,3 +841,51 @@ func (qb *sceneQueryBuilder) GetStashIDs(sceneID int) ([]*models.StashID, error)
func (qb *sceneQueryBuilder) UpdateStashIDs(sceneID int, stashIDs []models.StashID) error {
return qb.stashIDRepository().replace(sceneID, stashIDs)
}
+
+func (qb *sceneQueryBuilder) FindDuplicates(distance int) ([][]*models.Scene, error) {
+ var dupeIds [][]int
+ if distance == 0 {
+ var ids []string
+ if err := qb.tx.Select(&ids, findExactDuplicateQuery); err != nil {
+ return nil, err
+ }
+
+ for _, id := range ids {
+ strIds := strings.Split(id, ",")
+ var sceneIds []int
+ for _, strId := range strIds {
+ if intId, err := strconv.Atoi(strId); err == nil {
+ sceneIds = append(sceneIds, intId)
+ }
+ }
+ dupeIds = append(dupeIds, sceneIds)
+ }
+ } else {
+ var hashes []*utils.Phash
+
+ if err := qb.queryFunc(findAllPhashesQuery, nil, func(rows *sqlx.Rows) error {
+ phash := utils.Phash{
+ Bucket: -1,
+ }
+ if err := rows.StructScan(&phash); err != nil {
+ return err
+ }
+
+ hashes = append(hashes, &phash)
+ return nil
+ }); err != nil {
+ return nil, err
+ }
+
+ dupeIds = utils.FindDuplicates(hashes, distance)
+ }
+
+ var duplicates [][]*models.Scene
+ for _, sceneIds := range dupeIds {
+ if scenes, err := qb.FindMany(sceneIds); err == nil {
+ duplicates = append(duplicates, scenes)
+ }
+ }
+
+ return duplicates, nil
+}
diff --git a/pkg/sqlite/scene_test.go b/pkg/sqlite/scene_test.go
index ac34403fb..c0c36922f 100644
--- a/pkg/sqlite/scene_test.go
+++ b/pkg/sqlite/scene_test.go
@@ -187,6 +187,44 @@ func TestSceneQueryPath(t *testing.T) {
verifyScenesPath(t, pathCriterion)
}
+func TestSceneQueryURL(t *testing.T) {
+ const sceneIdx = 1
+ scenePath := getSceneStringValue(sceneIdx, urlField)
+
+ urlCriterion := models.StringCriterionInput{
+ Value: scenePath,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ filter := models.SceneFilterType{
+ URL: &urlCriterion,
+ }
+
+ verifyFn := func(s *models.Scene) {
+ t.Helper()
+ verifyNullString(t, s.URL, urlCriterion)
+ }
+
+ verifySceneQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierNotEquals
+ verifySceneQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierMatchesRegex
+ urlCriterion.Value = "scene_.*1_URL"
+ verifySceneQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierNotMatchesRegex
+ verifySceneQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierIsNull
+ urlCriterion.Value = ""
+ verifySceneQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierNotNull
+ verifySceneQuery(t, filter, verifyFn)
+}
+
func TestSceneQueryPathOr(t *testing.T) {
const scene1Idx = 1
const scene2Idx = 2
@@ -324,6 +362,24 @@ func TestSceneIllegalQuery(t *testing.T) {
})
}
+func verifySceneQuery(t *testing.T, filter models.SceneFilterType, verifyFn func(s *models.Scene)) {
+ withTxn(func(r models.Repository) error {
+ t.Helper()
+ sqb := r.Scene()
+
+ scenes := queryScene(t, sqb, &filter, nil)
+
+ // assume it should find at least one
+ assert.Greater(t, len(scenes), 0)
+
+ for _, scene := range scenes {
+ verifyFn(scene)
+ }
+
+ return nil
+ })
+}
+
func verifyScenesPath(t *testing.T, pathCriterion models.StringCriterionInput) {
withTxn(func(r models.Repository) error {
sqb := r.Scene()
@@ -345,10 +401,15 @@ func verifyNullString(t *testing.T, value sql.NullString, criterion models.Strin
t.Helper()
assert := assert.New(t)
if criterion.Modifier == models.CriterionModifierIsNull {
+ if value.Valid && value.String == "" {
+ // correct
+ return
+ }
assert.False(value.Valid, "expect is null values to be null")
}
if criterion.Modifier == models.CriterionModifierNotNull {
assert.True(value.Valid, "expect is null values to be null")
+ assert.Greater(len(value.String), 0)
}
if criterion.Modifier == models.CriterionModifierEquals {
assert.Equal(criterion.Value, value.String)
@@ -497,10 +558,10 @@ func verifyInt(t *testing.T, value int, criterion models.IntCriterionInput) {
assert.NotEqual(criterion.Value, value)
}
if criterion.Modifier == models.CriterionModifierGreaterThan {
- assert.True(value > criterion.Value)
+ assert.Greater(value, criterion.Value)
}
if criterion.Modifier == models.CriterionModifierLessThan {
- assert.True(value < criterion.Value)
+ assert.Less(value, criterion.Value)
}
}
@@ -1103,7 +1164,7 @@ func TestSceneQuerySorting(t *testing.T) {
lastScene := scenes[len(scenes)-1]
assert.Equal(t, sceneIDs[0], firstScene.ID)
- assert.Equal(t, sceneIDs[len(sceneIDs)-1], lastScene.ID)
+ assert.Equal(t, sceneIDs[sceneIdxWithSpacedName], lastScene.ID)
// sort in descending order
direction = models.SortDirectionEnumDesc
@@ -1112,7 +1173,7 @@ func TestSceneQuerySorting(t *testing.T) {
firstScene = scenes[0]
lastScene = scenes[len(scenes)-1]
- assert.Equal(t, sceneIDs[len(sceneIDs)-1], firstScene.ID)
+ assert.Equal(t, sceneIDs[sceneIdxWithSpacedName], firstScene.ID)
assert.Equal(t, sceneIDs[0], lastScene.ID)
return nil
@@ -1153,6 +1214,88 @@ func TestSceneQueryPagination(t *testing.T) {
})
}
+func TestSceneQueryTagCount(t *testing.T) {
+ const tagCount = 1
+ tagCountCriterion := models.IntCriterionInput{
+ Value: tagCount,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ verifyScenesTagCount(t, tagCountCriterion)
+
+ tagCountCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyScenesTagCount(t, tagCountCriterion)
+
+ tagCountCriterion.Modifier = models.CriterionModifierGreaterThan
+ verifyScenesTagCount(t, tagCountCriterion)
+
+ tagCountCriterion.Modifier = models.CriterionModifierLessThan
+ verifyScenesTagCount(t, tagCountCriterion)
+}
+
+func verifyScenesTagCount(t *testing.T, tagCountCriterion models.IntCriterionInput) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Scene()
+ sceneFilter := models.SceneFilterType{
+ TagCount: &tagCountCriterion,
+ }
+
+ scenes := queryScene(t, sqb, &sceneFilter, nil)
+ assert.Greater(t, len(scenes), 0)
+
+ for _, scene := range scenes {
+ ids, err := sqb.GetTagIDs(scene.ID)
+ if err != nil {
+ return err
+ }
+ verifyInt(t, len(ids), tagCountCriterion)
+ }
+
+ return nil
+ })
+}
+
+func TestSceneQueryPerformerCount(t *testing.T) {
+ const performerCount = 1
+ performerCountCriterion := models.IntCriterionInput{
+ Value: performerCount,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ verifyScenesPerformerCount(t, performerCountCriterion)
+
+ performerCountCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyScenesPerformerCount(t, performerCountCriterion)
+
+ performerCountCriterion.Modifier = models.CriterionModifierGreaterThan
+ verifyScenesPerformerCount(t, performerCountCriterion)
+
+ performerCountCriterion.Modifier = models.CriterionModifierLessThan
+ verifyScenesPerformerCount(t, performerCountCriterion)
+}
+
+func verifyScenesPerformerCount(t *testing.T, performerCountCriterion models.IntCriterionInput) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Scene()
+ sceneFilter := models.SceneFilterType{
+ PerformerCount: &performerCountCriterion,
+ }
+
+ scenes := queryScene(t, sqb, &sceneFilter, nil)
+ assert.Greater(t, len(scenes), 0)
+
+ for _, scene := range scenes {
+ ids, err := sqb.GetPerformerIDs(scene.ID)
+ if err != nil {
+ return err
+ }
+ verifyInt(t, len(ids), performerCountCriterion)
+ }
+
+ return nil
+ })
+}
+
func TestSceneCountByTagID(t *testing.T) {
withTxn(func(r models.Repository) error {
sqb := r.Scene()
@@ -1376,6 +1519,49 @@ func TestSceneStashIDs(t *testing.T) {
}
}
+func TestSceneQueryQTrim(t *testing.T) {
+ if err := withTxn(func(r models.Repository) error {
+ qb := r.Scene()
+
+ expectedID := sceneIDs[sceneIdxWithSpacedName]
+
+ type test struct {
+ query string
+ id int
+ count int
+ }
+ tests := []test{
+ {query: " zzz yyy ", id: expectedID, count: 1},
+ {query: " \"zzz yyy xxx\" ", id: expectedID, count: 1},
+ {query: "zzz", id: expectedID, count: 1},
+ {query: "\" zzz yyy \"", count: 0},
+ {query: "\"zzz yyy\"", count: 0},
+ {query: "\" zzz yyy\"", count: 0},
+ {query: "\"zzz yyy \"", count: 0},
+ }
+
+ for _, tst := range tests {
+ f := models.FindFilterType{
+ Q: &tst.query,
+ }
+ scenes := queryScene(t, qb, nil, &f)
+
+ assert.Len(t, scenes, tst.count)
+ if len(scenes) > 0 {
+ assert.Equal(t, tst.id, scenes[0].ID)
+ }
+ }
+
+ findFilter := models.FindFilterType{}
+ scenes := queryScene(t, qb, nil, &findFilter)
+ assert.NotEqual(t, 0, len(scenes))
+
+ return nil
+ }); err != nil {
+ t.Error(err.Error())
+ }
+}
+
// TODO Update
// TODO IncrementOCounter
// TODO DecrementOCounter
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index 323bb113c..a3abf2dc1 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -20,17 +20,26 @@ import (
"github.com/stashapp/stash/pkg/utils"
)
+const (
+ spacedSceneTitle = "zzz yyy xxx"
+)
+
const (
sceneIdxWithMovie = iota
sceneIdxWithGallery
sceneIdxWithPerformer
+ sceneIdx1WithPerformer
+ sceneIdx2WithPerformer
sceneIdxWithTwoPerformers
sceneIdxWithTag
sceneIdxWithTwoTags
sceneIdxWithStudio
+ sceneIdx1WithStudio
+ sceneIdx2WithStudio
sceneIdxWithMarker
sceneIdxWithPerformerTag
sceneIdxWithPerformerTwoTags
+ sceneIdxWithSpacedName
// new indexes above
lastSceneIdx
@@ -39,11 +48,18 @@ const (
const (
imageIdxWithGallery = iota
+ imageIdx1WithGallery
+ imageIdx2WithGallery
+ imageIdxWithTwoGalleries
imageIdxWithPerformer
+ imageIdx1WithPerformer
+ imageIdx2WithPerformer
imageIdxWithTwoPerformers
imageIdxWithTag
imageIdxWithTwoTags
imageIdxWithStudio
+ imageIdx1WithStudio
+ imageIdx2WithStudio
imageIdxInZip // TODO - not implemented
imageIdxWithPerformerTag
imageIdxWithPerformerTwoTags
@@ -55,12 +71,15 @@ const (
performerIdxWithScene = iota
performerIdx1WithScene
performerIdx2WithScene
+ performerIdxWithTwoScenes
performerIdxWithImage
+ performerIdxWithTwoImages
performerIdx1WithImage
performerIdx2WithImage
performerIdxWithTag
performerIdxWithTwoTags
performerIdxWithGallery
+ performerIdxWithTwoGalleries
performerIdx1WithGallery
performerIdx2WithGallery
// new indexes above
@@ -76,7 +95,8 @@ const (
movieIdxWithScene = iota
movieIdxWithStudio
// movies with dup names start from the end
- movieIdxWithDupName
+ // create 10 more basic movies (can remove this if we add more indexes)
+ movieIdxWithDupName = movieIdxWithStudio + 10
moviesNameCase = movieIdxWithDupName
moviesNameNoCase = 1
@@ -85,11 +105,18 @@ const (
const (
galleryIdxWithScene = iota
galleryIdxWithImage
+ galleryIdx1WithImage
+ galleryIdx2WithImage
+ galleryIdxWithTwoImages
galleryIdxWithPerformer
+ galleryIdx1WithPerformer
+ galleryIdx2WithPerformer
galleryIdxWithTwoPerformers
galleryIdxWithTag
galleryIdxWithTwoTags
galleryIdxWithStudio
+ galleryIdx1WithStudio
+ galleryIdx2WithStudio
galleryIdxWithPerformerTag
galleryIdxWithPerformerTwoTags
// new indexes above
@@ -125,11 +152,14 @@ const (
const (
studioIdxWithScene = iota
+ studioIdxWithTwoScenes
studioIdxWithMovie
studioIdxWithChildStudio
studioIdxWithParentStudio
studioIdxWithImage
+ studioIdxWithTwoImages
studioIdxWithGallery
+ studioIdxWithTwoGalleries
// new indexes above
// studios with dup names start from the end
studioIdxWithDupName
@@ -146,6 +176,7 @@ const (
pathField = "Path"
checksumField = "Checksum"
titleField = "Title"
+ urlField = "URL"
zipPath = "zipPath.zip"
)
@@ -183,6 +214,8 @@ var (
{sceneIdxWithTwoPerformers, performerIdx2WithScene},
{sceneIdxWithPerformerTag, performerIdxWithTag},
{sceneIdxWithPerformerTwoTags, performerIdxWithTwoTags},
+ {sceneIdx1WithPerformer, performerIdxWithTwoScenes},
+ {sceneIdx2WithPerformer, performerIdxWithTwoScenes},
}
sceneGalleryLinks = [][2]int{
@@ -195,15 +228,23 @@ var (
sceneStudioLinks = [][2]int{
{sceneIdxWithStudio, studioIdxWithScene},
+ {sceneIdx1WithStudio, studioIdxWithTwoScenes},
+ {sceneIdx2WithStudio, studioIdxWithTwoScenes},
}
)
var (
imageGalleryLinks = [][2]int{
{imageIdxWithGallery, galleryIdxWithImage},
+ {imageIdx1WithGallery, galleryIdxWithTwoImages},
+ {imageIdx2WithGallery, galleryIdxWithTwoImages},
+ {imageIdxWithTwoGalleries, galleryIdx1WithImage},
+ {imageIdxWithTwoGalleries, galleryIdx2WithImage},
}
imageStudioLinks = [][2]int{
{imageIdxWithStudio, studioIdxWithImage},
+ {imageIdx1WithStudio, studioIdxWithTwoImages},
+ {imageIdx2WithStudio, studioIdxWithTwoImages},
}
imageTagLinks = [][2]int{
{imageIdxWithTag, tagIdxWithImage},
@@ -216,6 +257,8 @@ var (
{imageIdxWithTwoPerformers, performerIdx2WithImage},
{imageIdxWithPerformerTag, performerIdxWithTag},
{imageIdxWithPerformerTwoTags, performerIdxWithTwoTags},
+ {imageIdx1WithPerformer, performerIdxWithTwoImages},
+ {imageIdx2WithPerformer, performerIdxWithTwoImages},
}
)
@@ -226,6 +269,14 @@ var (
{galleryIdxWithTwoPerformers, performerIdx2WithGallery},
{galleryIdxWithPerformerTag, performerIdxWithTag},
{galleryIdxWithPerformerTwoTags, performerIdxWithTwoTags},
+ {galleryIdx1WithPerformer, performerIdxWithTwoGalleries},
+ {galleryIdx2WithPerformer, performerIdxWithTwoGalleries},
+ }
+
+ galleryStudioLinks = [][2]int{
+ {galleryIdxWithStudio, studioIdxWithGallery},
+ {galleryIdx1WithStudio, studioIdxWithTwoGalleries},
+ {galleryIdx2WithStudio, studioIdxWithTwoGalleries},
}
galleryTagLinks = [][2]int{
@@ -391,8 +442,8 @@ func populateDB() error {
return fmt.Errorf("error linking gallery tags: %s", err.Error())
}
- if err := linkGalleryStudio(r.Gallery(), galleryIdxWithStudio, studioIdxWithGallery); err != nil {
- return fmt.Errorf("error linking gallery studio: %s", err.Error())
+ if err := linkGalleryStudios(r.Gallery()); err != nil {
+ return fmt.Errorf("error linking gallery studios: %s", err.Error())
}
if err := createMarker(r.SceneMarker(), sceneIdxWithMarker, tagIdxWithPrimaryMarker, []int{tagIdxWithMarker}); err != nil {
@@ -407,8 +458,41 @@ func populateDB() error {
return nil
}
+func getPrefixedStringValue(prefix string, index int, field string) string {
+ return fmt.Sprintf("%s_%04d_%s", prefix, index, field)
+}
+
+func getPrefixedNullStringValue(prefix string, index int, field string) sql.NullString {
+ if index > 0 && index%5 == 0 {
+ return sql.NullString{}
+ }
+ if index > 0 && index%6 == 0 {
+ return sql.NullString{
+ String: "",
+ Valid: true,
+ }
+ }
+ return sql.NullString{
+ String: getPrefixedStringValue(prefix, index, field),
+ Valid: true,
+ }
+}
+
func getSceneStringValue(index int, field string) string {
- return fmt.Sprintf("scene_%04d_%s", index, field)
+ return getPrefixedStringValue("scene", index, field)
+}
+
+func getSceneNullStringValue(index int, field string) sql.NullString {
+ return getPrefixedNullStringValue("scene", index, field)
+}
+
+func getSceneTitle(index int) string {
+ switch index {
+ case sceneIdxWithSpacedName:
+ return spacedSceneTitle
+ default:
+ return getSceneStringValue(index, titleField)
+ }
}
func getRating(index int) sql.NullInt64 {
@@ -439,6 +523,14 @@ func getHeight(index int) sql.NullInt64 {
}
}
+func getWidth(index int) sql.NullInt64 {
+ height := getHeight(index)
+ return sql.NullInt64{
+ Int64: height.Int64 * 2,
+ Valid: height.Valid,
+ }
+}
+
func getSceneDate(index int) models.SQLiteDate {
dates := []string{"null", "", "0001-01-01", "2001-02-03"}
date := dates[index%len(dates)]
@@ -452,9 +544,10 @@ func createScenes(sqb models.SceneReaderWriter, n int) error {
for i := 0; i < n; i++ {
scene := models.Scene{
Path: getSceneStringValue(i, pathField),
- Title: sql.NullString{String: getSceneStringValue(i, titleField), Valid: true},
+ Title: sql.NullString{String: getSceneTitle(i), Valid: true},
Checksum: sql.NullString{String: getSceneStringValue(i, checksumField), Valid: true},
Details: sql.NullString{String: getSceneStringValue(i, "Details"), Valid: true},
+ URL: getSceneNullStringValue(i, urlField),
Rating: getRating(i),
OCounter: getOCounter(i),
Duration: getSceneDuration(i),
@@ -496,6 +589,7 @@ func createImages(qb models.ImageReaderWriter, n int) error {
Rating: getRating(i),
OCounter: getOCounter(i),
Height: getHeight(i),
+ Width: getWidth(i),
}
created, err := qb.Create(image)
@@ -511,14 +605,20 @@ func createImages(qb models.ImageReaderWriter, n int) error {
}
func getGalleryStringValue(index int, field string) string {
- return "gallery_" + strconv.FormatInt(int64(index), 10) + "_" + field
+ return getPrefixedStringValue("gallery", index, field)
+}
+
+func getGalleryNullStringValue(index int, field string) sql.NullString {
+ return getPrefixedNullStringValue("gallery", index, field)
}
func createGalleries(gqb models.GalleryReaderWriter, n int) error {
for i := 0; i < n; i++ {
gallery := models.Gallery{
Path: models.NullString(getGalleryStringValue(i, pathField)),
+ URL: getGalleryNullStringValue(i, urlField),
Checksum: getGalleryStringValue(i, checksumField),
+ Rating: getRating(i),
}
created, err := gqb.Create(gallery)
@@ -534,10 +634,14 @@ func createGalleries(gqb models.GalleryReaderWriter, n int) error {
}
func getMovieStringValue(index int, field string) string {
- return "movie_" + strconv.FormatInt(int64(index), 10) + "_" + field
+ return getPrefixedStringValue("movie", index, field)
}
-//createMoviees creates n movies with plain Name and o movies with camel cased NaMe included
+func getMovieNullStringValue(index int, field string) sql.NullString {
+ return getPrefixedNullStringValue("movie", index, field)
+}
+
+// createMoviees creates n movies with plain Name and o movies with camel cased NaMe included
func createMovies(mqb models.MovieReaderWriter, n int, o int) error {
const namePlain = "Name"
const nameNoCase = "NaMe"
@@ -555,6 +659,7 @@ func createMovies(mqb models.MovieReaderWriter, n int, o int) error {
name = getMovieStringValue(index, name)
movie := models.Movie{
Name: sql.NullString{String: name, Valid: true},
+ URL: getMovieNullStringValue(index, urlField),
Checksum: utils.MD5FromString(name),
}
@@ -572,7 +677,11 @@ func createMovies(mqb models.MovieReaderWriter, n int, o int) error {
}
func getPerformerStringValue(index int, field string) string {
- return "performer_" + strconv.FormatInt(int64(index), 10) + "_" + field
+ return getPrefixedStringValue("performer", index, field)
+}
+
+func getPerformerNullStringValue(index int, field string) sql.NullString {
+ return getPrefixedNullStringValue("performer", index, field)
}
func getPerformerBoolValue(index int) bool {
@@ -587,6 +696,19 @@ func getPerformerBirthdate(index int) string {
return birthdate.Format("2006-01-02")
}
+func getPerformerDeathDate(index int) models.SQLiteDate {
+ if index != 5 {
+ return models.SQLiteDate{}
+ }
+
+ deathDate := time.Now()
+ deathDate = deathDate.AddDate(-index+1, -1, -1)
+ return models.SQLiteDate{
+ String: deathDate.Format("2006-01-02"),
+ Valid: true,
+ }
+}
+
func getPerformerCareerLength(index int) *string {
if index%5 == 0 {
return nil
@@ -596,7 +718,7 @@ func getPerformerCareerLength(index int) *string {
return &ret
}
-//createPerformers creates n performers with plain Name and o performers with camel cased NaMe included
+// createPerformers creates n performers with plain Name and o performers with camel cased NaMe included
func createPerformers(pqb models.PerformerReaderWriter, n int, o int) error {
const namePlain = "Name"
const nameNoCase = "NaMe"
@@ -615,11 +737,14 @@ func createPerformers(pqb models.PerformerReaderWriter, n int, o int) error {
performer := models.Performer{
Name: sql.NullString{String: getPerformerStringValue(index, name), Valid: true},
Checksum: getPerformerStringValue(i, checksumField),
+ URL: getPerformerNullStringValue(i, urlField),
Favorite: sql.NullBool{Bool: getPerformerBoolValue(i), Valid: true},
Birthdate: models.SQLiteDate{
String: getPerformerBirthdate(i),
Valid: true,
},
+ DeathDate: getPerformerDeathDate(i),
+ Details: sql.NullString{String: getPerformerStringValue(i, "Details"), Valid: true},
}
careerLength := getPerformerCareerLength(i)
@@ -718,7 +843,11 @@ func createTags(tqb models.TagReaderWriter, n int, o int) error {
}
func getStudioStringValue(index int, field string) string {
- return "studio_" + strconv.FormatInt(int64(index), 10) + "_" + field
+ return getPrefixedStringValue("studio", index, field)
+}
+
+func getStudioNullStringValue(index int, field string) sql.NullString {
+ return getPrefixedNullStringValue("studio", index, field)
}
func createStudio(sqb models.StudioReaderWriter, name string, parentID *int64) (*models.Studio, error) {
@@ -731,6 +860,10 @@ func createStudio(sqb models.StudioReaderWriter, name string, parentID *int64) (
studio.ParentID = sql.NullInt64{Int64: *parentID, Valid: true}
}
+ return createStudioFromModel(sqb, studio)
+}
+
+func createStudioFromModel(sqb models.StudioReaderWriter, studio models.Studio) (*models.Studio, error) {
created, err := sqb.Create(studio)
if err != nil {
@@ -740,7 +873,7 @@ func createStudio(sqb models.StudioReaderWriter, name string, parentID *int64) (
return created, nil
}
-//createStudios creates n studios with plain Name and o studios with camel cased NaMe included
+// createStudios creates n studios with plain Name and o studios with camel cased NaMe included
func createStudios(sqb models.StudioReaderWriter, n int, o int) error {
const namePlain = "Name"
const nameNoCase = "NaMe"
@@ -756,7 +889,12 @@ func createStudios(sqb models.StudioReaderWriter, n int, o int) error {
// studios [ i ] and [ n + o - i - 1 ] should have similar names with only the Name!=NaMe part different
name = getStudioStringValue(index, name)
- created, err := createStudio(sqb, name, nil)
+ studio := models.Studio{
+ Name: sql.NullString{String: name, Valid: true},
+ Checksum: utils.MD5FromString(name),
+ URL: getStudioNullStringValue(index, urlField),
+ }
+ created, err := createStudioFromModel(sqb, studio)
if err != nil {
return err
@@ -918,7 +1056,7 @@ func linkImagePerformers(qb models.ImageReaderWriter) error {
func linkGalleryPerformers(qb models.GalleryReaderWriter) error {
return doLinks(galleryPerformerLinks, func(galleryIndex, performerIndex int) error {
- galleryID := imageIDs[galleryIndex]
+ galleryID := galleryIDs[galleryIndex]
performers, err := qb.GetPerformerIDs(galleryID)
if err != nil {
return err
@@ -930,17 +1068,29 @@ func linkGalleryPerformers(qb models.GalleryReaderWriter) error {
})
}
-func linkGalleryTags(iqb models.GalleryReaderWriter) error {
+func linkGalleryStudios(qb models.GalleryReaderWriter) error {
+ return doLinks(galleryStudioLinks, func(galleryIndex, studioIndex int) error {
+ gallery := models.GalleryPartial{
+ ID: galleryIDs[galleryIndex],
+ StudioID: &sql.NullInt64{Int64: int64(studioIDs[studioIndex]), Valid: true},
+ }
+ _, err := qb.UpdatePartial(gallery)
+
+ return err
+ })
+}
+
+func linkGalleryTags(qb models.GalleryReaderWriter) error {
return doLinks(galleryTagLinks, func(galleryIndex, tagIndex int) error {
- galleryID := imageIDs[galleryIndex]
- tags, err := iqb.GetTagIDs(galleryID)
+ galleryID := galleryIDs[galleryIndex]
+ tags, err := qb.GetTagIDs(galleryID)
if err != nil {
return err
}
tags = append(tags, tagIDs[tagIndex])
- return iqb.UpdateTags(galleryID, tags)
+ return qb.UpdateTags(galleryID, tags)
})
}
@@ -971,13 +1121,3 @@ func linkStudiosParent(qb models.StudioWriter) error {
func addTagImage(qb models.TagWriter, tagIndex int) error {
return qb.UpdateImage(tagIDs[tagIndex], models.DefaultTagImage)
}
-
-func linkGalleryStudio(qb models.GalleryWriter, galleryIndex, studioIndex int) error {
- gallery := models.GalleryPartial{
- ID: galleryIDs[galleryIndex],
- StudioID: &sql.NullInt64{Int64: int64(studioIDs[studioIndex]), Valid: true},
- }
- _, err := qb.UpdatePartial(gallery)
-
- return err
-}
diff --git a/pkg/sqlite/sql.go b/pkg/sqlite/sql.go
index 71b46fe80..b683e1a07 100644
--- a/pkg/sqlite/sql.go
+++ b/pkg/sqlite/sql.go
@@ -2,7 +2,9 @@ package sqlite
import (
"database/sql"
+ "fmt"
"math/rand"
+ "regexp"
"strconv"
"strings"
@@ -44,10 +46,15 @@ func getPaginationSQL(page int, perPage int) string {
return " LIMIT " + strconv.Itoa(perPage) + " OFFSET " + strconv.Itoa(page) + " "
}
-func getSort(sort string, direction string, tableName string) string {
+func getSortDirection(direction string) string {
if direction != "ASC" && direction != "DESC" {
- direction = "ASC"
+ return "ASC"
+ } else {
+ return direction
}
+}
+func getSort(sort string, direction string, tableName string) string {
+ direction = getSortDirection(direction)
const randomSeedPrefix = "random_"
@@ -96,6 +103,10 @@ func getRandomSort(tableName string, direction string, seed float64) string {
return " ORDER BY " + "(substr(" + colName + " * " + randomSortString + ", length(" + colName + ") + 2))" + " " + direction
}
+func getCountSort(primaryTable, joinTable, primaryFK, direction string) string {
+ return fmt.Sprintf(" ORDER BY (SELECT COUNT(*) FROM %s WHERE %s = %s.id) %s", joinTable, primaryFK, primaryTable, getSortDirection(direction))
+}
+
func getSearchBinding(columns []string, q string, not bool) (string, []interface{}) {
var likeClauses []string
var args []interface{}
@@ -106,10 +117,12 @@ func getSearchBinding(columns []string, q string, not bool) (string, []interface
notStr = " NOT"
binaryType = " AND "
}
-
- queryWords := strings.Split(q, " ")
+ q = strings.TrimSpace(q)
trimmedQuery := strings.Trim(q, "\"")
+
if trimmedQuery == q {
+ q = regexp.MustCompile(`\s+`).ReplaceAllString(q, " ")
+ queryWords := strings.Split(q, " ")
// Search for any word
for _, word := range queryWords {
for _, column := range columns {
@@ -213,6 +226,11 @@ func getMultiCriterionClause(primaryTable, foreignTable, joinTable, primaryFK, f
return whereClause, havingClause
}
+func getCountCriterionClause(primaryTable, joinTable, primaryFK string, criterion models.IntCriterionInput) (string, int) {
+ lhs := fmt.Sprintf("(SELECT COUNT(*) FROM %s s WHERE s.%s = %s.id)", joinTable, primaryFK, primaryTable)
+ return getIntCriterionWhereClause(lhs, criterion)
+}
+
func ensureTx(tx *sqlx.Tx) {
if tx == nil {
panic("must use a transaction")
diff --git a/pkg/sqlite/studio.go b/pkg/sqlite/studio.go
index fa08017a1..76099481e 100644
--- a/pkg/sqlite/studio.go
+++ b/pkg/sqlite/studio.go
@@ -3,6 +3,7 @@ package sqlite
import (
"database/sql"
"fmt"
+ "strings"
"github.com/stashapp/stash/pkg/models"
)
@@ -121,6 +122,23 @@ func (qb *studioQueryBuilder) All() ([]*models.Studio, error) {
return qb.queryStudios(selectAll("studios")+qb.getStudioSort(nil), nil)
}
+func (qb *studioQueryBuilder) QueryForAutoTag(words []string) ([]*models.Studio, error) {
+ // TODO - Query needs to be changed to support queries of this type, and
+ // this method should be removed
+ query := selectAll(studioTable)
+
+ var whereClauses []string
+ var args []interface{}
+
+ for _, w := range words {
+ whereClauses = append(whereClauses, "name like ?")
+ args = append(args, "%"+w+"%")
+ }
+
+ where := strings.Join(whereClauses, " OR ")
+ return qb.queryStudios(query+" WHERE "+where, args)
+}
+
func (qb *studioQueryBuilder) Query(studioFilter *models.StudioFilterType, findFilter *models.FindFilterType) ([]*models.Studio, int, error) {
if studioFilter == nil {
studioFilter = &models.StudioFilterType{}
@@ -129,12 +147,11 @@ func (qb *studioQueryBuilder) Query(studioFilter *models.StudioFilterType, findF
findFilter = &models.FindFilterType{}
}
- var whereClauses []string
- var havingClauses []string
- var args []interface{}
- body := selectDistinctIDs("studios")
- body += `
- left join scenes on studios.id = scenes.studio_id
+ query := qb.newQuery()
+
+ query.body = selectDistinctIDs("studios")
+ query.body += `
+ left join scenes on studios.id = scenes.studio_id
left join studio_stash_ids on studio_stash_ids.studio_id = studios.id
`
@@ -142,44 +159,49 @@ func (qb *studioQueryBuilder) Query(studioFilter *models.StudioFilterType, findF
searchColumns := []string{"studios.name"}
clause, thisArgs := getSearchBinding(searchColumns, *q, false)
- whereClauses = append(whereClauses, clause)
- args = append(args, thisArgs...)
+ query.addWhere(clause)
+ query.addArg(thisArgs...)
}
if parentsFilter := studioFilter.Parents; parentsFilter != nil && len(parentsFilter.Value) > 0 {
- body += `
+ query.body += `
left join studios as parent_studio on parent_studio.id = studios.parent_id
`
for _, studioID := range parentsFilter.Value {
- args = append(args, studioID)
+ query.addArg(studioID)
}
whereClause, havingClause := getMultiCriterionClause("studios", "parent_studio", "", "", "parent_id", parentsFilter)
- whereClauses = appendClause(whereClauses, whereClause)
- havingClauses = appendClause(havingClauses, havingClause)
+
+ query.addWhere(whereClause)
+ query.addHaving(havingClause)
}
- if stashIDFilter := studioFilter.StashID; stashIDFilter != nil {
- whereClauses = append(whereClauses, "studio_stash_ids.stash_id = ?")
- args = append(args, stashIDFilter)
+ if rating := studioFilter.Rating; rating != nil {
+ query.handleIntCriterionInput(studioFilter.Rating, "studios.rating")
}
+ query.handleCountCriterion(studioFilter.SceneCount, studioTable, sceneTable, studioIDColumn)
+ query.handleCountCriterion(studioFilter.ImageCount, studioTable, imageTable, studioIDColumn)
+ query.handleCountCriterion(studioFilter.GalleryCount, studioTable, galleryTable, studioIDColumn)
+ query.handleStringCriterionInput(studioFilter.URL, "studios.url")
+ query.handleStringCriterionInput(studioFilter.StashID, "studio_stash_ids.stash_id")
if isMissingFilter := studioFilter.IsMissing; isMissingFilter != nil && *isMissingFilter != "" {
switch *isMissingFilter {
case "image":
- body += `left join studios_image on studios_image.studio_id = studios.id
+ query.body += `left join studios_image on studios_image.studio_id = studios.id
`
- whereClauses = appendClause(whereClauses, "studios_image.studio_id IS NULL")
+ query.addWhere("studios_image.studio_id IS NULL")
case "stash_id":
- whereClauses = appendClause(whereClauses, "studio_stash_ids.studio_id IS NULL")
+ query.addWhere("studio_stash_ids.studio_id IS NULL")
default:
- whereClauses = appendClause(whereClauses, "studios."+*isMissingFilter+" IS NULL")
+ query.addWhere("studios." + *isMissingFilter + " IS NULL")
}
}
- sortAndPagination := qb.getStudioSort(findFilter) + getPagination(findFilter)
- idsResult, countResult, err := qb.executeFindQuery(body, args, sortAndPagination, whereClauses, havingClauses)
+ query.sortAndPagination = qb.getStudioSort(findFilter) + getPagination(findFilter)
+ idsResult, countResult, err := query.executeFind()
if err != nil {
return nil, 0, err
}
@@ -207,7 +229,15 @@ func (qb *studioQueryBuilder) getStudioSort(findFilter *models.FindFilterType) s
sort = findFilter.GetSort("name")
direction = findFilter.GetDirection()
}
- return getSort(sort, direction, "studios")
+
+ switch sort {
+ case "images_count":
+ return getCountSort(studioTable, imageTable, studioIDColumn, direction)
+ case "galleries_count":
+ return getCountSort(studioTable, galleryTable, studioIDColumn, direction)
+ default:
+ return getSort(sort, direction, "studios")
+ }
}
func (qb *studioQueryBuilder) queryStudio(query string, args []interface{}) (*models.Studio, error) {
diff --git a/pkg/sqlite/studio_test.go b/pkg/sqlite/studio_test.go
index 0dd3e4585..cf0fc5096 100644
--- a/pkg/sqlite/studio_test.go
+++ b/pkg/sqlite/studio_test.go
@@ -45,6 +45,26 @@ func TestStudioFindByName(t *testing.T) {
})
}
+func TestStudioQueryForAutoTag(t *testing.T) {
+ withTxn(func(r models.Repository) error {
+ tqb := r.Studio()
+
+ name := studioNames[studioIdxWithScene] // find a studio by name
+
+ studios, err := tqb.QueryForAutoTag([]string{name})
+
+ if err != nil {
+ t.Errorf("Error finding studios: %s", err.Error())
+ }
+
+ assert.Len(t, studios, 2)
+ assert.Equal(t, strings.ToLower(studioNames[studioIdxWithScene]), strings.ToLower(studios[0].Name.String))
+ assert.Equal(t, strings.ToLower(studioNames[studioIdxWithScene]), strings.ToLower(studios[1].Name.String))
+
+ return nil
+ })
+}
+
func TestStudioQueryParent(t *testing.T) {
withTxn(func(r models.Repository) error {
sqb := r.Studio()
@@ -265,6 +285,147 @@ func TestStudioDestroyStudioImage(t *testing.T) {
}
}
+func TestStudioQuerySceneCount(t *testing.T) {
+ const sceneCount = 1
+ sceneCountCriterion := models.IntCriterionInput{
+ Value: sceneCount,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ verifyStudiosSceneCount(t, sceneCountCriterion)
+
+ sceneCountCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyStudiosSceneCount(t, sceneCountCriterion)
+
+ sceneCountCriterion.Modifier = models.CriterionModifierGreaterThan
+ verifyStudiosSceneCount(t, sceneCountCriterion)
+
+ sceneCountCriterion.Modifier = models.CriterionModifierLessThan
+ verifyStudiosSceneCount(t, sceneCountCriterion)
+}
+
+func verifyStudiosSceneCount(t *testing.T, sceneCountCriterion models.IntCriterionInput) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Studio()
+ studioFilter := models.StudioFilterType{
+ SceneCount: &sceneCountCriterion,
+ }
+
+ studios := queryStudio(t, sqb, &studioFilter, nil)
+ assert.Greater(t, len(studios), 0)
+
+ for _, studio := range studios {
+ sceneCount, err := r.Scene().CountByStudioID(studio.ID)
+ if err != nil {
+ return err
+ }
+ verifyInt(t, sceneCount, sceneCountCriterion)
+ }
+
+ return nil
+ })
+}
+
+func TestStudioQueryImageCount(t *testing.T) {
+ const imageCount = 1
+ imageCountCriterion := models.IntCriterionInput{
+ Value: imageCount,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ verifyStudiosImageCount(t, imageCountCriterion)
+
+ imageCountCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyStudiosImageCount(t, imageCountCriterion)
+
+ imageCountCriterion.Modifier = models.CriterionModifierGreaterThan
+ verifyStudiosImageCount(t, imageCountCriterion)
+
+ imageCountCriterion.Modifier = models.CriterionModifierLessThan
+ verifyStudiosImageCount(t, imageCountCriterion)
+}
+
+func verifyStudiosImageCount(t *testing.T, imageCountCriterion models.IntCriterionInput) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Studio()
+ studioFilter := models.StudioFilterType{
+ ImageCount: &imageCountCriterion,
+ }
+
+ studios := queryStudio(t, sqb, &studioFilter, nil)
+ assert.Greater(t, len(studios), 0)
+
+ for _, studio := range studios {
+ pp := 0
+
+ _, count, err := r.Image().Query(&models.ImageFilterType{
+ Studios: &models.MultiCriterionInput{
+ Value: []string{strconv.Itoa(studio.ID)},
+ Modifier: models.CriterionModifierIncludes,
+ },
+ }, &models.FindFilterType{
+ PerPage: &pp,
+ })
+ if err != nil {
+ return err
+ }
+ verifyInt(t, count, imageCountCriterion)
+ }
+
+ return nil
+ })
+}
+
+func TestStudioQueryGalleryCount(t *testing.T) {
+ const galleryCount = 1
+ galleryCountCriterion := models.IntCriterionInput{
+ Value: galleryCount,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ verifyStudiosGalleryCount(t, galleryCountCriterion)
+
+ galleryCountCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyStudiosGalleryCount(t, galleryCountCriterion)
+
+ galleryCountCriterion.Modifier = models.CriterionModifierGreaterThan
+ verifyStudiosGalleryCount(t, galleryCountCriterion)
+
+ galleryCountCriterion.Modifier = models.CriterionModifierLessThan
+ verifyStudiosGalleryCount(t, galleryCountCriterion)
+}
+
+func verifyStudiosGalleryCount(t *testing.T, galleryCountCriterion models.IntCriterionInput) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Studio()
+ studioFilter := models.StudioFilterType{
+ GalleryCount: &galleryCountCriterion,
+ }
+
+ studios := queryStudio(t, sqb, &studioFilter, nil)
+ assert.Greater(t, len(studios), 0)
+
+ for _, studio := range studios {
+ pp := 0
+
+ _, count, err := r.Gallery().Query(&models.GalleryFilterType{
+ Studios: &models.MultiCriterionInput{
+ Value: []string{strconv.Itoa(studio.ID)},
+ Modifier: models.CriterionModifierIncludes,
+ },
+ }, &models.FindFilterType{
+ PerPage: &pp,
+ })
+ if err != nil {
+ return err
+ }
+ verifyInt(t, count, galleryCountCriterion)
+ }
+
+ return nil
+ })
+}
+
func TestStudioStashIDs(t *testing.T) {
if err := withTxn(func(r models.Repository) error {
qb := r.Studio()
@@ -283,6 +444,141 @@ func TestStudioStashIDs(t *testing.T) {
}
}
+func TestStudioQueryURL(t *testing.T) {
+ const sceneIdx = 1
+ studioURL := getStudioStringValue(sceneIdx, urlField)
+
+ urlCriterion := models.StringCriterionInput{
+ Value: studioURL,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ filter := models.StudioFilterType{
+ URL: &urlCriterion,
+ }
+
+ verifyFn := func(g *models.Studio) {
+ t.Helper()
+ verifyNullString(t, g.URL, urlCriterion)
+ }
+
+ verifyStudioQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyStudioQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierMatchesRegex
+ urlCriterion.Value = "studio_.*1_URL"
+ verifyStudioQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierNotMatchesRegex
+ verifyStudioQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierIsNull
+ urlCriterion.Value = ""
+ verifyStudioQuery(t, filter, verifyFn)
+
+ urlCriterion.Modifier = models.CriterionModifierNotNull
+ verifyStudioQuery(t, filter, verifyFn)
+}
+
+func TestStudioQueryRating(t *testing.T) {
+ const rating = 3
+ ratingCriterion := models.IntCriterionInput{
+ Value: rating,
+ Modifier: models.CriterionModifierEquals,
+ }
+
+ verifyStudiosRating(t, ratingCriterion)
+
+ ratingCriterion.Modifier = models.CriterionModifierNotEquals
+ verifyStudiosRating(t, ratingCriterion)
+
+ ratingCriterion.Modifier = models.CriterionModifierGreaterThan
+ verifyStudiosRating(t, ratingCriterion)
+
+ ratingCriterion.Modifier = models.CriterionModifierLessThan
+ verifyStudiosRating(t, ratingCriterion)
+
+ ratingCriterion.Modifier = models.CriterionModifierIsNull
+ verifyStudiosRating(t, ratingCriterion)
+
+ ratingCriterion.Modifier = models.CriterionModifierNotNull
+ verifyStudiosRating(t, ratingCriterion)
+}
+
+func verifyStudioQuery(t *testing.T, filter models.StudioFilterType, verifyFn func(s *models.Studio)) {
+ withTxn(func(r models.Repository) error {
+ t.Helper()
+ sqb := r.Studio()
+
+ studios := queryStudio(t, sqb, &filter, nil)
+
+ // assume it should find at least one
+ assert.Greater(t, len(studios), 0)
+
+ for _, studio := range studios {
+ verifyFn(studio)
+ }
+
+ return nil
+ })
+}
+
+func verifyStudiosRating(t *testing.T, ratingCriterion models.IntCriterionInput) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Studio()
+ studioFilter := models.StudioFilterType{
+ Rating: &ratingCriterion,
+ }
+
+ studios, _, err := sqb.Query(&studioFilter, nil)
+
+ if err != nil {
+ t.Errorf("Error querying studio: %s", err.Error())
+ }
+
+ for _, studio := range studios {
+ verifyInt64(t, studio.Rating, ratingCriterion)
+ }
+
+ return nil
+ })
+}
+
+func TestStudioQueryIsMissingRating(t *testing.T) {
+ withTxn(func(r models.Repository) error {
+ sqb := r.Studio()
+ isMissing := "rating"
+ studioFilter := models.StudioFilterType{
+ IsMissing: &isMissing,
+ }
+
+ studios, _, err := sqb.Query(&studioFilter, nil)
+
+ if err != nil {
+ t.Errorf("Error querying studio: %s", err.Error())
+ }
+
+ assert.True(t, len(studios) > 0)
+
+ for _, studio := range studios {
+ assert.True(t, !studio.Rating.Valid)
+ }
+
+ return nil
+ })
+}
+
+func queryStudio(t *testing.T, sqb models.StudioReader, studioFilter *models.StudioFilterType, findFilter *models.FindFilterType) []*models.Studio {
+ studios, _, err := sqb.Query(studioFilter, findFilter)
+ if err != nil {
+ t.Errorf("Error querying studio: %s", err.Error())
+ }
+
+ return studios
+}
+
// TODO Create
// TODO Update
// TODO Destroy
diff --git a/pkg/sqlite/tag.go b/pkg/sqlite/tag.go
index acb0105d1..a4549acd9 100644
--- a/pkg/sqlite/tag.go
+++ b/pkg/sqlite/tag.go
@@ -4,6 +4,7 @@ import (
"database/sql"
"errors"
"fmt"
+ "strings"
"github.com/stashapp/stash/pkg/models"
)
@@ -192,6 +193,23 @@ func (qb *tagQueryBuilder) All() ([]*models.Tag, error) {
return qb.queryTags(selectAll("tags")+qb.getDefaultTagSort(), nil)
}
+func (qb *tagQueryBuilder) QueryForAutoTag(words []string) ([]*models.Tag, error) {
+ // TODO - Query needs to be changed to support queries of this type, and
+ // this method should be removed
+ query := selectAll(tagTable)
+
+ var whereClauses []string
+ var args []interface{}
+
+ for _, w := range words {
+ whereClauses = append(whereClauses, "name like ?")
+ args = append(args, "%"+w+"%")
+ }
+
+ where := strings.Join(whereClauses, " OR ")
+ return qb.queryTags(query+" WHERE "+where, args)
+}
+
func (qb *tagQueryBuilder) validateFilter(tagFilter *models.TagFilterType) error {
const and = "AND"
const or = "OR"
diff --git a/pkg/sqlite/tag_test.go b/pkg/sqlite/tag_test.go
index 272006776..f6a29def2 100644
--- a/pkg/sqlite/tag_test.go
+++ b/pkg/sqlite/tag_test.go
@@ -70,6 +70,26 @@ func TestTagFindByName(t *testing.T) {
})
}
+func TestTagQueryForAutoTag(t *testing.T) {
+ withTxn(func(r models.Repository) error {
+ tqb := r.Tag()
+
+ name := tagNames[tagIdxWithScene] // find a tag by name
+
+ tags, err := tqb.QueryForAutoTag([]string{name})
+
+ if err != nil {
+ t.Errorf("Error finding tags: %s", err.Error())
+ }
+
+ assert.Len(t, tags, 2)
+ assert.Equal(t, strings.ToLower(tagNames[tagIdxWithScene]), strings.ToLower(tags[0].Name))
+ assert.Equal(t, strings.ToLower(tagNames[tagIdxWithScene]), strings.ToLower(tags[1].Name))
+
+ return nil
+ })
+}
+
func TestTagFindByNames(t *testing.T) {
var names []string
diff --git a/pkg/sqlite/transaction.go b/pkg/sqlite/transaction.go
index 50016db45..b9d3157ff 100644
--- a/pkg/sqlite/transaction.go
+++ b/pkg/sqlite/transaction.go
@@ -29,6 +29,10 @@ func (t *transaction) Begin() error {
return errors.New("transaction already begun")
}
+ if err := database.Ready(); err != nil {
+ return err
+ }
+
var err error
t.tx, err = database.DB.BeginTxx(t.Ctx, nil)
if err != nil {
@@ -124,6 +128,10 @@ func (t *transaction) Tag() models.TagReaderWriter {
type ReadTransaction struct{}
func (t *ReadTransaction) Begin() error {
+ if err := database.Ready(); err != nil {
+ return err
+ }
+
return nil
}
diff --git a/pkg/studio/export.go b/pkg/studio/export.go
index f7e72d53d..dc71fd915 100644
--- a/pkg/studio/export.go
+++ b/pkg/studio/export.go
@@ -23,6 +23,10 @@ func ToJSON(reader models.StudioReader, studio *models.Studio) (*jsonschema.Stud
newStudioJSON.URL = studio.URL.String
}
+ if studio.Details.Valid {
+ newStudioJSON.Details = studio.Details.String
+ }
+
if studio.ParentID.Valid {
parent, err := reader.Find(int(studio.ParentID.Int64))
if err != nil {
@@ -34,6 +38,10 @@ func ToJSON(reader models.StudioReader, studio *models.Studio) (*jsonschema.Stud
}
}
+ if studio.Rating.Valid {
+ newStudioJSON.Rating = int(studio.Rating.Int64)
+ }
+
image, err := reader.GetImage(studio.ID)
if err != nil {
return nil, fmt.Errorf("error getting studio image: %s", err.Error())
diff --git a/pkg/studio/export_test.go b/pkg/studio/export_test.go
index 72807df48..516c3714e 100644
--- a/pkg/studio/export_test.go
+++ b/pkg/studio/export_test.go
@@ -24,10 +24,13 @@ const (
errParentStudioID = 12
)
-const studioName = "testStudio"
-const url = "url"
-
-const parentStudioName = "parentStudio"
+const (
+ studioName = "testStudio"
+ url = "url"
+ details = "details"
+ rating = 5
+ parentStudioName = "parentStudio"
+)
var parentStudio models.Studio = models.Studio{
Name: models.NullString(parentStudioName),
@@ -37,22 +40,29 @@ var imageBytes = []byte("imageBytes")
const image = "aW1hZ2VCeXRlcw=="
-var createTime time.Time = time.Date(2001, 01, 01, 0, 0, 0, 0, time.UTC)
-var updateTime time.Time = time.Date(2002, 01, 01, 0, 0, 0, 0, time.UTC)
+var createTime time.Time = time.Date(2001, 01, 01, 0, 0, 0, 0, time.Local)
+var updateTime time.Time = time.Date(2002, 01, 01, 0, 0, 0, 0, time.Local)
func createFullStudio(id int, parentID int) models.Studio {
- return models.Studio{
- ID: id,
- Name: models.NullString(studioName),
- URL: models.NullString(url),
- ParentID: models.NullInt64(int64(parentID)),
+ ret := models.Studio{
+ ID: id,
+ Name: models.NullString(studioName),
+ URL: models.NullString(url),
+ Details: models.NullString(details),
CreatedAt: models.SQLiteTimestamp{
Timestamp: createTime,
},
UpdatedAt: models.SQLiteTimestamp{
Timestamp: updateTime,
},
+ Rating: models.NullInt64(rating),
}
+
+ if parentID != 0 {
+ ret.ParentID = models.NullInt64(int64(parentID))
+ }
+
+ return ret
}
func createEmptyStudio(id int) models.Studio {
@@ -69,8 +79,9 @@ func createEmptyStudio(id int) models.Studio {
func createFullJSONStudio(parentStudio, image string) *jsonschema.Studio {
return &jsonschema.Studio{
- Name: studioName,
- URL: url,
+ Name: studioName,
+ URL: url,
+ Details: details,
CreatedAt: models.JSONTime{
Time: createTime,
},
@@ -79,6 +90,7 @@ func createFullJSONStudio(parentStudio, image string) *jsonschema.Studio {
},
ParentStudio: parentStudio,
Image: image,
+ Rating: rating,
}
}
diff --git a/pkg/studio/import.go b/pkg/studio/import.go
index 1e8afcc67..f509c0626 100644
--- a/pkg/studio/import.go
+++ b/pkg/studio/import.go
@@ -28,8 +28,10 @@ func (i *Importer) PreImport() error {
Checksum: checksum,
Name: sql.NullString{String: i.Input.Name, Valid: true},
URL: sql.NullString{String: i.Input.URL, Valid: true},
+ Details: sql.NullString{String: i.Input.Details, Valid: true},
CreatedAt: models.SQLiteTimestamp{Timestamp: i.Input.CreatedAt.GetTime()},
UpdatedAt: models.SQLiteTimestamp{Timestamp: i.Input.UpdatedAt.GetTime()},
+ Rating: sql.NullInt64{Int64: int64(i.Input.Rating), Valid: true},
}
if err := i.populateParentStudio(); err != nil {
diff --git a/pkg/studio/import_test.go b/pkg/studio/import_test.go
index 339e8b9b6..29a0d8813 100644
--- a/pkg/studio/import_test.go
+++ b/pkg/studio/import_test.go
@@ -7,6 +7,7 @@ import (
"github.com/stashapp/stash/pkg/manager/jsonschema"
"github.com/stashapp/stash/pkg/models"
"github.com/stashapp/stash/pkg/models/mocks"
+ "github.com/stashapp/stash/pkg/utils"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
@@ -51,6 +52,17 @@ func TestImporterPreImport(t *testing.T) {
err = i.PreImport()
assert.Nil(t, err)
+
+ i.Input = *createFullJSONStudio(studioName, image)
+ i.Input.ParentStudio = ""
+
+ err = i.PreImport()
+
+ assert.Nil(t, err)
+ expectedStudio := createFullStudio(0, 0)
+ expectedStudio.ParentID.Valid = false
+ expectedStudio.Checksum = utils.MD5FromString(studioName)
+ assert.Equal(t, expectedStudio, i.studio)
}
func TestImporterPreImportWithParent(t *testing.T) {
diff --git a/pkg/utils/file.go b/pkg/utils/file.go
index 563c3fa54..6ecdf2c50 100644
--- a/pkg/utils/file.go
+++ b/pkg/utils/file.go
@@ -283,3 +283,14 @@ func IsPathInDir(dir, pathToCheck string) bool {
return false
}
+
+// GetNameFromPath returns the name of a file from its path
+// if stripExtension is true the extension is omitted from the name
+func GetNameFromPath(path string, stripExtension bool) string {
+ fn := filepath.Base(path)
+ if stripExtension {
+ ext := filepath.Ext(fn)
+ fn = strings.TrimSuffix(fn, ext)
+ }
+ return fn
+}
diff --git a/pkg/utils/phash.go b/pkg/utils/phash.go
new file mode 100644
index 000000000..f5e1f2cd9
--- /dev/null
+++ b/pkg/utils/phash.go
@@ -0,0 +1,57 @@
+package utils
+
+import (
+ "strconv"
+
+ "github.com/corona10/goimagehash"
+)
+
+type Phash struct {
+ SceneID int `db:"id"`
+ Hash int64 `db:"phash"`
+ Neighbors []int
+ Bucket int
+}
+
+func FindDuplicates(hashes []*Phash, distance int) [][]int {
+ for i, scene := range hashes {
+ sceneHash := goimagehash.NewImageHash(uint64(scene.Hash), goimagehash.PHash)
+ for j, neighbor := range hashes {
+ if i != j {
+ neighborHash := goimagehash.NewImageHash(uint64(neighbor.Hash), goimagehash.PHash)
+ neighborDistance, _ := sceneHash.Distance(neighborHash)
+ if neighborDistance <= distance {
+ scene.Neighbors = append(scene.Neighbors, j)
+ }
+ }
+ }
+ }
+
+ var buckets [][]int
+ for _, scene := range hashes {
+ if len(scene.Neighbors) > 0 && scene.Bucket == -1 {
+ bucket := len(buckets)
+ scenes := []int{scene.SceneID}
+ scene.Bucket = bucket
+ findNeighbors(bucket, scene.Neighbors, hashes, &scenes)
+ buckets = append(buckets, scenes)
+ }
+ }
+
+ return buckets
+}
+
+func findNeighbors(bucket int, neighbors []int, hashes []*Phash, scenes *[]int) {
+ for _, id := range neighbors {
+ hash := hashes[id]
+ if hash.Bucket == -1 {
+ hash.Bucket = bucket
+ *scenes = append(*scenes, hash.SceneID)
+ findNeighbors(bucket, hash.Neighbors, hashes, scenes)
+ }
+ }
+}
+
+func PhashToString(phash int64) string {
+ return strconv.FormatUint(uint64(phash), 16)
+}
diff --git a/pkg/utils/string_collections.go b/pkg/utils/string_collections.go
index af135eb71..ae2f52991 100644
--- a/pkg/utils/string_collections.go
+++ b/pkg/utils/string_collections.go
@@ -35,6 +35,40 @@ func StrMap(vs []string, f func(string) string) []string {
return vsm
}
+// StrAppendUnique appends toAdd to the vs string slice if toAdd does not already
+// exist in the slice. It returns the new or unchanged string slice.
+func StrAppendUnique(vs []string, toAdd string) []string {
+ if StrInclude(vs, toAdd) {
+ return vs
+ }
+
+ return append(vs, toAdd)
+}
+
+// StrAppendUniques appends a slice of string values to the vs string slice. It only
+// appends values that do not already exist in the slice. It returns the new or
+// unchanged string slice.
+func StrAppendUniques(vs []string, toAdd []string) []string {
+ for _, v := range toAdd {
+ vs = StrAppendUnique(vs, v)
+ }
+
+ return vs
+}
+
+// StrUnique returns the vs string slice with non-unique values removed.
+func StrUnique(vs []string) []string {
+ distinctValues := make(map[string]struct{})
+ var ret []string
+ for _, v := range vs {
+ if _, exists := distinctValues[v]; !exists {
+ distinctValues[v] = struct{}{}
+ ret = append(ret, v)
+ }
+ }
+ return ret
+}
+
// StringSliceToIntSlice converts a slice of strings to a slice of ints.
// Returns an error if any values cannot be parsed.
func StringSliceToIntSlice(ss []string) ([]int, error) {
diff --git a/pkg/utils/time.go b/pkg/utils/time.go
new file mode 100644
index 000000000..59ed6bc93
--- /dev/null
+++ b/pkg/utils/time.go
@@ -0,0 +1,22 @@
+package utils
+
+import "time"
+
+// Timeout executes the provided todo function, and waits for it to return. If
+// the function does not return before the waitTime duration is elapsed, then
+// onTimeout is executed, passing a channel that will be closed when the
+// function returns.
+func Timeout(todo func(), waitTime time.Duration, onTimeout func(done chan struct{})) {
+ done := make(chan struct{})
+
+ go func() {
+ todo()
+ close(done)
+ }()
+
+ select {
+ case <-done: // on time, just exit
+ case <-time.After(waitTime):
+ onTimeout(done)
+ }
+}
diff --git a/ui/login/login.css b/ui/login/login.css
index e0ed5f797..cddf4c8d3 100644
--- a/ui/login/login.css
+++ b/ui/login/login.css
@@ -9,7 +9,7 @@ html {
body {
background-color: #202b33;
color: #f5f8fa;
- font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";
+ font-family: -apple-system,BlinkMacSystemFont,"Segoe UI","Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
margin: 0;
diff --git a/ui/login/login.html b/ui/login/login.html
index c8ad61256..ea552bba8 100644
--- a/ui/login/login.html
+++ b/ui/login/login.html
@@ -5,7 +5,6 @@
Login
-
@@ -26,9 +25,9 @@
diff --git a/ui/setup/index.html b/ui/setup/index.html
deleted file mode 100644
index 38825d717..000000000
--- a/ui/setup/index.html
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
- Stash
-
-
-
-
-
-
-
-Stash
-
-
-
-
-
-
-
-
+
+ );
+ }
+
return (
-
diff --git a/ui/v2.5/src/components/Changelog/Changelog.tsx b/ui/v2.5/src/components/Changelog/Changelog.tsx
index 7d0434a3c..a00beacf7 100644
--- a/ui/v2.5/src/components/Changelog/Changelog.tsx
+++ b/ui/v2.5/src/components/Changelog/Changelog.tsx
@@ -9,6 +9,7 @@ import V030 from "./versions/v030.md";
import V040 from "./versions/v040.md";
import V050 from "./versions/v050.md";
import V060 from "./versions/v060.md";
+import V070 from "./versions/v070.md";
import { MarkdownPage } from "../Shared/MarkdownPage";
const Changelog: React.FC = () => {
@@ -38,11 +39,19 @@ const Changelog: React.FC = () => {
<>
+
+
diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md
new file mode 100644
index 000000000..915f22be6
--- /dev/null
+++ b/ui/v2.5/src/components/Changelog/versions/v070.md
@@ -0,0 +1,47 @@
+### ✨ New Features
+* Added stash-box performer tagger.
+* Auto-tagger now tags images and galleries.
+* Added rating field to performers and studios.
+* Support serving UI from specific directory location.
+* Added details, death date, hair color, and weight to Performers.
+* Added `lbToKg` post-process action for performer scrapers.
+* Added details to Studios.
+* Added [perceptual dupe checker](/sceneDuplicateChecker).
+* Add various `count` filter criteria and sort options.
+* Add URL filter criteria for scenes, galleries, movies, performers and studios.
+* Add HTTP endpoint for health checking at `/healthz`.
+* Add random sorting option for galleries, studios, movies and tags.
+* Support access to system without logging in via API key.
+* Added scene queue.
+
+### 🎨 Improvements
+* Improve sprite generation performance when using network storage.
+* Remove duplicate values when scraping lists of elements.
+* Improved performance of the auto-tagger.
+* Clean generation artifacts after generating each scene.
+* Log message at startup when cleaning the `tmp` and `downloads` generated folders takes more than one second.
+* Sort movie scenes by scene number by default.
+* Support http request headers in scrapers.
+* Sort performers by gender in scene/image/gallery cards and details.
+* Add popover buttons for scenes/images/galleries on performer/studio/tag cards.
+* Add slideshow to image wall view.
+* Support API key via URL query parameter, and added API key to stream link in Scene File Info.
+* Revamped setup wizard and migration UI.
+* Scroll to top when changing page number.
+* Support `today` and `yesterday` for `parseDate` in scrapers.
+* Disable sounds on scene/marker wall previews by default.
+* Improve Movie UI.
+* Change performer text query to search by name and alias only.
+
+### 🐛 Bug fixes
+* Fix image/gallery title not being set during scan.
+* Reverted video previews always playing on small devices.
+* Fix performer/studio being cleared when skipped in scene tagger.
+* Fixed error when auto-tagging for performers/studios/tags with regex characters in the name.
+* Fix scraped performer image not updating after clearing the current image when creating a new performer.
+* Fix error preventing adding a new library path when an existing library path is missing.
+* Fix whitespace in query string returning all objects.
+* Fix hang on Login page when not connected to internet.
+* Fix `Clear Image` button not updating image preview.
+* Fix processing some webp files.
+* Fix incorrect performer age calculation in UI.
diff --git a/ui/v2.5/src/components/Galleries/EditGalleriesDialog.tsx b/ui/v2.5/src/components/Galleries/EditGalleriesDialog.tsx
index f54668ca9..78ce68b60 100644
--- a/ui/v2.5/src/components/Galleries/EditGalleriesDialog.tsx
+++ b/ui/v2.5/src/components/Galleries/EditGalleriesDialog.tsx
@@ -10,7 +10,7 @@ import MultiSet from "../Shared/MultiSet";
import { RatingStars } from "../Scenes/SceneDetails/RatingStars";
interface IListOperationProps {
- selected: GQL.GallerySlimDataFragment[];
+ selected: GQL.SlimGalleryDataFragment[];
onClose: (applied: boolean) => void;
}
@@ -146,7 +146,7 @@ export const EditGalleriesDialog: React.FC = (
setIsUpdating(false);
}
- function getRating(state: GQL.GallerySlimDataFragment[]) {
+ function getRating(state: GQL.SlimGalleryDataFragment[]) {
let ret: number | undefined;
let first = true;
@@ -162,7 +162,7 @@ export const EditGalleriesDialog: React.FC = (
return ret;
}
- function getStudioId(state: GQL.GallerySlimDataFragment[]) {
+ function getStudioId(state: GQL.SlimGalleryDataFragment[]) {
let ret: string | undefined;
let first = true;
@@ -181,7 +181,7 @@ export const EditGalleriesDialog: React.FC = (
return ret;
}
- function getPerformerIds(state: GQL.GallerySlimDataFragment[]) {
+ function getPerformerIds(state: GQL.SlimGalleryDataFragment[]) {
let ret: string[] = [];
let first = true;
@@ -205,7 +205,7 @@ export const EditGalleriesDialog: React.FC = (
return ret;
}
- function getTagIds(state: GQL.GallerySlimDataFragment[]) {
+ function getTagIds(state: GQL.SlimGalleryDataFragment[]) {
let ret: string[] = [];
let first = true;
@@ -234,7 +234,7 @@ export const EditGalleriesDialog: React.FC = (
let updateOrganized: boolean | undefined;
let first = true;
- state.forEach((gallery: GQL.GallerySlimDataFragment) => {
+ state.forEach((gallery: GQL.SlimGalleryDataFragment) => {
const galleryRating = gallery.rating;
const GalleriestudioID = gallery?.studio?.id;
const galleryPerformerIDs = (gallery.performers ?? [])
diff --git a/ui/v2.5/src/components/Galleries/GalleryCard.tsx b/ui/v2.5/src/components/Galleries/GalleryCard.tsx
index 7bfb14398..0a1f8c458 100644
--- a/ui/v2.5/src/components/Galleries/GalleryCard.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryCard.tsx
@@ -12,9 +12,10 @@ import {
TruncatedText,
} from "src/components/Shared";
import { TextUtils } from "src/utils";
+import { PerformerPopoverButton } from "../Shared/PerformerPopoverButton";
interface IProps {
- gallery: GQL.GallerySlimDataFragment;
+ gallery: GQL.SlimGalleryDataFragment;
selecting?: boolean;
selected?: boolean | undefined;
zoomIndex?: number;
@@ -63,30 +64,7 @@ export const GalleryCard: React.FC = (props) => {
function maybeRenderPerformerPopoverButton() {
if (props.gallery.performers.length <= 0) return;
- const popoverContent = props.gallery.performers.map((performer) => (
-
-
-
- );
+ return ;
@@ -38,7 +39,8 @@ export const GalleryDetailPanel: React.FC = (props) => {
function renderPerformers() {
if (!props.gallery.performers || props.gallery.performers.length === 0)
return;
- const cards = props.gallery.performers.map((performer) => (
+ const performers = sortPerformers(props.gallery.performers);
+ const cards = performers.map((performer) => (
= ({
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx
index 9a71b33ad..cd8f0f93f 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryScrapeDialog.tsx
@@ -14,6 +14,7 @@ import {
useStudioCreate,
usePerformerCreate,
useTagCreate,
+ makePerformerCreateInput,
} from "src/core/StashService";
import { useToast } from "src/hooks";
@@ -273,8 +274,10 @@ export const GalleryScrapeDialog: React.FC = (
try {
const result = await createStudio({
variables: {
- name: toCreate.name,
- url: toCreate.url,
+ input: {
+ name: toCreate.name,
+ url: toCreate.url,
+ },
},
});
@@ -295,11 +298,11 @@ export const GalleryScrapeDialog: React.FC = (
}
async function createNewPerformer(toCreate: GQL.ScrapedScenePerformer) {
- let performerInput: GQL.PerformerCreateInput = { name: "" };
+ const input = makePerformerCreateInput(toCreate);
+
try {
- performerInput = Object.assign(performerInput, toCreate);
const result = await createPerformer({
- variables: performerInput,
+ variables: { input },
});
// add the new performer to the new performers value
diff --git a/ui/v2.5/src/components/Galleries/GalleryList.tsx b/ui/v2.5/src/components/Galleries/GalleryList.tsx
index 8e3096a16..ee56499ca 100644
--- a/ui/v2.5/src/components/Galleries/GalleryList.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryList.tsx
@@ -5,7 +5,7 @@ import { Link, useHistory } from "react-router-dom";
import Mousetrap from "mousetrap";
import {
FindGalleriesQueryResult,
- GallerySlimDataFragment,
+ SlimGalleryDataFragment,
} from "src/core/generated-graphql";
import { useGalleriesList } from "src/hooks";
import { TextUtils } from "src/utils";
@@ -130,7 +130,7 @@ export const GalleryList: React.FC = ({
}
function renderEditGalleriesDialog(
- selectedImages: GallerySlimDataFragment[],
+ selectedImages: SlimGalleryDataFragment[],
onClose: (applied: boolean) => void
) {
return (
@@ -141,7 +141,7 @@ export const GalleryList: React.FC = ({
}
function renderDeleteGalleriesDialog(
- selectedImages: GallerySlimDataFragment[],
+ selectedImages: SlimGalleryDataFragment[],
onClose: (confirmed: boolean) => void
) {
return (
diff --git a/ui/v2.5/src/components/Galleries/GalleryWallCard.tsx b/ui/v2.5/src/components/Galleries/GalleryWallCard.tsx
index b724ea09b..d2d02aba1 100644
--- a/ui/v2.5/src/components/Galleries/GalleryWallCard.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryWallCard.tsx
@@ -12,7 +12,7 @@ const CLASSNAME_IMG = `${CLASSNAME}-img`;
const CLASSNAME_TITLE = `${CLASSNAME}-title`;
interface IProps {
- gallery: GQL.GallerySlimDataFragment;
+ gallery: GQL.SlimGalleryDataFragment;
}
const GalleryWallCard: React.FC = ({ gallery }) => {
diff --git a/ui/v2.5/src/components/Help/Manual.tsx b/ui/v2.5/src/components/Help/Manual.tsx
index c53405f61..89ed6637b 100644
--- a/ui/v2.5/src/components/Help/Manual.tsx
+++ b/ui/v2.5/src/components/Help/Manual.tsx
@@ -14,6 +14,7 @@ import Contributing from "src/docs/en/Contributing.md";
import SceneFilenameParser from "src/docs/en/SceneFilenameParser.md";
import KeyboardShortcuts from "src/docs/en/KeyboardShortcuts.md";
import Help from "src/docs/en/Help.md";
+import Deduplication from "src/docs/en/Deduplication.md";
import { MarkdownPage } from "../Shared/MarkdownPage";
interface IManualProps {
@@ -86,6 +87,11 @@ export const Manual: React.FC = ({
title: "Scene Tagger",
content: Tagger,
},
+ {
+ key: "Deduplication.md",
+ title: "Dupe Checker",
+ content: Deduplication,
+ },
{
key: "KeyboardShortcuts.md",
title: "Keyboard Shortcuts",
diff --git a/ui/v2.5/src/components/Images/ImageCard.tsx b/ui/v2.5/src/components/Images/ImageCard.tsx
index 53e153a76..7f8055d82 100644
--- a/ui/v2.5/src/components/Images/ImageCard.tsx
+++ b/ui/v2.5/src/components/Images/ImageCard.tsx
@@ -11,6 +11,7 @@ import {
TruncatedText,
} from "src/components/Shared";
import { TextUtils } from "src/utils";
+import { PerformerPopoverButton } from "../Shared/PerformerPopoverButton";
interface IImageCardProps {
image: GQL.SlimImageDataFragment;
@@ -58,30 +59,7 @@ export const ImageCard: React.FC = (
function maybeRenderPerformerPopoverButton() {
if (props.image.performers.length <= 0) return;
- const popoverContent = props.image.performers.map((performer) => (
-
-
-
- );
+ return = (props) => {
function renderPerformers() {
if (props.image.performers.length === 0) return;
- const cards = props.image.performers.map((performer) => (
+ const performers = sortPerformers(props.image.performers);
+ const cards = performers.map((performer) => (
= ({
currentPage,
pageCount,
}) => {
+ const [slideshowRunning, setSlideshowRunning] = useState(false);
const handleLightBoxPage = useCallback(
(direction: number) => {
if (direction === -1) {
if (currentPage === 1) return false;
onChangePage(currentPage - 1);
} else {
- if (currentPage === pageCount) return false;
+ if (currentPage === pageCount) {
+ // if the slideshow is running
+ // return to the first page
+ if (slideshowRunning) {
+ onChangePage(0);
+ return true;
+ }
+ return false;
+ }
onChangePage(currentPage + 1);
}
return direction === -1 || direction === 1;
},
- [onChangePage, currentPage, pageCount]
+ [onChangePage, currentPage, pageCount, slideshowRunning]
);
+ const handleClose = useCallback(() => {
+ setSlideshowRunning(false);
+ }, [setSlideshowRunning]);
+
const showLightbox = useLightbox({
images,
showNavigation: false,
pageCallback: handleLightBoxPage,
pageHeader: `Page ${currentPage} / ${pageCount}`,
+ slideshowEnabled: slideshowRunning,
+ onClose: handleClose,
});
+ const handleImageOpen = useCallback(
+ (index) => {
+ setSlideshowRunning(true);
+ showLightbox(index, true);
+ },
+ [showLightbox]
+ );
+
const thumbs = images.map((image, index) => (
{{.Error}}
-
+
-
+
-
-
-
-
-
\ No newline at end of file
diff --git a/ui/setup/migrate.html b/ui/setup/migrate.html
deleted file mode 100644
index 632f30144..000000000
--- a/ui/setup/migrate.html
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/ui/setup/milligram.min.css b/ui/setup/milligram.min.css
deleted file mode 100755
index 85f877b9f..000000000
--- a/ui/setup/milligram.min.css
+++ /dev/null
@@ -1,11 +0,0 @@
-/*!
- * Milligram v1.3.0
- * https://milligram.github.io
- *
- * Copyright (c) 2017 CJ Patoilo
- * Licensed under the MIT license
- */
-
-*,*:after,*:before{box-sizing:inherit}html{box-sizing:border-box;font-size:62.5%}body{color:#606c76;font-family:'Roboto', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;font-size:1.6em;font-weight:300;letter-spacing:.01em;line-height:1.6}blockquote{border-left:0.3rem solid #d1d1d1;margin-left:0;margin-right:0;padding:1rem 1.5rem}blockquote *:last-child{margin-bottom:0}.button,button,input[type='button'],input[type='reset'],input[type='submit']{background-color:#9b4dca;border:0.1rem solid #9b4dca;border-radius:.4rem;color:#fff;cursor:pointer;display:inline-block;font-size:1.1rem;font-weight:700;height:3.8rem;letter-spacing:.1rem;line-height:3.8rem;padding:0 3.0rem;text-align:center;text-decoration:none;text-transform:uppercase;white-space:nowrap}.button:focus,.button:hover,button:focus,button:hover,input[type='button']:focus,input[type='button']:hover,input[type='reset']:focus,input[type='reset']:hover,input[type='submit']:focus,input[type='submit']:hover{background-color:#606c76;border-color:#606c76;color:#fff;outline:0}.button[disabled],button[disabled],input[type='button'][disabled],input[type='reset'][disabled],input[type='submit'][disabled]{cursor:default;opacity:.5}.button[disabled]:focus,.button[disabled]:hover,button[disabled]:focus,button[disabled]:hover,input[type='button'][disabled]:focus,input[type='button'][disabled]:hover,input[type='reset'][disabled]:focus,input[type='reset'][disabled]:hover,input[type='submit'][disabled]:focus,input[type='submit'][disabled]:hover{background-color:#9b4dca;border-color:#9b4dca}.button.button-outline,button.button-outline,input[type='button'].button-outline,input[type='reset'].button-outline,input[type='submit'].button-outline{background-color:transparent;color:#9b4dca}.button.button-outline:focus,.button.button-outline:hover,button.button-outline:focus,button.button-outline:hover,input[type='button'].button-outline:focus,input[type='button'].button-outline:hover,input[type='reset'].button-outline:focus,input[type='reset'].button-outline:hover,input[type='submit'].button-outline:focus,input[type='submit'].button-outline:hover{background-color:transparent;border-color:#606c76;color:#606c76}.button.button-outline[disabled]:focus,.button.button-outline[disabled]:hover,button.button-outline[disabled]:focus,button.button-outline[disabled]:hover,input[type='button'].button-outline[disabled]:focus,input[type='button'].button-outline[disabled]:hover,input[type='reset'].button-outline[disabled]:focus,input[type='reset'].button-outline[disabled]:hover,input[type='submit'].button-outline[disabled]:focus,input[type='submit'].button-outline[disabled]:hover{border-color:inherit;color:#9b4dca}.button.button-clear,button.button-clear,input[type='button'].button-clear,input[type='reset'].button-clear,input[type='submit'].button-clear{background-color:transparent;border-color:transparent;color:#9b4dca}.button.button-clear:focus,.button.button-clear:hover,button.button-clear:focus,button.button-clear:hover,input[type='button'].button-clear:focus,input[type='button'].button-clear:hover,input[type='reset'].button-clear:focus,input[type='reset'].button-clear:hover,input[type='submit'].button-clear:focus,input[type='submit'].button-clear:hover{background-color:transparent;border-color:transparent;color:#606c76}.button.button-clear[disabled]:focus,.button.button-clear[disabled]:hover,button.button-clear[disabled]:focus,button.button-clear[disabled]:hover,input[type='button'].button-clear[disabled]:focus,input[type='button'].button-clear[disabled]:hover,input[type='reset'].button-clear[disabled]:focus,input[type='reset'].button-clear[disabled]:hover,input[type='submit'].button-clear[disabled]:focus,input[type='submit'].button-clear[disabled]:hover{color:#9b4dca}code{background:#f4f5f6;border-radius:.4rem;font-size:86%;margin:0 .2rem;padding:.2rem .5rem;white-space:nowrap}pre{background:#f4f5f6;border-left:0.3rem solid #9b4dca;overflow-y:hidden}pre>code{border-radius:0;display:block;padding:1rem 1.5rem;white-space:pre}hr{border:0;border-top:0.1rem solid #f4f5f6;margin:3.0rem 0}input[type='email'],input[type='number'],input[type='password'],input[type='search'],input[type='tel'],input[type='text'],input[type='url'],textarea,select{-webkit-appearance:none;-moz-appearance:none;appearance:none;background-color:transparent;border:0.1rem solid #d1d1d1;border-radius:.4rem;box-shadow:none;box-sizing:inherit;height:3.8rem;padding:.6rem 1.0rem;width:100%}input[type='email']:focus,input[type='number']:focus,input[type='password']:focus,input[type='search']:focus,input[type='tel']:focus,input[type='text']:focus,input[type='url']:focus,textarea:focus,select:focus{border-color:#9b4dca;outline:0}select{background:url('data:image/svg+xml;utf8,') center right no-repeat;padding-right:3.0rem}select:focus{background-image:url('data:image/svg+xml;utf8,')}textarea{min-height:6.5rem}label,legend{display:block;font-size:1.6rem;font-weight:700;margin-bottom:.5rem}fieldset{border-width:0;padding:0}input[type='checkbox'],input[type='radio']{display:inline}.label-inline{display:inline-block;font-weight:normal;margin-left:.5rem}.container{margin:0 auto;max-width:112.0rem;padding:0 2.0rem;position:relative;width:100%}.row{display:flex;flex-direction:column;padding:0;width:100%}.row.row-no-padding{padding:0}.row.row-no-padding>.column{padding:0}.row.row-wrap{flex-wrap:wrap}.row.row-top{align-items:flex-start}.row.row-bottom{align-items:flex-end}.row.row-center{align-items:center}.row.row-stretch{align-items:stretch}.row.row-baseline{align-items:baseline}.row .column{display:block;flex:1 1 auto;margin-left:0;max-width:100%;width:100%}.row .column.column-offset-10{margin-left:10%}.row .column.column-offset-20{margin-left:20%}.row .column.column-offset-25{margin-left:25%}.row .column.column-offset-33,.row .column.column-offset-34{margin-left:33.3333%}.row .column.column-offset-50{margin-left:50%}.row .column.column-offset-66,.row .column.column-offset-67{margin-left:66.6666%}.row .column.column-offset-75{margin-left:75%}.row .column.column-offset-80{margin-left:80%}.row .column.column-offset-90{margin-left:90%}.row .column.column-10{flex:0 0 10%;max-width:10%}.row .column.column-20{flex:0 0 20%;max-width:20%}.row .column.column-25{flex:0 0 25%;max-width:25%}.row .column.column-33,.row .column.column-34{flex:0 0 33.3333%;max-width:33.3333%}.row .column.column-40{flex:0 0 40%;max-width:40%}.row .column.column-50{flex:0 0 50%;max-width:50%}.row .column.column-60{flex:0 0 60%;max-width:60%}.row .column.column-66,.row .column.column-67{flex:0 0 66.6666%;max-width:66.6666%}.row .column.column-75{flex:0 0 75%;max-width:75%}.row .column.column-80{flex:0 0 80%;max-width:80%}.row .column.column-90{flex:0 0 90%;max-width:90%}.row .column .column-top{align-self:flex-start}.row .column .column-bottom{align-self:flex-end}.row .column .column-center{-ms-grid-row-align:center;align-self:center}@media (min-width: 40rem){.row{flex-direction:row;margin-left:-1.0rem;width:calc(100% + 2.0rem)}.row .column{margin-bottom:inherit;padding:0 1.0rem}}a{color:#9b4dca;text-decoration:none}a:focus,a:hover{color:#606c76}dl,ol,ul{list-style:none;margin-top:0;padding-left:0}dl dl,dl ol,dl ul,ol dl,ol ol,ol ul,ul dl,ul ol,ul ul{font-size:90%;margin:1.5rem 0 1.5rem 3.0rem}ol{list-style:decimal inside}ul{list-style:circle inside}.button,button,dd,dt,li{margin-bottom:1.0rem}fieldset,input,select,textarea{margin-bottom:1.5rem}blockquote,dl,figure,form,ol,p,pre,table,ul{margin-bottom:2.5rem}table{border-spacing:0;width:100%}td,th{border-bottom:0.1rem solid #e1e1e1;padding:1.2rem 1.5rem;text-align:left}td:first-child,th:first-child{padding-left:0}td:last-child,th:last-child{padding-right:0}b,strong{font-weight:bold}p{margin-top:0}h1,h2,h3,h4,h5,h6{font-weight:300;letter-spacing:-.1rem;margin-bottom:2.0rem;margin-top:0}h1{font-size:4.6rem;line-height:1.2}h2{font-size:3.6rem;line-height:1.25}h3{font-size:2.8rem;line-height:1.3}h4{font-size:2.2rem;letter-spacing:-.08rem;line-height:1.35}h5{font-size:1.8rem;letter-spacing:-.05rem;line-height:1.5}h6{font-size:1.6rem;letter-spacing:0;line-height:1.4}img{max-width:100%}.clearfix:after{clear:both;content:' ';display:table}.float-left{float:left}.float-right{float:right}
-
-/*# sourceMappingURL=milligram.min.css.map */
\ No newline at end of file
diff --git a/ui/v2.5/.eslintrc.json b/ui/v2.5/.eslintrc.json
index c99b31cc3..32597b3e3 100644
--- a/ui/v2.5/.eslintrc.json
+++ b/ui/v2.5/.eslintrc.json
@@ -63,6 +63,7 @@
"react/destructuring-assignment": "off",
"react/require-default-props": "off",
"react/jsx-props-no-spreading": "off",
+ "react/sort-comp": "off",
"react/style-prop-object": ["error", {
"allow": ["FormattedNumber"]
}],
diff --git a/ui/v2.5/package.json b/ui/v2.5/package.json
index 883804306..765216f10 100644
--- a/ui/v2.5/package.json
+++ b/ui/v2.5/package.json
@@ -34,8 +34,7 @@
"@fortawesome/free-regular-svg-icons": "^5.15.2",
"@fortawesome/free-solid-svg-icons": "^5.15.2",
"@fortawesome/react-fontawesome": "^0.1.14",
- "@types/react-select": "^3.1.2",
- "@types/yup": "^0.29.11",
+ "@types/react-select": "^4.0.8",
"apollo-upload-client": "^14.1.3",
"axios": "0.21.1",
"base64-blob": "^1.4.1",
diff --git a/ui/v2.5/src/App.tsx b/ui/v2.5/src/App.tsx
index 5be2b0268..96f90da63 100755
--- a/ui/v2.5/src/App.tsx
+++ b/ui/v2.5/src/App.tsx
@@ -1,5 +1,5 @@
-import React from "react";
-import { Route, Switch } from "react-router-dom";
+import React, { useEffect } from "react";
+import { Route, Switch, useRouteMatch } from "react-router-dom";
import { IntlProvider } from "react-intl";
import { ToastProvider } from "src/hooks/Toast";
import LightboxProvider from "src/hooks/Lightbox/context";
@@ -8,7 +8,7 @@ import { fas } from "@fortawesome/free-solid-svg-icons";
import { initPolyfills } from "src/polyfills";
import locales from "src/locale";
-import { useConfiguration } from "src/core/StashService";
+import { useConfiguration, useSystemStatus } from "src/core/StashService";
import { flattenMessages } from "src/utils";
import Mousetrap from "mousetrap";
import MousetrapPause from "mousetrap-pause";
@@ -22,9 +22,14 @@ import { Settings } from "./components/Settings/Settings";
import { Stats } from "./components/Stats";
import Studios from "./components/Studios/Studios";
import { SceneFilenameParser } from "./components/SceneFilenameParser/SceneFilenameParser";
+import { SceneDuplicateChecker } from "./components/SceneDuplicateChecker/SceneDuplicateChecker";
import Movies from "./components/Movies/Movies";
import Tags from "./components/Tags/Tags";
import Images from "./components/Images/Images";
+import { Setup } from "./components/Setup/Setup";
+import { Migrate } from "./components/Setup/Migrate";
+import * as GQL from "./core/generated-graphql";
+import { LoadingIndicator } from "./components/Shared";
initPolyfills();
@@ -41,35 +46,82 @@ const intlFormats = {
export const App: React.FC = () => {
const config = useConfiguration();
+ const { data: systemStatusData } = useSystemStatus();
const language = config.data?.configuration?.interface?.language ?? "en-GB";
const messageLanguage = language.replace(/-/, "");
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const messages = flattenMessages((locales as any)[messageLanguage]);
+ const setupMatch = useRouteMatch(["/setup", "/migrate"]);
+
+ // redirect to setup or migrate as needed
+ useEffect(() => {
+ if (!systemStatusData) {
+ return;
+ }
+
+ if (
+ window.location.pathname !== "/setup" &&
+ systemStatusData.systemStatus.status === GQL.SystemStatusEnum.Setup
+ ) {
+ // redirect to setup page
+ const newURL = new URL("/setup", window.location.toString());
+ window.location.href = newURL.toString();
+ }
+
+ if (
+ window.location.pathname !== "/migrate" &&
+ systemStatusData.systemStatus.status ===
+ GQL.SystemStatusEnum.NeedsMigration
+ ) {
+ // redirect to setup page
+ const newURL = new URL("/migrate", window.location.toString());
+ window.location.href = newURL.toString();
+ }
+ }, [systemStatusData]);
+
+ function maybeRenderNavbar() {
+ // don't render navbar for setup views
+ if (!setupMatch) {
+ return - Your current stash database is schema version {{.ExistingVersion}} and needs to be migrated to version {{.MigrateVersion}}. - This version of Stash will not function without migrating the database. The schema migration process is not reversible. Once the migration is - performed, your database will be incompatible with previous versions of stash. -
- -
- It is recommended that you backup your existing database before you migrate. We can do this for you, writing a backup to {{.BackupPath}} if required.
-
-
-
-
+ {maybeRenderNavbar()}
+ {renderContent()}
Changelog:
-
- 
-
-
- ));
-
- return (
-
-
-
-
-
- ));
-
- return (
- showLightbox(index)}
- onKeyPress={() => showLightbox(index)}
+ onClick={() => handleImageOpen(index)}
+ onKeyPress={() => handleImageOpen(index)}
>
{
const [backImage, setBackImage] = useState(
undefined
);
- const [name, setName] = useState(undefined);
- const [aliases, setAliases] = useState(undefined);
- const [duration, setDuration] = useState(undefined);
- const [date, setDate] = useState(undefined);
- const [rating, setRating] = useState(undefined);
- const [studioId, setStudioId] = useState();
- const [director, setDirector] = useState(undefined);
- const [synopsis, setSynopsis] = useState(undefined);
- const [url, setUrl] = useState(undefined);
// Movie state
- const [movie, setMovie] = useState>({});
- const [imagePreview, setImagePreview] = useState(
- undefined
- );
- const [backimagePreview, setBackImagePreview] = useState(
- undefined
- );
-
const [imageClipboard, setImageClipboard] = useState(
undefined
);
// Network state
const { data, error, loading } = useFindMovie(id);
+ const movie = data?.findMovie;
+
const [isLoading, setIsLoading] = useState(false);
const [updateMovie] = useMovieUpdate();
- const [createMovie] = useMovieCreate(getMovieInput() as GQL.MovieCreateInput);
- const [deleteMovie] = useMovieDestroy(
- getMovieInput() as GQL.MovieDestroyInput
- );
-
- const Scrapers = useListMovieScrapers();
- const [scrapedMovie, setScrapedMovie] = useState<
- GQL.ScrapedMovie | undefined
- >();
-
- const intl = useIntl();
+ const [createMovie] = useMovieCreate();
+ const [deleteMovie] = useMovieDestroy({ id });
// set up hotkeys
useEffect(() => {
- if (isEditing) {
- Mousetrap.bind("r 0", () => setRating(NaN));
- Mousetrap.bind("r 1", () => setRating(1));
- Mousetrap.bind("r 2", () => setRating(2));
- Mousetrap.bind("r 3", () => setRating(3));
- Mousetrap.bind("r 4", () => setRating(4));
- Mousetrap.bind("r 5", () => setRating(5));
- // Mousetrap.bind("u", (e) => {
- // setStudioFocus()
- // e.preventDefault();
- // });
- Mousetrap.bind("s s", () => onSave());
- }
-
Mousetrap.bind("e", () => setIsEditing(true));
Mousetrap.bind("d d", () => onDelete());
return () => {
- if (isEditing) {
- Mousetrap.unbind("r 0");
- Mousetrap.unbind("r 1");
- Mousetrap.unbind("r 2");
- Mousetrap.unbind("r 3");
- Mousetrap.unbind("r 4");
- Mousetrap.unbind("r 5");
- // Mousetrap.unbind("u");
- Mousetrap.unbind("s s");
- }
-
Mousetrap.unbind("e");
Mousetrap.unbind("d d");
};
});
- function updateMovieEditState(state: Partial) {
- setName(state.name ?? undefined);
- setAliases(state.aliases ?? undefined);
- setDuration(state.duration ?? undefined);
- setDate(state.date ?? undefined);
- setRating(state.rating ?? undefined);
- setStudioId(state?.studio?.id ?? undefined);
- setDirector(state.director ?? undefined);
- setSynopsis(state.synopsis ?? undefined);
- setUrl(state.url ?? undefined);
- }
-
- const updateMovieData = useCallback(
- (movieData: Partial) => {
- setFrontImage(undefined);
- setBackImage(undefined);
- updateMovieEditState(movieData);
- setImagePreview(movieData.front_image_path ?? undefined);
- setBackImagePreview(movieData.back_image_path ?? undefined);
- setMovie(movieData);
- },
- []
- );
-
- useEffect(() => {
- if (data && data.findMovie) {
- updateMovieData(data.findMovie);
- }
- }, [data, updateMovieData]);
-
function showImageAlert(imageData: string) {
setImageClipboard(imageData);
setIsImageAlertOpen(true);
@@ -165,10 +76,8 @@ export const Movie: React.FC = () => {
function setImageFromClipboard(isFrontImage: boolean) {
if (isFrontImage) {
- setImagePreview(imageClipboard);
setFrontImage(imageClipboard);
} else {
- setBackImagePreview(imageClipboard);
setBackImage(imageClipboard);
}
@@ -176,16 +85,6 @@ export const Movie: React.FC = () => {
setIsImageAlertOpen(false);
}
- function onBackImageLoad(imageData: string) {
- setBackImagePreview(imageData);
- setBackImage(imageData);
- }
-
- function onFrontImageLoad(imageData: string) {
- setImagePreview(imageData);
- setFrontImage(imageData);
- }
-
const encodingImage = ImageUtils.usePasteImage(showImageAlert, isEditing);
if (!isNew && !isEditing) {
@@ -195,41 +94,41 @@ export const Movie: React.FC = () => {
}
}
- function getMovieInput() {
- const input: Partial = {
- name,
- aliases,
- duration,
- date,
- rating: rating ?? null,
- studio_id: studioId ?? null,
- director,
- synopsis,
- url,
+ function getMovieInput(
+ input: Partial
+ ) {
+ const ret: Partial = {
+ ...input,
front_image: frontImage,
back_image: backImage,
};
if (!isNew) {
- (input as GQL.MovieUpdateInput).id = id;
+ (ret as GQL.MovieUpdateInput).id = id;
}
- return input;
+ return ret;
}
- async function onSave() {
+ async function onSave(
+ input: Partial
+ ) {
try {
+ setIsLoading(true);
+
if (!isNew) {
const result = await updateMovie({
variables: {
- input: getMovieInput() as GQL.MovieUpdateInput,
+ input: getMovieInput(input) as GQL.MovieUpdateInput,
},
});
if (result.data?.movieUpdate) {
- updateMovieData(result.data.movieUpdate);
setIsEditing(false);
+ history.push(`/movies/${result.data.movieUpdate.id}`);
}
} else {
- const result = await createMovie();
+ const result = await createMovie({
+ variables: getMovieInput(input) as GQL.MovieCreateInput,
+ });
if (result.data?.movieCreate?.id) {
history.push(`/movies/${result.data.movieCreate.id}`);
setIsEditing(false);
@@ -237,31 +136,29 @@ export const Movie: React.FC = () => {
}
} catch (e) {
Toast.error(e);
+ } finally {
+ setIsLoading(false);
}
}
async function onDelete() {
try {
+ setIsLoading(true);
await deleteMovie();
} catch (e) {
Toast.error(e);
+ } finally {
+ setIsLoading(false);
}
// redirect to movies page
history.push(`/movies`);
}
- function onFrontImageChange(event: React.FormEvent) {
- ImageUtils.onImageChange(event, onFrontImageLoad);
- }
-
- function onBackImageChange(event: React.FormEvent) {
- ImageUtils.onImageChange(event, onBackImageLoad);
- }
-
function onToggleEdit() {
setIsEditing(!isEditing);
- updateMovieData(movie);
+ setFrontImage(undefined);
+ setBackImage(undefined);
}
function renderDeleteAlert() {
@@ -272,7 +169,7 @@ export const Movie: React.FC = () => {
accept={{ text: "Delete", variant: "danger", onClick: onDelete }}
cancel={{ onClick: () => setIsDeleteAlertOpen(false) }}
>
-
- ) {
- if (state.name) {
- setName(state.name);
- }
-
- if (state.aliases) {
- setAliases(state.aliases ?? undefined);
- }
-
- if (state.duration) {
- setDuration(DurationUtils.stringToSeconds(state.duration) ?? undefined);
- }
-
- if (state.date) {
- setDate(state.date ?? undefined);
- }
-
- if (state.studio && state.studio.id) {
- setStudioId(state.studio.id ?? undefined);
- }
-
- if (state.director) {
- setDirector(state.director ?? undefined);
- }
- if (state.synopsis) {
- setSynopsis(state.synopsis ?? undefined);
- }
- if (state.url) {
- setUrl(state.url ?? undefined);
- }
-
- // image is a base64 string
- // #404: don't overwrite image if it has been modified by the user
- // overwrite if not new since it came from a dialog
- // otherwise follow existing behaviour
- if (
- (!isNew || frontImage === undefined) &&
- (state as GQL.ScrapedMovieDataFragment).front_image !== undefined
- ) {
- const imageStr = (state as GQL.ScrapedMovieDataFragment).front_image;
- setFrontImage(imageStr ?? undefined);
- setImagePreview(imageStr ?? undefined);
- }
-
- if (
- (!isNew || backImage === undefined) &&
- (state as GQL.ScrapedMovieDataFragment).back_image !== undefined
- ) {
- const imageStr = (state as GQL.ScrapedMovieDataFragment).back_image;
- setBackImage(imageStr ?? undefined);
- setBackImagePreview(imageStr ?? undefined);
- }
- }
-
- async function onScrapeMovieURL() {
- if (!url) return;
- setIsLoading(true);
-
- try {
- const result = await queryScrapeMovieURL(url);
- if (!result.data || !result.data.scrapeMovieURL) {
- return;
+ function renderFrontImage() {
+ let image = movie?.front_image_path;
+ if (isEditing) {
+ if (frontImage === null) {
+ image = `${image}&default=true`;
+ } else if (frontImage) {
+ image = frontImage;
}
+ }
- // if this is a new movie, just dump the data
- if (isNew) {
- updateMovieEditStateFromScraper(result.data.scrapeMovieURL);
- } else {
- setScrapedMovie(result.data.scrapeMovieURL);
+ if (image) {
+ return (
+ {
- onScrapeDialogClosed(m);
- }}
- />
- );
- }
-
- function onScrapeDialogClosed(p?: GQL.ScrapedMovieDataFragment) {
- if (p) {
- updateMovieEditStateFromScraper(p);
+ if (image) {
+ return (
+
Are you sure you want to delete {name ?? "movie"}?
+Are you sure you want to delete {movie?.name ?? "movie"}?
); } @@ -314,153 +211,42 @@ export const Movie: React.FC = () => { ); } - function updateMovieEditStateFromScraper( - state: Partial
+ 
+
+ );
+ }
+ }
+
+ function renderBackImage() {
+ let image = movie?.back_image_path;
+ if (isEditing) {
+ if (backImage === null) {
+ image = undefined;
+ } else if (backImage) {
+ image = backImage;
}
- } catch (e) {
- Toast.error(e);
- } finally {
- setIsLoading(false);
- }
- }
-
- function urlScrapable(scrapedUrl: string) {
- return (
- !!scrapedUrl &&
- (Scrapers?.data?.listMovieScrapers ?? []).some((s) =>
- (s?.movie?.urls ?? []).some((u) => scrapedUrl.includes(u))
- )
- );
- }
-
- function maybeRenderScrapeButton() {
- if (!url || !isEditing || !urlScrapable(url)) {
- return undefined;
- }
- return (
-
- );
- }
-
- function maybeRenderScrapeDialog() {
- if (!scrapedMovie) {
- return;
}
- const currentMovie = getMovieInput();
-
- // Get image paths for scrape gui
- currentMovie.front_image = movie.front_image_path;
- currentMovie.back_image = movie.back_image_path;
-
- return (
-
+
+
+ );
}
- setScrapedMovie(undefined);
- }
-
- function onClearFrontImage() {
- setFrontImage(null);
- setImagePreview(
- movie.front_image_path
- ? `${movie.front_image_path}?default=true`
- : undefined
- );
- }
-
- function onClearBackImage() {
- setBackImage(null);
- setBackImagePreview(
- movie.back_image_path
- ? `${movie.back_image_path}?default=true`
- : undefined
- );
}
if (isLoading) return
-
- {isNew &&
-
- {TableUtils.renderInputGroup({
- title: "Name",
- value: name ?? "",
- isEditing: !!isEditing,
- onChange: setName,
- })}
- {TableUtils.renderInputGroup({
- title: "Aliases",
- value: aliases,
- isEditing,
- onChange: setAliases,
- })}
- {TableUtils.renderDurationInput({
- title: "Duration",
- value: duration ? duration.toString() : "",
- isEditing,
- onChange: (value: string | undefined) =>
- setDuration(value ? Number.parseInt(value, 10) : undefined),
- })}
- {TableUtils.renderInputGroup({
- title: `Date ${isEditing ? "(YYYY-MM-DD)" : ""}`,
- value: isEditing ? date : TextUtils.formatDate(intl, date),
- isEditing,
- onChange: setDate,
- })}
-
-
-
- URL {maybeRenderScrapeButton()}
-
-
-
- Synopsis
- ) =>
- setSynopsis(newValue.currentTarget.value)
- }
- value={synopsis}
+ {!isEditing && movie ? (
+ <>
+ {}}
+ onImageChange={() => {}}
+ onDelete={onDelete}
+ />
+
+ ) : (
+
-
- ;
+}
+
+export const MovieDetailsPanel: React.FC = ({ movie }) => {
+ // Network state
+ const intl = useIntl();
+
+ function maybeRenderAliases() {
+ if (movie.aliases) {
+ return (
+ ;
+ onSubmit: (
+ movie: Partial
+ ) => void;
+ onCancel: () => void;
+ onDelete: () => void;
+ setFrontImage: (image?: string | null) => void;
+ setBackImage: (image?: string | null) => void;
+}
+
+export const MovieEditPanel: React.FC = ({
+ movie,
+ onSubmit,
+ onCancel,
+ onDelete,
+ setFrontImage,
+ setBackImage,
+}) => {
+ const Toast = useToast();
+
+ const isNew = movie === undefined;
+
+ const [isLoading, setIsLoading] = useState(false);
+
+ const Scrapers = useListMovieScrapers();
+ const [scrapedMovie, setScrapedMovie] = useState<
+ GQL.ScrapedMovie | undefined
+ >();
+
+ const labelXS = 3;
+ const labelXL = 3;
+ const fieldXS = 9;
+ const fieldXL = 9;
+
+ const schema = yup.object({
+ name: yup.string().required(),
+ aliases: yup.string().optional().nullable(),
+ duration: yup.string().optional().nullable(),
+ date: yup
+ .string()
+ .optional()
+ .nullable()
+ .matches(/^\d{4}-\d{2}-\d{2}$/),
+ rating: yup.number().optional().nullable(),
+ studio_id: yup.string().optional().nullable(),
+ director: yup.string().optional().nullable(),
+ synopsis: yup.string().optional().nullable(),
+ url: yup.string().optional().nullable(),
+ });
+
+ const initialValues = {
+ name: movie?.name,
+ aliases: movie?.aliases,
+ duration: movie?.duration,
+ date: movie?.date,
+ rating: movie?.rating,
+ studio_id: movie?.studio?.id,
+ director: movie?.director,
+ synopsis: movie?.synopsis,
+ url: movie?.url,
+ };
+
+ type InputValues = typeof initialValues;
+
+ const formik = useFormik({
+ initialValues,
+ validationSchema: schema,
+ onSubmit: (values) => onSubmit(getMovieInput(values)),
+ });
+
+ function setRating(v: number) {
+ formik.setFieldValue("rating", v);
+ }
+
+ // set up hotkeys
+ useEffect(() => {
+ Mousetrap.bind("r 0", () => setRating(NaN));
+ Mousetrap.bind("r 1", () => setRating(1));
+ Mousetrap.bind("r 2", () => setRating(2));
+ Mousetrap.bind("r 3", () => setRating(3));
+ Mousetrap.bind("r 4", () => setRating(4));
+ Mousetrap.bind("r 5", () => setRating(5));
+ // Mousetrap.bind("u", (e) => {
+ // setStudioFocus()
+ // e.preventDefault();
+ // });
+ Mousetrap.bind("s s", () => formik.handleSubmit());
+
+ return () => {
+ Mousetrap.unbind("r 0");
+ Mousetrap.unbind("r 1");
+ Mousetrap.unbind("r 2");
+ Mousetrap.unbind("r 3");
+ Mousetrap.unbind("r 4");
+ Mousetrap.unbind("r 5");
+ // Mousetrap.unbind("u");
+ Mousetrap.unbind("s s");
+ };
+ });
+
+ function getMovieInput(values: InputValues) {
+ const input: Partial = {
+ ...values,
+ rating: values.rating ?? null,
+ studio_id: values.studio_id ?? null,
+ };
+
+ if (movie && movie.id) {
+ (input as GQL.MovieUpdateInput).id = movie.id;
+ }
+ return input;
+ }
+
+ function updateMovieEditStateFromScraper(
+ state: Partial
+ ) {
+ if (state.name) {
+ formik.setFieldValue("name", state.name);
+ }
+
+ if (state.aliases) {
+ formik.setFieldValue("aliases", state.aliases ?? undefined);
+ }
+
+ if (state.duration) {
+ formik.setFieldValue(
+ "duration",
+ DurationUtils.stringToSeconds(state.duration) ?? undefined
+ );
+ }
+
+ if (state.date) {
+ formik.setFieldValue("date", state.date ?? undefined);
+ }
+
+ if (state.studio && state.studio.id) {
+ formik.setFieldValue("studio_id", state.studio.id ?? undefined);
+ }
+
+ if (state.director) {
+ formik.setFieldValue("director", state.director ?? undefined);
+ }
+ if (state.synopsis) {
+ formik.setFieldValue("synopsis", state.synopsis ?? undefined);
+ }
+ if (state.url) {
+ formik.setFieldValue("url", state.url ?? undefined);
+ }
+
+ const imageStr = (state as GQL.ScrapedMovieDataFragment).front_image;
+ setFrontImage(imageStr ?? undefined);
+
+ const backImageStr = (state as GQL.ScrapedMovieDataFragment).back_image;
+ setBackImage(backImageStr ?? undefined);
+ }
+
+ async function onScrapeMovieURL() {
+ const { url } = formik.values;
+ if (!url) return;
+ setIsLoading(true);
+
+ try {
+ const result = await queryScrapeMovieURL(url);
+ if (!result.data || !result.data.scrapeMovieURL) {
+ return;
+ }
+
+ // if this is a new movie, just dump the data
+ if (isNew) {
+ updateMovieEditStateFromScraper(result.data.scrapeMovieURL);
+ } else {
+ setScrapedMovie(result.data.scrapeMovieURL);
+ }
+ } catch (e) {
+ Toast.error(e);
+ } finally {
+ setIsLoading(false);
+ }
+ }
+
+ function urlScrapable(scrapedUrl: string) {
+ return (
+ !!scrapedUrl &&
+ (Scrapers?.data?.listMovieScrapers ?? []).some((s) =>
+ (s?.movie?.urls ?? []).some((u) => scrapedUrl.includes(u))
+ )
+ );
+ }
+
+ function maybeRenderScrapeButton() {
+ const { url } = formik.values;
+ if (!url || !urlScrapable(url)) {
+ return undefined;
+ }
+ return (
+
+ );
+ }
+
+ function maybeRenderScrapeDialog() {
+ if (!scrapedMovie) {
+ return;
+ }
+
+ const currentMovie = getMovieInput(formik.values);
+
+ // Get image paths for scrape gui
+ currentMovie.front_image = movie?.front_image_path;
+ currentMovie.back_image = movie?.back_image_path;
+
+ return (
+ {
+ onScrapeDialogClosed(m);
+ }}
+ />
+ );
+ }
+
+ function onScrapeDialogClosed(p?: GQL.ScrapedMovieDataFragment) {
+ if (p) {
+ updateMovieEditStateFromScraper(p);
+ }
+ setScrapedMovie(undefined);
+ }
+
+ function onFrontImageChange(event: React.FormEvent) {
+ ImageUtils.onImageChange(event, setFrontImage);
+ }
+
+ function onBackImageChange(event: React.FormEvent) {
+ ImageUtils.onImageChange(event, setBackImage);
+ }
+
+ if (isLoading) return
+
+ {title}
+
+
+ );
+ }
+
+ // TODO: CSS class
+ return (
+ = ({ movie }) => {
}
if (movie && movie.id) {
- return = (
props: IListOperationProps
) => {
const Toast = useToast();
-
+ const [rating, setRating] = useState();
const [tagMode, setTagMode] = React.useState(
GQL.BulkUpdateIdMode.Add
);
@@ -43,6 +45,7 @@ export const EditPerformersDialog: React.FC = (
function getPerformerInput(): GQL.BulkPerformerUpdateInput {
// need to determine what we are actually setting on each performer
const aggregateTagIds = getTagIds(props.selected);
+ const aggregateRating = getRating(props.selected);
const performerInput: GQL.BulkPerformerUpdateInput = {
ids: props.selected.map((performer) => {
@@ -50,6 +53,19 @@ export const EditPerformersDialog: React.FC = (
}),
};
+ // if rating is undefined
+ if (rating === undefined) {
+ // and all galleries have the same rating, then we are unsetting the rating.
+ if (aggregateRating) {
+ // null to unset rating
+ performerInput.rating = null;
+ }
+ // otherwise not setting the rating
+ } else {
+ // if rating is set, then we are setting the rating for all
+ performerInput.rating = rating;
+ }
+
// if tagIds non-empty, then we are setting them
if (
tagMode === GQL.BulkUpdateIdMode.Set &&
@@ -106,19 +122,38 @@ export const EditPerformersDialog: React.FC = (
return ret;
}
+ function getRating(state: GQL.SlimPerformerDataFragment[]) {
+ let ret: number | undefined;
+ let first = true;
+
+ state.forEach((performer) => {
+ if (first) {
+ ret = performer.rating ?? undefined;
+ first = false;
+ } else if (ret !== performer.rating) {
+ ret = undefined;
+ }
+ });
+
+ return ret;
+ }
+
useEffect(() => {
const state = props.selected;
let updateTagIds: string[] = [];
let updateFavorite: boolean | undefined;
+ let updateRating: number | undefined;
let first = true;
state.forEach((performer: GQL.SlimPerformerDataFragment) => {
const performerTagIDs = (performer.tags ?? []).map((p) => p.id).sort();
+ const performerRating = performer.rating;
if (first) {
updateTagIds = performerTagIDs;
first = false;
updateFavorite = performer.favorite;
+ updateRating = performerRating ?? undefined;
} else {
if (!_.isEqual(performerTagIDs, updateTagIds)) {
updateTagIds = [];
@@ -126,6 +161,9 @@ export const EditPerformersDialog: React.FC = (
if (performer.favorite !== updateFavorite) {
updateFavorite = undefined;
}
+ if (performerRating !== updateRating) {
+ updateRating = undefined;
+ }
}
});
@@ -133,6 +171,7 @@ export const EditPerformersDialog: React.FC = (
setTagIds(updateTagIds);
}
setFavorite(updateFavorite);
+ setRating(updateRating);
}, [props.selected, tagMode]);
useEffect(() => {
@@ -201,6 +240,18 @@ export const EditPerformersDialog: React.FC = (
}}
isRunning={isUpdating}
>
+
+ {FormUtils.renderLabel({
+ title: "Rating",
+ })}
+ setRating(value)}
+ disabled={isUpdating}
+ />
+
+
Add Movie
} +
{encodingImage ? (
- 
-
+
-
+ {renderFrontImage()}
+ {renderBackImage()}
+
)}
| Studio | -
- |
-
| Rating | -
- |
-
- {EditableTextUtils.renderInputGroup({
- isEditing,
- onChange: setUrl,
- value: url,
- url: TextUtils.sanitiseURL(url),
- })}
-
-
+
+ {!isNew && movie && (
+
);
};
diff --git a/ui/v2.5/src/components/Movies/MovieDetails/MovieDetailsPanel.tsx b/ui/v2.5/src/components/Movies/MovieDetails/MovieDetailsPanel.tsx
new file mode 100644
index 000000000..5f3c27fe0
--- /dev/null
+++ b/ui/v2.5/src/components/Movies/MovieDetails/MovieDetailsPanel.tsx
@@ -0,0 +1,81 @@
+import React from "react";
+import { useIntl } from "react-intl";
+import * as GQL from "src/core/generated-graphql";
+import { DurationUtils, TextUtils } from "src/utils";
+import { RatingStars } from "src/components/Scenes/SceneDetails/RatingStars";
+import { TextField, URLField } from "src/utils/field";
+
+interface IMovieDetailsPanel {
+ movie: Partial
+ Also known as
+ {movie.aliases}
+
+ );
+ }
+ }
+
+ function renderRatingField() {
+ if (!movie.rating) {
+ return;
+ }
+
+ return (
+ -
+
+
+ );
+};
diff --git a/ui/v2.5/src/components/Movies/MovieDetails/MovieEditPanel.tsx b/ui/v2.5/src/components/Movies/MovieDetails/MovieEditPanel.tsx
new file mode 100644
index 000000000..4c9a71aa0
--- /dev/null
+++ b/ui/v2.5/src/components/Movies/MovieDetails/MovieEditPanel.tsx
@@ -0,0 +1,418 @@
+import React, { useEffect, useState } from "react";
+import * as GQL from "src/core/generated-graphql";
+import * as yup from "yup";
+import Mousetrap from "mousetrap";
+import {
+ queryScrapeMovieURL,
+ useListMovieScrapers,
+} from "src/core/StashService";
+import {
+ LoadingIndicator,
+ StudioSelect,
+ Icon,
+ DetailsEditNavbar,
+ DurationInput,
+} from "src/components/Shared";
+import { useToast } from "src/hooks";
+import { Form, Button, Col, Row, InputGroup } from "react-bootstrap";
+import { DurationUtils, ImageUtils } from "src/utils";
+import { RatingStars } from "src/components/Scenes/SceneDetails/RatingStars";
+import { useFormik } from "formik";
+import { Prompt } from "react-router-dom";
+import { MovieScrapeDialog } from "./MovieScrapeDialog";
+
+interface IMovieEditPanel {
+ movie?: Partial
+
+
+ {maybeRenderAliases()}
+
+ {movie.name}
+
+
+
+ {isNew && formik.handleSubmit()}
+ onImageChange={onFrontImageChange}
+ onImageChangeURL={setFrontImage}
+ onClearImage={() => {
+ setFrontImage(null);
+ }}
+ onBackImageChange={onBackImageChange}
+ onBackImageChangeURL={setBackImage}
+ onClearBackImage={() => {
+ setBackImage(null);
+ }}
+ onDelete={onDelete}
+ />
+
+ {maybeRenderScrapeDialog()}
+
+ );
+};
diff --git a/ui/v2.5/src/components/Movies/MovieDetails/MovieScenesPanel.tsx b/ui/v2.5/src/components/Movies/MovieDetails/MovieScenesPanel.tsx
index 8a6f8c7be..aae203f8b 100644
--- a/ui/v2.5/src/components/Movies/MovieDetails/MovieScenesPanel.tsx
+++ b/ui/v2.5/src/components/Movies/MovieDetails/MovieScenesPanel.tsx
@@ -42,7 +42,9 @@ export const MovieScenesPanel: React.FC