Sort tags by name while scraping or merging scenes (#5752)

* Sort tags by name while scraping scenes
* TagStore.All should sort by sort_name first
* Sort tag by sort name/name in TagIDSelect
---------
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>

pkg/models/model_scraped_item.go

@@ -3,6 +3,7 @@ package models
 import (
 	"context"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/stashapp/stash/pkg/sliceutil/stringslice"
@@ -400,6 +401,10 @@ type ScrapedTag struct {
 
 func (ScrapedTag) IsScrapedContent() {}
 
+func ScrapedTagSortFunction(a, b *ScrapedTag) int {
+	return strings.Compare(strings.ToLower(a.Name), strings.ToLower(b.Name))
+}
+
 // A movie from a scraping operation...
 type ScrapedMovie struct {
 	StoredID *string        `json:"stored_id"`

pkg/scraper/tag.go

@@ -32,6 +32,8 @@ func FilterTags(excludeRegexps []*regexp.Regexp, tags []*models.ScrapedTag) (new
 		return tags, nil
 	}
 
+	newTags = make([]*models.ScrapedTag, 0, len(tags))
+
 	for _, t := range tags {
 		ignore := false
 		for _, reg := range excludeRegexps {

pkg/sqlite/tag.go

@@ -562,7 +562,7 @@ func (qb *TagStore) All(ctx context.Context) ([]*models.Tag, error) {
 	table := qb.table()
 
 	return qb.getMany(ctx, qb.selectDataset().Order(
-		table.Col("name").Asc(),
+		goqu.L("COALESCE(tags.sort_name, tags.name) COLLATE NATURAL_CI").Asc(),
 		table.Col(idColumn).Asc(),
 	))
 }

pkg/stashbox/graphql/generated_models.go

@@ -1018,6 +1018,7 @@ type StashBoxConfig struct {
 	GuidelinesURL              string `json:"guidelines_url"`
 	RequireSceneDraft          bool   `json:"require_scene_draft"`
 	EditUpdateLimit            int    `json:"edit_update_limit"`
+	RequireTagRole             bool   `json:"require_tag_role"`
 }
 
 type StringCriterionInput struct {
@@ -2143,6 +2144,8 @@ const (
 	// May grant and rescind invite tokens and resind invite keys
 	RoleEnumManageInvites RoleEnum = "MANAGE_INVITES"
 	RoleEnumBot           RoleEnum = "BOT"
+	RoleEnumReadOnly      RoleEnum = "READ_ONLY"
+	RoleEnumEditTags      RoleEnum = "EDIT_TAGS"
 )
 
 var AllRoleEnum = []RoleEnum{
@@ -2154,11 +2157,13 @@ var AllRoleEnum = []RoleEnum{
 	RoleEnumInvite,
 	RoleEnumManageInvites,
 	RoleEnumBot,
+	RoleEnumReadOnly,
+	RoleEnumEditTags,
 }
 
 func (e RoleEnum) IsValid() bool {
 	switch e {
-	case RoleEnumRead, RoleEnumVote, RoleEnumEdit, RoleEnumModify, RoleEnumAdmin, RoleEnumInvite, RoleEnumManageInvites, RoleEnumBot:
+	case RoleEnumRead, RoleEnumVote, RoleEnumEdit, RoleEnumModify, RoleEnumAdmin, RoleEnumInvite, RoleEnumManageInvites, RoleEnumBot, RoleEnumReadOnly, RoleEnumEditTags:
 		return true
 	}
 	return false