Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Scene Gender Filter #5608

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .idea/go.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions graphql/schema/types/filters.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,8 @@ input SceneFilterType {
performers: MultiCriterionInput
"Filter by performer count"
performer_count: IntCriterionInput
"Filter by performer gender"
performer_gender: GenderCriterionInput
"Filter by StashID"
stash_id_endpoint: StashIDCriterionInput
"Filter by url"
Expand Down
2 changes: 2 additions & 0 deletions pkg/models/scene.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ type SceneFilterType struct {
PerformerFavorite *bool `json:"performer_favorite"`
// Filter scenes by performer age at time of scene
PerformerAge *IntCriterionInput `json:"performer_age"`
// Filter by performer gender
PerformerGender *GenderCriterionInput `json:"performer_gender"`
// Filter to only include scenes with these performers
Performers *MultiCriterionInput `json:"performers"`
// Filter by performer count
Expand Down
16 changes: 16 additions & 0 deletions pkg/sqlite/scene_filter.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ func (qb *sceneFilterHandler) criterionHandler() criterionHandler {
intCriterionHandler(sceneFilter.ID, "scenes.id", nil),
pathCriterionHandler(sceneFilter.Path, "folders.path", "files.basename", qb.addFoldersTable),
qb.fileCountCriterionHandler(sceneFilter.FileCount),
qb.performerGenderCriterionHandler(sceneFilter.PerformerGender),
stringCriterionHandler(sceneFilter.Title, "scenes.title"),
stringCriterionHandler(sceneFilter.Code, "scenes.code"),
stringCriterionHandler(sceneFilter.Details, "scenes.details"),
Expand Down Expand Up @@ -307,6 +308,21 @@ func (qb *sceneFilterHandler) hasMarkersCriterionHandler(hasMarkers *string) cri
}
}

func (qb *sceneFilterHandler) performerGenderCriterionHandler(genderFilter *models.GenderCriterionInput) criterionHandlerFunc {
return func(ctx context.Context, f *filterBuilder) {
if genderFilter != nil {
f.addInnerJoin("performers_scenes", "", "scenes.id = performers_scenes.scene_id")
f.addInnerJoin("performers", "", "performers_scenes.performer_id = performers.id")

// Apply the gender filter
stringCriterionHandler(&models.StringCriterionInput{
Value: string(genderFilter.Value),
Modifier: genderFilter.Modifier,
}, "performers.gender")(ctx, f)
}
}
}

func (qb *sceneFilterHandler) isMissingCriterionHandler(isMissing *string) criterionHandlerFunc {
return func(ctx context.Context, f *filterBuilder) {
if isMissing != nil && *isMissing != "" {
Expand Down
2 changes: 2 additions & 0 deletions ui/v2.5/src/models/list-filter/scenes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import { StashIDCriterionOption } from "./criteria/stash-ids";
import { RatingCriterionOption } from "./criteria/rating";
import { PathCriterionOption } from "./criteria/path";
import { OrientationCriterionOption } from "./criteria/orientation";
import { GenderCriterionOption } from "./criteria/gender";

const defaultSortBy = "date";
const sortByOptions = [
Expand Down Expand Up @@ -74,6 +75,7 @@ const displayModeOptions = [
];

const criterionOptions = [
GenderCriterionOption,
createStringCriterionOption("title"),
createStringCriterionOption("code", "scene_code"),
PathCriterionOption,
Expand Down
Loading