diff --git a/pkg/session/authentication.go b/pkg/session/authentication.go
index 3d756d7a2..d9a02314b 100644
--- a/pkg/session/authentication.go
+++ b/pkg/session/authentication.go
@@ -81,6 +81,6 @@ func LogExternalAccessError(err ExternalAccessError) {
"You probably forwarded a port from your router. At the very least, add a password to stash in the settings. \n"+
"Stash will not serve requests until you edit config.yml, remove the security_tripwire_accessed_from_public_internet key and restart stash. \n"+
"This behaviour can be overridden (but not recommended) by setting dangerous_allow_public_without_auth to true in config.yml. \n"+
- "More information is available at https://github.com/stashapp/stash/wiki/Authentication-Required-When-Accessing-Stash-From-the-Internet \n"+
+ "More information is available at https://docs.stashapp.cc/networking/authentication-required-when-accessing-stash-from-the-internet \n"+
"Stash is not answering any other requests to protect your privacy.", net.IP(err).String())
}
diff --git a/pkg/sliceutil/stringslice/string_collections.go b/pkg/sliceutil/stringslice/string_collections.go
index f466d911b..3c66c5c48 100644
--- a/pkg/sliceutil/stringslice/string_collections.go
+++ b/pkg/sliceutil/stringslice/string_collections.go
@@ -1,6 +1,9 @@
package stringslice
-import "strconv"
+import (
+ "strconv"
+ "strings"
+)
// https://gobyexample.com/collection-functions
@@ -56,6 +59,19 @@ func StrAppendUniques(vs []string, toAdd []string) []string {
return vs
}
+// StrExclude removes all instances of any value in toExclude from the vs string
+// slice. It returns the new or unchanged string slice.
+func StrExclude(vs []string, toExclude []string) []string {
+ var ret []string
+ for _, v := range vs {
+ if !StrInclude(toExclude, v) {
+ ret = append(ret, v)
+ }
+ }
+
+ return ret
+}
+
// StrUnique returns the vs string slice with non-unique values removed.
func StrUnique(vs []string) []string {
distinctValues := make(map[string]struct{})
@@ -94,3 +110,13 @@ func StringSliceToIntSlice(ss []string) ([]int, error) {
return ret, nil
}
+
+// FromString converts a string to a slice of strings, splitting on the sep character.
+// Unlike strings.Split, this function will also trim whitespace from the resulting strings.
+func FromString(s string, sep string) []string {
+ v := strings.Split(s, ",")
+ for i, vv := range v {
+ v[i] = strings.TrimSpace(vv)
+ }
+ return v
+}
diff --git a/pkg/sqlite/anonymise.go b/pkg/sqlite/anonymise.go
new file mode 100644
index 000000000..c16d1160d
--- /dev/null
+++ b/pkg/sqlite/anonymise.go
@@ -0,0 +1,897 @@
+package sqlite
+
+import (
+ "context"
+ "crypto/rand"
+ "database/sql"
+ "fmt"
+ "math/big"
+ "path/filepath"
+ "strings"
+ "unicode"
+
+ "github.com/doug-martin/goqu/v9"
+ "github.com/doug-martin/goqu/v9/exp"
+ "github.com/jmoiron/sqlx"
+ "github.com/stashapp/stash/pkg/logger"
+ "github.com/stashapp/stash/pkg/txn"
+ "github.com/stashapp/stash/pkg/utils"
+)
+
+const (
+ letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+ hex = "0123456789abcdef"
+)
+
+type Anonymiser struct {
+ *Database
+}
+
+func NewAnonymiser(db *Database, outPath string) (*Anonymiser, error) {
+ if _, err := db.db.Exec(fmt.Sprintf(`VACUUM INTO "%s"`, outPath)); err != nil {
+ return nil, fmt.Errorf("vacuuming into %s: %w", outPath, err)
+ }
+
+ newDB := NewDatabase()
+ if err := newDB.Open(outPath); err != nil {
+ return nil, fmt.Errorf("opening %s: %w", outPath, err)
+ }
+
+ return &Anonymiser{Database: newDB}, nil
+}
+
+func (db *Anonymiser) Anonymise(ctx context.Context) error {
+ if err := func() error {
+ defer db.Close()
+
+ return utils.Do([]func() error{
+ func() error { return db.deleteBlobs() },
+ func() error { return db.deleteStashIDs() },
+ func() error { return db.anonymiseFolders(ctx) },
+ func() error { return db.anonymiseFiles(ctx) },
+ func() error { return db.anonymiseFingerprints(ctx) },
+ func() error { return db.anonymiseScenes(ctx) },
+ func() error { return db.anonymiseMarkers(ctx) },
+ func() error { return db.anonymiseImages(ctx) },
+ func() error { return db.anonymiseGalleries(ctx) },
+ func() error { return db.anonymisePerformers(ctx) },
+ func() error { return db.anonymiseStudios(ctx) },
+ func() error { return db.anonymiseTags(ctx) },
+ func() error { return db.anonymiseMovies(ctx) },
+ func() error { db.optimise(); return nil },
+ })
+ }(); err != nil {
+ // delete the database
+ _ = db.Remove()
+
+ return err
+ }
+
+ return nil
+}
+
+func (db *Anonymiser) truncateColumn(tableName string, column string) error {
+ _, err := db.db.Exec("UPDATE " + tableName + " SET " + column + " = NULL")
+ return err
+}
+
+func (db *Anonymiser) truncateTable(tableName string) error {
+ _, err := db.db.Exec("DELETE FROM " + tableName)
+ return err
+}
+
+func (db *Anonymiser) deleteBlobs() error {
+ return utils.Do([]func() error{
+ func() error { return db.truncateColumn("tags", "image_blob") },
+ func() error { return db.truncateColumn("studios", "image_blob") },
+ func() error { return db.truncateColumn("performers", "image_blob") },
+ func() error { return db.truncateColumn("scenes", "cover_blob") },
+ func() error { return db.truncateColumn("movies", "front_image_blob") },
+ func() error { return db.truncateColumn("movies", "back_image_blob") },
+
+ func() error { return db.truncateTable("blobs") },
+ })
+}
+
+func (db *Anonymiser) deleteStashIDs() error {
+ return utils.Do([]func() error{
+ func() error { return db.truncateTable("scene_stash_ids") },
+ func() error { return db.truncateTable("studio_stash_ids") },
+ func() error { return db.truncateTable("performer_stash_ids") },
+ })
+}
+
+func (db *Anonymiser) anonymiseFolders(ctx context.Context) error {
+ logger.Infof("Anonymising folders")
+ return txn.WithTxn(ctx, db, func(ctx context.Context) error {
+ return db.anonymiseFoldersRecurse(ctx, 0, "")
+ })
+}
+
+func (db *Anonymiser) anonymiseFoldersRecurse(ctx context.Context, parentFolderID int, parentPath string) error {
+ table := folderTableMgr.table
+
+ stmt := dialect.Update(table)
+
+ if parentFolderID == 0 {
+ stmt = stmt.Set(goqu.Record{"path": goqu.Cast(table.Col(idColumn), "VARCHAR")}).Where(table.Col("parent_folder_id").IsNull())
+ } else {
+ stmt = stmt.Prepared(true).Set(goqu.Record{
+ "path": goqu.L("? || ? || id", parentPath, string(filepath.Separator)),
+ }).Where(table.Col("parent_folder_id").Eq(parentFolderID))
+ }
+
+ if _, err := exec(ctx, stmt); err != nil {
+ return fmt.Errorf("anonymising %s: %w", table.GetTable(), err)
+ }
+
+ // now recurse to sub-folders
+ query := dialect.From(table).Select(table.Col(idColumn), table.Col("path"))
+ if parentFolderID == 0 {
+ query = query.Where(table.Col("parent_folder_id").IsNull())
+ } else {
+ query = query.Where(table.Col("parent_folder_id").Eq(parentFolderID))
+ }
+
+ const single = false
+ return queryFunc(ctx, query, single, func(rows *sqlx.Rows) error {
+ var id int
+ var path string
+ if err := rows.Scan(&id, &path); err != nil {
+ return err
+ }
+
+ return db.anonymiseFoldersRecurse(ctx, id, path)
+ })
+}
+
+func (db *Anonymiser) anonymiseFiles(ctx context.Context) error {
+ logger.Infof("Anonymising files")
+ return txn.WithTxn(ctx, db, func(ctx context.Context) error {
+ table := fileTableMgr.table
+ stmt := dialect.Update(table).Set(goqu.Record{"basename": goqu.Cast(table.Col(idColumn), "VARCHAR")})
+
+ if _, err := exec(ctx, stmt); err != nil {
+ return fmt.Errorf("anonymising %s: %w", table.GetTable(), err)
+ }
+
+ return nil
+ })
+}
+
+func (db *Anonymiser) anonymiseFingerprints(ctx context.Context) error {
+ logger.Infof("Anonymising fingerprints")
+ table := fingerprintTableMgr.table
+ lastID := 0
+ lastType := ""
+ total := 0
+ const logEvery = 10000
+
+ for gotSome := true; gotSome; {
+ if err := txn.WithTxn(ctx, db, func(ctx context.Context) error {
+ query := dialect.From(table).Select(
+ table.Col(fileIDColumn),
+ table.Col("type"),
+ table.Col("fingerprint"),
+ ).Where(goqu.L("(file_id, type)").Gt(goqu.L("(?, ?)", lastID, lastType))).Limit(1000)
+
+ gotSome = false
+
+ const single = false
+ return queryFunc(ctx, query, single, func(rows *sqlx.Rows) error {
+ var (
+ id int
+ typ string
+ fingerprint string
+ )
+
+ if err := rows.Scan(
+ &id,
+ &typ,
+ &fingerprint,
+ ); err != nil {
+ return err
+ }
+
+ if err := db.anonymiseFingerprint(ctx, table, "fingerprint", fingerprint); err != nil {
+ return err
+ }
+
+ lastID = id
+ lastType = typ
+
+ gotSome = true
+ total++
+
+ if total%logEvery == 0 {
+ logger.Infof("Anonymised %d fingerprints", total)
+ }
+
+ return nil
+ })
+ }); err != nil {
+ return err
+ }
+ }
+
+ return nil
+}
+
+func (db *Anonymiser) anonymiseScenes(ctx context.Context) error {
+ logger.Infof("Anonymising scenes")
+ table := sceneTableMgr.table
+ lastID := 0
+ total := 0
+ const logEvery = 10000
+
+ for gotSome := true; gotSome; {
+ if err := txn.WithTxn(ctx, db, func(ctx context.Context) error {
+ query := dialect.From(table).Select(
+ table.Col(idColumn),
+ table.Col("title"),
+ table.Col("details"),
+ table.Col("url"),
+ table.Col("code"),
+ table.Col("director"),
+ ).Where(table.Col(idColumn).Gt(lastID)).Limit(1000)
+
+ gotSome = false
+
+ const single = false
+ return queryFunc(ctx, query, single, func(rows *sqlx.Rows) error {
+ var (
+ id int
+ title sql.NullString
+ details sql.NullString
+ url sql.NullString
+ code sql.NullString
+ director sql.NullString
+ )
+
+ if err := rows.Scan(
+ &id,
+ &title,
+ &details,
+ &url,
+ &code,
+ &director,
+ ); err != nil {
+ return err
+ }
+
+ set := goqu.Record{}
+
+ // if title set set new title
+ db.obfuscateNullString(set, "title", title)
+ db.obfuscateNullString(set, "details", details)
+ db.obfuscateNullString(set, "url", url)
+
+ if len(set) > 0 {
+ stmt := dialect.Update(table).Set(set).Where(table.Col(idColumn).Eq(id))
+
+ if _, err := exec(ctx, stmt); err != nil {
+ return fmt.Errorf("anonymising %s: %w", table.GetTable(), err)
+ }
+ }
+
+ if code.Valid {
+ if err := db.anonymiseText(ctx, table, "code", code.String); err != nil {
+ return err
+ }
+ }
+
+ if director.Valid {
+ if err := db.anonymiseText(ctx, table, "director", director.String); err != nil {
+ return err
+ }
+ }
+
+ lastID = id
+ gotSome = true
+ total++
+
+ if total%logEvery == 0 {
+ logger.Infof("Anonymised %d scenes", total)
+ }
+
+ return nil
+ })
+ }); err != nil {
+ return err
+ }
+ }
+
+ return nil
+}
+
+func (db *Anonymiser) anonymiseMarkers(ctx context.Context) error {
+ logger.Infof("Anonymising scene markers")
+ table := sceneMarkerTableMgr.table
+ lastID := 0
+ total := 0
+ const logEvery = 10000
+
+ for gotSome := true; gotSome; {
+ if err := txn.WithTxn(ctx, db, func(ctx context.Context) error {
+ query := dialect.From(table).Select(
+ table.Col(idColumn),
+ table.Col("title"),
+ ).Where(table.Col(idColumn).Gt(lastID)).Limit(1000)
+
+ gotSome = false
+
+ const single = false
+ return queryFunc(ctx, query, single, func(rows *sqlx.Rows) error {
+ var (
+ id int
+ title string
+ )
+
+ if err := rows.Scan(
+ &id,
+ &title,
+ ); err != nil {
+ return err
+ }
+
+ if err := db.anonymiseText(ctx, table, "title", title); err != nil {
+ return err
+ }
+
+ lastID = id
+ gotSome = true
+ total++
+
+ if total%logEvery == 0 {
+ logger.Infof("Anonymised %d scene markers", total)
+ }
+
+ return nil
+ })
+ }); err != nil {
+ return err
+ }
+ }
+
+ return nil
+}
+
+func (db *Anonymiser) anonymiseImages(ctx context.Context) error {
+ logger.Infof("Anonymising images")
+ table := imageTableMgr.table
+ lastID := 0
+ total := 0
+ const logEvery = 10000
+
+ for gotSome := true; gotSome; {
+ if err := txn.WithTxn(ctx, db, func(ctx context.Context) error {
+ query := dialect.From(table).Select(
+ table.Col(idColumn),
+ table.Col("title"),
+ table.Col("url"),
+ ).Where(table.Col(idColumn).Gt(lastID)).Limit(1000)
+
+ gotSome = false
+
+ const single = false
+ return queryFunc(ctx, query, single, func(rows *sqlx.Rows) error {
+ var (
+ id int
+ title sql.NullString
+ url sql.NullString
+ )
+
+ if err := rows.Scan(
+ &id,
+ &title,
+ &url,
+ ); err != nil {
+ return err
+ }
+
+ set := goqu.Record{}
+ db.obfuscateNullString(set, "title", title)
+ db.obfuscateNullString(set, "url", url)
+
+ if len(set) > 0 {
+ stmt := dialect.Update(table).Set(set).Where(table.Col(idColumn).Eq(id))
+
+ if _, err := exec(ctx, stmt); err != nil {
+ return fmt.Errorf("anonymising %s: %w", table.GetTable(), err)
+ }
+ }
+
+ lastID = id
+ gotSome = true
+ total++
+
+ if total%logEvery == 0 {
+ logger.Infof("Anonymised %d images", total)
+ }
+
+ return nil
+ })
+ }); err != nil {
+ return err
+ }
+ }
+
+ return nil
+}
+
+func (db *Anonymiser) anonymiseGalleries(ctx context.Context) error {
+ logger.Infof("Anonymising galleries")
+ table := galleryTableMgr.table
+ lastID := 0
+ total := 0
+ const logEvery = 10000
+
+ for gotSome := true; gotSome; {
+ if err := txn.WithTxn(ctx, db, func(ctx context.Context) error {
+ query := dialect.From(table).Select(
+ table.Col(idColumn),
+ table.Col("title"),
+ table.Col("details"),
+ ).Where(table.Col(idColumn).Gt(lastID)).Limit(1000)
+
+ gotSome = false
+
+ const single = false
+ return queryFunc(ctx, query, single, func(rows *sqlx.Rows) error {
+ var (
+ id int
+ title sql.NullString
+ details sql.NullString
+ )
+
+ if err := rows.Scan(
+ &id,
+ &title,
+ &details,
+ ); err != nil {
+ return err
+ }
+
+ set := goqu.Record{}
+ db.obfuscateNullString(set, "title", title)
+ db.obfuscateNullString(set, "details", details)
+
+ if len(set) > 0 {
+ stmt := dialect.Update(table).Set(set).Where(table.Col(idColumn).Eq(id))
+
+ if _, err := exec(ctx, stmt); err != nil {
+ return fmt.Errorf("anonymising %s: %w", table.GetTable(), err)
+ }
+ }
+
+ lastID = id
+ gotSome = true
+ total++
+
+ if total%logEvery == 0 {
+ logger.Infof("Anonymised %d galleries", total)
+ }
+
+ return nil
+ })
+ }); err != nil {
+ return err
+ }
+ }
+
+ return nil
+}
+
+func (db *Anonymiser) anonymisePerformers(ctx context.Context) error {
+ logger.Infof("Anonymising performers")
+ table := performerTableMgr.table
+ lastID := 0
+ total := 0
+ const logEvery = 10000
+
+ for gotSome := true; gotSome; {
+ if err := txn.WithTxn(ctx, db, func(ctx context.Context) error {
+ query := dialect.From(table).Select(
+ table.Col(idColumn),
+ table.Col("name"),
+ table.Col("details"),
+ table.Col("url"),
+ table.Col("twitter"),
+ table.Col("instagram"),
+ table.Col("tattoos"),
+ table.Col("piercings"),
+ ).Where(table.Col(idColumn).Gt(lastID)).Limit(1000)
+
+ gotSome = false
+
+ const single = false
+ return queryFunc(ctx, query, single, func(rows *sqlx.Rows) error {
+ var (
+ id int
+ name sql.NullString
+ details sql.NullString
+ url sql.NullString
+ twitter sql.NullString
+ instagram sql.NullString
+ tattoos sql.NullString
+ piercings sql.NullString
+ )
+
+ if err := rows.Scan(
+ &id,
+ &name,
+ &details,
+ &url,
+ &twitter,
+ &instagram,
+ &tattoos,
+ &piercings,
+ ); err != nil {
+ return err
+ }
+
+ set := goqu.Record{}
+ db.obfuscateNullString(set, "name", name)
+ db.obfuscateNullString(set, "details", details)
+ db.obfuscateNullString(set, "url", url)
+ db.obfuscateNullString(set, "twitter", twitter)
+ db.obfuscateNullString(set, "instagram", instagram)
+ db.obfuscateNullString(set, "tattoos", tattoos)
+ db.obfuscateNullString(set, "piercings", piercings)
+
+ if len(set) > 0 {
+ stmt := dialect.Update(table).Set(set).Where(table.Col(idColumn).Eq(id))
+
+ if _, err := exec(ctx, stmt); err != nil {
+ return fmt.Errorf("anonymising %s: %w", table.GetTable(), err)
+ }
+ }
+
+ lastID = id
+ gotSome = true
+ total++
+
+ if total%logEvery == 0 {
+ logger.Infof("Anonymised %d performers", total)
+ }
+
+ return nil
+ })
+ }); err != nil {
+ return err
+ }
+ }
+
+ if err := db.anonymiseAliases(ctx, goqu.T(performersAliasesTable), "performer_id"); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (db *Anonymiser) anonymiseStudios(ctx context.Context) error {
+ logger.Infof("Anonymising studios")
+ table := studioTableMgr.table
+ lastID := 0
+ total := 0
+ const logEvery = 10000
+
+ for gotSome := true; gotSome; {
+ if err := txn.WithTxn(ctx, db, func(ctx context.Context) error {
+ query := dialect.From(table).Select(
+ table.Col(idColumn),
+ table.Col("name"),
+ table.Col("url"),
+ table.Col("details"),
+ ).Where(table.Col(idColumn).Gt(lastID)).Limit(1000)
+
+ gotSome = false
+
+ const single = false
+ return queryFunc(ctx, query, single, func(rows *sqlx.Rows) error {
+ var (
+ id int
+ name sql.NullString
+ url sql.NullString
+ details sql.NullString
+ )
+
+ if err := rows.Scan(
+ &id,
+ &name,
+ &url,
+ &details,
+ ); err != nil {
+ return err
+ }
+
+ set := goqu.Record{}
+ db.obfuscateNullString(set, "name", name)
+ db.obfuscateNullString(set, "url", url)
+ db.obfuscateNullString(set, "details", details)
+
+ if len(set) > 0 {
+ stmt := dialect.Update(table).Set(set).Where(table.Col(idColumn).Eq(id))
+
+ if _, err := exec(ctx, stmt); err != nil {
+ return fmt.Errorf("anonymising %s: %w", table.GetTable(), err)
+ }
+ }
+
+ lastID = id
+ gotSome = true
+ total++
+
+ // TODO - anonymise studio aliases
+
+ if total%logEvery == 0 {
+ logger.Infof("Anonymised %d studios", total)
+ }
+
+ return nil
+ })
+ }); err != nil {
+ return err
+ }
+ }
+
+ if err := db.anonymiseAliases(ctx, goqu.T(studioAliasesTable), "studio_id"); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (db *Anonymiser) anonymiseAliases(ctx context.Context, table exp.IdentifierExpression, idColumn string) error {
+ lastID := 0
+ lastAlias := ""
+ total := 0
+ const logEvery = 10000
+
+ for gotSome := true; gotSome; {
+ if err := txn.WithTxn(ctx, db, func(ctx context.Context) error {
+ query := dialect.From(table).Select(
+ table.Col(idColumn),
+ table.Col("alias"),
+ ).Where(goqu.L("(" + idColumn + ", alias)").Gt(goqu.L("(?, ?)", lastID, lastAlias))).Limit(1000)
+
+ gotSome = false
+
+ const single = false
+ return queryFunc(ctx, query, single, func(rows *sqlx.Rows) error {
+ var (
+ id int
+ alias sql.NullString
+ )
+
+ if err := rows.Scan(
+ &id,
+ &alias,
+ ); err != nil {
+ return err
+ }
+
+ set := goqu.Record{}
+ db.obfuscateNullString(set, "alias", alias)
+
+ if len(set) > 0 {
+ stmt := dialect.Update(table).Set(set).Where(
+ table.Col(idColumn).Eq(id),
+ table.Col("alias").Eq(alias),
+ )
+
+ if _, err := exec(ctx, stmt); err != nil {
+ return fmt.Errorf("anonymising %s: %w", table.GetTable(), err)
+ }
+ }
+
+ lastID = id
+ lastAlias = alias.String
+ gotSome = true
+ total++
+
+ if total%logEvery == 0 {
+ logger.Infof("Anonymised %d %s aliases", total, table.GetTable())
+ }
+
+ return nil
+ })
+ }); err != nil {
+ return err
+ }
+ }
+
+ return nil
+}
+
+func (db *Anonymiser) anonymiseTags(ctx context.Context) error {
+ logger.Infof("Anonymising tags")
+ table := tagTableMgr.table
+ lastID := 0
+ total := 0
+ const logEvery = 10000
+
+ for gotSome := true; gotSome; {
+ if err := txn.WithTxn(ctx, db, func(ctx context.Context) error {
+ query := dialect.From(table).Select(
+ table.Col(idColumn),
+ table.Col("name"),
+ table.Col("description"),
+ ).Where(table.Col(idColumn).Gt(lastID)).Limit(1000)
+
+ gotSome = false
+
+ const single = false
+ return queryFunc(ctx, query, single, func(rows *sqlx.Rows) error {
+ var (
+ id int
+ name sql.NullString
+ description sql.NullString
+ )
+
+ if err := rows.Scan(
+ &id,
+ &name,
+ &description,
+ ); err != nil {
+ return err
+ }
+
+ set := goqu.Record{}
+ db.obfuscateNullString(set, "name", name)
+ db.obfuscateNullString(set, "description", description)
+
+ if len(set) > 0 {
+ stmt := dialect.Update(table).Set(set).Where(table.Col(idColumn).Eq(id))
+
+ if _, err := exec(ctx, stmt); err != nil {
+ return fmt.Errorf("anonymising %s: %w", table.GetTable(), err)
+ }
+ }
+
+ lastID = id
+ gotSome = true
+ total++
+
+ if total%logEvery == 0 {
+ logger.Infof("Anonymised %d tags", total)
+ }
+
+ return nil
+ })
+ }); err != nil {
+ return err
+ }
+ }
+
+ if err := db.anonymiseAliases(ctx, goqu.T(tagAliasesTable), "tag_id"); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (db *Anonymiser) anonymiseMovies(ctx context.Context) error {
+ logger.Infof("Anonymising movies")
+ table := movieTableMgr.table
+ lastID := 0
+ total := 0
+ const logEvery = 10000
+
+ for gotSome := true; gotSome; {
+ if err := txn.WithTxn(ctx, db, func(ctx context.Context) error {
+ query := dialect.From(table).Select(
+ table.Col(idColumn),
+ table.Col("name"),
+ table.Col("aliases"),
+ table.Col("synopsis"),
+ table.Col("url"),
+ table.Col("director"),
+ ).Where(table.Col(idColumn).Gt(lastID)).Limit(1000)
+
+ gotSome = false
+
+ const single = false
+ return queryFunc(ctx, query, single, func(rows *sqlx.Rows) error {
+ var (
+ id int
+ name sql.NullString
+ aliases sql.NullString
+ synopsis sql.NullString
+ url sql.NullString
+ director sql.NullString
+ )
+
+ if err := rows.Scan(
+ &id,
+ &name,
+ &aliases,
+ &synopsis,
+ &url,
+ &director,
+ ); err != nil {
+ return err
+ }
+
+ set := goqu.Record{}
+ db.obfuscateNullString(set, "name", name)
+ db.obfuscateNullString(set, "aliases", aliases)
+ db.obfuscateNullString(set, "synopsis", synopsis)
+ db.obfuscateNullString(set, "url", url)
+ db.obfuscateNullString(set, "director", director)
+
+ if len(set) > 0 {
+ stmt := dialect.Update(table).Set(set).Where(table.Col(idColumn).Eq(id))
+
+ if _, err := exec(ctx, stmt); err != nil {
+ return fmt.Errorf("anonymising %s: %w", table.GetTable(), err)
+ }
+ }
+
+ lastID = id
+ gotSome = true
+ total++
+
+ if total%logEvery == 0 {
+ logger.Infof("Anonymised %d movies", total)
+ }
+
+ return nil
+ })
+ }); err != nil {
+ return err
+ }
+ }
+
+ return nil
+}
+
+func (db *Anonymiser) anonymiseText(ctx context.Context, table exp.IdentifierExpression, column string, value string) error {
+ set := goqu.Record{}
+ set[column] = db.obfuscateString(value, letters)
+
+ stmt := dialect.Update(table).Set(set).Where(table.Col(column).Eq(value))
+
+ if _, err := exec(ctx, stmt); err != nil {
+ return fmt.Errorf("anonymising %s: %w", column, err)
+ }
+
+ return nil
+}
+
+func (db *Anonymiser) anonymiseFingerprint(ctx context.Context, table exp.IdentifierExpression, column string, value string) error {
+ set := goqu.Record{}
+ set[column] = db.obfuscateString(value, hex)
+
+ stmt := dialect.Update(table).Set(set).Where(table.Col(column).Eq(value))
+
+ if _, err := exec(ctx, stmt); err != nil {
+ return fmt.Errorf("anonymising %s: %w", column, err)
+ }
+
+ return nil
+}
+
+func (db *Anonymiser) obfuscateNullString(out goqu.Record, column string, in sql.NullString) {
+ if in.Valid {
+ out[column] = db.obfuscateString(in.String, letters)
+ }
+}
+
+func (db *Anonymiser) obfuscateString(in string, dict string) string {
+ out := strings.Builder{}
+ for _, c := range in {
+ if unicode.IsSpace(c) {
+ out.WriteRune(c)
+ } else {
+ num, err := rand.Int(rand.Reader, big.NewInt(int64(len(dict))))
+ if err != nil {
+ panic("error generating random number")
+ }
+
+ out.WriteByte(dict[num.Int64()])
+ }
+ }
+
+ return out.String()
+}
diff --git a/pkg/sqlite/anonymise_test.go b/pkg/sqlite/anonymise_test.go
new file mode 100644
index 000000000..868224eef
--- /dev/null
+++ b/pkg/sqlite/anonymise_test.go
@@ -0,0 +1,39 @@
+//go:build integration
+// +build integration
+
+package sqlite_test
+
+import (
+ "context"
+ "os"
+ "testing"
+
+ "github.com/stashapp/stash/pkg/sqlite"
+)
+
+func TestAnonymiser_Anonymise(t *testing.T) {
+ f, err := os.CreateTemp("", "*.sqlite")
+ if err != nil {
+ t.Errorf("Could not create temporary file: %v", err)
+ return
+ }
+
+ f.Close()
+ defer os.Remove(f.Name())
+
+ // use existing database
+ anonymiser, err := sqlite.NewAnonymiser(db, f.Name())
+ if err != nil {
+ t.Errorf("Could not create anonymiser: %v", err)
+ return
+ }
+
+ if err := anonymiser.Anonymise(context.Background()); err != nil {
+ t.Errorf("Could not anonymise: %v", err)
+ return
+ }
+
+ t.Logf("Anonymised database written to %s", f.Name())
+
+ // TODO - ensure anonymous
+}
diff --git a/pkg/sqlite/batch.go b/pkg/sqlite/batch.go
new file mode 100644
index 000000000..71ad5d354
--- /dev/null
+++ b/pkg/sqlite/batch.go
@@ -0,0 +1,20 @@
+package sqlite
+
+const defaultBatchSize = 1000
+
+// batchExec executes the provided function in batches of the provided size.
+func batchExec(ids []int, batchSize int, fn func(batch []int) error) error {
+ for i := 0; i < len(ids); i += batchSize {
+ end := i + batchSize
+ if end > len(ids) {
+ end = len(ids)
+ }
+
+ batch := ids[i:end]
+ if err := fn(batch); err != nil {
+ return err
+ }
+ }
+
+ return nil
+}
diff --git a/pkg/sqlite/blob.go b/pkg/sqlite/blob.go
new file mode 100644
index 000000000..27ecd94ad
--- /dev/null
+++ b/pkg/sqlite/blob.go
@@ -0,0 +1,414 @@
+package sqlite
+
+import (
+ "context"
+ "database/sql"
+ "errors"
+ "fmt"
+ "io/fs"
+
+ "github.com/doug-martin/goqu/v9"
+ "github.com/doug-martin/goqu/v9/exp"
+ "github.com/jmoiron/sqlx"
+ "github.com/mattn/go-sqlite3"
+ "github.com/stashapp/stash/pkg/file"
+ "github.com/stashapp/stash/pkg/hash/md5"
+ "github.com/stashapp/stash/pkg/logger"
+ "github.com/stashapp/stash/pkg/sqlite/blob"
+ "github.com/stashapp/stash/pkg/utils"
+ "gopkg.in/guregu/null.v4"
+)
+
+const (
+ blobTable = "blobs"
+ blobChecksumColumn = "checksum"
+)
+
+type BlobStoreOptions struct {
+ // UseFilesystem should be true if blob data should be stored in the filesystem
+ UseFilesystem bool
+ // UseDatabase should be true if blob data should be stored in the database
+ UseDatabase bool
+ // Path is the filesystem path to use for storing blobs
+ Path string
+}
+
+type BlobStore struct {
+ repository
+
+ tableMgr *table
+
+ fsStore *blob.FilesystemStore
+ options BlobStoreOptions
+}
+
+func NewBlobStore(options BlobStoreOptions) *BlobStore {
+ return &BlobStore{
+ repository: repository{
+ tableName: blobTable,
+ idColumn: blobChecksumColumn,
+ },
+
+ tableMgr: blobTableMgr,
+
+ fsStore: blob.NewFilesystemStore(options.Path, &file.OsFS{}),
+ options: options,
+ }
+}
+
+type blobRow struct {
+ Checksum string `db:"checksum"`
+ Blob []byte `db:"blob"`
+}
+
+func (qb *BlobStore) table() exp.IdentifierExpression {
+ return qb.tableMgr.table
+}
+
+func (qb *BlobStore) Count(ctx context.Context) (int, error) {
+ table := qb.table()
+ q := dialect.From(table).Select(goqu.COUNT(table.Col(blobChecksumColumn)))
+
+ var ret int
+ if err := querySimple(ctx, q, &ret); err != nil {
+ return 0, err
+ }
+
+ return ret, nil
+}
+
+// Write stores the data and its checksum in enabled stores.
+// Always writes at least the checksum to the database.
+func (qb *BlobStore) Write(ctx context.Context, data []byte) (string, error) {
+ if !qb.options.UseDatabase && !qb.options.UseFilesystem {
+ panic("no blob store configured")
+ }
+
+ if len(data) == 0 {
+ return "", fmt.Errorf("cannot write empty data")
+ }
+
+ checksum := md5.FromBytes(data)
+
+ // only write blob to the database if UseDatabase is true
+ // always at least write the checksum
+ var storedData []byte
+ if qb.options.UseDatabase {
+ storedData = data
+ }
+
+ if err := qb.write(ctx, checksum, storedData); err != nil {
+ return "", fmt.Errorf("writing to database: %w", err)
+ }
+
+ if qb.options.UseFilesystem {
+ if err := qb.fsStore.Write(ctx, checksum, data); err != nil {
+ return "", fmt.Errorf("writing to filesystem: %w", err)
+ }
+ }
+
+ return checksum, nil
+}
+
+func (qb *BlobStore) write(ctx context.Context, checksum string, data []byte) error {
+ table := qb.table()
+ q := dialect.Insert(table).Prepared(true).Rows(blobRow{
+ Checksum: checksum,
+ Blob: data,
+ }).OnConflict(goqu.DoNothing())
+
+ _, err := exec(ctx, q)
+ if err != nil {
+ return fmt.Errorf("inserting into %s: %w", table, err)
+ }
+
+ return nil
+}
+
+func (qb *BlobStore) update(ctx context.Context, checksum string, data []byte) error {
+ table := qb.table()
+ q := dialect.Update(table).Prepared(true).Set(goqu.Record{
+ "blob": data,
+ }).Where(goqu.C(blobChecksumColumn).Eq(checksum))
+
+ _, err := exec(ctx, q)
+ if err != nil {
+ return fmt.Errorf("updating %s: %w", table, err)
+ }
+
+ return nil
+}
+
+type ChecksumNotFoundError struct {
+ Checksum string
+}
+
+func (e *ChecksumNotFoundError) Error() string {
+ return fmt.Sprintf("checksum %s does not exist", e.Checksum)
+}
+
+type ChecksumBlobNotExistError struct {
+ Checksum string
+}
+
+func (e *ChecksumBlobNotExistError) Error() string {
+ return fmt.Sprintf("blob for checksum %s does not exist", e.Checksum)
+}
+
+func (qb *BlobStore) readSQL(ctx context.Context, querySQL string, args ...interface{}) ([]byte, string, error) {
+ if !qb.options.UseDatabase && !qb.options.UseFilesystem {
+ panic("no blob store configured")
+ }
+
+ // always try to get from the database first, even if set to use filesystem
+ var row blobRow
+ found := false
+ const single = true
+ if err := qb.queryFunc(ctx, querySQL, args, single, func(r *sqlx.Rows) error {
+ found = true
+ if err := r.StructScan(&row); err != nil {
+ return err
+ }
+
+ return nil
+ }); err != nil {
+ return nil, "", fmt.Errorf("reading from database: %w", err)
+ }
+
+ if !found {
+ // not found in the database - does not exist
+ return nil, "", nil
+ }
+
+ checksum := row.Checksum
+
+ if row.Blob != nil {
+ return row.Blob, checksum, nil
+ }
+
+ // don't use the filesystem if not configured to do so
+ if qb.options.UseFilesystem {
+ ret, err := qb.fsStore.Read(ctx, checksum)
+ if err == nil {
+ return ret, checksum, nil
+ }
+
+ if !errors.Is(err, fs.ErrNotExist) {
+ return nil, checksum, fmt.Errorf("reading from filesystem: %w", err)
+ }
+ }
+
+ return nil, checksum, &ChecksumBlobNotExistError{
+ Checksum: checksum,
+ }
+}
+
+// Read reads the data from the database or filesystem, depending on which is enabled.
+func (qb *BlobStore) Read(ctx context.Context, checksum string) ([]byte, error) {
+ if !qb.options.UseDatabase && !qb.options.UseFilesystem {
+ panic("no blob store configured")
+ }
+
+ // always try to get from the database first, even if set to use filesystem
+ ret, err := qb.readFromDatabase(ctx, checksum)
+ if err != nil {
+ if !errors.Is(err, sql.ErrNoRows) {
+ return nil, fmt.Errorf("reading from database: %w", err)
+ }
+
+ // not found in the database - does not exist
+ return nil, &ChecksumNotFoundError{
+ Checksum: checksum,
+ }
+ }
+
+ if ret != nil {
+ return ret, nil
+ }
+
+ // don't use the filesystem if not configured to do so
+ if qb.options.UseFilesystem {
+ ret, err := qb.fsStore.Read(ctx, checksum)
+ if err == nil {
+ return ret, nil
+ }
+
+ if !errors.Is(err, fs.ErrNotExist) {
+ return nil, fmt.Errorf("reading from filesystem: %w", err)
+ }
+ }
+
+ // blob not found - should not happen
+ return nil, &ChecksumBlobNotExistError{
+ Checksum: checksum,
+ }
+}
+
+func (qb *BlobStore) readFromDatabase(ctx context.Context, checksum string) ([]byte, error) {
+ q := dialect.From(qb.table()).Select(qb.table().All()).Where(qb.tableMgr.byID(checksum))
+
+ var row blobRow
+ const single = true
+ if err := queryFunc(ctx, q, single, func(r *sqlx.Rows) error {
+ if err := r.StructScan(&row); err != nil {
+ return err
+ }
+
+ return nil
+ }); err != nil {
+ return nil, fmt.Errorf("querying %s: %w", qb.table(), err)
+ }
+
+ return row.Blob, nil
+}
+
+// Delete marks a checksum as no longer in use by a single reference.
+// If no references remain, the blob is deleted from the database and filesystem.
+func (qb *BlobStore) Delete(ctx context.Context, checksum string) error {
+ // try to delete the blob from the database
+ if err := qb.delete(ctx, checksum); err != nil {
+ if qb.isConstraintError(err) {
+ // blob is still referenced - do not delete
+ logger.Debugf("Blob %s is still referenced - not deleting", checksum)
+ return nil
+ }
+
+ // unexpected error
+ return fmt.Errorf("deleting from database: %w", err)
+ }
+
+ // blob was deleted from the database - delete from filesystem if enabled
+ if qb.options.UseFilesystem {
+ logger.Debugf("Deleting blob %s from filesystem", checksum)
+ if err := qb.fsStore.Delete(ctx, checksum); err != nil {
+ return fmt.Errorf("deleting from filesystem: %w", err)
+ }
+ }
+
+ return nil
+}
+
+func (qb *BlobStore) isConstraintError(err error) bool {
+ var sqliteError sqlite3.Error
+ if errors.As(err, &sqliteError) {
+ return sqliteError.Code == sqlite3.ErrConstraint
+ }
+ return false
+}
+
+func (qb *BlobStore) delete(ctx context.Context, checksum string) error {
+ table := qb.table()
+
+ q := dialect.Delete(table).Where(goqu.C(blobChecksumColumn).Eq(checksum))
+
+ _, err := exec(ctx, q)
+ if err != nil {
+ return fmt.Errorf("deleting from %s: %w", table, err)
+ }
+
+ return nil
+}
+
+type blobJoinQueryBuilder struct {
+ repository
+ blobStore *BlobStore
+
+ joinTable string
+}
+
+func (qb *blobJoinQueryBuilder) GetImage(ctx context.Context, id int, blobCol string) ([]byte, error) {
+ sqlQuery := utils.StrFormat(`
+SELECT blobs.checksum, blobs.blob FROM {joinTable} INNER JOIN blobs ON {joinTable}.{joinCol} = blobs.checksum
+WHERE {joinTable}.id = ?
+`, utils.StrFormatMap{
+ "joinTable": qb.joinTable,
+ "joinCol": blobCol,
+ })
+
+ ret, _, err := qb.blobStore.readSQL(ctx, sqlQuery, id)
+ return ret, err
+}
+
+func (qb *blobJoinQueryBuilder) UpdateImage(ctx context.Context, id int, blobCol string, image []byte) error {
+ if len(image) == 0 {
+ return qb.DestroyImage(ctx, id, blobCol)
+ }
+
+ oldChecksum, err := qb.getChecksum(ctx, id, blobCol)
+ if err != nil {
+ return err
+ }
+
+ checksum, err := qb.blobStore.Write(ctx, image)
+ if err != nil {
+ return err
+ }
+
+ sqlQuery := fmt.Sprintf("UPDATE %s SET %s = ? WHERE id = ?", qb.joinTable, blobCol)
+ if _, err := qb.tx.Exec(ctx, sqlQuery, checksum, id); err != nil {
+ return err
+ }
+
+ // #3595 - delete the old blob if the checksum is different
+ if oldChecksum != nil && *oldChecksum != checksum {
+ if err := qb.blobStore.Delete(ctx, *oldChecksum); err != nil {
+ return err
+ }
+ }
+
+ return nil
+}
+
+func (qb *blobJoinQueryBuilder) getChecksum(ctx context.Context, id int, blobCol string) (*string, error) {
+ sqlQuery := utils.StrFormat(`
+SELECT {joinTable}.{joinCol} FROM {joinTable} WHERE {joinTable}.id = ?
+`, utils.StrFormatMap{
+ "joinTable": qb.joinTable,
+ "joinCol": blobCol,
+ })
+
+ var checksum null.String
+ err := qb.repository.querySimple(ctx, sqlQuery, []interface{}{id}, &checksum)
+ if err != nil {
+ return nil, err
+ }
+
+ if !checksum.Valid {
+ return nil, nil
+ }
+
+ return &checksum.String, nil
+}
+
+func (qb *blobJoinQueryBuilder) DestroyImage(ctx context.Context, id int, blobCol string) error {
+ checksum, err := qb.getChecksum(ctx, id, blobCol)
+ if err != nil {
+ return err
+ }
+
+ if checksum == nil {
+ // no image to delete
+ return nil
+ }
+
+ updateQuery := fmt.Sprintf("UPDATE %s SET %s = NULL WHERE id = ?", qb.joinTable, blobCol)
+ if _, err = qb.tx.Exec(ctx, updateQuery, id); err != nil {
+ return err
+ }
+
+ return qb.blobStore.Delete(ctx, *checksum)
+}
+
+func (qb *blobJoinQueryBuilder) HasImage(ctx context.Context, id int, blobCol string) (bool, error) {
+ stmt := utils.StrFormat("SELECT COUNT(*) as count FROM (SELECT {joinCol} FROM {joinTable} WHERE id = ? AND {joinCol} IS NOT NULL LIMIT 1)", utils.StrFormatMap{
+ "joinTable": qb.joinTable,
+ "joinCol": blobCol,
+ })
+
+ c, err := qb.runCountQuery(ctx, stmt, []interface{}{id})
+ if err != nil {
+ return false, err
+ }
+
+ return c == 1, nil
+}
diff --git a/pkg/sqlite/blob/fs.go b/pkg/sqlite/blob/fs.go
new file mode 100644
index 000000000..9c85f926a
--- /dev/null
+++ b/pkg/sqlite/blob/fs.go
@@ -0,0 +1,110 @@
+package blob
+
+import (
+ "bytes"
+ "context"
+ "fmt"
+ "io"
+ "io/fs"
+ "os"
+ "path/filepath"
+
+ "github.com/stashapp/stash/pkg/file"
+ "github.com/stashapp/stash/pkg/fsutil"
+ "github.com/stashapp/stash/pkg/logger"
+)
+
+const (
+ blobsDirDepth int = 2
+ blobsDirLength int = 2 // thumbDirDepth * thumbDirLength must be smaller than the length of checksum
+)
+
+type FS interface {
+ Create(name string) (*os.File, error)
+ MkdirAll(path string, perm fs.FileMode) error
+ Open(name string) (fs.ReadDirFile, error)
+ Remove(name string) error
+
+ file.RenamerRemover
+}
+
+type FilesystemStore struct {
+ deleter *file.Deleter
+ path string
+ fs FS
+}
+
+func NewFilesystemStore(path string, fs FS) *FilesystemStore {
+ deleter := &file.Deleter{
+ RenamerRemover: fs,
+ }
+
+ return &FilesystemStore{
+ deleter: deleter,
+ path: path,
+ fs: fs,
+ }
+}
+
+func (s *FilesystemStore) checksumToPath(checksum string) string {
+ return filepath.Join(s.path, fsutil.GetIntraDir(checksum, blobsDirDepth, blobsDirLength), checksum)
+}
+
+func (s *FilesystemStore) Write(ctx context.Context, checksum string, data []byte) error {
+ if s.path == "" {
+ return fmt.Errorf("no path set")
+ }
+
+ fn := s.checksumToPath(checksum)
+
+ // create the directory if it doesn't exist
+ if err := s.fs.MkdirAll(filepath.Dir(fn), 0755); err != nil {
+ return fmt.Errorf("creating directory %q: %w", filepath.Dir(fn), err)
+ }
+
+ logger.Debugf("Writing blob file %s", fn)
+ out, err := s.fs.Create(fn)
+ if err != nil {
+ return fmt.Errorf("creating file %q: %w", fn, err)
+ }
+
+ r := bytes.NewReader(data)
+
+ if _, err = io.Copy(out, r); err != nil {
+ return fmt.Errorf("writing file %q: %w", fn, err)
+ }
+
+ return nil
+}
+
+func (s *FilesystemStore) Read(ctx context.Context, checksum string) ([]byte, error) {
+ if s.path == "" {
+ return nil, fmt.Errorf("no path set")
+ }
+
+ fn := s.checksumToPath(checksum)
+ f, err := s.fs.Open(fn)
+ if err != nil {
+ return nil, fmt.Errorf("opening file %q: %w", fn, err)
+ }
+
+ defer f.Close()
+
+ return io.ReadAll(f)
+}
+
+func (s *FilesystemStore) Delete(ctx context.Context, checksum string) error {
+ if s.path == "" {
+ return fmt.Errorf("no path set")
+ }
+
+ s.deleter.RegisterHooks(ctx)
+
+ fn := s.checksumToPath(checksum)
+
+ if err := s.deleter.Files([]string{fn}); err != nil {
+ return fmt.Errorf("deleting file %q: %w", fn, err)
+ }
+
+ return nil
+}
diff --git a/pkg/sqlite/blob_migrate.go b/pkg/sqlite/blob_migrate.go
new file mode 100644
index 000000000..e121d0792
--- /dev/null
+++ b/pkg/sqlite/blob_migrate.go
@@ -0,0 +1,116 @@
+package sqlite
+
+import (
+ "context"
+ "fmt"
+
+ "github.com/jmoiron/sqlx"
+)
+
+func (qb *BlobStore) FindBlobs(ctx context.Context, n uint, lastChecksum string) ([]string, error) {
+ table := qb.table()
+ q := dialect.From(table).Select(table.Col(blobChecksumColumn)).Order(table.Col(blobChecksumColumn).Asc()).Limit(n)
+
+ if lastChecksum != "" {
+ q = q.Where(table.Col(blobChecksumColumn).Gt(lastChecksum))
+ }
+
+ const single = false
+ var checksums []string
+ if err := queryFunc(ctx, q, single, func(rows *sqlx.Rows) error {
+ var checksum string
+ if err := rows.Scan(&checksum); err != nil {
+ return err
+ }
+ checksums = append(checksums, checksum)
+ return nil
+ }); err != nil {
+ return nil, err
+ }
+
+ return checksums, nil
+}
+
+// MigrateBlob migrates a blob from the filesystem to the database, or vice versa.
+// The target is determined by the UseDatabase and UseFilesystem options.
+// If deleteOld is true, the blob is deleted from the source after migration.
+func (qb *BlobStore) MigrateBlob(ctx context.Context, checksum string, deleteOld bool) error {
+ if !qb.options.UseDatabase && !qb.options.UseFilesystem {
+ panic("no blob store configured")
+ }
+
+ if qb.options.UseDatabase && qb.options.UseFilesystem {
+ panic("both filesystem and database configured")
+ }
+
+ if qb.options.Path == "" {
+ panic("no blob path configured")
+ }
+
+ if qb.options.UseDatabase {
+ return qb.migrateBlobDatabase(ctx, checksum, deleteOld)
+ }
+
+ return qb.migrateBlobFilesystem(ctx, checksum, deleteOld)
+}
+
+// migrateBlobDatabase migrates a blob from the filesystem to the database
+func (qb *BlobStore) migrateBlobDatabase(ctx context.Context, checksum string, deleteOld bool) error {
+ // ignore if the blob is already present in the database
+ // (still delete the old data if requested)
+ existing, err := qb.readFromDatabase(ctx, checksum)
+ if err != nil {
+ return fmt.Errorf("reading from database: %w", err)
+ }
+
+ if len(existing) == 0 {
+ // find the blob in the filesystem
+ blob, err := qb.fsStore.Read(ctx, checksum)
+ if err != nil {
+ return fmt.Errorf("reading from filesystem: %w", err)
+ }
+
+ // write the blob to the database
+ if err := qb.update(ctx, checksum, blob); err != nil {
+ return fmt.Errorf("writing to database: %w", err)
+ }
+ }
+
+ if deleteOld {
+ // delete the blob from the filesystem after commit
+ if err := qb.fsStore.Delete(ctx, checksum); err != nil {
+ return fmt.Errorf("deleting from filesystem: %w", err)
+ }
+ }
+
+ return nil
+}
+
+// migrateBlobFilesystem migrates a blob from the database to the filesystem
+func (qb *BlobStore) migrateBlobFilesystem(ctx context.Context, checksum string, deleteOld bool) error {
+ // find the blob in the database
+ blob, err := qb.readFromDatabase(ctx, checksum)
+ if err != nil {
+ return fmt.Errorf("reading from database: %w", err)
+ }
+
+ if len(blob) == 0 {
+ // it's possible that the blob is already present in the filesystem
+ // just ignore
+ return nil
+ }
+
+ // write the blob to the filesystem
+ if err := qb.fsStore.Write(ctx, checksum, blob); err != nil {
+ return fmt.Errorf("writing to filesystem: %w", err)
+ }
+
+ if deleteOld {
+ // delete the blob from the database row
+ if err := qb.update(ctx, checksum, nil); err != nil {
+ return err
+ }
+ }
+
+ return nil
+}
diff --git a/pkg/sqlite/blob_test.go b/pkg/sqlite/blob_test.go
new file mode 100644
index 000000000..4c6e0ccc2
--- /dev/null
+++ b/pkg/sqlite/blob_test.go
@@ -0,0 +1,45 @@
+//go:build integration
+// +build integration
+
+package sqlite_test
+
+import (
+ "context"
+ "fmt"
+ "testing"
+
+ "github.com/stretchr/testify/assert"
+)
+
+type updateImageFunc func(ctx context.Context, id int, image []byte) error
+type getImageFunc func(ctx context.Context, movieID int) ([]byte, error)
+
+func testUpdateImage(t *testing.T, ctx context.Context, id int, updateFn updateImageFunc, getFn getImageFunc) error {
+ image := []byte("image")
+ err := updateFn(ctx, id, image)
+ if err != nil {
+ return fmt.Errorf("Error updating performer image: %s", err.Error())
+ }
+
+ // ensure image set
+ storedImage, err := getFn(ctx, id)
+ if err != nil {
+ return fmt.Errorf("Error getting image: %s", err.Error())
+ }
+ assert.Equal(t, storedImage, image)
+
+ // set nil image
+ err = updateFn(ctx, id, nil)
+ if err != nil {
+ return fmt.Errorf("error setting nil image: %w", err)
+ }
+
+ // ensure image null
+ storedImage, err = getFn(ctx, id)
+ if err != nil {
+ return fmt.Errorf("Error getting image: %s", err.Error())
+ }
+ assert.Nil(t, storedImage)
+
+ return nil
+}
diff --git a/pkg/sqlite/database.go b/pkg/sqlite/database.go
index b2c333024..d8e8b5e0d 100644
--- a/pkg/sqlite/database.go
+++ b/pkg/sqlite/database.go
@@ -2,7 +2,6 @@ package sqlite
import (
"context"
- "database/sql"
"embed"
"errors"
"fmt"
@@ -10,18 +9,30 @@ import (
"path/filepath"
"time"
- "github.com/fvbommel/sortorder"
"github.com/golang-migrate/migrate/v4"
sqlite3mig "github.com/golang-migrate/migrate/v4/database/sqlite3"
"github.com/golang-migrate/migrate/v4/source/iofs"
"github.com/jmoiron/sqlx"
- sqlite3 "github.com/mattn/go-sqlite3"
"github.com/stashapp/stash/pkg/fsutil"
"github.com/stashapp/stash/pkg/logger"
)
-var appSchemaVersion uint = 41
+const (
+ // Number of database connections to use
+ // The same value is used for both the maximum and idle limit,
+ // to prevent opening connections on the fly which has a notieable performance penalty.
+ // Fewer connections use less memory, more connections increase performance,
+ // but have diminishing returns.
+ // 10 was found to be a good tradeoff.
+ dbConns = 10
+ // Idle connection timeout, in seconds
+ // Closes a connection after a period of inactivity, which saves on memory and
+ // causes the sqlite -wal and -shm files to be automatically deleted.
+ dbConnTimeout = 30
+)
+
+var appSchemaVersion uint = 45
//go:embed migrations/*.sql
var migrationsBox embed.FS
@@ -52,20 +63,17 @@ func (e *MismatchedSchemaVersionError) Error() string {
return fmt.Sprintf("schema version %d is incompatible with required schema version %d", e.CurrentSchemaVersion, e.RequiredSchemaVersion)
}
-const sqlite3Driver = "sqlite3ex"
-
-func init() {
- // register custom driver with regexp function
- registerCustomDriver()
-}
-
type Database struct {
+ Blobs *BlobStore
File *FileStore
Folder *FolderStore
Image *ImageStore
Gallery *GalleryStore
Scene *SceneStore
Performer *PerformerStore
+ Studio *studioQueryBuilder
+ Tag *tagQueryBuilder
+ Movie *movieQueryBuilder
db *sqlx.DB
dbPath string
@@ -78,20 +86,29 @@ type Database struct {
func NewDatabase() *Database {
fileStore := NewFileStore()
folderStore := NewFolderStore()
+ blobStore := NewBlobStore(BlobStoreOptions{})
ret := &Database{
+ Blobs: blobStore,
File: fileStore,
Folder: folderStore,
- Scene: NewSceneStore(fileStore),
+ Scene: NewSceneStore(fileStore, blobStore),
Image: NewImageStore(fileStore),
Gallery: NewGalleryStore(fileStore, folderStore),
- Performer: NewPerformerStore(),
+ Performer: NewPerformerStore(blobStore),
+ Studio: NewStudioReaderWriter(blobStore),
+ Tag: NewTagReaderWriter(blobStore),
+ Movie: NewMovieReaderWriter(blobStore),
lockChan: make(chan struct{}, 1),
}
return ret
}
+func (db *Database) SetBlobStoreOptions(options BlobStoreOptions) {
+ *db.Blobs = *NewBlobStore(options)
+}
+
// Ready returns an error if the database is not ready to begin transactions.
func (db *Database) Ready() error {
if db.db == nil {
@@ -196,15 +213,15 @@ func (db *Database) Close() error {
func (db *Database) open(disableForeignKeys bool) (*sqlx.DB, error) {
// https://github.com/mattn/go-sqlite3
- url := "file:" + db.dbPath + "?_journal=WAL&_sync=NORMAL"
+ url := "file:" + db.dbPath + "?_journal=WAL&_sync=NORMAL&_busy_timeout=50"
if !disableForeignKeys {
url += "&_fk=true"
}
conn, err := sqlx.Open(sqlite3Driver, url)
- conn.SetMaxOpenConns(25)
- conn.SetMaxIdleConns(4)
- conn.SetConnMaxLifetime(30 * time.Second)
+ conn.SetMaxOpenConns(dbConns)
+ conn.SetMaxIdleConns(dbConns)
+ conn.SetConnMaxIdleTime(dbConnTimeout * time.Second)
if err != nil {
return nil, fmt.Errorf("db.Open(): %w", err)
}
@@ -212,7 +229,7 @@ func (db *Database) open(disableForeignKeys bool) (*sqlx.DB, error) {
return conn, nil
}
-func (db *Database) Reset() error {
+func (db *Database) Remove() error {
databasePath := db.dbPath
err := db.Close()
@@ -236,6 +253,15 @@ func (db *Database) Reset() error {
}
}
+ return nil
+}
+
+func (db *Database) Reset() error {
+ databasePath := db.dbPath
+ if err := db.Remove(); err != nil {
+ return err
+ }
+
if err := db.Open(databasePath); err != nil {
return fmt.Errorf("[reset DB] unable to initialize: %w", err)
}
@@ -265,6 +291,16 @@ func (db *Database) Backup(backupPath string) error {
return nil
}
+func (db *Database) Anonymise(outPath string) error {
+ anon, err := NewAnonymiser(db, outPath)
+
+ if err != nil {
+ return err
+ }
+
+ return anon.Anonymise(context.Background())
+}
+
func (db *Database) RestoreFromBackup(backupPath string) error {
logger.Infof("Restoring backup database %s into %s", backupPath, db.dbPath)
return os.Rename(backupPath, db.dbPath)
@@ -293,6 +329,16 @@ func (db *Database) DatabaseBackupPath(backupDirectoryPath string) string {
return fn
}
+func (db *Database) AnonymousDatabasePath(backupDirectoryPath string) string {
+ fn := fmt.Sprintf("%s.anonymous.%d.%s", filepath.Base(db.dbPath), db.schemaVersion, time.Now().Format("20060102_150405"))
+
+ if backupDirectoryPath != "" {
+ return filepath.Join(backupDirectoryPath, fn)
+ }
+
+ return fn
+}
+
func (db *Database) Version() uint {
return db.schemaVersion
}
@@ -383,8 +429,14 @@ func (db *Database) RunMigrations() error {
}
// optimize database after migration
+ db.optimise()
+
+ return nil
+}
+
+func (db *Database) optimise() {
logger.Info("Optimizing database")
- _, err = db.db.Exec("ANALYZE")
+ _, err := db.db.Exec("ANALYZE")
if err != nil {
logger.Warnf("error while performing post-migration optimization: %v", err)
}
@@ -392,8 +444,12 @@ func (db *Database) RunMigrations() error {
if err != nil {
logger.Warnf("error while performing post-migration vacuum: %v", err)
}
+}
- return nil
+// Vacuum runs a VACUUM on the database, rebuilding the database file into a minimal amount of disk space.
+func (db *Database) Vacuum(ctx context.Context) error {
+ _, err := db.db.ExecContext(ctx, "VACUUM")
+ return err
}
func (db *Database) runCustomMigrations(ctx context.Context, fns []customMigrationFunc) error {
@@ -420,37 +476,3 @@ func (db *Database) runCustomMigration(ctx context.Context, fn customMigrationFu
return nil
}
-
-func registerCustomDriver() {
- sql.Register(sqlite3Driver,
- &sqlite3.SQLiteDriver{
- ConnectHook: func(conn *sqlite3.SQLiteConn) error {
- funcs := map[string]interface{}{
- "regexp": regexFn,
- "durationToTinyInt": durationToTinyIntFn,
- }
-
- for name, fn := range funcs {
- if err := conn.RegisterFunc(name, fn, true); err != nil {
- return fmt.Errorf("error registering function %s: %s", name, err.Error())
- }
- }
-
- // COLLATE NATURAL_CS - Case sensitive natural sort
- err := conn.RegisterCollation("NATURAL_CS", func(s string, s2 string) int {
- if sortorder.NaturalLess(s, s2) {
- return -1
- } else {
- return 1
- }
- })
-
- if err != nil {
- return fmt.Errorf("error registering natural sort collation: %v", err)
- }
-
- return nil
- },
- },
- )
-}
diff --git a/pkg/sqlite/driver.go b/pkg/sqlite/driver.go
new file mode 100644
index 000000000..5712c77c7
--- /dev/null
+++ b/pkg/sqlite/driver.go
@@ -0,0 +1,71 @@
+package sqlite
+
+import (
+ "database/sql"
+ "database/sql/driver"
+ "fmt"
+
+ "github.com/fvbommel/sortorder"
+ sqlite3 "github.com/mattn/go-sqlite3"
+)
+
+const sqlite3Driver = "sqlite3ex"
+
+func init() {
+ // register custom driver
+ sql.Register(sqlite3Driver, &CustomSQLiteDriver{})
+}
+
+type CustomSQLiteDriver struct{}
+
+type CustomSQLiteConn struct {
+ *sqlite3.SQLiteConn
+}
+
+func (d *CustomSQLiteDriver) Open(dsn string) (driver.Conn, error) {
+ sqlite3Driver := &sqlite3.SQLiteDriver{
+ ConnectHook: func(conn *sqlite3.SQLiteConn) error {
+ funcs := map[string]interface{}{
+ "regexp": regexFn,
+ "durationToTinyInt": durationToTinyIntFn,
+ "basename": basenameFn,
+ }
+
+ for name, fn := range funcs {
+ if err := conn.RegisterFunc(name, fn, true); err != nil {
+ return fmt.Errorf("error registering function %s: %v", name, err)
+ }
+ }
+
+ // COLLATE NATURAL_CS - Case sensitive natural sort
+ err := conn.RegisterCollation("NATURAL_CS", func(s string, s2 string) int {
+ if sortorder.NaturalLess(s, s2) {
+ return -1
+ } else {
+ return 1
+ }
+ })
+
+ if err != nil {
+ return fmt.Errorf("error registering natural sort collation: %v", err)
+ }
+
+ return nil
+ },
+ }
+
+ conn, err := sqlite3Driver.Open(dsn)
+ if err != nil {
+ return nil, err
+ }
+
+ return &CustomSQLiteConn{conn.(*sqlite3.SQLiteConn)}, nil
+}
+
+func (c *CustomSQLiteConn) Close() error {
+ conn := c.SQLiteConn
+
+ _, _ = conn.Exec("PRAGMA analysis_limit=1000; PRAGMA optimize;", []driver.Value{})
+
+ return conn.Close()
+}
diff --git a/pkg/sqlite/file.go b/pkg/sqlite/file.go
index 0cd21ee4b..06c83b8d6 100644
--- a/pkg/sqlite/file.go
+++ b/pkg/sqlite/file.go
@@ -575,6 +575,23 @@ func (qb *FileStore) find(ctx context.Context, id file.ID) (file.File, error) {
// FindByPath returns the first file that matches the given path. Wildcard characters are supported.
func (qb *FileStore) FindByPath(ctx context.Context, p string) (file.File, error) {
+
+ ret, err := qb.FindAllByPath(ctx, p)
+
+ if err != nil {
+ return nil, err
+ }
+
+ if len(ret) == 0 {
+ return nil, nil
+ }
+
+ return ret[0], nil
+}
+
+// FindAllByPath returns all the files that match the given path.
+// Wildcard characters are supported.
+func (qb *FileStore) FindAllByPath(ctx context.Context, p string) ([]file.File, error) {
// separate basename from path
basename := filepath.Base(p)
dirName := filepath.Dir(p)
@@ -601,7 +618,7 @@ func (qb *FileStore) FindByPath(ctx context.Context, p string) (file.File, error
)
}
- ret, err := qb.get(ctx, q)
+ ret, err := qb.getMany(ctx, q)
if err != nil && !errors.Is(err, sql.ErrNoRows) {
return nil, fmt.Errorf("getting file by path %s: %w", p, err)
}
@@ -806,7 +823,9 @@ func (qb *FileStore) Query(ctx context.Context, options models.FileQueryOptions)
}
filter := qb.makeFilter(ctx, fileFilter)
- query.addFilter(filter)
+ if err := query.addFilter(filter); err != nil {
+ return nil, err
+ }
qb.setQuerySort(&query, findFilter)
query.sortAndPagination += getPagination(findFilter)
diff --git a/pkg/sqlite/functions.go b/pkg/sqlite/functions.go
index 29e93aa22..f639d0b5b 100644
--- a/pkg/sqlite/functions.go
+++ b/pkg/sqlite/functions.go
@@ -1,6 +1,7 @@
package sqlite
import (
+ "path/filepath"
"strconv"
"strings"
)
@@ -30,3 +31,7 @@ func durationToTinyIntFn(str string) (int64, error) {
return int64(seconds), nil
}
+
+func basenameFn(str string) (string, error) {
+ return filepath.Base(str), nil
+}
diff --git a/pkg/sqlite/gallery.go b/pkg/sqlite/gallery.go
index e45d7cb9f..590586b94 100644
--- a/pkg/sqlite/gallery.go
+++ b/pkg/sqlite/gallery.go
@@ -26,6 +26,7 @@ const (
galleriesTagsTable = "galleries_tags"
galleriesImagesTable = "galleries_images"
galleriesScenesTable = "scenes_galleries"
+ galleriesChaptersTable = "galleries_chapters"
galleryIDColumn = "gallery_id"
)
@@ -363,17 +364,23 @@ func (qb *GalleryStore) Find(ctx context.Context, id int) (*models.Gallery, erro
}
func (qb *GalleryStore) FindMany(ctx context.Context, ids []int) ([]*models.Gallery, error) {
- q := qb.selectDataset().Prepared(true).Where(qb.table().Col(idColumn).In(ids))
- unsorted, err := qb.getMany(ctx, q)
- if err != nil {
- return nil, err
- }
-
galleries := make([]*models.Gallery, len(ids))
- for _, s := range unsorted {
- i := intslice.IntIndex(ids, s.ID)
- galleries[i] = s
+ if err := batchExec(ids, defaultBatchSize, func(batch []int) error {
+ q := qb.selectDataset().Prepared(true).Where(qb.table().Col(idColumn).In(batch))
+ unsorted, err := qb.getMany(ctx, q)
+ if err != nil {
+ return err
+ }
+
+ for _, s := range unsorted {
+ i := intslice.IntIndex(ids, s.ID)
+ galleries[i] = s
+ }
+
+ return nil
+ }); err != nil {
+ return nil, err
}
for i := range galleries {
@@ -662,6 +669,7 @@ func (qb *GalleryStore) makeFilter(ctx context.Context, galleryFilter *models.Ga
query.handleCriterion(ctx, galleryTagCountCriterionHandler(qb, galleryFilter.TagCount))
query.handleCriterion(ctx, galleryPerformersCriterionHandler(qb, galleryFilter.Performers))
query.handleCriterion(ctx, galleryPerformerCountCriterionHandler(qb, galleryFilter.PerformerCount))
+ query.handleCriterion(ctx, hasChaptersCriterionHandler(galleryFilter.HasChapters))
query.handleCriterion(ctx, galleryStudioCriterionHandler(qb, galleryFilter.Studios))
query.handleCriterion(ctx, galleryPerformerTagsCriterionHandler(qb, galleryFilter.PerformerTags))
query.handleCriterion(ctx, galleryAverageResolutionCriterionHandler(qb, galleryFilter.AverageResolution))
@@ -723,11 +731,15 @@ func (qb *GalleryStore) makeQuery(ctx context.Context, galleryFilter *models.Gal
as: "gallery_folder",
onClause: "galleries.folder_id = gallery_folder.id",
},
+ join{
+ table: galleriesChaptersTable,
+ onClause: "galleries_chapters.gallery_id = galleries.id",
+ },
)
// add joins for files and checksum
filepathColumn := "folders.path || '" + string(filepath.Separator) + "' || files.basename"
- searchColumns := []string{"galleries.title", "gallery_folder.path", filepathColumn, "files_fingerprints.fingerprint"}
+ searchColumns := []string{"galleries.title", "gallery_folder.path", filepathColumn, "files_fingerprints.fingerprint", "galleries_chapters.title"}
query.parseQueryString(searchColumns, *q)
}
@@ -736,7 +748,9 @@ func (qb *GalleryStore) makeQuery(ctx context.Context, galleryFilter *models.Gal
}
filter := qb.makeFilter(ctx, galleryFilter)
- query.addFilter(filter)
+ if err := query.addFilter(filter); err != nil {
+ return nil, err
+ }
qb.setGallerySort(&query, findFilter)
query.sortAndPagination += getPagination(findFilter)
@@ -941,6 +955,19 @@ func galleryImageCountCriterionHandler(qb *GalleryStore, imageCount *models.IntC
return h.handler(imageCount)
}
+func hasChaptersCriterionHandler(hasChapters *string) criterionHandlerFunc {
+ return func(ctx context.Context, f *filterBuilder) {
+ if hasChapters != nil {
+ f.addLeftJoin("galleries_chapters", "", "galleries_chapters.gallery_id = galleries.id")
+ if *hasChapters == "true" {
+ f.addHaving("count(galleries_chapters.gallery_id) > 0")
+ } else {
+ f.addWhere("galleries_chapters.id IS NULL")
+ }
+ }
+ }
+}
+
func galleryStudioCriterionHandler(qb *GalleryStore, studios *models.HierarchicalMultiCriterionInput) criterionHandlerFunc {
h := hierarchicalMultiCriterionHandlerBuilder{
tx: qb.tx,
@@ -1109,7 +1136,7 @@ func (qb *GalleryStore) setGallerySort(query *queryBuilder, findFilter *models.F
case "title":
addFileTable()
addFolderTable()
- query.sortAndPagination += " ORDER BY galleries.title COLLATE NATURAL_CS " + direction + ", folders.path " + direction + ", file_folder.path " + direction + ", files.basename COLLATE NATURAL_CS " + direction
+ query.sortAndPagination += " ORDER BY COALESCE(galleries.title, files.basename, basename(COALESCE(folders.path, ''))) COLLATE NATURAL_CS " + direction + ", file_folder.path " + direction
default:
query.sortAndPagination += getSort(sort, direction, "galleries")
}
diff --git a/pkg/sqlite/gallery_chapter.go b/pkg/sqlite/gallery_chapter.go
new file mode 100644
index 000000000..694a70655
--- /dev/null
+++ b/pkg/sqlite/gallery_chapter.go
@@ -0,0 +1,94 @@
+package sqlite
+
+import (
+ "context"
+ "fmt"
+
+ "github.com/stashapp/stash/pkg/models"
+)
+
+type galleryChapterQueryBuilder struct {
+ repository
+}
+
+var GalleryChapterReaderWriter = &galleryChapterQueryBuilder{
+ repository{
+ tableName: galleriesChaptersTable,
+ idColumn: idColumn,
+ },
+}
+
+func (qb *galleryChapterQueryBuilder) Create(ctx context.Context, newObject models.GalleryChapter) (*models.GalleryChapter, error) {
+ var ret models.GalleryChapter
+ if err := qb.insertObject(ctx, newObject, &ret); err != nil {
+ return nil, err
+ }
+
+ return &ret, nil
+}
+
+func (qb *galleryChapterQueryBuilder) Update(ctx context.Context, updatedObject models.GalleryChapter) (*models.GalleryChapter, error) {
+ const partial = false
+ if err := qb.update(ctx, updatedObject.ID, updatedObject, partial); err != nil {
+ return nil, err
+ }
+
+ var ret models.GalleryChapter
+ if err := qb.getByID(ctx, updatedObject.ID, &ret); err != nil {
+ return nil, err
+ }
+
+ return &ret, nil
+}
+
+func (qb *galleryChapterQueryBuilder) Destroy(ctx context.Context, id int) error {
+ return qb.destroyExisting(ctx, []int{id})
+}
+
+func (qb *galleryChapterQueryBuilder) Find(ctx context.Context, id int) (*models.GalleryChapter, error) {
+ query := "SELECT * FROM galleries_chapters WHERE id = ? LIMIT 1"
+ args := []interface{}{id}
+ results, err := qb.queryGalleryChapters(ctx, query, args)
+ if err != nil || len(results) < 1 {
+ return nil, err
+ }
+ return results[0], nil
+}
+
+func (qb *galleryChapterQueryBuilder) FindMany(ctx context.Context, ids []int) ([]*models.GalleryChapter, error) {
+ var markers []*models.GalleryChapter
+ for _, id := range ids {
+ marker, err := qb.Find(ctx, id)
+ if err != nil {
+ return nil, err
+ }
+
+ if marker == nil {
+ return nil, fmt.Errorf("gallery chapter with id %d not found", id)
+ }
+
+ markers = append(markers, marker)
+ }
+
+ return markers, nil
+}
+
+func (qb *galleryChapterQueryBuilder) FindByGalleryID(ctx context.Context, galleryID int) ([]*models.GalleryChapter, error) {
+ query := `
+ SELECT galleries_chapters.* FROM galleries_chapters
+ WHERE galleries_chapters.gallery_id = ?
+ GROUP BY galleries_chapters.id
+ ORDER BY galleries_chapters.image_index ASC
+ `
+ args := []interface{}{galleryID}
+ return qb.queryGalleryChapters(ctx, query, args)
+}
+
+func (qb *galleryChapterQueryBuilder) queryGalleryChapters(ctx context.Context, query string, args []interface{}) ([]*models.GalleryChapter, error) {
+ var ret models.GalleryChapters
+ if err := qb.query(ctx, query, args, &ret); err != nil {
+ return nil, err
+ }
+
+ return []*models.GalleryChapter(ret), nil
+}
diff --git a/pkg/sqlite/gallery_chapter_test.go b/pkg/sqlite/gallery_chapter_test.go
new file mode 100644
index 000000000..3464b462a
--- /dev/null
+++ b/pkg/sqlite/gallery_chapter_test.go
@@ -0,0 +1,44 @@
+//go:build integration
+// +build integration
+
+package sqlite_test
+
+import (
+ "context"
+ "testing"
+
+ "github.com/stashapp/stash/pkg/sqlite"
+ "github.com/stretchr/testify/assert"
+)
+
+func TestChapterFindByGalleryID(t *testing.T) {
+ withTxn(func(ctx context.Context) error {
+ mqb := sqlite.GalleryChapterReaderWriter
+
+ galleryID := galleryIDs[galleryIdxWithChapters]
+ chapters, err := mqb.FindByGalleryID(ctx, galleryID)
+
+ if err != nil {
+ t.Errorf("Error finding chapters: %s", err.Error())
+ }
+
+ assert.Greater(t, len(chapters), 0)
+ for _, chapter := range chapters {
+ assert.Equal(t, galleryIDs[galleryIdxWithChapters], int(chapter.GalleryID.Int64))
+ }
+
+ chapters, err = mqb.FindByGalleryID(ctx, 0)
+
+ if err != nil {
+ t.Errorf("Error finding chapter: %s", err.Error())
+ }
+
+ assert.Len(t, chapters, 0)
+
+ return nil
+ })
+}
+
+// TODO Update
+// TODO Destroy
+// TODO Find
diff --git a/pkg/sqlite/gallery_test.go b/pkg/sqlite/gallery_test.go
index 80e25b6d1..6d145cb1b 100644
--- a/pkg/sqlite/gallery_test.go
+++ b/pkg/sqlite/gallery_test.go
@@ -2414,6 +2414,13 @@ func TestGalleryQuerySorting(t *testing.T) {
-1,
-1,
},
+ {
+ "title",
+ "title",
+ models.SortDirectionEnumDesc,
+ -1,
+ -1,
+ },
}
qb := db.Gallery
@@ -2609,6 +2616,37 @@ func TestGalleryStore_RemoveImages(t *testing.T) {
}
}
+func TestGalleryQueryHasChapters(t *testing.T) {
+ withTxn(func(ctx context.Context) error {
+ sqb := db.Gallery
+ hasChapters := "true"
+ galleryFilter := models.GalleryFilterType{
+ HasChapters: &hasChapters,
+ }
+
+ q := getGalleryStringValue(galleryIdxWithChapters, titleField)
+ findFilter := models.FindFilterType{
+ Q: &q,
+ }
+
+ galleries := queryGallery(ctx, t, sqb, &galleryFilter, &findFilter)
+
+ assert.Len(t, galleries, 1)
+ assert.Equal(t, galleryIDs[galleryIdxWithChapters], galleries[0].ID)
+
+ hasChapters = "false"
+ galleries = queryGallery(ctx, t, sqb, &galleryFilter, &findFilter)
+ assert.Len(t, galleries, 0)
+
+ findFilter.Q = nil
+ galleries = queryGallery(ctx, t, sqb, &galleryFilter, &findFilter)
+
+ assert.NotEqual(t, 0, len(galleries))
+
+ return nil
+ })
+}
+
// TODO Count
// TODO All
// TODO Query
diff --git a/pkg/sqlite/image.go b/pkg/sqlite/image.go
index 9cc0e957a..d5bb4e852 100644
--- a/pkg/sqlite/image.go
+++ b/pkg/sqlite/image.go
@@ -31,6 +31,8 @@ type imageRow struct {
Title zero.String `db:"title"`
// expressed as 1-100
Rating null.Int `db:"rating"`
+ URL zero.String `db:"url"`
+ Date models.SQLiteDate `db:"date"`
Organized bool `db:"organized"`
OCounter int `db:"o_counter"`
StudioID null.Int `db:"studio_id,omitempty"`
@@ -42,6 +44,10 @@ func (r *imageRow) fromImage(i models.Image) {
r.ID = i.ID
r.Title = zero.StringFrom(i.Title)
r.Rating = intFromPtr(i.Rating)
+ r.URL = zero.StringFrom(i.URL)
+ if i.Date != nil {
+ _ = r.Date.Scan(i.Date.Time)
+ }
r.Organized = i.Organized
r.OCounter = i.OCounter
r.StudioID = intFromPtr(i.StudioID)
@@ -62,6 +68,8 @@ func (r *imageQueryRow) resolve() *models.Image {
ID: r.ID,
Title: r.Title.String,
Rating: nullIntPtr(r.Rating),
+ URL: r.URL.String,
+ Date: r.Date.DatePtr(),
Organized: r.Organized,
OCounter: r.OCounter,
StudioID: nullIntPtr(r.StudioID),
@@ -87,6 +95,8 @@ type imageRowRecord struct {
func (r *imageRowRecord) fromPartial(i models.ImagePartial) {
r.setNullString("title", i.Title)
r.setNullInt("rating", i.Rating)
+ r.setNullString("url", i.URL)
+ r.setSQLiteDate("date", i.Date)
r.setBool("organized", i.Organized)
r.setInt("o_counter", i.OCounter)
r.setNullInt("studio_id", i.StudioID)
@@ -250,17 +260,23 @@ func (qb *ImageStore) Find(ctx context.Context, id int) (*models.Image, error) {
}
func (qb *ImageStore) FindMany(ctx context.Context, ids []int) ([]*models.Image, error) {
- q := qb.selectDataset().Prepared(true).Where(qb.table().Col(idColumn).In(ids))
- unsorted, err := qb.getMany(ctx, q)
- if err != nil {
- return nil, err
- }
-
images := make([]*models.Image, len(ids))
- for _, s := range unsorted {
- i := intslice.IntIndex(ids, s.ID)
- images[i] = s
+ if err := batchExec(ids, defaultBatchSize, func(batch []int) error {
+ q := qb.selectDataset().Prepared(true).Where(qb.table().Col(idColumn).In(batch))
+ unsorted, err := qb.getMany(ctx, q)
+ if err != nil {
+ return err
+ }
+
+ for _, s := range unsorted {
+ i := intslice.IntIndex(ids, s.ID)
+ images[i] = s
+ }
+
+ return nil
+ }); err != nil {
+ return nil, err
}
for i := range images {
@@ -638,6 +654,8 @@ func (qb *ImageStore) makeFilter(ctx context.Context, imageFilter *models.ImageF
query.handleCriterion(ctx, rating5CriterionHandler(imageFilter.Rating, "images.rating", nil))
query.handleCriterion(ctx, intCriterionHandler(imageFilter.OCounter, "images.o_counter", nil))
query.handleCriterion(ctx, boolCriterionHandler(imageFilter.Organized, "images.organized", nil))
+ query.handleCriterion(ctx, dateCriterionHandler(imageFilter.Date, "images.date"))
+ query.handleCriterion(ctx, stringCriterionHandler(imageFilter.URL, "images.url"))
query.handleCriterion(ctx, resolutionCriterionHandler(imageFilter.Resolution, "image_files.height", "image_files.width", qb.addImageFilesTable))
query.handleCriterion(ctx, imageIsMissingCriterionHandler(qb, imageFilter.IsMissing))
@@ -716,7 +734,9 @@ func (qb *ImageStore) makeQuery(ctx context.Context, imageFilter *models.ImageFi
}
filter := qb.makeFilter(ctx, imageFilter)
- query.addFilter(filter)
+ if err := query.addFilter(filter); err != nil {
+ return nil, err
+ }
qb.setImageSortAndPagination(&query, findFilter)
@@ -1019,7 +1039,7 @@ func (qb *ImageStore) setImageSortAndPagination(q *queryBuilder, findFilter *mod
case "title":
addFilesJoin()
addFolderJoin()
- sortClause = " ORDER BY images.title COLLATE NATURAL_CS " + direction + ", folders.path " + direction + ", files.basename COLLATE NATURAL_CS " + direction
+ sortClause = " ORDER BY COALESCE(images.title, files.basename) COLLATE NATURAL_CS " + direction + ", folders.path " + direction
default:
sortClause = getSort(sort, direction, "images")
}
diff --git a/pkg/sqlite/image_test.go b/pkg/sqlite/image_test.go
index d40859de9..31f6d4876 100644
--- a/pkg/sqlite/image_test.go
+++ b/pkg/sqlite/image_test.go
@@ -56,6 +56,8 @@ func Test_imageQueryBuilder_Create(t *testing.T) {
title = "title"
rating = 60
ocounter = 5
+ url = "url"
+ date = models.NewDate("2003-02-01")
createdAt = time.Date(2001, 1, 1, 0, 0, 0, 0, time.UTC)
updatedAt = time.Date(2001, 1, 1, 0, 0, 0, 0, time.UTC)
@@ -72,6 +74,8 @@ func Test_imageQueryBuilder_Create(t *testing.T) {
models.Image{
Title: title,
Rating: &rating,
+ Date: &date,
+ URL: url,
Organized: true,
OCounter: ocounter,
StudioID: &studioIDs[studioIdxWithImage],
@@ -88,6 +92,8 @@ func Test_imageQueryBuilder_Create(t *testing.T) {
models.Image{
Title: title,
Rating: &rating,
+ Date: &date,
+ URL: url,
Organized: true,
OCounter: ocounter,
StudioID: &studioIDs[studioIdxWithImage],
@@ -209,6 +215,8 @@ func Test_imageQueryBuilder_Update(t *testing.T) {
var (
title = "title"
rating = 60
+ url = "url"
+ date = models.NewDate("2003-02-01")
ocounter = 5
createdAt = time.Date(2001, 1, 1, 0, 0, 0, 0, time.UTC)
updatedAt = time.Date(2001, 1, 1, 0, 0, 0, 0, time.UTC)
@@ -225,6 +233,8 @@ func Test_imageQueryBuilder_Update(t *testing.T) {
ID: imageIDs[imageIdxWithGallery],
Title: title,
Rating: &rating,
+ URL: url,
+ Date: &date,
Organized: true,
OCounter: ocounter,
StudioID: &studioIDs[studioIdxWithImage],
@@ -372,6 +382,8 @@ func clearImagePartial() models.ImagePartial {
return models.ImagePartial{
Title: models.OptionalString{Set: true, Null: true},
Rating: models.OptionalInt{Set: true, Null: true},
+ URL: models.OptionalString{Set: true, Null: true},
+ Date: models.OptionalDate{Set: true, Null: true},
StudioID: models.OptionalInt{Set: true, Null: true},
GalleryIDs: &models.UpdateIDs{Mode: models.RelationshipUpdateModeSet},
TagIDs: &models.UpdateIDs{Mode: models.RelationshipUpdateModeSet},
@@ -383,6 +395,8 @@ func Test_imageQueryBuilder_UpdatePartial(t *testing.T) {
var (
title = "title"
rating = 60
+ url = "url"
+ date = models.NewDate("2003-02-01")
ocounter = 5
createdAt = time.Date(2001, 1, 1, 0, 0, 0, 0, time.UTC)
updatedAt = time.Date(2001, 1, 1, 0, 0, 0, 0, time.UTC)
@@ -401,6 +415,8 @@ func Test_imageQueryBuilder_UpdatePartial(t *testing.T) {
models.ImagePartial{
Title: models.NewOptionalString(title),
Rating: models.NewOptionalInt(rating),
+ URL: models.NewOptionalString(url),
+ Date: models.NewOptionalDate(date),
Organized: models.NewOptionalBool(true),
OCounter: models.NewOptionalInt(ocounter),
StudioID: models.NewOptionalInt(studioIDs[studioIdxWithImage]),
@@ -423,6 +439,8 @@ func Test_imageQueryBuilder_UpdatePartial(t *testing.T) {
ID: imageIDs[imageIdx1WithGallery],
Title: title,
Rating: &rating,
+ URL: url,
+ Date: &date,
Organized: true,
OCounter: ocounter,
StudioID: &studioIDs[studioIdxWithImage],
@@ -943,7 +961,8 @@ func Test_imageQueryBuilder_Destroy(t *testing.T) {
}
func makeImageWithID(index int) *models.Image {
- ret := makeImage(index)
+ const fromDB = true
+ ret := makeImage(index, true)
ret.ID = imageIDs[index]
ret.Files = models.NewRelatedImageFiles([]*file.ImageFile{makeImageFile(index)})
@@ -2560,6 +2579,13 @@ func TestImageQuerySorting(t *testing.T) {
-1,
-1,
},
+ {
+ "date",
+ "date",
+ models.SortDirectionEnumDesc,
+ imageIdxWithTwoGalleries,
+ imageIdxWithGrandChildStudio,
+ },
}
qb := db.Image
diff --git a/pkg/sqlite/migrations/42_performer_disambig_aliases.up.sql b/pkg/sqlite/migrations/42_performer_disambig_aliases.up.sql
new file mode 100644
index 000000000..34197d8ae
--- /dev/null
+++ b/pkg/sqlite/migrations/42_performer_disambig_aliases.up.sql
@@ -0,0 +1,121 @@
+PRAGMA foreign_keys=OFF;
+
+CREATE TABLE `performer_aliases` (
+ `performer_id` integer NOT NULL,
+ `alias` varchar(255) NOT NULL,
+ foreign key(`performer_id`) references `performers`(`id`) on delete CASCADE,
+ PRIMARY KEY(`performer_id`, `alias`)
+);
+
+CREATE INDEX `performer_aliases_alias` on `performer_aliases` (`alias`);
+
+DROP INDEX `performers_checksum_unique`;
+
+-- drop aliases and checksum
+-- add disambiguation
+
+CREATE TABLE `performers_new` (
+ `id` integer not null primary key autoincrement,
+ `name` varchar(255),
+ `disambiguation` varchar(255),
+ `gender` varchar(20),
+ `url` varchar(255),
+ `twitter` varchar(255),
+ `instagram` varchar(255),
+ `birthdate` date,
+ `ethnicity` varchar(255),
+ `country` varchar(255),
+ `eye_color` varchar(255),
+ `height` int,
+ `measurements` varchar(255),
+ `fake_tits` varchar(255),
+ `career_length` varchar(255),
+ `tattoos` varchar(255),
+ `piercings` varchar(255),
+ `favorite` boolean not null default '0',
+ `created_at` datetime not null,
+ `updated_at` datetime not null,
+ `details` text,
+ `death_date` date,
+ `hair_color` varchar(255),
+ `weight` integer,
+ `rating` tinyint,
+ `ignore_auto_tag` boolean not null default '0'
+);
+
+INSERT INTO `performers_new`
+ (
+ `id`,
+ `name`,
+ `gender`,
+ `url`,
+ `twitter`,
+ `instagram`,
+ `birthdate`,
+ `ethnicity`,
+ `country`,
+ `eye_color`,
+ `height`,
+ `measurements`,
+ `fake_tits`,
+ `career_length`,
+ `tattoos`,
+ `piercings`,
+ `favorite`,
+ `created_at`,
+ `updated_at`,
+ `details`,
+ `death_date`,
+ `hair_color`,
+ `weight`,
+ `rating`,
+ `ignore_auto_tag`
+ )
+ SELECT
+ `id`,
+ `name`,
+ `gender`,
+ `url`,
+ `twitter`,
+ `instagram`,
+ `birthdate`,
+ `ethnicity`,
+ `country`,
+ `eye_color`,
+ `height`,
+ `measurements`,
+ `fake_tits`,
+ `career_length`,
+ `tattoos`,
+ `piercings`,
+ `favorite`,
+ `created_at`,
+ `updated_at`,
+ `details`,
+ `death_date`,
+ `hair_color`,
+ `weight`,
+ `rating`,
+ `ignore_auto_tag`
+ FROM `performers`;
+
+INSERT INTO `performer_aliases`
+ (
+ `performer_id`,
+ `alias`
+ )
+ SELECT
+ `id`,
+ `aliases`
+ FROM `performers`
+ WHERE `performers`.`aliases` IS NOT NULL AND `performers`.`aliases` != '';
+
+DROP TABLE `performers`;
+ALTER TABLE `performers_new` rename to `performers`;
+
+
+-- these will be executed in the post-migration
+-- CREATE UNIQUE INDEX `performers_name_disambiguation_unique` on `performers` (`name`, `disambiguation`) WHERE `disambiguation` IS NOT NULL;
+-- CREATE UNIQUE INDEX `performers_name_unique` on `performers` (`name`) WHERE `disambiguation` IS NULL;
+
+PRAGMA foreign_keys=ON;
diff --git a/pkg/sqlite/migrations/42_postmigrate.go b/pkg/sqlite/migrations/42_postmigrate.go
new file mode 100644
index 000000000..235687f92
--- /dev/null
+++ b/pkg/sqlite/migrations/42_postmigrate.go
@@ -0,0 +1,353 @@
+package migrations
+
+import (
+ "context"
+ "database/sql"
+ "fmt"
+ "regexp"
+ "strconv"
+ "strings"
+
+ "github.com/jmoiron/sqlx"
+ "github.com/stashapp/stash/pkg/logger"
+ "github.com/stashapp/stash/pkg/sliceutil/stringslice"
+ "github.com/stashapp/stash/pkg/sqlite"
+)
+
+type schema42Migrator struct {
+ migrator
+}
+
+func post42(ctx context.Context, db *sqlx.DB) error {
+ logger.Info("Running post-migration for schema version 42")
+
+ m := schema42Migrator{
+ migrator: migrator{
+ db: db,
+ },
+ }
+
+ if err := m.migrate(ctx); err != nil {
+ return fmt.Errorf("migrating performer aliases: %w", err)
+ }
+
+ if err := m.migrateDuplicatePerformers(ctx); err != nil {
+ return fmt.Errorf("migrating duplicate performers: %w", err)
+ }
+
+ // do this after duplicate performer detection, since setting disambiguation
+ // breaks the duplicate disambiguation setting code
+ if err := m.migratePerformersDisam(ctx); err != nil {
+ return fmt.Errorf("migrating performer names: %w", err)
+ }
+
+ if err := m.executeSchemaChanges(); err != nil {
+ return fmt.Errorf("executing schema changes: %w", err)
+ }
+
+ return nil
+}
+
+func (m *schema42Migrator) migrate(ctx context.Context) error {
+ logger.Info("Migrating performer aliases")
+
+ const (
+ limit = 1000
+ logEvery = 10000
+ )
+
+ lastID := 0
+ count := 0
+
+ for {
+ gotSome := false
+
+ if err := m.withTxn(ctx, func(tx *sqlx.Tx) error {
+ query := "SELECT `performer_id`, `alias` FROM `performer_aliases`"
+
+ if lastID != 0 {
+ query += fmt.Sprintf(" WHERE `performer_id` > %d ", lastID)
+ }
+
+ query += fmt.Sprintf(" ORDER BY `performer_id` LIMIT %d", limit)
+
+ rows, err := m.db.Query(query)
+ if err != nil {
+ return err
+ }
+ defer rows.Close()
+
+ for rows.Next() {
+ var (
+ id int
+ aliases string
+ )
+
+ err := rows.Scan(&id, &aliases)
+ if err != nil {
+ return err
+ }
+
+ lastID = id
+ gotSome = true
+ count++
+
+ if err := m.migratePerformerAliases(id, aliases); err != nil {
+ return err
+ }
+ }
+
+ return rows.Err()
+ }); err != nil {
+ return err
+ }
+
+ if !gotSome {
+ break
+ }
+
+ if count%logEvery == 0 {
+ logger.Infof("Migrated %d rows", count)
+ }
+ }
+
+ return nil
+}
+
+func (m *schema42Migrator) migratePerformerAliases(id int, aliases string) error {
+ // split aliases by , or /
+ aliasList := strings.FieldsFunc(aliases, func(r rune) bool {
+ return strings.ContainsRune(",/", r)
+ })
+
+ if len(aliasList) < 2 {
+ // existing value is fine
+ return nil
+ }
+
+ // delete the existing row
+ if _, err := m.db.Exec("DELETE FROM `performer_aliases` WHERE `performer_id` = ?", id); err != nil {
+ return err
+ }
+
+ // trim whitespace from each alias
+ for i, alias := range aliasList {
+ aliasList[i] = strings.TrimSpace(alias)
+ }
+
+ // remove duplicates
+ aliasList = stringslice.StrAppendUniques(nil, aliasList)
+
+ // insert aliases into table
+ for _, alias := range aliasList {
+ _, err := m.db.Exec("INSERT INTO `performer_aliases` (`performer_id`, `alias`) VALUES (?, ?)", id, alias)
+ if err != nil {
+ return err
+ }
+ }
+
+ return nil
+}
+
+func (m *schema42Migrator) migratePerformersDisam(ctx context.Context) error {
+ logger.Info("Migrating performer disambiguation")
+
+ const (
+ limit = 1
+ logEvery = 10000
+ )
+
+ count := 0
+ lastID := 0
+
+ for {
+ gotSome := false
+
+ if err := m.withTxn(ctx, func(tx *sqlx.Tx) error {
+ query := `
+SELECT id, name FROM performers WHERE performers.name like '% (%)'`
+
+ if lastID != 0 {
+ query += fmt.Sprintf(" AND `id` > %d ", lastID)
+ }
+
+ query += fmt.Sprintf(" ORDER BY `id` LIMIT %d", limit)
+
+ rows, err := m.db.Query(query)
+ if err != nil {
+ return err
+ }
+ defer rows.Close()
+
+ for rows.Next() {
+ var (
+ id int
+ name string
+ )
+
+ err := rows.Scan(&id, &name)
+ if err != nil {
+ return err
+ }
+
+ gotSome = true
+ lastID = id
+ count++
+
+ if err := m.massagePerformerName(id, name); err != nil {
+ return err
+ }
+ }
+
+ return rows.Err()
+ }); err != nil {
+ return err
+ }
+
+ if !gotSome {
+ break
+ }
+
+ if count%logEvery == 0 {
+ logger.Infof("Migrated %d performers", count)
+ }
+ }
+
+ return nil
+}
+
+// extracts the performer name and disambiguation from the name field based on
+// the format "name (disambiguation)".
+var performerDisRE = regexp.MustCompile(`^((?:[^(\s]+\s)+)\(([^)]+)\)$`)
+
+func (m *schema42Migrator) massagePerformerName(performerID int, name string) error {
+
+ r := performerDisRE.FindStringSubmatch(name)
+ if len(r) != 3 {
+ // ignore corner case invalid names
+ return nil
+ }
+
+ // get the performer name and disambiguation from the capturing groups
+ // trim the trailing whitespace (single only) from the name
+ newName := strings.TrimSuffix(r[1], " ")
+ newDis := r[2]
+
+ logger.Infof("Separating %q into %q and disambiguation %q", name, newName, newDis)
+
+ _, err := m.db.Exec("UPDATE performers SET name = ?, disambiguation = ? WHERE id = ?", newName, newDis, performerID)
+ if err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (m *schema42Migrator) migrateDuplicatePerformers(ctx context.Context) error {
+ logger.Info("Migrating duplicate performers")
+
+ const (
+ limit = 1000
+ logEvery = 10000
+ )
+
+ count := 0
+
+ for {
+ gotSome := false
+
+ if err := m.withTxn(ctx, func(tx *sqlx.Tx) error {
+ query := `
+SELECT id, name FROM performers WHERE performers.disambiguation IS NULL AND EXISTS (
+ SELECT 1 FROM performers p2 WHERE
+ performers.name = p2.name AND
+ performers.rowid > p2.rowid
+)`
+
+ query += fmt.Sprintf(" ORDER BY `id` LIMIT %d", limit)
+
+ rows, err := m.db.Query(query)
+ if err != nil {
+ return err
+ }
+ defer rows.Close()
+
+ for rows.Next() {
+ var (
+ id int
+ name string
+ )
+
+ err := rows.Scan(&id, &name)
+ if err != nil {
+ return err
+ }
+
+ gotSome = true
+ count++
+
+ if err := m.migrateDuplicatePerformer(id, name); err != nil {
+ return err
+ }
+ }
+
+ return rows.Err()
+ }); err != nil {
+ return err
+ }
+
+ if !gotSome {
+ break
+ }
+
+ if count%logEvery == 0 {
+ logger.Infof("Migrated %d performers", count)
+ }
+ }
+
+ return nil
+}
+
+func (m *schema42Migrator) migrateDuplicatePerformer(performerID int, name string) error {
+ // get the highest value of disambiguation for this performer name
+ query := `
+SELECT disambiguation FROM performers WHERE name = ? ORDER BY disambiguation DESC LIMIT 1`
+
+ var disambiguation sql.NullString
+ if err := m.db.Get(&disambiguation, query, name); err != nil {
+ return err
+ }
+
+ newDisambiguation := 1
+
+ // if there is no disambiguation, set it to 1
+ if disambiguation.Valid {
+ numericDis, err := strconv.Atoi(disambiguation.String)
+ if err != nil {
+ // shouldn't happen
+ return err
+ }
+
+ newDisambiguation = numericDis + 1
+ }
+
+ logger.Infof("Adding disambiguation '%d' for performer %q", newDisambiguation, name)
+
+ _, err := m.db.Exec("UPDATE performers SET disambiguation = ? WHERE id = ?", strconv.Itoa(newDisambiguation), performerID)
+ if err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (m *schema42Migrator) executeSchemaChanges() error {
+ return m.execAll([]string{
+ "CREATE UNIQUE INDEX `performers_name_disambiguation_unique` on `performers` (`name`, `disambiguation`) WHERE `disambiguation` IS NOT NULL",
+ "CREATE UNIQUE INDEX `performers_name_unique` on `performers` (`name`) WHERE `disambiguation` IS NULL",
+ })
+}
+
+func init() {
+ sqlite.RegisterPostMigration(42, post42)
+}
diff --git a/pkg/sqlite/migrations/43_image_date_url.up.sql b/pkg/sqlite/migrations/43_image_date_url.up.sql
new file mode 100644
index 000000000..b66591acb
--- /dev/null
+++ b/pkg/sqlite/migrations/43_image_date_url.up.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `images` ADD COLUMN `url` varchar(255);
+ALTER TABLE `images` ADD COLUMN `date` date;
\ No newline at end of file
diff --git a/pkg/sqlite/migrations/44_gallery_chapters.up.sql b/pkg/sqlite/migrations/44_gallery_chapters.up.sql
new file mode 100644
index 000000000..de38e23e9
--- /dev/null
+++ b/pkg/sqlite/migrations/44_gallery_chapters.up.sql
@@ -0,0 +1,10 @@
+CREATE TABLE `galleries_chapters` (
+ `id` integer not null primary key autoincrement,
+ `title` varchar(255) not null,
+ `image_index` integer not null,
+ `gallery_id` integer not null,
+ `created_at` datetime not null,
+ `updated_at` datetime not null,
+ foreign key(`gallery_id`) references `galleries`(`id`) on delete CASCADE
+);
+CREATE INDEX `index_galleries_chapters_on_gallery_id` on `galleries_chapters` (`gallery_id`);
diff --git a/pkg/sqlite/migrations/45_blobs.up.sql b/pkg/sqlite/migrations/45_blobs.up.sql
new file mode 100644
index 000000000..ea62fe5bc
--- /dev/null
+++ b/pkg/sqlite/migrations/45_blobs.up.sql
@@ -0,0 +1,19 @@
+CREATE TABLE `blobs` (
+ `checksum` varchar(255) NOT NULL PRIMARY KEY,
+ `blob` blob
+);
+
+ALTER TABLE `tags` ADD COLUMN `image_blob` varchar(255) REFERENCES `blobs`(`checksum`);
+ALTER TABLE `studios` ADD COLUMN `image_blob` varchar(255) REFERENCES `blobs`(`checksum`);
+ALTER TABLE `performers` ADD COLUMN `image_blob` varchar(255) REFERENCES `blobs`(`checksum`);
+ALTER TABLE `scenes` ADD COLUMN `cover_blob` varchar(255) REFERENCES `blobs`(`checksum`);
+
+ALTER TABLE `movies` ADD COLUMN `front_image_blob` varchar(255) REFERENCES `blobs`(`checksum`);
+ALTER TABLE `movies` ADD COLUMN `back_image_blob` varchar(255) REFERENCES `blobs`(`checksum`);
+
+-- performed in the post-migration
+-- DROP TABLE `tags_image`;
+-- DROP TABLE `studios_image`;
+-- DROP TABLE `performers_image`;
+-- DROP TABLE `scenes_cover`;
+-- DROP TABLE `movies_images`;
diff --git a/pkg/sqlite/migrations/45_postmigrate.go b/pkg/sqlite/migrations/45_postmigrate.go
new file mode 100644
index 000000000..ee205788b
--- /dev/null
+++ b/pkg/sqlite/migrations/45_postmigrate.go
@@ -0,0 +1,296 @@
+package migrations
+
+import (
+ "context"
+ "fmt"
+ "strings"
+
+ "github.com/jmoiron/sqlx"
+ "github.com/stashapp/stash/internal/manager/config"
+ "github.com/stashapp/stash/pkg/hash/md5"
+ "github.com/stashapp/stash/pkg/logger"
+ "github.com/stashapp/stash/pkg/sqlite"
+ "github.com/stashapp/stash/pkg/utils"
+)
+
+type schema45Migrator struct {
+ migrator
+ hasBlobs bool
+}
+
+func post45(ctx context.Context, db *sqlx.DB) error {
+ logger.Info("Running post-migration for schema version 45")
+
+ m := schema45Migrator{
+ migrator: migrator{
+ db: db,
+ },
+ }
+
+ if err := m.migrateImagesTable(ctx, migrateImagesTableOptions{
+ joinTable: "tags_image",
+ joinIDCol: "tag_id",
+ destTable: "tags",
+ cols: []migrateImageToBlobOptions{
+ {
+ joinImageCol: "image",
+ destCol: "image_blob",
+ },
+ },
+ }); err != nil {
+ return err
+ }
+
+ if err := m.migrateImagesTable(ctx, migrateImagesTableOptions{
+ joinTable: "studios_image",
+ joinIDCol: "studio_id",
+ destTable: "studios",
+ cols: []migrateImageToBlobOptions{
+ {
+ joinImageCol: "image",
+ destCol: "image_blob",
+ },
+ },
+ }); err != nil {
+ return err
+ }
+
+ if err := m.migrateImagesTable(ctx, migrateImagesTableOptions{
+ joinTable: "performers_image",
+ joinIDCol: "performer_id",
+ destTable: "performers",
+ cols: []migrateImageToBlobOptions{
+ {
+ joinImageCol: "image",
+ destCol: "image_blob",
+ },
+ },
+ }); err != nil {
+ return err
+ }
+
+ if err := m.migrateImagesTable(ctx, migrateImagesTableOptions{
+ joinTable: "scenes_cover",
+ joinIDCol: "scene_id",
+ destTable: "scenes",
+ cols: []migrateImageToBlobOptions{
+ {
+ joinImageCol: "cover",
+ destCol: "cover_blob",
+ },
+ },
+ }); err != nil {
+ return err
+ }
+
+ if err := m.migrateImagesTable(ctx, migrateImagesTableOptions{
+ joinTable: "movies_images",
+ joinIDCol: "movie_id",
+ destTable: "movies",
+ cols: []migrateImageToBlobOptions{
+ {
+ joinImageCol: "front_image",
+ destCol: "front_image_blob",
+ },
+ {
+ joinImageCol: "back_image",
+ destCol: "back_image_blob",
+ },
+ },
+ }); err != nil {
+ return err
+ }
+
+ tablesToDrop := []string{
+ "tags_image",
+ "studios_image",
+ "performers_image",
+ "scenes_cover",
+ "movies_images",
+ }
+
+ for _, table := range tablesToDrop {
+ if err := m.dropTable(ctx, table); err != nil {
+ return err
+ }
+ }
+
+ if err := m.migrateConfig(ctx); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+type migrateImageToBlobOptions struct {
+ joinImageCol string
+ destCol string
+}
+
+type migrateImagesTableOptions struct {
+ joinTable string
+ joinIDCol string
+ destTable string
+ cols []migrateImageToBlobOptions
+}
+
+func (o migrateImagesTableOptions) selectColumns() string {
+ var cols []string
+ for _, c := range o.cols {
+ cols = append(cols, "`"+c.joinImageCol+"`")
+ }
+
+ return strings.Join(cols, ", ")
+}
+
+func (m *schema45Migrator) migrateImagesTable(ctx context.Context, options migrateImagesTableOptions) error {
+ logger.Infof("Moving %s to blobs table", options.joinTable)
+
+ const (
+ limit = 1000
+ logEvery = 10000
+ )
+
+ count := 0
+
+ for {
+ gotSome := false
+
+ if err := m.withTxn(ctx, func(tx *sqlx.Tx) error {
+ query := fmt.Sprintf("SELECT %s, %s FROM `%s`", options.joinIDCol, options.selectColumns(), options.joinTable)
+
+ query += fmt.Sprintf(" LIMIT %d", limit)
+
+ rows, err := m.db.Query(query)
+ if err != nil {
+ return err
+ }
+ defer rows.Close()
+
+ for rows.Next() {
+ m.hasBlobs = true
+
+ var id int
+
+ result := make([]interface{}, len(options.cols)+1)
+ result[0] = &id
+ for i := range options.cols {
+ v := []byte{}
+ result[i+1] = &v
+ }
+
+ err := rows.Scan(result...)
+ if err != nil {
+ return err
+ }
+
+ gotSome = true
+ count++
+
+ for i, col := range options.cols {
+ image := result[i+1].(*[]byte)
+
+ if len(*image) > 0 {
+ if err := m.insertImage(*image, id, options.destTable, col.destCol); err != nil {
+ return err
+ }
+ }
+ }
+
+ // delete the row from the join table so we don't process it again
+ deleteSQL := utils.StrFormat("DELETE FROM `{joinTable}` WHERE `{joinIDCol}` = ?", utils.StrFormatMap{
+ "joinTable": options.joinTable,
+ "joinIDCol": options.joinIDCol,
+ })
+ if _, err := m.db.Exec(deleteSQL, id); err != nil {
+ return err
+ }
+ }
+
+ return rows.Err()
+ }); err != nil {
+ return err
+ }
+
+ if !gotSome {
+ break
+ }
+
+ if count%logEvery == 0 {
+ logger.Infof("Migrated %d images", count)
+ }
+ }
+
+ return nil
+}
+
+func (m *schema45Migrator) insertImage(data []byte, id int, destTable string, destCol string) error {
+ // calculate checksum and insert into blobs table
+ checksum := md5.FromBytes(data)
+
+ if _, err := m.db.Exec("INSERT INTO `blobs` (`checksum`, `blob`) VALUES (?, ?) ON CONFLICT DO NOTHING", checksum, data); err != nil {
+ return err
+ }
+
+ // set the tag image checksum
+ updateSQL := utils.StrFormat("UPDATE `{destTable}` SET `{destCol}` = ? WHERE `id` = ?", utils.StrFormatMap{
+ "destTable": destTable,
+ "destCol": destCol,
+ })
+ if _, err := m.db.Exec(updateSQL, checksum, id); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (m *schema45Migrator) dropTable(ctx context.Context, table string) error {
+ if err := m.withTxn(ctx, func(tx *sqlx.Tx) error {
+ logger.Debugf("Dropping %s", table)
+ _, err := m.db.Exec(fmt.Sprintf("DROP TABLE `%s`", table))
+ return err
+ }); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (m *schema45Migrator) migrateConfig(ctx context.Context) error {
+ c := config.GetInstance()
+
+ // if we don't have blobs, and storage is already set, then don't overwrite
+ if !m.hasBlobs && c.GetBlobsStorage().IsValid() {
+ logger.Infof("Blobs storage already set, not overwriting")
+ return nil
+ }
+
+ // if we have blobs in the database, then default to database storage
+ // otherwise default to filesystem storage
+ defaultStorage := config.BlobStorageTypeFilesystem
+ if m.hasBlobs || c.GetBlobsPath() == "" {
+ defaultStorage = config.BlobStorageTypeDatabase
+ }
+
+ logger.Infof("Setting blobs storage to %s", defaultStorage.String())
+ c.Set(config.BlobsStorage, defaultStorage)
+ if err := c.Write(); err != nil {
+ logger.Errorf("Error while writing configuration file: %s", err.Error())
+ }
+
+ // if default scan settings are set, then set to generate scene covers by default
+ scanDefaults := c.GetDefaultScanSettings()
+ if scanDefaults != nil {
+ scanDefaults.ScanGenerateCovers = true
+ c.Set(config.DefaultScanSettings, scanDefaults)
+ if err := c.Write(); err != nil {
+ logger.Errorf("Error while writing configuration file: %s", err.Error())
+ }
+ }
+
+ return nil
+}
+
+func init() {
+ sqlite.RegisterPostMigration(45, post45)
+}
diff --git a/pkg/sqlite/migrations/custom_migration.go b/pkg/sqlite/migrations/custom_migration.go
index baebc7094..f243e20e3 100644
--- a/pkg/sqlite/migrations/custom_migration.go
+++ b/pkg/sqlite/migrations/custom_migration.go
@@ -36,3 +36,13 @@ func (m *migrator) withTxn(ctx context.Context, fn func(tx *sqlx.Tx) error) erro
err = fn(tx)
return err
}
+
+func (m *migrator) execAll(stmts []string) error {
+ for _, stmt := range stmts {
+ if _, err := m.db.Exec(stmt); err != nil {
+ return fmt.Errorf("executing statement %s: %w", stmt, err)
+ }
+ }
+
+ return nil
+}
diff --git a/pkg/sqlite/movies.go b/pkg/sqlite/movies.go
index a3b0e2f2b..1c591614d 100644
--- a/pkg/sqlite/movies.go
+++ b/pkg/sqlite/movies.go
@@ -12,18 +12,30 @@ import (
"github.com/stashapp/stash/pkg/sliceutil/intslice"
)
-const movieTable = "movies"
-const movieIDColumn = "movie_id"
+const (
+ movieTable = "movies"
+ movieIDColumn = "movie_id"
+
+ movieFrontImageBlobColumn = "front_image_blob"
+ movieBackImageBlobColumn = "back_image_blob"
+)
type movieQueryBuilder struct {
repository
+ blobJoinQueryBuilder
}
-var MovieReaderWriter = &movieQueryBuilder{
- repository{
- tableName: movieTable,
- idColumn: idColumn,
- },
+func NewMovieReaderWriter(blobStore *BlobStore) *movieQueryBuilder {
+ return &movieQueryBuilder{
+ repository{
+ tableName: movieTable,
+ idColumn: idColumn,
+ },
+ blobJoinQueryBuilder{
+ blobStore: blobStore,
+ joinTable: movieTable,
+ },
+ }
}
func (qb *movieQueryBuilder) Create(ctx context.Context, newObject models.Movie) (*models.Movie, error) {
@@ -54,6 +66,11 @@ func (qb *movieQueryBuilder) UpdateFull(ctx context.Context, updatedObject model
}
func (qb *movieQueryBuilder) Destroy(ctx context.Context, id int) error {
+ // must handle image checksums manually
+ if err := qb.destroyImages(ctx, id); err != nil {
+ return err
+ }
+
return qb.destroyExisting(ctx, []int{id})
}
@@ -70,17 +87,23 @@ func (qb *movieQueryBuilder) Find(ctx context.Context, id int) (*models.Movie, e
func (qb *movieQueryBuilder) FindMany(ctx context.Context, ids []int) ([]*models.Movie, error) {
tableMgr := movieTableMgr
- q := goqu.Select("*").From(tableMgr.table).Where(tableMgr.byIDInts(ids...))
- unsorted, err := qb.getMany(ctx, q)
- if err != nil {
- return nil, err
- }
-
ret := make([]*models.Movie, len(ids))
- for _, s := range unsorted {
- i := intslice.IntIndex(ids, s.ID)
- ret[i] = s
+ if err := batchExec(ids, defaultBatchSize, func(batch []int) error {
+ q := goqu.Select("*").From(tableMgr.table).Where(tableMgr.byIDInts(batch...))
+ unsorted, err := qb.getMany(ctx, q)
+ if err != nil {
+ return err
+ }
+
+ for _, s := range unsorted {
+ i := intslice.IntIndex(ids, s.ID)
+ ret[i] = s
+ }
+
+ return nil
+ }); err != nil {
+ return nil, err
}
for i := range ret {
@@ -180,7 +203,9 @@ func (qb *movieQueryBuilder) Query(ctx context.Context, movieFilter *models.Movi
filter := qb.makeFilter(ctx, movieFilter)
- query.addFilter(filter)
+ if err := query.addFilter(filter); err != nil {
+ return nil, 0, err
+ }
query.sortAndPagination = qb.getMovieSort(findFilter) + getPagination(findFilter)
idsResult, countResult, err := query.executeFind(ctx)
@@ -201,11 +226,9 @@ func movieIsMissingCriterionHandler(qb *movieQueryBuilder, isMissing *string) cr
if isMissing != nil && *isMissing != "" {
switch *isMissing {
case "front_image":
- f.addLeftJoin("movies_images", "", "movies_images.movie_id = movies.id")
- f.addWhere("movies_images.front_image IS NULL")
+ f.addWhere("movies.front_image_blob IS NULL")
case "back_image":
- f.addLeftJoin("movies_images", "", "movies_images.movie_id = movies.id")
- f.addWhere("movies_images.back_image IS NULL")
+ f.addWhere("movies.back_image_blob IS NULL")
case "scenes":
f.addLeftJoin("movies_scenes", "", "movies_scenes.movie_id = movies.id")
f.addWhere("movies_scenes.scene_id IS NULL")
@@ -314,39 +337,35 @@ func (qb *movieQueryBuilder) queryMovies(ctx context.Context, query string, args
return []*models.Movie(ret), nil
}
-func (qb *movieQueryBuilder) UpdateImages(ctx context.Context, movieID int, frontImage []byte, backImage []byte) error {
- // Delete the existing cover and then create new
- if err := qb.DestroyImages(ctx, movieID); err != nil {
- return err
- }
-
- _, err := qb.tx.Exec(ctx,
- `INSERT INTO movies_images (movie_id, front_image, back_image) VALUES (?, ?, ?)`,
- movieID,
- frontImage,
- backImage,
- )
-
- return err
+func (qb *movieQueryBuilder) UpdateFrontImage(ctx context.Context, movieID int, frontImage []byte) error {
+ return qb.UpdateImage(ctx, movieID, movieFrontImageBlobColumn, frontImage)
}
-func (qb *movieQueryBuilder) DestroyImages(ctx context.Context, movieID int) error {
- // Delete the existing joins
- _, err := qb.tx.Exec(ctx, "DELETE FROM movies_images WHERE movie_id = ?", movieID)
- if err != nil {
+func (qb *movieQueryBuilder) UpdateBackImage(ctx context.Context, movieID int, backImage []byte) error {
+ return qb.UpdateImage(ctx, movieID, movieBackImageBlobColumn, backImage)
+}
+
+func (qb *movieQueryBuilder) destroyImages(ctx context.Context, movieID int) error {
+ if err := qb.DestroyImage(ctx, movieID, movieFrontImageBlobColumn); err != nil {
return err
}
- return err
+ if err := qb.DestroyImage(ctx, movieID, movieBackImageBlobColumn); err != nil {
+ return err
+ }
+
+ return nil
}
func (qb *movieQueryBuilder) GetFrontImage(ctx context.Context, movieID int) ([]byte, error) {
- query := `SELECT front_image from movies_images WHERE movie_id = ?`
- return getImage(ctx, qb.tx, query, movieID)
+ return qb.GetImage(ctx, movieID, movieFrontImageBlobColumn)
}
func (qb *movieQueryBuilder) GetBackImage(ctx context.Context, movieID int) ([]byte, error) {
- query := `SELECT back_image from movies_images WHERE movie_id = ?`
- return getImage(ctx, qb.tx, query, movieID)
+ return qb.GetImage(ctx, movieID, movieBackImageBlobColumn)
+}
+
+func (qb *movieQueryBuilder) HasBackImage(ctx context.Context, movieID int) (bool, error) {
+ return qb.HasImage(ctx, movieID, movieBackImageBlobColumn)
}
func (qb *movieQueryBuilder) FindByPerformerID(ctx context.Context, performerID int) ([]*models.Movie, error) {
diff --git a/pkg/sqlite/movies_test.go b/pkg/sqlite/movies_test.go
index eff0cf50b..9180dde20 100644
--- a/pkg/sqlite/movies_test.go
+++ b/pkg/sqlite/movies_test.go
@@ -15,12 +15,11 @@ import (
"github.com/stashapp/stash/pkg/hash/md5"
"github.com/stashapp/stash/pkg/models"
- "github.com/stashapp/stash/pkg/sqlite"
)
func TestMovieFindByName(t *testing.T) {
withTxn(func(ctx context.Context) error {
- mqb := sqlite.MovieReaderWriter
+ mqb := db.Movie
name := movieNames[movieIdxWithScene] // find a movie by name
@@ -53,7 +52,7 @@ func TestMovieFindByNames(t *testing.T) {
withTxn(func(ctx context.Context) error {
var names []string
- mqb := sqlite.MovieReaderWriter
+ mqb := db.Movie
names = append(names, movieNames[movieIdxWithScene]) // find movies by names
@@ -76,9 +75,80 @@ func TestMovieFindByNames(t *testing.T) {
})
}
+func moviesToIDs(i []*models.Movie) []int {
+ ret := make([]int, len(i))
+ for i, v := range i {
+ ret[i] = v.ID
+ }
+
+ return ret
+}
+
+func TestMovieQuery(t *testing.T) {
+ var (
+ frontImage = "front_image"
+ backImage = "back_image"
+ )
+
+ tests := []struct {
+ name string
+ findFilter *models.FindFilterType
+ filter *models.MovieFilterType
+ includeIdxs []int
+ excludeIdxs []int
+ wantErr bool
+ }{
+ {
+ "is missing front image",
+ nil,
+ &models.MovieFilterType{
+ IsMissing: &frontImage,
+ },
+ // just ensure that it doesn't error
+ nil,
+ nil,
+ false,
+ },
+ {
+ "is missing back image",
+ nil,
+ &models.MovieFilterType{
+ IsMissing: &backImage,
+ },
+ // just ensure that it doesn't error
+ nil,
+ nil,
+ false,
+ },
+ }
+
+ for _, tt := range tests {
+ runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+ assert := assert.New(t)
+
+ results, _, err := db.Movie.Query(ctx, tt.filter, tt.findFilter)
+ if (err != nil) != tt.wantErr {
+ t.Errorf("MovieQueryBuilder.Query() error = %v, wantErr %v", err, tt.wantErr)
+ return
+ }
+
+ ids := moviesToIDs(results)
+ include := indexesToIDs(performerIDs, tt.includeIdxs)
+ exclude := indexesToIDs(performerIDs, tt.excludeIdxs)
+
+ for _, i := range include {
+ assert.Contains(ids, i)
+ }
+ for _, e := range exclude {
+ assert.NotContains(ids, e)
+ }
+ })
+ }
+}
+
func TestMovieQueryStudio(t *testing.T) {
withTxn(func(ctx context.Context) error {
- mqb := sqlite.MovieReaderWriter
+ mqb := db.Movie
studioCriterion := models.HierarchicalMultiCriterionInput{
Value: []string{
strconv.Itoa(studioIDs[studioIdxWithMovie]),
@@ -163,7 +233,7 @@ func TestMovieQueryURL(t *testing.T) {
func verifyMovieQuery(t *testing.T, filter models.MovieFilterType, verifyFn func(s *models.Movie)) {
withTxn(func(ctx context.Context) error {
t.Helper()
- sqb := sqlite.MovieReaderWriter
+ sqb := db.Movie
movies := queryMovie(ctx, t, sqb, &filter, nil)
@@ -196,7 +266,7 @@ func TestMovieQuerySorting(t *testing.T) {
}
withTxn(func(ctx context.Context) error {
- sqb := sqlite.MovieReaderWriter
+ sqb := db.Movie
movies := queryMovie(ctx, t, sqb, nil, &findFilter)
// scenes should be in same order as indexes
@@ -216,122 +286,50 @@ func TestMovieQuerySorting(t *testing.T) {
})
}
-func TestMovieUpdateMovieImages(t *testing.T) {
- if err := withTxn(func(ctx context.Context) error {
- mqb := sqlite.MovieReaderWriter
+func TestMovieUpdateFrontImage(t *testing.T) {
+ if err := withRollbackTxn(func(ctx context.Context) error {
+ qb := db.Movie
// create movie to test against
const name = "TestMovieUpdateMovieImages"
- movie := models.Movie{
+ toCreate := models.Movie{
Name: sql.NullString{String: name, Valid: true},
Checksum: md5.FromString(name),
}
- created, err := mqb.Create(ctx, movie)
+ movie, err := qb.Create(ctx, toCreate)
if err != nil {
return fmt.Errorf("Error creating movie: %s", err.Error())
}
- frontImage := []byte("frontImage")
- backImage := []byte("backImage")
- err = mqb.UpdateImages(ctx, created.ID, frontImage, backImage)
- if err != nil {
- return fmt.Errorf("Error updating movie images: %s", err.Error())
- }
-
- // ensure images are set
- storedFront, err := mqb.GetFrontImage(ctx, created.ID)
- if err != nil {
- return fmt.Errorf("Error getting front image: %s", err.Error())
- }
- assert.Equal(t, storedFront, frontImage)
-
- storedBack, err := mqb.GetBackImage(ctx, created.ID)
- if err != nil {
- return fmt.Errorf("Error getting back image: %s", err.Error())
- }
- assert.Equal(t, storedBack, backImage)
-
- // set front image only
- newImage := []byte("newImage")
- err = mqb.UpdateImages(ctx, created.ID, newImage, nil)
- if err != nil {
- return fmt.Errorf("Error updating movie images: %s", err.Error())
- }
-
- storedFront, err = mqb.GetFrontImage(ctx, created.ID)
- if err != nil {
- return fmt.Errorf("Error getting front image: %s", err.Error())
- }
- assert.Equal(t, storedFront, newImage)
-
- // back image should be nil
- storedBack, err = mqb.GetBackImage(ctx, created.ID)
- if err != nil {
- return fmt.Errorf("Error getting back image: %s", err.Error())
- }
- assert.Nil(t, nil)
-
- // set back image only
- err = mqb.UpdateImages(ctx, created.ID, nil, newImage)
- if err == nil {
- return fmt.Errorf("Expected error setting nil front image")
- }
-
- return nil
+ return testUpdateImage(t, ctx, movie.ID, qb.UpdateFrontImage, qb.GetFrontImage)
}); err != nil {
t.Error(err.Error())
}
}
-func TestMovieDestroyMovieImages(t *testing.T) {
- if err := withTxn(func(ctx context.Context) error {
- mqb := sqlite.MovieReaderWriter
+func TestMovieUpdateBackImage(t *testing.T) {
+ if err := withRollbackTxn(func(ctx context.Context) error {
+ qb := db.Movie
// create movie to test against
- const name = "TestMovieDestroyMovieImages"
- movie := models.Movie{
+ const name = "TestMovieUpdateMovieImages"
+ toCreate := models.Movie{
Name: sql.NullString{String: name, Valid: true},
Checksum: md5.FromString(name),
}
- created, err := mqb.Create(ctx, movie)
+ movie, err := qb.Create(ctx, toCreate)
if err != nil {
return fmt.Errorf("Error creating movie: %s", err.Error())
}
- frontImage := []byte("frontImage")
- backImage := []byte("backImage")
- err = mqb.UpdateImages(ctx, created.ID, frontImage, backImage)
- if err != nil {
- return fmt.Errorf("Error updating movie images: %s", err.Error())
- }
-
- err = mqb.DestroyImages(ctx, created.ID)
- if err != nil {
- return fmt.Errorf("Error destroying movie images: %s", err.Error())
- }
-
- // front image should be nil
- storedFront, err := mqb.GetFrontImage(ctx, created.ID)
- if err != nil {
- return fmt.Errorf("Error getting front image: %s", err.Error())
- }
- assert.Nil(t, storedFront)
-
- // back image should be nil
- storedBack, err := mqb.GetBackImage(ctx, created.ID)
- if err != nil {
- return fmt.Errorf("Error getting back image: %s", err.Error())
- }
- assert.Nil(t, storedBack)
-
- return nil
+ return testUpdateImage(t, ctx, movie.ID, qb.UpdateBackImage, qb.GetBackImage)
}); err != nil {
t.Error(err.Error())
}
}
// TODO Update
-// TODO Destroy
+// TODO Destroy - ensure image is destroyed
// TODO Find
// TODO Count
// TODO All
diff --git a/pkg/sqlite/performer.go b/pkg/sqlite/performer.go
index fae593ba6..f288401d3 100644
--- a/pkg/sqlite/performer.go
+++ b/pkg/sqlite/performer.go
@@ -17,33 +17,37 @@ import (
"gopkg.in/guregu/null.v4/zero"
)
-const performerTable = "performers"
-const performerIDColumn = "performer_id"
-const performersTagsTable = "performers_tags"
-const performersImageTable = "performers_image" // performer cover image
+const (
+ performerTable = "performers"
+ performerIDColumn = "performer_id"
+ performersAliasesTable = "performer_aliases"
+ performerAliasColumn = "alias"
+ performersTagsTable = "performers_tags"
+
+ performerImageBlobColumn = "image_blob"
+)
type performerRow struct {
- ID int `db:"id" goqu:"skipinsert"`
- Checksum string `db:"checksum"`
- Name zero.String `db:"name"`
- Gender zero.String `db:"gender"`
- URL zero.String `db:"url"`
- Twitter zero.String `db:"twitter"`
- Instagram zero.String `db:"instagram"`
- Birthdate models.SQLiteDate `db:"birthdate"`
- Ethnicity zero.String `db:"ethnicity"`
- Country zero.String `db:"country"`
- EyeColor zero.String `db:"eye_color"`
- Height null.Int `db:"height"`
- Measurements zero.String `db:"measurements"`
- FakeTits zero.String `db:"fake_tits"`
- CareerLength zero.String `db:"career_length"`
- Tattoos zero.String `db:"tattoos"`
- Piercings zero.String `db:"piercings"`
- Aliases zero.String `db:"aliases"`
- Favorite sql.NullBool `db:"favorite"`
- CreatedAt models.SQLiteTimestamp `db:"created_at"`
- UpdatedAt models.SQLiteTimestamp `db:"updated_at"`
+ ID int `db:"id" goqu:"skipinsert"`
+ Name string `db:"name"`
+ Disambigation zero.String `db:"disambiguation"`
+ Gender zero.String `db:"gender"`
+ URL zero.String `db:"url"`
+ Twitter zero.String `db:"twitter"`
+ Instagram zero.String `db:"instagram"`
+ Birthdate models.SQLiteDate `db:"birthdate"`
+ Ethnicity zero.String `db:"ethnicity"`
+ Country zero.String `db:"country"`
+ EyeColor zero.String `db:"eye_color"`
+ Height null.Int `db:"height"`
+ Measurements zero.String `db:"measurements"`
+ FakeTits zero.String `db:"fake_tits"`
+ CareerLength zero.String `db:"career_length"`
+ Tattoos zero.String `db:"tattoos"`
+ Piercings zero.String `db:"piercings"`
+ Favorite sql.NullBool `db:"favorite"`
+ CreatedAt models.SQLiteTimestamp `db:"created_at"`
+ UpdatedAt models.SQLiteTimestamp `db:"updated_at"`
// expressed as 1-100
Rating null.Int `db:"rating"`
Details zero.String `db:"details"`
@@ -51,12 +55,15 @@ type performerRow struct {
HairColor zero.String `db:"hair_color"`
Weight null.Int `db:"weight"`
IgnoreAutoTag bool `db:"ignore_auto_tag"`
+
+ // not used for resolution
+ ImageBlob zero.String `db:"image_blob"`
}
func (r *performerRow) fromPerformer(o models.Performer) {
r.ID = o.ID
- r.Checksum = o.Checksum
- r.Name = zero.StringFrom(o.Name)
+ r.Name = o.Name
+ r.Disambigation = zero.StringFrom(o.Disambiguation)
if o.Gender.IsValid() {
r.Gender = zero.StringFrom(o.Gender.String())
}
@@ -75,7 +82,6 @@ func (r *performerRow) fromPerformer(o models.Performer) {
r.CareerLength = zero.StringFrom(o.CareerLength)
r.Tattoos = zero.StringFrom(o.Tattoos)
r.Piercings = zero.StringFrom(o.Piercings)
- r.Aliases = zero.StringFrom(o.Aliases)
r.Favorite = sql.NullBool{Bool: o.Favorite, Valid: true}
r.CreatedAt = models.SQLiteTimestamp{Timestamp: o.CreatedAt}
r.UpdatedAt = models.SQLiteTimestamp{Timestamp: o.UpdatedAt}
@@ -91,27 +97,26 @@ func (r *performerRow) fromPerformer(o models.Performer) {
func (r *performerRow) resolve() *models.Performer {
ret := &models.Performer{
- ID: r.ID,
- Checksum: r.Checksum,
- Name: r.Name.String,
- Gender: models.GenderEnum(r.Gender.String),
- URL: r.URL.String,
- Twitter: r.Twitter.String,
- Instagram: r.Instagram.String,
- Birthdate: r.Birthdate.DatePtr(),
- Ethnicity: r.Ethnicity.String,
- Country: r.Country.String,
- EyeColor: r.EyeColor.String,
- Height: nullIntPtr(r.Height),
- Measurements: r.Measurements.String,
- FakeTits: r.FakeTits.String,
- CareerLength: r.CareerLength.String,
- Tattoos: r.Tattoos.String,
- Piercings: r.Piercings.String,
- Aliases: r.Aliases.String,
- Favorite: r.Favorite.Bool,
- CreatedAt: r.CreatedAt.Timestamp,
- UpdatedAt: r.UpdatedAt.Timestamp,
+ ID: r.ID,
+ Name: r.Name,
+ Disambiguation: r.Disambigation.String,
+ Gender: models.GenderEnum(r.Gender.String),
+ URL: r.URL.String,
+ Twitter: r.Twitter.String,
+ Instagram: r.Instagram.String,
+ Birthdate: r.Birthdate.DatePtr(),
+ Ethnicity: r.Ethnicity.String,
+ Country: r.Country.String,
+ EyeColor: r.EyeColor.String,
+ Height: nullIntPtr(r.Height),
+ Measurements: r.Measurements.String,
+ FakeTits: r.FakeTits.String,
+ CareerLength: r.CareerLength.String,
+ Tattoos: r.Tattoos.String,
+ Piercings: r.Piercings.String,
+ Favorite: r.Favorite.Bool,
+ CreatedAt: r.CreatedAt.Timestamp,
+ UpdatedAt: r.UpdatedAt.Timestamp,
// expressed as 1-100
Rating: nullIntPtr(r.Rating),
Details: r.Details.String,
@@ -129,8 +134,8 @@ type performerRowRecord struct {
}
func (r *performerRowRecord) fromPartial(o models.PerformerPartial) {
- r.setNullString("checksum", o.Checksum)
- r.setNullString("name", o.Name)
+ r.setString("name", o.Name)
+ r.setNullString("disambiguation", o.Disambiguation)
r.setNullString("gender", o.Gender)
r.setNullString("url", o.URL)
r.setNullString("twitter", o.Twitter)
@@ -145,7 +150,6 @@ func (r *performerRowRecord) fromPartial(o models.PerformerPartial) {
r.setNullString("career_length", o.CareerLength)
r.setNullString("tattoos", o.Tattoos)
r.setNullString("piercings", o.Piercings)
- r.setNullString("aliases", o.Aliases)
r.setBool("favorite", o.Favorite)
r.setSQLiteTimestamp("created_at", o.CreatedAt)
r.setSQLiteTimestamp("updated_at", o.UpdatedAt)
@@ -159,16 +163,21 @@ func (r *performerRowRecord) fromPartial(o models.PerformerPartial) {
type PerformerStore struct {
repository
+ blobJoinQueryBuilder
tableMgr *table
}
-func NewPerformerStore() *PerformerStore {
+func NewPerformerStore(blobStore *BlobStore) *PerformerStore {
return &PerformerStore{
repository: repository{
tableName: performerTable,
idColumn: idColumn,
},
+ blobJoinQueryBuilder: blobJoinQueryBuilder{
+ blobStore: blobStore,
+ joinTable: performerTable,
+ },
tableMgr: performerTableMgr,
}
}
@@ -182,6 +191,24 @@ func (qb *PerformerStore) Create(ctx context.Context, newObject *models.Performe
return err
}
+ if newObject.Aliases.Loaded() {
+ if err := performersAliasesTableMgr.insertJoins(ctx, id, newObject.Aliases.List()); err != nil {
+ return err
+ }
+ }
+
+ if newObject.TagIDs.Loaded() {
+ if err := performersTagsTableMgr.insertJoins(ctx, id, newObject.TagIDs.List()); err != nil {
+ return err
+ }
+ }
+
+ if newObject.StashIDs.Loaded() {
+ if err := performersStashIDsTableMgr.insertJoins(ctx, id, newObject.StashIDs.List()); err != nil {
+ return err
+ }
+ }
+
updated, err := qb.Find(ctx, id)
if err != nil {
return fmt.Errorf("finding after create: %w", err)
@@ -192,14 +219,14 @@ func (qb *PerformerStore) Create(ctx context.Context, newObject *models.Performe
return nil
}
-func (qb *PerformerStore) UpdatePartial(ctx context.Context, id int, updatedObject models.PerformerPartial) (*models.Performer, error) {
+func (qb *PerformerStore) UpdatePartial(ctx context.Context, id int, partial models.PerformerPartial) (*models.Performer, error) {
r := performerRowRecord{
updateRecord{
Record: make(exp.Record),
},
}
- r.fromPartial(updatedObject)
+ r.fromPartial(partial)
if len(r.Record) > 0 {
if err := qb.tableMgr.updateByID(ctx, id, r.Record); err != nil {
@@ -207,6 +234,23 @@ func (qb *PerformerStore) UpdatePartial(ctx context.Context, id int, updatedObje
}
}
+ if partial.Aliases != nil {
+ if err := performersAliasesTableMgr.modifyJoins(ctx, id, partial.Aliases.Values, partial.Aliases.Mode); err != nil {
+ return nil, err
+ }
+ }
+
+ if partial.TagIDs != nil {
+ if err := performersTagsTableMgr.modifyJoins(ctx, id, partial.TagIDs.IDs, partial.TagIDs.Mode); err != nil {
+ return nil, err
+ }
+ }
+ if partial.StashIDs != nil {
+ if err := performersStashIDsTableMgr.modifyJoins(ctx, id, partial.StashIDs.StashIDs, partial.StashIDs.Mode); err != nil {
+ return nil, err
+ }
+ }
+
return qb.Find(ctx, id)
}
@@ -218,10 +262,33 @@ func (qb *PerformerStore) Update(ctx context.Context, updatedObject *models.Perf
return err
}
+ if updatedObject.Aliases.Loaded() {
+ if err := performersAliasesTableMgr.replaceJoins(ctx, updatedObject.ID, updatedObject.Aliases.List()); err != nil {
+ return err
+ }
+ }
+
+ if updatedObject.TagIDs.Loaded() {
+ if err := performersTagsTableMgr.replaceJoins(ctx, updatedObject.ID, updatedObject.TagIDs.List()); err != nil {
+ return err
+ }
+ }
+
+ if updatedObject.StashIDs.Loaded() {
+ if err := performersStashIDsTableMgr.replaceJoins(ctx, updatedObject.ID, updatedObject.StashIDs.List()); err != nil {
+ return err
+ }
+ }
+
return nil
}
func (qb *PerformerStore) Destroy(ctx context.Context, id int) error {
+ // must handle image checksums manually
+ if err := qb.DestroyImage(ctx, id); err != nil {
+ return err
+ }
+
return qb.destroyExisting(ctx, []int{id})
}
@@ -246,17 +313,23 @@ func (qb *PerformerStore) Find(ctx context.Context, id int) (*models.Performer,
func (qb *PerformerStore) FindMany(ctx context.Context, ids []int) ([]*models.Performer, error) {
tableMgr := performerTableMgr
- q := goqu.Select("*").From(tableMgr.table).Where(tableMgr.byIDInts(ids...))
- unsorted, err := qb.getMany(ctx, q)
- if err != nil {
- return nil, err
- }
-
ret := make([]*models.Performer, len(ids))
- for _, s := range unsorted {
- i := intslice.IntIndex(ids, s.ID)
- ret[i] = s
+ if err := batchExec(ids, defaultBatchSize, func(batch []int) error {
+ q := goqu.Select("*").From(tableMgr.table).Where(tableMgr.byIDInts(batch...))
+ unsorted, err := qb.getMany(ctx, q)
+ if err != nil {
+ return err
+ }
+
+ for _, s := range unsorted {
+ i := intslice.IntIndex(ids, s.ID)
+ ret[i] = s
+ }
+
+ return nil
+ }); err != nil {
+ return nil, err
}
for i := range ret {
@@ -397,14 +470,19 @@ func (qb *PerformerStore) QueryForAutoTag(ctx context.Context, words []string) (
// TODO - Query needs to be changed to support queries of this type, and
// this method should be removed
table := qb.table()
- sq := dialect.From(table).Select(table.Col(idColumn)).Where()
+ sq := dialect.From(table).Select(table.Col(idColumn))
+ // TODO - disabled alias matching until we get finer control over it
+ // .LeftJoin(
+ // performersAliasesJoinTable,
+ // goqu.On(performersAliasesJoinTable.Col(performerIDColumn).Eq(table.Col(idColumn))),
+ // )
var whereClauses []exp.Expression
for _, w := range words {
whereClauses = append(whereClauses, table.Col("name").Like(w+"%"))
- // TODO - commented out until alias matching works both ways
- // whereClauses = append(whereClauses, table.Col("aliases").Like(w+"%")
+ // TODO - see above
+ // whereClauses = append(whereClauses, performersAliasesJoinTable.Col("alias").Like(w+"%"))
}
sq = sq.Where(
@@ -483,6 +561,7 @@ func (qb *PerformerStore) makeFilter(ctx context.Context, filter *models.Perform
const tableName = performerTable
query.handleCriterion(ctx, stringCriterionHandler(filter.Name, tableName+".name"))
+ query.handleCriterion(ctx, stringCriterionHandler(filter.Disambiguation, tableName+".disambiguation"))
query.handleCriterion(ctx, stringCriterionHandler(filter.Details, tableName+".details"))
query.handleCriterion(ctx, boolCriterionHandler(filter.FilterFavorites, tableName+".favorite", nil))
@@ -540,8 +619,7 @@ func (qb *PerformerStore) makeFilter(ctx context.Context, filter *models.Perform
parentIDCol: "performers.id",
})
- // TODO - need better handling of aliases
- query.handleCriterion(ctx, stringCriterionHandler(filter.Aliases, tableName+".aliases"))
+ query.handleCriterion(ctx, performerAliasCriterionHandler(qb, filter.Aliases))
query.handleCriterion(ctx, performerTagsCriterionHandler(qb, filter.Tags))
@@ -559,7 +637,7 @@ func (qb *PerformerStore) makeFilter(ctx context.Context, filter *models.Perform
return query
}
-func (qb *PerformerStore) Query(ctx context.Context, performerFilter *models.PerformerFilterType, findFilter *models.FindFilterType) ([]*models.Performer, int, error) {
+func (qb *PerformerStore) makeQuery(ctx context.Context, performerFilter *models.PerformerFilterType, findFilter *models.FindFilterType) (*queryBuilder, error) {
if performerFilter == nil {
performerFilter = &models.PerformerFilterType{}
}
@@ -571,18 +649,31 @@ func (qb *PerformerStore) Query(ctx context.Context, performerFilter *models.Per
distinctIDs(&query, performerTable)
if q := findFilter.Q; q != nil && *q != "" {
- searchColumns := []string{"performers.name", "performers.aliases"}
+ query.join(performersAliasesTable, "", "performer_aliases.performer_id = performers.id")
+ searchColumns := []string{"performers.name", "performer_aliases.alias"}
query.parseQueryString(searchColumns, *q)
}
if err := qb.validateFilter(performerFilter); err != nil {
- return nil, 0, err
+ return nil, err
}
filter := qb.makeFilter(ctx, performerFilter)
- query.addFilter(filter)
+ if err := query.addFilter(filter); err != nil {
+ return nil, err
+ }
query.sortAndPagination = qb.getPerformerSort(findFilter) + getPagination(findFilter)
+
+ return &query, nil
+}
+
+func (qb *PerformerStore) Query(ctx context.Context, performerFilter *models.PerformerFilterType, findFilter *models.FindFilterType) ([]*models.Performer, int, error) {
+ query, err := qb.makeQuery(ctx, performerFilter, findFilter)
+ if err != nil {
+ return nil, 0, err
+ }
+
idsResult, countResult, err := query.executeFind(ctx)
if err != nil {
return nil, 0, err
@@ -596,6 +687,15 @@ func (qb *PerformerStore) Query(ctx context.Context, performerFilter *models.Per
return performers, countResult, nil
}
+func (qb *PerformerStore) QueryCount(ctx context.Context, performerFilter *models.PerformerFilterType, findFilter *models.FindFilterType) (int, error) {
+ query, err := qb.makeQuery(ctx, performerFilter, findFilter)
+ if err != nil {
+ return 0, err
+ }
+
+ return query.executeCount(ctx)
+}
+
func performerIsMissingCriterionHandler(qb *PerformerStore, isMissing *string) criterionHandlerFunc {
return func(ctx context.Context, f *filterBuilder) {
if isMissing != nil && *isMissing != "" {
@@ -604,10 +704,9 @@ func performerIsMissingCriterionHandler(qb *PerformerStore, isMissing *string) c
f.addLeftJoin(performersScenesTable, "scenes_join", "scenes_join.performer_id = performers.id")
f.addWhere("scenes_join.scene_id IS NULL")
case "image":
- f.addLeftJoin(performersImageTable, "image_join", "image_join.performer_id = performers.id")
- f.addWhere("image_join.performer_id IS NULL")
+ f.addWhere("performers.image_blob IS NULL")
case "stash_id":
- qb.stashIDRepository().join(f, "performer_stash_ids", "performers.id")
+ performersStashIDsTableMgr.join(f, "performer_stash_ids", "performers.id")
f.addWhere("performer_stash_ids.performer_id IS NULL")
default:
f.addWhere("(performers." + *isMissing + " IS NULL OR TRIM(performers." + *isMissing + ") = '')")
@@ -637,6 +736,18 @@ func performerAgeFilterCriterionHandler(age *models.IntCriterionInput) criterion
}
}
+func performerAliasCriterionHandler(qb *PerformerStore, alias *models.StringCriterionInput) criterionHandlerFunc {
+ h := stringListCriterionHandlerBuilder{
+ joinTable: performersAliasesTable,
+ stringColumn: performerAliasColumn,
+ addJoinTable: func(f *filterBuilder) {
+ performersAliasesTableMgr.join(f, "", "performers.id")
+ },
+ }
+
+ return h.handler(alias)
+}
+
func performerTagsCriterionHandler(qb *PerformerStore, tags *models.HierarchicalMultiCriterionInput) criterionHandlerFunc {
h := joinedHierarchicalMultiCriterionHandlerBuilder{
tx: qb.tx,
@@ -813,32 +924,16 @@ func (qb *PerformerStore) GetTagIDs(ctx context.Context, id int) ([]int, error)
return qb.tagsRepository().getIDs(ctx, id)
}
-func (qb *PerformerStore) UpdateTags(ctx context.Context, id int, tagIDs []int) error {
- // Delete the existing joins and then create new ones
- return qb.tagsRepository().replace(ctx, id, tagIDs)
-}
-
-func (qb *PerformerStore) imageRepository() *imageRepository {
- return &imageRepository{
- repository: repository{
- tx: qb.tx,
- tableName: "performers_image",
- idColumn: performerIDColumn,
- },
- imageColumn: "image",
- }
-}
-
func (qb *PerformerStore) GetImage(ctx context.Context, performerID int) ([]byte, error) {
- return qb.imageRepository().get(ctx, performerID)
+ return qb.blobJoinQueryBuilder.GetImage(ctx, performerID, performerImageBlobColumn)
}
func (qb *PerformerStore) UpdateImage(ctx context.Context, performerID int, image []byte) error {
- return qb.imageRepository().replace(ctx, performerID, image)
+ return qb.blobJoinQueryBuilder.UpdateImage(ctx, performerID, performerImageBlobColumn, image)
}
func (qb *PerformerStore) DestroyImage(ctx context.Context, performerID int) error {
- return qb.imageRepository().destroy(ctx, []int{performerID})
+ return qb.blobJoinQueryBuilder.DestroyImage(ctx, performerID, performerImageBlobColumn)
}
func (qb *PerformerStore) stashIDRepository() *stashIDRepository {
@@ -851,12 +946,12 @@ func (qb *PerformerStore) stashIDRepository() *stashIDRepository {
}
}
-func (qb *PerformerStore) GetStashIDs(ctx context.Context, performerID int) ([]models.StashID, error) {
- return qb.stashIDRepository().get(ctx, performerID)
+func (qb *PerformerStore) GetAliases(ctx context.Context, performerID int) ([]string, error) {
+ return performersAliasesTableMgr.get(ctx, performerID)
}
-func (qb *PerformerStore) UpdateStashIDs(ctx context.Context, performerID int, stashIDs []models.StashID) error {
- return qb.stashIDRepository().replace(ctx, performerID, stashIDs)
+func (qb *PerformerStore) GetStashIDs(ctx context.Context, performerID int) ([]models.StashID, error) {
+ return performersStashIDsTableMgr.get(ctx, performerID)
}
func (qb *PerformerStore) FindByStashID(ctx context.Context, stashID models.StashID) ([]*models.Performer, error) {
diff --git a/pkg/sqlite/performer_test.go b/pkg/sqlite/performer_test.go
index 934287524..2b24d6455 100644
--- a/pkg/sqlite/performer_test.go
+++ b/pkg/sqlite/performer_test.go
@@ -12,37 +12,204 @@ import (
"testing"
"time"
- "github.com/stashapp/stash/pkg/hash/md5"
"github.com/stashapp/stash/pkg/models"
"github.com/stretchr/testify/assert"
)
+func loadPerformerRelationships(ctx context.Context, expected models.Performer, actual *models.Performer) error {
+ if expected.Aliases.Loaded() {
+ if err := actual.LoadAliases(ctx, db.Performer); err != nil {
+ return err
+ }
+ }
+ if expected.TagIDs.Loaded() {
+ if err := actual.LoadTagIDs(ctx, db.Performer); err != nil {
+ return err
+ }
+ }
+ if expected.StashIDs.Loaded() {
+ if err := actual.LoadStashIDs(ctx, db.Performer); err != nil {
+ return err
+ }
+ }
+
+ return nil
+}
+
+func Test_PerformerStore_Create(t *testing.T) {
+ var (
+ name = "name"
+ disambiguation = "disambiguation"
+ gender = models.GenderEnumFemale
+ details = "details"
+ url = "url"
+ twitter = "twitter"
+ instagram = "instagram"
+ rating = 3
+ ethnicity = "ethnicity"
+ country = "country"
+ eyeColor = "eyeColor"
+ height = 134
+ measurements = "measurements"
+ fakeTits = "fakeTits"
+ careerLength = "careerLength"
+ tattoos = "tattoos"
+ piercings = "piercings"
+ aliases = []string{"alias1", "alias2"}
+ hairColor = "hairColor"
+ weight = 123
+ ignoreAutoTag = true
+ favorite = true
+ endpoint1 = "endpoint1"
+ endpoint2 = "endpoint2"
+ stashID1 = "stashid1"
+ stashID2 = "stashid2"
+ createdAt = time.Date(2001, 1, 1, 0, 0, 0, 0, time.UTC)
+ updatedAt = time.Date(2001, 1, 1, 0, 0, 0, 0, time.UTC)
+
+ birthdate = models.NewDate("2003-02-01")
+ deathdate = models.NewDate("2023-02-01")
+ )
+
+ tests := []struct {
+ name string
+ newObject models.Performer
+ wantErr bool
+ }{
+ {
+ "full",
+ models.Performer{
+ Name: name,
+ Disambiguation: disambiguation,
+ Gender: gender,
+ URL: url,
+ Twitter: twitter,
+ Instagram: instagram,
+ Birthdate: &birthdate,
+ Ethnicity: ethnicity,
+ Country: country,
+ EyeColor: eyeColor,
+ Height: &height,
+ Measurements: measurements,
+ FakeTits: fakeTits,
+ CareerLength: careerLength,
+ Tattoos: tattoos,
+ Piercings: piercings,
+ Favorite: favorite,
+ Rating: &rating,
+ Details: details,
+ DeathDate: &deathdate,
+ HairColor: hairColor,
+ Weight: &weight,
+ IgnoreAutoTag: ignoreAutoTag,
+ TagIDs: models.NewRelatedIDs([]int{tagIDs[tagIdx1WithPerformer], tagIDs[tagIdx1WithDupName]}),
+ Aliases: models.NewRelatedStrings(aliases),
+ StashIDs: models.NewRelatedStashIDs([]models.StashID{
+ {
+ StashID: stashID1,
+ Endpoint: endpoint1,
+ },
+ {
+ StashID: stashID2,
+ Endpoint: endpoint2,
+ },
+ }),
+ CreatedAt: createdAt,
+ UpdatedAt: updatedAt,
+ },
+ false,
+ },
+ {
+ "invalid tag id",
+ models.Performer{
+ Name: name,
+ TagIDs: models.NewRelatedIDs([]int{invalidID}),
+ },
+ true,
+ },
+ }
+
+ qb := db.Performer
+
+ for _, tt := range tests {
+ runWithRollbackTxn(t, tt.name, func(t *testing.T, ctx context.Context) {
+ assert := assert.New(t)
+
+ p := tt.newObject
+ if err := qb.Create(ctx, &p); (err != nil) != tt.wantErr {
+ t.Errorf("PerformerStore.Create() error = %v, wantErr = %v", err, tt.wantErr)
+ }
+
+ if tt.wantErr {
+ assert.Zero(p.ID)
+ return
+ }
+
+ assert.NotZero(p.ID)
+
+ copy := tt.newObject
+ copy.ID = p.ID
+
+ // load relationships
+ if err := loadPerformerRelationships(ctx, copy, &p); err != nil {
+ t.Errorf("loadPerformerRelationships() error = %v", err)
+ return
+ }
+
+ assert.Equal(copy, p)
+
+ // ensure can find the performer
+ found, err := qb.Find(ctx, p.ID)
+ if err != nil {
+ t.Errorf("PerformerStore.Find() error = %v", err)
+ }
+
+ if !assert.NotNil(found) {
+ return
+ }
+
+ // load relationships
+ if err := loadPerformerRelationships(ctx, copy, found); err != nil {
+ t.Errorf("loadPerformerRelationships() error = %v", err)
+ return
+ }
+ assert.Equal(copy, *found)
+
+ return
+ })
+ }
+}
+
func Test_PerformerStore_Update(t *testing.T) {
var (
- name = "name"
- gender = models.GenderEnumFemale
- checksum = "checksum"
- details = "details"
- url = "url"
- twitter = "twitter"
- instagram = "instagram"
- rating = 3
- ethnicity = "ethnicity"
- country = "country"
- eyeColor = "eyeColor"
- height = 134
- measurements = "measurements"
- fakeTits = "fakeTits"
- careerLength = "careerLength"
- tattoos = "tattoos"
- piercings = "piercings"
- aliases = "aliases"
- hairColor = "hairColor"
- weight = 123
- ignoreAutoTag = true
- favorite = true
- createdAt = time.Date(2001, 1, 1, 0, 0, 0, 0, time.UTC)
- updatedAt = time.Date(2001, 1, 1, 0, 0, 0, 0, time.UTC)
+ name = "name"
+ disambiguation = "disambiguation"
+ gender = models.GenderEnumFemale
+ details = "details"
+ url = "url"
+ twitter = "twitter"
+ instagram = "instagram"
+ rating = 3
+ ethnicity = "ethnicity"
+ country = "country"
+ eyeColor = "eyeColor"
+ height = 134
+ measurements = "measurements"
+ fakeTits = "fakeTits"
+ careerLength = "careerLength"
+ tattoos = "tattoos"
+ piercings = "piercings"
+ aliases = []string{"alias1", "alias2"}
+ hairColor = "hairColor"
+ weight = 123
+ ignoreAutoTag = true
+ favorite = true
+ endpoint1 = "endpoint1"
+ endpoint2 = "endpoint2"
+ stashID1 = "stashid1"
+ stashID2 = "stashid2"
+ createdAt = time.Date(2001, 1, 1, 0, 0, 0, 0, time.UTC)
+ updatedAt = time.Date(2001, 1, 1, 0, 0, 0, 0, time.UTC)
birthdate = models.NewDate("2003-02-01")
deathdate = models.NewDate("2023-02-01")
@@ -56,43 +223,73 @@ func Test_PerformerStore_Update(t *testing.T) {
{
"full",
&models.Performer{
- ID: performerIDs[performerIdxWithGallery],
- Name: name,
- Checksum: checksum,
- Gender: gender,
- URL: url,
- Twitter: twitter,
- Instagram: instagram,
- Birthdate: &birthdate,
- Ethnicity: ethnicity,
- Country: country,
- EyeColor: eyeColor,
- Height: &height,
- Measurements: measurements,
- FakeTits: fakeTits,
- CareerLength: careerLength,
- Tattoos: tattoos,
- Piercings: piercings,
- Aliases: aliases,
- Favorite: favorite,
- Rating: &rating,
- Details: details,
- DeathDate: &deathdate,
- HairColor: hairColor,
- Weight: &weight,
- IgnoreAutoTag: ignoreAutoTag,
- CreatedAt: createdAt,
- UpdatedAt: updatedAt,
+ ID: performerIDs[performerIdxWithGallery],
+ Name: name,
+ Disambiguation: disambiguation,
+ Gender: gender,
+ URL: url,
+ Twitter: twitter,
+ Instagram: instagram,
+ Birthdate: &birthdate,
+ Ethnicity: ethnicity,
+ Country: country,
+ EyeColor: eyeColor,
+ Height: &height,
+ Measurements: measurements,
+ FakeTits: fakeTits,
+ CareerLength: careerLength,
+ Tattoos: tattoos,
+ Piercings: piercings,
+ Favorite: favorite,
+ Rating: &rating,
+ Details: details,
+ DeathDate: &deathdate,
+ HairColor: hairColor,
+ Weight: &weight,
+ IgnoreAutoTag: ignoreAutoTag,
+ Aliases: models.NewRelatedStrings(aliases),
+ TagIDs: models.NewRelatedIDs([]int{tagIDs[tagIdx1WithPerformer], tagIDs[tagIdx1WithDupName]}),
+ StashIDs: models.NewRelatedStashIDs([]models.StashID{
+ {
+ StashID: stashID1,
+ Endpoint: endpoint1,
+ },
+ {
+ StashID: stashID2,
+ Endpoint: endpoint2,
+ },
+ }),
+ CreatedAt: createdAt,
+ UpdatedAt: updatedAt,
},
false,
},
{
- "clear all",
+ "clear nullables",
&models.Performer{
- ID: performerIDs[performerIdxWithGallery],
+ ID: performerIDs[performerIdxWithGallery],
+ Aliases: models.NewRelatedStrings([]string{}),
+ TagIDs: models.NewRelatedIDs([]int{}),
+ StashIDs: models.NewRelatedStashIDs([]models.StashID{}),
},
false,
},
+ {
+ "clear tag ids",
+ &models.Performer{
+ ID: performerIDs[sceneIdxWithTag],
+ TagIDs: models.NewRelatedIDs([]int{}),
+ },
+ false,
+ },
+ {
+ "invalid tag id",
+ &models.Performer{
+ ID: performerIDs[sceneIdxWithGallery],
+ TagIDs: models.NewRelatedIDs([]int{invalidID}),
+ },
+ true,
+ },
}
qb := db.Performer
@@ -115,37 +312,80 @@ func Test_PerformerStore_Update(t *testing.T) {
t.Errorf("PerformerStore.Find() error = %v", err)
}
+ // load relationships
+ if err := loadPerformerRelationships(ctx, copy, s); err != nil {
+ t.Errorf("loadPerformerRelationships() error = %v", err)
+ return
+ }
+
assert.Equal(copy, *s)
})
}
}
+func clearPerformerPartial() models.PerformerPartial {
+ nullString := models.OptionalString{Set: true, Null: true}
+ nullDate := models.OptionalDate{Set: true, Null: true}
+ nullInt := models.OptionalInt{Set: true, Null: true}
+
+ // leave mandatory fields
+ return models.PerformerPartial{
+ Disambiguation: nullString,
+ Gender: nullString,
+ URL: nullString,
+ Twitter: nullString,
+ Instagram: nullString,
+ Birthdate: nullDate,
+ Ethnicity: nullString,
+ Country: nullString,
+ EyeColor: nullString,
+ Height: nullInt,
+ Measurements: nullString,
+ FakeTits: nullString,
+ CareerLength: nullString,
+ Tattoos: nullString,
+ Piercings: nullString,
+ Aliases: &models.UpdateStrings{Mode: models.RelationshipUpdateModeSet},
+ Rating: nullInt,
+ Details: nullString,
+ DeathDate: nullDate,
+ HairColor: nullString,
+ Weight: nullInt,
+ TagIDs: &models.UpdateIDs{Mode: models.RelationshipUpdateModeSet},
+ StashIDs: &models.UpdateStashIDs{Mode: models.RelationshipUpdateModeSet},
+ }
+}
+
func Test_PerformerStore_UpdatePartial(t *testing.T) {
var (
- name = "name"
- gender = models.GenderEnumFemale
- checksum = "checksum"
- details = "details"
- url = "url"
- twitter = "twitter"
- instagram = "instagram"
- rating = 3
- ethnicity = "ethnicity"
- country = "country"
- eyeColor = "eyeColor"
- height = 143
- measurements = "measurements"
- fakeTits = "fakeTits"
- careerLength = "careerLength"
- tattoos = "tattoos"
- piercings = "piercings"
- aliases = "aliases"
- hairColor = "hairColor"
- weight = 123
- ignoreAutoTag = true
- favorite = true
- createdAt = time.Date(2001, 1, 1, 0, 0, 0, 0, time.UTC)
- updatedAt = time.Date(2001, 1, 1, 0, 0, 0, 0, time.UTC)
+ name = "name"
+ disambiguation = "disambiguation"
+ gender = models.GenderEnumFemale
+ details = "details"
+ url = "url"
+ twitter = "twitter"
+ instagram = "instagram"
+ rating = 3
+ ethnicity = "ethnicity"
+ country = "country"
+ eyeColor = "eyeColor"
+ height = 143
+ measurements = "measurements"
+ fakeTits = "fakeTits"
+ careerLength = "careerLength"
+ tattoos = "tattoos"
+ piercings = "piercings"
+ aliases = []string{"alias1", "alias2"}
+ hairColor = "hairColor"
+ weight = 123
+ ignoreAutoTag = true
+ favorite = true
+ endpoint1 = "endpoint1"
+ endpoint2 = "endpoint2"
+ stashID1 = "stashid1"
+ stashID2 = "stashid2"
+ createdAt = time.Date(2001, 1, 1, 0, 0, 0, 0, time.UTC)
+ updatedAt = time.Date(2001, 1, 1, 0, 0, 0, 0, time.UTC)
birthdate = models.NewDate("2003-02-01")
deathdate = models.NewDate("2023-02-01")
@@ -162,23 +402,26 @@ func Test_PerformerStore_UpdatePartial(t *testing.T) {
"full",
performerIDs[performerIdxWithDupName],
models.PerformerPartial{
- Name: models.NewOptionalString(name),
- Checksum: models.NewOptionalString(checksum),
- Gender: models.NewOptionalString(gender.String()),
- URL: models.NewOptionalString(url),
- Twitter: models.NewOptionalString(twitter),
- Instagram: models.NewOptionalString(instagram),
- Birthdate: models.NewOptionalDate(birthdate),
- Ethnicity: models.NewOptionalString(ethnicity),
- Country: models.NewOptionalString(country),
- EyeColor: models.NewOptionalString(eyeColor),
- Height: models.NewOptionalInt(height),
- Measurements: models.NewOptionalString(measurements),
- FakeTits: models.NewOptionalString(fakeTits),
- CareerLength: models.NewOptionalString(careerLength),
- Tattoos: models.NewOptionalString(tattoos),
- Piercings: models.NewOptionalString(piercings),
- Aliases: models.NewOptionalString(aliases),
+ Name: models.NewOptionalString(name),
+ Disambiguation: models.NewOptionalString(disambiguation),
+ Gender: models.NewOptionalString(gender.String()),
+ URL: models.NewOptionalString(url),
+ Twitter: models.NewOptionalString(twitter),
+ Instagram: models.NewOptionalString(instagram),
+ Birthdate: models.NewOptionalDate(birthdate),
+ Ethnicity: models.NewOptionalString(ethnicity),
+ Country: models.NewOptionalString(country),
+ EyeColor: models.NewOptionalString(eyeColor),
+ Height: models.NewOptionalInt(height),
+ Measurements: models.NewOptionalString(measurements),
+ FakeTits: models.NewOptionalString(fakeTits),
+ CareerLength: models.NewOptionalString(careerLength),
+ Tattoos: models.NewOptionalString(tattoos),
+ Piercings: models.NewOptionalString(piercings),
+ Aliases: &models.UpdateStrings{
+ Values: aliases,
+ Mode: models.RelationshipUpdateModeSet,
+ },
Favorite: models.NewOptionalBool(favorite),
Rating: models.NewOptionalInt(rating),
Details: models.NewOptionalString(details),
@@ -186,40 +429,89 @@ func Test_PerformerStore_UpdatePartial(t *testing.T) {
HairColor: models.NewOptionalString(hairColor),
Weight: models.NewOptionalInt(weight),
IgnoreAutoTag: models.NewOptionalBool(ignoreAutoTag),
- CreatedAt: models.NewOptionalTime(createdAt),
- UpdatedAt: models.NewOptionalTime(updatedAt),
+ TagIDs: &models.UpdateIDs{
+ IDs: []int{tagIDs[tagIdx1WithPerformer], tagIDs[tagIdx1WithDupName]},
+ Mode: models.RelationshipUpdateModeSet,
+ },
+ StashIDs: &models.UpdateStashIDs{
+ StashIDs: []models.StashID{
+ {
+ StashID: stashID1,
+ Endpoint: endpoint1,
+ },
+ {
+ StashID: stashID2,
+ Endpoint: endpoint2,
+ },
+ },
+ Mode: models.RelationshipUpdateModeSet,
+ },
+ CreatedAt: models.NewOptionalTime(createdAt),
+ UpdatedAt: models.NewOptionalTime(updatedAt),
},
models.Performer{
- ID: performerIDs[performerIdxWithDupName],
- Name: name,
- Checksum: checksum,
- Gender: gender,
- URL: url,
- Twitter: twitter,
- Instagram: instagram,
- Birthdate: &birthdate,
- Ethnicity: ethnicity,
- Country: country,
- EyeColor: eyeColor,
- Height: &height,
- Measurements: measurements,
- FakeTits: fakeTits,
- CareerLength: careerLength,
- Tattoos: tattoos,
- Piercings: piercings,
- Aliases: aliases,
- Favorite: favorite,
- Rating: &rating,
- Details: details,
- DeathDate: &deathdate,
- HairColor: hairColor,
- Weight: &weight,
- IgnoreAutoTag: ignoreAutoTag,
- CreatedAt: createdAt,
- UpdatedAt: updatedAt,
+ ID: performerIDs[performerIdxWithDupName],
+ Name: name,
+ Disambiguation: disambiguation,
+ Gender: gender,
+ URL: url,
+ Twitter: twitter,
+ Instagram: instagram,
+ Birthdate: &birthdate,
+ Ethnicity: ethnicity,
+ Country: country,
+ EyeColor: eyeColor,
+ Height: &height,
+ Measurements: measurements,
+ FakeTits: fakeTits,
+ CareerLength: careerLength,
+ Tattoos: tattoos,
+ Piercings: piercings,
+ Aliases: models.NewRelatedStrings(aliases),
+ Favorite: favorite,
+ Rating: &rating,
+ Details: details,
+ DeathDate: &deathdate,
+ HairColor: hairColor,
+ Weight: &weight,
+ IgnoreAutoTag: ignoreAutoTag,
+ TagIDs: models.NewRelatedIDs([]int{tagIDs[tagIdx1WithPerformer], tagIDs[tagIdx1WithDupName]}),
+ StashIDs: models.NewRelatedStashIDs([]models.StashID{
+ {
+ StashID: stashID1,
+ Endpoint: endpoint1,
+ },
+ {
+ StashID: stashID2,
+ Endpoint: endpoint2,
+ },
+ }),
+ CreatedAt: createdAt,
+ UpdatedAt: updatedAt,
},
false,
},
+ {
+ "clear all",
+ performerIDs[performerIdxWithTwoTags],
+ clearPerformerPartial(),
+ models.Performer{
+ ID: performerIDs[performerIdxWithTwoTags],
+ Name: getPerformerStringValue(performerIdxWithTwoTags, "Name"),
+ Favorite: true,
+ Aliases: models.NewRelatedStrings([]string{}),
+ TagIDs: models.NewRelatedIDs([]int{}),
+ StashIDs: models.NewRelatedStashIDs([]models.StashID{}),
+ },
+ false,
+ },
+ {
+ "invalid id",
+ invalidID,
+ models.PerformerPartial{},
+ models.Performer{},
+ true,
+ },
}
for _, tt := range tests {
qb := db.Performer
@@ -237,6 +529,11 @@ func Test_PerformerStore_UpdatePartial(t *testing.T) {
return
}
+ if err := loadPerformerRelationships(ctx, tt.want, got); err != nil {
+ t.Errorf("loadPerformerRelationships() error = %v", err)
+ return
+ }
+
assert.Equal(tt.want, *got)
s, err := qb.Find(ctx, tt.id)
@@ -244,6 +541,12 @@ func Test_PerformerStore_UpdatePartial(t *testing.T) {
t.Errorf("PerformerStore.Find() error = %v", err)
}
+ // load relationships
+ if err := loadPerformerRelationships(ctx, tt.want, s); err != nil {
+ t.Errorf("loadPerformerRelationships() error = %v", err)
+ return
+ }
+
assert.Equal(tt.want, *s)
})
}
@@ -653,6 +956,19 @@ func TestPerformerQuery(t *testing.T) {
nil,
false,
},
+ {
+ "alias",
+ nil,
+ &models.PerformerFilterType{
+ Aliases: &models.StringCriterionInput{
+ Value: getPerformerStringValue(performerIdxWithGallery, "alias"),
+ Modifier: models.CriterionModifierEquals,
+ },
+ },
+ []int{performerIdxWithGallery},
+ []int{performerIdxWithScene},
+ false,
+ },
}
for _, tt := range tests {
@@ -706,34 +1022,14 @@ func TestPerformerUpdatePerformerImage(t *testing.T) {
// create performer to test against
const name = "TestPerformerUpdatePerformerImage"
performer := models.Performer{
- Name: name,
- Checksum: md5.FromString(name),
+ Name: name,
}
err := qb.Create(ctx, &performer)
if err != nil {
return fmt.Errorf("Error creating performer: %s", err.Error())
}
- image := []byte("image")
- err = qb.UpdateImage(ctx, performer.ID, image)
- if err != nil {
- return fmt.Errorf("Error updating performer image: %s", err.Error())
- }
-
- // ensure image set
- storedImage, err := qb.GetImage(ctx, performer.ID)
- if err != nil {
- return fmt.Errorf("Error getting image: %s", err.Error())
- }
- assert.Equal(t, storedImage, image)
-
- // set nil image
- err = qb.UpdateImage(ctx, performer.ID, nil)
- if err == nil {
- return fmt.Errorf("Expected error setting nil image")
- }
-
- return nil
+ return testUpdateImage(t, ctx, performer.ID, qb.UpdateImage, qb.GetImage)
}); err != nil {
t.Error(err.Error())
}
@@ -746,8 +1042,7 @@ func TestPerformerDestroyPerformerImage(t *testing.T) {
// create performer to test against
const name = "TestPerformerDestroyPerformerImage"
performer := models.Performer{
- Name: name,
- Checksum: md5.FromString(name),
+ Name: name,
}
err := qb.Create(ctx, &performer)
if err != nil {
@@ -819,11 +1114,14 @@ func verifyPerformerAge(t *testing.T, ageCriterion models.IntCriterionInput) {
d := performer.Birthdate.Time
age := cd.Year() - d.Year()
- if cd.YearDay() < d.YearDay() {
+ // using YearDay screws up on leap years
+ if cd.Month() < d.Month() || (cd.Month() == d.Month() && cd.Day() < d.Day()) {
age = age - 1
}
- verifyInt(t, age, ageCriterion)
+ if !verifyInt(t, age, ageCriterion) {
+ t.Errorf("Performer birthdate: %s, deathdate: %s", performer.Birthdate.String(), performer.DeathDate.String())
+ }
}
return nil
@@ -925,6 +1223,7 @@ func verifyPerformerQuery(t *testing.T, filter models.PerformerFilterType, verif
}
func queryPerformers(ctx context.Context, t *testing.T, performerFilter *models.PerformerFilterType, findFilter *models.FindFilterType) []*models.Performer {
+ t.Helper()
performers, _, err := db.Performer.Query(ctx, performerFilter, findFilter)
if err != nil {
t.Errorf("Error querying performers: %s", err.Error())
@@ -1253,23 +1552,78 @@ func TestPerformerStashIDs(t *testing.T) {
if err := withRollbackTxn(func(ctx context.Context) error {
qb := db.Performer
- // create performer to test against
- const name = "TestStashIDs"
- performer := models.Performer{
- Name: name,
- Checksum: md5.FromString(name),
+ // create scene to test against
+ const name = "TestPerformerStashIDs"
+ performer := &models.Performer{
+ Name: name,
}
- err := qb.Create(ctx, &performer)
- if err != nil {
+ if err := qb.Create(ctx, performer); err != nil {
return fmt.Errorf("Error creating performer: %s", err.Error())
}
- testStashIDReaderWriter(ctx, t, qb, performer.ID)
+ if err := performer.LoadStashIDs(ctx, qb); err != nil {
+ return err
+ }
+
+ testPerformerStashIDs(ctx, t, performer)
return nil
}); err != nil {
t.Error(err.Error())
}
}
+
+func testPerformerStashIDs(ctx context.Context, t *testing.T, s *models.Performer) {
+ // ensure no stash IDs to begin with
+ assert.Len(t, s.StashIDs.List(), 0)
+
+ // add stash ids
+ const stashIDStr = "stashID"
+ const endpoint = "endpoint"
+ stashID := models.StashID{
+ StashID: stashIDStr,
+ Endpoint: endpoint,
+ }
+
+ qb := db.Performer
+
+ // update stash ids and ensure was updated
+ var err error
+ s, err = qb.UpdatePartial(ctx, s.ID, models.PerformerPartial{
+ StashIDs: &models.UpdateStashIDs{
+ StashIDs: []models.StashID{stashID},
+ Mode: models.RelationshipUpdateModeSet,
+ },
+ })
+ if err != nil {
+ t.Error(err.Error())
+ }
+
+ if err := s.LoadStashIDs(ctx, qb); err != nil {
+ t.Error(err.Error())
+ return
+ }
+
+ assert.Equal(t, []models.StashID{stashID}, s.StashIDs.List())
+
+ // remove stash ids and ensure was updated
+ s, err = qb.UpdatePartial(ctx, s.ID, models.PerformerPartial{
+ StashIDs: &models.UpdateStashIDs{
+ StashIDs: []models.StashID{stashID},
+ Mode: models.RelationshipUpdateModeRemove,
+ },
+ })
+ if err != nil {
+ t.Error(err.Error())
+ }
+
+ if err := s.LoadStashIDs(ctx, qb); err != nil {
+ t.Error(err.Error())
+ return
+ }
+
+ assert.Len(t, s.StashIDs.List(), 0)
+}
+
func TestPerformerQueryLegacyRating(t *testing.T) {
const rating = 3
ratingCriterion := models.IntCriterionInput{
diff --git a/pkg/sqlite/query.go b/pkg/sqlite/query.go
index 00b790955..597ab66b9 100644
--- a/pkg/sqlite/query.go
+++ b/pkg/sqlite/query.go
@@ -22,8 +22,6 @@ type queryBuilder struct {
recursiveWith bool
sortAndPagination string
-
- err error
}
func (qb queryBuilder) body() string {
@@ -61,20 +59,11 @@ func (qb queryBuilder) findIDs(ctx context.Context) ([]int, error) {
}
func (qb queryBuilder) executeFind(ctx context.Context) ([]int, int, error) {
- if qb.err != nil {
- return nil, 0, qb.err
- }
-
body := qb.body()
-
return qb.repository.executeFindQuery(ctx, body, qb.args, qb.sortAndPagination, qb.whereClauses, qb.havingClauses, qb.withClauses, qb.recursiveWith)
}
func (qb queryBuilder) executeCount(ctx context.Context) (int, error) {
- if qb.err != nil {
- return 0, qb.err
- }
-
body := qb.body()
withClause := ""
@@ -136,11 +125,10 @@ func (qb *queryBuilder) addJoins(joins ...join) {
qb.joins.add(joins...)
}
-func (qb *queryBuilder) addFilter(f *filterBuilder) {
+func (qb *queryBuilder) addFilter(f *filterBuilder) error {
err := f.getError()
if err != nil {
- qb.err = err
- return
+ return err
}
clause, args := f.generateWithClauses()
@@ -172,6 +160,8 @@ func (qb *queryBuilder) addFilter(f *filterBuilder) {
}
qb.addJoins(f.getAllJoins()...)
+
+ return nil
}
func (qb *queryBuilder) parseQueryString(columns []string, q string) {
diff --git a/pkg/sqlite/record.go b/pkg/sqlite/record.go
index 7e79dc721..fbee73e86 100644
--- a/pkg/sqlite/record.go
+++ b/pkg/sqlite/record.go
@@ -14,14 +14,14 @@ func (r *updateRecord) set(destField string, v interface{}) {
r.Record[destField] = v
}
-// func (r *updateRecord) setString(destField string, v models.OptionalString) {
-// if v.Set {
-// if v.Null {
-// panic("null value not allowed in optional string")
-// }
-// r.set(destField, v.Value)
-// }
-// }
+func (r *updateRecord) setString(destField string, v models.OptionalString) {
+ if v.Set {
+ if v.Null {
+ panic("null value not allowed in optional string")
+ }
+ r.set(destField, v.Value)
+ }
+}
func (r *updateRecord) setNullString(destField string, v models.OptionalString) {
if v.Set {
@@ -32,7 +32,7 @@ func (r *updateRecord) setNullString(destField string, v models.OptionalString)
func (r *updateRecord) setBool(destField string, v models.OptionalBool) {
if v.Set {
if v.Null {
- panic("null value not allowed in optional int")
+ panic("null value not allowed in optional bool")
}
r.set(destField, v.Value)
}
@@ -102,11 +102,11 @@ func (r *updateRecord) setSQLiteDate(destField string, v models.OptionalDate) {
if v.Set {
if v.Null {
r.set(destField, models.SQLiteDate{})
+ } else {
+ r.set(destField, models.SQLiteDate{
+ String: v.Value.String(),
+ Valid: true,
+ })
}
-
- r.set(destField, models.SQLiteDate{
- String: v.Value.String(),
- Valid: true,
- })
}
}
diff --git a/pkg/sqlite/repository.go b/pkg/sqlite/repository.go
index fe7c6c7da..c3b1d74aa 100644
--- a/pkg/sqlite/repository.go
+++ b/pkg/sqlite/repository.go
@@ -387,29 +387,6 @@ func (r *joinRepository) replace(ctx context.Context, id int, foreignIDs []int)
return nil
}
-type imageRepository struct {
- repository
- imageColumn string
-}
-
-func (r *imageRepository) get(ctx context.Context, id int) ([]byte, error) {
- query := fmt.Sprintf("SELECT %s from %s WHERE %s = ?", r.imageColumn, r.tableName, r.idColumn)
- var ret []byte
- err := r.querySimple(ctx, query, []interface{}{id}, &ret)
- return ret, err
-}
-
-func (r *imageRepository) replace(ctx context.Context, id int, image []byte) error {
- if err := r.destroy(ctx, []int{id}); err != nil {
- return err
- }
-
- stmt := fmt.Sprintf("INSERT INTO %s (%s, %s) VALUES (?, ?)", r.tableName, r.idColumn, r.imageColumn)
- _, err := r.tx.Exec(ctx, stmt, id, image)
-
- return err
-}
-
type captionRepository struct {
repository
}
diff --git a/pkg/sqlite/scene.go b/pkg/sqlite/scene.go
index 341e9ee26..a5e903653 100644
--- a/pkg/sqlite/scene.go
+++ b/pkg/sqlite/scene.go
@@ -6,6 +6,7 @@ import (
"errors"
"fmt"
"path/filepath"
+ "sort"
"strconv"
"strings"
"time"
@@ -30,6 +31,8 @@ const (
scenesTagsTable = "scenes_tags"
scenesGalleriesTable = "scenes_galleries"
moviesScenesTable = "movies_scenes"
+
+ sceneCoverBlobColumn = "cover_blob"
)
var findExactDuplicateQuery = `
@@ -71,6 +74,9 @@ type sceneRow struct {
ResumeTime float64 `db:"resume_time"`
PlayDuration float64 `db:"play_duration"`
PlayCount int `db:"play_count"`
+
+ // not used in resolutions or updates
+ CoverBlob zero.String `db:"cover_blob"`
}
func (r *sceneRow) fromScene(o models.Scene) {
@@ -171,6 +177,7 @@ func (r *sceneRowRecord) fromPartial(o models.ScenePartial) {
type SceneStore struct {
repository
+ blobJoinQueryBuilder
tableMgr *table
oCounterManager
@@ -178,12 +185,16 @@ type SceneStore struct {
fileStore *FileStore
}
-func NewSceneStore(fileStore *FileStore) *SceneStore {
+func NewSceneStore(fileStore *FileStore, blobStore *BlobStore) *SceneStore {
return &SceneStore{
repository: repository{
tableName: sceneTable,
idColumn: idColumn,
},
+ blobJoinQueryBuilder: blobJoinQueryBuilder{
+ blobStore: blobStore,
+ joinTable: sceneTable,
+ },
tableMgr: sceneTableMgr,
oCounterManager: oCounterManager{sceneTableMgr},
@@ -352,6 +363,11 @@ func (qb *SceneStore) Update(ctx context.Context, updatedObject *models.Scene) e
}
func (qb *SceneStore) Destroy(ctx context.Context, id int) error {
+ // must handle image checksums manually
+ if err := qb.destroyCover(ctx, id); err != nil {
+ return err
+ }
+
// scene markers should be handled prior to calling destroy
// galleries should be handled prior to calling destroy
@@ -363,18 +379,24 @@ func (qb *SceneStore) Find(ctx context.Context, id int) (*models.Scene, error) {
}
func (qb *SceneStore) FindMany(ctx context.Context, ids []int) ([]*models.Scene, error) {
- table := qb.table()
- q := qb.selectDataset().Prepared(true).Where(table.Col(idColumn).In(ids))
- unsorted, err := qb.getMany(ctx, q)
- if err != nil {
- return nil, err
- }
-
scenes := make([]*models.Scene, len(ids))
- for _, s := range unsorted {
- i := intslice.IntIndex(ids, s.ID)
- scenes[i] = s
+ table := qb.table()
+ if err := batchExec(ids, defaultBatchSize, func(batch []int) error {
+ q := qb.selectDataset().Prepared(true).Where(table.Col(idColumn).In(batch))
+ unsorted, err := qb.getMany(ctx, q)
+ if err != nil {
+ return err
+ }
+
+ for _, s := range unsorted {
+ i := intslice.IntIndex(ids, s.ID)
+ scenes[i] = s
+ }
+
+ return nil
+ }); err != nil {
+ return nil, err
}
for i := range scenes {
@@ -990,7 +1012,9 @@ func (qb *SceneStore) Query(ctx context.Context, options models.SceneQueryOption
}
filter := qb.makeFilter(ctx, sceneFilter)
- query.addFilter(filter)
+ if err := query.addFilter(filter); err != nil {
+ return nil, err
+ }
qb.setSceneSort(&query, findFilter)
query.sortAndPagination += getPagination(findFilter)
@@ -1178,6 +1202,8 @@ func sceneIsMissingCriterionHandler(qb *SceneStore, isMissing *string) criterion
qb.addSceneFilesTable(f)
f.addLeftJoin(fingerprintTable, "fingerprints_phash", "scenes_files.file_id = fingerprints_phash.file_id AND fingerprints_phash.type = 'phash'")
f.addWhere("fingerprints_phash.fingerprint IS NULL")
+ case "cover":
+ f.addWhere("scenes.cover_blob IS NULL")
default:
f.addWhere("(scenes." + *isMissing + " IS NULL OR TRIM(scenes." + *isMissing + ") = '')")
}
@@ -1446,7 +1472,7 @@ func (qb *SceneStore) setSceneSort(query *queryBuilder, findFilter *models.FindF
case "title":
addFileTable()
addFolderTable()
- query.sortAndPagination += " ORDER BY scenes.title COLLATE NATURAL_CS " + direction + ", folders.path " + direction + ", files.basename COLLATE NATURAL_CS " + direction
+ query.sortAndPagination += " ORDER BY COALESCE(scenes.title, files.basename) COLLATE NATURAL_CS " + direction + ", folders.path " + direction
case "play_count":
// handle here since getSort has special handling for _count suffix
query.sortAndPagination += " ORDER BY scenes.play_count " + direction
@@ -1455,17 +1481,6 @@ func (qb *SceneStore) setSceneSort(query *queryBuilder, findFilter *models.FindF
}
}
-func (qb *SceneStore) imageRepository() *imageRepository {
- return &imageRepository{
- repository: repository{
- tx: qb.tx,
- tableName: "scenes_cover",
- idColumn: sceneIDColumn,
- },
- imageColumn: "cover",
- }
-}
-
func (qb *SceneStore) getPlayCount(ctx context.Context, id int) (int, error) {
q := dialect.From(qb.tableMgr.table).Select("play_count").Where(goqu.Ex{"id": id})
@@ -1523,15 +1538,19 @@ func (qb *SceneStore) IncrementWatchCount(ctx context.Context, id int) (int, err
}
func (qb *SceneStore) GetCover(ctx context.Context, sceneID int) ([]byte, error) {
- return qb.imageRepository().get(ctx, sceneID)
+ return qb.GetImage(ctx, sceneID, sceneCoverBlobColumn)
+}
+
+func (qb *SceneStore) HasCover(ctx context.Context, sceneID int) (bool, error) {
+ return qb.HasImage(ctx, sceneID, sceneCoverBlobColumn)
}
func (qb *SceneStore) UpdateCover(ctx context.Context, sceneID int, image []byte) error {
- return qb.imageRepository().replace(ctx, sceneID, image)
+ return qb.UpdateImage(ctx, sceneID, sceneCoverBlobColumn, image)
}
-func (qb *SceneStore) DestroyCover(ctx context.Context, sceneID int) error {
- return qb.imageRepository().destroy(ctx, []int{sceneID})
+func (qb *SceneStore) destroyCover(ctx context.Context, sceneID int) error {
+ return qb.DestroyImage(ctx, sceneID, sceneCoverBlobColumn)
}
func (qb *SceneStore) AssignFiles(ctx context.Context, sceneID int, fileIDs []file.ID) error {
@@ -1704,5 +1723,26 @@ func (qb *SceneStore) FindDuplicates(ctx context.Context, distance int) ([][]*mo
}
}
+ sortByPath(duplicates)
+
return duplicates, nil
}
+
+func sortByPath(scenes [][]*models.Scene) {
+ lessFunc := func(i int, j int) bool {
+ firstPathI := getFirstPath(scenes[i])
+ firstPathJ := getFirstPath(scenes[j])
+ return firstPathI < firstPathJ
+ }
+ sort.SliceStable(scenes, lessFunc)
+}
+
+func getFirstPath(scenes []*models.Scene) string {
+ var firstPath string
+ for i, scene := range scenes {
+ if i == 0 || scene.Path < firstPath {
+ firstPath = scene.Path
+ }
+ }
+ return firstPath
+}
diff --git a/pkg/sqlite/scene_marker.go b/pkg/sqlite/scene_marker.go
index b0ed5ac84..df3c73030 100644
--- a/pkg/sqlite/scene_marker.go
+++ b/pkg/sqlite/scene_marker.go
@@ -158,7 +158,9 @@ func (qb *sceneMarkerQueryBuilder) Query(ctx context.Context, sceneMarkerFilter
filter := qb.makeFilter(ctx, sceneMarkerFilter)
- query.addFilter(filter)
+ if err := query.addFilter(filter); err != nil {
+ return nil, 0, err
+ }
query.sortAndPagination = qb.getSceneMarkerSort(&query, findFilter) + getPagination(findFilter)
idsResult, countResult, err := query.executeFind(ctx)
@@ -344,3 +346,11 @@ func (qb *sceneMarkerQueryBuilder) UpdateTags(ctx context.Context, id int, tagID
// Delete the existing joins and then create new ones
return qb.tagsRepository().replace(ctx, id, tagIDs)
}
+
+func (qb *sceneMarkerQueryBuilder) Count(ctx context.Context) (int, error) {
+ return qb.runCountQuery(ctx, qb.buildCountQuery("SELECT scene_markers.id FROM scene_markers"), nil)
+}
+
+func (qb *sceneMarkerQueryBuilder) All(ctx context.Context) ([]*models.SceneMarker, error) {
+ return qb.querySceneMarkers(ctx, selectAll("scene_markers")+qb.getSceneMarkerSort(nil, nil), nil)
+}
diff --git a/pkg/sqlite/scene_marker_test.go b/pkg/sqlite/scene_marker_test.go
index 76a4dd845..9c5ae866f 100644
--- a/pkg/sqlite/scene_marker_test.go
+++ b/pkg/sqlite/scene_marker_test.go
@@ -222,4 +222,6 @@ func queryMarkers(ctx context.Context, t *testing.T, sqb models.SceneMarkerReade
// TODO Find
// TODO GetMarkerStrings
// TODO Wall
+// TODO Count
+// TODO All
// TODO Query
diff --git a/pkg/sqlite/scene_test.go b/pkg/sqlite/scene_test.go
index 697dba113..560d3fcfc 100644
--- a/pkg/sqlite/scene_test.go
+++ b/pkg/sqlite/scene_test.go
@@ -2836,21 +2836,23 @@ func verifyScenesOCounter(t *testing.T, oCounterCriterion models.IntCriterionInp
})
}
-func verifyInt(t *testing.T, value int, criterion models.IntCriterionInput) {
+func verifyInt(t *testing.T, value int, criterion models.IntCriterionInput) bool {
t.Helper()
assert := assert.New(t)
if criterion.Modifier == models.CriterionModifierEquals {
- assert.Equal(criterion.Value, value)
+ return assert.Equal(criterion.Value, value)
}
if criterion.Modifier == models.CriterionModifierNotEquals {
- assert.NotEqual(criterion.Value, value)
+ return assert.NotEqual(criterion.Value, value)
}
if criterion.Modifier == models.CriterionModifierGreaterThan {
- assert.Greater(value, criterion.Value)
+ return assert.Greater(value, criterion.Value)
}
if criterion.Modifier == models.CriterionModifierLessThan {
- assert.Less(value, criterion.Value)
+ return assert.Less(value, criterion.Value)
}
+
+ return true
}
func TestSceneQueryDuration(t *testing.T) {
@@ -4088,53 +4090,7 @@ func TestSceneUpdateSceneCover(t *testing.T) {
sceneID := sceneIDs[sceneIdxWithGallery]
- image := []byte("image")
- if err := qb.UpdateCover(ctx, sceneID, image); err != nil {
- return fmt.Errorf("Error updating scene cover: %s", err.Error())
- }
-
- // ensure image set
- storedImage, err := qb.GetCover(ctx, sceneID)
- if err != nil {
- return fmt.Errorf("Error getting image: %s", err.Error())
- }
- assert.Equal(t, storedImage, image)
-
- // set nil image
- err = qb.UpdateCover(ctx, sceneID, nil)
- if err == nil {
- return fmt.Errorf("Expected error setting nil image")
- }
-
- return nil
- }); err != nil {
- t.Error(err.Error())
- }
-}
-
-func TestSceneDestroySceneCover(t *testing.T) {
- if err := withTxn(func(ctx context.Context) error {
- qb := db.Scene
-
- sceneID := sceneIDs[sceneIdxWithGallery]
-
- image := []byte("image")
- if err := qb.UpdateCover(ctx, sceneID, image); err != nil {
- return fmt.Errorf("Error updating scene image: %s", err.Error())
- }
-
- if err := qb.DestroyCover(ctx, sceneID); err != nil {
- return fmt.Errorf("Error destroying scene cover: %s", err.Error())
- }
-
- // image should be nil
- storedImage, err := qb.GetCover(ctx, sceneID)
- if err != nil {
- return fmt.Errorf("Error getting image: %s", err.Error())
- }
- assert.Nil(t, storedImage)
-
- return nil
+ return testUpdateImage(t, ctx, sceneID, qb.UpdateCover, qb.GetCover)
}); err != nil {
t.Error(err.Error())
}
diff --git a/pkg/sqlite/setup_test.go b/pkg/sqlite/setup_test.go
index 75d3360d0..4300111cf 100644
--- a/pkg/sqlite/setup_test.go
+++ b/pkg/sqlite/setup_test.go
@@ -17,7 +17,6 @@ import (
"github.com/stashapp/stash/pkg/file"
"github.com/stashapp/stash/pkg/hash/md5"
"github.com/stashapp/stash/pkg/models"
- "github.com/stashapp/stash/pkg/sliceutil/intslice"
"github.com/stashapp/stash/pkg/sqlite"
"github.com/stashapp/stash/pkg/txn"
@@ -147,6 +146,7 @@ const (
const (
galleryIdxWithScene = iota
+ galleryIdxWithChapters
galleryIdxWithImage
galleryIdx1WithImage
galleryIdx2WithImage
@@ -237,6 +237,11 @@ const (
totalMarkers
)
+const (
+ chapterIdxWithGallery = iota
+ totalChapters
+)
+
const (
savedFilterIdxDefaultScene = iota
savedFilterIdxDefaultImage
@@ -262,6 +267,7 @@ var (
sceneFileIDs []file.ID
imageFileIDs []file.ID
galleryFileIDs []file.ID
+ chapterIDs []int
sceneIDs []int
imageIDs []int
@@ -373,6 +379,19 @@ var (
}
)
+type chapterSpec struct {
+ galleryIdx int
+ title string
+ imageIndex int
+}
+
+var (
+ // indexed by chapter
+ chapterSpecs = []chapterSpec{
+ {galleryIdxWithChapters, "Test1", 10},
+ }
+)
+
var (
imageGalleries = linkMap{
imageIdxWithGallery: {galleryIdxWithImage},
@@ -442,10 +461,9 @@ var (
)
var (
- performerTagLinks = [][2]int{
- {performerIdxWithTag, tagIdxWithPerformer},
- {performerIdxWithTwoTags, tagIdx1WithPerformer},
- {performerIdxWithTwoTags, tagIdx2WithPerformer},
+ performerTags = linkMap{
+ performerIdxWithTag: {tagIdxWithPerformer},
+ performerIdxWithTwoTags: {tagIdx1WithPerformer, tagIdx2WithPerformer},
}
)
@@ -519,6 +537,10 @@ func runTests(m *testing.M) int {
f.Close()
databaseFile := f.Name()
db = sqlite.NewDatabase()
+ db.SetBlobStoreOptions(sqlite.BlobStoreOptions{
+ UseDatabase: true,
+ // don't use filesystem
+ })
if err := db.Open(databaseFile); err != nil {
panic(fmt.Sprintf("Could not initialize database: %s", err.Error()))
@@ -548,19 +570,19 @@ func populateDB() error {
// TODO - link folders to zip files
- if err := createMovies(ctx, sqlite.MovieReaderWriter, moviesNameCase, moviesNameNoCase); err != nil {
+ if err := createMovies(ctx, db.Movie, moviesNameCase, moviesNameNoCase); err != nil {
return fmt.Errorf("error creating movies: %s", err.Error())
}
+ if err := createTags(ctx, db.Tag, tagsNameCase, tagsNameNoCase); err != nil {
+ return fmt.Errorf("error creating tags: %s", err.Error())
+ }
+
if err := createPerformers(ctx, performersNameCase, performersNameNoCase); err != nil {
return fmt.Errorf("error creating performers: %s", err.Error())
}
- if err := createTags(ctx, sqlite.TagReaderWriter, tagsNameCase, tagsNameNoCase); err != nil {
- return fmt.Errorf("error creating tags: %s", err.Error())
- }
-
- if err := createStudios(ctx, sqlite.StudioReaderWriter, studiosNameCase, studiosNameNoCase); err != nil {
+ if err := createStudios(ctx, db.Studio, studiosNameCase, studiosNameNoCase); err != nil {
return fmt.Errorf("error creating studios: %s", err.Error())
}
@@ -576,7 +598,7 @@ func populateDB() error {
return fmt.Errorf("error creating images: %s", err.Error())
}
- if err := addTagImage(ctx, sqlite.TagReaderWriter, tagIdxWithCoverImage); err != nil {
+ if err := addTagImage(ctx, db.Tag, tagIdxWithCoverImage); err != nil {
return fmt.Errorf("error adding tag image: %s", err.Error())
}
@@ -584,19 +606,15 @@ func populateDB() error {
return fmt.Errorf("error creating saved filters: %s", err.Error())
}
- if err := linkPerformerTags(ctx); err != nil {
- return fmt.Errorf("error linking performer tags: %s", err.Error())
- }
-
- if err := linkMovieStudios(ctx, sqlite.MovieReaderWriter); err != nil {
+ if err := linkMovieStudios(ctx, db.Movie); err != nil {
return fmt.Errorf("error linking movie studios: %s", err.Error())
}
- if err := linkStudiosParent(ctx, sqlite.StudioReaderWriter); err != nil {
+ if err := linkStudiosParent(ctx, db.Studio); err != nil {
return fmt.Errorf("error linking studios parent: %s", err.Error())
}
- if err := linkTagsParent(ctx, sqlite.TagReaderWriter); err != nil {
+ if err := linkTagsParent(ctx, db.Tag); err != nil {
return fmt.Errorf("error linking tags parent: %s", err.Error())
}
@@ -605,6 +623,11 @@ func populateDB() error {
return fmt.Errorf("error creating scene marker: %s", err.Error())
}
}
+ for _, cs := range chapterSpecs {
+ if err := createChapter(ctx, sqlite.GalleryChapterReaderWriter, cs); err != nil {
+ return fmt.Errorf("error creating gallery chapter: %s", err.Error())
+ }
+ }
return nil
}); err != nil {
@@ -891,9 +914,9 @@ func getObjectDate(index int) models.SQLiteDate {
}
}
-func getObjectDateObject(index int) *models.Date {
+func getObjectDateObject(index int, fromDB bool) *models.Date {
d := getObjectDate(index)
- if !d.Valid {
+ if !d.Valid || (fromDB && (d.String == "" || d.String == "0001-01-01")) {
return nil
}
@@ -1004,7 +1027,7 @@ func makeScene(i int) *models.Scene {
URL: getSceneEmptyString(i, urlField),
Rating: getIntPtr(rating),
OCounter: getOCounter(i),
- Date: getObjectDateObject(i),
+ Date: getObjectDateObject(i, false),
StudioID: studioID,
GalleryIDs: models.NewRelatedIDs(gids),
PerformerIDs: models.NewRelatedIDs(pids),
@@ -1069,7 +1092,7 @@ func makeImageFile(i int) *file.ImageFile {
}
}
-func makeImage(i int) *models.Image {
+func makeImage(i int, fromDB bool) *models.Image {
title := getImageStringValue(i, titleField)
var studioID *int
if _, ok := imageStudios[i]; ok {
@@ -1084,6 +1107,8 @@ func makeImage(i int) *models.Image {
return &models.Image{
Title: title,
Rating: getIntPtr(getRating(i)),
+ Date: getObjectDateObject(i, fromDB),
+ URL: getImageStringValue(i, urlField),
OCounter: getOCounter(i),
StudioID: studioID,
GalleryIDs: models.NewRelatedIDs(gids),
@@ -1107,7 +1132,7 @@ func createImages(ctx context.Context, n int) error {
}
imageFileIDs = append(imageFileIDs, f.ID)
- image := makeImage(i)
+ image := makeImage(i, false)
err := qb.Create(ctx, &models.ImageCreateInput{
Image: image,
@@ -1168,7 +1193,7 @@ func makeGallery(i int, includeScenes bool) *models.Gallery {
Title: getGalleryStringValue(i, titleField),
URL: getGalleryNullStringValue(i, urlField).String,
Rating: getIntPtr(getRating(i)),
- Date: getObjectDateObject(i),
+ Date: getObjectDateObject(i, false),
StudioID: studioID,
PerformerIDs: models.NewRelatedIDs(pids),
TagIDs: models.NewRelatedIDs(tids),
@@ -1335,17 +1360,21 @@ func createPerformers(ctx context.Context, n int, o int) error {
} // so count backwards to 0 as needed
// performers [ i ] and [ n + o - i - 1 ] should have similar names with only the Name!=NaMe part different
+ tids := indexesToIDs(tagIDs, performerTags[i])
+
performer := models.Performer{
- Name: getPerformerStringValue(index, name),
- Checksum: getPerformerStringValue(i, checksumField),
- URL: getPerformerNullStringValue(i, urlField),
- Favorite: getPerformerBoolValue(i),
- Birthdate: getPerformerBirthdate(i),
- DeathDate: getPerformerDeathDate(i),
- Details: getPerformerStringValue(i, "Details"),
- Ethnicity: getPerformerStringValue(i, "Ethnicity"),
- Rating: getIntPtr(getRating(i)),
- IgnoreAutoTag: getIgnoreAutoTag(i),
+ Name: getPerformerStringValue(index, name),
+ Disambiguation: getPerformerStringValue(index, "disambiguation"),
+ Aliases: models.NewRelatedStrings([]string{getPerformerStringValue(index, "alias")}),
+ URL: getPerformerNullStringValue(i, urlField),
+ Favorite: getPerformerBoolValue(i),
+ Birthdate: getPerformerBirthdate(i),
+ DeathDate: getPerformerDeathDate(i),
+ Details: getPerformerStringValue(i, "Details"),
+ Ethnicity: getPerformerStringValue(i, "Ethnicity"),
+ Rating: getIntPtr(getRating(i)),
+ IgnoreAutoTag: getIgnoreAutoTag(i),
+ TagIDs: models.NewRelatedIDs(tids),
}
careerLength := getPerformerCareerLength(i)
@@ -1353,20 +1382,18 @@ func createPerformers(ctx context.Context, n int, o int) error {
performer.CareerLength = *careerLength
}
+ if (index+1)%5 != 0 {
+ performer.StashIDs = models.NewRelatedStashIDs([]models.StashID{
+ performerStashID(i),
+ })
+ }
+
err := pqb.Create(ctx, &performer)
if err != nil {
return fmt.Errorf("Error creating performer %v+: %s", performer, err.Error())
}
- if (index+1)%5 != 0 {
- if err := pqb.UpdateStashIDs(ctx, performer.ID, []models.StashID{
- performerStashID(i),
- }); err != nil {
- return fmt.Errorf("setting performer stash ids: %w", err)
- }
- }
-
performerIDs = append(performerIDs, performer.ID)
performerNames = append(performerNames, performer.Name)
}
@@ -1582,6 +1609,24 @@ func createMarker(ctx context.Context, mqb models.SceneMarkerReaderWriter, marke
return nil
}
+func createChapter(ctx context.Context, mqb models.GalleryChapterReaderWriter, chapterSpec chapterSpec) error {
+ chapter := models.GalleryChapter{
+ GalleryID: sql.NullInt64{Int64: int64(sceneIDs[chapterSpec.galleryIdx]), Valid: true},
+ Title: chapterSpec.title,
+ ImageIndex: chapterSpec.imageIndex,
+ }
+
+ created, err := mqb.Create(ctx, chapter)
+
+ if err != nil {
+ return fmt.Errorf("error creating chapter %v+: %w", chapter, err)
+ }
+
+ chapterIDs = append(chapterIDs, created.ID)
+
+ return nil
+}
+
func getSavedFilterMode(index int) models.FilterMode {
switch index {
case savedFilterIdxScene, savedFilterIdxDefaultScene:
@@ -1637,22 +1682,6 @@ func doLinks(links [][2]int, fn func(idx1, idx2 int) error) error {
return nil
}
-func linkPerformerTags(ctx context.Context) error {
- qb := db.Performer
- return doLinks(performerTagLinks, func(performerIndex, tagIndex int) error {
- performerID := performerIDs[performerIndex]
- tagID := tagIDs[tagIndex]
- tagIDs, err := qb.GetTagIDs(ctx, performerID)
- if err != nil {
- return err
- }
-
- tagIDs = intslice.IntAppendUnique(tagIDs, tagID)
-
- return qb.UpdateTags(ctx, performerID, tagIDs)
- })
-}
-
func linkMovieStudios(ctx context.Context, mqb models.MovieWriter) error {
return doLinks(movieStudioLinks, func(movieIndex, studioIndex int) error {
movie := models.MoviePartial{
diff --git a/pkg/sqlite/sql.go b/pkg/sqlite/sql.go
index 8611f42fa..af864df01 100644
--- a/pkg/sqlite/sql.go
+++ b/pkg/sqlite/sql.go
@@ -1,9 +1,6 @@
package sqlite
import (
- "context"
- "database/sql"
- "errors"
"fmt"
"math/rand"
"regexp"
@@ -197,9 +194,9 @@ func getDateWhereClause(column string, modifier models.CriterionModifier, value
switch modifier {
case models.CriterionModifierIsNull:
- return fmt.Sprintf("(%s IS NULL OR %s = '')", column, column), nil
+ return fmt.Sprintf("(%s IS NULL OR %s = '' OR %s = '0001-01-01')", column, column, column), nil
case models.CriterionModifierNotNull:
- return fmt.Sprintf("(%s IS NOT NULL AND %s != '')", column, column), nil
+ return fmt.Sprintf("(%s IS NOT NULL AND %s != '' AND %s != '0001-01-01')", column, column, column), nil
case models.CriterionModifierEquals:
return fmt.Sprintf("%s = ?", column), args
case models.CriterionModifierNotEquals:
@@ -290,28 +287,6 @@ func getCountCriterionClause(primaryTable, joinTable, primaryFK string, criterio
return getIntCriterionWhereClause(lhs, criterion)
}
-func getImage(ctx context.Context, tx dbWrapper, query string, args ...interface{}) ([]byte, error) {
- rows, err := tx.Queryx(ctx, query, args...)
-
- if err != nil && !errors.Is(err, sql.ErrNoRows) {
- return nil, err
- }
- defer rows.Close()
-
- var ret []byte
- if rows.Next() {
- if err := rows.Scan(&ret); err != nil {
- return nil, err
- }
- }
-
- if err := rows.Err(); err != nil {
- return nil, err
- }
-
- return ret, nil
-}
-
func coalesce(column string) string {
return fmt.Sprintf("COALESCE(%s, '')", column)
}
diff --git a/pkg/sqlite/studio.go b/pkg/sqlite/studio.go
index 8509b74d7..b8f783de1 100644
--- a/pkg/sqlite/studio.go
+++ b/pkg/sqlite/studio.go
@@ -13,20 +13,31 @@ import (
"github.com/stashapp/stash/pkg/sliceutil/intslice"
)
-const studioTable = "studios"
-const studioIDColumn = "studio_id"
-const studioAliasesTable = "studio_aliases"
-const studioAliasColumn = "alias"
+const (
+ studioTable = "studios"
+ studioIDColumn = "studio_id"
+ studioAliasesTable = "studio_aliases"
+ studioAliasColumn = "alias"
+
+ studioImageBlobColumn = "image_blob"
+)
type studioQueryBuilder struct {
repository
+ blobJoinQueryBuilder
}
-var StudioReaderWriter = &studioQueryBuilder{
- repository{
- tableName: studioTable,
- idColumn: idColumn,
- },
+func NewStudioReaderWriter(blobStore *BlobStore) *studioQueryBuilder {
+ return &studioQueryBuilder{
+ repository{
+ tableName: studioTable,
+ idColumn: idColumn,
+ },
+ blobJoinQueryBuilder{
+ blobStore: blobStore,
+ joinTable: studioTable,
+ },
+ }
}
func (qb *studioQueryBuilder) Create(ctx context.Context, newObject models.Studio) (*models.Studio, error) {
@@ -57,6 +68,11 @@ func (qb *studioQueryBuilder) UpdateFull(ctx context.Context, updatedObject mode
}
func (qb *studioQueryBuilder) Destroy(ctx context.Context, id int) error {
+ // must handle image checksums manually
+ if err := qb.destroyImage(ctx, id); err != nil {
+ return err
+ }
+
// TODO - set null on foreign key in scraped items
// remove studio from scraped items
_, err := qb.tx.Exec(ctx, "UPDATE scraped_items SET studio_id = null WHERE studio_id = ?", id)
@@ -80,17 +96,23 @@ func (qb *studioQueryBuilder) Find(ctx context.Context, id int) (*models.Studio,
func (qb *studioQueryBuilder) FindMany(ctx context.Context, ids []int) ([]*models.Studio, error) {
tableMgr := studioTableMgr
- q := goqu.Select("*").From(tableMgr.table).Where(tableMgr.byIDInts(ids...))
- unsorted, err := qb.getMany(ctx, q)
- if err != nil {
- return nil, err
- }
-
ret := make([]*models.Studio, len(ids))
- for _, s := range unsorted {
- i := intslice.IntIndex(ids, s.ID)
- ret[i] = s
+ if err := batchExec(ids, defaultBatchSize, func(batch []int) error {
+ q := goqu.Select("*").From(tableMgr.table).Where(tableMgr.byIDInts(batch...))
+ unsorted, err := qb.getMany(ctx, q)
+ if err != nil {
+ return err
+ }
+
+ for _, s := range unsorted {
+ i := intslice.IntIndex(ids, s.ID)
+ ret[i] = s
+ }
+
+ return nil
+ }); err != nil {
+ return nil, err
}
for i := range ret {
@@ -287,7 +309,9 @@ func (qb *studioQueryBuilder) Query(ctx context.Context, studioFilter *models.St
}
filter := qb.makeFilter(ctx, studioFilter)
- query.addFilter(filter)
+ if err := query.addFilter(filter); err != nil {
+ return nil, 0, err
+ }
query.sortAndPagination = qb.getStudioSort(findFilter) + getPagination(findFilter)
idsResult, countResult, err := query.executeFind(ctx)
@@ -308,8 +332,7 @@ func studioIsMissingCriterionHandler(qb *studioQueryBuilder, isMissing *string)
if isMissing != nil && *isMissing != "" {
switch *isMissing {
case "image":
- f.addLeftJoin("studios_image", "", "studios_image.studio_id = studios.id")
- f.addWhere("studios_image.studio_id IS NULL")
+ f.addWhere("studios.image_blob IS NULL")
case "stash_id":
qb.stashIDRepository().join(f, "studio_stash_ids", "studios.id")
f.addWhere("studio_stash_ids.studio_id IS NULL")
@@ -420,31 +443,20 @@ func (qb *studioQueryBuilder) queryStudios(ctx context.Context, query string, ar
return []*models.Studio(ret), nil
}
-func (qb *studioQueryBuilder) imageRepository() *imageRepository {
- return &imageRepository{
- repository: repository{
- tx: qb.tx,
- tableName: "studios_image",
- idColumn: studioIDColumn,
- },
- imageColumn: "image",
- }
-}
-
func (qb *studioQueryBuilder) GetImage(ctx context.Context, studioID int) ([]byte, error) {
- return qb.imageRepository().get(ctx, studioID)
+ return qb.blobJoinQueryBuilder.GetImage(ctx, studioID, studioImageBlobColumn)
}
func (qb *studioQueryBuilder) HasImage(ctx context.Context, studioID int) (bool, error) {
- return qb.imageRepository().exists(ctx, studioID)
+ return qb.blobJoinQueryBuilder.HasImage(ctx, studioID, studioImageBlobColumn)
}
func (qb *studioQueryBuilder) UpdateImage(ctx context.Context, studioID int, image []byte) error {
- return qb.imageRepository().replace(ctx, studioID, image)
+ return qb.blobJoinQueryBuilder.UpdateImage(ctx, studioID, studioImageBlobColumn, image)
}
-func (qb *studioQueryBuilder) DestroyImage(ctx context.Context, studioID int) error {
- return qb.imageRepository().destroy(ctx, []int{studioID})
+func (qb *studioQueryBuilder) destroyImage(ctx context.Context, studioID int) error {
+ return qb.blobJoinQueryBuilder.DestroyImage(ctx, studioID, studioImageBlobColumn)
}
func (qb *studioQueryBuilder) stashIDRepository() *stashIDRepository {
diff --git a/pkg/sqlite/studio_test.go b/pkg/sqlite/studio_test.go
index 4bffe4517..334ad1a15 100644
--- a/pkg/sqlite/studio_test.go
+++ b/pkg/sqlite/studio_test.go
@@ -14,13 +14,12 @@ import (
"testing"
"github.com/stashapp/stash/pkg/models"
- "github.com/stashapp/stash/pkg/sqlite"
"github.com/stretchr/testify/assert"
)
func TestStudioFindByName(t *testing.T) {
withTxn(func(ctx context.Context) error {
- sqb := sqlite.StudioReaderWriter
+ sqb := db.Studio
name := studioNames[studioIdxWithScene] // find a studio by name
@@ -70,7 +69,7 @@ func TestStudioQueryNameOr(t *testing.T) {
}
withTxn(func(ctx context.Context) error {
- sqb := sqlite.StudioReaderWriter
+ sqb := db.Studio
studios := queryStudio(ctx, t, sqb, &studioFilter, nil)
@@ -101,7 +100,7 @@ func TestStudioQueryNameAndUrl(t *testing.T) {
}
withTxn(func(ctx context.Context) error {
- sqb := sqlite.StudioReaderWriter
+ sqb := db.Studio
studios := queryStudio(ctx, t, sqb, &studioFilter, nil)
@@ -136,7 +135,7 @@ func TestStudioQueryNameNotUrl(t *testing.T) {
}
withTxn(func(ctx context.Context) error {
- sqb := sqlite.StudioReaderWriter
+ sqb := db.Studio
studios := queryStudio(ctx, t, sqb, &studioFilter, nil)
@@ -167,7 +166,7 @@ func TestStudioIllegalQuery(t *testing.T) {
}
withTxn(func(ctx context.Context) error {
- sqb := sqlite.StudioReaderWriter
+ sqb := db.Studio
_, _, err := sqb.Query(ctx, studioFilter, nil)
assert.NotNil(err)
@@ -193,7 +192,7 @@ func TestStudioQueryIgnoreAutoTag(t *testing.T) {
IgnoreAutoTag: &ignoreAutoTag,
}
- sqb := sqlite.StudioReaderWriter
+ sqb := db.Studio
studios := queryStudio(ctx, t, sqb, &studioFilter, nil)
@@ -208,7 +207,7 @@ func TestStudioQueryIgnoreAutoTag(t *testing.T) {
func TestStudioQueryForAutoTag(t *testing.T) {
withTxn(func(ctx context.Context) error {
- tqb := sqlite.StudioReaderWriter
+ tqb := db.Studio
name := studioNames[studioIdxWithMovie] // find a studio by name
@@ -239,7 +238,7 @@ func TestStudioQueryForAutoTag(t *testing.T) {
func TestStudioQueryParent(t *testing.T) {
withTxn(func(ctx context.Context) error {
- sqb := sqlite.StudioReaderWriter
+ sqb := db.Studio
studioCriterion := models.MultiCriterionInput{
Value: []string{
strconv.Itoa(studioIDs[studioIdxWithChildStudio]),
@@ -289,18 +288,18 @@ func TestStudioDestroyParent(t *testing.T) {
// create parent and child studios
if err := withTxn(func(ctx context.Context) error {
- createdParent, err := createStudio(ctx, sqlite.StudioReaderWriter, parentName, nil)
+ createdParent, err := createStudio(ctx, db.Studio, parentName, nil)
if err != nil {
return fmt.Errorf("Error creating parent studio: %s", err.Error())
}
parentID := int64(createdParent.ID)
- createdChild, err := createStudio(ctx, sqlite.StudioReaderWriter, childName, &parentID)
+ createdChild, err := createStudio(ctx, db.Studio, childName, &parentID)
if err != nil {
return fmt.Errorf("Error creating child studio: %s", err.Error())
}
- sqb := sqlite.StudioReaderWriter
+ sqb := db.Studio
// destroy the parent
err = sqb.Destroy(ctx, createdParent.ID)
@@ -322,7 +321,7 @@ func TestStudioDestroyParent(t *testing.T) {
func TestStudioFindChildren(t *testing.T) {
withTxn(func(ctx context.Context) error {
- sqb := sqlite.StudioReaderWriter
+ sqb := db.Studio
studios, err := sqb.FindChildren(ctx, studioIDs[studioIdxWithChildStudio])
@@ -351,18 +350,18 @@ func TestStudioUpdateClearParent(t *testing.T) {
// create parent and child studios
if err := withTxn(func(ctx context.Context) error {
- createdParent, err := createStudio(ctx, sqlite.StudioReaderWriter, parentName, nil)
+ createdParent, err := createStudio(ctx, db.Studio, parentName, nil)
if err != nil {
return fmt.Errorf("Error creating parent studio: %s", err.Error())
}
parentID := int64(createdParent.ID)
- createdChild, err := createStudio(ctx, sqlite.StudioReaderWriter, childName, &parentID)
+ createdChild, err := createStudio(ctx, db.Studio, childName, &parentID)
if err != nil {
return fmt.Errorf("Error creating child studio: %s", err.Error())
}
- sqb := sqlite.StudioReaderWriter
+ sqb := db.Studio
// clear the parent id from the child
updatePartial := models.StudioPartial{
@@ -388,70 +387,16 @@ func TestStudioUpdateClearParent(t *testing.T) {
func TestStudioUpdateStudioImage(t *testing.T) {
if err := withTxn(func(ctx context.Context) error {
- qb := sqlite.StudioReaderWriter
+ qb := db.Studio
- // create performer to test against
+ // create studio to test against
const name = "TestStudioUpdateStudioImage"
- created, err := createStudio(ctx, sqlite.StudioReaderWriter, name, nil)
+ created, err := createStudio(ctx, db.Studio, name, nil)
if err != nil {
return fmt.Errorf("Error creating studio: %s", err.Error())
}
- image := []byte("image")
- err = qb.UpdateImage(ctx, created.ID, image)
- if err != nil {
- return fmt.Errorf("Error updating studio image: %s", err.Error())
- }
-
- // ensure image set
- storedImage, err := qb.GetImage(ctx, created.ID)
- if err != nil {
- return fmt.Errorf("Error getting image: %s", err.Error())
- }
- assert.Equal(t, storedImage, image)
-
- // set nil image
- err = qb.UpdateImage(ctx, created.ID, nil)
- if err == nil {
- return fmt.Errorf("Expected error setting nil image")
- }
-
- return nil
- }); err != nil {
- t.Error(err.Error())
- }
-}
-
-func TestStudioDestroyStudioImage(t *testing.T) {
- if err := withTxn(func(ctx context.Context) error {
- qb := sqlite.StudioReaderWriter
-
- // create performer to test against
- const name = "TestStudioDestroyStudioImage"
- created, err := createStudio(ctx, sqlite.StudioReaderWriter, name, nil)
- if err != nil {
- return fmt.Errorf("Error creating studio: %s", err.Error())
- }
-
- image := []byte("image")
- err = qb.UpdateImage(ctx, created.ID, image)
- if err != nil {
- return fmt.Errorf("Error updating studio image: %s", err.Error())
- }
-
- err = qb.DestroyImage(ctx, created.ID)
- if err != nil {
- return fmt.Errorf("Error destroying studio image: %s", err.Error())
- }
-
- // image should be nil
- storedImage, err := qb.GetImage(ctx, created.ID)
- if err != nil {
- return fmt.Errorf("Error getting image: %s", err.Error())
- }
- assert.Nil(t, storedImage)
-
- return nil
+ return testUpdateImage(t, ctx, created.ID, qb.UpdateImage, qb.GetImage)
}); err != nil {
t.Error(err.Error())
}
@@ -478,7 +423,7 @@ func TestStudioQuerySceneCount(t *testing.T) {
func verifyStudiosSceneCount(t *testing.T, sceneCountCriterion models.IntCriterionInput) {
withTxn(func(ctx context.Context) error {
- sqb := sqlite.StudioReaderWriter
+ sqb := db.Studio
studioFilter := models.StudioFilterType{
SceneCount: &sceneCountCriterion,
}
@@ -519,7 +464,7 @@ func TestStudioQueryImageCount(t *testing.T) {
func verifyStudiosImageCount(t *testing.T, imageCountCriterion models.IntCriterionInput) {
withTxn(func(ctx context.Context) error {
- sqb := sqlite.StudioReaderWriter
+ sqb := db.Studio
studioFilter := models.StudioFilterType{
ImageCount: &imageCountCriterion,
}
@@ -575,7 +520,7 @@ func TestStudioQueryGalleryCount(t *testing.T) {
func verifyStudiosGalleryCount(t *testing.T, galleryCountCriterion models.IntCriterionInput) {
withTxn(func(ctx context.Context) error {
- sqb := sqlite.StudioReaderWriter
+ sqb := db.Studio
studioFilter := models.StudioFilterType{
GalleryCount: &galleryCountCriterion,
}
@@ -606,11 +551,11 @@ func verifyStudiosGalleryCount(t *testing.T, galleryCountCriterion models.IntCri
func TestStudioStashIDs(t *testing.T) {
if err := withTxn(func(ctx context.Context) error {
- qb := sqlite.StudioReaderWriter
+ qb := db.Studio
// create studio to test against
const name = "TestStudioStashIDs"
- created, err := createStudio(ctx, sqlite.StudioReaderWriter, name, nil)
+ created, err := createStudio(ctx, db.Studio, name, nil)
if err != nil {
return fmt.Errorf("Error creating studio: %s", err.Error())
}
@@ -688,7 +633,7 @@ func TestStudioQueryRating(t *testing.T) {
func verifyStudioQuery(t *testing.T, filter models.StudioFilterType, verifyFn func(ctx context.Context, s *models.Studio)) {
withTxn(func(ctx context.Context) error {
t.Helper()
- sqb := sqlite.StudioReaderWriter
+ sqb := db.Studio
studios := queryStudio(ctx, t, sqb, &filter, nil)
@@ -705,7 +650,7 @@ func verifyStudioQuery(t *testing.T, filter models.StudioFilterType, verifyFn fu
func verifyStudiosRating(t *testing.T, ratingCriterion models.IntCriterionInput) {
withTxn(func(ctx context.Context) error {
- sqb := sqlite.StudioReaderWriter
+ sqb := db.Studio
studioFilter := models.StudioFilterType{
Rating: &ratingCriterion,
}
@@ -726,7 +671,7 @@ func verifyStudiosRating(t *testing.T, ratingCriterion models.IntCriterionInput)
func TestStudioQueryIsMissingRating(t *testing.T) {
withTxn(func(ctx context.Context) error {
- sqb := sqlite.StudioReaderWriter
+ sqb := db.Studio
isMissing := "rating"
studioFilter := models.StudioFilterType{
IsMissing: &isMissing,
@@ -802,7 +747,7 @@ func TestStudioQueryAlias(t *testing.T) {
verifyFn := func(ctx context.Context, studio *models.Studio) {
t.Helper()
- aliases, err := sqlite.StudioReaderWriter.GetAliases(ctx, studio.ID)
+ aliases, err := db.Studio.GetAliases(ctx, studio.ID)
if err != nil {
t.Errorf("Error querying studios: %s", err.Error())
}
@@ -837,7 +782,7 @@ func TestStudioQueryAlias(t *testing.T) {
func TestStudioUpdateAlias(t *testing.T) {
if err := withTxn(func(ctx context.Context) error {
- qb := sqlite.StudioReaderWriter
+ qb := db.Studio
// create studio to test against
const name = "TestStudioUpdateAlias"
@@ -934,7 +879,7 @@ func TestStudioQueryFast(t *testing.T) {
}
withTxn(func(ctx context.Context) error {
- sqb := sqlite.StudioReaderWriter
+ sqb := db.Studio
for _, f := range filters {
for _, ff := range findFilters {
_, _, err := sqb.Query(ctx, &f, &ff)
diff --git a/pkg/sqlite/table.go b/pkg/sqlite/table.go
index 31cdefcf9..1a33ee2bf 100644
--- a/pkg/sqlite/table.go
+++ b/pkg/sqlite/table.go
@@ -15,6 +15,7 @@ import (
"github.com/stashapp/stash/pkg/logger"
"github.com/stashapp/stash/pkg/models"
"github.com/stashapp/stash/pkg/sliceutil/intslice"
+ "github.com/stashapp/stash/pkg/sliceutil/stringslice"
)
type table struct {
@@ -129,6 +130,15 @@ func (t *table) destroy(ctx context.Context, ids []int) error {
return nil
}
+func (t *table) join(j joiner, as string, parentIDCol string) {
+ tableName := t.table.GetTable()
+ tt := tableName
+ if as != "" {
+ tt = as
+ }
+ j.addLeftJoin(tableName, as, fmt.Sprintf("%s.%s = %s", tt, t.idColumn.GetCol(), parentIDCol))
+}
+
// func (t *table) get(ctx context.Context, q *goqu.SelectDataset, dest interface{}) error {
// tx, err := getTx(ctx)
// if err != nil {
@@ -258,18 +268,18 @@ type stashIDRow struct {
Endpoint null.String `db:"endpoint"`
}
-func (r *stashIDRow) resolve() *models.StashID {
- return &models.StashID{
+func (r *stashIDRow) resolve() models.StashID {
+ return models.StashID{
StashID: r.StashID.String,
Endpoint: r.Endpoint.String,
}
}
-func (t *stashIDTable) get(ctx context.Context, id int) ([]*models.StashID, error) {
+func (t *stashIDTable) get(ctx context.Context, id int) ([]models.StashID, error) {
q := dialect.Select("endpoint", "stash_id").From(t.table.table).Where(t.idColumn.Eq(id))
const single = false
- var ret []*models.StashID
+ var ret []models.StashID
if err := queryFunc(ctx, q, single, func(rows *sqlx.Rows) error {
var v stashIDRow
if err := rows.StructScan(&v); err != nil {
@@ -366,6 +376,102 @@ func (t *stashIDTable) modifyJoins(ctx context.Context, id int, v []models.Stash
return nil
}
+type stringTable struct {
+ table
+ stringColumn exp.IdentifierExpression
+}
+
+func (t *stringTable) get(ctx context.Context, id int) ([]string, error) {
+ q := dialect.Select(t.stringColumn).From(t.table.table).Where(t.idColumn.Eq(id))
+
+ const single = false
+ var ret []string
+ if err := queryFunc(ctx, q, single, func(rows *sqlx.Rows) error {
+ var v string
+ if err := rows.Scan(&v); err != nil {
+ return err
+ }
+
+ ret = append(ret, v)
+
+ return nil
+ }); err != nil {
+ return nil, fmt.Errorf("getting stash ids from %s: %w", t.table.table.GetTable(), err)
+ }
+
+ return ret, nil
+}
+
+func (t *stringTable) insertJoin(ctx context.Context, id int, v string) (sql.Result, error) {
+ q := dialect.Insert(t.table.table).Cols(t.idColumn.GetCol(), t.stringColumn.GetCol()).Vals(
+ goqu.Vals{id, v},
+ )
+ ret, err := exec(ctx, q)
+ if err != nil {
+ return nil, fmt.Errorf("inserting into %s: %w", t.table.table.GetTable(), err)
+ }
+
+ return ret, nil
+}
+
+func (t *stringTable) insertJoins(ctx context.Context, id int, v []string) error {
+ for _, fk := range v {
+ if _, err := t.insertJoin(ctx, id, fk); err != nil {
+ return err
+ }
+ }
+
+ return nil
+}
+
+func (t *stringTable) replaceJoins(ctx context.Context, id int, v []string) error {
+ if err := t.destroy(ctx, []int{id}); err != nil {
+ return err
+ }
+
+ return t.insertJoins(ctx, id, v)
+}
+
+func (t *stringTable) addJoins(ctx context.Context, id int, v []string) error {
+ // get existing foreign keys
+ existing, err := t.get(ctx, id)
+ if err != nil {
+ return err
+ }
+
+ // only add values that are not already present
+ filtered := stringslice.StrExclude(v, existing)
+ return t.insertJoins(ctx, id, filtered)
+}
+
+func (t *stringTable) destroyJoins(ctx context.Context, id int, v []string) error {
+ for _, vv := range v {
+ q := dialect.Delete(t.table.table).Where(
+ t.idColumn.Eq(id),
+ t.stringColumn.Eq(vv),
+ )
+
+ if _, err := exec(ctx, q); err != nil {
+ return fmt.Errorf("destroying %s: %w", t.table.table.GetTable(), err)
+ }
+ }
+
+ return nil
+}
+
+func (t *stringTable) modifyJoins(ctx context.Context, id int, v []string, mode models.RelationshipUpdateMode) error {
+ switch mode {
+ case models.RelationshipUpdateModeSet:
+ return t.replaceJoins(ctx, id, v)
+ case models.RelationshipUpdateModeAdd:
+ return t.addJoins(ctx, id, v)
+ case models.RelationshipUpdateModeRemove:
+ return t.destroyJoins(ctx, id, v)
+ }
+
+ return nil
+}
+
type scenesMoviesTable struct {
table
}
diff --git a/pkg/sqlite/tables.go b/pkg/sqlite/tables.go
index 99301d046..2bf1bfd16 100644
--- a/pkg/sqlite/tables.go
+++ b/pkg/sqlite/tables.go
@@ -25,6 +25,7 @@ var (
scenesStashIDsJoinTable = goqu.T("scene_stash_ids")
scenesMoviesJoinTable = goqu.T(moviesScenesTable)
+ performersAliasesJoinTable = goqu.T(performersAliasesTable)
performersTagsJoinTable = goqu.T(performersTagsTable)
performersStashIDsJoinTable = goqu.T("performer_stash_ids")
)
@@ -111,6 +112,11 @@ var (
idColumn: goqu.T(sceneTable).Col(idColumn),
}
+ sceneMarkerTableMgr = &table{
+ table: goqu.T(sceneMarkerTable),
+ idColumn: goqu.T(sceneMarkerTable).Col(idColumn),
+ }
+
scenesFilesTableMgr = &relatedFilesTable{
table: table{
table: scenesFilesJoinTable,
@@ -183,6 +189,29 @@ var (
table: goqu.T(performerTable),
idColumn: goqu.T(performerTable).Col(idColumn),
}
+
+ performersAliasesTableMgr = &stringTable{
+ table: table{
+ table: performersAliasesJoinTable,
+ idColumn: performersAliasesJoinTable.Col(performerIDColumn),
+ },
+ stringColumn: performersAliasesJoinTable.Col(performerAliasColumn),
+ }
+
+ performersTagsTableMgr = &joinTable{
+ table: table{
+ table: performersTagsJoinTable,
+ idColumn: performersTagsJoinTable.Col(performerIDColumn),
+ },
+ fkColumn: performersTagsJoinTable.Col(tagIDColumn),
+ }
+
+ performersStashIDsTableMgr = &stashIDTable{
+ table: table{
+ table: performersStashIDsJoinTable,
+ idColumn: performersStashIDsJoinTable.Col(performerIDColumn),
+ },
+ }
)
var (
@@ -205,3 +234,10 @@ var (
idColumn: goqu.T(movieTable).Col(idColumn),
}
)
+
+var (
+ blobTableMgr = &table{
+ table: goqu.T(blobTable),
+ idColumn: goqu.T(blobTable).Col(blobChecksumColumn),
+ }
+)
diff --git a/pkg/sqlite/tag.go b/pkg/sqlite/tag.go
index 9521e8a79..9ad4abcaf 100644
--- a/pkg/sqlite/tag.go
+++ b/pkg/sqlite/tag.go
@@ -13,20 +13,31 @@ import (
"github.com/stashapp/stash/pkg/sliceutil/intslice"
)
-const tagTable = "tags"
-const tagIDColumn = "tag_id"
-const tagAliasesTable = "tag_aliases"
-const tagAliasColumn = "alias"
+const (
+ tagTable = "tags"
+ tagIDColumn = "tag_id"
+ tagAliasesTable = "tag_aliases"
+ tagAliasColumn = "alias"
+
+ tagImageBlobColumn = "image_blob"
+)
type tagQueryBuilder struct {
repository
+ blobJoinQueryBuilder
}
-var TagReaderWriter = &tagQueryBuilder{
- repository{
- tableName: tagTable,
- idColumn: idColumn,
- },
+func NewTagReaderWriter(blobStore *BlobStore) *tagQueryBuilder {
+ return &tagQueryBuilder{
+ repository{
+ tableName: tagTable,
+ idColumn: idColumn,
+ },
+ blobJoinQueryBuilder{
+ blobStore: blobStore,
+ joinTable: tagTable,
+ },
+ }
}
func (qb *tagQueryBuilder) Create(ctx context.Context, newObject models.Tag) (*models.Tag, error) {
@@ -57,16 +68,8 @@ func (qb *tagQueryBuilder) UpdateFull(ctx context.Context, updatedObject models.
}
func (qb *tagQueryBuilder) Destroy(ctx context.Context, id int) error {
- // TODO - add delete cascade to foreign key
- // delete tag from scenes and markers first
- _, err := qb.tx.Exec(ctx, "DELETE FROM scenes_tags WHERE tag_id = ?", id)
- if err != nil {
- return err
- }
-
- // TODO - add delete cascade to foreign key
- _, err = qb.tx.Exec(ctx, "DELETE FROM scene_markers_tags WHERE tag_id = ?", id)
- if err != nil {
+ // must handle image checksums manually
+ if err := qb.destroyImage(ctx, id); err != nil {
return err
}
@@ -98,17 +101,23 @@ func (qb *tagQueryBuilder) Find(ctx context.Context, id int) (*models.Tag, error
func (qb *tagQueryBuilder) FindMany(ctx context.Context, ids []int) ([]*models.Tag, error) {
tableMgr := tagTableMgr
- q := goqu.Select("*").From(tableMgr.table).Where(tableMgr.byIDInts(ids...))
- unsorted, err := qb.getMany(ctx, q)
- if err != nil {
- return nil, err
- }
-
ret := make([]*models.Tag, len(ids))
- for _, s := range unsorted {
- i := intslice.IntIndex(ids, s.ID)
- ret[i] = s
+ if err := batchExec(ids, defaultBatchSize, func(batch []int) error {
+ q := goqu.Select("*").From(tableMgr.table).Where(tableMgr.byIDInts(batch...))
+ unsorted, err := qb.getMany(ctx, q)
+ if err != nil {
+ return err
+ }
+
+ for _, s := range unsorted {
+ i := intslice.IntIndex(ids, s.ID)
+ ret[i] = s
+ }
+
+ return nil
+ }); err != nil {
+ return nil, err
}
for i := range ret {
@@ -366,7 +375,9 @@ func (qb *tagQueryBuilder) Query(ctx context.Context, tagFilter *models.TagFilte
}
filter := qb.makeFilter(ctx, tagFilter)
- query.addFilter(filter)
+ if err := query.addFilter(filter); err != nil {
+ return nil, 0, err
+ }
query.sortAndPagination = qb.getTagSort(&query, findFilter) + getPagination(findFilter)
idsResult, countResult, err := query.executeFind(ctx)
@@ -399,8 +410,7 @@ func tagIsMissingCriterionHandler(qb *tagQueryBuilder, isMissing *string) criter
if isMissing != nil && *isMissing != "" {
switch *isMissing {
case "image":
- qb.imageRepository().join(f, "", "tags.id")
- f.addWhere("tags_image.tag_id IS NULL")
+ f.addWhere("tags.image_blob IS NULL")
default:
f.addWhere("(tags." + *isMissing + " IS NULL OR TRIM(tags." + *isMissing + ") = '')")
}
@@ -634,31 +644,16 @@ func (qb *tagQueryBuilder) queryTags(ctx context.Context, query string, args []i
return []*models.Tag(ret), nil
}
-func (qb *tagQueryBuilder) imageRepository() *imageRepository {
- return &imageRepository{
- repository: repository{
- tx: qb.tx,
- tableName: "tags_image",
- idColumn: tagIDColumn,
- },
- imageColumn: "image",
- }
-}
-
func (qb *tagQueryBuilder) GetImage(ctx context.Context, tagID int) ([]byte, error) {
- return qb.imageRepository().get(ctx, tagID)
-}
-
-func (qb *tagQueryBuilder) HasImage(ctx context.Context, tagID int) (bool, error) {
- return qb.imageRepository().exists(ctx, tagID)
+ return qb.blobJoinQueryBuilder.GetImage(ctx, tagID, tagImageBlobColumn)
}
func (qb *tagQueryBuilder) UpdateImage(ctx context.Context, tagID int, image []byte) error {
- return qb.imageRepository().replace(ctx, tagID, image)
+ return qb.blobJoinQueryBuilder.UpdateImage(ctx, tagID, tagImageBlobColumn, image)
}
-func (qb *tagQueryBuilder) DestroyImage(ctx context.Context, tagID int) error {
- return qb.imageRepository().destroy(ctx, []int{tagID})
+func (qb *tagQueryBuilder) destroyImage(ctx context.Context, tagID int) error {
+ return qb.blobJoinQueryBuilder.DestroyImage(ctx, tagID, tagImageBlobColumn)
}
func (qb *tagQueryBuilder) aliasRepository() *stringRepository {
diff --git a/pkg/sqlite/tag_test.go b/pkg/sqlite/tag_test.go
index a351f28f4..d3ff5459f 100644
--- a/pkg/sqlite/tag_test.go
+++ b/pkg/sqlite/tag_test.go
@@ -19,7 +19,7 @@ import (
func TestMarkerFindBySceneMarkerID(t *testing.T) {
withTxn(func(ctx context.Context) error {
- tqb := sqlite.TagReaderWriter
+ tqb := db.Tag
markerID := markerIDs[markerIdxWithTag]
@@ -46,7 +46,7 @@ func TestMarkerFindBySceneMarkerID(t *testing.T) {
func TestTagFindByName(t *testing.T) {
withTxn(func(ctx context.Context) error {
- tqb := sqlite.TagReaderWriter
+ tqb := db.Tag
name := tagNames[tagIdxWithScene] // find a tag by name
@@ -82,7 +82,7 @@ func TestTagQueryIgnoreAutoTag(t *testing.T) {
IgnoreAutoTag: &ignoreAutoTag,
}
- sqb := sqlite.TagReaderWriter
+ sqb := db.Tag
tags := queryTags(ctx, t, sqb, &tagFilter, nil)
@@ -97,7 +97,7 @@ func TestTagQueryIgnoreAutoTag(t *testing.T) {
func TestTagQueryForAutoTag(t *testing.T) {
withTxn(func(ctx context.Context) error {
- tqb := sqlite.TagReaderWriter
+ tqb := db.Tag
name := tagNames[tagIdx1WithScene] // find a tag by name
@@ -131,7 +131,7 @@ func TestTagFindByNames(t *testing.T) {
var names []string
withTxn(func(ctx context.Context) error {
- tqb := sqlite.TagReaderWriter
+ tqb := db.Tag
names = append(names, tagNames[tagIdxWithScene]) // find tags by names
@@ -176,7 +176,7 @@ func TestTagFindByNames(t *testing.T) {
func TestTagQuerySort(t *testing.T) {
withTxn(func(ctx context.Context) error {
- sqb := sqlite.TagReaderWriter
+ sqb := db.Tag
sortBy := "scenes_count"
dir := models.SortDirectionEnumDesc
@@ -253,7 +253,7 @@ func TestTagQueryAlias(t *testing.T) {
}
verifyFn := func(ctx context.Context, tag *models.Tag) {
- aliases, err := sqlite.TagReaderWriter.GetAliases(ctx, tag.ID)
+ aliases, err := db.Tag.GetAliases(ctx, tag.ID)
if err != nil {
t.Errorf("Error querying tags: %s", err.Error())
}
@@ -288,7 +288,7 @@ func TestTagQueryAlias(t *testing.T) {
func verifyTagQuery(t *testing.T, tagFilter *models.TagFilterType, findFilter *models.FindFilterType, verifyFn func(ctx context.Context, t *models.Tag)) {
withTxn(func(ctx context.Context) error {
- sqb := sqlite.TagReaderWriter
+ sqb := db.Tag
tags := queryTags(ctx, t, sqb, tagFilter, findFilter)
@@ -312,7 +312,7 @@ func queryTags(ctx context.Context, t *testing.T, qb models.TagReader, tagFilter
func TestTagQueryIsMissingImage(t *testing.T) {
withTxn(func(ctx context.Context) error {
- qb := sqlite.TagReaderWriter
+ qb := db.Tag
isMissing := "image"
tagFilter := models.TagFilterType{
IsMissing: &isMissing,
@@ -366,7 +366,7 @@ func TestTagQuerySceneCount(t *testing.T) {
func verifyTagSceneCount(t *testing.T, sceneCountCriterion models.IntCriterionInput) {
withTxn(func(ctx context.Context) error {
- qb := sqlite.TagReaderWriter
+ qb := db.Tag
tagFilter := models.TagFilterType{
SceneCount: &sceneCountCriterion,
}
@@ -408,7 +408,7 @@ func TestTagQueryMarkerCount(t *testing.T) {
func verifyTagMarkerCount(t *testing.T, markerCountCriterion models.IntCriterionInput) {
withTxn(func(ctx context.Context) error {
- qb := sqlite.TagReaderWriter
+ qb := db.Tag
tagFilter := models.TagFilterType{
MarkerCount: &markerCountCriterion,
}
@@ -450,7 +450,7 @@ func TestTagQueryImageCount(t *testing.T) {
func verifyTagImageCount(t *testing.T, imageCountCriterion models.IntCriterionInput) {
withTxn(func(ctx context.Context) error {
- qb := sqlite.TagReaderWriter
+ qb := db.Tag
tagFilter := models.TagFilterType{
ImageCount: &imageCountCriterion,
}
@@ -492,7 +492,7 @@ func TestTagQueryGalleryCount(t *testing.T) {
func verifyTagGalleryCount(t *testing.T, imageCountCriterion models.IntCriterionInput) {
withTxn(func(ctx context.Context) error {
- qb := sqlite.TagReaderWriter
+ qb := db.Tag
tagFilter := models.TagFilterType{
GalleryCount: &imageCountCriterion,
}
@@ -534,7 +534,7 @@ func TestTagQueryPerformerCount(t *testing.T) {
func verifyTagPerformerCount(t *testing.T, imageCountCriterion models.IntCriterionInput) {
withTxn(func(ctx context.Context) error {
- qb := sqlite.TagReaderWriter
+ qb := db.Tag
tagFilter := models.TagFilterType{
PerformerCount: &imageCountCriterion,
}
@@ -576,7 +576,7 @@ func TestTagQueryParentCount(t *testing.T) {
func verifyTagParentCount(t *testing.T, sceneCountCriterion models.IntCriterionInput) {
withTxn(func(ctx context.Context) error {
- qb := sqlite.TagReaderWriter
+ qb := db.Tag
tagFilter := models.TagFilterType{
ParentCount: &sceneCountCriterion,
}
@@ -619,7 +619,7 @@ func TestTagQueryChildCount(t *testing.T) {
func verifyTagChildCount(t *testing.T, sceneCountCriterion models.IntCriterionInput) {
withTxn(func(ctx context.Context) error {
- qb := sqlite.TagReaderWriter
+ qb := db.Tag
tagFilter := models.TagFilterType{
ChildCount: &sceneCountCriterion,
}
@@ -644,7 +644,7 @@ func verifyTagChildCount(t *testing.T, sceneCountCriterion models.IntCriterionIn
func TestTagQueryParent(t *testing.T) {
withTxn(func(ctx context.Context) error {
const nameField = "Name"
- sqb := sqlite.TagReaderWriter
+ sqb := db.Tag
tagCriterion := models.HierarchicalMultiCriterionInput{
Value: []string{
strconv.Itoa(tagIDs[tagIdxWithChildTag]),
@@ -722,7 +722,7 @@ func TestTagQueryChild(t *testing.T) {
withTxn(func(ctx context.Context) error {
const nameField = "Name"
- sqb := sqlite.TagReaderWriter
+ sqb := db.Tag
tagCriterion := models.HierarchicalMultiCriterionInput{
Value: []string{
strconv.Itoa(tagIDs[tagIdxWithParentTag]),
@@ -798,7 +798,7 @@ func TestTagQueryChild(t *testing.T) {
func TestTagUpdateTagImage(t *testing.T) {
if err := withTxn(func(ctx context.Context) error {
- qb := sqlite.TagReaderWriter
+ qb := db.Tag
// create tag to test against
const name = "TestTagUpdateTagImage"
@@ -810,64 +810,7 @@ func TestTagUpdateTagImage(t *testing.T) {
return fmt.Errorf("Error creating tag: %s", err.Error())
}
- image := []byte("image")
- err = qb.UpdateImage(ctx, created.ID, image)
- if err != nil {
- return fmt.Errorf("Error updating studio image: %s", err.Error())
- }
-
- // ensure image set
- storedImage, err := qb.GetImage(ctx, created.ID)
- if err != nil {
- return fmt.Errorf("Error getting image: %s", err.Error())
- }
- assert.Equal(t, storedImage, image)
-
- // set nil image
- err = qb.UpdateImage(ctx, created.ID, nil)
- if err == nil {
- return fmt.Errorf("Expected error setting nil image")
- }
-
- return nil
- }); err != nil {
- t.Error(err.Error())
- }
-}
-
-func TestTagDestroyTagImage(t *testing.T) {
- if err := withTxn(func(ctx context.Context) error {
- qb := sqlite.TagReaderWriter
-
- // create performer to test against
- const name = "TestTagDestroyTagImage"
- tag := models.Tag{
- Name: name,
- }
- created, err := qb.Create(ctx, tag)
- if err != nil {
- return fmt.Errorf("Error creating tag: %s", err.Error())
- }
-
- image := []byte("image")
- err = qb.UpdateImage(ctx, created.ID, image)
- if err != nil {
- return fmt.Errorf("Error updating studio image: %s", err.Error())
- }
-
- err = qb.DestroyImage(ctx, created.ID)
- if err != nil {
- return fmt.Errorf("Error destroying studio image: %s", err.Error())
- }
-
- // image should be nil
- storedImage, err := qb.GetImage(ctx, created.ID)
- if err != nil {
- return fmt.Errorf("Error getting image: %s", err.Error())
- }
- assert.Nil(t, storedImage)
-
- return nil
+ return testUpdateImage(t, ctx, created.ID, qb.UpdateImage, qb.GetImage)
}); err != nil {
t.Error(err.Error())
}
@@ -875,7 +818,7 @@ func TestTagDestroyTagImage(t *testing.T) {
func TestTagUpdateAlias(t *testing.T) {
if err := withTxn(func(ctx context.Context) error {
- qb := sqlite.TagReaderWriter
+ qb := db.Tag
// create tag to test against
const name = "TestTagUpdateAlias"
@@ -911,7 +854,7 @@ func TestTagMerge(t *testing.T) {
// merge tests - perform these in a transaction that we'll rollback
if err := withRollbackTxn(func(ctx context.Context) error {
- qb := sqlite.TagReaderWriter
+ qb := db.Tag
// try merging into same tag
err := qb.Merge(ctx, []int{tagIDs[tagIdx1WithScene]}, tagIDs[tagIdx1WithScene])
diff --git a/pkg/sqlite/transaction.go b/pkg/sqlite/transaction.go
index c56b2fcd9..743ccce04 100644
--- a/pkg/sqlite/transaction.go
+++ b/pkg/sqlite/transaction.go
@@ -125,18 +125,19 @@ func (db *Database) IsLocked(err error) bool {
func (db *Database) TxnRepository() models.Repository {
return models.Repository{
- TxnManager: db,
- File: db.File,
- Folder: db.Folder,
- Gallery: db.Gallery,
- Image: db.Image,
- Movie: MovieReaderWriter,
- Performer: db.Performer,
- Scene: db.Scene,
- SceneMarker: SceneMarkerReaderWriter,
- ScrapedItem: ScrapedItemReaderWriter,
- Studio: StudioReaderWriter,
- Tag: TagReaderWriter,
- SavedFilter: SavedFilterReaderWriter,
+ TxnManager: db,
+ File: db.File,
+ Folder: db.Folder,
+ Gallery: db.Gallery,
+ GalleryChapter: GalleryChapterReaderWriter,
+ Image: db.Image,
+ Movie: db.Movie,
+ Performer: db.Performer,
+ Scene: db.Scene,
+ SceneMarker: SceneMarkerReaderWriter,
+ ScrapedItem: ScrapedItemReaderWriter,
+ Studio: db.Studio,
+ Tag: db.Tag,
+ SavedFilter: SavedFilterReaderWriter,
}
}
diff --git a/pkg/studio/export.go b/pkg/studio/export.go
index 27cbaeb38..f0cad2eef 100644
--- a/pkg/studio/export.go
+++ b/pkg/studio/export.go
@@ -4,6 +4,7 @@ import (
"context"
"fmt"
+ "github.com/stashapp/stash/pkg/logger"
"github.com/stashapp/stash/pkg/models"
"github.com/stashapp/stash/pkg/models/json"
"github.com/stashapp/stash/pkg/models/jsonschema"
@@ -61,7 +62,7 @@ func ToJSON(ctx context.Context, reader FinderImageStashIDGetter, studio *models
image, err := reader.GetImage(ctx, studio.ID)
if err != nil {
- return nil, fmt.Errorf("error getting studio image: %v", err)
+ logger.Errorf("Error getting studio image: %v", err)
}
if len(image) > 0 {
diff --git a/pkg/studio/export_test.go b/pkg/studio/export_test.go
index 8b329668e..702bab863 100644
--- a/pkg/studio/export_test.go
+++ b/pkg/studio/export_test.go
@@ -147,8 +147,9 @@ func initTestTable() {
},
{
createFullStudio(errImageID, parentStudioID),
- nil,
- true,
+ createFullJSONStudio(parentStudioName, "", nil),
+ // failure to get image is not an error
+ false,
},
{
createFullStudio(missingParentStudioID, missingStudioID),
@@ -200,6 +201,7 @@ func TestToJSON(t *testing.T) {
mockStudioReader.On("GetStashIDs", ctx, studioID).Return(stashIDs, nil).Once()
mockStudioReader.On("GetStashIDs", ctx, noImageID).Return(nil, nil).Once()
mockStudioReader.On("GetStashIDs", ctx, missingParentStudioID).Return(stashIDs, nil).Once()
+ mockStudioReader.On("GetStashIDs", ctx, errImageID).Return(stashIDs, nil).Once()
for i, s := range scenarios {
studio := s.input
diff --git a/pkg/tag/export.go b/pkg/tag/export.go
index 93f5e97b3..fc37ae43f 100644
--- a/pkg/tag/export.go
+++ b/pkg/tag/export.go
@@ -4,6 +4,7 @@ import (
"context"
"fmt"
+ "github.com/stashapp/stash/pkg/logger"
"github.com/stashapp/stash/pkg/models"
"github.com/stashapp/stash/pkg/models/json"
"github.com/stashapp/stash/pkg/models/jsonschema"
@@ -35,7 +36,7 @@ func ToJSON(ctx context.Context, reader FinderAliasImageGetter, tag *models.Tag)
image, err := reader.GetImage(ctx, tag.ID)
if err != nil {
- return nil, fmt.Errorf("error getting tag image: %v", err)
+ logger.Errorf("Error getting tag image: %v", err)
}
if len(image) > 0 {
diff --git a/pkg/tag/export_test.go b/pkg/tag/export_test.go
index e7a68aaf1..e207db7a5 100644
--- a/pkg/tag/export_test.go
+++ b/pkg/tag/export_test.go
@@ -92,8 +92,9 @@ func initTestTable() {
},
{
createTag(errImageID),
- nil,
- true,
+ createJSONTag(nil, "", nil),
+ // getting the image should not cause an error
+ false,
},
{
createTag(errAliasID),
@@ -140,6 +141,7 @@ func TestToJSON(t *testing.T) {
mockTagReader.On("FindByChildTagID", ctx, noImageID).Return(nil, nil).Once()
mockTagReader.On("FindByChildTagID", ctx, withParentsID).Return([]*models.Tag{{Name: "parent"}}, nil).Once()
mockTagReader.On("FindByChildTagID", ctx, errParentsID).Return(nil, parentsErr).Once()
+ mockTagReader.On("FindByChildTagID", ctx, errImageID).Return(nil, nil).Once()
for i, s := range scenarios {
tag := s.tag
diff --git a/pkg/txn/hooks.go b/pkg/txn/hooks.go
index 13cc85d05..2327349cb 100644
--- a/pkg/txn/hooks.go
+++ b/pkg/txn/hooks.go
@@ -11,9 +11,10 @@ const (
)
type hookManager struct {
- postCommitHooks []TxnFunc
- postRollbackHooks []TxnFunc
- postCompleteHooks []TxnFunc
+ preCommitHooks []TxnFunc
+ postCommitHooks []MustFunc
+ postRollbackHooks []MustFunc
+ postCompleteHooks []MustFunc
}
func (m *hookManager) register(ctx context.Context) context.Context {
@@ -28,39 +29,55 @@ func hookManagerCtx(ctx context.Context) *hookManager {
return m
}
-func executeHooks(ctx context.Context, hooks []TxnFunc) {
+func executeHooks(ctx context.Context, hooks []TxnFunc) error {
+ // we need to return the first error
for _, h := range hooks {
- // ignore errors
- _ = h(ctx)
+ if err := h(ctx); err != nil {
+ return err
+ }
+ }
+
+ return nil
+}
+
+func executeMustHooks(ctx context.Context, hooks []MustFunc) {
+ for _, h := range hooks {
+ h(ctx)
}
}
-func executePostCommitHooks(ctx context.Context) {
- m := hookManagerCtx(ctx)
- executeHooks(ctx, m.postCommitHooks)
+func (m *hookManager) executePostCommitHooks(ctx context.Context) {
+ executeMustHooks(ctx, m.postCommitHooks)
}
-func executePostRollbackHooks(ctx context.Context) {
- m := hookManagerCtx(ctx)
- executeHooks(ctx, m.postRollbackHooks)
+func (m *hookManager) executePostRollbackHooks(ctx context.Context) {
+ executeMustHooks(ctx, m.postRollbackHooks)
}
-func executePostCompleteHooks(ctx context.Context) {
- m := hookManagerCtx(ctx)
- executeHooks(ctx, m.postCompleteHooks)
+func (m *hookManager) executePreCommitHooks(ctx context.Context) error {
+ return executeHooks(ctx, m.preCommitHooks)
}
-func AddPostCommitHook(ctx context.Context, hook TxnFunc) {
+func (m *hookManager) executePostCompleteHooks(ctx context.Context) {
+ executeMustHooks(ctx, m.postCompleteHooks)
+}
+
+func AddPreCommitHook(ctx context.Context, hook TxnFunc) {
+ m := hookManagerCtx(ctx)
+ m.preCommitHooks = append(m.preCommitHooks, hook)
+}
+
+func AddPostCommitHook(ctx context.Context, hook MustFunc) {
m := hookManagerCtx(ctx)
m.postCommitHooks = append(m.postCommitHooks, hook)
}
-func AddPostRollbackHook(ctx context.Context, hook TxnFunc) {
+func AddPostRollbackHook(ctx context.Context, hook MustFunc) {
m := hookManagerCtx(ctx)
m.postRollbackHooks = append(m.postRollbackHooks, hook)
}
-func AddPostCompleteHook(ctx context.Context, hook TxnFunc) {
+func AddPostCompleteHook(ctx context.Context, hook MustFunc) {
m := hookManagerCtx(ctx)
m.postCompleteHooks = append(m.postCompleteHooks, hook)
}
diff --git a/pkg/txn/transaction.go b/pkg/txn/transaction.go
index 2a78da721..751588eff 100644
--- a/pkg/txn/transaction.go
+++ b/pkg/txn/transaction.go
@@ -17,13 +17,14 @@ type DatabaseProvider interface {
WithDatabase(ctx context.Context) (context.Context, error)
}
-type DatabaseProviderManager interface {
- DatabaseProvider
- Manager
-}
-
+// TxnFunc is a function that is used in transaction hooks.
+// It should return an error if something went wrong.
type TxnFunc func(ctx context.Context) error
+// MustFunc is a function that is used in transaction hooks.
+// It does not return an error.
+type MustFunc func(ctx context.Context)
+
// WithTxn executes fn in a transaction. If fn returns an error then
// the transaction is rolled back. Otherwise it is committed.
// Transaction is exclusive. Only one thread may run a transaction
@@ -52,35 +53,43 @@ func WithReadTxn(ctx context.Context, m Manager, fn TxnFunc) error {
}
func withTxn(ctx context.Context, m Manager, fn TxnFunc, exclusive bool, execCompleteOnLocked bool) error {
- var err error
- ctx, err = begin(ctx, m, exclusive)
+ // post-hooks should be executed with the outside context
+ txnCtx, err := begin(ctx, m, exclusive)
if err != nil {
return err
}
+ hookMgr := hookManagerCtx(txnCtx)
+
defer func() {
if p := recover(); p != nil {
// a panic occurred, rollback and repanic
- rollback(ctx, m)
+ rollback(txnCtx, m)
panic(p)
}
if err != nil {
// something went wrong, rollback
- rollback(ctx, m)
+ rollback(txnCtx, m)
+
+ // execute post-hooks with outside context
+ hookMgr.executePostRollbackHooks(ctx)
if execCompleteOnLocked || !m.IsLocked(err) {
- executePostCompleteHooks(ctx)
+ hookMgr.executePostCompleteHooks(ctx)
}
} else {
// all good, commit
- err = commit(ctx, m)
- executePostCompleteHooks(ctx)
+ err = commit(txnCtx, m)
+
+ // execute post-hooks with outside context
+ hookMgr.executePostCommitHooks(ctx)
+ hookMgr.executePostCompleteHooks(ctx)
}
}()
- err = fn(ctx)
+ err = fn(txnCtx)
return err
}
@@ -98,11 +107,15 @@ func begin(ctx context.Context, m Manager, exclusive bool) (context.Context, err
}
func commit(ctx context.Context, m Manager) error {
+ hookMgr := hookManagerCtx(ctx)
+ if err := hookMgr.executePreCommitHooks(ctx); err != nil {
+ return err
+ }
+
if err := m.Commit(ctx); err != nil {
return err
}
- executePostCommitHooks(ctx)
return nil
}
@@ -110,8 +123,6 @@ func rollback(ctx context.Context, m Manager) {
if err := m.Rollback(ctx); err != nil {
return
}
-
- executePostRollbackHooks(ctx)
}
// WithDatabase executes fn with the context provided by p.WithDatabase.
diff --git a/pkg/utils/context.go b/pkg/utils/context.go
new file mode 100644
index 000000000..2a3862b5d
--- /dev/null
+++ b/pkg/utils/context.go
@@ -0,0 +1,22 @@
+package utils
+
+import (
+ "context"
+ "time"
+)
+
+type ValueOnlyContext struct {
+ context.Context
+}
+
+func (ValueOnlyContext) Deadline() (deadline time.Time, ok bool) {
+ return
+}
+
+func (ValueOnlyContext) Done() <-chan struct{} {
+ return nil
+}
+
+func (ValueOnlyContext) Err() error {
+ return nil
+}
diff --git a/pkg/utils/func.go b/pkg/utils/func.go
new file mode 100644
index 000000000..a84091721
--- /dev/null
+++ b/pkg/utils/func.go
@@ -0,0 +1,12 @@
+package utils
+
+// Do executes each function in the slice in order. If any function returns an error, it is returned immediately.
+func Do(fn []func() error) error {
+ for _, f := range fn {
+ if err := f(); err != nil {
+ return err
+ }
+ }
+
+ return nil
+}
diff --git a/scripts/test_db_generator/config.yml b/scripts/test_db_generator/config.yml
index ac072c459..a5d94b98f 100644
--- a/scripts/test_db_generator/config.yml
+++ b/scripts/test_db_generator/config.yml
@@ -2,6 +2,7 @@ database: generated.sqlite
scenes: 30000
images: 4000000
galleries: 1500
+chapters: 3000
markers: 3000
performers: 10000
studios: 1500
@@ -15,4 +16,4 @@ naming:
galleries: scene.txt
studios: studio.txt
tags: scene.txt
- images: scene.txt
\ No newline at end of file
+ images: scene.txt
diff --git a/scripts/test_db_generator/makeTestDB.go b/scripts/test_db_generator/makeTestDB.go
index 347e85873..bfdb042df 100644
--- a/scripts/test_db_generator/makeTestDB.go
+++ b/scripts/test_db_generator/makeTestDB.go
@@ -28,7 +28,7 @@ import (
const batchSize = 50000
// create an example database by generating a number of scenes, markers,
-// performers, studios and tags, and associating between them all
+// performers, studios, galleries, chapters and tags, and associating between them all
type config struct {
Database string `yaml:"database"`
@@ -36,6 +36,7 @@ type config struct {
Markers int `yaml:"markers"`
Images int `yaml:"images"`
Galleries int `yaml:"galleries"`
+ Chapters int `yaml:"chapters"`
Performers int `yaml:"performers"`
Studios int `yaml:"studios"`
Tags int `yaml:"tags"`
@@ -97,6 +98,7 @@ func populateDB() {
makeScenes(c.Scenes)
makeImages(c.Images)
makeGalleries(c.Galleries)
+ makeChapters(c.Chapters)
makeMarkers(c.Markers)
}
@@ -496,6 +498,38 @@ func generateGallery(i int) models.Gallery {
}
}
+func makeChapters(n int) {
+ logf("creating %d chapters...", n)
+ for i := 0; i < n; {
+ // do in batches of 1000
+ batch := i + batchSize
+ if err := withTxn(func(ctx context.Context) error {
+ for ; i < batch && i < n; i++ {
+ chapter := generateChapter(i)
+ chapter.GalleryID = models.NullInt64(int64(getRandomGallery()))
+
+ created, err := repo.GalleryChapter.Create(ctx, chapter)
+ if err != nil {
+ return err
+ }
+ }
+
+ logf("... created %d chapters", i)
+
+ return nil
+ }); err != nil {
+ panic(err)
+ }
+ }
+}
+
+func generateChapter(i int) models.GalleryChapter {
+ return models.GalleryChapter{
+ Title: names[c.Naming.Galleries].generateName(rand.Intn(7) + 1),
+ ImageIndex: rand.Intn(200),
+ }
+}
+
func makeMarkers(n int) {
logf("creating %d markers...", n)
for i := 0; i < n; {
@@ -617,6 +651,10 @@ func getRandomScene() int {
return rand.Intn(c.Scenes) + 1
}
+func getRandomGallery() int {
+ return rand.Intn(c.Galleries) + 1
+}
+
func getRandomTags(ctx context.Context, min, max int) []int {
var n int
if min == max {
diff --git a/tools.go b/tools.go
index adc47d7e9..cb92a06fb 100644
--- a/tools.go
+++ b/tools.go
@@ -5,6 +5,7 @@ package main
import (
_ "github.com/99designs/gqlgen"
+ _ "github.com/99designs/gqlgen/graphql/introspection"
_ "github.com/Yamashou/gqlgenc"
_ "github.com/vektah/dataloaden"
_ "github.com/vektra/mockery/v2"
diff --git a/ui/login/login.css b/ui/login/login.css
index cddf4c8d3..dcf41ddbe 100644
--- a/ui/login/login.css
+++ b/ui/login/login.css
@@ -115,3 +115,18 @@ button, input {
font-weight: 500;
padding-bottom: 1rem;
}
+
+@media (max-width: 576px) {
+ .card {
+ width: 100%;
+ }
+
+ .dialog {
+ height: auto;
+ margin-top: 50%;
+ }
+
+ .btn-primary {
+ width: 100%;
+ }
+}
\ No newline at end of file
diff --git a/ui/v2.5/.env b/ui/v2.5/.env
index 66df2e28e..6e49b46e4 100644
--- a/ui/v2.5/.env
+++ b/ui/v2.5/.env
@@ -1,3 +1,2 @@
BROWSER=none
-PORT=3000
ESLINT_NO_DEV_ERRORS=true
diff --git a/ui/v2.5/.eslintrc.json b/ui/v2.5/.eslintrc.json
index ca3e8c0ce..f37f8028c 100644
--- a/ui/v2.5/.eslintrc.json
+++ b/ui/v2.5/.eslintrc.json
@@ -9,61 +9,73 @@
"parserOptions": {
"project": "./tsconfig.json"
},
- "plugins": [
- "@typescript-eslint",
- "jsx-a11y"
- ],
+ "plugins": ["@typescript-eslint", "jsx-a11y"],
"extends": [
- "airbnb-typescript",
- "airbnb/hooks",
- "plugin:react/recommended",
- "plugin:import/recommended",
- "prettier",
- "prettier/prettier"
+ "airbnb-typescript",
+ "plugin:import/recommended",
+ "plugin:react/recommended",
+ "plugin:react/jsx-runtime",
+ "airbnb/hooks",
+ "prettier"
],
"settings": {
"react": {
"version": "detect"
}
},
+ "ignorePatterns": ["node_modules/", "src/core/generated-graphql.tsx"],
"rules": {
- "@typescript-eslint/no-explicit-any": 2,
- "@typescript-eslint/naming-convention": [
- "error",
- {
+ "@typescript-eslint/no-explicit-any": 2,
+ "@typescript-eslint/naming-convention": [
+ "error",
+ {
"selector": "interface",
"format": ["PascalCase"],
"custom": {
"regex": "^I[A-Z]",
"match": true
- }
}
- ],
- "lines-between-class-members": "off",
- "@typescript-eslint/lines-between-class-members": "off",
- "import/extensions": [
- "error",
- "ignorePackages",
- {
- "js": "never",
- "jsx": "never",
- "ts": "never",
- "tsx": "never"
- }
- ],
- "import/named": "off",
- "import/namespace": "off",
- "import/no-unresolved": "off",
- "react/display-name": "off",
- "react/prop-types": "off",
- "react/style-prop-object": ["error", {
+ }
+ ],
+ "lines-between-class-members": "off",
+ "@typescript-eslint/lines-between-class-members": "off",
+ "import/extensions": [
+ "error",
+ "ignorePackages",
+ {
+ "js": "never",
+ "jsx": "never",
+ "ts": "never",
+ "tsx": "never"
+ }
+ ],
+ "import/named": "off",
+ "import/namespace": "off",
+ "import/no-unresolved": "off",
+ "react/display-name": "off",
+ "react-hooks/exhaustive-deps": [
+ "error",
+ { "additionalHooks": "^(useDebounce)$" }
+ ],
+ "react/prop-types": "off",
+ "react/style-prop-object": [
+ "error",
+ {
"allow": ["FormattedNumber"]
- }],
- "spaced-comment": ["error", "always", {
- "markers": ["/"]
- }],
- "prefer-destructuring": ["error", {"object": true, "array": false}],
- "@typescript-eslint/no-use-before-define": ["error", { "functions": false, "classes": true }],
- "no-nested-ternary": "off"
+ }
+ ],
+ "spaced-comment": [
+ "error",
+ "always",
+ {
+ "markers": ["/"]
+ }
+ ],
+ "prefer-destructuring": ["error", { "object": true, "array": false }],
+ "@typescript-eslint/no-use-before-define": [
+ "error",
+ { "functions": false, "classes": true }
+ ],
+ "no-nested-ternary": "off"
}
}
diff --git a/ui/v2.5/.gitignore b/ui/v2.5/.gitignore
index d7b8f1bd7..baf52f432 100755
--- a/ui/v2.5/.gitignore
+++ b/ui/v2.5/.gitignore
@@ -1,4 +1,5 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+# generated
+src/core/generated-*.tsx
# dependencies
/node_modules
@@ -12,6 +13,7 @@
/build
# misc
+.gitignore
.DS_Store
.env.local
.env.development.local
@@ -23,3 +25,4 @@ yarn-debug.log*
yarn-error.log*
.eslintcache
+.stylelintcache
diff --git a/ui/v2.5/.prettierignore b/ui/v2.5/.prettierignore
new file mode 100644
index 000000000..aeb40cd1c
--- /dev/null
+++ b/ui/v2.5/.prettierignore
@@ -0,0 +1,18 @@
+*.md
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# locales
+src/locales/**/*.json
+
+# testing
+/coverage
+
+# production
+/build
+
+# generated
+src/core/generated-graphql.tsx
\ No newline at end of file
diff --git a/ui/v2.5/.stylelintrc b/ui/v2.5/.stylelintrc
index 1357ed90e..de2f58dac 100644
--- a/ui/v2.5/.stylelintrc
+++ b/ui/v2.5/.stylelintrc
@@ -1,91 +1,55 @@
{
- "plugins": [
- "stylelint-order"
- ],
- "extends": "stylelint-config-prettier",
+ "plugins": ["stylelint-order"],
+ "customSyntax": "postcss-scss",
"rules": {
- "indentation": null,
- "at-rule-empty-line-before": [ "always", {
- except: ["after-same-name", "first-nested" ],
- ignore: ["after-comment"],
- } ],
+ "at-rule-empty-line-before": [
+ "always",
+ {
+ "except": ["after-same-name", "first-nested"],
+ "ignore": ["after-comment"]
+ }
+ ],
"at-rule-no-vendor-prefix": true,
"selector-no-vendor-prefix": true,
- "block-closing-brace-newline-after": "always",
- "block-closing-brace-newline-before": "always-multi-line",
- "block-closing-brace-space-before": "always-single-line",
"block-no-empty": true,
- "block-opening-brace-newline-after": "always-multi-line",
- "block-opening-brace-space-after": "always-single-line",
- "block-opening-brace-space-before": "always",
- "color-hex-case": "lower",
"color-hex-length": "short",
"color-no-invalid-hex": true,
- "comment-empty-line-before": [ "always", {
- except: ["first-nested"],
- ignore: ["stylelint-commands"],
- } ],
+ "comment-empty-line-before": [
+ "always",
+ {
+ "except": ["first-nested"],
+ "ignore": ["stylelint-commands"]
+ }
+ ],
"comment-whitespace-inside": "always",
- "declaration-bang-space-after": "never",
- "declaration-bang-space-before": "always",
"declaration-block-no-shorthand-property-overrides": true,
- "declaration-block-semicolon-newline-after": "always-multi-line",
- "declaration-block-semicolon-space-after": "always-single-line",
- "declaration-block-semicolon-space-before": "never",
"declaration-block-single-line-max-declarations": 1,
- "declaration-block-trailing-semicolon": "always",
- "declaration-colon-space-after": "always-single-line",
- "declaration-colon-space-before": "never",
"declaration-no-important": true,
"font-family-name-quotes": "always-where-recommended",
"function-calc-no-unspaced-operator": true,
- "function-comma-newline-after": "always-multi-line",
- "function-comma-space-after": "always-single-line",
- "function-comma-space-before": "never",
"function-linear-gradient-no-nonstandard-direction": true,
- "function-parentheses-newline-inside": "always-multi-line",
- "function-parentheses-space-inside": "never-single-line",
"function-url-quotes": "always",
- "function-whitespace-after": "always",
"length-zero-no-unit": true,
- "max-empty-lines": 1,
"max-nesting-depth": 4,
- "media-feature-colon-space-after": "always",
- "media-feature-colon-space-before": "never",
- "media-feature-range-operator-space-after": "always",
- "media-feature-range-operator-space-before": "always",
- "media-query-list-comma-newline-after": "always-multi-line",
- "media-query-list-comma-space-after": "always-single-line",
- "media-query-list-comma-space-before": "never",
- "media-feature-parentheses-space-inside": "never",
"no-descending-specificity": null,
"no-invalid-double-slash-comments": true,
- "no-missing-end-of-source-newline": true,
"number-max-precision": 3,
- "number-no-trailing-zeros": true,
- "order/order": [
- "custom-properties",
- "declarations"
- ],
+ "order/order": ["custom-properties", "declarations"],
"order/properties-alphabetical-order": true,
- "rule-empty-line-before": ["always-multi-line", {
- except: ["after-single-line-comment", "first-nested" ],
- ignore: ["after-comment"],
- }],
+ "rule-empty-line-before": [
+ "always-multi-line",
+ {
+ "except": ["after-single-line-comment", "first-nested"],
+ "ignore": ["after-comment"]
+ }
+ ],
"selector-max-id": 1,
"selector-max-type": 2,
"selector-class-pattern": "^(\\.*[A-Z]*[a-z]+)+(-[a-z0-9]+)*$",
- "selector-combinator-space-after": "always",
- "selector-combinator-space-before": "always",
- "selector-list-comma-newline-after": "always",
- "selector-list-comma-space-before": "never",
"selector-max-universal": 0,
"selector-type-case": "lower",
"selector-pseudo-element-colon-notation": "double",
"string-no-newline": true,
- "string-quotes": "double",
- "time-min-milliseconds": 100,
- "value-list-comma-space-after": "always-single-line",
- "value-list-comma-space-before": "never"
- },
+ "time-min-milliseconds": 100
+ }
}
diff --git a/ui/v2.5/.vscode/launch.json b/ui/v2.5/.vscode/launch.json
deleted file mode 100644
index a0b21cbef..000000000
--- a/ui/v2.5/.vscode/launch.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- // Use IntelliSense to learn about possible attributes.
- // Hover to view descriptions of existing attributes.
- // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
- "version": "0.2.0",
- "configurations": [
- {
- "type": "chrome",
- "request": "launch",
- "name": "Chrome",
- "url": "http://localhost:3000",
- "webRoot": "${workspaceFolder}/src",
- "sourceMapPathOverrides": {
- "webpack:///src/*": "${webRoot}/*"
- }
- }
- ]
-}
\ No newline at end of file
diff --git a/ui/v2.5/.vscode/settings.json b/ui/v2.5/.vscode/settings.json
deleted file mode 100644
index ba5be62ee..000000000
--- a/ui/v2.5/.vscode/settings.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "typescript.tsdk": "node_modules/typescript/lib",
- "editor.tabSize": 2,
- "editor.renderWhitespace": "boundary",
- "editor.wordWrap": "bounded",
- "javascript.preferences.importModuleSpecifier": "relative",
- "typescript.preferences.importModuleSpecifier": "relative",
- "editor.wordWrapColumn": 120,
- "editor.rulers": [
- 120
- ],
- "i18n-ally.localesPaths": [
- "src/locales"
- ],
- "i18n-ally.keystyle": "nested",
- "i18n-ally.sourceLanguage": "en-GB",
- "spellright.language": [
- "en"
- ],
- "spellright.documentTypes": [
- "markdown",
- "latex",
- "plaintext",
- "typescriptreact"
- ]
-}
\ No newline at end of file
diff --git a/ui/v2.5/codegen.yml b/ui/v2.5/codegen.yml
index d648406a9..08b8c54fd 100644
--- a/ui/v2.5/codegen.yml
+++ b/ui/v2.5/codegen.yml
@@ -4,11 +4,9 @@ documents: "../../graphql/documents/**/*.graphql"
generates:
src/core/generated-graphql.tsx:
plugins:
- - add:
- content: "/* eslint-disable */"
- time
- typescript
- typescript-operations
- typescript-react-apollo
config:
- withRefetchFn: true
+ withRefetchFn: true
diff --git a/ui/v2.5/index.html b/ui/v2.5/index.html
index b25ebc3d0..11bbb270d 100755
--- a/ui/v2.5/index.html
+++ b/ui/v2.5/index.html
@@ -1,7 +1,7 @@
- Stash
-
+
-
diff --git a/ui/v2.5/package.json b/ui/v2.5/package.json
index 21c25ab58..7236dda18 100644
--- a/ui/v2.5/package.json
+++ b/ui/v2.5/package.json
@@ -3,125 +3,119 @@
"version": "0.1.0",
"private": true,
"homepage": "./",
- "sideEffects": false,
"scripts": {
"start": "vite",
"build": "vite build",
- "build-ci": "yarn validate && yarn build",
- "validate": "yarn lint && tsc --noEmit && yarn format-check",
- "lint": "yarn lint:css && yarn lint:js",
- "lint:js": "eslint --cache src/**/*.{ts,tsx}",
- "lint:css": "stylelint \"src/**/*.scss\"",
- "format": "prettier --write \"src/**/!(generated-graphql).{js,jsx,ts,tsx,scss}\"",
- "format-check": "prettier --check \"src/**/!(generated-graphql).{js,jsx,ts,tsx,scss}\"",
+ "build-ci": "yarn run validate && yarn run build",
+ "validate": "yarn run lint && yarn run check && yarn run format-check",
+ "lint": "yarn run lint:css && yarn run lint:js",
+ "lint:css": "stylelint --cache \"src/**/*.scss\"",
+ "lint:js": "eslint --cache src/",
+ "check": "tsc --noEmit",
+ "format": "prettier --write .",
+ "format-check": "prettier --check .",
"gqlgen": "gql-gen --config codegen.yml",
"extract": "NODE_ENV=development extract-messages -l=en,de -o src/locale -d en --flat false 'src/**/!(*.test).tsx'"
},
- "browserslist": [
- ">0.2%",
- "not dead",
- "not ie <= 11",
- "not op_mini all"
- ],
"dependencies": {
- "@apollo/client": "^3.3.7",
- "@formatjs/intl-getcanonicallocales": "^1.5.3",
- "@formatjs/intl-locale": "^2.4.14",
- "@formatjs/intl-numberformat": "^6.1.3",
- "@formatjs/intl-pluralrules": "^4.0.6",
- "@fortawesome/fontawesome-svg-core": "^1.2.34",
- "@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": "^4.0.8",
- "ansi-regex": "^5.0.1",
- "apollo-upload-client": "^14.1.3",
- "axios": "^1.1.3",
+ "@ant-design/react-slick": "^1.0.0",
+ "@apollo/client": "^3.7.8",
+ "@formatjs/intl-getcanonicallocales": "^2.0.5",
+ "@formatjs/intl-locale": "^3.0.11",
+ "@formatjs/intl-numberformat": "^8.3.3",
+ "@formatjs/intl-pluralrules": "^5.1.8",
+ "@fortawesome/fontawesome-svg-core": "^6.3.0",
+ "@fortawesome/free-brands-svg-icons": "^6.3.0",
+ "@fortawesome/free-regular-svg-icons": "^6.3.0",
+ "@fortawesome/free-solid-svg-icons": "^6.3.0",
+ "@fortawesome/react-fontawesome": "^0.2.0",
+ "apollo-upload-client": "^17.0.0",
+ "axios": "^1.3.3",
"base64-blob": "^1.4.1",
- "bootstrap": "^4.6.0",
- "classnames": "^2.2.6",
- "flag-icon-css": "^3.5.0",
+ "bootstrap": "^4.6.2",
+ "classnames": "^2.3.2",
+ "flag-icons": "^6.6.6",
"flexbin": "^0.2.0",
- "formik": "^2.2.6",
- "graphql": "^15.4.0",
- "graphql-tag": "^2.11.0",
- "i18n-iso-countries": "^6.4.0",
- "intersection-observer": "^0.12.0",
- "localforage": "^1.9.0",
+ "formik": "^2.2.9",
+ "graphql": "^16.6.0",
+ "graphql-tag": "^2.12.6",
+ "graphql-ws": "^5.11.3",
+ "i18n-iso-countries": "^7.5.0",
+ "intersection-observer": "^0.12.2",
+ "localforage": "^1.10.0",
"lodash-es": "^4.17.21",
"mousetrap": "^1.6.5",
"mousetrap-pause": "^1.0.0",
"normalize-url": "^4.5.1",
- "postcss": "^8.2.10",
- "query-string": "6.13.8",
- "react": "17.0.2",
- "react-bootstrap": "1.4.3",
- "react-dom": "17.0.2",
+ "react": "^17.0.2",
+ "react-bootstrap": "^1.6.6",
+ "react-datepicker": "^4.10.0",
+ "react-dom": "^17.0.2",
"react-helmet": "^6.1.0",
- "react-intl": "^5.10.16",
- "react-markdown": "^7.1.0",
+ "react-intl": "^6.2.8",
+ "react-photo-gallery": "^8.0.0",
+ "react-remark": "^2.1.0",
"react-router-bootstrap": "^0.25.0",
- "react-router-dom": "^5.2.0",
- "react-router-hash-link": "^2.3.1",
- "react-select": "^4.0.2",
- "react-slick": "^0.29.0",
+ "react-router-dom": "^5.3.4",
+ "react-router-hash-link": "^2.4.3",
+ "react-select": "^5.7.0",
"remark-gfm": "^1.0.0",
"resize-observer-polyfill": "^1.5.1",
- "sass": "^1.32.5",
"slick-carousel": "^1.8.1",
- "string.prototype.replaceall": "^1.0.4",
- "subscriptions-transport-ws": "^0.9.18",
+ "string.prototype.replaceall": "^1.0.7",
"thehandy": "^1.0.3",
"universal-cookie": "^4.0.4",
- "video.js": "^7.20.3",
+ "video.js": "^7.21.3",
+ "videojs-contrib-dash": "^5.1.1",
"videojs-mobile-ui": "^0.8.0",
"videojs-seek-buttons": "^3.0.1",
"videojs-vtt.js": "^0.15.4",
- "vite": "^2.9.13",
- "vite-plugin-compression": "^0.3.5",
- "vite-tsconfig-paths": "^3.3.17",
- "ws": "^7.4.6",
- "yup": "^0.32.9"
+ "yup": "^1.0.0"
},
"devDependencies": {
- "@graphql-codegen/add": "^2.0.2",
- "@graphql-codegen/cli": "^1.20.0",
- "@graphql-codegen/time": "^2.0.2",
- "@graphql-codegen/typescript": "^1.20.00",
- "@graphql-codegen/typescript-operations": "^1.17.13",
- "@graphql-codegen/typescript-react-apollo": "^2.2.1",
- "@types/apollo-upload-client": "^14.1.0",
- "@types/classnames": "^2.2.11",
- "@types/fslightbox-react": "^1.4.0",
+ "@babel/core": "^7.20.12",
+ "@graphql-codegen/cli": "^3.0.0",
+ "@graphql-codegen/time": "^4.0.0",
+ "@graphql-codegen/typescript": "^3.0.0",
+ "@graphql-codegen/typescript-operations": "^3.0.0",
+ "@graphql-codegen/typescript-react-apollo": "^3.3.7",
+ "@types/apollo-upload-client": "^17.0.2",
"@types/lodash-es": "^4.17.6",
- "@types/mousetrap": "^1.6.5",
- "@types/node": "14.14.22",
- "@types/react": "17.0.31",
- "@types/react-dom": "^17.0.10",
- "@types/react-helmet": "^6.1.3",
+ "@types/mousetrap": "^1.6.11",
+ "@types/node": "^18.13.0",
+ "@types/react": "^17.0.53",
+ "@types/react-datepicker": "^4.10.0",
+ "@types/react-dom": "^17.0.19",
+ "@types/react-helmet": "^6.1.6",
"@types/react-router-bootstrap": "^0.24.5",
- "@types/react-router-dom": "5.1.7",
- "@types/react-router-hash-link": "^1.2.1",
- "@types/react-slick": "^0.23.8",
- "@types/video.js": "^7.3.49",
+ "@types/react-router-hash-link": "^2.4.5",
+ "@types/video.js": "^7.3.51",
"@types/videojs-mobile-ui": "^0.5.0",
"@types/videojs-seek-buttons": "^2.1.0",
- "@typescript-eslint/eslint-plugin": "^4.33.0",
- "@typescript-eslint/parser": "^4.33.0",
- "eslint": "^7.32.0",
- "eslint-config-airbnb": "^18.2.1",
- "eslint-config-airbnb-typescript": "^14.0.1",
- "eslint-config-prettier": "^8.3.0",
- "eslint-plugin-import": "^2.25.2",
- "eslint-plugin-jsx-a11y": "^6.4.1",
- "eslint-plugin-react": "^7.26.1",
- "eslint-plugin-react-hooks": "^4.2.0",
+ "@typescript-eslint/eslint-plugin": "^5.52.0",
+ "@typescript-eslint/parser": "^5.52.0",
+ "@vitejs/plugin-legacy": "^4.0.1",
+ "@vitejs/plugin-react": "^3.1.0",
+ "eslint": "^8.34.0",
+ "eslint-config-airbnb": "^19.0.4",
+ "eslint-config-airbnb-typescript": "^17.0.0",
+ "eslint-config-prettier": "^8.6.0",
+ "eslint-plugin-import": "^2.27.5",
+ "eslint-plugin-jsx-a11y": "^6.7.1",
+ "eslint-plugin-react": "^7.32.2",
+ "eslint-plugin-react-hooks": "^4.6.0",
"extract-react-intl-messages": "^4.1.1",
- "postcss-safe-parser": "^5.0.2",
- "prettier": "2.2.1",
- "stylelint": "^13.9.0",
- "stylelint-config-prettier": "^8.0.2",
- "stylelint-order": "^4.1.0",
- "typescript": "~4.4.4"
+ "postcss": "^8.4.21",
+ "postcss-scss": "^4.0.6",
+ "prettier": "^2.8.4",
+ "sass": "^1.58.1",
+ "stylelint": "^15.1.0",
+ "stylelint-order": "^6.0.2",
+ "terser": "^5.9.0",
+ "ts-node": "^10.9.1",
+ "typescript": "~4.8.4",
+ "vite": "^4.1.1",
+ "vite-plugin-compression": "^0.5.1",
+ "vite-tsconfig-paths": "^4.0.5"
}
}
diff --git a/ui/v2.5/src/@types/mousetrap-pause.d.ts b/ui/v2.5/src/@types/mousetrap-pause.d.ts
new file mode 100644
index 000000000..8abd93fcb
--- /dev/null
+++ b/ui/v2.5/src/@types/mousetrap-pause.d.ts
@@ -0,0 +1,24 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+
+declare module "mousetrap-pause" {
+ import { MousetrapStatic } from "mousetrap";
+
+ function MousetrapPause(mousetrap: MousetrapStatic): MousetrapStatic;
+
+ export default MousetrapPause;
+
+ module "mousetrap" {
+ interface MousetrapStatic {
+ pause(): void;
+ unpause(): void;
+ pauseCombo(combo: string): void;
+ unpauseCombo(combo: string): void;
+ }
+ interface MousetrapInstance {
+ pause(): void;
+ unpause(): void;
+ pauseCombo(combo: string): void;
+ unpauseCombo(combo: string): void;
+ }
+ }
+}
diff --git a/ui/v2.5/src/@types/string.prototype.replaceall.d.ts b/ui/v2.5/src/@types/string.prototype.replaceall.d.ts
new file mode 100644
index 000000000..fa87eec06
--- /dev/null
+++ b/ui/v2.5/src/@types/string.prototype.replaceall.d.ts
@@ -0,0 +1,19 @@
+declare module "string.prototype.replaceall" {
+ function replaceAll(
+ searchValue: string | RegExp,
+ replaceValue: string
+ ): string;
+ function replaceAll(
+ searchValue: string | RegExp,
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ replacer: (substring: string, ...args: any[]) => string
+ ): string;
+
+ namespace replaceAll {
+ function getPolyfill(): typeof replaceAll;
+ function implementation(): typeof replaceAll;
+ function shim(): void;
+ }
+
+ export default replaceAll;
+}
diff --git a/ui/v2.5/src/@types/videojs-contrib-dash.d.ts b/ui/v2.5/src/@types/videojs-contrib-dash.d.ts
new file mode 100644
index 000000000..b791d1edb
--- /dev/null
+++ b/ui/v2.5/src/@types/videojs-contrib-dash.d.ts
@@ -0,0 +1,31 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+
+declare module "videojs-contrib-dash" {
+ class Html5DashJS {
+ /**
+ * Get a list of hooks for a specific lifecycle.
+ *
+ * @param type the lifecycle to get hooks from
+ * @param hook optionally add a hook to the lifecycle
+ * @return an array of hooks or empty if none
+ */
+ static hooks(type: string, hook: Function | Function[]): Function[];
+
+ /**
+ * Add a function hook to a specific dash lifecycle.
+ *
+ * @param type the lifecycle to hook the function to
+ * @param hook the function or array of functions to attach
+ */
+ static hook(type: string, hook: Function | Function[]): void;
+
+ /**
+ * Remove a hook from a specific dash lifecycle.
+ *
+ * @param type the lifecycle that the function hooked to
+ * @param hook the hooked function to remove
+ * @return true if the function was removed, false if not found
+ */
+ static removeHook(type: string, hook: Function): boolean;
+ }
+}
diff --git a/ui/v2.5/src/@types/videojs-vtt.d.ts b/ui/v2.5/src/@types/videojs-vtt.d.ts
index 7140e5b6e..191c0d27d 100644
--- a/ui/v2.5/src/@types/videojs-vtt.d.ts
+++ b/ui/v2.5/src/@types/videojs-vtt.d.ts
@@ -1,111 +1,111 @@
/* eslint-disable @typescript-eslint/naming-convention */
declare module "videojs-vtt.js" {
- namespace vttjs {
- /**
- * A custom JS error object that is reported through the parser's `onparsingerror` callback.
- * It has a name, code, and message property, along with all the regular properties that come with a JavaScript error object.
- *
- * There are two error codes that can be reported back currently:
- * * 0 BadSignature
- * * 1 BadTimeStamp
- *
- * Note: Exceptions other then ParsingError will be thrown and not reported.
- */
- class ParsingError extends Error {
- readonly name: string;
- readonly code: number;
- readonly message: string;
- }
-
- namespace WebVTT {
- /**
- * A parser for the WebVTT spec in JavaScript.
- */
- class Parser {
- /**
- * The Parser constructor is passed a window object with which it will create new `VTTCues` and `VTTRegions`
- * as well as an optional `StringDecoder` object which it will use to decode the data that the `parse()` function receives.
- * For ease of use, a `StringDecoder` is provided via `WebVTT.StringDecoder()`.
- * If a custom `StringDecoder` object is passed in it must support the API specified by the #whatwg string encoding spec.
- *
- * @param window the window object to use
- * @param vttjs the vtt.js module
- * @param decoder the decoder to decode `parse()` data with
- */
- constructor(window: Window);
- constructor(window: Window, decoder: TextDecoder);
- constructor(window: Window, vttjs: vttjs, decoder: TextDecoder);
-
- /**
- * Callback that is invoked for every region that is correctly parsed. Is passed a `VTTRegion` object.
- */
- onregion?: (cue: VTTRegion) => void;
-
- /**
- * Callback that is invoked for every cue that is fully parsed. In case of streaming parsing,
- * `oncue` is delayed until the cue has been completely received. Is passed a `VTTCue` object.
- */
- oncue?: (cue: VTTCue) => void;
-
- /**
- * Is invoked in response to `flush()` and after the content was parsed completely.
- */
- onflush?: () => void;
-
- /**
- * Is invoked when a parsing error has occurred. This means that some part of the WebVTT file markup is badly formed.
- * Is passed a `ParsingError` object.
- */
- onparsingerror?: (e: ParsingError) => void;
-
- /**
- * Hands data in some format to the parser for parsing. The passed data format is expected to be decodable by the
- * StringDecoder object that it has. The parser decodes the data and reassembles partial data (streaming), even across line breaks.
- *
- * @param data data to be parsed
- */
- parse(data: string): this;
-
- /**
- * Indicates that no more data is expected and will force the parser to parse any unparsed data that it may have.
- * Will also trigger `onflush`.
- */
- flush(): this;
- }
-
- /**
- * Helper to allow strings to be decoded instead of the default binary utf8 data.
- */
- function StringDecoder(): TextDecoder;
-
- /**
- * Parses the cue text handed to it into a tree of DOM nodes that mirrors the internal WebVTT node structure of the cue text.
- * It uses the window object handed to it to construct new HTMLElements and returns a tree of DOM nodes attached to a top level div.
- *
- * @param window window object to use
- * @param cuetext cue text to parse
- */
- function convertCueToDOMTree(
- window: Window,
- cuetext: string
- ): HTMLDivElement | null;
-
- /**
- * Converts the cuetext of the cues passed to it to DOM trees - by calling convertCueToDOMTree - and then runs the
- * processing model steps of the WebVTT specification on the divs. The processing model applies the necessary CSS styles
- * to the cue divs to prepare them for display on the web page. During this process the cue divs get added to a block level element (overlay).
- * The overlay should be a part of the live DOM as the algorithm will use the computed styles (only of the divs) to do overlap avoidance.
- *
- * @param overlay A block level element (usually a div) that the computed cues and regions will be placed into.
- */
- function processCues(
- window: Window,
- cues: VTTCue[],
- overlay: Element
- ): void;
- }
+ /**
+ * A custom JS error object that is reported through the parser's `onparsingerror` callback.
+ * It has a name, code, and message property, along with all the regular properties that come with a JavaScript error object.
+ *
+ * There are two error codes that can be reported back currently:
+ * * 0 BadSignature
+ * * 1 BadTimeStamp
+ *
+ * Note: Exceptions other then ParsingError will be thrown and not reported.
+ */
+ class ParsingError extends Error {
+ readonly name: string;
+ readonly code: number;
+ readonly message: string;
}
- export = vttjs;
+ export namespace WebVTT {
+ /**
+ * A parser for the WebVTT spec in JavaScript.
+ */
+ class Parser {
+ /**
+ * The Parser constructor is passed a window object with which it will create new `VTTCues` and `VTTRegions`
+ * as well as an optional `StringDecoder` object which it will use to decode the data that the `parse()` function receives.
+ * For ease of use, a `StringDecoder` is provided via `WebVTT.StringDecoder()`.
+ * If a custom `StringDecoder` object is passed in it must support the API specified by the #whatwg string encoding spec.
+ *
+ * @param window the window object to use
+ * @param vttjs the vtt.js module
+ * @param decoder the decoder to decode `parse()` data with
+ */
+ constructor(window: Window);
+ constructor(window: Window, decoder: TextDecoder);
+ constructor(
+ window: Window,
+ vttjs: typeof import("videojs-vtt.js"),
+ decoder: TextDecoder
+ );
+
+ /**
+ * Callback that is invoked for every region that is correctly parsed. Is passed a `VTTRegion` object.
+ */
+ onregion?: (cue: VTTRegion) => void;
+
+ /**
+ * Callback that is invoked for every cue that is fully parsed. In case of streaming parsing,
+ * `oncue` is delayed until the cue has been completely received. Is passed a `VTTCue` object.
+ */
+ oncue?: (cue: VTTCue) => void;
+
+ /**
+ * Is invoked in response to `flush()` and after the content was parsed completely.
+ */
+ onflush?: () => void;
+
+ /**
+ * Is invoked when a parsing error has occurred. This means that some part of the WebVTT file markup is badly formed.
+ * Is passed a `ParsingError` object.
+ */
+ onparsingerror?: (e: ParsingError) => void;
+
+ /**
+ * Hands data in some format to the parser for parsing. The passed data format is expected to be decodable by the
+ * StringDecoder object that it has. The parser decodes the data and reassembles partial data (streaming), even across line breaks.
+ *
+ * @param data data to be parsed
+ */
+ parse(data: string): this;
+
+ /**
+ * Indicates that no more data is expected and will force the parser to parse any unparsed data that it may have.
+ * Will also trigger `onflush`.
+ */
+ flush(): this;
+ }
+
+ /**
+ * Helper to allow strings to be decoded instead of the default binary utf8 data.
+ */
+ function StringDecoder(): TextDecoder;
+
+ /**
+ * Parses the cue text handed to it into a tree of DOM nodes that mirrors the internal WebVTT node structure of the cue text.
+ * It uses the window object handed to it to construct new HTMLElements and returns a tree of DOM nodes attached to a top level div.
+ *
+ * @param window window object to use
+ * @param cuetext cue text to parse
+ */
+ function convertCueToDOMTree(
+ window: Window,
+ cuetext: string
+ ): HTMLDivElement | null;
+
+ /**
+ * Converts the cuetext of the cues passed to it to DOM trees - by calling convertCueToDOMTree - and then runs the
+ * processing model steps of the WebVTT specification on the divs. The processing model applies the necessary CSS styles
+ * to the cue divs to prepare them for display on the web page. During this process the cue divs get added to a block level element (overlay).
+ * The overlay should be a part of the live DOM as the algorithm will use the computed styles (only of the divs) to do overlap avoidance.
+ *
+ * @param overlay A block level element (usually a div) that the computed cues and regions will be placed into.
+ */
+ function processCues(
+ window: Window,
+ cues: VTTCue[],
+ overlay: Element
+ ): void;
+ }
}
diff --git a/ui/v2.5/src/App.tsx b/ui/v2.5/src/App.tsx
index 71a0755e8..4a374065c 100644
--- a/ui/v2.5/src/App.tsx
+++ b/ui/v2.5/src/App.tsx
@@ -1,11 +1,17 @@
-import React, { lazy, Suspense, useEffect, useState } from "react";
-import { Route, Switch, useRouteMatch } from "react-router-dom";
+import React, { Suspense, useEffect, useState } from "react";
+import {
+ Route,
+ Switch,
+ useHistory,
+ useLocation,
+ useRouteMatch,
+} from "react-router-dom";
import { IntlProvider, CustomFormats } from "react-intl";
import { Helmet } from "react-helmet";
import cloneDeep from "lodash-es/cloneDeep";
import mergeWith from "lodash-es/mergeWith";
import { ToastProvider } from "src/hooks/Toast";
-import LightboxProvider from "src/hooks/Lightbox/context";
+import { LightboxProvider } from "src/hooks/Lightbox/context";
import { initPolyfills } from "src/polyfills";
import locales, { registerCountry } from "src/locales";
@@ -14,14 +20,16 @@ import {
useConfigureUI,
useSystemStatus,
} from "src/core/StashService";
-import { flattenMessages } from "src/utils";
+import flattenMessages from "./utils/flattenMessages";
+import * as yup from "yup";
import Mousetrap from "mousetrap";
import MousetrapPause from "mousetrap-pause";
import { ErrorBoundary } from "./components/ErrorBoundary";
import { MainNavbar } from "./components/MainNavbar";
import { PageNotFound } from "./components/PageNotFound";
import * as GQL from "./core/generated-graphql";
-import { LoadingIndicator, TITLE_SUFFIX } from "./components/Shared";
+import { TITLE_SUFFIX } from "./components/Shared/constants";
+import { LoadingIndicator } from "./components/Shared/LoadingIndicator";
import { ConfigurationProvider } from "./hooks/Config";
import { ManualProvider } from "./components/Help/context";
@@ -29,26 +37,33 @@ import { InteractiveProvider } from "./hooks/Interactive/context";
import { ReleaseNotesDialog } from "./components/Dialogs/ReleaseNotesDialog";
import { IUIConfig } from "./core/config";
import { releaseNotes } from "./docs/en/ReleaseNotes";
-import { getPlatformURL, getBaseURL } from "./core/createClient";
+import { getPlatformURL } from "./core/createClient";
+import { lazyComponent } from "./utils/lazyComponent";
-const Performers = lazy(() => import("./components/Performers/Performers"));
-const FrontPage = lazy(() => import("./components/FrontPage/FrontPage"));
-const Scenes = lazy(() => import("./components/Scenes/Scenes"));
-const Settings = lazy(() => import("./components/Settings/Settings"));
-const Stats = lazy(() => import("./components/Stats"));
-const Studios = lazy(() => import("./components/Studios/Studios"));
-const Galleries = lazy(() => import("./components/Galleries/Galleries"));
+const Performers = lazyComponent(
+ () => import("./components/Performers/Performers")
+);
+const FrontPage = lazyComponent(
+ () => import("./components/FrontPage/FrontPage")
+);
+const Scenes = lazyComponent(() => import("./components/Scenes/Scenes"));
+const Settings = lazyComponent(() => import("./components/Settings/Settings"));
+const Stats = lazyComponent(() => import("./components/Stats"));
+const Studios = lazyComponent(() => import("./components/Studios/Studios"));
+const Galleries = lazyComponent(
+ () => import("./components/Galleries/Galleries")
+);
-const Movies = lazy(() => import("./components/Movies/Movies"));
-const Tags = lazy(() => import("./components/Tags/Tags"));
-const Images = lazy(() => import("./components/Images/Images"));
-const Setup = lazy(() => import("./components/Setup/Setup"));
-const Migrate = lazy(() => import("./components/Setup/Migrate"));
+const Movies = lazyComponent(() => import("./components/Movies/Movies"));
+const Tags = lazyComponent(() => import("./components/Tags/Tags"));
+const Images = lazyComponent(() => import("./components/Images/Images"));
+const Setup = lazyComponent(() => import("./components/Setup/Setup"));
+const Migrate = lazyComponent(() => import("./components/Setup/Migrate"));
-const SceneFilenameParser = lazy(
+const SceneFilenameParser = lazyComponent(
() => import("./components/SceneFilenameParser/SceneFilenameParser")
);
-const SceneDuplicateChecker = lazy(
+const SceneDuplicateChecker = lazyComponent(
() => import("./components/SceneDuplicateChecker/SceneDuplicateChecker")
);
@@ -91,10 +106,12 @@ export const App: React.FC = () => {
const defaultMessages = (await locales[defaultMessageLanguage]()).default;
const mergedMessages = cloneDeep(Object.assign({}, defaultMessages));
const chosenMessages = (await locales[messageLanguage]()).default;
- const res = await fetch(getPlatformURL() + "customlocales");
let customMessages = {};
try {
- customMessages = res.ok ? await res.json() : {};
+ const res = await fetch(getPlatformURL() + "customlocales");
+ if (res.ok) {
+ customMessages = await res.json();
+ }
} catch (err) {
console.log(err);
}
@@ -110,12 +127,25 @@ export const App: React.FC = () => {
}
);
- setMessages(flattenMessages(mergedMessages));
+ const newMessages = flattenMessages(mergedMessages) as Record<
+ string,
+ string
+ >;
+
+ yup.setLocale({
+ mixed: {
+ required: newMessages["validation.required"],
+ },
+ });
+
+ setMessages(newMessages);
};
setLocale();
}, [language]);
+ const location = useLocation();
+ const history = useHistory();
const setupMatch = useRouteMatch(["/setup", "/migrate"]);
// redirect to setup or migrate as needed
@@ -124,27 +154,24 @@ export const App: React.FC = () => {
return;
}
- const baseURL = getBaseURL();
+ const { status } = systemStatusData.systemStatus;
if (
- window.location.pathname !== baseURL + "setup" &&
- systemStatusData.systemStatus.status === GQL.SystemStatusEnum.Setup
+ location.pathname !== "/setup" &&
+ status === GQL.SystemStatusEnum.Setup
) {
// redirect to setup page
- const newURL = new URL("setup", window.location.origin + baseURL);
- window.location.href = newURL.toString();
+ history.push("/setup");
}
if (
- window.location.pathname !== baseURL + "migrate" &&
- systemStatusData.systemStatus.status ===
- GQL.SystemStatusEnum.NeedsMigration
+ location.pathname !== "/migrate" &&
+ status === GQL.SystemStatusEnum.NeedsMigration
) {
- // redirect to setup page
- const newURL = new URL("migrate", window.location.origin + baseURL);
- window.location.href = newURL.toString();
+ // redirect to migrate page
+ history.push("/migrate");
}
- }, [systemStatusData]);
+ }, [systemStatusData, setupMatch, history, location]);
function maybeRenderNavbar() {
// don't render navbar for setup views
@@ -190,7 +217,7 @@ export const App: React.FC = () => {
}
function maybeRenderReleaseNotes() {
- if (setupMatch || config.loading || config.error) {
+ if (setupMatch || !systemStatusData || config.loading || config.error) {
return;
}
@@ -204,7 +231,7 @@ export const App: React.FC = () => {
return (
n.content)}
+ notes={notes}
onClose={() => {
saveUI({
variables: {
diff --git a/ui/v2.5/src/components/Changelog/Changelog.tsx b/ui/v2.5/src/components/Changelog/Changelog.tsx
index 22d6ed640..d959019a7 100644
--- a/ui/v2.5/src/components/Changelog/Changelog.tsx
+++ b/ui/v2.5/src/components/Changelog/Changelog.tsx
@@ -1,5 +1,5 @@
import React from "react";
-import { useChangelogStorage } from "src/hooks";
+import { useChangelogStorage } from "src/hooks/LocalForage";
import Version from "./Version";
import V010 from "src/docs/en/Changelog/v010.md";
import V011 from "src/docs/en/Changelog/v011.md";
@@ -23,11 +23,10 @@ import V0160 from "src/docs/en/Changelog/v0160.md";
import V0161 from "src/docs/en/Changelog/v0161.md";
import V0170 from "src/docs/en/Changelog/v0170.md";
import V0180 from "src/docs/en/Changelog/v0180.md";
+import V0190 from "src/docs/en/Changelog/v0190.md";
+import V0200 from "src/docs/en/Changelog/v0200.md";
import { MarkdownPage } from "../Shared/MarkdownPage";
-// to avoid use of explicit any
-type Module = typeof V010;
-
const Changelog: React.FC = () => {
const [{ data, loading }, setOpenState] = useChangelogStorage();
@@ -54,16 +53,16 @@ const Changelog: React.FC = () => {
interface IStashRelease {
version: string;
date?: string;
- page: Module;
+ page: string;
defaultOpen?: boolean;
}
// after new release:
// add entry to releases, using the current* fields
// then update the current fields.
- const currentVersion = stashVersion || "v0.18.0";
+ const currentVersion = stashVersion || "v0.20.0";
const currentDate = buildDate;
- const currentPage = V0180;
+ const currentPage = V0200;
const releases: IStashRelease[] = [
{
@@ -72,6 +71,16 @@ const Changelog: React.FC = () => {
page: currentPage,
defaultOpen: true,
},
+ {
+ version: "v0.19.1",
+ date: "2023-02-21",
+ page: V0190,
+ },
+ {
+ version: "v0.18.0",
+ date: "2022-11-30",
+ page: V0180,
+ },
{
version: "v0.17.2",
date: "2022-10-25",
diff --git a/ui/v2.5/src/components/Changelog/Version.tsx b/ui/v2.5/src/components/Changelog/Version.tsx
index cd5b99442..bc2f75138 100644
--- a/ui/v2.5/src/components/Changelog/Version.tsx
+++ b/ui/v2.5/src/components/Changelog/Version.tsx
@@ -2,7 +2,7 @@ import { faAngleDown, faAngleUp } from "@fortawesome/free-solid-svg-icons";
import React, { useState } from "react";
import { Button, Card, Collapse } from "react-bootstrap";
import { FormattedDate, FormattedMessage } from "react-intl";
-import { Icon } from "src/components/Shared";
+import { Icon } from "src/components/Shared/Icon";
interface IVersionProps {
version: string;
diff --git a/ui/v2.5/src/components/Dialogs/GenerateDialog.tsx b/ui/v2.5/src/components/Dialogs/GenerateDialog.tsx
index f9eb805ce..4a0657efe 100644
--- a/ui/v2.5/src/components/Dialogs/GenerateDialog.tsx
+++ b/ui/v2.5/src/components/Dialogs/GenerateDialog.tsx
@@ -1,13 +1,14 @@
import React, { useState, useEffect, useMemo } from "react";
import { Form, Button } from "react-bootstrap";
import { mutateMetadataGenerate } from "src/core/StashService";
-import { Modal, Icon } from "src/components/Shared";
-import { useToast } from "src/hooks";
+import { ModalComponent } from "../Shared/Modal";
+import { Icon } from "src/components/Shared/Icon";
+import { useToast } from "src/hooks/Toast";
import * as GQL from "src/core/generated-graphql";
import { FormattedMessage, useIntl } from "react-intl";
import { ConfigurationContext } from "src/hooks/Config";
import { Manual } from "../Help/Manual";
-import { withoutTypename } from "src/utils";
+import { withoutTypename } from "src/utils/data";
import { GenerateOptions } from "../Settings/Tasks/GenerateOptions";
import { SettingSection } from "../Settings/SettingSection";
import { faCogs, faQuestionCircle } from "@fortawesome/free-solid-svg-icons";
@@ -169,7 +170,7 @@ export const GenerateDialog: React.FC = ({
}
return (
- = ({
/>
-
+
);
};
diff --git a/ui/v2.5/src/components/Dialogs/IdentifyDialog/FieldOptions.tsx b/ui/v2.5/src/components/Dialogs/IdentifyDialog/FieldOptions.tsx
index f8c146fbb..ba027cd5c 100644
--- a/ui/v2.5/src/components/Dialogs/IdentifyDialog/FieldOptions.tsx
+++ b/ui/v2.5/src/components/Dialogs/IdentifyDialog/FieldOptions.tsx
@@ -1,6 +1,6 @@
import React, { useState, useEffect, useCallback } from "react";
import { Form, Button, Table } from "react-bootstrap";
-import { Icon } from "src/components/Shared";
+import { Icon } from "src/components/Shared/Icon";
import * as GQL from "src/core/generated-graphql";
import { FormattedMessage, useIntl } from "react-intl";
import {
@@ -261,9 +261,8 @@ export const FieldOptionsList: React.FC = ({
allowSetDefault = true,
defaultOptions,
}) => {
- const [localFieldOptions, setLocalFieldOptions] = useState<
- GQL.IdentifyFieldOptions[]
- >();
+ const [localFieldOptions, setLocalFieldOptions] =
+ useState();
const [editField, setEditField] = useState();
useEffect(() => {
diff --git a/ui/v2.5/src/components/Dialogs/IdentifyDialog/IdentifyDialog.tsx b/ui/v2.5/src/components/Dialogs/IdentifyDialog/IdentifyDialog.tsx
index f5964ee97..7c5207f44 100644
--- a/ui/v2.5/src/components/Dialogs/IdentifyDialog/IdentifyDialog.tsx
+++ b/ui/v2.5/src/components/Dialogs/IdentifyDialog/IdentifyDialog.tsx
@@ -6,11 +6,13 @@ import {
useConfigureDefaults,
useListSceneScrapers,
} from "src/core/StashService";
-import { Icon, Modal, OperationButton } from "src/components/Shared";
-import { useToast } from "src/hooks";
+import { Icon } from "src/components/Shared/Icon";
+import { ModalComponent } from "src/components/Shared/Modal";
+import { OperationButton } from "src/components/Shared/OperationButton";
+import { useToast } from "src/hooks/Toast";
import * as GQL from "src/core/generated-graphql";
import { FormattedMessage, useIntl } from "react-intl";
-import { withoutTypename } from "src/utils";
+import { withoutTypename } from "src/utils/data";
import {
SCRAPER_PREFIX,
STASH_BOX_PREFIX,
@@ -202,9 +204,8 @@ export const IdentifyDialog: React.FC = ({
if (s.options) {
const sourceOptions = withoutTypename(s.options);
- sourceOptions.fieldOptions = sourceOptions.fieldOptions?.map(
- withoutTypename
- );
+ sourceOptions.fieldOptions =
+ sourceOptions.fieldOptions?.map(withoutTypename);
ret.options = sourceOptions;
}
@@ -215,9 +216,8 @@ export const IdentifyDialog: React.FC = ({
setSources(mappedSources);
if (identifyDefaults.options) {
const defaultOptions = withoutTypename(identifyDefaults.options);
- defaultOptions.fieldOptions = defaultOptions.fieldOptions?.map(
- withoutTypename
- );
+ defaultOptions.fieldOptions =
+ defaultOptions.fieldOptions?.map(withoutTypename);
setOptions(defaultOptions);
}
} else {
@@ -405,7 +405,7 @@ export const IdentifyDialog: React.FC = ({
}
return (
- = ({
setEditingField={(v) => setEditingField(v)}
/>
-
+
);
};
diff --git a/ui/v2.5/src/components/Dialogs/IdentifyDialog/Sources.tsx b/ui/v2.5/src/components/Dialogs/IdentifyDialog/Sources.tsx
index 9cc0c6a51..b18e661bc 100644
--- a/ui/v2.5/src/components/Dialogs/IdentifyDialog/Sources.tsx
+++ b/ui/v2.5/src/components/Dialogs/IdentifyDialog/Sources.tsx
@@ -1,6 +1,7 @@
import React, { useState, useEffect } from "react";
import { Form, Button, ListGroup } from "react-bootstrap";
-import { Modal, Icon } from "src/components/Shared";
+import { ModalComponent } from "src/components/Shared/Modal";
+import { Icon } from "src/components/Shared/Icon";
import { FormattedMessage, useIntl } from "react-intl";
import * as GQL from "src/core/generated-graphql";
import { IScraperSource } from "./constants";
@@ -53,7 +54,7 @@ export const SourcesEditor: React.FC = ({
}
return (
- = ({
defaultOptions={defaultOptions}
/>
-
+
);
};
diff --git a/ui/v2.5/src/components/Dialogs/IdentifyDialog/constants.ts b/ui/v2.5/src/components/Dialogs/IdentifyDialog/constants.ts
index 46ed88854..13889d037 100644
--- a/ui/v2.5/src/components/Dialogs/IdentifyDialog/constants.ts
+++ b/ui/v2.5/src/components/Dialogs/IdentifyDialog/constants.ts
@@ -20,7 +20,7 @@ export const sceneFields = [
"tags",
"stash_ids",
] as const;
-export type SceneField = typeof sceneFields[number];
+export type SceneField = (typeof sceneFields)[number];
export const multiValueSceneFields: SceneField[] = [
"studio",
diff --git a/ui/v2.5/src/components/Dialogs/IdentifyDialog/styles.scss b/ui/v2.5/src/components/Dialogs/IdentifyDialog/styles.scss
index 450b31e86..dcaeb054c 100644
--- a/ui/v2.5/src/components/Dialogs/IdentifyDialog/styles.scss
+++ b/ui/v2.5/src/components/Dialogs/IdentifyDialog/styles.scss
@@ -32,7 +32,3 @@
margin-right: 0.25em;
}
}
-
-.field-options-table td:first-child {
- padding-left: 0.75rem;
-}
diff --git a/ui/v2.5/src/components/Dialogs/ReleaseNotesDialog.tsx b/ui/v2.5/src/components/Dialogs/ReleaseNotesDialog.tsx
index fefc344be..4cfc35fdc 100644
--- a/ui/v2.5/src/components/Dialogs/ReleaseNotesDialog.tsx
+++ b/ui/v2.5/src/components/Dialogs/ReleaseNotesDialog.tsx
@@ -1,13 +1,12 @@
import React from "react";
-import { Form } from "react-bootstrap";
-import { Modal } from "src/components/Shared";
+import { ModalComponent } from "../Shared/Modal";
import { faCogs } from "@fortawesome/free-solid-svg-icons";
import { useIntl } from "react-intl";
import { MarkdownPage } from "../Shared/MarkdownPage";
-import { Module } from "src/docs/en/ReleaseNotes";
+import { IReleaseNotes } from "src/docs/en/ReleaseNotes";
interface IReleaseNotesDialog {
- notes: Module[];
+ notes: IReleaseNotes[];
onClose: () => void;
}
@@ -18,7 +17,7 @@ export const ReleaseNotesDialog: React.FC = ({
const intl = useIntl();
return (
- = ({
text: intl.formatMessage({ id: "actions.close" }),
}}
>
-
-
+ = ({
undefined;
return (
- = ({
{boxes.map((box, i) => (
+
);
};
diff --git a/ui/v2.5/src/components/ErrorBoundary.tsx b/ui/v2.5/src/components/ErrorBoundary.tsx
index 302abb2cc..a6e466efb 100644
--- a/ui/v2.5/src/components/ErrorBoundary.tsx
+++ b/ui/v2.5/src/components/ErrorBoundary.tsx
@@ -1,4 +1,6 @@
import React from "react";
+import { FormattedMessage } from "react-intl";
+import { isLazyComponentError } from "src/utils/lazyComponent";
interface IErrorBoundaryProps {
children?: React.ReactNode;
@@ -10,6 +12,7 @@ type ErrorInfo = {
interface IErrorBoundaryState {
error?: Error;
+ errorHelpId?: string;
errorInfo?: ErrorInfo;
}
@@ -23,22 +26,35 @@ export class ErrorBoundary extends React.Component<
}
public componentDidCatch(error: Error, errorInfo: ErrorInfo) {
+ let errorHelpId: string | undefined;
+ if (isLazyComponentError(error)) {
+ errorHelpId = "errors.lazy_component_error_help";
+ }
this.setState({
error,
+ errorHelpId,
errorInfo,
});
}
public render() {
- if (this.state.errorInfo) {
+ const { error, errorHelpId, errorInfo } = this.state;
+ if (errorInfo) {
// Error path
return (
= (props: IFilterRowProps) => {
case "SavedFilter":
const savedFilter = props.allSavedFilters.find(
(f) =>
- f.id === (props.content as ISavedFilterRow).savedFilterId.toString()
+ f.id ===
+ (props.content as ISavedFilterRow).savedFilterId?.toString()
);
if (!savedFilter) return "";
return filterTitle(intl, savedFilter);
@@ -337,7 +338,10 @@ export const FrontPageConfig: React.FC = ({
}
const existingSavedFilterIDs = currentContent
- .filter((f) => f.__typename === "SavedFilter")
+ .filter(
+ (f) =>
+ f.__typename === "SavedFilter" && (f as ISavedFilterRow).savedFilterId
+ )
.map((f) => (f as ISavedFilterRow).savedFilterId.toString());
function addSavedFilter(content?: FrontPageContent) {
diff --git a/ui/v2.5/src/components/FrontPage/styles.scss b/ui/v2.5/src/components/FrontPage/styles.scss
index 34b58cc8a..a1661d032 100644
--- a/ui/v2.5/src/components/FrontPage/styles.scss
+++ b/ui/v2.5/src/components/FrontPage/styles.scss
@@ -69,11 +69,7 @@
white-space: normal;
}
-.recommendations-container .studio-card hr,
-.recommendations-container .movie-card hr,
-.recommendations-container .gallery-card hr,
-.recommendations-container .image-card hr,
-.recommendations-container .tag-card hr {
+.card hr {
margin-top: auto;
}
diff --git a/ui/v2.5/src/components/Galleries/DeleteGalleriesDialog.tsx b/ui/v2.5/src/components/Galleries/DeleteGalleriesDialog.tsx
index 4e128dd28..fe9de2d97 100644
--- a/ui/v2.5/src/components/Galleries/DeleteGalleriesDialog.tsx
+++ b/ui/v2.5/src/components/Galleries/DeleteGalleriesDialog.tsx
@@ -2,8 +2,8 @@ import React, { useState } from "react";
import { Form } from "react-bootstrap";
import { useGalleryDestroy } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
-import { Modal } from "src/components/Shared";
-import { useToast } from "src/hooks";
+import { ModalComponent } from "../Shared/Modal";
+import { useToast } from "src/hooks/Toast";
import { ConfigurationContext } from "src/hooks/Config";
import { FormattedMessage, useIntl } from "react-intl";
import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
@@ -119,7 +119,7 @@ export const DeleteGalleriesDialog: React.FC = (
}
return (
- = (
onChange={() => setDeleteGenerated(!deleteGenerated)}
/>
-
+
);
};
diff --git a/ui/v2.5/src/components/Galleries/EditGalleriesDialog.tsx b/ui/v2.5/src/components/Galleries/EditGalleriesDialog.tsx
index 24e153acd..68fb1f310 100644
--- a/ui/v2.5/src/components/Galleries/EditGalleriesDialog.tsx
+++ b/ui/v2.5/src/components/Galleries/EditGalleriesDialog.tsx
@@ -4,10 +4,11 @@ import { FormattedMessage, useIntl } from "react-intl";
import isEqual from "lodash-es/isEqual";
import { useBulkGalleryUpdate } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
-import { StudioSelect, Modal } from "src/components/Shared";
-import { useToast } from "src/hooks";
-import { FormUtils } from "src/utils";
-import MultiSet from "../Shared/MultiSet";
+import { StudioSelect } from "../Shared/Select";
+import { ModalComponent } from "../Shared/Modal";
+import { useToast } from "src/hooks/Toast";
+import FormUtils from "src/utils/form";
+import { MultiSet } from "../Shared/MultiSet";
import { RatingSystem } from "../Shared/Rating/RatingSystem";
import {
getAggregateInputIDs,
@@ -31,10 +32,8 @@ export const EditGalleriesDialog: React.FC = (
const Toast = useToast();
const [rating100, setRating] = useState();
const [studioId, setStudioId] = useState();
- const [
- performerMode,
- setPerformerMode,
- ] = React.useState(GQL.BulkUpdateIdMode.Add);
+ const [performerMode, setPerformerMode] =
+ React.useState(GQL.BulkUpdateIdMode.Add);
const [performerIds, setPerformerIds] = useState();
const [existingPerformerIds, setExistingPerformerIds] = useState();
const [tagMode, setTagMode] = React.useState(
@@ -228,7 +227,7 @@ export const EditGalleriesDialog: React.FC = (
function render() {
return (
- = (
/>
-
+
);
}
diff --git a/ui/v2.5/src/components/Galleries/Galleries.tsx b/ui/v2.5/src/components/Galleries/Galleries.tsx
index 7dd4d3b97..c2c6e9236 100644
--- a/ui/v2.5/src/components/Galleries/Galleries.tsx
+++ b/ui/v2.5/src/components/Galleries/Galleries.tsx
@@ -2,13 +2,13 @@ import React from "react";
import { Route, Switch } from "react-router-dom";
import { useIntl } from "react-intl";
import { Helmet } from "react-helmet";
-import { TITLE_SUFFIX } from "src/components/Shared";
-import { PersistanceLevel } from "src/hooks/ListHook";
+import { TITLE_SUFFIX } from "../Shared/constants";
+import { PersistanceLevel } from "../List/ItemList";
import Gallery from "./GalleryDetails/Gallery";
import GalleryCreate from "./GalleryDetails/GalleryCreate";
import { GalleryList } from "./GalleryList";
-const Galleries = () => {
+const Galleries: React.FC = () => {
const intl = useIntl();
const title_template = `${intl.formatMessage({
diff --git a/ui/v2.5/src/components/Galleries/GalleryCard.tsx b/ui/v2.5/src/components/Galleries/GalleryCard.tsx
index 76673d74e..88fe37f2a 100644
--- a/ui/v2.5/src/components/Galleries/GalleryCard.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryCard.tsx
@@ -2,17 +2,15 @@ import { Button, ButtonGroup } from "react-bootstrap";
import React from "react";
import { Link } from "react-router-dom";
import * as GQL from "src/core/generated-graphql";
-import {
- GridCard,
- HoverPopover,
- Icon,
- TagLink,
- TruncatedText,
-} from "src/components/Shared";
-import { PopoverCountButton } from "src/components/Shared/PopoverCountButton";
-import { NavUtils } from "src/utils";
-import { ConfigurationContext } from "src/hooks/Config";
+import { GridCard } from "../Shared/GridCard";
+import { HoverPopover } from "../Shared/HoverPopover";
+import { Icon } from "../Shared/Icon";
+import { TagLink } from "../Shared/TagLink";
+import { TruncatedText } from "../Shared/TruncatedText";
import { PerformerPopoverButton } from "../Shared/PerformerPopoverButton";
+import { PopoverCountButton } from "../Shared/PopoverCountButton";
+import NavUtils from "src/utils/navigation";
+import { ConfigurationContext } from "src/hooks/Config";
import { RatingBanner } from "../Shared/RatingBanner";
import { faBox, faPlayCircle, faTag } from "@fortawesome/free-solid-svg-icons";
import { galleryTitle } from "src/core/galleries";
@@ -167,13 +165,11 @@ export const GalleryCard: React.FC = (props) => {
details={
= ({
+ galleryChapters,
+ onClickChapter,
+ onEdit,
+}) => {
+ if (!galleryChapters?.length) return ;
+
+ const chapterCards = galleryChapters.map((chapter) => {
+ return (
+ = ({ gallery }) => {
const history = useHistory();
const Toast = useToast();
const intl = useIntl();
+ const showLightbox = useGalleryLightbox(gallery.id, gallery.chapters);
+
+ const [collapsed, setCollapsed] = useState(false);
const [activeTabKey, setActiveTabKey] = useState("gallery-details-panel");
const activeRightTabKey = tab === "images" || tab === "add" ? tab : "images";
@@ -75,6 +78,10 @@ export const GalleryPage: React.FC = ({ gallery }) => {
}
};
+ function getCollapseButtonText() {
+ return collapsed ? ">" : "<";
+ }
+
async function onRescan() {
if (!gallery || !path) {
return;
@@ -95,6 +102,10 @@ export const GalleryPage: React.FC = ({ gallery }) => {
});
}
+ async function onClickChapter(imageindex: number) {
+ showLightbox(imageindex - 1);
+ }
+
const [isDeleteAlertOpen, setIsDeleteAlertOpen] = useState(false);
function onDeleteDialogClosed(deleted: boolean) {
@@ -185,6 +196,11 @@ export const GalleryPage: React.FC = ({ gallery }) => {
) : undefined}
+
+
+
+
= ({ gallery }) => {
>
+
setIsDeleteAlertOpen(true)}
/>
@@ -257,10 +279,16 @@ export const GalleryPage: React.FC = ({ gallery }) => {
-
-
@@ -270,13 +298,17 @@ export const GalleryPage: React.FC = ({ gallery }) => {
// set up hotkeys
useEffect(() => {
Mousetrap.bind("a", () => setActiveTabKey("gallery-details-panel"));
+ Mousetrap.bind("c", () => setActiveTabKey("gallery-chapter-panel"));
Mousetrap.bind("e", () => setActiveTabKey("gallery-edit-panel"));
Mousetrap.bind("f", () => setActiveTabKey("gallery-file-info-panel"));
+ Mousetrap.bind(",", () => setCollapsed(!collapsed));
return () => {
Mousetrap.unbind("a");
+ Mousetrap.unbind("c");
Mousetrap.unbind("e");
Mousetrap.unbind("f");
+ Mousetrap.unbind(",");
};
});
@@ -288,7 +320,7 @@ export const GalleryPage: React.FC = ({ gallery }) => {
{title}
{maybeRenderDeleteDialog()}
- = ({ gallery }) => {
+export const GalleryAddPanel: React.FC = ({
+ active,
+ gallery,
+}) => {
const Toast = useToast();
const intl = useIntl();
@@ -93,6 +97,10 @@ export const GalleryAddPanel: React.FC = ({ gallery }) => {
];
return (
- = ({
+ galleryID,
+ editingChapter,
+ onClose,
+}) => {
+ const intl = useIntl();
+
+ const [galleryChapterCreate] = useGalleryChapterCreate();
+ const [galleryChapterUpdate] = useGalleryChapterUpdate();
+ const [galleryChapterDestroy] = useGalleryChapterDestroy();
+ const Toast = useToast();
+
+ const schema = yup.object({
+ title: yup.string().ensure(),
+ imageIndex: yup
+ .number()
+ .required()
+ .label(intl.formatMessage({ id: "image_index" }))
+ .moreThan(0),
+ });
+
+ const onSubmit = (values: IFormFields) => {
+ const variables:
+ | GQL.GalleryChapterUpdateInput
+ | GQL.GalleryChapterCreateInput = {
+ title: values.title,
+ image_index: values.imageIndex,
+ gallery_id: galleryID,
+ };
+
+ if (!editingChapter) {
+ galleryChapterCreate({ variables })
+ .then(onClose)
+ .catch((err) => Toast.error(err));
+ } else {
+ const updateVariables = variables as GQL.GalleryChapterUpdateInput;
+ updateVariables.id = editingChapter!.id;
+ galleryChapterUpdate({ variables: updateVariables })
+ .then(onClose)
+ .catch((err) => Toast.error(err));
+ }
+ };
+
+ const onDelete = () => {
+ if (!editingChapter) return;
+
+ galleryChapterDestroy({ variables: { id: editingChapter.id } })
+ .then(onClose)
+ .catch((err) => Toast.error(err));
+ };
+
+ const values: IFormFields = {
+ title: editingChapter?.title ?? "",
+ imageIndex: editingChapter?.image_index ?? 1,
+ };
+
+ return (
+
+ {(formik) => (
+
+
+ )}
+
+ );
+};
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryChaptersPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryChaptersPanel.tsx
new file mode 100644
index 000000000..ae5021c39
--- /dev/null
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryChaptersPanel.tsx
@@ -0,0 +1,72 @@
+import React, { useState, useEffect } from "react";
+import { Button } from "react-bootstrap";
+import { FormattedMessage } from "react-intl";
+import Mousetrap from "mousetrap";
+import * as GQL from "src/core/generated-graphql";
+import { ChapterEntries } from "./ChapterEntry";
+import { GalleryChapterForm } from "./GalleryChapterForm";
+
+interface IGalleryChapterPanelProps {
+ gallery: GQL.GalleryDataFragment;
+ isVisible: boolean;
+ onClickChapter: (index: number) => void;
+}
+
+export const GalleryChapterPanel: React.FC = (
+ props: IGalleryChapterPanelProps
+) => {
+ const [isEditorOpen, setIsEditorOpen] = useState(false);
+ const [editingChapter, setEditingChapter] =
+ useState();
+
+ // set up hotkeys
+ useEffect(() => {
+ if (props.isVisible) {
+ Mousetrap.bind("n", () => onOpenEditor());
+
+ return () => {
+ Mousetrap.unbind("n");
+ };
+ }
+ });
+
+ function onOpenEditor(chapter?: GQL.GalleryChapterDataFragment) {
+ setIsEditorOpen(true);
+ setEditingChapter(chapter ?? undefined);
+ }
+
+ function onClickChapter(image_index: number) {
+ props.onClickChapter(image_index);
+ }
+
+ const closeEditor = () => {
+ setEditingChapter(undefined);
+ setIsEditorOpen(false);
+ };
+
+ if (isEditorOpen)
+ return (
+
);
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryDetailPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryDetailPanel.tsx
index c2cfece58..463ced506 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryDetailPanel.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryDetailPanel.tsx
@@ -2,8 +2,9 @@ import React from "react";
import { Link } from "react-router-dom";
import { FormattedDate, FormattedMessage, useIntl } from "react-intl";
import * as GQL from "src/core/generated-graphql";
-import { TextUtils } from "src/utils";
-import { TagLink, TruncatedText } from "src/components/Shared";
+import TextUtils from "src/utils/text";
+import { TagLink } from "src/components/Shared/TagLink";
+import { TruncatedText } from "src/components/Shared/TruncatedText";
import { PerformerCard } from "src/components/Performers/PerformerCard";
import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
import { sortPerformers } from "src/core/performers";
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx
index ed85d9309..d560127dc 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryEditPanel.tsx
@@ -25,36 +25,33 @@ import {
TagSelect,
SceneSelect,
StudioSelect,
- Icon,
- LoadingIndicator,
- URLField,
-} from "src/components/Shared";
-import { useToast } from "src/hooks";
+} from "src/components/Shared/Select";
+import { Icon } from "src/components/Shared/Icon";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
+import { URLField } from "src/components/Shared/URLField";
+import { useToast } from "src/hooks/Toast";
import { useFormik } from "formik";
-import { FormUtils } from "src/utils";
+import FormUtils from "src/utils/form";
import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
import { GalleryScrapeDialog } from "./GalleryScrapeDialog";
import { faSyncAlt } from "@fortawesome/free-solid-svg-icons";
import { galleryTitle } from "src/core/galleries";
+import { useRatingKeybinds } from "src/hooks/keybinds";
+import { ConfigurationContext } from "src/hooks/Config";
+import isEqual from "lodash-es/isEqual";
+import { DateInput } from "src/components/Shared/DateInput";
interface IProps {
+ gallery: Partial
+ {notes
+ .map((n, i) => (
+
+ {curr} + + ))} +
+
);
};
diff --git a/ui/v2.5/src/components/Dialogs/SubmitDraft.tsx b/ui/v2.5/src/components/Dialogs/SubmitDraft.tsx
index dca73532f..7c0364f8d 100644
--- a/ui/v2.5/src/components/Dialogs/SubmitDraft.tsx
+++ b/ui/v2.5/src/components/Dialogs/SubmitDraft.tsx
@@ -2,8 +2,8 @@ import React, { useState } from "react";
import { useMutation, DocumentNode } from "@apollo/client";
import { Button, Form } from "react-bootstrap";
import * as GQL from "src/core/generated-graphql";
-import { Modal } from "src/components/Shared";
-import { getStashboxBase } from "src/utils";
+import { ModalComponent } from "src/components/Shared/Modal";
+import { getStashboxBase } from "src/utils/stashbox";
import { FormattedMessage, useIntl } from "react-intl";
import { faPaperPlane } from "@fortawesome/free-solid-svg-icons";
@@ -78,7 +78,7 @@ export const SubmitStashBoxDraft: React.FC
+
+ ))
+ .reduce((accu, curr) => (
+ <>
+ {accu}
+ {n.version}
++ {curr} + + ))} +
-
+
+ {errorHelpId && (
+
+
+ )}
);
diff --git a/ui/v2.5/src/components/FrontPage/FrontPage.tsx b/ui/v2.5/src/components/FrontPage/FrontPage.tsx
index d68e2ca00..856afb48b 100644
--- a/ui/v2.5/src/components/FrontPage/FrontPage.tsx
+++ b/ui/v2.5/src/components/FrontPage/FrontPage.tsx
@@ -1,10 +1,10 @@
import React, { useState } from "react";
import { FormattedMessage, useIntl } from "react-intl";
import { useConfigureUI } from "src/core/StashService";
-import { LoadingIndicator } from "src/components/Shared";
+import { LoadingIndicator } from "../Shared/LoadingIndicator";
import { Button } from "react-bootstrap";
import { FrontPageConfig } from "./FrontPageConfig";
-import { useToast } from "src/hooks";
+import { useToast } from "src/hooks/Toast";
import { Control } from "./Control";
import { ConfigurationContext } from "src/hooks/Config";
import {
diff --git a/ui/v2.5/src/components/FrontPage/FrontPageConfig.tsx b/ui/v2.5/src/components/FrontPage/FrontPageConfig.tsx
index 4bbf6a7c0..04464b655 100644
--- a/ui/v2.5/src/components/FrontPage/FrontPageConfig.tsx
+++ b/ui/v2.5/src/components/FrontPage/FrontPageConfig.tsx
@@ -1,7 +1,7 @@
import React, { useEffect, useMemo, useState } from "react";
import { FormattedMessage, IntlShape, useIntl } from "react-intl";
import { useFindSavedFilters } from "src/core/StashService";
-import { LoadingIndicator } from "src/components/Shared";
+import { LoadingIndicator } from "../Shared/LoadingIndicator";
import { Button, Form, Modal } from "react-bootstrap";
import {
FilterMode,
@@ -243,7 +243,8 @@ const ContentRow: React.FCSomething went wrong.
+
+
+ {errorHelpId && (
+
+
+ )}
- {this.state.error && this.state.error.toString()}
+ {error?.toString()}
- {this.state.errorInfo.componentStack} + {errorInfo.componentStack.trim().replaceAll(/^\s*/gm, " ")}
- {this.state.errorInfo.componentStack} + {errorInfo.componentStack.trim().replaceAll(/^\s*/gm, " ")}
{props.gallery.date}
-
}
popovers={maybeRenderPopoverButtonGroup()}
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/ChapterEntry.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/ChapterEntry.tsx
new file mode 100644
index 000000000..632244a5b
--- /dev/null
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/ChapterEntry.tsx
@@ -0,0 +1,47 @@
+import React from "react";
+import { FormattedMessage } from "react-intl";
+import * as GQL from "src/core/generated-graphql";
+import { Button } from "react-bootstrap";
+
+interface IChapterEntries {
+ galleryChapters: GQL.GalleryChapterDataFragment[];
+ onClickChapter: (image_index: number) => void;
+ onEdit: (chapter: GQL.GalleryChapterDataFragment) => void;
+}
+
+export const ChapterEntries: React.FC
-
+
+
+ );
+ });
+
+ return +
+
+
+
+ {chapterCards}
;
+};
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
index 422e45d4e..1adedc799 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
@@ -1,4 +1,4 @@
-import { Tab, Nav, Dropdown } from "react-bootstrap";
+import { Button, Tab, Nav, Dropdown } from "react-bootstrap";
import React, { useEffect, useMemo, useState } from "react";
import { useParams, useHistory, Link } from "react-router-dom";
import { FormattedMessage, useIntl } from "react-intl";
@@ -9,14 +9,13 @@ import {
useFindGallery,
useGalleryUpdate,
} from "src/core/StashService";
-import {
- ErrorMessage,
- LoadingIndicator,
- Icon,
- Counter,
-} from "src/components/Shared";
+import { ErrorMessage } from "src/components/Shared/ErrorMessage";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
+import { Icon } from "src/components/Shared/Icon";
+import { Counter } from "src/components/Shared/Counter";
import Mousetrap from "mousetrap";
-import { useToast } from "src/hooks";
+import { useGalleryLightbox } from "src/hooks/Lightbox/hooks";
+import { useToast } from "src/hooks/Toast";
import { OrganizedButton } from "src/components/Scenes/SceneDetails/OrganizedButton";
import { GalleryEditPanel } from "./GalleryEditPanel";
import { GalleryDetailPanel } from "./GalleryDetailPanel";
@@ -27,6 +26,7 @@ import { GalleryFileInfoPanel } from "./GalleryFileInfoPanel";
import { GalleryScenesPanel } from "./GalleryScenesPanel";
import { faEllipsisV } from "@fortawesome/free-solid-svg-icons";
import { galleryPath, galleryTitle } from "src/core/galleries";
+import { GalleryChapterPanel } from "./GalleryChaptersPanel";
interface IProps {
gallery: GQL.GalleryDataFragment;
@@ -41,6 +41,9 @@ export const GalleryPage: React.FC
+
-
);
};
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx
index 04a9db305..b423b1104 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryAddPanel.tsx
@@ -3,18 +3,22 @@ import * as GQL from "src/core/generated-graphql";
import { GalleriesCriterion } from "src/models/list-filter/criteria/galleries";
import { ListFilterModel } from "src/models/list-filter/filter";
import { ImageList } from "src/components/Images/ImageList";
-import { showWhenSelected } from "src/hooks/ListHook";
+import { showWhenSelected } from "src/components/List/ItemList";
import { mutateAddGalleryImages } from "src/core/StashService";
-import { useToast } from "src/hooks";
+import { useToast } from "src/hooks/Toast";
import { useIntl } from "react-intl";
import { faPlus } from "@fortawesome/free-solid-svg-icons";
import { galleryTitle } from "src/core/galleries";
interface IGalleryAddProps {
+ active: boolean;
gallery: GQL.GalleryDataFragment;
}
-export const GalleryAddPanel: React.FC
{gallery.studio && (
@@ -305,7 +337,14 @@ export const GalleryPage: React.FC
{renderTabs()}
@@ -305,7 +337,14 @@ export const GalleryPage: React.FC = ({ gallery }) => {
{renderRightTabs()}
+
+
+
+
+ {renderRightTabs()}
+
+
+
+
+
+
+ {formik.getFieldMeta("title").error}
+
+
+
+
+
+
+
+
+ {formik.getFieldMeta("imageIndex").error}
+
+
+
+
+
+
+
+
+ {editingChapter && (
+
+ )}
+
+
+
+
+ );
+};
+
+export default GalleryChapterPanel;
diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryCreate.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryCreate.tsx
index 09ad8d17f..62e80e23e 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryCreate.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/GalleryCreate.tsx
@@ -1,18 +1,15 @@
-import React from "react";
+import React, { useMemo } from "react";
import { FormattedMessage, useIntl } from "react-intl";
import { useLocation } from "react-router-dom";
import { GalleryEditPanel } from "./GalleryEditPanel";
const GalleryCreate: React.FC = () => {
const intl = useIntl();
-
- function useQuery() {
- const { search } = useLocation();
- return React.useMemo(() => new URLSearchParams(search), [search]);
- }
-
- const query = useQuery();
- const nameQuery = query.get("name");
+ const location = useLocation();
+ const query = useMemo(() => new URLSearchParams(location.search), [location]);
+ const gallery = {
+ title: query.get("q") ?? undefined,
+ };
return (
+
+
@@ -23,12 +20,7 @@ const GalleryCreate: React.FC = () => {
values={{ entityType: intl.formatMessage({ id: "gallery" }) }}
/>
- {}}
- />
+ {}} />
+ {result.data.findGalleries.galleries.map((gallery) => (
+ 0}
+ selected={selectedIds.has(gallery.id)}
+ onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
+ onSelectChange(gallery.id, selected, shiftKey)
+ }
+ />
+ ))}
+
+ );
+ }
+ if (filter.displayMode === DisplayMode.List) {
+ return (
+ | {intl.formatMessage({ id: "actions.preview" })} | ++ {intl.formatMessage({ id: "title" })} + | +
|---|---|
|
+
+ {gallery.cover ? (
+ |
+ + + {galleryTitle(gallery)} ({gallery.image_count}{" "} + {gallery.image_count === 1 ? "image" : "images"}) + + | +
+
+ );
+ }
}
- }
- function renderEditGalleriesDialog(
- selectedImages: SlimGalleryDataFragment[],
- onClose: (applied: boolean) => void
- ) {
return (
<>
-
+ {result.data.findGalleries.galleries.map((gallery) => (
+
+
- {result.data.findGalleries.galleries.map((gallery) => (
- 0}
- selected={selectedIds.has(gallery.id)}
- onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
- listData.onSelectChange(gallery.id, selected, shiftKey)
- }
- />
- ))}
-
- );
- }
- if (filter.displayMode === DisplayMode.List) {
- return (
- | {intl.formatMessage({ id: "actions.preview" })} | -- {intl.formatMessage({ id: "title" })} - | -
|---|---|
|
-
- {gallery.cover ? (
- |
- - - {galleryTitle(gallery)} ({gallery.image_count}{" "} - {gallery.image_count === 1 ? "image" : "images"}) - - | -
-
- );
- }
- }
-
- function renderContent(
- result: FindGalleriesQueryResult,
- filter: ListFilterModel,
- selectedIds: Set
- {result.data.findGalleries.galleries.map((gallery) => (
-
- showLightbox(index)}
- onKeyPress={() => showLightbox(index)}
- >
- 
-
- ));
+ let photos: {
+ src: string;
+ srcSet?: string | string[] | undefined;
+ sizes?: string | string[] | undefined;
+ width: number;
+ height: number;
+ alt?: string | undefined;
+ key?: string | undefined;
+ }[] = [];
+
+ images.forEach((image, index) => {
+ let imageData = {
+ src: image.paths.thumbnail!,
+ width: image.files[0].width,
+ height: image.files[0].height,
+ tabIndex: index,
+ key: image.id ?? index,
+ loading: "lazy",
+ className: "gallery-image",
+ alt: image.title ?? index.toString(),
+ };
+ photos.push(imageData);
+ });
return (
-
);
};
diff --git a/ui/v2.5/src/components/Galleries/GalleryWallCard.tsx b/ui/v2.5/src/components/Galleries/GalleryWallCard.tsx
index a357b6722..d103938ce 100644
--- a/ui/v2.5/src/components/Galleries/GalleryWallCard.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryWallCard.tsx
@@ -2,9 +2,9 @@ import React from "react";
import { useIntl } from "react-intl";
import { Link } from "react-router-dom";
import * as GQL from "src/core/generated-graphql";
-import { TruncatedText } from "src/components/Shared";
-import { TextUtils } from "src/utils";
-import { useGalleryLightbox } from "src/hooks";
+import { TruncatedText } from "src/components/Shared/TruncatedText";
+import TextUtils from "src/utils/text";
+import { useGalleryLightbox } from "src/hooks/Lightbox/hooks";
import { galleryTitle } from "src/core/galleries";
import { RatingSystem } from "../Shared/Rating/RatingSystem";
@@ -19,7 +19,7 @@ interface IProps {
const GalleryWallCard: React.FC{thumbs}
+
+
+ ) : undefined}
{props.image.rating100 ? (
= (props) => {
) : (
""
)}
+
{renderGalleries()}
{file?.width && file?.height ? (
diff --git a/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx b/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx
index b16da38b5..96ace1609 100644
--- a/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx
+++ b/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx
@@ -9,13 +9,18 @@ import {
PerformerSelect,
TagSelect,
StudioSelect,
- LoadingIndicator,
-} from "src/components/Shared";
-import { useToast } from "src/hooks";
-import { FormUtils } from "src/utils";
+} from "src/components/Shared/Select";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
+import { URLField } from "src/components/Shared/URLField";
+import { useToast } from "src/hooks/Toast";
+import FormUtils from "src/utils/form";
import { useFormik } from "formik";
import { Prompt } from "react-router-dom";
import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
+import { useRatingKeybinds } from "src/hooks/keybinds";
+import { ConfigurationContext } from "src/hooks/Config";
+import isEqual from "lodash-es/isEqual";
+import { DateInput } from "src/components/Shared/DateInput";
interface IProps {
image: GQL.ImageDataFragment;
@@ -34,36 +39,61 @@ export const ImageEditPanel: React.FC = ({
// Network state
const [isLoading, setIsLoading] = useState(false);
+ const { configuration } = React.useContext(ConfigurationContext);
+
const [updateImage] = useImageUpdate();
const schema = yup.object({
- title: yup.string().optional().nullable(),
- rating100: yup.number().optional().nullable(),
- studio_id: yup.string().optional().nullable(),
- performer_ids: yup.array(yup.string().required()).optional().nullable(),
- tag_ids: yup.array(yup.string().required()).optional().nullable(),
+ title: yup.string().ensure(),
+ url: yup.string().ensure(),
+ date: yup
+ .string()
+ .ensure()
+ .test({
+ name: "date",
+ test: (value) => {
+ if (!value) return true;
+ if (!value.match(/^\d{4}-\d{2}-\d{2}$/)) return false;
+ if (Number.isNaN(Date.parse(value))) return false;
+ return true;
+ },
+ message: intl.formatMessage({ id: "validation.date_invalid_form" }),
+ }),
+ rating100: yup.number().nullable().defined(),
+ studio_id: yup.string().required().nullable(),
+ performer_ids: yup.array(yup.string().required()).defined(),
+ tag_ids: yup.array(yup.string().required()).defined(),
});
const initialValues = {
title: image.title ?? "",
+ url: image?.url ?? "",
+ date: image?.date ?? "",
rating100: image.rating100 ?? null,
- studio_id: image.studio?.id,
+ studio_id: image.studio?.id ?? null,
performer_ids: (image.performers ?? []).map((p) => p.id),
tag_ids: (image.tags ?? []).map((t) => t.id),
};
- type InputValues = typeof initialValues;
+ type InputValues = yup.InferType;
- const formik = useFormik({
+ const formik = useFormik({
initialValues,
+ enableReinitialize: true,
validationSchema: schema,
- onSubmit: (values) => onSave(getImageInput(values)),
+ onSubmit: (values) => onSave(values),
});
function setRating(v: number) {
formik.setFieldValue("rating100", v);
}
+ useRatingKeybinds(
+ true,
+ configuration?.ui?.ratingSystemOptions?.type,
+ setRating
+ );
+
useEffect(() => {
if (isVisible) {
Mousetrap.bind("s s", () => {
@@ -73,52 +103,22 @@ export const ImageEditPanel: React.FC = ({
onDelete();
});
- // numeric keypresses get caught by jwplayer, so blur the element
- // if the rating sequence is started
- Mousetrap.bind("r", () => {
- if (document.activeElement instanceof HTMLElement) {
- document.activeElement.blur();
- }
-
- Mousetrap.bind("0", () => setRating(NaN));
- Mousetrap.bind("1", () => setRating(20));
- Mousetrap.bind("2", () => setRating(40));
- Mousetrap.bind("3", () => setRating(60));
- Mousetrap.bind("4", () => setRating(80));
- Mousetrap.bind("5", () => setRating(100));
-
- setTimeout(() => {
- Mousetrap.unbind("0");
- Mousetrap.unbind("1");
- Mousetrap.unbind("2");
- Mousetrap.unbind("3");
- Mousetrap.unbind("4");
- Mousetrap.unbind("5");
- }, 1000);
- });
-
return () => {
Mousetrap.unbind("s s");
Mousetrap.unbind("d d");
-
- Mousetrap.unbind("r");
};
}
});
- function getImageInput(input: InputValues): GQL.ImageUpdateInput {
- return {
- id: image.id,
- ...input,
- };
- }
-
- async function onSave(input: GQL.ImageUpdateInput) {
+ async function onSave(input: InputValues) {
setIsLoading(true);
try {
const result = await updateImage({
variables: {
- input,
+ input: {
+ id: image.id,
+ ...input,
+ },
},
});
if (result.data?.imageUpdate) {
@@ -128,7 +128,7 @@ export const ImageEditPanel: React.FC = ({
{ entity: intl.formatMessage({ id: "image" }).toLocaleLowerCase() }
),
});
- formik.resetForm({ values: formik.values });
+ formik.resetForm();
}
} catch (e) {
Toast.error(e);
@@ -138,7 +138,7 @@ export const ImageEditPanel: React.FC = ({
function renderTextField(field: string, title: string, placeholder?: string) {
return (
-
+
{FormUtils.renderLabel({
title,
})}
@@ -172,7 +172,7 @@ export const ImageEditPanel: React.FC = ({
- {renderTextField("date", intl.formatMessage({ id: "date" }))}
+
+ {FormUtils.renderLabel({
+ title: intl.formatMessage({ id: "date" }),
+ })}
+ formik.setFieldValue("date", value)}
+ error={formik.errors.date}
+ />
+
+
{FormUtils.renderLabel({
@@ -417,7 +433,7 @@ export const MovieEditPanel: React.FC = ({
onSelect={(items) =>
formik.setFieldValue(
"studio_id",
- items.length > 0 ? items[0]?.id : undefined
+ items.length > 0 ? items[0]?.id : null
)
}
ids={formik.values.studio_id ? [formik.values.studio_id] : []}
@@ -472,19 +488,15 @@ export const MovieEditPanel: React.FC = ({
objectName={movie?.name ?? intl.formatMessage({ id: "movie" })}
isNew={isNew}
isEditing={isEditing}
- onToggleEdit={onCancel}
- onSave={() => formik.handleSubmit()}
- saveDisabled={!formik.dirty}
+ onToggleEdit={onCancelEditing}
+ onSave={formik.handleSubmit}
+ saveDisabled={(!isNew && !formik.dirty) || !isEqual(formik.errors, {})}
onImageChange={onFrontImageChange}
- onImageChangeURL={(i) => formik.setFieldValue("front_image", i)}
- onClearImage={() => {
- formik.setFieldValue("front_image", null);
- }}
+ onImageChangeURL={onFrontImageLoad}
+ onClearImage={() => onFrontImageLoad(null)}
onBackImageChange={onBackImageChange}
- onBackImageChangeURL={(i) => formik.setFieldValue("back_image", i)}
- onClearBackImage={() => {
- formik.setFieldValue("back_image", null);
- }}
+ onBackImageChangeURL={onBackImageLoad}
+ onClearBackImage={() => onBackImageLoad(null)}
onDelete={onDelete}
/>
diff --git a/ui/v2.5/src/components/Movies/MovieDetails/MovieScenesPanel.tsx b/ui/v2.5/src/components/Movies/MovieDetails/MovieScenesPanel.tsx
index 1750bc5f9..22215de5a 100644
--- a/ui/v2.5/src/components/Movies/MovieDetails/MovieScenesPanel.tsx
+++ b/ui/v2.5/src/components/Movies/MovieDetails/MovieScenesPanel.tsx
@@ -5,10 +5,14 @@ import { ListFilterModel } from "src/models/list-filter/filter";
import { SceneList } from "src/components/Scenes/SceneList";
interface IMovieScenesPanel {
+ active: boolean;
movie: GQL.MovieDataFragment;
}
-export const MovieScenesPanel: React.FC = ({ movie }) => {
+export const MovieScenesPanel: React.FC = ({
+ active,
+ movie,
+}) => {
function filterHook(filter: ListFilterModel) {
const movieValue = { id: movie.id, label: movie.name };
// if movie is already present, then we modify it, otherwise add
@@ -43,7 +47,11 @@ export const MovieScenesPanel: React.FC = ({ movie }) => {
if (movie && movie.id) {
return (
- ,
diff --git a/ui/v2.5/src/components/Movies/MovieList.tsx b/ui/v2.5/src/components/Movies/MovieList.tsx
index 51a6bd2b0..c5b6c8ded 100644
--- a/ui/v2.5/src/components/Movies/MovieList.tsx
+++ b/ui/v2.5/src/components/Movies/MovieList.tsx
@@ -3,28 +3,41 @@ import { useIntl } from "react-intl";
import cloneDeep from "lodash-es/cloneDeep";
import Mousetrap from "mousetrap";
import { useHistory } from "react-router-dom";
-import {
- FindMoviesQueryResult,
- SlimMovieDataFragment,
- MovieDataFragment,
-} from "src/core/generated-graphql";
import { ListFilterModel } from "src/models/list-filter/filter";
import { DisplayMode } from "src/models/list-filter/types";
-import { queryFindMovies, useMoviesDestroy } from "src/core/StashService";
+import * as GQL from "src/core/generated-graphql";
import {
- showWhenSelected,
- useMoviesList,
+ queryFindMovies,
+ useFindMovies,
+ useMoviesDestroy,
+} from "src/core/StashService";
+import {
+ makeItemList,
PersistanceLevel,
-} from "src/hooks/ListHook";
-import { ExportDialog, DeleteEntityDialog } from "src/components/Shared";
+ showWhenSelected,
+} from "../List/ItemList";
+import { ExportDialog } from "../Shared/ExportDialog";
+import { DeleteEntityDialog } from "../Shared/DeleteEntityDialog";
import { MovieCard } from "./MovieCard";
import { EditMoviesDialog } from "./EditMoviesDialog";
+const MovieItemList = makeItemList({
+ filterMode: GQL.FilterMode.Movies,
+ useResult: useFindMovies,
+ getItems(result: GQL.FindMoviesQueryResult) {
+ return result?.data?.findMovies?.movies ?? [];
+ },
+ getCount(result: GQL.FindMoviesQueryResult) {
+ return result?.data?.findMovies?.count ?? 0;
+ },
+});
+
interface IMovieList {
filterHook?: (filter: ListFilterModel) => ListFilterModel;
+ alterQuery?: boolean;
}
-export const MovieList: React.FC = ({ filterHook }) => {
+export const MovieList: React.FC = ({ filterHook, alterQuery }) => {
const intl = useIntl();
const history = useHistory();
const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
@@ -46,10 +59,10 @@ export const MovieList: React.FC = ({ filterHook }) => {
},
];
- const addKeybinds = (
- result: FindMoviesQueryResult,
+ function addKeybinds(
+ result: GQL.FindMoviesQueryResult,
filter: ListFilterModel
- ) => {
+ ) {
Mousetrap.bind("p r", () => {
viewRandom(result, filter);
});
@@ -57,49 +70,14 @@ export const MovieList: React.FC = ({ filterHook }) => {
return () => {
Mousetrap.unbind("p r");
};
- };
-
- function renderEditDialog(
- selectedMovies: MovieDataFragment[],
- onClose: (applied: boolean) => void
- ) {
- return (
- <>
- = ({ filterHook }) => {
filterCopy.itemsPerPage = 1;
filterCopy.currentPage = index + 1;
const singleResult = await queryFindMovies(filterCopy);
- if (
- singleResult &&
- singleResult.data &&
- singleResult.data.findMovies &&
- singleResult.data.findMovies.movies.length === 1
- ) {
- const { id } = singleResult!.data!.findMovies!.movies[0];
+ if (singleResult.data.findMovies.movies.length === 1) {
+ const { id } = singleResult.data.findMovies.movies[0];
// navigate to the movie page
history.push(`/movies/${id}`);
}
@@ -130,10 +103,15 @@ export const MovieList: React.FC = ({ filterHook }) => {
setIsExportDialogOpen(true);
}
- function maybeRenderMovieExportDialog(selectedIds: Set) {
- if (isExportDialogOpen) {
- return (
- <>
+ function renderContent(
+ result: GQL.FindMoviesQueryResult,
+ filter: ListFilterModel,
+ selectedIds: Set,
+ onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
+ ) {
+ function maybeRenderMovieExportDialog() {
+ if (isExportDialogOpen) {
+ return (
= ({ filterHook }) => {
all: isExportAll,
},
}}
- onClose={() => {
- setIsExportDialogOpen(false);
- }}
+ onClose={() => setIsExportDialogOpen(false)}
/>
-
- );
+ );
+ }
}
- }
- function renderContent(
- result: FindMoviesQueryResult,
- filter: ListFilterModel,
- selectedIds: Set
- ) {
- if (!result.data?.findMovies) {
- return;
- }
- if (filter.displayMode === DisplayMode.Grid) {
- return (
- <>
- {maybeRenderMovieExportDialog(selectedIds)}
+ function renderMovies() {
+ if (!result.data?.findMovies) return;
+
+ if (filter.displayMode === DisplayMode.Grid) {
+ return (
{result.data.findMovies.movies.map((p) => (
= ({ filterHook }) => {
selecting={selectedIds.size > 0}
selected={selectedIds.has(p.id)}
onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
- listData.onSelectChange(p.id, selected, shiftKey)
+ onSelectChange(p.id, selected, shiftKey)
}
/>
))}
-
- );
- }
- if (filter.displayMode === DisplayMode.List) {
- return TODO
;
+ );
+ }
+ if (filter.displayMode === DisplayMode.List) {
+ return TODO
;
+ }
}
+ return (
+ <>
+ {maybeRenderMovieExportDialog()}
+ {renderMovies()}
+
+ );
}
- return listData.template;
+ function renderEditDialog(
+ selectedMovies: GQL.MovieDataFragment[],
+ onClose: (applied: boolean) => void
+ ) {
+ return Page not found.
;
};
diff --git a/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx b/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
index 42453a1a6..aff7fa268 100644
--- a/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
+++ b/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
@@ -3,9 +3,9 @@ import { Col, Form, Row } from "react-bootstrap";
import { FormattedMessage, useIntl } from "react-intl";
import { useBulkPerformerUpdate } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
-import { Modal } from "src/components/Shared";
-import { useToast } from "src/hooks";
-import MultiSet from "../Shared/MultiSet";
+import { ModalComponent } from "../Shared/Modal";
+import { useToast } from "src/hooks/Toast";
+import { MultiSet } from "../Shared/MultiSet";
import { RatingSystem } from "../Shared/Rating/RatingSystem";
import {
getAggregateInputValue,
@@ -20,7 +20,7 @@ import {
import { IndeterminateCheckbox } from "../Shared/IndeterminateCheckbox";
import { BulkUpdateTextInput } from "../Shared/BulkUpdateTextInput";
import { faPencilAlt } from "@fortawesome/free-solid-svg-icons";
-import { FormUtils } from "../../utils";
+import FormUtils from "src/utils/form";
interface IListOperationProps {
selected: GQL.SlimPerformerDataFragment[];
@@ -29,6 +29,7 @@ interface IListOperationProps {
const performerFields = [
"favorite",
+ "disambiguation",
"url",
"instagram",
"twitter",
@@ -59,10 +60,8 @@ export const EditPerformersDialog: React.FC = (
mode: GQL.BulkUpdateIdMode.Add,
});
const [existingTagIds, setExistingTagIds] = useState();
- const [
- aggregateState,
- setAggregateState,
- ] = useState({});
+ const [aggregateState, setAggregateState] =
+ useState({});
// weight needs conversion to/from number
const [weight, setWeight] = useState();
const [updateInput, setUpdateInput] = useState(
@@ -182,7 +181,7 @@ export const EditPerformersDialog: React.FC = (
function render() {
return (
- = (
setUpdateField({
gender: stringToGender(event.currentTarget.value),
@@ -243,6 +242,9 @@ export const EditPerformersDialog: React.FC = (
+ {renderTextField("disambiguation", updateInput.disambiguation, (v) =>
+ setUpdateField({ disambiguation: v })
+ )}
{renderTextField("birthdate", updateInput.birthdate, (v) =>
setUpdateField({ birthdate: v })
)}
@@ -315,7 +317,7 @@ export const EditPerformersDialog: React.FC = (
/>
-
+
);
}
diff --git a/ui/v2.5/src/components/Performers/PerformerCard.tsx b/ui/v2.5/src/components/Performers/PerformerCard.tsx
index 26baa8f7a..f11f96dbe 100644
--- a/ui/v2.5/src/components/Performers/PerformerCard.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerCard.tsx
@@ -2,14 +2,13 @@ import React from "react";
import { Link } from "react-router-dom";
import { useIntl } from "react-intl";
import * as GQL from "src/core/generated-graphql";
-import { NavUtils, TextUtils } from "src/utils";
-import {
- GridCard,
- CountryFlag,
- HoverPopover,
- Icon,
- TagLink,
-} from "src/components/Shared";
+import NavUtils from "src/utils/navigation";
+import TextUtils from "src/utils/text";
+import { GridCard } from "../Shared/GridCard";
+import { CountryFlag } from "../Shared/CountryFlag";
+import { HoverPopover } from "../Shared/HoverPopover";
+import { Icon } from "../Shared/Icon";
+import { TagLink } from "../Shared/TagLink";
import { Button, ButtonGroup } from "react-bootstrap";
import {
Criterion,
@@ -19,6 +18,8 @@ import { PopoverCountButton } from "../Shared/PopoverCountButton";
import GenderIcon from "./GenderIcon";
import { faHeart, faTag } from "@fortawesome/free-solid-svg-icons";
import { RatingBanner } from "../Shared/RatingBanner";
+import cx from "classnames";
+import { usePerformerUpdate } from "src/core/StashService";
export interface IPerformerCardExtraCriteria {
scenes: Criterion[];
@@ -61,17 +62,39 @@ export const PerformerCard: React.FC = ({
{ age, years_old: ageL10String }
);
- function maybeRenderFavoriteIcon() {
- if (performer.favorite === false) {
- return;
- }
+ const [updatePerformer] = usePerformerUpdate();
+
+ function renderFavoriteIcon() {
return (
-
- = ({
pretitleIcon={
![]()
= ({
alt={performer.name ?? ""}
src={performer.image_path ?? ""}
/>
- {maybeRenderFavoriteIcon()}
+
+ {renderFavoriteIcon()}
{maybeRenderRatingBanner()}
{maybeRenderFlag()}
@@ -217,9 +250,9 @@ export const PerformerCard: React.FC = ({
) : (
""
)}
- {maybeRenderPopoverButtonGroup()}
}
+ popovers={maybeRenderPopoverButtonGroup()}
selected={selected}
selecting={selecting}
onSelectedChanged={onSelectedChanged}
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
index d3032762f..36b288e9a 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
@@ -12,17 +12,16 @@ import {
usePerformerDestroy,
mutateMetadataAutoTag,
} from "src/core/StashService";
-import {
- Counter,
- CountryFlag,
- DetailsEditNavbar,
- ErrorMessage,
- Icon,
- LoadingIndicator,
-} from "src/components/Shared";
-import { useLightbox, useToast } from "src/hooks";
+import { Counter } from "src/components/Shared/Counter";
+import { CountryFlag } from "src/components/Shared/CountryFlag";
+import { DetailsEditNavbar } from "src/components/Shared/DetailsEditNavbar";
+import { ErrorMessage } from "src/components/Shared/ErrorMessage";
+import { Icon } from "src/components/Shared/Icon";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
+import { useLightbox } from "src/hooks/Lightbox/hooks";
+import { useToast } from "src/hooks/Toast";
import { ConfigurationContext } from "src/hooks/Config";
-import { TextUtils } from "src/utils";
+import TextUtils from "src/utils/text";
import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
import { PerformerDetailsPanel } from "./PerformerDetailsPanel";
import { PerformerScenesPanel } from "./PerformerScenesPanel";
@@ -32,13 +31,10 @@ import { PerformerImagesPanel } from "./PerformerImagesPanel";
import { PerformerEditPanel } from "./PerformerEditPanel";
import { PerformerSubmitButton } from "./PerformerSubmitButton";
import GenderIcon from "../GenderIcon";
-import {
- faCamera,
- faDove,
- faHeart,
- faLink,
-} from "@fortawesome/free-solid-svg-icons";
+import { faHeart, faLink } from "@fortawesome/free-solid-svg-icons";
+import { faInstagram, faTwitter } from "@fortawesome/free-brands-svg-icons";
import { IUIConfig } from "src/core/config";
+import { useRatingKeybinds } from "src/hooks/keybinds";
interface IProps {
performer: GQL.PerformerDataFragment;
@@ -53,22 +49,24 @@ const PerformerPage: React.FC = ({ performer }) => {
const intl = useIntl();
const { tab = "details" } = useParams();
+ const [collapsed, setCollapsed] = useState(false);
+
// Configuration settings
const { configuration } = React.useContext(ConfigurationContext);
const abbreviateCounter =
(configuration?.ui as IUIConfig)?.abbreviateCounters ?? false;
- const [imagePreview, setImagePreview] = useState();
- const [imageEncoding, setImageEncoding] = useState(false);
const [isEditing, setIsEditing] = useState(false);
+ const [image, setImage] = useState();
+ const [encodingImage, setEncodingImage] = useState(false);
// if undefined then get the existing image
// if null then get the default (no) image
// otherwise get the set image
const activeImage =
- imagePreview === undefined
+ image === undefined
? performer.image_path ?? ""
- : imagePreview ?? `${performer.image_path}&default=true`;
+ : image ?? `${performer.image_path}&default=true`;
const lightboxImages = useMemo(
() => [{ paths: { thumbnail: activeImage, image: activeImage } }],
[activeImage]
@@ -95,10 +93,6 @@ const PerformerPage: React.FC = ({ performer }) => {
}
};
- const onImageChange = (image?: string | null) => setImagePreview(image);
-
- const onImageEncoding = (isEncoding = false) => setImageEncoding(isEncoding);
-
async function onAutoTag() {
try {
await mutateMetadataAutoTag({ performers: [performer.id] });
@@ -110,6 +104,12 @@ const PerformerPage: React.FC = ({ performer }) => {
}
}
+ useRatingKeybinds(
+ true,
+ configuration?.ui?.ratingSystemOptions?.type,
+ setRating
+ );
+
// set up hotkeys
useEffect(() => {
Mousetrap.bind("a", () => setActiveTabKey("details"));
@@ -118,30 +118,7 @@ const PerformerPage: React.FC = ({ performer }) => {
Mousetrap.bind("g", () => setActiveTabKey("galleries"));
Mousetrap.bind("m", () => setActiveTabKey("movies"));
Mousetrap.bind("f", () => setFavorite(!performer.favorite));
-
- // numeric keypresses get caught by jwplayer, so blur the element
- // if the rating sequence is started
- Mousetrap.bind("r", () => {
- if (document.activeElement instanceof HTMLElement) {
- document.activeElement.blur();
- }
-
- Mousetrap.bind("0", () => setRating(NaN));
- Mousetrap.bind("1", () => setRating(20));
- Mousetrap.bind("2", () => setRating(40));
- Mousetrap.bind("3", () => setRating(60));
- Mousetrap.bind("4", () => setRating(80));
- Mousetrap.bind("5", () => setRating(100));
-
- setTimeout(() => {
- Mousetrap.unbind("0");
- Mousetrap.unbind("1");
- Mousetrap.unbind("2");
- Mousetrap.unbind("3");
- Mousetrap.unbind("4");
- Mousetrap.unbind("5");
- }, 1000);
- });
+ Mousetrap.bind(",", () => setCollapsed(!collapsed));
return () => {
Mousetrap.unbind("a");
@@ -149,6 +126,7 @@ const PerformerPage: React.FC = ({ performer }) => {
Mousetrap.unbind("c");
Mousetrap.unbind("f");
Mousetrap.unbind("o");
+ Mousetrap.unbind(",");
};
});
@@ -210,7 +188,10 @@ const PerformerPage: React.FC = ({ performer }) => {
}
>
- = ({ performer }) => {
}
>
-
= ({ performer }) => {
}
>
-
= ({ performer }) => {
}
>
-
@@ -264,12 +254,9 @@ const PerformerPage: React.FC = ({ performer }) => {
{
- setIsEditing(false);
- }}
+ onCancel={() => setIsEditing(false)}
+ setImage={setImage}
+ setEncodingImage={setEncodingImage}
/>
);
} else {
@@ -296,13 +283,13 @@ const PerformerPage: React.FC = ({ performer }) => {
}
function maybeRenderAliases() {
- if (performer?.aliases) {
+ if (performer?.alias_list?.length) {
return (
= ({ performer }) => {
target="_blank"
rel="noopener noreferrer"
>
- = ({ performer }) => {
target="_blank"
rel="noopener noreferrer"
>
- = ({ performer }) => {
/>
);
+ function getCollapseButtonText() {
+ return collapsed ? ">" : "<";
+ }
+
return (
{performer.name}
-
- {imageEncoding ? (
+
+ {encodingImage ? (
{
- const [imagePreview, setImagePreview] = useState();
- const [imageEncoding, setImageEncoding] = useState(false);
+ const [image, setImage] = useState();
+ const [encodingImage, setEncodingImage] = useState(false);
- function useQuery() {
- const { search } = useLocation();
- return React.useMemo(() => new URLSearchParams(search), [search]);
- }
+ const location = useLocation();
+ const query = useMemo(() => new URLSearchParams(location.search), [location]);
+ const performer = {
+ name: query.get("q") ?? undefined,
+ };
- const query = useQuery();
- const nameQuery = query.get("name");
-
- const activeImage = imagePreview ?? "";
const intl = useIntl();
- const onImageChange = (image?: string | null) => setImagePreview(image);
- const onImageEncoding = (isEncoding = false) => setImageEncoding(isEncoding);
-
function renderPerformerImage() {
- if (imageEncoding) {
+ if (encodingImage) {
return 
);
@@ -50,11 +44,10 @@ const PerformerCreate: React.FC = () => {
/>
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
index e8c4ffc3f..9a0aa9f07 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
@@ -1,8 +1,10 @@
import React from "react";
import { FormattedMessage, useIntl } from "react-intl";
-import { TagLink } from "src/components/Shared";
+import { TagLink } from "src/components/Shared/TagLink";
import * as GQL from "src/core/generated-graphql";
-import { TextUtils, getStashboxBase, getCountryByISO } from "src/utils";
+import TextUtils from "src/utils/text";
+import { getStashboxBase } from "src/utils/stashbox";
+import { getCountryByISO } from "src/utils/country";
import { TextField, URLField } from "src/utils/field";
import { cmToImperial, kgToLbs } from "src/utils/units";
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index d9370d9ad..b92330fad 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -13,26 +13,25 @@ import {
useTagCreate,
queryScrapePerformerURL,
} from "src/core/StashService";
-import {
- Icon,
- ImageInput,
- LoadingIndicator,
- CollapseButton,
- TagSelect,
- URLField,
- CountrySelect,
-} from "src/components/Shared";
-import { ImageUtils, getStashIDs } from "src/utils";
-import { useToast } from "src/hooks";
+import { Icon } from "src/components/Shared/Icon";
+import { ImageInput } from "src/components/Shared/ImageInput";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
+import { CollapseButton } from "src/components/Shared/CollapseButton";
+import { TagSelect } from "src/components/Shared/Select";
+import { CountrySelect } from "src/components/Shared/CountrySelect";
+import { URLField } from "src/components/Shared/URLField";
+import ImageUtils from "src/utils/image";
+import { getStashIDs } from "src/utils/stashIds";
+import { stashboxDisplayName } from "src/utils/stashbox";
+import { useToast } from "src/hooks/Toast";
import { Prompt, useHistory } from "react-router-dom";
import { useFormik } from "formik";
import {
- genderStrings,
genderToString,
+ stringGenderMap,
stringToGender,
} from "src/utils/gender";
import { ConfigurationContext } from "src/hooks/Config";
-import { stashboxDisplayName } from "src/utils/stashbox";
import { PerformerScrapeDialog } from "./PerformerScrapeDialog";
import PerformerScrapeModal from "./PerformerScrapeModal";
import PerformerStashBoxModal, { IStashBox } from "./PerformerStashBoxModal";
@@ -42,6 +41,9 @@ import {
faSyncAlt,
faTrashAlt,
} from "@fortawesome/free-solid-svg-icons";
+import { StringListInput } from "src/components/Shared/StringListInput";
+import isEqual from "lodash-es/isEqual";
+import { DateInput } from "src/components/Shared/DateInput";
const isScraper = (
scraper: GQL.Scraper | GQL.StashBox
@@ -49,26 +51,26 @@ const isScraper = (
interface IPerformerDetails {
performer: Partial;
- isNew?: boolean;
isVisible: boolean;
- onImageChange?: (image?: string | null) => void;
- onImageEncoding?: (loading?: boolean) => void;
- onCancelEditing?: () => void;
+ onCancel?: () => void;
+ setImage: (image?: string | null) => void;
+ setEncodingImage: (loading: boolean) => void;
}
export const PerformerEditPanel: React.FC = ({
performer,
- isNew,
isVisible,
- onImageChange,
- onImageEncoding,
- onCancelEditing,
+ onCancel,
+ setImage,
+ setEncodingImage,
}) => {
const Toast = useToast();
const history = useHistory();
+ const isNew = performer.id === undefined;
+
// Editing state
- const [scraper, setScraper] = useState();
+ const [scraper, setScraper] = useState();
const [newTags, setNewTags] = useState();
const [isScraperModalOpen, setIsScraperModalOpen] = useState(false);
@@ -81,18 +83,13 @@ export const PerformerEditPanel: React.FC = ({
const Scrapers = useListPerformerScrapers();
const [queryableScrapers, setQueryableScrapers] = useState([]);
- const [scrapedPerformer, setScrapedPerformer] = useState<
- GQL.ScrapedPerformer | undefined
- >();
+ const [scrapedPerformer, setScrapedPerformer] =
+ useState();
const { configuration: stashConfig } = React.useContext(ConfigurationContext);
- const imageEncoding = ImageUtils.usePasteImage(onImageLoad, true);
-
const [createTag] = useTagCreate();
const intl = useIntl();
- const genderOptions = [""].concat(genderStrings);
-
const labelXS = 3;
const labelXL = 2;
const fieldXS = 9;
@@ -100,62 +97,102 @@ export const PerformerEditPanel: React.FC = ({
const schema = yup.object({
name: yup.string().required(),
- aliases: yup.string().optional(),
- gender: yup.string().optional().oneOf(genderOptions),
- birthdate: yup.string().optional(),
- ethnicity: yup.string().optional(),
- eye_color: yup.string().optional(),
- country: yup.string().optional(),
- height_cm: yup.number().optional(),
- measurements: yup.string().optional(),
- fake_tits: yup.string().optional(),
- career_length: yup.string().optional(),
- tattoos: yup.string().optional(),
- piercings: yup.string().optional(),
- url: yup.string().optional(),
- twitter: yup.string().optional(),
- instagram: yup.string().optional(),
- tag_ids: yup.array(yup.string().required()).optional(),
- stash_ids: yup.mixed().optional(),
- image: yup.string().optional().nullable(),
- details: yup.string().optional(),
- death_date: yup.string().optional(),
- hair_color: yup.string().optional(),
- weight: yup.number().optional(),
- ignore_auto_tag: yup.boolean().optional(),
+ disambiguation: yup.string().ensure(),
+ alias_list: yup
+ .array(yup.string().required())
+ .defined()
+ .test({
+ name: "unique",
+ test: (value, context) => {
+ if (!value) return true;
+ const aliases = new Set(value);
+ aliases.add(context.parent.name);
+ return value.length + 1 === aliases.size;
+ },
+ message: intl.formatMessage({
+ id: "validation.aliases_must_be_unique",
+ }),
+ }),
+ gender: yup.string().ensure(),
+ birthdate: yup
+ .string()
+ .ensure()
+ .test({
+ name: "date",
+ test: (value) => {
+ if (!value) return true;
+ if (!value.match(/^\d{4}-\d{2}-\d{2}$/)) return false;
+ if (Number.isNaN(Date.parse(value))) return false;
+ return true;
+ },
+ message: intl.formatMessage({ id: "validation.date_invalid_form" }),
+ }),
+ death_date: yup
+ .string()
+ .ensure()
+ .test({
+ name: "date",
+ test: (value) => {
+ if (!value) return true;
+ if (!value.match(/^\d{4}-\d{2}-\d{2}$/)) return false;
+ if (Number.isNaN(Date.parse(value))) return false;
+ return true;
+ },
+ message: intl.formatMessage({ id: "validation.date_invalid_form" }),
+ }),
+ country: yup.string().ensure(),
+ ethnicity: yup.string().ensure(),
+ hair_color: yup.string().ensure(),
+ eye_color: yup.string().ensure(),
+ height_cm: yup.number().nullable().defined().default(null),
+ weight: yup.number().nullable().defined().default(null),
+ measurements: yup.string().ensure(),
+ fake_tits: yup.string().ensure(),
+ tattoos: yup.string().ensure(),
+ piercings: yup.string().ensure(),
+ career_length: yup.string().ensure(),
+ url: yup.string().ensure(),
+ twitter: yup.string().ensure(),
+ instagram: yup.string().ensure(),
+ details: yup.string().ensure(),
+ tag_ids: yup.array(yup.string().required()).defined(),
+ ignore_auto_tag: yup.boolean().defined(),
+ stash_ids: yup.mixed().defined(),
+ image: yup.string().nullable().optional(),
});
const initialValues = {
name: performer.name ?? "",
- aliases: performer.aliases ?? "",
- gender: genderToString(performer.gender ?? undefined),
+ disambiguation: performer.disambiguation ?? "",
+ alias_list: performer.alias_list ?? [],
+ gender: (performer.gender as GQL.GenderEnum) ?? "",
birthdate: performer.birthdate ?? "",
- ethnicity: performer.ethnicity ?? "",
- eye_color: performer.eye_color ?? "",
+ death_date: performer.death_date ?? "",
country: performer.country ?? "",
- height_cm: performer.height_cm ?? undefined,
+ ethnicity: performer.ethnicity ?? "",
+ hair_color: performer.hair_color ?? "",
+ eye_color: performer.eye_color ?? "",
+ height_cm: performer.height_cm ?? null,
+ weight: performer.weight ?? null,
measurements: performer.measurements ?? "",
fake_tits: performer.fake_tits ?? "",
- career_length: performer.career_length ?? "",
tattoos: performer.tattoos ?? "",
piercings: performer.piercings ?? "",
+ career_length: performer.career_length ?? "",
url: performer.url ?? "",
twitter: performer.twitter ?? "",
instagram: performer.instagram ?? "",
- tag_ids: (performer.tags ?? []).map((t) => t.id),
- stash_ids: performer.stash_ids ?? undefined,
- image: undefined,
details: performer.details ?? "",
- death_date: performer.death_date ?? "",
- hair_color: performer.hair_color ?? "",
- weight: performer.weight ?? undefined,
+ tag_ids: (performer.tags ?? []).map((t) => t.id),
ignore_auto_tag: performer.ignore_auto_tag ?? false,
+ stash_ids: getStashIDs(performer.stash_ids),
};
- type InputValues = typeof initialValues;
+ type InputValues = yup.InferType;
- const formik = useFormik({
+ const formik = useFormik({
initialValues,
+ enableReinitialize: true,
validationSchema: schema,
onSubmit: (values) => onSave(values),
});
@@ -165,20 +202,16 @@ export const PerformerEditPanel: React.FC = ({
return;
}
- let retEnum: GQL.GenderEnum | undefined;
-
// try to translate from enum values first
- const upperGender = scrapedGender?.toUpperCase();
+ const upperGender = scrapedGender.toUpperCase();
const asEnum = genderToString(upperGender);
if (asEnum) {
- retEnum = stringToGender(asEnum);
+ return stringToGender(asEnum);
} else {
// try to match against gender strings
const caseInsensitive = true;
- retEnum = stringToGender(scrapedGender, caseInsensitive);
+ return stringToGender(scrapedGender, caseInsensitive);
}
-
- return genderToString(retEnum);
}
function renderNewTags() {
@@ -262,9 +295,14 @@ export const PerformerEditPanel: React.FC = ({
if (state.name) {
formik.setFieldValue("name", state.name);
}
-
+ if (state.disambiguation) {
+ formik.setFieldValue("disambiguation", state.disambiguation);
+ }
if (state.aliases) {
- formik.setFieldValue("aliases", state.aliases);
+ formik.setFieldValue(
+ "alias_list",
+ state.aliases.split(",").map((a) => a.trim())
+ );
}
if (state.birthdate) {
formik.setFieldValue("birthdate", state.birthdate);
@@ -307,10 +345,10 @@ export const PerformerEditPanel: React.FC = ({
}
if (state.gender) {
// gender is a string in the scraper data
- formik.setFieldValue(
- "gender",
- translateScrapedGender(state.gender ?? undefined)
- );
+ const newGender = translateScrapedGender(state.gender);
+ if (newGender) {
+ formik.setFieldValue("gender", newGender);
+ }
}
if (state.tags) {
// map tags to their ids and filter out those not found
@@ -323,15 +361,14 @@ export const PerformerEditPanel: React.FC = ({
// 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
- // overwrite if image was cleared (`null`)
- // otherwise follow existing behaviour (`undefined`)
+ // overwrite if image is unset
if (
- (!isNew || [null, undefined].includes(formik.values.image)) &&
+ (!isNew || !formik.values.image) &&
state.images &&
state.images.length > 0
) {
const imageStr = state.images[0];
- formik.setFieldValue("image", imageStr ?? undefined);
+ formik.setFieldValue("image", imageStr);
}
if (state.details) {
formik.setFieldValue("details", state.details);
@@ -360,31 +397,50 @@ export const PerformerEditPanel: React.FC = ({
}
}
- function onImageLoad(imageData: string) {
+ const encodingImage = ImageUtils.usePasteImage(onImageLoad);
+
+ useEffect(() => {
+ setImage(formik.values.image);
+ }, [formik.values.image, setImage]);
+
+ useEffect(() => {
+ setEncodingImage(encodingImage);
+ }, [setEncodingImage, encodingImage]);
+
+ function onImageLoad(imageData: string | null) {
formik.setFieldValue("image", imageData);
}
- async function onSave(performerInput: InputValues) {
+ function onImageChange(event: React.FormEvent) {
+ ImageUtils.onImageChange(event, onImageLoad);
+ }
+
+ async function onSave(input: InputValues) {
setIsLoading(true);
try {
if (isNew) {
- const input = getCreateValues(performerInput);
const result = await createPerformer({
variables: {
- input,
+ input: {
+ ...input,
+ gender: input.gender || null,
+ height_cm: input.height_cm || null,
+ weight: input.weight || null,
+ },
},
});
if (result.data?.performerCreate) {
history.push(`/performers/${result.data.performerCreate.id}`);
}
} else {
- const input = getUpdateValues(performerInput);
-
await updatePerformer({
variables: {
input: {
+ id: performer.id!,
...input,
- stash_ids: getStashIDs(performerInput?.stash_ids),
+ gender: input.gender || null,
+ height_cm: input.height_cm || null,
+ weight: input.weight || null,
},
},
});
@@ -394,12 +450,17 @@ export const PerformerEditPanel: React.FC = ({
setIsLoading(false);
return;
}
- if (!isNew && onCancelEditing) {
- onCancelEditing();
+ if (!isNew && onCancel) {
+ onCancel();
}
setIsLoading(false);
}
+ function onCancelEditing() {
+ setImage(undefined);
+ onCancel?.();
+ }
+
// set up hotkeys
useEffect(() => {
if (isVisible) {
@@ -417,18 +478,6 @@ export const PerformerEditPanel: React.FC = ({
}
});
- useEffect(() => {
- if (onImageChange) {
- onImageChange(formik.values.image);
- }
- return () => onImageChange?.();
- }, [formik.values.image, onImageChange]);
-
- useEffect(() => onImageEncoding?.(imageEncoding), [
- onImageEncoding,
- imageEncoding,
- ]);
-
useEffect(() => {
const newQueryableScrapers = (
Scrapers?.data?.listPerformerScrapers ?? []
@@ -441,33 +490,6 @@ export const PerformerEditPanel: React.FC = ({
if (isLoading) return ) {
- ImageUtils.onImageChange(event, onImageLoad);
- }
-
- function onImageChangeURL(url: string) {
- formik.setFieldValue("image", url);
- }
-
async function onReloadScrapers() {
setIsLoading(true);
try {
@@ -633,9 +655,9 @@ export const PerformerEditPanel: React.FC = ({
return;
}
- const currentPerformer: Partial = {
+ const currentPerformer = {
...formik.values,
- gender: stringToGender(formik.values.gender),
+ gender: formik.values.gender || null,
image: formik.values.image ?? performer.image_path,
};
@@ -662,22 +684,16 @@ export const PerformerEditPanel: React.FC = ({
function renderButtons(classNames: string) {
return (
- {!isNew && onCancelEditing ? (
-
-
+
);
};
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerStashBoxModal.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerStashBoxModal.tsx
index b9c7f4316..5b508ea1f 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerStashBoxModal.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerStashBoxModal.tsx
@@ -1,11 +1,12 @@
import React, { useEffect, useRef, useState } from "react";
-import debounce from "lodash-es/debounce";
import { Button, Form } from "react-bootstrap";
import { useIntl } from "react-intl";
import * as GQL from "src/core/generated-graphql";
-import { Modal, LoadingIndicator } from "src/components/Shared";
+import { ModalComponent } from "src/components/Shared/Modal";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { stashboxDisplayName } from "src/utils/stashbox";
+import { useDebouncedSetState } from "src/hooks/debounce";
const CLASSNAME = "PerformerScrapeModal";
const CLASSNAME_LIST = `${CLASSNAME}-list`;
@@ -43,14 +44,12 @@ const PerformerStashBoxModal: React.FC = ({
const performers = data?.scrapeSinglePerformer ?? [];
- const onInputChange = debounce((input: string) => {
- setQuery(input);
- }, 500);
+ const onInputChange = useDebouncedSetState(setQuery, 500);
useEffect(() => inputRef.current?.focus(), []);
return (
- = ({
))}
@@ -89,7 +89,7 @@ const PerformerStashBoxModal: React.FC = ({
query !== "" && No results found.
)}
-
+
);
};
diff --git a/ui/v2.5/src/components/Performers/PerformerList.tsx b/ui/v2.5/src/components/Performers/PerformerList.tsx
index 0cd8902ae..cdfc37f09 100644
--- a/ui/v2.5/src/components/Performers/PerformerList.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerList.tsx
@@ -3,33 +3,48 @@ import React, { useState } from "react";
import { useIntl } from "react-intl";
import { useHistory } from "react-router-dom";
import Mousetrap from "mousetrap";
-import {
- FindPerformersQueryResult,
- SlimPerformerDataFragment,
-} from "src/core/generated-graphql";
+import * as GQL from "src/core/generated-graphql";
import {
queryFindPerformers,
+ useFindPerformers,
usePerformersDestroy,
} from "src/core/StashService";
-import { usePerformersList } from "src/hooks";
-import { showWhenSelected, PersistanceLevel } from "src/hooks/ListHook";
+import {
+ makeItemList,
+ PersistanceLevel,
+ showWhenSelected,
+} from "../List/ItemList";
import { ListFilterModel } from "src/models/list-filter/filter";
import { DisplayMode } from "src/models/list-filter/types";
-import { PerformerTagger } from "src/components/Tagger";
-import { ExportDialog, DeleteEntityDialog } from "src/components/Shared";
+import { PerformerTagger } from "../Tagger/performers/PerformerTagger";
+import { ExportDialog } from "../Shared/ExportDialog";
+import { DeleteEntityDialog } from "../Shared/DeleteEntityDialog";
import { IPerformerCardExtraCriteria, PerformerCard } from "./PerformerCard";
import { PerformerListTable } from "./PerformerListTable";
import { EditPerformersDialog } from "./EditPerformersDialog";
+const PerformerItemList = makeItemList({
+ filterMode: GQL.FilterMode.Performers,
+ useResult: useFindPerformers,
+ getItems(result: GQL.FindPerformersQueryResult) {
+ return result?.data?.findPerformers?.performers ?? [];
+ },
+ getCount(result: GQL.FindPerformersQueryResult) {
+ return result?.data?.findPerformers?.count ?? 0;
+ },
+});
+
interface IPerformerList {
filterHook?: (filter: ListFilterModel) => ListFilterModel;
persistState?: PersistanceLevel;
+ alterQuery?: boolean;
extraCriteria?: IPerformerCardExtraCriteria;
}
export const PerformerList: React.FC = ({
filterHook,
persistState,
+ alterQuery,
extraCriteria,
}) => {
const intl = useIntl();
@@ -40,7 +55,7 @@ export const PerformerList: React.FC = ({
const otherOperations = [
{
text: intl.formatMessage({ id: "actions.open_random" }),
- onClick: getRandom,
+ onClick: openRandom,
},
{
text: intl.formatMessage({ id: "actions.export" }),
@@ -53,18 +68,36 @@ export const PerformerList: React.FC = ({
},
];
- const addKeybinds = (
- result: FindPerformersQueryResult,
+ function addKeybinds(
+ result: GQL.FindPerformersQueryResult,
filter: ListFilterModel
- ) => {
+ ) {
Mousetrap.bind("p r", () => {
- getRandom(result, filter);
+ openRandom(result, filter);
});
return () => {
Mousetrap.unbind("p r");
};
- };
+ }
+
+ async function openRandom(
+ result: GQL.FindPerformersQueryResult,
+ filter: ListFilterModel
+ ) {
+ if (result.data?.findPerformers) {
+ const { count } = result.data.findPerformers;
+ const index = Math.floor(Math.random() * count);
+ const filterCopy = cloneDeep(filter);
+ filterCopy.itemsPerPage = 1;
+ filterCopy.currentPage = index + 1;
+ const singleResult = await queryFindPerformers(filterCopy);
+ if (singleResult.data.findPerformers.performers.length === 1) {
+ const { id } = singleResult.data.findPerformers.performers[0]!;
+ history.push(`/performers/${id}`);
+ }
+ }
+ }
async function onExport() {
setIsExportAll(false);
@@ -76,96 +109,35 @@ export const PerformerList: React.FC = ({
setIsExportDialogOpen(true);
}
- function maybeRenderPerformerExportDialog(selectedIds: Set) {
- if (isExportDialogOpen) {
- return (
- <>
- {
- setIsExportDialogOpen(false);
- }}
- />
-
- );
- }
- }
-
- function renderEditPerformersDialog(
- selectedPerformers: SlimPerformerDataFragment[],
- onClose: (applied: boolean) => void
+ function renderContent(
+ result: GQL.FindPerformersQueryResult,
+ filter: ListFilterModel,
+ selectedIds: Set,
+ onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
) {
- return (
- <>
- setIsExportDialogOpen(false)}
+ />
+
+ );
}
}
- }
- function renderContent(
- result: FindPerformersQueryResult,
- filter: ListFilterModel,
- selectedIds: Set
- ) {
- if (!result.data?.findPerformers) {
- return;
- }
- if (filter.displayMode === DisplayMode.Grid) {
- return (
- <>
- {maybeRenderPerformerExportDialog(selectedIds)}
+ function renderPerformers() {
+ if (!result.data?.findPerformers) return;
+
+ if (filter.displayMode === DisplayMode.Grid) {
+ return (
{result.data.findPerformers.performers.map((p) => (
= ({
selecting={selectedIds.size > 0}
selected={selectedIds.has(p.id)}
onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
- listData.onSelectChange(p.id, selected, shiftKey)
+ onSelectChange(p.id, selected, shiftKey)
}
extraCriteria={extraCriteria}
/>
))}
-
- );
- }
- if (filter.displayMode === DisplayMode.List) {
- return (
- = (
- {performer.name}
+
+ {performer.name}
+ {performer.disambiguation && (
+
+ {` (${performer.disambiguation})`}
+
+ )}
+
- {performer.aliases ? performer.aliases : ""}
+ {performer.alias_list ? performer.alias_list.join(", ") : ""}
{performer.favorite && (
+
diff --git a/ui/v2.5/src/components/ScenePlayer/index.ts b/ui/v2.5/src/components/ScenePlayer/index.ts
deleted file mode 100644
index 04a525412..000000000
--- a/ui/v2.5/src/components/ScenePlayer/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ScenePlayer";
diff --git a/ui/v2.5/src/components/ScenePlayer/styles.scss b/ui/v2.5/src/components/ScenePlayer/styles.scss
index 76a8ba73e..8e717892f 100644
--- a/ui/v2.5/src/components/ScenePlayer/styles.scss
+++ b/ui/v2.5/src/components/ScenePlayer/styles.scss
@@ -382,7 +382,7 @@ $sceneTabWidth: 450px;
}
#scrubber-position-indicator {
- background-color: #ccc;
+ background-color: rgba(255, 255, 255, 0.7);
height: 20px;
left: -100%;
position: absolute;
@@ -426,6 +426,14 @@ $sceneTabWidth: 450px;
}
}
+.scrubber-heatmap {
+ background-size: 100% 100%;
+ height: 20px;
+ left: 0;
+ position: absolute;
+ right: 0;
+}
+
.scrubber-tag {
background-color: #000;
cursor: pointer;
diff --git a/ui/v2.5/src/components/ScenePlayer/track-activity.ts b/ui/v2.5/src/components/ScenePlayer/track-activity.ts
index f4ed2eb49..6b5cbd051 100644
--- a/ui/v2.5/src/components/ScenePlayer/track-activity.ts
+++ b/ui/v2.5/src/components/ScenePlayer/track-activity.ts
@@ -10,12 +10,10 @@ class TrackActivityPlugin extends videojs.getPlugin("plugin") {
incrementPlayCount: () => Promise = () => {
return Promise.resolve();
};
- saveActivity: (
- resumeTime: number,
- playDuration: number
- ) => Promise = () => {
- return Promise.resolve();
- };
+ saveActivity: (resumeTime: number, playDuration: number) => Promise =
+ () => {
+ return Promise.resolve();
+ };
private enabled = false;
private playCountIncremented = false;
diff --git a/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx b/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx
index c98785e1c..6a17ff5bf 100644
--- a/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx
@@ -2,8 +2,8 @@ import React, { useState } from "react";
import { Form } from "react-bootstrap";
import { useScenesDestroy } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
-import { Modal } from "src/components/Shared";
-import { useToast } from "src/hooks";
+import { ModalComponent } from "src/components/Shared/Modal";
+import { useToast } from "src/hooks/Toast";
import { ConfigurationContext } from "src/hooks/Config";
import { FormattedMessage, useIntl } from "react-intl";
import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
@@ -126,7 +126,7 @@ export const DeleteScenesDialog: React.FC = (
}
return (
- = (
onChange={() => setDeleteGenerated(!deleteGenerated)}
/>
-
+
);
};
diff --git a/ui/v2.5/src/components/Scenes/EditScenesDialog.tsx b/ui/v2.5/src/components/Scenes/EditScenesDialog.tsx
index 34947060f..9fed7f54b 100644
--- a/ui/v2.5/src/components/Scenes/EditScenesDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/EditScenesDialog.tsx
@@ -4,10 +4,11 @@ import { FormattedMessage, useIntl } from "react-intl";
import isEqual from "lodash-es/isEqual";
import { useBulkSceneUpdate } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
-import { StudioSelect, Modal } from "src/components/Shared";
-import { useToast } from "src/hooks";
-import { FormUtils } from "src/utils";
-import MultiSet from "../Shared/MultiSet";
+import { StudioSelect } from "../Shared/Select";
+import { ModalComponent } from "../Shared/Modal";
+import { MultiSet } from "../Shared/MultiSet";
+import { useToast } from "src/hooks/Toast";
+import FormUtils from "src/utils/form";
import { RatingSystem } from "../Shared/Rating/RatingSystem";
import {
getAggregateInputIDs,
@@ -32,10 +33,8 @@ export const EditScenesDialog: React.FC = (
const Toast = useToast();
const [rating100, setRating] = useState();
const [studioId, setStudioId] = useState();
- const [
- performerMode,
- setPerformerMode,
- ] = React.useState(GQL.BulkUpdateIdMode.Add);
+ const [performerMode, setPerformerMode] =
+ React.useState(GQL.BulkUpdateIdMode.Add);
const [performerIds, setPerformerIds] = useState();
const [existingPerformerIds, setExistingPerformerIds] = useState();
const [tagMode, setTagMode] = React.useState(
@@ -243,7 +242,7 @@ export const EditScenesDialog: React.FC = (
function render() {
return (
- = (
/>
-
+
);
}
diff --git a/ui/v2.5/src/components/Scenes/SceneCard.tsx b/ui/v2.5/src/components/Scenes/SceneCard.tsx
index b7b79c0e7..3205fdcb8 100644
--- a/ui/v2.5/src/components/Scenes/SceneCard.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneCard.tsx
@@ -3,14 +3,13 @@ import { Button, ButtonGroup } from "react-bootstrap";
import { Link } from "react-router-dom";
import cx from "classnames";
import * as GQL from "src/core/generated-graphql";
-import {
- Icon,
- TagLink,
- HoverPopover,
- SweatDrops,
- TruncatedText,
-} from "src/components/Shared";
-import { NavUtils, TextUtils } from "src/utils";
+import { Icon } from "../Shared/Icon";
+import { TagLink } from "../Shared/TagLink";
+import { HoverPopover } from "../Shared/HoverPopover";
+import { SweatDrops } from "../Shared/SweatDrops";
+import { TruncatedText } from "../Shared/TruncatedText";
+import NavUtils from "src/utils/navigation";
+import TextUtils from "src/utils/text";
import { SceneQueue } from "src/models/sceneQueue";
import { ConfigurationContext } from "src/hooks/Config";
import { PerformerPopoverButton } from "../Shared/PerformerPopoverButton";
@@ -99,9 +98,8 @@ export const SceneCard: React.FC = (
);
// studio image is missing if it uses the default
- const missingStudioImage = props.scene.studio?.image_path?.endsWith(
- "?default=true"
- );
+ const missingStudioImage =
+ props.scene.studio?.image_path?.endsWith("?default=true");
const showStudioAsText =
missingStudioImage || (configuration?.interface.showStudioAsText ?? false);
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/ExternalPlayerButton.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/ExternalPlayerButton.tsx
index 8ee4d992c..eef8db914 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/ExternalPlayerButton.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/ExternalPlayerButton.tsx
@@ -2,7 +2,7 @@ import { faExternalLinkAlt } from "@fortawesome/free-solid-svg-icons";
import React from "react";
import { Button } from "react-bootstrap";
import { useIntl } from "react-intl";
-import Icon from "src/components/Shared/Icon";
+import { Icon } from "src/components/Shared/Icon";
import { objectTitle } from "src/core/files";
import { SceneDataFragment } from "src/core/generated-graphql";
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/OCounterButton.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/OCounterButton.tsx
index 19d9e337d..8fdb7dfd7 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/OCounterButton.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/OCounterButton.tsx
@@ -2,7 +2,9 @@ import { faBan, faMinus } from "@fortawesome/free-solid-svg-icons";
import React, { useState } from "react";
import { Button, ButtonGroup, Dropdown, DropdownButton } from "react-bootstrap";
import { useIntl } from "react-intl";
-import { Icon, LoadingIndicator, SweatDrops } from "src/components/Shared";
+import { Icon } from "src/components/Shared/Icon";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
+import { SweatDrops } from "src/components/Shared/SweatDrops";
export interface IOCounterButtonProps {
value: number;
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/OrganizedButton.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/OrganizedButton.tsx
index 63e82f9d2..4d0d7dd51 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/OrganizedButton.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/OrganizedButton.tsx
@@ -1,7 +1,7 @@
import React from "react";
import cx from "classnames";
import { Button, Spinner } from "react-bootstrap";
-import Icon from "src/components/Shared/Icon";
+import { Icon } from "src/components/Shared/Icon";
import { defineMessages, useIntl } from "react-intl";
import { faBox } from "@fortawesome/free-solid-svg-icons";
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/QueueViewer.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/QueueViewer.tsx
index 09b575a68..1f4b8f740 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/QueueViewer.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/QueueViewer.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
import { Link } from "react-router-dom";
import cx from "classnames";
import { Button, Form, Spinner } from "react-bootstrap";
-import Icon from "src/components/Shared/Icon";
+import { Icon } from "src/components/Shared/Icon";
import { useIntl } from "react-intl";
import {
faChevronDown,
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
index 1e7a8163f..21ba9d5c4 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
@@ -1,13 +1,5 @@
import { Tab, Nav, Dropdown, Button, ButtonGroup } from "react-bootstrap";
-import queryString from "query-string";
-import React, {
- useEffect,
- useState,
- useMemo,
- useContext,
- lazy,
- useRef,
-} from "react";
+import React, { useEffect, useState, useMemo, useContext, useRef } from "react";
import { FormattedMessage, useIntl } from "react-intl";
import { useParams, useLocation, useHistory, Link } from "react-router-dom";
import { Helmet } from "react-helmet";
@@ -24,8 +16,11 @@ import {
queryFindScenesByID,
} from "src/core/StashService";
-import Icon from "src/components/Shared/Icon";
-import { useToast } from "src/hooks";
+import { ErrorMessage } from "src/components/Shared/ErrorMessage";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
+import { Icon } from "src/components/Shared/Icon";
+import { Counter } from "src/components/Shared/Counter";
+import { useToast } from "src/hooks/Toast";
import SceneQueue, { QueuedScene } from "src/models/sceneQueue";
import { ListFilterModel } from "src/models/list-filter/filter";
import Mousetrap from "mousetrap";
@@ -34,31 +29,39 @@ import { OrganizedButton } from "./OrganizedButton";
import { ConfigurationContext } from "src/hooks/Config";
import { getPlayerPosition } from "src/components/ScenePlayer/util";
import { faEllipsisV } from "@fortawesome/free-solid-svg-icons";
+import { lazyComponent } from "src/utils/lazyComponent";
-const SubmitStashBoxDraft = lazy(
+const SubmitStashBoxDraft = lazyComponent(
() => import("src/components/Dialogs/SubmitDraft")
);
-const ScenePlayer = lazy(
+const ScenePlayer = lazyComponent(
() => import("src/components/ScenePlayer/ScenePlayer")
);
-const GalleryViewer = lazy(
+const GalleryViewer = lazyComponent(
() => import("src/components/Galleries/GalleryViewer")
);
-const ExternalPlayerButton = lazy(() => import("./ExternalPlayerButton"));
+const ExternalPlayerButton = lazyComponent(
+ () => import("./ExternalPlayerButton")
+);
-const QueueViewer = lazy(() => import("./QueueViewer"));
-const SceneMarkersPanel = lazy(() => import("./SceneMarkersPanel"));
-const SceneFileInfoPanel = lazy(() => import("./SceneFileInfoPanel"));
-const SceneEditPanel = lazy(() => import("./SceneEditPanel"));
-const SceneDetailPanel = lazy(() => import("./SceneDetailPanel"));
-const SceneMoviePanel = lazy(() => import("./SceneMoviePanel"));
-const SceneGalleriesPanel = lazy(() => import("./SceneGalleriesPanel"));
-const DeleteScenesDialog = lazy(() => import("../DeleteScenesDialog"));
-const GenerateDialog = lazy(() => import("../../Dialogs/GenerateDialog"));
-const SceneVideoFilterPanel = lazy(() => import("./SceneVideoFilterPanel"));
+const QueueViewer = lazyComponent(() => import("./QueueViewer"));
+const SceneMarkersPanel = lazyComponent(() => import("./SceneMarkersPanel"));
+const SceneFileInfoPanel = lazyComponent(() => import("./SceneFileInfoPanel"));
+const SceneEditPanel = lazyComponent(() => import("./SceneEditPanel"));
+const SceneDetailPanel = lazyComponent(() => import("./SceneDetailPanel"));
+const SceneMoviePanel = lazyComponent(() => import("./SceneMoviePanel"));
+const SceneGalleriesPanel = lazyComponent(
+ () => import("./SceneGalleriesPanel")
+);
+const DeleteScenesDialog = lazyComponent(() => import("../DeleteScenesDialog"));
+const GenerateDialog = lazyComponent(
+ () => import("../../Dialogs/GenerateDialog")
+);
+const SceneVideoFilterPanel = lazyComponent(
+ () => import("./SceneVideoFilterPanel")
+);
import { objectPath, objectTitle } from "src/core/files";
-import { Counter } from "src/components/Shared";
interface IProps {
scene: GQL.SceneDataFragment;
@@ -140,7 +143,9 @@ const ScenePage: React.FC = ({
Mousetrap.bind("e", () => setActiveTabKey("scene-edit-panel"));
Mousetrap.bind("k", () => setActiveTabKey("scene-markers-panel"));
Mousetrap.bind("i", () => setActiveTabKey("scene-file-info-panel"));
- Mousetrap.bind("o", () => onIncrementClick());
+ Mousetrap.bind("o", () => {
+ onIncrementClick();
+ });
Mousetrap.bind("p n", () => onQueueNext());
Mousetrap.bind("p p", () => onQueuePrevious());
Mousetrap.bind("p r", () => onQueueRandom());
@@ -514,10 +519,10 @@ const SceneLoader: React.FC = () => {
const location = useLocation();
const history = useHistory();
const { configuration } = useContext(ConfigurationContext);
- const { data, loading } = useFindScene(id ?? "");
+ const { data, loading, error } = useFindScene(id ?? "");
const queryParams = useMemo(
- () => queryString.parse(location.search, { decode: false }),
+ () => new URLSearchParams(location.search),
[location.search]
);
const sceneQueue = useMemo(
@@ -525,13 +530,13 @@ const SceneLoader: React.FC = () => {
[queryParams]
);
const queryContinue = useMemo(() => {
- let cont = queryParams.continue;
- if (cont !== undefined) {
+ let cont = queryParams.get("continue");
+ if (cont) {
return cont === "true";
} else {
return !!configuration?.interface.continuePlaylistDefault;
}
- }, [configuration?.interface.continuePlaylistDefault, queryParams.continue]);
+ }, [configuration?.interface.continuePlaylistDefault, queryParams]);
const [queueScenes, setQueueScenes] = useState([]);
@@ -543,14 +548,13 @@ const SceneLoader: React.FC = () => {
const _setTimestamp = useRef<(value: number) => void>();
const initialTimestamp = useMemo(() => {
- const t = Array.isArray(queryParams.t) ? queryParams.t[0] : queryParams.t;
- return Number.parseInt(t ?? "0", 10);
+ return Number.parseInt(queryParams.get("t") ?? "0", 10);
}, [queryParams]);
const [queueTotal, setQueueTotal] = useState(0);
const [queueStart, setQueueStart] = useState(1);
- const autoplay = queryParams.autoplay === "true";
+ const autoplay = queryParams.get("autoplay") === "true";
const currentQueueIndex = queueScenes
? queueScenes.findIndex((s) => s.id === id)
: -1;
@@ -728,32 +732,32 @@ const SceneLoader: React.FC = () => {
}
}
+ if (loading) return {
const intl = useIntl();
- // create scene from provided scene id if applicable
- const queryParams = queryString.parse(location.search);
+ const location = useLocation();
+ const query = useMemo(() => new URLSearchParams(location.search), [location]);
- const fromSceneID = (queryParams?.from_scene_id ?? "") as string;
- const { data, loading } = useFindScene(fromSceneID ?? "");
+ // create scene from provided scene id if applicable
+ const { data, loading } = useFindScene(query.get("from_scene_id") ?? "");
const [loadingCoverImage, setLoadingCoverImage] = useState(false);
- const [coverImage, setCoverImage] = useState(undefined);
+ const [coverImage, setCoverImage] = useState();
const scene = useMemo(() => {
if (data?.findScene) {
@@ -26,8 +26,10 @@ const SceneCreate: React.FC = () => {
};
}
- return {};
- }, [data?.findScene]);
+ return {
+ title: query.get("q") ?? undefined,
+ };
+ }, [data?.findScene, query]);
useEffect(() => {
async function fetchCoverImage() {
@@ -62,6 +64,7 @@ const SceneCreate: React.FC = () => {
import("./SceneScrapeDialog"));
-const SceneQueryModal = lazy(() => import("./SceneQueryModal"));
+const SceneScrapeDialog = lazyComponent(() => import("./SceneScrapeDialog"));
+const SceneQueryModal = lazyComponent(() => import("./SceneQueryModal"));
interface IProps {
scene: Partial;
+ fileID?: string;
initialCoverImage?: string;
isNew?: boolean;
isVisible: boolean;
@@ -61,6 +68,7 @@ interface IProps {
export const SceneEditPanel: React.FC = ({
scene,
+ fileID,
initialCoverImage,
isNew = false,
isVisible,
@@ -70,10 +78,6 @@ export const SceneEditPanel: React.FC = ({
const Toast = useToast();
const history = useHistory();
- const queryParams = queryString.parse(location.search);
-
- const fileID = (queryParams?.file_id ?? "") as string;
-
const [galleries, setGalleries] = useState<{ id: string; title: string }[]>(
[]
);
@@ -82,17 +86,13 @@ export const SceneEditPanel: React.FC = ({
const [fragmentScrapers, setFragmentScrapers] = useState([]);
const [queryableScrapers, setQueryableScrapers] = useState([]);
- const [scraper, setScraper] = useState();
- const [
- isScraperQueryModalOpen,
- setIsScraperQueryModalOpen,
- ] = useState(false);
+ const [scraper, setScraper] = useState();
+ const [isScraperQueryModalOpen, setIsScraperQueryModalOpen] =
+ useState(false);
const [scrapedScene, setScrapedScene] = useState();
- const [endpoint, setEndpoint] = useState();
+ const [endpoint, setEndpoint] = useState();
- const [coverImagePreview, setCoverImagePreview] = useState<
- string | undefined
- >();
+ const [coverImagePreview, setCoverImagePreview] = useState();
useEffect(() => {
setCoverImagePreview(
@@ -104,7 +104,7 @@ export const SceneEditPanel: React.FC = ({
setGalleries(
scene.galleries?.map((g) => ({
id: g.id,
- title: objectTitle(g),
+ title: galleryTitle(g),
})) ?? []
);
}, [scene.galleries]);
@@ -117,53 +117,66 @@ export const SceneEditPanel: React.FC = ({
const [updateScene] = useSceneUpdate();
const schema = yup.object({
- title: yup.string().optional().nullable(),
- code: yup.string().optional().nullable(),
- details: yup.string().optional().nullable(),
- director: yup.string().optional().nullable(),
- url: yup.string().optional().nullable(),
- date: yup.string().optional().nullable(),
- rating100: yup.number().optional().nullable(),
- gallery_ids: yup.array(yup.string().required()).optional().nullable(),
- studio_id: yup.string().optional().nullable(),
- performer_ids: yup.array(yup.string().required()).optional().nullable(),
+ title: yup.string().ensure(),
+ code: yup.string().ensure(),
+ url: yup.string().ensure(),
+ date: yup
+ .string()
+ .ensure()
+ .test({
+ name: "date",
+ test: (value) => {
+ if (!value) return true;
+ if (!value.match(/^\d{4}-\d{2}-\d{2}$/)) return false;
+ if (Number.isNaN(Date.parse(value))) return false;
+ return true;
+ },
+ message: intl.formatMessage({ id: "validation.date_invalid_form" }),
+ }),
+ director: yup.string().ensure(),
+ rating100: yup.number().nullable().defined(),
+ gallery_ids: yup.array(yup.string().required()).defined(),
+ studio_id: yup.string().required().nullable(),
+ performer_ids: yup.array(yup.string().required()).defined(),
movies: yup
- .object({
- movie_id: yup.string().required(),
- scene_index: yup.string().optional().nullable(),
- })
- .optional()
- .nullable(),
- tag_ids: yup.array(yup.string().required()).optional().nullable(),
- cover_image: yup.string().optional().nullable(),
- stash_ids: yup.mixed().optional().nullable(),
+ .array(
+ yup.object({
+ movie_id: yup.string().required(),
+ scene_index: yup.number().nullable().defined(),
+ })
+ )
+ .defined(),
+ tag_ids: yup.array(yup.string().required()).defined(),
+ stash_ids: yup.mixed().defined(),
+ details: yup.string().ensure(),
+ cover_image: yup.string().nullable().optional(),
});
const initialValues = useMemo(
() => ({
title: scene.title ?? "",
code: scene.code ?? "",
- details: scene.details ?? "",
- director: scene.director ?? "",
url: scene.url ?? "",
date: scene.date ?? "",
+ director: scene.director ?? "",
rating100: scene.rating100 ?? null,
gallery_ids: (scene.galleries ?? []).map((g) => g.id),
- studio_id: scene.studio?.id,
+ studio_id: scene.studio?.id ?? null,
performer_ids: (scene.performers ?? []).map((p) => p.id),
movies: (scene.movies ?? []).map((m) => {
- return { movie_id: m.movie.id, scene_index: m.scene_index };
+ return { movie_id: m.movie.id, scene_index: m.scene_index ?? null };
}),
tag_ids: (scene.tags ?? []).map((t) => t.id),
- cover_image: initialCoverImage,
stash_ids: getStashIDs(scene.stash_ids),
+ details: scene.details ?? "",
+ cover_image: initialCoverImage,
}),
[scene, initialCoverImage]
);
- type InputValues = typeof initialValues;
+ type InputValues = yup.InferType;
- const formik = useFormik({
+ const formik = useFormik({
initialValues,
enableReinitialize: true,
validationSchema: schema,
@@ -187,6 +200,12 @@ export const SceneEditPanel: React.FC = ({
);
}
+ useRatingKeybinds(
+ isVisible,
+ stashConfig?.ui?.ratingSystemOptions?.type,
+ setRating
+ );
+
useEffect(() => {
if (isVisible) {
Mousetrap.bind("s s", () => {
@@ -198,35 +217,9 @@ export const SceneEditPanel: React.FC = ({
}
});
- // numeric keypresses get caught by jwplayer, so blur the element
- // if the rating sequence is started
- Mousetrap.bind("r", () => {
- if (document.activeElement instanceof HTMLElement) {
- document.activeElement.blur();
- }
-
- Mousetrap.bind("0", () => setRating(NaN));
- Mousetrap.bind("1", () => setRating(20));
- Mousetrap.bind("2", () => setRating(40));
- Mousetrap.bind("3", () => setRating(60));
- Mousetrap.bind("4", () => setRating(80));
- Mousetrap.bind("5", () => setRating(100));
-
- setTimeout(() => {
- Mousetrap.unbind("0");
- Mousetrap.unbind("1");
- Mousetrap.unbind("2");
- Mousetrap.unbind("3");
- Mousetrap.unbind("4");
- Mousetrap.unbind("5");
- }, 1000);
- });
-
return () => {
Mousetrap.unbind("s s");
Mousetrap.unbind("d d");
-
- Mousetrap.unbind("r");
};
}
});
@@ -245,15 +238,6 @@ export const SceneEditPanel: React.FC = ({
setQueryableScrapers(newQueryableScrapers);
}, [Scrapers, stashConfig]);
- const imageEncoding = ImageUtils.usePasteImage(onImageLoad, true);
-
- function getSceneInput(input: InputValues): GQL.SceneUpdateInput {
- return {
- id: scene.id!,
- ...input,
- };
- }
-
function setMovieIds(movieIds: string[]) {
const existingMovies = formik.values.movies;
@@ -265,29 +249,22 @@ export const SceneEditPanel: React.FC = ({
return {
movie_id: m,
+ scene_index: null,
};
});
formik.setFieldValue("movies", newMovies);
}
- function getCreateValues(values: InputValues): GQL.SceneCreateInput {
- return {
- ...values,
- };
- }
-
async function onSave(input: InputValues) {
setIsLoading(true);
try {
if (!isNew) {
- const updateValues = getSceneInput(input);
const result = await updateScene({
variables: {
input: {
- ...updateValues,
id: scene.id!,
- rating100: input.rating100 ?? null,
+ ...input,
},
},
});
@@ -300,20 +277,17 @@ export const SceneEditPanel: React.FC = ({
}
),
});
+ formik.resetForm();
}
} else {
- const createValues = getCreateValues(input);
const result = await mutateCreateScene({
- ...createValues,
- file_ids: fileID ? [fileID as string] : undefined,
+ ...input,
+ file_ids: fileID ? [fileID] : undefined,
});
if (result.data?.sceneCreate?.id) {
history.push(`/scenes/${result.data?.sceneCreate.id}`);
}
}
-
- // clear the cover image so that it doesn't appear dirty
- formik.resetForm({ values: formik.values });
} catch (e) {
Toast.error(e);
}
@@ -341,6 +315,8 @@ export const SceneEditPanel: React.FC = ({
);
}
+ const encodingImage = ImageUtils.usePasteImage(onImageLoad);
+
function onImageLoad(imageData: string) {
setCoverImagePreview(imageData);
formik.setFieldValue("cover_image", imageData);
@@ -434,9 +410,13 @@ export const SceneEditPanel: React.FC = ({
return;
}
- const currentScene = getSceneInput(formik.values);
+ const currentScene = {
+ id: scene.id!,
+ ...formik.values,
+ };
+
if (!currentScene.cover_image) {
- currentScene.cover_image = scene.paths!.screenshot;
+ currentScene.cover_image = scene.paths?.screenshot;
}
return (
@@ -691,7 +671,7 @@ export const SceneEditPanel: React.FC = ({
function renderTextField(field: string, title: string, placeholder?: string) {
return (
-
+
{FormUtils.renderLabel({
title,
})}
@@ -702,13 +682,16 @@ export const SceneEditPanel: React.FC = ({
{...formik.getFieldProps(field)}
isInvalid={!!formik.getFieldMeta(field).error}
/>
+
+ {formik.getFieldMeta(field).error}
+
);
}
const image = useMemo(() => {
- if (imageEncoding) {
+ if (encodingImage) {
return = ({
}
return ;
- }, [imageEncoding, coverImagePreview, intl]);
+ }, [encodingImage, coverImagePreview, intl]);
if (isLoading) return = ({
- {renderTextField(
- "date",
- intl.formatMessage({ id: "date" }),
- "YYYY-MM-DD"
- )}
+
+
+ {FormUtils.renderLabel({
+ title: intl.formatMessage({ id: "date" }),
+ })}
+ formik.setFieldValue("date", value)}
+ error={formik.errors.date}
+ />
+
+
+
{renderTextField(
"director",
intl.formatMessage({ id: "director" })
@@ -920,9 +914,8 @@ export const SceneEditPanel: React.FC = ({
{renderMovies(scene)}
-
- {scene.gallery && (
-
- )}
-
+ {renderGalleries(scene)}
);
};
@@ -144,7 +144,7 @@ export const SceneListTable: React.FC = (
-
diff --git a/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx b/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
index 9958b0432..af6635940 100644
--- a/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
@@ -2,25 +2,41 @@ import cloneDeep from "lodash-es/cloneDeep";
import React from "react";
import { useHistory } from "react-router-dom";
import { useIntl } from "react-intl";
-import { Helmet } from "react-helmet";
-import { TITLE_SUFFIX } from "src/components/Shared";
import Mousetrap from "mousetrap";
-import { FindSceneMarkersQueryResult } from "src/core/generated-graphql";
-import { queryFindSceneMarkers } from "src/core/StashService";
-import { NavUtils } from "src/utils";
-import { useSceneMarkersList } from "src/hooks";
-import { PersistanceLevel } from "src/hooks/ListHook";
+import * as GQL from "src/core/generated-graphql";
+import {
+ queryFindSceneMarkers,
+ useFindSceneMarkers,
+} from "src/core/StashService";
+import NavUtils from "src/utils/navigation";
+import { makeItemList, PersistanceLevel } from "../List/ItemList";
import { ListFilterModel } from "src/models/list-filter/filter";
import { DisplayMode } from "src/models/list-filter/types";
import { WallPanel } from "../Wall/WallPanel";
+const SceneMarkerItemList = makeItemList({
+ filterMode: GQL.FilterMode.SceneMarkers,
+ useResult: useFindSceneMarkers,
+ getItems(result: GQL.FindSceneMarkersQueryResult) {
+ return result?.data?.findSceneMarkers?.scene_markers ?? [];
+ },
+ getCount(result: GQL.FindSceneMarkersQueryResult) {
+ return result?.data?.findSceneMarkers?.count ?? 0;
+ },
+});
+
interface ISceneMarkerList {
filterHook?: (filter: ListFilterModel) => ListFilterModel;
+ alterQuery?: boolean;
}
-export const SceneMarkerList: React.FC = ({ filterHook }) => {
+export const SceneMarkerList: React.FC = ({
+ filterHook,
+ alterQuery,
+}) => {
const intl = useIntl();
const history = useHistory();
+
const otherOperations = [
{
text: intl.formatMessage({ id: "actions.play_random" }),
@@ -28,10 +44,10 @@ export const SceneMarkerList: React.FC = ({ filterHook }) => {
},
];
- const addKeybinds = (
- result: FindSceneMarkersQueryResult,
+ function addKeybinds(
+ result: GQL.FindSceneMarkersQueryResult,
filter: ListFilterModel
- ) => {
+ ) {
Mousetrap.bind("p r", () => {
playRandom(result, filter);
});
@@ -39,18 +55,10 @@ export const SceneMarkerList: React.FC = ({ filterHook }) => {
return () => {
Mousetrap.unbind("p r");
};
- };
-
- const listData = useSceneMarkersList({
- otherOperations,
- renderContent,
- filterHook,
- addKeybinds,
- persistState: PersistanceLevel.ALL,
- });
+ }
async function playRandom(
- result: FindSceneMarkersQueryResult,
+ result: GQL.FindSceneMarkersQueryResult,
filter: ListFilterModel
) {
// query for a random scene
@@ -62,7 +70,7 @@ export const SceneMarkerList: React.FC = ({ filterHook }) => {
filterCopy.itemsPerPage = 1;
filterCopy.currentPage = index + 1;
const singleResult = await queryFindSceneMarkers(filterCopy);
- if (singleResult?.data?.findSceneMarkers?.scene_markers?.length === 1) {
+ if (singleResult.data.findSceneMarkers.scene_markers.length === 1) {
// navigate to the scene player page
const url = NavUtils.makeSceneMarkerUrl(
singleResult.data.findSceneMarkers.scene_markers[0]
@@ -73,29 +81,27 @@ export const SceneMarkerList: React.FC = ({ filterHook }) => {
}
function renderContent(
- result: FindSceneMarkersQueryResult,
+ result: GQL.FindSceneMarkersQueryResult,
filter: ListFilterModel
) {
- if (!result?.data?.findSceneMarkers) return;
+ if (!result.data?.findSceneMarkers) return;
+
if (filter.displayMode === DisplayMode.Wall) {
return (
= ({
);
const [rating, setRating] = useState(
- new ScrapeResult(dest.rating100)
+ new ZeroableScrapeResult(dest.rating100)
);
+ // zero values can be treated as missing for these fields
const [oCounter, setOCounter] = useState(
new ScrapeResult(dest.o_counter)
);
@@ -119,6 +119,10 @@ const SceneMergeDetails: React.FC = ({
const [stashIDs, setStashIDs] = useState(new ScrapeResult([]));
+ const [organized, setOrganized] = useState(
+ new ZeroableScrapeResult(dest.organized)
+ );
+
const [image, setImage] = useState>(
new ScrapeResult(dest.paths.screenshot)
);
@@ -133,7 +137,7 @@ const SceneMergeDetails: React.FC = ({
setLoading(true);
const destData = await ImageUtils.imageToDataURL(dest.paths.screenshot);
- const srcData = await ImageUtils.imageToDataURL(src.paths!.screenshot!);
+ const srcData = await ImageUtils.imageToDataURL(src.paths.screenshot!);
// keep destination image by default
const useNewValue = false;
@@ -230,6 +234,13 @@ const SceneMergeDetails: React.FC = ({
)
);
+ setOrganized(
+ new ScrapeResult(
+ dest.organized ?? false,
+ sources.every((s) => s.organized)
+ )
+ );
+
setStashIDs(
new ScrapeResult(
dest.stash_ids,
@@ -289,6 +300,7 @@ const SceneMergeDetails: React.FC = ({
movies,
tags,
details,
+ organized,
stashIDs,
image,
]);
@@ -304,6 +316,7 @@ const SceneMergeDetails: React.FC = ({
movies,
tags,
details,
+ organized,
stashIDs,
image,
]);
@@ -325,6 +338,9 @@ const SceneMergeDetails: React.FC = ({
);
}
+ const trueString = intl.formatMessage({ id: "true" });
+ const falseString = intl.formatMessage({ id: "false" });
+
return (
<>
= ({
result={details}
onChange={(value) => setDetails(value)}
/>
+ (
+ {}}
+ className="bg-secondary text-white border-secondary"
+ />
+ )}
+ renderNewField={() => (
+ {}}
+ className="bg-secondary text-white border-secondary"
+ />
+ )}
+ onChange={(value) => setOrganized(value)}
+ />
= ({
}),
tag_ids: tags.getNewValue(),
details: details.getNewValue(),
+ organized: organized.getNewValue(),
stash_ids: stashIDs.getNewValue(),
cover_image: coverImage,
};
@@ -658,7 +696,7 @@ export const SceneMergeModal: React.FC = ({
}
return (
- = ({
-
+
);
};
diff --git a/ui/v2.5/src/components/Scenes/SceneRecommendationRow.tsx b/ui/v2.5/src/components/Scenes/SceneRecommendationRow.tsx
index 2d9aa7371..86ae558f0 100644
--- a/ui/v2.5/src/components/Scenes/SceneRecommendationRow.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneRecommendationRow.tsx
@@ -1,6 +1,6 @@
-import React, { FunctionComponent, useMemo } from "react";
+import React, { useMemo } from "react";
import { useFindScenes } from "src/core/StashService";
-import Slider from "react-slick";
+import Slider from "@ant-design/react-slick";
import { SceneCard } from "./SceneCard";
import { SceneQueue } from "src/models/sceneQueue";
import { ListFilterModel } from "src/models/list-filter/filter";
@@ -14,9 +14,7 @@ interface IProps {
header: string;
}
-export const SceneRecommendationRow: FunctionComponent = (
- props: IProps
-) => {
+export const SceneRecommendationRow: React.FC = (props) => {
const result = useFindScenes(props.filter);
const cardCount = result.data?.findScenes.count;
diff --git a/ui/v2.5/src/components/Scenes/Scenes.tsx b/ui/v2.5/src/components/Scenes/Scenes.tsx
index 97a9ea5c6..ea966e74a 100644
--- a/ui/v2.5/src/components/Scenes/Scenes.tsx
+++ b/ui/v2.5/src/components/Scenes/Scenes.tsx
@@ -1,14 +1,15 @@
-import React, { lazy } from "react";
+import React from "react";
import { Route, Switch } from "react-router-dom";
import { useIntl } from "react-intl";
import { Helmet } from "react-helmet";
-import { TITLE_SUFFIX } from "src/components/Shared";
-import { PersistanceLevel } from "src/hooks/ListHook";
+import { TITLE_SUFFIX } from "src/components/Shared/constants";
+import { PersistanceLevel } from "../List/ItemList";
+import { lazyComponent } from "src/utils/lazyComponent";
-const SceneList = lazy(() => import("./SceneList"));
-const SceneMarkerList = lazy(() => import("./SceneMarkerList"));
-const Scene = lazy(() => import("./SceneDetails/Scene"));
-const SceneCreate = lazy(() => import("./SceneDetails/SceneCreate"));
+const SceneList = lazyComponent(() => import("./SceneList"));
+const SceneMarkerList = lazyComponent(() => import("./SceneMarkerList"));
+const Scene = lazyComponent(() => import("./SceneDetails/Scene"));
+const SceneCreate = lazyComponent(() => import("./SceneDetails/SceneCreate"));
const Scenes: React.FC = () => {
const intl = useIntl();
@@ -16,6 +17,10 @@ const Scenes: React.FC = () => {
const title_template = `${intl.formatMessage({
id: "scenes",
})} ${TITLE_SUFFIX}`;
+ const marker_title_template = `${intl.formatMessage({
+ id: "markers",
+ })} ${TITLE_SUFFIX}`;
+
return (
<>
{
(
+ <>
+ = (props) => {
};
interface ISelectSetting extends ISetting {
- value?: string | number | string[] | undefined;
+ value?: string | number | string[];
onChange: (v: string) => void;
}
@@ -429,7 +428,7 @@ export const StringListSetting: React.FC = (props) => {
+
+
+
+ {intl.formatMessage({
+ id: "config.about.build_hash",
+ })}
+
+ {hashString}
+
+
+
+
+
+
+
+
+
+ );
+ }
+ }
return (
<>
@@ -39,48 +101,10 @@ export const SettingsAboutPanel: React.FC = () => {
value={buildTime}
/>
+
-
- {errorLatest ? (
-
- {intl.formatMessage({
- id: "config.about.latest_version_build_hash",
- })}
-
-
- {dataLatest.latestversion.shorthash}{" "}
- {hasNew
- ? intl.formatMessage({
- id: "config.about.new_version_notice",
- })
- : undefined}
-
-
-
-
-
-
-
-
-
- )}
-
+
+ {renderLatestVersion()}
@@ -108,11 +132,11 @@ export const SettingsAboutPanel: React.FC = () => {
{
url: (
- Wiki
+ Documentation
),
}
diff --git a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
index 8e5fb1286..97866b4d4 100644
--- a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
@@ -1,11 +1,9 @@
import React from "react";
import { Button, Form } from "react-bootstrap";
import { FormattedMessage, useIntl } from "react-intl";
-import {
- DurationInput,
- PercentInput,
- LoadingIndicator,
-} from "src/components/Shared";
+import { DurationInput } from "src/components/Shared/DurationInput";
+import { PercentInput } from "src/components/Shared/PercentInput";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { CheckboxGroup } from "./CheckboxGroup";
import { SettingSection } from "../SettingSection";
import {
@@ -16,13 +14,13 @@ import {
StringSetting,
} from "../Inputs";
import { SettingStateContext } from "../context";
-import { DurationUtils } from "src/utils";
+import DurationUtils from "src/utils/duration";
import * as GQL from "src/core/generated-graphql";
import {
imageLightboxDisplayModeIntlMap,
imageLightboxScrollModeIntlMap,
} from "src/core/enums";
-import { useInterfaceLocalForage } from "src/hooks";
+import { useInterfaceLocalForage } from "src/hooks/LocalForage";
import {
ConnectionState,
connectionStateLabel,
@@ -37,6 +35,14 @@ import {
ratingSystemIntlMap,
RatingSystemType,
} from "src/utils/rating";
+import {
+ imageWallDirectionIntlMap,
+ ImageWallDirection,
+ defaultImageWallOptions,
+ defaultImageWallDirection,
+ defaultImageWallMargin,
+} from "src/utils/imageWall";
+import { defaultMaxOptionsShown } from "src/core/config";
const allMenuItems = [
{ id: "scenes", headingID: "scenes" },
@@ -93,6 +99,24 @@ export const SettingsInterfacePanel: React.FC = () => {
});
}
+ function saveImageWallMargin(m: number) {
+ saveUI({
+ imageWallOptions: {
+ ...(ui.imageWallOptions ?? defaultImageWallOptions),
+ margin: m,
+ },
+ });
+ }
+
+ function saveImageWallDirection(d: ImageWallDirection) {
+ saveUI({
+ imageWallOptions: {
+ ...(ui.imageWallOptions ?? defaultImageWallOptions),
+ direction: d,
+ },
+ });
+ }
+
function saveRatingSystemType(t: RatingSystemType) {
saveUI({
ratingSystemOptions: {
@@ -354,6 +378,31 @@ export const SettingsInterfacePanel: React.FC = () => {
/>
+
+ saveImageWallMargin(v)}
+ />
+
+ saveImageWallDirection(v as ImageWallDirection)}
+ >
+ {Array.from(imageWallDirectionIntlMap.entries()).map((v) => (
+
+ ))}
+
+
+
{
}
/>
+ saveUI({ maxOptionsShown: v })}
+ />
{
const intl = useIntl();
- const {
- general,
- loading,
- error,
- saveGeneral,
- defaults,
- saveDefaults,
- } = React.useContext(SettingStateContext);
+ const { general, loading, error, saveGeneral, defaults, saveDefaults } =
+ React.useContext(SettingStateContext);
function commaDelimitedToList(value: string | undefined) {
if (value) {
@@ -82,7 +77,7 @@ export const SettingsLibraryPanel: React.FC = () => {
id: "config.general.excluded_video_patterns_desc",
})}
@@ -104,7 +99,7 @@ export const SettingsLibraryPanel: React.FC = () => {
id: "config.general.excluded_image_gallery_patterns_desc",
})}
@@ -134,6 +129,14 @@ export const SettingsLibraryPanel: React.FC = () => {
checked={general.writeImageThumbnails ?? false}
onChange={(v) => saveGeneral({ writeImageThumbnails: v })}
/>
+
+ saveGeneral({ galleryCoverRegex: v })}
+ />
diff --git a/ui/v2.5/src/components/Settings/SettingsPluginsPanel.tsx b/ui/v2.5/src/components/Settings/SettingsPluginsPanel.tsx
index 274c82b1c..0cd02703c 100644
--- a/ui/v2.5/src/components/Settings/SettingsPluginsPanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsPluginsPanel.tsx
@@ -3,9 +3,11 @@ import { Button } from "react-bootstrap";
import { FormattedMessage, useIntl } from "react-intl";
import * as GQL from "src/core/generated-graphql";
import { mutateReloadPlugins, usePlugins } from "src/core/StashService";
-import { useToast } from "src/hooks";
-import { TextUtils } from "src/utils";
-import { CollapseButton, Icon, LoadingIndicator } from "src/components/Shared";
+import { useToast } from "src/hooks/Toast";
+import TextUtils from "src/utils/text";
+import { CollapseButton } from "../Shared/CollapseButton";
+import { Icon } from "../Shared/Icon";
+import { LoadingIndicator } from "../Shared/LoadingIndicator";
import { SettingSection } from "./SettingSection";
import { Setting, SettingGroup } from "./Inputs";
import { faLink, faSyncAlt } from "@fortawesome/free-solid-svg-icons";
diff --git a/ui/v2.5/src/components/Settings/SettingsScrapingPanel.tsx b/ui/v2.5/src/components/Settings/SettingsScrapingPanel.tsx
index ecd80ae8a..d0453fbb4 100644
--- a/ui/v2.5/src/components/Settings/SettingsScrapingPanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsScrapingPanel.tsx
@@ -8,9 +8,11 @@ import {
useListSceneScrapers,
useListGalleryScrapers,
} from "src/core/StashService";
-import { useToast } from "src/hooks";
-import { TextUtils } from "src/utils";
-import { CollapseButton, Icon, LoadingIndicator } from "src/components/Shared";
+import { useToast } from "src/hooks/Toast";
+import TextUtils from "src/utils/text";
+import { CollapseButton } from "../Shared/CollapseButton";
+import { Icon } from "../Shared/Icon";
+import { LoadingIndicator } from "../Shared/LoadingIndicator";
import { ScrapeType } from "src/core/generated-graphql";
import { SettingSection } from "./SettingSection";
import { BooleanSetting, StringListSetting, StringSetting } from "./Inputs";
@@ -75,31 +77,17 @@ const URLList: React.FC = ({ urls }) => {
export const SettingsScrapingPanel: React.FC = () => {
const Toast = useToast();
const intl = useIntl();
- const {
- data: performerScrapers,
- loading: loadingPerformers,
- } = useListPerformerScrapers();
- const {
- data: sceneScrapers,
- loading: loadingScenes,
- } = useListSceneScrapers();
- const {
- data: galleryScrapers,
- loading: loadingGalleries,
- } = useListGalleryScrapers();
- const {
- data: movieScrapers,
- loading: loadingMovies,
- } = useListMovieScrapers();
+ const { data: performerScrapers, loading: loadingPerformers } =
+ useListPerformerScrapers();
+ const { data: sceneScrapers, loading: loadingScenes } =
+ useListSceneScrapers();
+ const { data: galleryScrapers, loading: loadingGalleries } =
+ useListGalleryScrapers();
+ const { data: movieScrapers, loading: loadingMovies } =
+ useListMovieScrapers();
- const {
- general,
- scraping,
- loading,
- error,
- saveGeneral,
- saveScraping,
- } = React.useContext(SettingStateContext);
+ const { general, scraping, loading, error, saveGeneral, saveScraping } =
+ React.useContext(SettingStateContext);
async function onReloadScrapers() {
await mutateReloadScrapers().catch((e) => Toast.error(e));
diff --git a/ui/v2.5/src/components/Settings/SettingsSecurityPanel.tsx b/ui/v2.5/src/components/Settings/SettingsSecurityPanel.tsx
index 02d1fae1d..b99217938 100644
--- a/ui/v2.5/src/components/Settings/SettingsSecurityPanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsSecurityPanel.tsx
@@ -5,8 +5,8 @@ import * as GQL from "src/core/generated-graphql";
import { Button, Form } from "react-bootstrap";
import { useIntl } from "react-intl";
import { SettingStateContext } from "./context";
-import { LoadingIndicator } from "../Shared";
-import { useToast } from "src/hooks";
+import { LoadingIndicator } from "../Shared/LoadingIndicator";
+import { useToast } from "src/hooks/Toast";
import { useGenerateAPIKey } from "src/core/StashService";
type AuthenticationSettingsInput = Pick<
@@ -71,14 +71,8 @@ export const SettingsSecurityPanel: React.FC = () => {
const intl = useIntl();
const Toast = useToast();
- const {
- general,
- apiKey,
- loading,
- error,
- saveGeneral,
- refetch,
- } = React.useContext(SettingStateContext);
+ const { general, apiKey, loading, error, saveGeneral, refetch } =
+ React.useContext(SettingStateContext);
const [generateAPIKey] = useGenerateAPIKey();
diff --git a/ui/v2.5/src/components/Settings/SettingsServicesPanel.tsx b/ui/v2.5/src/components/Settings/SettingsServicesPanel.tsx
index 51d30b1dc..2db88f926 100644
--- a/ui/v2.5/src/components/Settings/SettingsServicesPanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsServicesPanel.tsx
@@ -8,8 +8,11 @@ import {
useAddTempDLNAIP,
useRemoveTempDLNAIP,
} from "src/core/StashService";
-import { useToast } from "src/hooks";
-import { DurationInput, Icon, LoadingIndicator, Modal } from "../Shared";
+import { useToast } from "src/hooks/Toast";
+import { DurationInput } from "../Shared/DurationInput";
+import { Icon } from "../Shared/Icon";
+import { LoadingIndicator } from "../Shared/LoadingIndicator";
+import { ModalComponent } from "../Shared/Modal";
import { SettingSection } from "./SettingSection";
import { BooleanSetting, StringListSetting, StringSetting } from "./Inputs";
import { SettingStateContext } from "./context";
@@ -23,9 +26,12 @@ export const SettingsServicesPanel: React.FC = () => {
const intl = useIntl();
const Toast = useToast();
- const { dlna, loading: configLoading, error, saveDLNA } = React.useContext(
- SettingStateContext
- );
+ const {
+ dlna,
+ loading: configLoading,
+ error,
+ saveDLNA,
+ } = React.useContext(SettingStateContext);
// undefined to hide dialog, true for enable, false for disable
const [enableDisable, setEnableDisable] = useState(
@@ -233,7 +239,7 @@ export const SettingsServicesPanel: React.FC = () => {
const capitalised = `${text[0].toUpperCase()}${text.slice(1)}`;
return (
- {
Duration to {text} for - in minutes.
-
+
);
}
function renderTempWhitelistDialog() {
return (
- {
Duration to allow for - in minutes.
-
+
);
}
diff --git a/ui/v2.5/src/components/Settings/SettingsSystemPanel.tsx b/ui/v2.5/src/components/Settings/SettingsSystemPanel.tsx
index 46d02ba80..c5b0f36c1 100644
--- a/ui/v2.5/src/components/Settings/SettingsSystemPanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsSystemPanel.tsx
@@ -1,12 +1,13 @@
import React from "react";
import * as GQL from "src/core/generated-graphql";
-import { LoadingIndicator } from "src/components/Shared";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { SettingSection } from "./SettingSection";
import {
BooleanSetting,
ModalSetting,
NumberSetting,
SelectSetting,
+ StringListSetting,
StringSetting,
} from "./Inputs";
import { SettingStateContext } from "./context";
@@ -14,11 +15,13 @@ import {
VideoPreviewInput,
VideoPreviewSettingsInput,
} from "./GeneratePreviewOptions";
+import { useIntl } from "react-intl";
export const SettingsConfigurationPanel: React.FC = () => {
- const { general, loading, error, saveGeneral } = React.useContext(
- SettingStateContext
- );
+ const intl = useIntl();
+
+ const { general, loading, error, saveGeneral } =
+ React.useContext(SettingStateContext);
const transcodeQualities = [
GQL.StreamingResolutionEnum.Low,
@@ -94,20 +97,23 @@ export const SettingsConfigurationPanel: React.FC = () => {
return GQL.HashAlgorithm.Md5;
}
+ function blobStorageTypeToID(value: GQL.BlobsStorageType | undefined) {
+ switch (value) {
+ case GQL.BlobsStorageType.Database:
+ return "blobs_storage_type.database";
+ case GQL.BlobsStorageType.Filesystem:
+ return "blobs_storage_type.filesystem";
+ }
+
+ return "blobs_storage_type.database";
+ }
+
if (error) return {error.message}
;
if (loading) return
- saveGeneral({ databasePath: v })}
- />
-
{
onChange={(v) => saveGeneral({ generatedPath: v })}
/>
+ saveGeneral({ cachePath: v })}
+ />
+
{
onChange={(v) => saveGeneral({ metadataPath: v })}
/>
- saveGeneral({ cachePath: v })}
- />
-
{
/>
+
+ saveGeneral({ databasePath: v })}
+ />
+
+ saveGeneral({ blobsStorage: v as GQL.BlobsStorageType })
+ }
+ >
+ {Object.values(GQL.BlobsStorageType).map((q) => (
+
+ ))}
+
+ saveGeneral({ blobsPath: v })}
+ />
+
+
{
))}
+
+ saveGeneral({ transcodeHardwareAcceleration: v })}
+ />
+
+ saveGeneral({ transcodeInputArgs: v })}
+ value={general.transcodeInputArgs ?? []}
+ />
+ saveGeneral({ transcodeOutputArgs: v })}
+ value={general.transcodeOutputArgs ?? []}
+ />
+
+ saveGeneral({ liveTranscodeInputArgs: v })}
+ value={general.liveTranscodeInputArgs ?? []}
+ />
+ saveGeneral({ liveTranscodeOutputArgs: v })}
+ value={general.liveTranscodeOutputArgs ?? []}
+ />
@@ -285,6 +361,16 @@ export const SettingsConfigurationPanel: React.FC = () => {
/>
+
+ saveGeneral({ drawFunscriptHeatmapRange: v })}
+ />
+
+
= ({
}
return (
- = ({
{msg}
-
+
);
};
@@ -149,10 +152,12 @@ const CleanOptions: React.FC = ({
interface IDataManagementTasks {
setIsBackupRunning: (v: boolean) => void;
+ setIsAnonymiseRunning: (v: boolean) => void;
}
export const DataManagementTasks: React.FC = ({
setIsBackupRunning,
+ setIsAnonymiseRunning,
}) => {
const intl = useIntl();
const Toast = useToast();
@@ -167,6 +172,17 @@ export const DataManagementTasks: React.FC = ({
dryRun: false,
});
+ const [migrateBlobsOptions, setMigrateBlobsOptions] =
+ useState({
+ deleteOld: true,
+ });
+
+ const [migrateSceneScreenshotsOptions, setMigrateSceneScreenshotsOptions] =
+ useState({
+ deleteFiles: false,
+ overwriteExisting: false,
+ });
+
type DialogOpenState = typeof dialogOpen;
function setDialogOpen(s: Partial) {
@@ -192,7 +208,7 @@ export const DataManagementTasks: React.FC = ({
function renderImportAlert() {
return (
- = ({
cancel={{ onClick: () => setDialogOpen({ importAlert: false }) }}
>
{intl.formatMessage({ id: "actions.tasks.import_warning" })}
-
+
);
}
@@ -253,13 +269,49 @@ export const DataManagementTasks: React.FC = ({
}
}
+ async function onMigrateSceneScreenshots() {
+ try {
+ await mutateMigrateSceneScreenshots(migrateSceneScreenshotsOptions);
+ Toast.success({
+ content: intl.formatMessage(
+ { id: "config.tasks.added_job_to_queue" },
+ {
+ operation_name: intl.formatMessage({
+ id: "actions.migrate_scene_screenshots",
+ }),
+ }
+ ),
+ });
+ } catch (err) {
+ Toast.error(err);
+ }
+ }
+
+ async function onMigrateBlobs() {
+ try {
+ await mutateMigrateBlobs(migrateBlobsOptions);
+ Toast.success({
+ content: intl.formatMessage(
+ { id: "config.tasks.added_job_to_queue" },
+ {
+ operation_name: intl.formatMessage({
+ id: "actions.migrate_blobs",
+ }),
+ }
+ ),
+ });
+ } catch (err) {
+ Toast.error(err);
+ }
+ }
+
async function onExport() {
try {
await mutateMetadataExport();
Toast.success({
content: intl.formatMessage(
{ id: "config.tasks.added_job_to_queue" },
- { operation_name: intl.formatMessage({ id: "actions.backup" }) }
+ { operation_name: intl.formatMessage({ id: "actions.export" }) }
),
});
} catch (err) {
@@ -286,6 +338,25 @@ export const DataManagementTasks: React.FC = ({
}
}
+ async function onAnonymise(download?: boolean) {
+ try {
+ setIsAnonymiseRunning(true);
+ const ret = await mutateAnonymiseDatabase({
+ download,
+ });
+
+ // download the result
+ if (download && ret.data && ret.data.anonymiseDatabase) {
+ const link = ret.data.anonymiseDatabase;
+ downloadFile(link);
+ }
+ } catch (e) {
+ Toast.error(e);
+ } finally {
+ setIsAnonymiseRunning(false);
+ }
+ }
+
return (
{renderImportAlert()}
@@ -361,7 +432,7 @@ export const DataManagementTasks: React.FC = ({
type="submit"
onClick={() => onExport()}
>
- = ({
+
+
+ [origFilename].anonymous.sqlite.[schemaVersion].[YYYYMMDD_HHMMSS]
+
+ ),
+ }
+ )}
+ >
+
+
+
+
+
+
+
+
= ({
+
+
+
+
+
+
+
+ setMigrateBlobsOptions({ ...migrateBlobsOptions, deleteOld: v })
+ }
+ />
+
+
+
+
+
+
+
+
+ setMigrateSceneScreenshotsOptions({
+ ...migrateSceneScreenshotsOptions,
+ overwriteExisting: v,
+ })
+ }
+ />
+
+
+ setMigrateSceneScreenshotsOptions({
+ ...migrateSceneScreenshotsOptions,
+ deleteFiles: v,
+ })
+ }
+ />
+
);
diff --git a/ui/v2.5/src/components/Settings/Tasks/DirectorySelectionDialog.tsx b/ui/v2.5/src/components/Settings/Tasks/DirectorySelectionDialog.tsx
index 84b1e0d5a..30e64ebcd 100644
--- a/ui/v2.5/src/components/Settings/Tasks/DirectorySelectionDialog.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/DirectorySelectionDialog.tsx
@@ -6,7 +6,8 @@ import {
import React, { useState } from "react";
import { Button, Col, Form, Row } from "react-bootstrap";
import { useIntl } from "react-intl";
-import { Icon, Modal } from "src/components/Shared";
+import { Icon } from "src/components/Shared/Icon";
+import { ModalComponent } from "src/components/Shared/Modal";
import { FolderSelect } from "src/components/Shared/FolderSelect/FolderSelect";
import { ConfigurationContext } from "src/hooks/Config";
@@ -17,12 +18,9 @@ interface IDirectorySelectionDialogProps {
onClose: (paths?: string[]) => void;
}
-export const DirectorySelectionDialog: React.FC = ({
- animation,
- allowEmpty = false,
- initialPaths = [],
- onClose,
-}) => {
+export const DirectorySelectionDialog: React.FC<
+ IDirectorySelectionDialogProps
+> = ({ animation, allowEmpty = false, initialPaths = [], onClose }) => {
const intl = useIntl();
const { configuration } = React.useContext(ConfigurationContext);
@@ -42,7 +40,7 @@ export const DirectorySelectionDialog: React.FC
}
return (
-
}
/>
-
+
);
};
diff --git a/ui/v2.5/src/components/Settings/Tasks/GenerateOptions.tsx b/ui/v2.5/src/components/Settings/Tasks/GenerateOptions.tsx
index 5e8864f26..4436bf179 100644
--- a/ui/v2.5/src/components/Settings/Tasks/GenerateOptions.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/GenerateOptions.tsx
@@ -26,6 +26,12 @@ export const GenerateOptions: React.FC = ({
return (
<>
+ setOptions({ covers: v })}
+ />
= (
}
return (
- = (
-
+
);
};
diff --git a/ui/v2.5/src/components/Settings/Tasks/JobTable.tsx b/ui/v2.5/src/components/Settings/Tasks/JobTable.tsx
index b88107434..2d394a5e0 100644
--- a/ui/v2.5/src/components/Settings/Tasks/JobTable.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/JobTable.tsx
@@ -6,7 +6,7 @@ import {
useJobsSubscribe,
} from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
-import { Icon } from "src/components/Shared";
+import { Icon } from "src/components/Shared/Icon";
import { useIntl } from "react-intl";
import {
faBan,
diff --git a/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx b/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
index 82c4c3b17..6069ef433 100644
--- a/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
@@ -7,18 +7,18 @@ import {
mutateMetadataGenerate,
useConfigureDefaults,
} from "src/core/StashService";
-import { withoutTypename } from "src/utils";
+import { withoutTypename } from "src/utils/data";
import { ConfigurationContext } from "src/hooks/Config";
import { IdentifyDialog } from "../../Dialogs/IdentifyDialog/IdentifyDialog";
import * as GQL from "src/core/generated-graphql";
import { DirectorySelectionDialog } from "./DirectorySelectionDialog";
import { ScanOptions } from "./ScanOptions";
-import { useToast } from "src/hooks";
+import { useToast } from "src/hooks/Toast";
import { GenerateOptions } from "./GenerateOptions";
import { SettingSection } from "../SettingSection";
import { BooleanSetting, Setting, SettingGroup } from "../Inputs";
import { ManualLink } from "src/components/Help/context";
-import { Icon } from "src/components/Shared";
+import { Icon } from "src/components/Shared/Icon";
import { faQuestionCircle } from "@fortawesome/free-solid-svg-icons";
interface IAutoTagOptions {
@@ -81,17 +81,16 @@ export const LibraryTasks: React.FC = () => {
});
const [scanOptions, setScanOptions] = useState({});
- const [
- autoTagOptions,
- setAutoTagOptions,
- ] = useState({
- performers: ["*"],
- studios: ["*"],
- tags: ["*"],
- });
+ const [autoTagOptions, setAutoTagOptions] =
+ useState({
+ performers: ["*"],
+ studios: ["*"],
+ tags: ["*"],
+ });
function getDefaultGenerateOptions(): GQL.GenerateMetadataInput {
return {
+ covers: true,
sprites: true,
phashes: true,
previews: true,
@@ -104,10 +103,8 @@ export const LibraryTasks: React.FC = () => {
};
}
- const [
- generateOptions,
- setGenerateOptions,
- ] = useState(getDefaultGenerateOptions());
+ const [generateOptions, setGenerateOptions] =
+ useState(getDefaultGenerateOptions());
type DialogOpenState = typeof dialogOpen;
diff --git a/ui/v2.5/src/components/Settings/Tasks/PluginTasks.tsx b/ui/v2.5/src/components/Settings/Tasks/PluginTasks.tsx
index d1d9ab9e9..396e1d66a 100644
--- a/ui/v2.5/src/components/Settings/Tasks/PluginTasks.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/PluginTasks.tsx
@@ -2,7 +2,7 @@ import React from "react";
import { useIntl } from "react-intl";
import { Button, Form } from "react-bootstrap";
import { mutateRunPluginTask, usePlugins } from "src/core/StashService";
-import { useToast } from "src/hooks";
+import { useToast } from "src/hooks/Toast";
import * as GQL from "src/core/generated-graphql";
import { SettingSection } from "../SettingSection";
import { Setting, SettingGroup } from "../Inputs";
diff --git a/ui/v2.5/src/components/Settings/Tasks/ScanOptions.tsx b/ui/v2.5/src/components/Settings/Tasks/ScanOptions.tsx
index 2f9497ee3..1a965ead3 100644
--- a/ui/v2.5/src/components/Settings/Tasks/ScanOptions.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/ScanOptions.tsx
@@ -12,6 +12,7 @@ export const ScanOptions: React.FC = ({
setOptions: setOptionsState,
}) => {
const {
+ scanGenerateCovers,
scanGeneratePreviews,
scanGenerateImagePreviews,
scanGenerateSprites,
@@ -25,6 +26,12 @@ export const ScanOptions: React.FC = ({
return (
<>
+ setOptions({ scanGenerateCovers: v })}
+ />
{
const intl = useIntl();
const [isBackupRunning, setIsBackupRunning] = useState(false);
+ const [isAnonymiseRunning, setIsAnonymiseRunning] = useState(false);
if (isBackupRunning) {
return (
@@ -18,6 +19,16 @@ export const SettingsTasksPanel: React.FC = () => {
);
}
+ if (isAnonymiseRunning) {
+ return (
+
-
({});
- const [pendingGeneral, setPendingGeneral] = useState<
- GQL.ConfigGeneralInput | undefined
- >();
+ const [pendingGeneral, setPendingGeneral] =
+ useState();
const [updateGeneralConfig] = useConfigureGeneral();
const [iface, setIface] = useState({});
- const [pendingInterface, setPendingInterface] = useState<
- GQL.ConfigInterfaceInput | undefined
- >();
+ const [pendingInterface, setPendingInterface] =
+ useState();
const [updateInterfaceConfig] = useConfigureInterface();
const [defaults, setDefaults] = useState({});
- const [pendingDefaults, setPendingDefaults] = useState<
- GQL.ConfigDefaultSettingsInput | undefined
- >();
+ const [pendingDefaults, setPendingDefaults] =
+ useState();
const [updateDefaultsConfig] = useConfigureDefaults();
const [scraping, setScraping] = useState({});
- const [pendingScraping, setPendingScraping] = useState<
- GQL.ConfigScrapingInput | undefined
- >();
+ const [pendingScraping, setPendingScraping] =
+ useState();
const [updateScrapingConfig] = useConfigureScraping();
const [dlna, setDLNA] = useState({});
- const [pendingDLNA, setPendingDLNA] = useState<
- GQL.ConfigDlnaInput | undefined
- >();
+ const [pendingDLNA, setPendingDLNA] = useState();
const [updateDLNAConfig] = useConfigureDLNA();
const [ui, setUI] = useState({});
- const [pendingUI, setPendingUI] = useState<{} | undefined>();
+ const [pendingUI, setPendingUI] = useState<{}>();
const [updateUIConfig] = useConfigureUI();
- const [updateSuccess, setUpdateSuccess] = useState();
+ const [updateSuccess, setUpdateSuccess] = useState();
const [apiKey, setApiKey] = useState("");
@@ -146,13 +134,7 @@ export const SettingsContext: React.FC = ({ children }) => {
setUI(data.configuration.ui);
}, [data, error]);
- const resetSuccess = useMemo(
- () =>
- debounce(() => {
- setUpdateSuccess(undefined);
- }, 4000),
- []
- );
+ const resetSuccess = useDebounce(() => setUpdateSuccess(undefined), [], 4000);
const onSuccess = useCallback(() => {
setUpdateSuccess(true);
@@ -160,24 +142,24 @@ export const SettingsContext: React.FC = ({ children }) => {
}, [resetSuccess]);
// saves the configuration if no further changes are made after a half second
- const saveGeneralConfig = useMemo(
- () =>
- debounce(async (input: GQL.ConfigGeneralInput) => {
- try {
- setUpdateSuccess(undefined);
- await updateGeneralConfig({
- variables: {
- input,
- },
- });
+ const saveGeneralConfig = useDebounce(
+ async (input: GQL.ConfigGeneralInput) => {
+ try {
+ setUpdateSuccess(undefined);
+ await updateGeneralConfig({
+ variables: {
+ input,
+ },
+ });
- setPendingGeneral(undefined);
- onSuccess();
- } catch (e) {
- setSaveError(e);
- }
- }, 500),
- [updateGeneralConfig, onSuccess]
+ setPendingGeneral(undefined);
+ onSuccess();
+ } catch (e) {
+ setSaveError(e);
+ }
+ },
+ [updateGeneralConfig, onSuccess],
+ 500
);
useEffect(() => {
@@ -210,24 +192,24 @@ export const SettingsContext: React.FC = ({ children }) => {
}
// saves the configuration if no further changes are made after a half second
- const saveInterfaceConfig = useMemo(
- () =>
- debounce(async (input: GQL.ConfigInterfaceInput) => {
- try {
- setUpdateSuccess(undefined);
- await updateInterfaceConfig({
- variables: {
- input,
- },
- });
+ const saveInterfaceConfig = useDebounce(
+ async (input: GQL.ConfigInterfaceInput) => {
+ try {
+ setUpdateSuccess(undefined);
+ await updateInterfaceConfig({
+ variables: {
+ input,
+ },
+ });
- setPendingInterface(undefined);
- onSuccess();
- } catch (e) {
- setSaveError(e);
- }
- }, 500),
- [updateInterfaceConfig, onSuccess]
+ setPendingInterface(undefined);
+ onSuccess();
+ } catch (e) {
+ setSaveError(e);
+ }
+ },
+ [updateInterfaceConfig, onSuccess],
+ 500
);
useEffect(() => {
@@ -260,24 +242,24 @@ export const SettingsContext: React.FC = ({ children }) => {
}
// saves the configuration if no further changes are made after a half second
- const saveDefaultsConfig = useMemo(
- () =>
- debounce(async (input: GQL.ConfigDefaultSettingsInput) => {
- try {
- setUpdateSuccess(undefined);
- await updateDefaultsConfig({
- variables: {
- input,
- },
- });
+ const saveDefaultsConfig = useDebounce(
+ async (input: GQL.ConfigDefaultSettingsInput) => {
+ try {
+ setUpdateSuccess(undefined);
+ await updateDefaultsConfig({
+ variables: {
+ input,
+ },
+ });
- setPendingDefaults(undefined);
- onSuccess();
- } catch (e) {
- setSaveError(e);
- }
- }, 500),
- [updateDefaultsConfig, onSuccess]
+ setPendingDefaults(undefined);
+ onSuccess();
+ } catch (e) {
+ setSaveError(e);
+ }
+ },
+ [updateDefaultsConfig, onSuccess],
+ 500
);
useEffect(() => {
@@ -310,24 +292,24 @@ export const SettingsContext: React.FC = ({ children }) => {
}
// saves the configuration if no further changes are made after a half second
- const saveScrapingConfig = useMemo(
- () =>
- debounce(async (input: GQL.ConfigScrapingInput) => {
- try {
- setUpdateSuccess(undefined);
- await updateScrapingConfig({
- variables: {
- input,
- },
- });
+ const saveScrapingConfig = useDebounce(
+ async (input: GQL.ConfigScrapingInput) => {
+ try {
+ setUpdateSuccess(undefined);
+ await updateScrapingConfig({
+ variables: {
+ input,
+ },
+ });
- setPendingScraping(undefined);
- onSuccess();
- } catch (e) {
- setSaveError(e);
- }
- }, 500),
- [updateScrapingConfig, onSuccess]
+ setPendingScraping(undefined);
+ onSuccess();
+ } catch (e) {
+ setSaveError(e);
+ }
+ },
+ [updateScrapingConfig, onSuccess],
+ 500
);
useEffect(() => {
@@ -360,24 +342,24 @@ export const SettingsContext: React.FC = ({ children }) => {
}
// saves the configuration if no further changes are made after a half second
- const saveDLNAConfig = useMemo(
- () =>
- debounce(async (input: GQL.ConfigDlnaInput) => {
- try {
- setUpdateSuccess(undefined);
- await updateDLNAConfig({
- variables: {
- input,
- },
- });
+ const saveDLNAConfig = useDebounce(
+ async (input: GQL.ConfigDlnaInput) => {
+ try {
+ setUpdateSuccess(undefined);
+ await updateDLNAConfig({
+ variables: {
+ input,
+ },
+ });
- setPendingDLNA(undefined);
- onSuccess();
- } catch (e) {
- setSaveError(e);
- }
- }, 500),
- [updateDLNAConfig, onSuccess]
+ setPendingDLNA(undefined);
+ onSuccess();
+ } catch (e) {
+ setSaveError(e);
+ }
+ },
+ [updateDLNAConfig, onSuccess],
+ 500
);
useEffect(() => {
@@ -410,24 +392,24 @@ export const SettingsContext: React.FC = ({ children }) => {
}
// saves the configuration if no further changes are made after a half second
- const saveUIConfig = useMemo(
- () =>
- debounce(async (input: IUIConfig) => {
- try {
- setUpdateSuccess(undefined);
- await updateUIConfig({
- variables: {
- input,
- },
- });
+ const saveUIConfig = useDebounce(
+ async (input: IUIConfig) => {
+ try {
+ setUpdateSuccess(undefined);
+ await updateUIConfig({
+ variables: {
+ input,
+ },
+ });
- setPendingUI(undefined);
- onSuccess();
- } catch (e) {
- setSaveError(e);
- }
- }, 500),
- [updateUIConfig, onSuccess]
+ setPendingUI(undefined);
+ onSuccess();
+ } catch (e) {
+ setSaveError(e);
+ }
+ },
+ [updateUIConfig, onSuccess],
+ 500
);
useEffect(() => {
diff --git a/ui/v2.5/src/components/Setup/Migrate.tsx b/ui/v2.5/src/components/Setup/Migrate.tsx
index 57ac073c8..9f27d7805 100644
--- a/ui/v2.5/src/components/Setup/Migrate.tsx
+++ b/ui/v2.5/src/components/Setup/Migrate.tsx
@@ -1,11 +1,11 @@
import React, { useEffect, useMemo, useState } from "react";
import { Button, Card, Container, Form } from "react-bootstrap";
import { useIntl, FormattedMessage } from "react-intl";
-import { getBaseURL } from "src/core/createClient";
+import { useHistory } from "react-router-dom";
import * as GQL from "src/core/generated-graphql";
import { useSystemStatus, mutateMigrate } from "src/core/StashService";
import { migrationNotes } from "src/docs/en/MigrationNotes";
-import { LoadingIndicator } from "../Shared";
+import { LoadingIndicator } from "../Shared/LoadingIndicator";
import { MarkdownPage } from "../Shared/MarkdownPage";
export const Migrate: React.FC = () => {
@@ -15,6 +15,7 @@ export const Migrate: React.FC = () => {
const [migrateError, setMigrateError] = useState("");
const intl = useIntl();
+ const history = useHistory();
// if database path includes path separators, then this is passed through
// to the migration path. Extract the base name of the database file.
@@ -109,8 +110,7 @@ export const Migrate: React.FC = () => {
systemStatus.systemStatus.status !== GQL.SystemStatusEnum.NeedsMigration
) {
// redirect to main page
- const newURL = new URL("/", window.location.toString());
- window.location.href = newURL.toString();
+ history.push("/");
return ([]);
const [showStashAlert, setShowStashAlert] = useState(false);
- const [generatedLocation, setGeneratedLocation] = useState("");
const [databaseFile, setDatabaseFile] = useState("");
+ const [generatedLocation, setGeneratedLocation] = useState("");
+ const [cacheLocation, setCacheLocation] = useState("");
+ const [blobsLocation, setBlobsLocation] = useState("blobs");
const [loading, setLoading] = useState(false);
const [setupError, setSetupError] = useState("");
const intl = useIntl();
+ const history = useHistory();
- const [showGeneratedDialog, setShowGeneratedDialog] = useState(false);
+ const [showGeneratedSelectDialog, setShowGeneratedSelectDialog] =
+ useState(false);
+ const [showCacheSelectDialog, setShowCacheSelectDialog] = useState(false);
+ const [showBlobsDialog, setShowBlobsDialog] = useState(false);
const { data: systemStatus, loading: statusLoading } = useSystemStatus();
@@ -111,7 +124,7 @@ export const Setup: React.FC = () => {
}
return (
- {
-
+
);
}
@@ -226,20 +239,36 @@ export const Setup: React.FC = () => {
);
}
- function onGeneratedClosed(d?: string) {
+ function onGeneratedSelectClosed(d?: string) {
if (d) {
setGeneratedLocation(d);
}
- setShowGeneratedDialog(false);
+ setShowGeneratedSelectDialog(false);
}
function maybeRenderGeneratedSelectDialog() {
- if (!showGeneratedDialog) {
+ if (!showGeneratedSelectDialog) {
return;
}
- return
+
+
+
+ {chunks},
+ }}
+ />
+
+
+ ) =>
+ setCacheLocation(e.currentTarget.value)
+ }
+ />
+
+
+
+
+
+ );
+ }
+ }
+
+ function maybeRenderBlobs() {
+ if (!configuration?.general.blobsPath) {
+ return (
+
+
+
+
+ {chunks},
+ }}
+ />
+
+
+ {chunks},
+ strong: (chunks: string) => {chunks},
+ }}
+ />
+
+
+ ) =>
+ setBlobsLocation(e.currentTarget.value)
+ }
+ />
+
+
@@ -321,6 +457,13 @@ export const Setup: React.FC = () => {
code: (chunks: string) => {chunks},
}}
/>
+
+ {chunks},
+ }}
+ />
{
/>
{maybeRenderGenerated()}
+ {maybeRenderCache()}
+ {maybeRenderBlobs()}
@@ -397,8 +542,19 @@ export const Setup: React.FC = () => {
configLocation,
databaseFile,
generatedLocation,
+ cacheLocation,
+ blobsLocation,
stashes,
});
+ // Set lastNoteSeen to hide release notes dialog
+ await saveUI({
+ variables: {
+ input: {
+ ...configuration?.ui,
+ lastNoteSeen: releaseNotes[0].date,
+ },
+ },
+ });
} catch (e) {
if (e instanceof Error) setSetupError(e.message ?? e.toString());
} finally {
@@ -457,6 +613,32 @@ export const Setup: React.FC = () => {
+
+ -
+
+ -
+
+ {cacheLocation !== ""
+ ? cacheLocation
+ : intl.formatMessage({
+ id: "setup.confirm.default_cache_location",
+ })}
+
+
+ -
+
+ -
+
+ {blobsLocation !== ""
+ ? blobsLocation
+ : intl.formatMessage({
+ id: "setup.confirm.default_blobs_location",
+ })}
+
+
+
@@ -576,7 +758,7 @@ export const Setup: React.FC = () => {
-
);
};
-
-export default CountryLabel;
diff --git a/ui/v2.5/src/components/Shared/CountrySelect.tsx b/ui/v2.5/src/components/Shared/CountrySelect.tsx
index e354279fd..659731725 100644
--- a/ui/v2.5/src/components/Shared/CountrySelect.tsx
+++ b/ui/v2.5/src/components/Shared/CountrySelect.tsx
@@ -1,25 +1,27 @@
import React from "react";
import Creatable from "react-select/creatable";
import { useIntl } from "react-intl";
-import { getCountries } from "src/utils";
-import CountryLabel from "./CountryLabel";
+import { getCountries } from "src/utils/country";
+import { CountryLabel } from "./CountryLabel";
interface IProps {
- value?: string | undefined;
+ value?: string;
onChange?: (value: string) => void;
disabled?: boolean;
className?: string;
showFlag?: boolean;
isClearable?: boolean;
+ menuPortalTarget?: HTMLElement | null;
}
-const CountrySelect: React.FC = ({
+export const CountrySelect: React.FC = ({
value,
onChange,
disabled = false,
isClearable = true,
showFlag,
className,
+ menuPortalTarget,
}) => {
const { locale } = useIntl();
const options = getCountries(locale);
@@ -44,8 +46,7 @@ const CountrySelect: React.FC = ({
IndicatorSeparator: null,
}}
className={`CountrySelect ${className}`}
+ menuPortalTarget={menuPortalTarget}
/>
);
};
-
-export default CountrySelect;
diff --git a/ui/v2.5/src/components/Shared/DateInput.tsx b/ui/v2.5/src/components/Shared/DateInput.tsx
new file mode 100644
index 000000000..aa57fd37f
--- /dev/null
+++ b/ui/v2.5/src/components/Shared/DateInput.tsx
@@ -0,0 +1,105 @@
+import { faCalendar } from "@fortawesome/free-regular-svg-icons";
+import React, { useMemo } from "react";
+import { Button, InputGroup, Form } from "react-bootstrap";
+import ReactDatePicker from "react-datepicker";
+import TextUtils from "src/utils/text";
+import { Icon } from "./Icon";
+
+import "react-datepicker/dist/react-datepicker.css";
+import { useIntl } from "react-intl";
+
+interface IProps {
+ disabled?: boolean;
+ value: string | undefined;
+ isTime?: boolean;
+ onValueChange(value: string): void;
+ placeholder?: string;
+ error?: string;
+}
+
+export const DateInput: React.FC = (props: IProps) => {
+ const intl = useIntl();
+
+ const date = useMemo(() => {
+ const toDate = props.isTime
+ ? TextUtils.stringToFuzzyDateTime
+ : TextUtils.stringToFuzzyDate;
+ if (props.value) {
+ const ret = toDate(props.value);
+ if (!ret || isNaN(ret.getTime())) {
+ return undefined;
+ }
+
+ return ret;
+ }
+ }, [props.value, props.isTime]);
+
+ function maybeRenderButton() {
+ if (!props.disabled) {
+ const ShowPickerButton = ({
+ onClick,
+ }: {
+ onClick: (
+ event: React.MouseEvent
+ ) => void;
+ }) => (
+
+ );
+
+ const dateToString = props.isTime
+ ? TextUtils.dateTimeToString
+ : TextUtils.dateToString;
+
+ return (
+ {
+ props.onValueChange(v ? dateToString(v) : "");
+ }}
+ customInput={React.createElement(ShowPickerButton)}
+ showMonthDropdown
+ showYearDropdown
+ scrollableMonthYearDropdown
+ scrollableYearDropdown
+ maxDate={new Date()}
+ yearDropdownItemNumber={100}
+ portalId="date-picker-portal"
+ showTimeSelect={props.isTime}
+ />
+ );
+ }
+ }
+
+ const placeholderText = intl.formatMessage({
+ id: props.isTime ? "datetime_format" : "date_format",
+ });
+
+ return (
+
+
+ ) =>
+ props.onValueChange(e.currentTarget.value)
+ }
+ placeholder={
+ !props.disabled
+ ? props.placeholder
+ ? `${props.placeholder} (${placeholderText})`
+ : placeholderText
+ : undefined
+ }
+ isInvalid={!!props.error}
+ />
+ {maybeRenderButton()}
+
+ {props.error}
+
+
+
+ );
+};
diff --git a/ui/v2.5/src/components/Shared/DeleteEntityDialog.tsx b/ui/v2.5/src/components/Shared/DeleteEntityDialog.tsx
index cf6284982..4fd5114c8 100644
--- a/ui/v2.5/src/components/Shared/DeleteEntityDialog.tsx
+++ b/ui/v2.5/src/components/Shared/DeleteEntityDialog.tsx
@@ -2,8 +2,8 @@ import React, { useState } from "react";
import { defineMessages, FormattedMessage, useIntl } from "react-intl";
import { FetchResult } from "@apollo/client";
-import Modal from "src/components/Shared/Modal";
-import { useToast } from "src/hooks";
+import { ModalComponent } from "./Modal";
+import { useToast } from "src/hooks/Toast";
import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
interface IDeletionEntity {
@@ -39,7 +39,7 @@ const messages = defineMessages({
},
});
-const DeleteEntityDialog: React.FC = ({
+export const DeleteEntityDialog: React.FC = ({
selected,
onClose,
singularEntity,
@@ -77,7 +77,7 @@ const DeleteEntityDialog: React.FC = ({
}
return (
- = ({
/>
)}
-
+
);
};
-
-export default DeleteEntityDialog;
diff --git a/ui/v2.5/src/components/Shared/DeleteFilesDialog.tsx b/ui/v2.5/src/components/Shared/DeleteFilesDialog.tsx
index 9e23c400f..e6898c87a 100644
--- a/ui/v2.5/src/components/Shared/DeleteFilesDialog.tsx
+++ b/ui/v2.5/src/components/Shared/DeleteFilesDialog.tsx
@@ -1,7 +1,7 @@
import React, { useState } from "react";
import { mutateDeleteFiles } from "src/core/StashService";
-import { Modal } from "src/components/Shared";
-import { useToast } from "src/hooks";
+import { ModalComponent } from "./Modal";
+import { useToast } from "src/hooks/Toast";
import { FormattedMessage, useIntl } from "react-intl";
import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
@@ -88,7 +88,7 @@ export const DeleteFilesDialog: React.FC = (
}
return (
- = (
>
{message}
{renderDeleteFileAlert()}
-
+
);
};
-
-export default DeleteFilesDialog;
diff --git a/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx b/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx
index 5c4854c02..fb5646ff5 100644
--- a/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx
+++ b/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx
@@ -1,7 +1,7 @@
import { Button, Modal } from "react-bootstrap";
import React, { useState } from "react";
import { FormattedMessage, useIntl } from "react-intl";
-import { ImageInput } from "src/components/Shared/ImageInput";
+import { ImageInput } from "./ImageInput";
import cx from "classnames";
interface IProps {
diff --git a/ui/v2.5/src/components/Shared/DurationInput.tsx b/ui/v2.5/src/components/Shared/DurationInput.tsx
index b5839790b..0e346acd7 100644
--- a/ui/v2.5/src/components/Shared/DurationInput.tsx
+++ b/ui/v2.5/src/components/Shared/DurationInput.tsx
@@ -5,8 +5,8 @@ import {
} from "@fortawesome/free-solid-svg-icons";
import React, { useState, useEffect } from "react";
import { Button, ButtonGroup, InputGroup, Form } from "react-bootstrap";
-import Icon from "src/components/Shared/Icon";
-import { DurationUtils } from "src/utils";
+import { Icon } from "./Icon";
+import DurationUtils from "src/utils/duration";
interface IProps {
disabled?: boolean;
diff --git a/ui/v2.5/src/components/Shared/ErrorMessage.tsx b/ui/v2.5/src/components/Shared/ErrorMessage.tsx
index 2e40a35df..b0cdb12f3 100644
--- a/ui/v2.5/src/components/Shared/ErrorMessage.tsx
+++ b/ui/v2.5/src/components/Shared/ErrorMessage.tsx
@@ -4,10 +4,8 @@ interface IProps {
error: string | ReactNode;
}
-const ErrorMessage: React.FC = ({ error }) => (
+export const ErrorMessage: React.FC = ({ error }) => (
Error: {error}
);
-
-export default ErrorMessage;
diff --git a/ui/v2.5/src/components/Shared/ExportDialog.tsx b/ui/v2.5/src/components/Shared/ExportDialog.tsx
index 3c0ad5b7c..bf855d732 100644
--- a/ui/v2.5/src/components/Shared/ExportDialog.tsx
+++ b/ui/v2.5/src/components/Shared/ExportDialog.tsx
@@ -1,8 +1,8 @@
import React, { useState } from "react";
import { Form } from "react-bootstrap";
import { mutateExportObjects } from "src/core/StashService";
-import Modal from "src/components/Shared/Modal";
-import useToast from "src/hooks/Toast";
+import { ModalComponent } from "./Modal";
+import { useToast } from "src/hooks/Toast";
import downloadFile from "src/utils/download";
import { ExportObjectsInput } from "src/core/generated-graphql";
import { useIntl } from "react-intl";
@@ -46,7 +46,7 @@ export const ExportDialog: React.FC = (
}
return (
- = (
/>
-
+
);
};
diff --git a/ui/v2.5/src/components/Shared/FolderSelect/FolderSelect.tsx b/ui/v2.5/src/components/Shared/FolderSelect/FolderSelect.tsx
index f6c6de544..9dfd61f5b 100644
--- a/ui/v2.5/src/components/Shared/FolderSelect/FolderSelect.tsx
+++ b/ui/v2.5/src/components/Shared/FolderSelect/FolderSelect.tsx
@@ -1,17 +1,20 @@
-import React, { useEffect, useState, useMemo } from "react";
+import React, { useEffect, useState } from "react";
import { FormattedMessage, useIntl } from "react-intl";
-import { Button, InputGroup, Form } from "react-bootstrap";
-import debounce from "lodash-es/debounce";
-import Icon from "src/components/Shared/Icon";
-import LoadingIndicator from "src/components/Shared/LoadingIndicator";
+import { Button, InputGroup, Form, Collapse } from "react-bootstrap";
+import { Icon } from "../Icon";
+import { LoadingIndicator } from "../LoadingIndicator";
import { useDirectory } from "src/core/StashService";
-import { faTimes } from "@fortawesome/free-solid-svg-icons";
+import { faEllipsis, faTimes } from "@fortawesome/free-solid-svg-icons";
+import { useDebouncedSetState } from "src/hooks/debounce";
interface IProps {
currentDirectory: string;
setCurrentDirectory: (value: string) => void;
defaultDirectories?: string[];
appendButton?: JSX.Element;
+ collapsible?: boolean;
+ quoteSpaced?: boolean;
+ hideError?: boolean;
}
export const FolderSelect: React.FC = ({
@@ -19,33 +22,43 @@ export const FolderSelect: React.FC = ({
setCurrentDirectory,
defaultDirectories,
appendButton,
+ collapsible = false,
+ quoteSpaced = false,
+ hideError = false,
}) => {
- const [debouncedDirectory, setDebouncedDirectory] = useState(
- currentDirectory
+ const [showBrowser, setShowBrowser] = React.useState(false);
+ const [directory, setDirectory] = useState(currentDirectory);
+
+ const isQuoted =
+ quoteSpaced && directory.startsWith('"') && directory.endsWith('"');
+ const { data, error, loading } = useDirectory(
+ isQuoted ? directory.slice(1, -1) : directory
);
- const { data, error, loading } = useDirectory(debouncedDirectory);
+
const intl = useIntl();
- const selectableDirectories: string[] = currentDirectory
- ? data?.directory.directories ?? defaultDirectories ?? []
- : defaultDirectories ?? [];
+ const defaultDirectoriesOrEmpty = defaultDirectories ?? [];
- const debouncedSetDirectory = useMemo(
- () =>
- debounce((input: string) => {
- setDebouncedDirectory(input);
- }, 250),
- []
- );
+ const selectableDirectories: string[] = currentDirectory
+ ? data?.directory.directories ??
+ (error && hideError ? [] : defaultDirectoriesOrEmpty)
+ : defaultDirectoriesOrEmpty;
+
+ const debouncedSetDirectory = useDebouncedSetState(setDirectory, 250);
useEffect(() => {
- if (currentDirectory === "" && !defaultDirectories && data?.directory.path)
- setCurrentDirectory(data.directory.path);
- }, [currentDirectory, setCurrentDirectory, data, defaultDirectories]);
+ if (currentDirectory !== directory) {
+ debouncedSetDirectory(currentDirectory);
+ }
+ }, [currentDirectory, directory, debouncedSetDirectory]);
function setInstant(value: string) {
+ if (quoteSpaced && value.includes(" ")) {
+ value = `"${value}"`;
+ }
+
setCurrentDirectory(value);
- setDebouncedDirectory(value);
+ setDirectory(value);
}
function setDebounced(value: string) {
@@ -74,6 +87,7 @@ export const FolderSelect: React.FC = ({
<>
) => {
setDebounced(e.currentTarget.value);
@@ -84,31 +98,43 @@ export const FolderSelect: React.FC = ({
{appendButton ? (
{appendButton}
) : undefined}
+ {collapsible ? (
+
+
+
+ ) : undefined}
{!data || !data.directory || loading ? (
{loading ? (
) : undefined}
- {error !== undefined && (
+ {!hideError && error !== undefined && (
Error: {error.message}
)}
-
- {topDirectory}
- {selectableDirectories.map((path) => {
- return (
- -
-
-
- );
- })}
-
+
+
+ {topDirectory}
+ {selectableDirectories.map((path) => {
+ return (
+ -
+
+
+ );
+ })}
+
+
);
};
diff --git a/ui/v2.5/src/components/Shared/GridCard.tsx b/ui/v2.5/src/components/Shared/GridCard.tsx
index f7ec2ee81..332bcaf04 100644
--- a/ui/v2.5/src/components/Shared/GridCard.tsx
+++ b/ui/v2.5/src/components/Shared/GridCard.tsx
@@ -2,7 +2,7 @@ import React from "react";
import { Card, Form } from "react-bootstrap";
import { Link } from "react-router-dom";
import cx from "classnames";
-import TruncatedText from "./TruncatedText";
+import { TruncatedText } from "./TruncatedText";
interface ICardProps {
className?: string;
@@ -10,7 +10,7 @@ interface ICardProps {
thumbnailSectionClassName?: string;
url: string;
pretitleIcon?: JSX.Element;
- title: string;
+ title: JSX.Element | string;
image: JSX.Element;
details?: JSX.Element;
overlays?: JSX.Element;
diff --git a/ui/v2.5/src/components/Shared/Icon.tsx b/ui/v2.5/src/components/Shared/Icon.tsx
index d1f2616f6..f5cb23964 100644
--- a/ui/v2.5/src/components/Shared/Icon.tsx
+++ b/ui/v2.5/src/components/Shared/Icon.tsx
@@ -9,7 +9,7 @@ interface IIcon {
size?: SizeProp;
}
-const Icon: React.FC = ({ icon, className, color, size }) => (
+export const Icon: React.FC = ({ icon, className, color, size }) => (
= ({ icon, className, color, size }) => (
size={size}
/>
);
-
-export default Icon;
diff --git a/ui/v2.5/src/components/Shared/ImageInput.tsx b/ui/v2.5/src/components/Shared/ImageInput.tsx
index f1ace6f83..cf25aa887 100644
--- a/ui/v2.5/src/components/Shared/ImageInput.tsx
+++ b/ui/v2.5/src/components/Shared/ImageInput.tsx
@@ -8,8 +8,8 @@ import {
Row,
} from "react-bootstrap";
import { useIntl } from "react-intl";
-import Modal from "./Modal";
-import Icon from "./Icon";
+import { ModalComponent } from "./Modal";
+import { Icon } from "./Icon";
import { faFile, faLink } from "@fortawesome/free-solid-svg-icons";
interface IImageInput {
@@ -64,7 +64,7 @@ export const ImageInput: React.FC = ({
function renderDialog() {
return (
- setIsShowDialog(false)}
header={intl.formatMessage({ id: "dialogs.set_image_url_title" })}
@@ -90,7 +90,7 @@ export const ImageInput: React.FC = ({
-
+
);
}
diff --git a/ui/v2.5/src/components/Shared/LoadingIndicator.tsx b/ui/v2.5/src/components/Shared/LoadingIndicator.tsx
index f52498f0b..3b9247c91 100644
--- a/ui/v2.5/src/components/Shared/LoadingIndicator.tsx
+++ b/ui/v2.5/src/components/Shared/LoadingIndicator.tsx
@@ -12,7 +12,7 @@ interface ILoadingProps {
const CLASSNAME = "LoadingIndicator";
const CLASSNAME_MESSAGE = `${CLASSNAME}-message`;
-const LoadingIndicator: React.FC = ({
+export const LoadingIndicator: React.FC = ({
message,
inline = false,
small = false,
@@ -27,5 +27,3 @@ const LoadingIndicator: React.FC = ({
)}
);
-
-export default LoadingIndicator;
diff --git a/ui/v2.5/src/components/Shared/MarkdownPage.tsx b/ui/v2.5/src/components/Shared/MarkdownPage.tsx
index b9fc93eba..c9713be55 100644
--- a/ui/v2.5/src/components/Shared/MarkdownPage.tsx
+++ b/ui/v2.5/src/components/Shared/MarkdownPage.tsx
@@ -1,11 +1,10 @@
import React, { useEffect, useState } from "react";
-import ReactMarkdown from "react-markdown";
-import gfm from "remark-gfm";
+import { Remark } from "react-remark";
+import remarkGfm from "remark-gfm";
interface IPageProps {
// page is a markdown module
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- page: any;
+ page: string;
}
export const MarkdownPage: React.FC = ({ page }) => {
@@ -20,8 +19,8 @@ export const MarkdownPage: React.FC = ({ page }) => {
}, [page, markdown]);
return (
-
- {markdown}
-
+
+ {markdown}
+
);
};
diff --git a/ui/v2.5/src/components/Shared/Modal.tsx b/ui/v2.5/src/components/Shared/Modal.tsx
index 8cf3b8029..df2e2f270 100644
--- a/ui/v2.5/src/components/Shared/Modal.tsx
+++ b/ui/v2.5/src/components/Shared/Modal.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { Button, Modal, Spinner, ModalProps } from "react-bootstrap";
-import Icon from "src/components/Shared/Icon";
+import { Icon } from "./Icon";
import { IconDefinition } from "@fortawesome/fontawesome-svg-core";
import { FormattedMessage } from "react-intl";
@@ -27,7 +27,7 @@ interface IModal {
const defaultOnHide = () => {};
-const ModalComponent: React.FC = ({
+export const ModalComponent: React.FC = ({
children,
show,
icon,
@@ -99,5 +99,3 @@ const ModalComponent: React.FC = ({
);
-
-export default ModalComponent;
diff --git a/ui/v2.5/src/components/Shared/MultiSet.tsx b/ui/v2.5/src/components/Shared/MultiSet.tsx
index 6f7aa08e4..c19922683 100644
--- a/ui/v2.5/src/components/Shared/MultiSet.tsx
+++ b/ui/v2.5/src/components/Shared/MultiSet.tsx
@@ -1,15 +1,9 @@
-import * as React from "react";
+import React from "react";
import { useIntl } from "react-intl";
import * as GQL from "src/core/generated-graphql";
import { Button, ButtonGroup } from "react-bootstrap";
-import { FilterSelect } from "./Select";
-
-type ValidTypes =
- | GQL.SlimPerformerDataFragment
- | GQL.SlimTagDataFragment
- | GQL.SlimStudioDataFragment
- | GQL.SlimMovieDataFragment;
+import { FilterSelect, SelectObject } from "./Select";
interface IMultiSetProps {
type: "performers" | "studios" | "tags" | "movies";
@@ -21,9 +15,7 @@ interface IMultiSetProps {
onSetMode: (mode: GQL.BulkUpdateIdMode) => void;
}
-const MultiSet: React.FunctionComponent = (
- props: IMultiSetProps
-) => {
+export const MultiSet: React.FC = (props) => {
const intl = useIntl();
const modes = [
GQL.BulkUpdateIdMode.Set,
@@ -31,7 +23,7 @@ const MultiSet: React.FunctionComponent = (
GQL.BulkUpdateIdMode.Remove,
];
- function onUpdate(items: ValidTypes[]) {
+ function onUpdate(items: SelectObject[]) {
props.onUpdate(items.map((i) => i.id));
}
@@ -102,5 +94,3 @@ const MultiSet: React.FunctionComponent = (
);
};
-
-export default MultiSet;
diff --git a/ui/v2.5/src/components/Shared/OperationButton.tsx b/ui/v2.5/src/components/Shared/OperationButton.tsx
index c71d9e139..89155467c 100644
--- a/ui/v2.5/src/components/Shared/OperationButton.tsx
+++ b/ui/v2.5/src/components/Shared/OperationButton.tsx
@@ -1,6 +1,6 @@
import React, { useState, useRef, useEffect } from "react";
import { Button, ButtonProps } from "react-bootstrap";
-import LoadingIndicator from "src/components/Shared/LoadingIndicator";
+import { LoadingIndicator } from "./LoadingIndicator";
interface IOperationButton extends ButtonProps {
operation?: () => Promise;
diff --git a/ui/v2.5/src/components/Shared/PercentInput.tsx b/ui/v2.5/src/components/Shared/PercentInput.tsx
index 783ead755..66357a05b 100644
--- a/ui/v2.5/src/components/Shared/PercentInput.tsx
+++ b/ui/v2.5/src/components/Shared/PercentInput.tsx
@@ -5,8 +5,8 @@ import {
} from "@fortawesome/free-solid-svg-icons";
import React, { useState, useEffect } from "react";
import { Button, ButtonGroup, InputGroup, Form } from "react-bootstrap";
-import Icon from "src/components/Shared/Icon";
-import { PercentUtils } from "src/utils";
+import { Icon } from "./Icon";
+import PercentUtils from "src/utils/percent";
interface IProps {
disabled?: boolean;
diff --git a/ui/v2.5/src/components/Shared/PerformerPopoverButton.tsx b/ui/v2.5/src/components/Shared/PerformerPopoverButton.tsx
index d12da10d3..9d0cfb6fe 100644
--- a/ui/v2.5/src/components/Shared/PerformerPopoverButton.tsx
+++ b/ui/v2.5/src/components/Shared/PerformerPopoverButton.tsx
@@ -5,7 +5,7 @@ import { Link } from "react-router-dom";
import * as GQL from "src/core/generated-graphql";
import { sortPerformers } from "src/core/performers";
import { HoverPopover } from "./HoverPopover";
-import Icon from "./Icon";
+import { Icon } from "./Icon";
import { TagLink } from "./TagLink";
interface IProps {
diff --git a/ui/v2.5/src/components/Shared/PopoverCountButton.tsx b/ui/v2.5/src/components/Shared/PopoverCountButton.tsx
index 901424b98..6d6ef8571 100644
--- a/ui/v2.5/src/components/Shared/PopoverCountButton.tsx
+++ b/ui/v2.5/src/components/Shared/PopoverCountButton.tsx
@@ -3,6 +3,7 @@ import {
faImage,
faImages,
faPlayCircle,
+ faUser,
} from "@fortawesome/free-solid-svg-icons";
import React, { useMemo } from "react";
import { Button } from "react-bootstrap";
@@ -10,10 +11,10 @@ import { FormattedNumber, useIntl } from "react-intl";
import { Link } from "react-router-dom";
import { IUIConfig } from "src/core/config";
import { ConfigurationContext } from "src/hooks/Config";
-import { TextUtils } from "src/utils";
-import Icon from "./Icon";
+import TextUtils from "src/utils/text";
+import { Icon } from "./Icon";
-type PopoverLinkType = "scene" | "image" | "gallery" | "movie";
+type PopoverLinkType = "scene" | "image" | "gallery" | "movie" | "performer";
interface IProps {
className?: string;
@@ -44,6 +45,8 @@ export const PopoverCountButton: React.FC = ({
return faImages;
case "movie":
return faFilm;
+ case "performer":
+ return faUser;
}
}
@@ -69,6 +72,11 @@ export const PopoverCountButton: React.FC = ({
one: "movie",
other: "movies",
};
+ case "performer":
+ return {
+ one: "performer",
+ other: "performers",
+ };
}
}
diff --git a/ui/v2.5/src/components/Shared/Rating/RatingStars.tsx b/ui/v2.5/src/components/Shared/Rating/RatingStars.tsx
index e2801ee80..99e2e5be6 100644
--- a/ui/v2.5/src/components/Shared/Rating/RatingStars.tsx
+++ b/ui/v2.5/src/components/Shared/Rating/RatingStars.tsx
@@ -1,6 +1,6 @@
import React, { useState } from "react";
import { Button } from "react-bootstrap";
-import Icon from "src/components/Shared/Icon";
+import { Icon } from "../Icon";
import { faStar as fasStar } from "@fortawesome/free-solid-svg-icons";
import { faStar as farStar } from "@fortawesome/free-regular-svg-icons";
import {
@@ -32,7 +32,8 @@ export const RatingStars: React.FC = (
starPrecision: props.precision,
});
const stars = rating ? Math.floor(rating) : 0;
- const fraction = rating ? rating % 1 : 0;
+ // the upscaling was necesary to fix rounding issue present with tenth place precision
+ const fraction = rating ? ((rating * 10) % 10) / 10 : 0;
const max = 5;
const precision = getRatingPrecision(props.precision);
@@ -223,11 +224,28 @@ export const RatingStars: React.FC = (
);
};
+ const maybeRenderStarRatingNumber = () => {
+ const ratingFraction = getCurrentSelectedRating();
+ if (
+ !ratingFraction ||
+ (ratingFraction.rating == 0 && ratingFraction.fraction == 0)
+ ) {
+ return;
+ }
+
+ return (
+
+ {ratingFraction.rating + ratingFraction.fraction}
+
+ );
+ };
+
return (
{Array.from(Array(max)).map((value, index) =>
renderRatingButton(index + 1)
)}
+ {maybeRenderStarRatingNumber()}
);
};
diff --git a/ui/v2.5/src/components/Shared/Rating/styles.scss b/ui/v2.5/src/components/Shared/Rating/styles.scss
index 2784943bb..f7b463359 100644
--- a/ui/v2.5/src/components/Shared/Rating/styles.scss
+++ b/ui/v2.5/src/components/Shared/Rating/styles.scss
@@ -21,18 +21,50 @@
width: 0;
}
+ &.star-fill-10 .filled-star {
+ width: 10%;
+ }
+
+ &.star-fill-20 .filled-star {
+ width: 20%;
+ }
+
&.star-fill-25 .filled-star {
width: 35%;
}
+ &.star-fill-30 .filled-star {
+ width: 30%;
+ }
+
+ &.star-fill-40 .filled-star {
+ width: 40%;
+ }
+
&.star-fill-50 .filled-star {
width: 50%;
}
+ &.star-fill-60 .filled-star {
+ width: 60%;
+ }
+
&.star-fill-75 .filled-star {
width: 65%;
}
+ &.star-fill-70 .filled-star {
+ width: 70%;
+ }
+
+ &.star-fill-80 .filled-star {
+ width: 80%;
+ }
+
+ &.star-fill-90 .filled-star {
+ width: 90%;
+ }
+
&.star-fill-100 .filled-star {
width: 100%;
}
@@ -56,6 +88,11 @@
}
}
+.star-rating-number {
+ font-size: 1rem;
+ margin: auto 0.5rem;
+}
+
.rating-number.disabled {
align-items: center;
display: inline-flex;
diff --git a/ui/v2.5/src/components/Shared/ReassignFilesDialog.tsx b/ui/v2.5/src/components/Shared/ReassignFilesDialog.tsx
index 8a15359b2..7629d0379 100644
--- a/ui/v2.5/src/components/Shared/ReassignFilesDialog.tsx
+++ b/ui/v2.5/src/components/Shared/ReassignFilesDialog.tsx
@@ -1,10 +1,11 @@
import React, { useState } from "react";
-import { Modal, SceneSelect } from "src/components/Shared";
-import { useToast } from "src/hooks";
+import { ModalComponent } from "./Modal";
+import { SceneSelect } from "./Select";
+import { useToast } from "src/hooks/Toast";
import { useIntl } from "react-intl";
import { faSignOutAlt } from "@fortawesome/free-solid-svg-icons";
import { Col, Form, Row } from "react-bootstrap";
-import { FormUtils } from "src/utils";
+import FormUtils from "src/utils/form";
import { mutateSceneAssignFile } from "src/core/StashService";
interface IFile {
@@ -59,7 +60,7 @@ export const ReassignFilesDialog: React.FC = (
}
return (
- = (
-
+
);
};
-
-export default ReassignFilesDialog;
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog.tsx b/ui/v2.5/src/components/Shared/ScrapeDialog.tsx
index 57609635e..0a5b1b9b2 100644
--- a/ui/v2.5/src/components/Shared/ScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog.tsx
@@ -8,9 +8,9 @@ import {
FormControl,
Badge,
} from "react-bootstrap";
-import { CollapseButton } from "src/components/Shared/CollapseButton";
-import Icon from "src/components/Shared/Icon";
-import Modal from "src/components/Shared/Modal";
+import { CollapseButton } from "./CollapseButton";
+import { Icon } from "./Icon";
+import { ModalComponent } from "./Modal";
import isEqual from "lodash-es/isEqual";
import clone from "lodash-es/clone";
import { FormattedMessage, useIntl } from "react-intl";
@@ -20,8 +20,8 @@ import {
faPlus,
faTimes,
} from "@fortawesome/free-solid-svg-icons";
-import { getCountryByISO } from "src/utils";
-import CountrySelect from "./CountrySelect";
+import { getCountryByISO } from "src/utils/country";
+import { CountrySelect } from "./CountrySelect";
export class ScrapeResult {
public newValue?: T;
@@ -36,10 +36,13 @@ export class ScrapeResult {
) {
this.originalValue = originalValue ?? undefined;
this.newValue = newValue ?? undefined;
+ // NOTE: this means that zero values are treated as null
+ // this is incorrect for numbers and booleans, but correct for strings
+ const hasNewValue = !!this.newValue;
const valuesEqual = isEqual(originalValue, newValue);
- this.useNewValue = useNewValue ?? (!!this.newValue && !valuesEqual);
- this.scraped = !!this.newValue && !valuesEqual;
+ this.useNewValue = useNewValue ?? (hasNewValue && !valuesEqual);
+ this.scraped = hasNewValue && !valuesEqual;
}
public setOriginalValue(value?: T) {
@@ -67,6 +70,23 @@ export class ScrapeResult {
}
}
+// for types where !!value is a valid value (boolean and number)
+export class ZeroableScrapeResult extends ScrapeResult {
+ public constructor(
+ originalValue?: T | null,
+ newValue?: T | null,
+ useNewValue?: boolean
+ ) {
+ super(originalValue, newValue, useNewValue);
+
+ const hasNewValue = this.newValue !== undefined;
+
+ const valuesEqual = isEqual(originalValue, newValue);
+ this.useNewValue = useNewValue ?? (hasNewValue && !valuesEqual);
+ this.scraped = hasNewValue && !valuesEqual;
+ }
+}
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export function hasScrapedValues(values: ScrapeResult[]) {
return values.some((r) => r.scraped);
@@ -367,7 +387,7 @@ export const ScrapeDialog: React.FC = (
) => {
const intl = useIntl();
return (
- = (
{props.renderScrapeRows()}
-
+
);
};
diff --git a/ui/v2.5/src/components/Shared/Select.tsx b/ui/v2.5/src/components/Shared/Select.tsx
index 8b44b864c..195c52bd7 100644
--- a/ui/v2.5/src/components/Shared/Select.tsx
+++ b/ui/v2.5/src/components/Shared/Select.tsx
@@ -1,16 +1,15 @@
import React, { useEffect, useMemo, useState } from "react";
import Select, {
- ValueType,
- Styles,
+ OnChangeValue,
+ StylesConfig,
OptionProps,
components as reactSelectComponents,
- GroupedOptionsType,
- OptionsType,
- MenuListComponentProps,
- GroupTypeBase,
+ Options,
+ MenuListProps,
+ GroupBase,
+ OptionsOrGroups,
} from "react-select";
import CreatableSelect from "react-select/creatable";
-import debounce from "lodash-es/debounce";
import * as GQL from "src/core/generated-graphql";
import {
@@ -23,19 +22,21 @@ import {
useStudioCreate,
usePerformerCreate,
} from "src/core/StashService";
-import { useToast } from "src/hooks";
-import { SelectComponents } from "react-select/src/components";
+import { useToast } from "src/hooks/Toast";
+import { SelectComponents } from "react-select/dist/declarations/src/components";
import { ConfigurationContext } from "src/hooks/Config";
import { useIntl } from "react-intl";
import { objectTitle } from "src/core/files";
import { galleryTitle } from "src/core/galleries";
import { TagPopover } from "../Tags/TagPopover";
+import { defaultMaxOptionsShown, IUIConfig } from "src/core/config";
+import { useDebouncedSetState } from "src/hooks/debounce";
-export type ValidTypes =
- | GQL.SlimPerformerDataFragment
- | GQL.SlimTagDataFragment
- | GQL.SlimStudioDataFragment
- | GQL.SlimMovieDataFragment;
+export type SelectObject = {
+ id: string;
+ name?: string | null;
+ title?: string | null;
+};
type Option = { value: string; label: string };
interface ITypeProps {
@@ -53,7 +54,7 @@ interface ITypeProps {
interface IFilterProps {
ids?: string[];
initialIds?: string[];
- onSelect?: (item: ValidTypes[]) => void;
+ onSelect?: (item: SelectObject[]) => void;
noSelectionString?: string;
className?: string;
isMulti?: boolean;
@@ -65,22 +66,22 @@ interface IFilterProps {
interface ISelectProps {
className?: string;
items: Option[];
- selectedOptions?: ValueType;
+ selectedOptions?: OnChangeValue;
creatable?: boolean;
onCreateOption?: (value: string) => void;
isLoading: boolean;
isDisabled?: boolean;
- onChange: (item: ValueType) => void;
+ onChange: (item: OnChangeValue) => void;
initialIds?: string[];
isMulti: T;
isClearable?: boolean;
onInputChange?: (input: string) => void;
- components?: Partial>;
+ components?: Partial>>;
filterOption?: (option: Option, rawInput: string) => boolean;
isValidNewOption?: (
inputValue: string,
- value: ValueType,
- options: OptionsType
diff --git a/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx b/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx
index b16da38b5..96ace1609 100644
--- a/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx
+++ b/ui/v2.5/src/components/Images/ImageDetails/ImageEditPanel.tsx
@@ -9,13 +9,18 @@ import {
PerformerSelect,
TagSelect,
StudioSelect,
- LoadingIndicator,
-} from "src/components/Shared";
-import { useToast } from "src/hooks";
-import { FormUtils } from "src/utils";
+} from "src/components/Shared/Select";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
+import { URLField } from "src/components/Shared/URLField";
+import { useToast } from "src/hooks/Toast";
+import FormUtils from "src/utils/form";
import { useFormik } from "formik";
import { Prompt } from "react-router-dom";
import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
+import { useRatingKeybinds } from "src/hooks/keybinds";
+import { ConfigurationContext } from "src/hooks/Config";
+import isEqual from "lodash-es/isEqual";
+import { DateInput } from "src/components/Shared/DateInput";
interface IProps {
image: GQL.ImageDataFragment;
@@ -34,36 +39,61 @@ export const ImageEditPanel: React.FC = ({
// Network state
const [isLoading, setIsLoading] = useState(false);
+ const { configuration } = React.useContext(ConfigurationContext);
+
const [updateImage] = useImageUpdate();
const schema = yup.object({
- title: yup.string().optional().nullable(),
- rating100: yup.number().optional().nullable(),
- studio_id: yup.string().optional().nullable(),
- performer_ids: yup.array(yup.string().required()).optional().nullable(),
- tag_ids: yup.array(yup.string().required()).optional().nullable(),
+ title: yup.string().ensure(),
+ url: yup.string().ensure(),
+ date: yup
+ .string()
+ .ensure()
+ .test({
+ name: "date",
+ test: (value) => {
+ if (!value) return true;
+ if (!value.match(/^\d{4}-\d{2}-\d{2}$/)) return false;
+ if (Number.isNaN(Date.parse(value))) return false;
+ return true;
+ },
+ message: intl.formatMessage({ id: "validation.date_invalid_form" }),
+ }),
+ rating100: yup.number().nullable().defined(),
+ studio_id: yup.string().required().nullable(),
+ performer_ids: yup.array(yup.string().required()).defined(),
+ tag_ids: yup.array(yup.string().required()).defined(),
});
const initialValues = {
title: image.title ?? "",
+ url: image?.url ?? "",
+ date: image?.date ?? "",
rating100: image.rating100 ?? null,
- studio_id: image.studio?.id,
+ studio_id: image.studio?.id ?? null,
performer_ids: (image.performers ?? []).map((p) => p.id),
tag_ids: (image.tags ?? []).map((t) => t.id),
};
- type InputValues = typeof initialValues;
+ type InputValues = yup.InferType;
- const formik = useFormik({
+ const formik = useFormik({
initialValues,
+ enableReinitialize: true,
validationSchema: schema,
- onSubmit: (values) => onSave(getImageInput(values)),
+ onSubmit: (values) => onSave(values),
});
function setRating(v: number) {
formik.setFieldValue("rating100", v);
}
+ useRatingKeybinds(
+ true,
+ configuration?.ui?.ratingSystemOptions?.type,
+ setRating
+ );
+
useEffect(() => {
if (isVisible) {
Mousetrap.bind("s s", () => {
@@ -73,52 +103,22 @@ export const ImageEditPanel: React.FC = ({
onDelete();
});
- // numeric keypresses get caught by jwplayer, so blur the element
- // if the rating sequence is started
- Mousetrap.bind("r", () => {
- if (document.activeElement instanceof HTMLElement) {
- document.activeElement.blur();
- }
-
- Mousetrap.bind("0", () => setRating(NaN));
- Mousetrap.bind("1", () => setRating(20));
- Mousetrap.bind("2", () => setRating(40));
- Mousetrap.bind("3", () => setRating(60));
- Mousetrap.bind("4", () => setRating(80));
- Mousetrap.bind("5", () => setRating(100));
-
- setTimeout(() => {
- Mousetrap.unbind("0");
- Mousetrap.unbind("1");
- Mousetrap.unbind("2");
- Mousetrap.unbind("3");
- Mousetrap.unbind("4");
- Mousetrap.unbind("5");
- }, 1000);
- });
-
return () => {
Mousetrap.unbind("s s");
Mousetrap.unbind("d d");
-
- Mousetrap.unbind("r");
};
}
});
- function getImageInput(input: InputValues): GQL.ImageUpdateInput {
- return {
- id: image.id,
- ...input,
- };
- }
-
- async function onSave(input: GQL.ImageUpdateInput) {
+ async function onSave(input: InputValues) {
setIsLoading(true);
try {
const result = await updateImage({
variables: {
- input,
+ input: {
+ id: image.id,
+ ...input,
+ },
},
});
if (result.data?.imageUpdate) {
@@ -128,7 +128,7 @@ export const ImageEditPanel: React.FC = ({
{ entity: intl.formatMessage({ id: "image" }).toLocaleLowerCase() }
),
});
- formik.resetForm({ values: formik.values });
+ formik.resetForm();
}
} catch (e) {
Toast.error(e);
@@ -138,7 +138,7 @@ export const ImageEditPanel: React.FC = ({
function renderTextField(field: string, title: string, placeholder?: string) {
return (
-
+
{FormUtils.renderLabel({
title,
})}
@@ -172,7 +172,7 @@ export const ImageEditPanel: React.FC = ({
- {renderTextField("date", intl.formatMessage({ id: "date" }))}
+
+ {FormUtils.renderLabel({
+ title: intl.formatMessage({ id: "date" }),
+ })}
+ formik.setFieldValue("date", value)}
+ error={formik.errors.date}
+ />
+
+
{FormUtils.renderLabel({
@@ -417,7 +433,7 @@ export const MovieEditPanel: React.FC = ({
onSelect={(items) =>
formik.setFieldValue(
"studio_id",
- items.length > 0 ? items[0]?.id : undefined
+ items.length > 0 ? items[0]?.id : null
)
}
ids={formik.values.studio_id ? [formik.values.studio_id] : []}
@@ -472,19 +488,15 @@ export const MovieEditPanel: React.FC = ({
objectName={movie?.name ?? intl.formatMessage({ id: "movie" })}
isNew={isNew}
isEditing={isEditing}
- onToggleEdit={onCancel}
- onSave={() => formik.handleSubmit()}
- saveDisabled={!formik.dirty}
+ onToggleEdit={onCancelEditing}
+ onSave={formik.handleSubmit}
+ saveDisabled={(!isNew && !formik.dirty) || !isEqual(formik.errors, {})}
onImageChange={onFrontImageChange}
- onImageChangeURL={(i) => formik.setFieldValue("front_image", i)}
- onClearImage={() => {
- formik.setFieldValue("front_image", null);
- }}
+ onImageChangeURL={onFrontImageLoad}
+ onClearImage={() => onFrontImageLoad(null)}
onBackImageChange={onBackImageChange}
- onBackImageChangeURL={(i) => formik.setFieldValue("back_image", i)}
- onClearBackImage={() => {
- formik.setFieldValue("back_image", null);
- }}
+ onBackImageChangeURL={onBackImageLoad}
+ onClearBackImage={() => onBackImageLoad(null)}
onDelete={onDelete}
/>
diff --git a/ui/v2.5/src/components/Movies/MovieDetails/MovieScenesPanel.tsx b/ui/v2.5/src/components/Movies/MovieDetails/MovieScenesPanel.tsx
index 1750bc5f9..22215de5a 100644
--- a/ui/v2.5/src/components/Movies/MovieDetails/MovieScenesPanel.tsx
+++ b/ui/v2.5/src/components/Movies/MovieDetails/MovieScenesPanel.tsx
@@ -5,10 +5,14 @@ import { ListFilterModel } from "src/models/list-filter/filter";
import { SceneList } from "src/components/Scenes/SceneList";
interface IMovieScenesPanel {
+ active: boolean;
movie: GQL.MovieDataFragment;
}
-export const MovieScenesPanel: React.FC = ({ movie }) => {
+export const MovieScenesPanel: React.FC = ({
+ active,
+ movie,
+}) => {
function filterHook(filter: ListFilterModel) {
const movieValue = { id: movie.id, label: movie.name };
// if movie is already present, then we modify it, otherwise add
@@ -43,7 +47,11 @@ export const MovieScenesPanel: React.FC = ({ movie }) => {
if (movie && movie.id) {
return (
- ,
diff --git a/ui/v2.5/src/components/Movies/MovieList.tsx b/ui/v2.5/src/components/Movies/MovieList.tsx
index 51a6bd2b0..c5b6c8ded 100644
--- a/ui/v2.5/src/components/Movies/MovieList.tsx
+++ b/ui/v2.5/src/components/Movies/MovieList.tsx
@@ -3,28 +3,41 @@ import { useIntl } from "react-intl";
import cloneDeep from "lodash-es/cloneDeep";
import Mousetrap from "mousetrap";
import { useHistory } from "react-router-dom";
-import {
- FindMoviesQueryResult,
- SlimMovieDataFragment,
- MovieDataFragment,
-} from "src/core/generated-graphql";
import { ListFilterModel } from "src/models/list-filter/filter";
import { DisplayMode } from "src/models/list-filter/types";
-import { queryFindMovies, useMoviesDestroy } from "src/core/StashService";
+import * as GQL from "src/core/generated-graphql";
import {
- showWhenSelected,
- useMoviesList,
+ queryFindMovies,
+ useFindMovies,
+ useMoviesDestroy,
+} from "src/core/StashService";
+import {
+ makeItemList,
PersistanceLevel,
-} from "src/hooks/ListHook";
-import { ExportDialog, DeleteEntityDialog } from "src/components/Shared";
+ showWhenSelected,
+} from "../List/ItemList";
+import { ExportDialog } from "../Shared/ExportDialog";
+import { DeleteEntityDialog } from "../Shared/DeleteEntityDialog";
import { MovieCard } from "./MovieCard";
import { EditMoviesDialog } from "./EditMoviesDialog";
+const MovieItemList = makeItemList({
+ filterMode: GQL.FilterMode.Movies,
+ useResult: useFindMovies,
+ getItems(result: GQL.FindMoviesQueryResult) {
+ return result?.data?.findMovies?.movies ?? [];
+ },
+ getCount(result: GQL.FindMoviesQueryResult) {
+ return result?.data?.findMovies?.count ?? 0;
+ },
+});
+
interface IMovieList {
filterHook?: (filter: ListFilterModel) => ListFilterModel;
+ alterQuery?: boolean;
}
-export const MovieList: React.FC = ({ filterHook }) => {
+export const MovieList: React.FC = ({ filterHook, alterQuery }) => {
const intl = useIntl();
const history = useHistory();
const [isExportDialogOpen, setIsExportDialogOpen] = useState(false);
@@ -46,10 +59,10 @@ export const MovieList: React.FC = ({ filterHook }) => {
},
];
- const addKeybinds = (
- result: FindMoviesQueryResult,
+ function addKeybinds(
+ result: GQL.FindMoviesQueryResult,
filter: ListFilterModel
- ) => {
+ ) {
Mousetrap.bind("p r", () => {
viewRandom(result, filter);
});
@@ -57,49 +70,14 @@ export const MovieList: React.FC = ({ filterHook }) => {
return () => {
Mousetrap.unbind("p r");
};
- };
-
- function renderEditDialog(
- selectedMovies: MovieDataFragment[],
- onClose: (applied: boolean) => void
- ) {
- return (
- <>
- = ({ filterHook }) => {
filterCopy.itemsPerPage = 1;
filterCopy.currentPage = index + 1;
const singleResult = await queryFindMovies(filterCopy);
- if (
- singleResult &&
- singleResult.data &&
- singleResult.data.findMovies &&
- singleResult.data.findMovies.movies.length === 1
- ) {
- const { id } = singleResult!.data!.findMovies!.movies[0];
+ if (singleResult.data.findMovies.movies.length === 1) {
+ const { id } = singleResult.data.findMovies.movies[0];
// navigate to the movie page
history.push(`/movies/${id}`);
}
@@ -130,10 +103,15 @@ export const MovieList: React.FC = ({ filterHook }) => {
setIsExportDialogOpen(true);
}
- function maybeRenderMovieExportDialog(selectedIds: Set) {
- if (isExportDialogOpen) {
- return (
- <>
+ function renderContent(
+ result: GQL.FindMoviesQueryResult,
+ filter: ListFilterModel,
+ selectedIds: Set,
+ onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
+ ) {
+ function maybeRenderMovieExportDialog() {
+ if (isExportDialogOpen) {
+ return (
= ({ filterHook }) => {
all: isExportAll,
},
}}
- onClose={() => {
- setIsExportDialogOpen(false);
- }}
+ onClose={() => setIsExportDialogOpen(false)}
/>
-
- );
+ );
+ }
}
- }
- function renderContent(
- result: FindMoviesQueryResult,
- filter: ListFilterModel,
- selectedIds: Set
- ) {
- if (!result.data?.findMovies) {
- return;
- }
- if (filter.displayMode === DisplayMode.Grid) {
- return (
- <>
- {maybeRenderMovieExportDialog(selectedIds)}
+ function renderMovies() {
+ if (!result.data?.findMovies) return;
+
+ if (filter.displayMode === DisplayMode.Grid) {
+ return (
{result.data.findMovies.movies.map((p) => (
= ({ filterHook }) => {
selecting={selectedIds.size > 0}
selected={selectedIds.has(p.id)}
onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
- listData.onSelectChange(p.id, selected, shiftKey)
+ onSelectChange(p.id, selected, shiftKey)
}
/>
))}
-
- );
- }
- if (filter.displayMode === DisplayMode.List) {
- return TODO
;
+ );
+ }
+ if (filter.displayMode === DisplayMode.List) {
+ return TODO
;
+ }
}
+ return (
+ <>
+ {maybeRenderMovieExportDialog()}
+ {renderMovies()}
+
+ );
}
- return listData.template;
+ function renderEditDialog(
+ selectedMovies: GQL.MovieDataFragment[],
+ onClose: (applied: boolean) => void
+ ) {
+ return Page not found.
;
};
diff --git a/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx b/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
index 42453a1a6..aff7fa268 100644
--- a/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
+++ b/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
@@ -3,9 +3,9 @@ import { Col, Form, Row } from "react-bootstrap";
import { FormattedMessage, useIntl } from "react-intl";
import { useBulkPerformerUpdate } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
-import { Modal } from "src/components/Shared";
-import { useToast } from "src/hooks";
-import MultiSet from "../Shared/MultiSet";
+import { ModalComponent } from "../Shared/Modal";
+import { useToast } from "src/hooks/Toast";
+import { MultiSet } from "../Shared/MultiSet";
import { RatingSystem } from "../Shared/Rating/RatingSystem";
import {
getAggregateInputValue,
@@ -20,7 +20,7 @@ import {
import { IndeterminateCheckbox } from "../Shared/IndeterminateCheckbox";
import { BulkUpdateTextInput } from "../Shared/BulkUpdateTextInput";
import { faPencilAlt } from "@fortawesome/free-solid-svg-icons";
-import { FormUtils } from "../../utils";
+import FormUtils from "src/utils/form";
interface IListOperationProps {
selected: GQL.SlimPerformerDataFragment[];
@@ -29,6 +29,7 @@ interface IListOperationProps {
const performerFields = [
"favorite",
+ "disambiguation",
"url",
"instagram",
"twitter",
@@ -59,10 +60,8 @@ export const EditPerformersDialog: React.FC = (
mode: GQL.BulkUpdateIdMode.Add,
});
const [existingTagIds, setExistingTagIds] = useState();
- const [
- aggregateState,
- setAggregateState,
- ] = useState({});
+ const [aggregateState, setAggregateState] =
+ useState({});
// weight needs conversion to/from number
const [weight, setWeight] = useState();
const [updateInput, setUpdateInput] = useState(
@@ -182,7 +181,7 @@ export const EditPerformersDialog: React.FC = (
function render() {
return (
- = (
setUpdateField({
gender: stringToGender(event.currentTarget.value),
@@ -243,6 +242,9 @@ export const EditPerformersDialog: React.FC = (
+ {renderTextField("disambiguation", updateInput.disambiguation, (v) =>
+ setUpdateField({ disambiguation: v })
+ )}
{renderTextField("birthdate", updateInput.birthdate, (v) =>
setUpdateField({ birthdate: v })
)}
@@ -315,7 +317,7 @@ export const EditPerformersDialog: React.FC = (
/>
-
+
);
}
diff --git a/ui/v2.5/src/components/Performers/PerformerCard.tsx b/ui/v2.5/src/components/Performers/PerformerCard.tsx
index 26baa8f7a..f11f96dbe 100644
--- a/ui/v2.5/src/components/Performers/PerformerCard.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerCard.tsx
@@ -2,14 +2,13 @@ import React from "react";
import { Link } from "react-router-dom";
import { useIntl } from "react-intl";
import * as GQL from "src/core/generated-graphql";
-import { NavUtils, TextUtils } from "src/utils";
-import {
- GridCard,
- CountryFlag,
- HoverPopover,
- Icon,
- TagLink,
-} from "src/components/Shared";
+import NavUtils from "src/utils/navigation";
+import TextUtils from "src/utils/text";
+import { GridCard } from "../Shared/GridCard";
+import { CountryFlag } from "../Shared/CountryFlag";
+import { HoverPopover } from "../Shared/HoverPopover";
+import { Icon } from "../Shared/Icon";
+import { TagLink } from "../Shared/TagLink";
import { Button, ButtonGroup } from "react-bootstrap";
import {
Criterion,
@@ -19,6 +18,8 @@ import { PopoverCountButton } from "../Shared/PopoverCountButton";
import GenderIcon from "./GenderIcon";
import { faHeart, faTag } from "@fortawesome/free-solid-svg-icons";
import { RatingBanner } from "../Shared/RatingBanner";
+import cx from "classnames";
+import { usePerformerUpdate } from "src/core/StashService";
export interface IPerformerCardExtraCriteria {
scenes: Criterion[];
@@ -61,17 +62,39 @@ export const PerformerCard: React.FC = ({
{ age, years_old: ageL10String }
);
- function maybeRenderFavoriteIcon() {
- if (performer.favorite === false) {
- return;
- }
+ const [updatePerformer] = usePerformerUpdate();
+
+ function renderFavoriteIcon() {
return (
-
- = ({
pretitleIcon={
![]()
= ({
alt={performer.name ?? ""}
src={performer.image_path ?? ""}
/>
- {maybeRenderFavoriteIcon()}
+
+ {renderFavoriteIcon()}
{maybeRenderRatingBanner()}
{maybeRenderFlag()}
@@ -217,9 +250,9 @@ export const PerformerCard: React.FC = ({
) : (
""
)}
- {maybeRenderPopoverButtonGroup()}
}
+ popovers={maybeRenderPopoverButtonGroup()}
selected={selected}
selecting={selecting}
onSelectedChanged={onSelectedChanged}
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
index d3032762f..36b288e9a 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/Performer.tsx
@@ -12,17 +12,16 @@ import {
usePerformerDestroy,
mutateMetadataAutoTag,
} from "src/core/StashService";
-import {
- Counter,
- CountryFlag,
- DetailsEditNavbar,
- ErrorMessage,
- Icon,
- LoadingIndicator,
-} from "src/components/Shared";
-import { useLightbox, useToast } from "src/hooks";
+import { Counter } from "src/components/Shared/Counter";
+import { CountryFlag } from "src/components/Shared/CountryFlag";
+import { DetailsEditNavbar } from "src/components/Shared/DetailsEditNavbar";
+import { ErrorMessage } from "src/components/Shared/ErrorMessage";
+import { Icon } from "src/components/Shared/Icon";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
+import { useLightbox } from "src/hooks/Lightbox/hooks";
+import { useToast } from "src/hooks/Toast";
import { ConfigurationContext } from "src/hooks/Config";
-import { TextUtils } from "src/utils";
+import TextUtils from "src/utils/text";
import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
import { PerformerDetailsPanel } from "./PerformerDetailsPanel";
import { PerformerScenesPanel } from "./PerformerScenesPanel";
@@ -32,13 +31,10 @@ import { PerformerImagesPanel } from "./PerformerImagesPanel";
import { PerformerEditPanel } from "./PerformerEditPanel";
import { PerformerSubmitButton } from "./PerformerSubmitButton";
import GenderIcon from "../GenderIcon";
-import {
- faCamera,
- faDove,
- faHeart,
- faLink,
-} from "@fortawesome/free-solid-svg-icons";
+import { faHeart, faLink } from "@fortawesome/free-solid-svg-icons";
+import { faInstagram, faTwitter } from "@fortawesome/free-brands-svg-icons";
import { IUIConfig } from "src/core/config";
+import { useRatingKeybinds } from "src/hooks/keybinds";
interface IProps {
performer: GQL.PerformerDataFragment;
@@ -53,22 +49,24 @@ const PerformerPage: React.FC = ({ performer }) => {
const intl = useIntl();
const { tab = "details" } = useParams();
+ const [collapsed, setCollapsed] = useState(false);
+
// Configuration settings
const { configuration } = React.useContext(ConfigurationContext);
const abbreviateCounter =
(configuration?.ui as IUIConfig)?.abbreviateCounters ?? false;
- const [imagePreview, setImagePreview] = useState();
- const [imageEncoding, setImageEncoding] = useState(false);
const [isEditing, setIsEditing] = useState(false);
+ const [image, setImage] = useState();
+ const [encodingImage, setEncodingImage] = useState(false);
// if undefined then get the existing image
// if null then get the default (no) image
// otherwise get the set image
const activeImage =
- imagePreview === undefined
+ image === undefined
? performer.image_path ?? ""
- : imagePreview ?? `${performer.image_path}&default=true`;
+ : image ?? `${performer.image_path}&default=true`;
const lightboxImages = useMemo(
() => [{ paths: { thumbnail: activeImage, image: activeImage } }],
[activeImage]
@@ -95,10 +93,6 @@ const PerformerPage: React.FC = ({ performer }) => {
}
};
- const onImageChange = (image?: string | null) => setImagePreview(image);
-
- const onImageEncoding = (isEncoding = false) => setImageEncoding(isEncoding);
-
async function onAutoTag() {
try {
await mutateMetadataAutoTag({ performers: [performer.id] });
@@ -110,6 +104,12 @@ const PerformerPage: React.FC = ({ performer }) => {
}
}
+ useRatingKeybinds(
+ true,
+ configuration?.ui?.ratingSystemOptions?.type,
+ setRating
+ );
+
// set up hotkeys
useEffect(() => {
Mousetrap.bind("a", () => setActiveTabKey("details"));
@@ -118,30 +118,7 @@ const PerformerPage: React.FC = ({ performer }) => {
Mousetrap.bind("g", () => setActiveTabKey("galleries"));
Mousetrap.bind("m", () => setActiveTabKey("movies"));
Mousetrap.bind("f", () => setFavorite(!performer.favorite));
-
- // numeric keypresses get caught by jwplayer, so blur the element
- // if the rating sequence is started
- Mousetrap.bind("r", () => {
- if (document.activeElement instanceof HTMLElement) {
- document.activeElement.blur();
- }
-
- Mousetrap.bind("0", () => setRating(NaN));
- Mousetrap.bind("1", () => setRating(20));
- Mousetrap.bind("2", () => setRating(40));
- Mousetrap.bind("3", () => setRating(60));
- Mousetrap.bind("4", () => setRating(80));
- Mousetrap.bind("5", () => setRating(100));
-
- setTimeout(() => {
- Mousetrap.unbind("0");
- Mousetrap.unbind("1");
- Mousetrap.unbind("2");
- Mousetrap.unbind("3");
- Mousetrap.unbind("4");
- Mousetrap.unbind("5");
- }, 1000);
- });
+ Mousetrap.bind(",", () => setCollapsed(!collapsed));
return () => {
Mousetrap.unbind("a");
@@ -149,6 +126,7 @@ const PerformerPage: React.FC = ({ performer }) => {
Mousetrap.unbind("c");
Mousetrap.unbind("f");
Mousetrap.unbind("o");
+ Mousetrap.unbind(",");
};
});
@@ -210,7 +188,10 @@ const PerformerPage: React.FC = ({ performer }) => {
}
>
- = ({ performer }) => {
}
>
-
= ({ performer }) => {
}
>
-
= ({ performer }) => {
}
>
-
@@ -264,12 +254,9 @@ const PerformerPage: React.FC = ({ performer }) => {
{
- setIsEditing(false);
- }}
+ onCancel={() => setIsEditing(false)}
+ setImage={setImage}
+ setEncodingImage={setEncodingImage}
/>
);
} else {
@@ -296,13 +283,13 @@ const PerformerPage: React.FC = ({ performer }) => {
}
function maybeRenderAliases() {
- if (performer?.aliases) {
+ if (performer?.alias_list?.length) {
return (
= ({ performer }) => {
target="_blank"
rel="noopener noreferrer"
>
- = ({ performer }) => {
target="_blank"
rel="noopener noreferrer"
>
- = ({ performer }) => {
/>
);
+ function getCollapseButtonText() {
+ return collapsed ? ">" : "<";
+ }
+
return (
{performer.name}
-
- {imageEncoding ? (
+
+ {encodingImage ? (
{
- const [imagePreview, setImagePreview] = useState();
- const [imageEncoding, setImageEncoding] = useState(false);
+ const [image, setImage] = useState();
+ const [encodingImage, setEncodingImage] = useState(false);
- function useQuery() {
- const { search } = useLocation();
- return React.useMemo(() => new URLSearchParams(search), [search]);
- }
+ const location = useLocation();
+ const query = useMemo(() => new URLSearchParams(location.search), [location]);
+ const performer = {
+ name: query.get("q") ?? undefined,
+ };
- const query = useQuery();
- const nameQuery = query.get("name");
-
- const activeImage = imagePreview ?? "";
const intl = useIntl();
- const onImageChange = (image?: string | null) => setImagePreview(image);
- const onImageEncoding = (isEncoding = false) => setImageEncoding(isEncoding);
-
function renderPerformerImage() {
- if (imageEncoding) {
+ if (encodingImage) {
return
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
index e8c4ffc3f..9a0aa9f07 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
@@ -1,8 +1,10 @@
import React from "react";
import { FormattedMessage, useIntl } from "react-intl";
-import { TagLink } from "src/components/Shared";
+import { TagLink } from "src/components/Shared/TagLink";
import * as GQL from "src/core/generated-graphql";
-import { TextUtils, getStashboxBase, getCountryByISO } from "src/utils";
+import TextUtils from "src/utils/text";
+import { getStashboxBase } from "src/utils/stashbox";
+import { getCountryByISO } from "src/utils/country";
import { TextField, URLField } from "src/utils/field";
import { cmToImperial, kgToLbs } from "src/utils/units";
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index d9370d9ad..b92330fad 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -13,26 +13,25 @@ import {
useTagCreate,
queryScrapePerformerURL,
} from "src/core/StashService";
-import {
- Icon,
- ImageInput,
- LoadingIndicator,
- CollapseButton,
- TagSelect,
- URLField,
- CountrySelect,
-} from "src/components/Shared";
-import { ImageUtils, getStashIDs } from "src/utils";
-import { useToast } from "src/hooks";
+import { Icon } from "src/components/Shared/Icon";
+import { ImageInput } from "src/components/Shared/ImageInput";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
+import { CollapseButton } from "src/components/Shared/CollapseButton";
+import { TagSelect } from "src/components/Shared/Select";
+import { CountrySelect } from "src/components/Shared/CountrySelect";
+import { URLField } from "src/components/Shared/URLField";
+import ImageUtils from "src/utils/image";
+import { getStashIDs } from "src/utils/stashIds";
+import { stashboxDisplayName } from "src/utils/stashbox";
+import { useToast } from "src/hooks/Toast";
import { Prompt, useHistory } from "react-router-dom";
import { useFormik } from "formik";
import {
- genderStrings,
genderToString,
+ stringGenderMap,
stringToGender,
} from "src/utils/gender";
import { ConfigurationContext } from "src/hooks/Config";
-import { stashboxDisplayName } from "src/utils/stashbox";
import { PerformerScrapeDialog } from "./PerformerScrapeDialog";
import PerformerScrapeModal from "./PerformerScrapeModal";
import PerformerStashBoxModal, { IStashBox } from "./PerformerStashBoxModal";
@@ -42,6 +41,9 @@ import {
faSyncAlt,
faTrashAlt,
} from "@fortawesome/free-solid-svg-icons";
+import { StringListInput } from "src/components/Shared/StringListInput";
+import isEqual from "lodash-es/isEqual";
+import { DateInput } from "src/components/Shared/DateInput";
const isScraper = (
scraper: GQL.Scraper | GQL.StashBox
@@ -49,26 +51,26 @@ const isScraper = (
interface IPerformerDetails {
performer: Partial;
- isNew?: boolean;
isVisible: boolean;
- onImageChange?: (image?: string | null) => void;
- onImageEncoding?: (loading?: boolean) => void;
- onCancelEditing?: () => void;
+ onCancel?: () => void;
+ setImage: (image?: string | null) => void;
+ setEncodingImage: (loading: boolean) => void;
}
export const PerformerEditPanel: React.FC = ({
performer,
- isNew,
isVisible,
- onImageChange,
- onImageEncoding,
- onCancelEditing,
+ onCancel,
+ setImage,
+ setEncodingImage,
}) => {
const Toast = useToast();
const history = useHistory();
+ const isNew = performer.id === undefined;
+
// Editing state
- const [scraper, setScraper] = useState();
+ const [scraper, setScraper] = useState();
const [newTags, setNewTags] = useState();
const [isScraperModalOpen, setIsScraperModalOpen] = useState(false);
@@ -81,18 +83,13 @@ export const PerformerEditPanel: React.FC = ({
const Scrapers = useListPerformerScrapers();
const [queryableScrapers, setQueryableScrapers] = useState([]);
- const [scrapedPerformer, setScrapedPerformer] = useState<
- GQL.ScrapedPerformer | undefined
- >();
+ const [scrapedPerformer, setScrapedPerformer] =
+ useState();
const { configuration: stashConfig } = React.useContext(ConfigurationContext);
- const imageEncoding = ImageUtils.usePasteImage(onImageLoad, true);
-
const [createTag] = useTagCreate();
const intl = useIntl();
- const genderOptions = [""].concat(genderStrings);
-
const labelXS = 3;
const labelXL = 2;
const fieldXS = 9;
@@ -100,62 +97,102 @@ export const PerformerEditPanel: React.FC = ({
const schema = yup.object({
name: yup.string().required(),
- aliases: yup.string().optional(),
- gender: yup.string().optional().oneOf(genderOptions),
- birthdate: yup.string().optional(),
- ethnicity: yup.string().optional(),
- eye_color: yup.string().optional(),
- country: yup.string().optional(),
- height_cm: yup.number().optional(),
- measurements: yup.string().optional(),
- fake_tits: yup.string().optional(),
- career_length: yup.string().optional(),
- tattoos: yup.string().optional(),
- piercings: yup.string().optional(),
- url: yup.string().optional(),
- twitter: yup.string().optional(),
- instagram: yup.string().optional(),
- tag_ids: yup.array(yup.string().required()).optional(),
- stash_ids: yup.mixed().optional(),
- image: yup.string().optional().nullable(),
- details: yup.string().optional(),
- death_date: yup.string().optional(),
- hair_color: yup.string().optional(),
- weight: yup.number().optional(),
- ignore_auto_tag: yup.boolean().optional(),
+ disambiguation: yup.string().ensure(),
+ alias_list: yup
+ .array(yup.string().required())
+ .defined()
+ .test({
+ name: "unique",
+ test: (value, context) => {
+ if (!value) return true;
+ const aliases = new Set(value);
+ aliases.add(context.parent.name);
+ return value.length + 1 === aliases.size;
+ },
+ message: intl.formatMessage({
+ id: "validation.aliases_must_be_unique",
+ }),
+ }),
+ gender: yup.string().ensure(),
+ birthdate: yup
+ .string()
+ .ensure()
+ .test({
+ name: "date",
+ test: (value) => {
+ if (!value) return true;
+ if (!value.match(/^\d{4}-\d{2}-\d{2}$/)) return false;
+ if (Number.isNaN(Date.parse(value))) return false;
+ return true;
+ },
+ message: intl.formatMessage({ id: "validation.date_invalid_form" }),
+ }),
+ death_date: yup
+ .string()
+ .ensure()
+ .test({
+ name: "date",
+ test: (value) => {
+ if (!value) return true;
+ if (!value.match(/^\d{4}-\d{2}-\d{2}$/)) return false;
+ if (Number.isNaN(Date.parse(value))) return false;
+ return true;
+ },
+ message: intl.formatMessage({ id: "validation.date_invalid_form" }),
+ }),
+ country: yup.string().ensure(),
+ ethnicity: yup.string().ensure(),
+ hair_color: yup.string().ensure(),
+ eye_color: yup.string().ensure(),
+ height_cm: yup.number().nullable().defined().default(null),
+ weight: yup.number().nullable().defined().default(null),
+ measurements: yup.string().ensure(),
+ fake_tits: yup.string().ensure(),
+ tattoos: yup.string().ensure(),
+ piercings: yup.string().ensure(),
+ career_length: yup.string().ensure(),
+ url: yup.string().ensure(),
+ twitter: yup.string().ensure(),
+ instagram: yup.string().ensure(),
+ details: yup.string().ensure(),
+ tag_ids: yup.array(yup.string().required()).defined(),
+ ignore_auto_tag: yup.boolean().defined(),
+ stash_ids: yup.mixed().defined(),
+ image: yup.string().nullable().optional(),
});
const initialValues = {
name: performer.name ?? "",
- aliases: performer.aliases ?? "",
- gender: genderToString(performer.gender ?? undefined),
+ disambiguation: performer.disambiguation ?? "",
+ alias_list: performer.alias_list ?? [],
+ gender: (performer.gender as GQL.GenderEnum) ?? "",
birthdate: performer.birthdate ?? "",
- ethnicity: performer.ethnicity ?? "",
- eye_color: performer.eye_color ?? "",
+ death_date: performer.death_date ?? "",
country: performer.country ?? "",
- height_cm: performer.height_cm ?? undefined,
+ ethnicity: performer.ethnicity ?? "",
+ hair_color: performer.hair_color ?? "",
+ eye_color: performer.eye_color ?? "",
+ height_cm: performer.height_cm ?? null,
+ weight: performer.weight ?? null,
measurements: performer.measurements ?? "",
fake_tits: performer.fake_tits ?? "",
- career_length: performer.career_length ?? "",
tattoos: performer.tattoos ?? "",
piercings: performer.piercings ?? "",
+ career_length: performer.career_length ?? "",
url: performer.url ?? "",
twitter: performer.twitter ?? "",
instagram: performer.instagram ?? "",
- tag_ids: (performer.tags ?? []).map((t) => t.id),
- stash_ids: performer.stash_ids ?? undefined,
- image: undefined,
details: performer.details ?? "",
- death_date: performer.death_date ?? "",
- hair_color: performer.hair_color ?? "",
- weight: performer.weight ?? undefined,
+ tag_ids: (performer.tags ?? []).map((t) => t.id),
ignore_auto_tag: performer.ignore_auto_tag ?? false,
+ stash_ids: getStashIDs(performer.stash_ids),
};
- type InputValues = typeof initialValues;
+ type InputValues = yup.InferType;
- const formik = useFormik({
+ const formik = useFormik({
initialValues,
+ enableReinitialize: true,
validationSchema: schema,
onSubmit: (values) => onSave(values),
});
@@ -165,20 +202,16 @@ export const PerformerEditPanel: React.FC = ({
return;
}
- let retEnum: GQL.GenderEnum | undefined;
-
// try to translate from enum values first
- const upperGender = scrapedGender?.toUpperCase();
+ const upperGender = scrapedGender.toUpperCase();
const asEnum = genderToString(upperGender);
if (asEnum) {
- retEnum = stringToGender(asEnum);
+ return stringToGender(asEnum);
} else {
// try to match against gender strings
const caseInsensitive = true;
- retEnum = stringToGender(scrapedGender, caseInsensitive);
+ return stringToGender(scrapedGender, caseInsensitive);
}
-
- return genderToString(retEnum);
}
function renderNewTags() {
@@ -262,9 +295,14 @@ export const PerformerEditPanel: React.FC = ({
if (state.name) {
formik.setFieldValue("name", state.name);
}
-
+ if (state.disambiguation) {
+ formik.setFieldValue("disambiguation", state.disambiguation);
+ }
if (state.aliases) {
- formik.setFieldValue("aliases", state.aliases);
+ formik.setFieldValue(
+ "alias_list",
+ state.aliases.split(",").map((a) => a.trim())
+ );
}
if (state.birthdate) {
formik.setFieldValue("birthdate", state.birthdate);
@@ -307,10 +345,10 @@ export const PerformerEditPanel: React.FC = ({
}
if (state.gender) {
// gender is a string in the scraper data
- formik.setFieldValue(
- "gender",
- translateScrapedGender(state.gender ?? undefined)
- );
+ const newGender = translateScrapedGender(state.gender);
+ if (newGender) {
+ formik.setFieldValue("gender", newGender);
+ }
}
if (state.tags) {
// map tags to their ids and filter out those not found
@@ -323,15 +361,14 @@ export const PerformerEditPanel: React.FC = ({
// 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
- // overwrite if image was cleared (`null`)
- // otherwise follow existing behaviour (`undefined`)
+ // overwrite if image is unset
if (
- (!isNew || [null, undefined].includes(formik.values.image)) &&
+ (!isNew || !formik.values.image) &&
state.images &&
state.images.length > 0
) {
const imageStr = state.images[0];
- formik.setFieldValue("image", imageStr ?? undefined);
+ formik.setFieldValue("image", imageStr);
}
if (state.details) {
formik.setFieldValue("details", state.details);
@@ -360,31 +397,50 @@ export const PerformerEditPanel: React.FC = ({
}
}
- function onImageLoad(imageData: string) {
+ const encodingImage = ImageUtils.usePasteImage(onImageLoad);
+
+ useEffect(() => {
+ setImage(formik.values.image);
+ }, [formik.values.image, setImage]);
+
+ useEffect(() => {
+ setEncodingImage(encodingImage);
+ }, [setEncodingImage, encodingImage]);
+
+ function onImageLoad(imageData: string | null) {
formik.setFieldValue("image", imageData);
}
- async function onSave(performerInput: InputValues) {
+ function onImageChange(event: React.FormEvent) {
+ ImageUtils.onImageChange(event, onImageLoad);
+ }
+
+ async function onSave(input: InputValues) {
setIsLoading(true);
try {
if (isNew) {
- const input = getCreateValues(performerInput);
const result = await createPerformer({
variables: {
- input,
+ input: {
+ ...input,
+ gender: input.gender || null,
+ height_cm: input.height_cm || null,
+ weight: input.weight || null,
+ },
},
});
if (result.data?.performerCreate) {
history.push(`/performers/${result.data.performerCreate.id}`);
}
} else {
- const input = getUpdateValues(performerInput);
-
await updatePerformer({
variables: {
input: {
+ id: performer.id!,
...input,
- stash_ids: getStashIDs(performerInput?.stash_ids),
+ gender: input.gender || null,
+ height_cm: input.height_cm || null,
+ weight: input.weight || null,
},
},
});
@@ -394,12 +450,17 @@ export const PerformerEditPanel: React.FC = ({
setIsLoading(false);
return;
}
- if (!isNew && onCancelEditing) {
- onCancelEditing();
+ if (!isNew && onCancel) {
+ onCancel();
}
setIsLoading(false);
}
+ function onCancelEditing() {
+ setImage(undefined);
+ onCancel?.();
+ }
+
// set up hotkeys
useEffect(() => {
if (isVisible) {
@@ -417,18 +478,6 @@ export const PerformerEditPanel: React.FC = ({
}
});
- useEffect(() => {
- if (onImageChange) {
- onImageChange(formik.values.image);
- }
- return () => onImageChange?.();
- }, [formik.values.image, onImageChange]);
-
- useEffect(() => onImageEncoding?.(imageEncoding), [
- onImageEncoding,
- imageEncoding,
- ]);
-
useEffect(() => {
const newQueryableScrapers = (
Scrapers?.data?.listPerformerScrapers ?? []
@@ -441,33 +490,6 @@ export const PerformerEditPanel: React.FC = ({
if (isLoading) return ) {
- ImageUtils.onImageChange(event, onImageLoad);
- }
-
- function onImageChangeURL(url: string) {
- formik.setFieldValue("image", url);
- }
-
async function onReloadScrapers() {
setIsLoading(true);
try {
@@ -633,9 +655,9 @@ export const PerformerEditPanel: React.FC = ({
return;
}
- const currentPerformer: Partial = {
+ const currentPerformer = {
...formik.values,
- gender: stringToGender(formik.values.gender),
+ gender: formik.values.gender || null,
image: formik.values.image ?? performer.image_path,
};
@@ -662,22 +684,16 @@ export const PerformerEditPanel: React.FC = ({
function renderButtons(classNames: string) {
return (
- {!isNew && onCancelEditing ? (
-
-
+
);
};
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerStashBoxModal.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerStashBoxModal.tsx
index b9c7f4316..5b508ea1f 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerStashBoxModal.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerStashBoxModal.tsx
@@ -1,11 +1,12 @@
import React, { useEffect, useRef, useState } from "react";
-import debounce from "lodash-es/debounce";
import { Button, Form } from "react-bootstrap";
import { useIntl } from "react-intl";
import * as GQL from "src/core/generated-graphql";
-import { Modal, LoadingIndicator } from "src/components/Shared";
+import { ModalComponent } from "src/components/Shared/Modal";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { stashboxDisplayName } from "src/utils/stashbox";
+import { useDebouncedSetState } from "src/hooks/debounce";
const CLASSNAME = "PerformerScrapeModal";
const CLASSNAME_LIST = `${CLASSNAME}-list`;
@@ -43,14 +44,12 @@ const PerformerStashBoxModal: React.FC = ({
const performers = data?.scrapeSinglePerformer ?? [];
- const onInputChange = debounce((input: string) => {
- setQuery(input);
- }, 500);
+ const onInputChange = useDebouncedSetState(setQuery, 500);
useEffect(() => inputRef.current?.focus(), []);
return (
- = ({
))}
@@ -89,7 +89,7 @@ const PerformerStashBoxModal: React.FC = ({
query !== "" && No results found.
)}
-
+
);
};
diff --git a/ui/v2.5/src/components/Performers/PerformerList.tsx b/ui/v2.5/src/components/Performers/PerformerList.tsx
index 0cd8902ae..cdfc37f09 100644
--- a/ui/v2.5/src/components/Performers/PerformerList.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerList.tsx
@@ -3,33 +3,48 @@ import React, { useState } from "react";
import { useIntl } from "react-intl";
import { useHistory } from "react-router-dom";
import Mousetrap from "mousetrap";
-import {
- FindPerformersQueryResult,
- SlimPerformerDataFragment,
-} from "src/core/generated-graphql";
+import * as GQL from "src/core/generated-graphql";
import {
queryFindPerformers,
+ useFindPerformers,
usePerformersDestroy,
} from "src/core/StashService";
-import { usePerformersList } from "src/hooks";
-import { showWhenSelected, PersistanceLevel } from "src/hooks/ListHook";
+import {
+ makeItemList,
+ PersistanceLevel,
+ showWhenSelected,
+} from "../List/ItemList";
import { ListFilterModel } from "src/models/list-filter/filter";
import { DisplayMode } from "src/models/list-filter/types";
-import { PerformerTagger } from "src/components/Tagger";
-import { ExportDialog, DeleteEntityDialog } from "src/components/Shared";
+import { PerformerTagger } from "../Tagger/performers/PerformerTagger";
+import { ExportDialog } from "../Shared/ExportDialog";
+import { DeleteEntityDialog } from "../Shared/DeleteEntityDialog";
import { IPerformerCardExtraCriteria, PerformerCard } from "./PerformerCard";
import { PerformerListTable } from "./PerformerListTable";
import { EditPerformersDialog } from "./EditPerformersDialog";
+const PerformerItemList = makeItemList({
+ filterMode: GQL.FilterMode.Performers,
+ useResult: useFindPerformers,
+ getItems(result: GQL.FindPerformersQueryResult) {
+ return result?.data?.findPerformers?.performers ?? [];
+ },
+ getCount(result: GQL.FindPerformersQueryResult) {
+ return result?.data?.findPerformers?.count ?? 0;
+ },
+});
+
interface IPerformerList {
filterHook?: (filter: ListFilterModel) => ListFilterModel;
persistState?: PersistanceLevel;
+ alterQuery?: boolean;
extraCriteria?: IPerformerCardExtraCriteria;
}
export const PerformerList: React.FC = ({
filterHook,
persistState,
+ alterQuery,
extraCriteria,
}) => {
const intl = useIntl();
@@ -40,7 +55,7 @@ export const PerformerList: React.FC = ({
const otherOperations = [
{
text: intl.formatMessage({ id: "actions.open_random" }),
- onClick: getRandom,
+ onClick: openRandom,
},
{
text: intl.formatMessage({ id: "actions.export" }),
@@ -53,18 +68,36 @@ export const PerformerList: React.FC = ({
},
];
- const addKeybinds = (
- result: FindPerformersQueryResult,
+ function addKeybinds(
+ result: GQL.FindPerformersQueryResult,
filter: ListFilterModel
- ) => {
+ ) {
Mousetrap.bind("p r", () => {
- getRandom(result, filter);
+ openRandom(result, filter);
});
return () => {
Mousetrap.unbind("p r");
};
- };
+ }
+
+ async function openRandom(
+ result: GQL.FindPerformersQueryResult,
+ filter: ListFilterModel
+ ) {
+ if (result.data?.findPerformers) {
+ const { count } = result.data.findPerformers;
+ const index = Math.floor(Math.random() * count);
+ const filterCopy = cloneDeep(filter);
+ filterCopy.itemsPerPage = 1;
+ filterCopy.currentPage = index + 1;
+ const singleResult = await queryFindPerformers(filterCopy);
+ if (singleResult.data.findPerformers.performers.length === 1) {
+ const { id } = singleResult.data.findPerformers.performers[0]!;
+ history.push(`/performers/${id}`);
+ }
+ }
+ }
async function onExport() {
setIsExportAll(false);
@@ -76,96 +109,35 @@ export const PerformerList: React.FC = ({
setIsExportDialogOpen(true);
}
- function maybeRenderPerformerExportDialog(selectedIds: Set) {
- if (isExportDialogOpen) {
- return (
- <>
- {
- setIsExportDialogOpen(false);
- }}
- />
-
- );
- }
- }
-
- function renderEditPerformersDialog(
- selectedPerformers: SlimPerformerDataFragment[],
- onClose: (applied: boolean) => void
+ function renderContent(
+ result: GQL.FindPerformersQueryResult,
+ filter: ListFilterModel,
+ selectedIds: Set,
+ onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
) {
- return (
- <>
- setIsExportDialogOpen(false)}
+ />
+
+ );
}
}
- }
- function renderContent(
- result: FindPerformersQueryResult,
- filter: ListFilterModel,
- selectedIds: Set
- ) {
- if (!result.data?.findPerformers) {
- return;
- }
- if (filter.displayMode === DisplayMode.Grid) {
- return (
- <>
- {maybeRenderPerformerExportDialog(selectedIds)}
+ function renderPerformers() {
+ if (!result.data?.findPerformers) return;
+
+ if (filter.displayMode === DisplayMode.Grid) {
+ return (
{result.data.findPerformers.performers.map((p) => (
= ({
selecting={selectedIds.size > 0}
selected={selectedIds.has(p.id)}
onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
- listData.onSelectChange(p.id, selected, shiftKey)
+ onSelectChange(p.id, selected, shiftKey)
}
extraCriteria={extraCriteria}
/>
))}
-
- );
- }
- if (filter.displayMode === DisplayMode.List) {
- return (
- = (
- {performer.name}
+
+ {performer.name}
+ {performer.disambiguation && (
+
+ {` (${performer.disambiguation})`}
+
+ )}
+
- {performer.aliases ? performer.aliases : ""}
+ {performer.alias_list ? performer.alias_list.join(", ") : ""}
{performer.favorite && (
+
diff --git a/ui/v2.5/src/components/ScenePlayer/index.ts b/ui/v2.5/src/components/ScenePlayer/index.ts
deleted file mode 100644
index 04a525412..000000000
--- a/ui/v2.5/src/components/ScenePlayer/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ScenePlayer";
diff --git a/ui/v2.5/src/components/ScenePlayer/styles.scss b/ui/v2.5/src/components/ScenePlayer/styles.scss
index 76a8ba73e..8e717892f 100644
--- a/ui/v2.5/src/components/ScenePlayer/styles.scss
+++ b/ui/v2.5/src/components/ScenePlayer/styles.scss
@@ -382,7 +382,7 @@ $sceneTabWidth: 450px;
}
#scrubber-position-indicator {
- background-color: #ccc;
+ background-color: rgba(255, 255, 255, 0.7);
height: 20px;
left: -100%;
position: absolute;
@@ -426,6 +426,14 @@ $sceneTabWidth: 450px;
}
}
+.scrubber-heatmap {
+ background-size: 100% 100%;
+ height: 20px;
+ left: 0;
+ position: absolute;
+ right: 0;
+}
+
.scrubber-tag {
background-color: #000;
cursor: pointer;
diff --git a/ui/v2.5/src/components/ScenePlayer/track-activity.ts b/ui/v2.5/src/components/ScenePlayer/track-activity.ts
index f4ed2eb49..6b5cbd051 100644
--- a/ui/v2.5/src/components/ScenePlayer/track-activity.ts
+++ b/ui/v2.5/src/components/ScenePlayer/track-activity.ts
@@ -10,12 +10,10 @@ class TrackActivityPlugin extends videojs.getPlugin("plugin") {
incrementPlayCount: () => Promise = () => {
return Promise.resolve();
};
- saveActivity: (
- resumeTime: number,
- playDuration: number
- ) => Promise = () => {
- return Promise.resolve();
- };
+ saveActivity: (resumeTime: number, playDuration: number) => Promise =
+ () => {
+ return Promise.resolve();
+ };
private enabled = false;
private playCountIncremented = false;
diff --git a/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx b/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx
index c98785e1c..6a17ff5bf 100644
--- a/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx
@@ -2,8 +2,8 @@ import React, { useState } from "react";
import { Form } from "react-bootstrap";
import { useScenesDestroy } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
-import { Modal } from "src/components/Shared";
-import { useToast } from "src/hooks";
+import { ModalComponent } from "src/components/Shared/Modal";
+import { useToast } from "src/hooks/Toast";
import { ConfigurationContext } from "src/hooks/Config";
import { FormattedMessage, useIntl } from "react-intl";
import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
@@ -126,7 +126,7 @@ export const DeleteScenesDialog: React.FC = (
}
return (
- = (
onChange={() => setDeleteGenerated(!deleteGenerated)}
/>
-
+
);
};
diff --git a/ui/v2.5/src/components/Scenes/EditScenesDialog.tsx b/ui/v2.5/src/components/Scenes/EditScenesDialog.tsx
index 34947060f..9fed7f54b 100644
--- a/ui/v2.5/src/components/Scenes/EditScenesDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/EditScenesDialog.tsx
@@ -4,10 +4,11 @@ import { FormattedMessage, useIntl } from "react-intl";
import isEqual from "lodash-es/isEqual";
import { useBulkSceneUpdate } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
-import { StudioSelect, Modal } from "src/components/Shared";
-import { useToast } from "src/hooks";
-import { FormUtils } from "src/utils";
-import MultiSet from "../Shared/MultiSet";
+import { StudioSelect } from "../Shared/Select";
+import { ModalComponent } from "../Shared/Modal";
+import { MultiSet } from "../Shared/MultiSet";
+import { useToast } from "src/hooks/Toast";
+import FormUtils from "src/utils/form";
import { RatingSystem } from "../Shared/Rating/RatingSystem";
import {
getAggregateInputIDs,
@@ -32,10 +33,8 @@ export const EditScenesDialog: React.FC = (
const Toast = useToast();
const [rating100, setRating] = useState();
const [studioId, setStudioId] = useState();
- const [
- performerMode,
- setPerformerMode,
- ] = React.useState(GQL.BulkUpdateIdMode.Add);
+ const [performerMode, setPerformerMode] =
+ React.useState(GQL.BulkUpdateIdMode.Add);
const [performerIds, setPerformerIds] = useState();
const [existingPerformerIds, setExistingPerformerIds] = useState();
const [tagMode, setTagMode] = React.useState(
@@ -243,7 +242,7 @@ export const EditScenesDialog: React.FC = (
function render() {
return (
- = (
/>
-
+
);
}
diff --git a/ui/v2.5/src/components/Scenes/SceneCard.tsx b/ui/v2.5/src/components/Scenes/SceneCard.tsx
index b7b79c0e7..3205fdcb8 100644
--- a/ui/v2.5/src/components/Scenes/SceneCard.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneCard.tsx
@@ -3,14 +3,13 @@ import { Button, ButtonGroup } from "react-bootstrap";
import { Link } from "react-router-dom";
import cx from "classnames";
import * as GQL from "src/core/generated-graphql";
-import {
- Icon,
- TagLink,
- HoverPopover,
- SweatDrops,
- TruncatedText,
-} from "src/components/Shared";
-import { NavUtils, TextUtils } from "src/utils";
+import { Icon } from "../Shared/Icon";
+import { TagLink } from "../Shared/TagLink";
+import { HoverPopover } from "../Shared/HoverPopover";
+import { SweatDrops } from "../Shared/SweatDrops";
+import { TruncatedText } from "../Shared/TruncatedText";
+import NavUtils from "src/utils/navigation";
+import TextUtils from "src/utils/text";
import { SceneQueue } from "src/models/sceneQueue";
import { ConfigurationContext } from "src/hooks/Config";
import { PerformerPopoverButton } from "../Shared/PerformerPopoverButton";
@@ -99,9 +98,8 @@ export const SceneCard: React.FC = (
);
// studio image is missing if it uses the default
- const missingStudioImage = props.scene.studio?.image_path?.endsWith(
- "?default=true"
- );
+ const missingStudioImage =
+ props.scene.studio?.image_path?.endsWith("?default=true");
const showStudioAsText =
missingStudioImage || (configuration?.interface.showStudioAsText ?? false);
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/ExternalPlayerButton.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/ExternalPlayerButton.tsx
index 8ee4d992c..eef8db914 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/ExternalPlayerButton.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/ExternalPlayerButton.tsx
@@ -2,7 +2,7 @@ import { faExternalLinkAlt } from "@fortawesome/free-solid-svg-icons";
import React from "react";
import { Button } from "react-bootstrap";
import { useIntl } from "react-intl";
-import Icon from "src/components/Shared/Icon";
+import { Icon } from "src/components/Shared/Icon";
import { objectTitle } from "src/core/files";
import { SceneDataFragment } from "src/core/generated-graphql";
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/OCounterButton.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/OCounterButton.tsx
index 19d9e337d..8fdb7dfd7 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/OCounterButton.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/OCounterButton.tsx
@@ -2,7 +2,9 @@ import { faBan, faMinus } from "@fortawesome/free-solid-svg-icons";
import React, { useState } from "react";
import { Button, ButtonGroup, Dropdown, DropdownButton } from "react-bootstrap";
import { useIntl } from "react-intl";
-import { Icon, LoadingIndicator, SweatDrops } from "src/components/Shared";
+import { Icon } from "src/components/Shared/Icon";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
+import { SweatDrops } from "src/components/Shared/SweatDrops";
export interface IOCounterButtonProps {
value: number;
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/OrganizedButton.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/OrganizedButton.tsx
index 63e82f9d2..4d0d7dd51 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/OrganizedButton.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/OrganizedButton.tsx
@@ -1,7 +1,7 @@
import React from "react";
import cx from "classnames";
import { Button, Spinner } from "react-bootstrap";
-import Icon from "src/components/Shared/Icon";
+import { Icon } from "src/components/Shared/Icon";
import { defineMessages, useIntl } from "react-intl";
import { faBox } from "@fortawesome/free-solid-svg-icons";
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/QueueViewer.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/QueueViewer.tsx
index 09b575a68..1f4b8f740 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/QueueViewer.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/QueueViewer.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
import { Link } from "react-router-dom";
import cx from "classnames";
import { Button, Form, Spinner } from "react-bootstrap";
-import Icon from "src/components/Shared/Icon";
+import { Icon } from "src/components/Shared/Icon";
import { useIntl } from "react-intl";
import {
faChevronDown,
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
index 1e7a8163f..21ba9d5c4 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
@@ -1,13 +1,5 @@
import { Tab, Nav, Dropdown, Button, ButtonGroup } from "react-bootstrap";
-import queryString from "query-string";
-import React, {
- useEffect,
- useState,
- useMemo,
- useContext,
- lazy,
- useRef,
-} from "react";
+import React, { useEffect, useState, useMemo, useContext, useRef } from "react";
import { FormattedMessage, useIntl } from "react-intl";
import { useParams, useLocation, useHistory, Link } from "react-router-dom";
import { Helmet } from "react-helmet";
@@ -24,8 +16,11 @@ import {
queryFindScenesByID,
} from "src/core/StashService";
-import Icon from "src/components/Shared/Icon";
-import { useToast } from "src/hooks";
+import { ErrorMessage } from "src/components/Shared/ErrorMessage";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
+import { Icon } from "src/components/Shared/Icon";
+import { Counter } from "src/components/Shared/Counter";
+import { useToast } from "src/hooks/Toast";
import SceneQueue, { QueuedScene } from "src/models/sceneQueue";
import { ListFilterModel } from "src/models/list-filter/filter";
import Mousetrap from "mousetrap";
@@ -34,31 +29,39 @@ import { OrganizedButton } from "./OrganizedButton";
import { ConfigurationContext } from "src/hooks/Config";
import { getPlayerPosition } from "src/components/ScenePlayer/util";
import { faEllipsisV } from "@fortawesome/free-solid-svg-icons";
+import { lazyComponent } from "src/utils/lazyComponent";
-const SubmitStashBoxDraft = lazy(
+const SubmitStashBoxDraft = lazyComponent(
() => import("src/components/Dialogs/SubmitDraft")
);
-const ScenePlayer = lazy(
+const ScenePlayer = lazyComponent(
() => import("src/components/ScenePlayer/ScenePlayer")
);
-const GalleryViewer = lazy(
+const GalleryViewer = lazyComponent(
() => import("src/components/Galleries/GalleryViewer")
);
-const ExternalPlayerButton = lazy(() => import("./ExternalPlayerButton"));
+const ExternalPlayerButton = lazyComponent(
+ () => import("./ExternalPlayerButton")
+);
-const QueueViewer = lazy(() => import("./QueueViewer"));
-const SceneMarkersPanel = lazy(() => import("./SceneMarkersPanel"));
-const SceneFileInfoPanel = lazy(() => import("./SceneFileInfoPanel"));
-const SceneEditPanel = lazy(() => import("./SceneEditPanel"));
-const SceneDetailPanel = lazy(() => import("./SceneDetailPanel"));
-const SceneMoviePanel = lazy(() => import("./SceneMoviePanel"));
-const SceneGalleriesPanel = lazy(() => import("./SceneGalleriesPanel"));
-const DeleteScenesDialog = lazy(() => import("../DeleteScenesDialog"));
-const GenerateDialog = lazy(() => import("../../Dialogs/GenerateDialog"));
-const SceneVideoFilterPanel = lazy(() => import("./SceneVideoFilterPanel"));
+const QueueViewer = lazyComponent(() => import("./QueueViewer"));
+const SceneMarkersPanel = lazyComponent(() => import("./SceneMarkersPanel"));
+const SceneFileInfoPanel = lazyComponent(() => import("./SceneFileInfoPanel"));
+const SceneEditPanel = lazyComponent(() => import("./SceneEditPanel"));
+const SceneDetailPanel = lazyComponent(() => import("./SceneDetailPanel"));
+const SceneMoviePanel = lazyComponent(() => import("./SceneMoviePanel"));
+const SceneGalleriesPanel = lazyComponent(
+ () => import("./SceneGalleriesPanel")
+);
+const DeleteScenesDialog = lazyComponent(() => import("../DeleteScenesDialog"));
+const GenerateDialog = lazyComponent(
+ () => import("../../Dialogs/GenerateDialog")
+);
+const SceneVideoFilterPanel = lazyComponent(
+ () => import("./SceneVideoFilterPanel")
+);
import { objectPath, objectTitle } from "src/core/files";
-import { Counter } from "src/components/Shared";
interface IProps {
scene: GQL.SceneDataFragment;
@@ -140,7 +143,9 @@ const ScenePage: React.FC = ({
Mousetrap.bind("e", () => setActiveTabKey("scene-edit-panel"));
Mousetrap.bind("k", () => setActiveTabKey("scene-markers-panel"));
Mousetrap.bind("i", () => setActiveTabKey("scene-file-info-panel"));
- Mousetrap.bind("o", () => onIncrementClick());
+ Mousetrap.bind("o", () => {
+ onIncrementClick();
+ });
Mousetrap.bind("p n", () => onQueueNext());
Mousetrap.bind("p p", () => onQueuePrevious());
Mousetrap.bind("p r", () => onQueueRandom());
@@ -514,10 +519,10 @@ const SceneLoader: React.FC = () => {
const location = useLocation();
const history = useHistory();
const { configuration } = useContext(ConfigurationContext);
- const { data, loading } = useFindScene(id ?? "");
+ const { data, loading, error } = useFindScene(id ?? "");
const queryParams = useMemo(
- () => queryString.parse(location.search, { decode: false }),
+ () => new URLSearchParams(location.search),
[location.search]
);
const sceneQueue = useMemo(
@@ -525,13 +530,13 @@ const SceneLoader: React.FC = () => {
[queryParams]
);
const queryContinue = useMemo(() => {
- let cont = queryParams.continue;
- if (cont !== undefined) {
+ let cont = queryParams.get("continue");
+ if (cont) {
return cont === "true";
} else {
return !!configuration?.interface.continuePlaylistDefault;
}
- }, [configuration?.interface.continuePlaylistDefault, queryParams.continue]);
+ }, [configuration?.interface.continuePlaylistDefault, queryParams]);
const [queueScenes, setQueueScenes] = useState([]);
@@ -543,14 +548,13 @@ const SceneLoader: React.FC = () => {
const _setTimestamp = useRef<(value: number) => void>();
const initialTimestamp = useMemo(() => {
- const t = Array.isArray(queryParams.t) ? queryParams.t[0] : queryParams.t;
- return Number.parseInt(t ?? "0", 10);
+ return Number.parseInt(queryParams.get("t") ?? "0", 10);
}, [queryParams]);
const [queueTotal, setQueueTotal] = useState(0);
const [queueStart, setQueueStart] = useState(1);
- const autoplay = queryParams.autoplay === "true";
+ const autoplay = queryParams.get("autoplay") === "true";
const currentQueueIndex = queueScenes
? queueScenes.findIndex((s) => s.id === id)
: -1;
@@ -728,32 +732,32 @@ const SceneLoader: React.FC = () => {
}
}
+ if (loading) return {
const intl = useIntl();
- // create scene from provided scene id if applicable
- const queryParams = queryString.parse(location.search);
+ const location = useLocation();
+ const query = useMemo(() => new URLSearchParams(location.search), [location]);
- const fromSceneID = (queryParams?.from_scene_id ?? "") as string;
- const { data, loading } = useFindScene(fromSceneID ?? "");
+ // create scene from provided scene id if applicable
+ const { data, loading } = useFindScene(query.get("from_scene_id") ?? "");
const [loadingCoverImage, setLoadingCoverImage] = useState(false);
- const [coverImage, setCoverImage] = useState(undefined);
+ const [coverImage, setCoverImage] = useState();
const scene = useMemo(() => {
if (data?.findScene) {
@@ -26,8 +26,10 @@ const SceneCreate: React.FC = () => {
};
}
- return {};
- }, [data?.findScene]);
+ return {
+ title: query.get("q") ?? undefined,
+ };
+ }, [data?.findScene, query]);
useEffect(() => {
async function fetchCoverImage() {
@@ -62,6 +64,7 @@ const SceneCreate: React.FC = () => {
import("./SceneScrapeDialog"));
-const SceneQueryModal = lazy(() => import("./SceneQueryModal"));
+const SceneScrapeDialog = lazyComponent(() => import("./SceneScrapeDialog"));
+const SceneQueryModal = lazyComponent(() => import("./SceneQueryModal"));
interface IProps {
scene: Partial;
+ fileID?: string;
initialCoverImage?: string;
isNew?: boolean;
isVisible: boolean;
@@ -61,6 +68,7 @@ interface IProps {
export const SceneEditPanel: React.FC = ({
scene,
+ fileID,
initialCoverImage,
isNew = false,
isVisible,
@@ -70,10 +78,6 @@ export const SceneEditPanel: React.FC = ({
const Toast = useToast();
const history = useHistory();
- const queryParams = queryString.parse(location.search);
-
- const fileID = (queryParams?.file_id ?? "") as string;
-
const [galleries, setGalleries] = useState<{ id: string; title: string }[]>(
[]
);
@@ -82,17 +86,13 @@ export const SceneEditPanel: React.FC = ({
const [fragmentScrapers, setFragmentScrapers] = useState([]);
const [queryableScrapers, setQueryableScrapers] = useState([]);
- const [scraper, setScraper] = useState();
- const [
- isScraperQueryModalOpen,
- setIsScraperQueryModalOpen,
- ] = useState(false);
+ const [scraper, setScraper] = useState();
+ const [isScraperQueryModalOpen, setIsScraperQueryModalOpen] =
+ useState(false);
const [scrapedScene, setScrapedScene] = useState();
- const [endpoint, setEndpoint] = useState();
+ const [endpoint, setEndpoint] = useState();
- const [coverImagePreview, setCoverImagePreview] = useState<
- string | undefined
- >();
+ const [coverImagePreview, setCoverImagePreview] = useState();
useEffect(() => {
setCoverImagePreview(
@@ -104,7 +104,7 @@ export const SceneEditPanel: React.FC = ({
setGalleries(
scene.galleries?.map((g) => ({
id: g.id,
- title: objectTitle(g),
+ title: galleryTitle(g),
})) ?? []
);
}, [scene.galleries]);
@@ -117,53 +117,66 @@ export const SceneEditPanel: React.FC = ({
const [updateScene] = useSceneUpdate();
const schema = yup.object({
- title: yup.string().optional().nullable(),
- code: yup.string().optional().nullable(),
- details: yup.string().optional().nullable(),
- director: yup.string().optional().nullable(),
- url: yup.string().optional().nullable(),
- date: yup.string().optional().nullable(),
- rating100: yup.number().optional().nullable(),
- gallery_ids: yup.array(yup.string().required()).optional().nullable(),
- studio_id: yup.string().optional().nullable(),
- performer_ids: yup.array(yup.string().required()).optional().nullable(),
+ title: yup.string().ensure(),
+ code: yup.string().ensure(),
+ url: yup.string().ensure(),
+ date: yup
+ .string()
+ .ensure()
+ .test({
+ name: "date",
+ test: (value) => {
+ if (!value) return true;
+ if (!value.match(/^\d{4}-\d{2}-\d{2}$/)) return false;
+ if (Number.isNaN(Date.parse(value))) return false;
+ return true;
+ },
+ message: intl.formatMessage({ id: "validation.date_invalid_form" }),
+ }),
+ director: yup.string().ensure(),
+ rating100: yup.number().nullable().defined(),
+ gallery_ids: yup.array(yup.string().required()).defined(),
+ studio_id: yup.string().required().nullable(),
+ performer_ids: yup.array(yup.string().required()).defined(),
movies: yup
- .object({
- movie_id: yup.string().required(),
- scene_index: yup.string().optional().nullable(),
- })
- .optional()
- .nullable(),
- tag_ids: yup.array(yup.string().required()).optional().nullable(),
- cover_image: yup.string().optional().nullable(),
- stash_ids: yup.mixed().optional().nullable(),
+ .array(
+ yup.object({
+ movie_id: yup.string().required(),
+ scene_index: yup.number().nullable().defined(),
+ })
+ )
+ .defined(),
+ tag_ids: yup.array(yup.string().required()).defined(),
+ stash_ids: yup.mixed().defined(),
+ details: yup.string().ensure(),
+ cover_image: yup.string().nullable().optional(),
});
const initialValues = useMemo(
() => ({
title: scene.title ?? "",
code: scene.code ?? "",
- details: scene.details ?? "",
- director: scene.director ?? "",
url: scene.url ?? "",
date: scene.date ?? "",
+ director: scene.director ?? "",
rating100: scene.rating100 ?? null,
gallery_ids: (scene.galleries ?? []).map((g) => g.id),
- studio_id: scene.studio?.id,
+ studio_id: scene.studio?.id ?? null,
performer_ids: (scene.performers ?? []).map((p) => p.id),
movies: (scene.movies ?? []).map((m) => {
- return { movie_id: m.movie.id, scene_index: m.scene_index };
+ return { movie_id: m.movie.id, scene_index: m.scene_index ?? null };
}),
tag_ids: (scene.tags ?? []).map((t) => t.id),
- cover_image: initialCoverImage,
stash_ids: getStashIDs(scene.stash_ids),
+ details: scene.details ?? "",
+ cover_image: initialCoverImage,
}),
[scene, initialCoverImage]
);
- type InputValues = typeof initialValues;
+ type InputValues = yup.InferType;
- const formik = useFormik({
+ const formik = useFormik({
initialValues,
enableReinitialize: true,
validationSchema: schema,
@@ -187,6 +200,12 @@ export const SceneEditPanel: React.FC = ({
);
}
+ useRatingKeybinds(
+ isVisible,
+ stashConfig?.ui?.ratingSystemOptions?.type,
+ setRating
+ );
+
useEffect(() => {
if (isVisible) {
Mousetrap.bind("s s", () => {
@@ -198,35 +217,9 @@ export const SceneEditPanel: React.FC = ({
}
});
- // numeric keypresses get caught by jwplayer, so blur the element
- // if the rating sequence is started
- Mousetrap.bind("r", () => {
- if (document.activeElement instanceof HTMLElement) {
- document.activeElement.blur();
- }
-
- Mousetrap.bind("0", () => setRating(NaN));
- Mousetrap.bind("1", () => setRating(20));
- Mousetrap.bind("2", () => setRating(40));
- Mousetrap.bind("3", () => setRating(60));
- Mousetrap.bind("4", () => setRating(80));
- Mousetrap.bind("5", () => setRating(100));
-
- setTimeout(() => {
- Mousetrap.unbind("0");
- Mousetrap.unbind("1");
- Mousetrap.unbind("2");
- Mousetrap.unbind("3");
- Mousetrap.unbind("4");
- Mousetrap.unbind("5");
- }, 1000);
- });
-
return () => {
Mousetrap.unbind("s s");
Mousetrap.unbind("d d");
-
- Mousetrap.unbind("r");
};
}
});
@@ -245,15 +238,6 @@ export const SceneEditPanel: React.FC = ({
setQueryableScrapers(newQueryableScrapers);
}, [Scrapers, stashConfig]);
- const imageEncoding = ImageUtils.usePasteImage(onImageLoad, true);
-
- function getSceneInput(input: InputValues): GQL.SceneUpdateInput {
- return {
- id: scene.id!,
- ...input,
- };
- }
-
function setMovieIds(movieIds: string[]) {
const existingMovies = formik.values.movies;
@@ -265,29 +249,22 @@ export const SceneEditPanel: React.FC = ({
return {
movie_id: m,
+ scene_index: null,
};
});
formik.setFieldValue("movies", newMovies);
}
- function getCreateValues(values: InputValues): GQL.SceneCreateInput {
- return {
- ...values,
- };
- }
-
async function onSave(input: InputValues) {
setIsLoading(true);
try {
if (!isNew) {
- const updateValues = getSceneInput(input);
const result = await updateScene({
variables: {
input: {
- ...updateValues,
id: scene.id!,
- rating100: input.rating100 ?? null,
+ ...input,
},
},
});
@@ -300,20 +277,17 @@ export const SceneEditPanel: React.FC = ({
}
),
});
+ formik.resetForm();
}
} else {
- const createValues = getCreateValues(input);
const result = await mutateCreateScene({
- ...createValues,
- file_ids: fileID ? [fileID as string] : undefined,
+ ...input,
+ file_ids: fileID ? [fileID] : undefined,
});
if (result.data?.sceneCreate?.id) {
history.push(`/scenes/${result.data?.sceneCreate.id}`);
}
}
-
- // clear the cover image so that it doesn't appear dirty
- formik.resetForm({ values: formik.values });
} catch (e) {
Toast.error(e);
}
@@ -341,6 +315,8 @@ export const SceneEditPanel: React.FC = ({
);
}
+ const encodingImage = ImageUtils.usePasteImage(onImageLoad);
+
function onImageLoad(imageData: string) {
setCoverImagePreview(imageData);
formik.setFieldValue("cover_image", imageData);
@@ -434,9 +410,13 @@ export const SceneEditPanel: React.FC = ({
return;
}
- const currentScene = getSceneInput(formik.values);
+ const currentScene = {
+ id: scene.id!,
+ ...formik.values,
+ };
+
if (!currentScene.cover_image) {
- currentScene.cover_image = scene.paths!.screenshot;
+ currentScene.cover_image = scene.paths?.screenshot;
}
return (
@@ -691,7 +671,7 @@ export const SceneEditPanel: React.FC = ({
function renderTextField(field: string, title: string, placeholder?: string) {
return (
-
+
{FormUtils.renderLabel({
title,
})}
@@ -702,13 +682,16 @@ export const SceneEditPanel: React.FC = ({
{...formik.getFieldProps(field)}
isInvalid={!!formik.getFieldMeta(field).error}
/>
+
+ {formik.getFieldMeta(field).error}
+
);
}
const image = useMemo(() => {
- if (imageEncoding) {
+ if (encodingImage) {
return = ({
}
return ;
- }, [imageEncoding, coverImagePreview, intl]);
+ }, [encodingImage, coverImagePreview, intl]);
if (isLoading) return = ({
- {renderTextField(
- "date",
- intl.formatMessage({ id: "date" }),
- "YYYY-MM-DD"
- )}
+
+
+ {FormUtils.renderLabel({
+ title: intl.formatMessage({ id: "date" }),
+ })}
+ formik.setFieldValue("date", value)}
+ error={formik.errors.date}
+ />
+
+
+
{renderTextField(
"director",
intl.formatMessage({ id: "director" })
@@ -920,9 +914,8 @@ export const SceneEditPanel: React.FC = ({
{renderMovies(scene)}
-
- {scene.gallery && (
-
- )}
-
+ {renderGalleries(scene)}
);
};
@@ -144,7 +144,7 @@ export const SceneListTable: React.FC = (
-
diff --git a/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx b/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
index 9958b0432..af6635940 100644
--- a/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
@@ -2,25 +2,41 @@ import cloneDeep from "lodash-es/cloneDeep";
import React from "react";
import { useHistory } from "react-router-dom";
import { useIntl } from "react-intl";
-import { Helmet } from "react-helmet";
-import { TITLE_SUFFIX } from "src/components/Shared";
import Mousetrap from "mousetrap";
-import { FindSceneMarkersQueryResult } from "src/core/generated-graphql";
-import { queryFindSceneMarkers } from "src/core/StashService";
-import { NavUtils } from "src/utils";
-import { useSceneMarkersList } from "src/hooks";
-import { PersistanceLevel } from "src/hooks/ListHook";
+import * as GQL from "src/core/generated-graphql";
+import {
+ queryFindSceneMarkers,
+ useFindSceneMarkers,
+} from "src/core/StashService";
+import NavUtils from "src/utils/navigation";
+import { makeItemList, PersistanceLevel } from "../List/ItemList";
import { ListFilterModel } from "src/models/list-filter/filter";
import { DisplayMode } from "src/models/list-filter/types";
import { WallPanel } from "../Wall/WallPanel";
+const SceneMarkerItemList = makeItemList({
+ filterMode: GQL.FilterMode.SceneMarkers,
+ useResult: useFindSceneMarkers,
+ getItems(result: GQL.FindSceneMarkersQueryResult) {
+ return result?.data?.findSceneMarkers?.scene_markers ?? [];
+ },
+ getCount(result: GQL.FindSceneMarkersQueryResult) {
+ return result?.data?.findSceneMarkers?.count ?? 0;
+ },
+});
+
interface ISceneMarkerList {
filterHook?: (filter: ListFilterModel) => ListFilterModel;
+ alterQuery?: boolean;
}
-export const SceneMarkerList: React.FC = ({ filterHook }) => {
+export const SceneMarkerList: React.FC = ({
+ filterHook,
+ alterQuery,
+}) => {
const intl = useIntl();
const history = useHistory();
+
const otherOperations = [
{
text: intl.formatMessage({ id: "actions.play_random" }),
@@ -28,10 +44,10 @@ export const SceneMarkerList: React.FC = ({ filterHook }) => {
},
];
- const addKeybinds = (
- result: FindSceneMarkersQueryResult,
+ function addKeybinds(
+ result: GQL.FindSceneMarkersQueryResult,
filter: ListFilterModel
- ) => {
+ ) {
Mousetrap.bind("p r", () => {
playRandom(result, filter);
});
@@ -39,18 +55,10 @@ export const SceneMarkerList: React.FC = ({ filterHook }) => {
return () => {
Mousetrap.unbind("p r");
};
- };
-
- const listData = useSceneMarkersList({
- otherOperations,
- renderContent,
- filterHook,
- addKeybinds,
- persistState: PersistanceLevel.ALL,
- });
+ }
async function playRandom(
- result: FindSceneMarkersQueryResult,
+ result: GQL.FindSceneMarkersQueryResult,
filter: ListFilterModel
) {
// query for a random scene
@@ -62,7 +70,7 @@ export const SceneMarkerList: React.FC = ({ filterHook }) => {
filterCopy.itemsPerPage = 1;
filterCopy.currentPage = index + 1;
const singleResult = await queryFindSceneMarkers(filterCopy);
- if (singleResult?.data?.findSceneMarkers?.scene_markers?.length === 1) {
+ if (singleResult.data.findSceneMarkers.scene_markers.length === 1) {
// navigate to the scene player page
const url = NavUtils.makeSceneMarkerUrl(
singleResult.data.findSceneMarkers.scene_markers[0]
@@ -73,29 +81,27 @@ export const SceneMarkerList: React.FC = ({ filterHook }) => {
}
function renderContent(
- result: FindSceneMarkersQueryResult,
+ result: GQL.FindSceneMarkersQueryResult,
filter: ListFilterModel
) {
- if (!result?.data?.findSceneMarkers) return;
+ if (!result.data?.findSceneMarkers) return;
+
if (filter.displayMode === DisplayMode.Wall) {
return (
= ({
);
const [rating, setRating] = useState(
- new ScrapeResult(dest.rating100)
+ new ZeroableScrapeResult(dest.rating100)
);
+ // zero values can be treated as missing for these fields
const [oCounter, setOCounter] = useState(
new ScrapeResult(dest.o_counter)
);
@@ -119,6 +119,10 @@ const SceneMergeDetails: React.FC = ({
const [stashIDs, setStashIDs] = useState(new ScrapeResult([]));
+ const [organized, setOrganized] = useState(
+ new ZeroableScrapeResult(dest.organized)
+ );
+
const [image, setImage] = useState>(
new ScrapeResult(dest.paths.screenshot)
);
@@ -133,7 +137,7 @@ const SceneMergeDetails: React.FC = ({
setLoading(true);
const destData = await ImageUtils.imageToDataURL(dest.paths.screenshot);
- const srcData = await ImageUtils.imageToDataURL(src.paths!.screenshot!);
+ const srcData = await ImageUtils.imageToDataURL(src.paths.screenshot!);
// keep destination image by default
const useNewValue = false;
@@ -230,6 +234,13 @@ const SceneMergeDetails: React.FC = ({
)
);
+ setOrganized(
+ new ScrapeResult(
+ dest.organized ?? false,
+ sources.every((s) => s.organized)
+ )
+ );
+
setStashIDs(
new ScrapeResult(
dest.stash_ids,
@@ -289,6 +300,7 @@ const SceneMergeDetails: React.FC = ({
movies,
tags,
details,
+ organized,
stashIDs,
image,
]);
@@ -304,6 +316,7 @@ const SceneMergeDetails: React.FC = ({
movies,
tags,
details,
+ organized,
stashIDs,
image,
]);
@@ -325,6 +338,9 @@ const SceneMergeDetails: React.FC = ({
);
}
+ const trueString = intl.formatMessage({ id: "true" });
+ const falseString = intl.formatMessage({ id: "false" });
+
return (
<>
= ({
result={details}
onChange={(value) => setDetails(value)}
/>
+ (
+ {}}
+ className="bg-secondary text-white border-secondary"
+ />
+ )}
+ renderNewField={() => (
+ {}}
+ className="bg-secondary text-white border-secondary"
+ />
+ )}
+ onChange={(value) => setOrganized(value)}
+ />
= ({
}),
tag_ids: tags.getNewValue(),
details: details.getNewValue(),
+ organized: organized.getNewValue(),
stash_ids: stashIDs.getNewValue(),
cover_image: coverImage,
};
@@ -658,7 +696,7 @@ export const SceneMergeModal: React.FC = ({
}
return (
- = ({
-
+
);
};
diff --git a/ui/v2.5/src/components/Scenes/SceneRecommendationRow.tsx b/ui/v2.5/src/components/Scenes/SceneRecommendationRow.tsx
index 2d9aa7371..86ae558f0 100644
--- a/ui/v2.5/src/components/Scenes/SceneRecommendationRow.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneRecommendationRow.tsx
@@ -1,6 +1,6 @@
-import React, { FunctionComponent, useMemo } from "react";
+import React, { useMemo } from "react";
import { useFindScenes } from "src/core/StashService";
-import Slider from "react-slick";
+import Slider from "@ant-design/react-slick";
import { SceneCard } from "./SceneCard";
import { SceneQueue } from "src/models/sceneQueue";
import { ListFilterModel } from "src/models/list-filter/filter";
@@ -14,9 +14,7 @@ interface IProps {
header: string;
}
-export const SceneRecommendationRow: FunctionComponent = (
- props: IProps
-) => {
+export const SceneRecommendationRow: React.FC = (props) => {
const result = useFindScenes(props.filter);
const cardCount = result.data?.findScenes.count;
diff --git a/ui/v2.5/src/components/Scenes/Scenes.tsx b/ui/v2.5/src/components/Scenes/Scenes.tsx
index 97a9ea5c6..ea966e74a 100644
--- a/ui/v2.5/src/components/Scenes/Scenes.tsx
+++ b/ui/v2.5/src/components/Scenes/Scenes.tsx
@@ -1,14 +1,15 @@
-import React, { lazy } from "react";
+import React from "react";
import { Route, Switch } from "react-router-dom";
import { useIntl } from "react-intl";
import { Helmet } from "react-helmet";
-import { TITLE_SUFFIX } from "src/components/Shared";
-import { PersistanceLevel } from "src/hooks/ListHook";
+import { TITLE_SUFFIX } from "src/components/Shared/constants";
+import { PersistanceLevel } from "../List/ItemList";
+import { lazyComponent } from "src/utils/lazyComponent";
-const SceneList = lazy(() => import("./SceneList"));
-const SceneMarkerList = lazy(() => import("./SceneMarkerList"));
-const Scene = lazy(() => import("./SceneDetails/Scene"));
-const SceneCreate = lazy(() => import("./SceneDetails/SceneCreate"));
+const SceneList = lazyComponent(() => import("./SceneList"));
+const SceneMarkerList = lazyComponent(() => import("./SceneMarkerList"));
+const Scene = lazyComponent(() => import("./SceneDetails/Scene"));
+const SceneCreate = lazyComponent(() => import("./SceneDetails/SceneCreate"));
const Scenes: React.FC = () => {
const intl = useIntl();
@@ -16,6 +17,10 @@ const Scenes: React.FC = () => {
const title_template = `${intl.formatMessage({
id: "scenes",
})} ${TITLE_SUFFIX}`;
+ const marker_title_template = `${intl.formatMessage({
+ id: "markers",
+ })} ${TITLE_SUFFIX}`;
+
return (
<>
{
(
+ <>
+ = (props) => {
};
interface ISelectSetting extends ISetting {
- value?: string | number | string[] | undefined;
+ value?: string | number | string[];
onChange: (v: string) => void;
}
@@ -429,7 +428,7 @@ export const StringListSetting: React.FC = (props) => {
+
+
+
+ {intl.formatMessage({
+ id: "config.about.build_hash",
+ })}
+
+ {hashString}
+
+
+
+
+
+
+
+
+
+ );
+ }
+ }
return (
<>
@@ -39,48 +101,10 @@ export const SettingsAboutPanel: React.FC = () => {
value={buildTime}
/>
+
-
- {errorLatest ? (
-
- {intl.formatMessage({
- id: "config.about.latest_version_build_hash",
- })}
-
-
- {dataLatest.latestversion.shorthash}{" "}
- {hasNew
- ? intl.formatMessage({
- id: "config.about.new_version_notice",
- })
- : undefined}
-
-
-
-
-
-
-
-
-
- )}
-
+
+ {renderLatestVersion()}
@@ -108,11 +132,11 @@ export const SettingsAboutPanel: React.FC = () => {
{
url: (
- Wiki
+ Documentation
),
}
diff --git a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
index 8e5fb1286..97866b4d4 100644
--- a/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
@@ -1,11 +1,9 @@
import React from "react";
import { Button, Form } from "react-bootstrap";
import { FormattedMessage, useIntl } from "react-intl";
-import {
- DurationInput,
- PercentInput,
- LoadingIndicator,
-} from "src/components/Shared";
+import { DurationInput } from "src/components/Shared/DurationInput";
+import { PercentInput } from "src/components/Shared/PercentInput";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { CheckboxGroup } from "./CheckboxGroup";
import { SettingSection } from "../SettingSection";
import {
@@ -16,13 +14,13 @@ import {
StringSetting,
} from "../Inputs";
import { SettingStateContext } from "../context";
-import { DurationUtils } from "src/utils";
+import DurationUtils from "src/utils/duration";
import * as GQL from "src/core/generated-graphql";
import {
imageLightboxDisplayModeIntlMap,
imageLightboxScrollModeIntlMap,
} from "src/core/enums";
-import { useInterfaceLocalForage } from "src/hooks";
+import { useInterfaceLocalForage } from "src/hooks/LocalForage";
import {
ConnectionState,
connectionStateLabel,
@@ -37,6 +35,14 @@ import {
ratingSystemIntlMap,
RatingSystemType,
} from "src/utils/rating";
+import {
+ imageWallDirectionIntlMap,
+ ImageWallDirection,
+ defaultImageWallOptions,
+ defaultImageWallDirection,
+ defaultImageWallMargin,
+} from "src/utils/imageWall";
+import { defaultMaxOptionsShown } from "src/core/config";
const allMenuItems = [
{ id: "scenes", headingID: "scenes" },
@@ -93,6 +99,24 @@ export const SettingsInterfacePanel: React.FC = () => {
});
}
+ function saveImageWallMargin(m: number) {
+ saveUI({
+ imageWallOptions: {
+ ...(ui.imageWallOptions ?? defaultImageWallOptions),
+ margin: m,
+ },
+ });
+ }
+
+ function saveImageWallDirection(d: ImageWallDirection) {
+ saveUI({
+ imageWallOptions: {
+ ...(ui.imageWallOptions ?? defaultImageWallOptions),
+ direction: d,
+ },
+ });
+ }
+
function saveRatingSystemType(t: RatingSystemType) {
saveUI({
ratingSystemOptions: {
@@ -354,6 +378,31 @@ export const SettingsInterfacePanel: React.FC = () => {
/>
+
+ saveImageWallMargin(v)}
+ />
+
+ saveImageWallDirection(v as ImageWallDirection)}
+ >
+ {Array.from(imageWallDirectionIntlMap.entries()).map((v) => (
+
+ ))}
+
+
+
{
}
/>
+ saveUI({ maxOptionsShown: v })}
+ />
{
const intl = useIntl();
- const {
- general,
- loading,
- error,
- saveGeneral,
- defaults,
- saveDefaults,
- } = React.useContext(SettingStateContext);
+ const { general, loading, error, saveGeneral, defaults, saveDefaults } =
+ React.useContext(SettingStateContext);
function commaDelimitedToList(value: string | undefined) {
if (value) {
@@ -82,7 +77,7 @@ export const SettingsLibraryPanel: React.FC = () => {
id: "config.general.excluded_video_patterns_desc",
})}
@@ -104,7 +99,7 @@ export const SettingsLibraryPanel: React.FC = () => {
id: "config.general.excluded_image_gallery_patterns_desc",
})}
@@ -134,6 +129,14 @@ export const SettingsLibraryPanel: React.FC = () => {
checked={general.writeImageThumbnails ?? false}
onChange={(v) => saveGeneral({ writeImageThumbnails: v })}
/>
+
+ saveGeneral({ galleryCoverRegex: v })}
+ />
diff --git a/ui/v2.5/src/components/Settings/SettingsPluginsPanel.tsx b/ui/v2.5/src/components/Settings/SettingsPluginsPanel.tsx
index 274c82b1c..0cd02703c 100644
--- a/ui/v2.5/src/components/Settings/SettingsPluginsPanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsPluginsPanel.tsx
@@ -3,9 +3,11 @@ import { Button } from "react-bootstrap";
import { FormattedMessage, useIntl } from "react-intl";
import * as GQL from "src/core/generated-graphql";
import { mutateReloadPlugins, usePlugins } from "src/core/StashService";
-import { useToast } from "src/hooks";
-import { TextUtils } from "src/utils";
-import { CollapseButton, Icon, LoadingIndicator } from "src/components/Shared";
+import { useToast } from "src/hooks/Toast";
+import TextUtils from "src/utils/text";
+import { CollapseButton } from "../Shared/CollapseButton";
+import { Icon } from "../Shared/Icon";
+import { LoadingIndicator } from "../Shared/LoadingIndicator";
import { SettingSection } from "./SettingSection";
import { Setting, SettingGroup } from "./Inputs";
import { faLink, faSyncAlt } from "@fortawesome/free-solid-svg-icons";
diff --git a/ui/v2.5/src/components/Settings/SettingsScrapingPanel.tsx b/ui/v2.5/src/components/Settings/SettingsScrapingPanel.tsx
index ecd80ae8a..d0453fbb4 100644
--- a/ui/v2.5/src/components/Settings/SettingsScrapingPanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsScrapingPanel.tsx
@@ -8,9 +8,11 @@ import {
useListSceneScrapers,
useListGalleryScrapers,
} from "src/core/StashService";
-import { useToast } from "src/hooks";
-import { TextUtils } from "src/utils";
-import { CollapseButton, Icon, LoadingIndicator } from "src/components/Shared";
+import { useToast } from "src/hooks/Toast";
+import TextUtils from "src/utils/text";
+import { CollapseButton } from "../Shared/CollapseButton";
+import { Icon } from "../Shared/Icon";
+import { LoadingIndicator } from "../Shared/LoadingIndicator";
import { ScrapeType } from "src/core/generated-graphql";
import { SettingSection } from "./SettingSection";
import { BooleanSetting, StringListSetting, StringSetting } from "./Inputs";
@@ -75,31 +77,17 @@ const URLList: React.FC = ({ urls }) => {
export const SettingsScrapingPanel: React.FC = () => {
const Toast = useToast();
const intl = useIntl();
- const {
- data: performerScrapers,
- loading: loadingPerformers,
- } = useListPerformerScrapers();
- const {
- data: sceneScrapers,
- loading: loadingScenes,
- } = useListSceneScrapers();
- const {
- data: galleryScrapers,
- loading: loadingGalleries,
- } = useListGalleryScrapers();
- const {
- data: movieScrapers,
- loading: loadingMovies,
- } = useListMovieScrapers();
+ const { data: performerScrapers, loading: loadingPerformers } =
+ useListPerformerScrapers();
+ const { data: sceneScrapers, loading: loadingScenes } =
+ useListSceneScrapers();
+ const { data: galleryScrapers, loading: loadingGalleries } =
+ useListGalleryScrapers();
+ const { data: movieScrapers, loading: loadingMovies } =
+ useListMovieScrapers();
- const {
- general,
- scraping,
- loading,
- error,
- saveGeneral,
- saveScraping,
- } = React.useContext(SettingStateContext);
+ const { general, scraping, loading, error, saveGeneral, saveScraping } =
+ React.useContext(SettingStateContext);
async function onReloadScrapers() {
await mutateReloadScrapers().catch((e) => Toast.error(e));
diff --git a/ui/v2.5/src/components/Settings/SettingsSecurityPanel.tsx b/ui/v2.5/src/components/Settings/SettingsSecurityPanel.tsx
index 02d1fae1d..b99217938 100644
--- a/ui/v2.5/src/components/Settings/SettingsSecurityPanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsSecurityPanel.tsx
@@ -5,8 +5,8 @@ import * as GQL from "src/core/generated-graphql";
import { Button, Form } from "react-bootstrap";
import { useIntl } from "react-intl";
import { SettingStateContext } from "./context";
-import { LoadingIndicator } from "../Shared";
-import { useToast } from "src/hooks";
+import { LoadingIndicator } from "../Shared/LoadingIndicator";
+import { useToast } from "src/hooks/Toast";
import { useGenerateAPIKey } from "src/core/StashService";
type AuthenticationSettingsInput = Pick<
@@ -71,14 +71,8 @@ export const SettingsSecurityPanel: React.FC = () => {
const intl = useIntl();
const Toast = useToast();
- const {
- general,
- apiKey,
- loading,
- error,
- saveGeneral,
- refetch,
- } = React.useContext(SettingStateContext);
+ const { general, apiKey, loading, error, saveGeneral, refetch } =
+ React.useContext(SettingStateContext);
const [generateAPIKey] = useGenerateAPIKey();
diff --git a/ui/v2.5/src/components/Settings/SettingsServicesPanel.tsx b/ui/v2.5/src/components/Settings/SettingsServicesPanel.tsx
index 51d30b1dc..2db88f926 100644
--- a/ui/v2.5/src/components/Settings/SettingsServicesPanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsServicesPanel.tsx
@@ -8,8 +8,11 @@ import {
useAddTempDLNAIP,
useRemoveTempDLNAIP,
} from "src/core/StashService";
-import { useToast } from "src/hooks";
-import { DurationInput, Icon, LoadingIndicator, Modal } from "../Shared";
+import { useToast } from "src/hooks/Toast";
+import { DurationInput } from "../Shared/DurationInput";
+import { Icon } from "../Shared/Icon";
+import { LoadingIndicator } from "../Shared/LoadingIndicator";
+import { ModalComponent } from "../Shared/Modal";
import { SettingSection } from "./SettingSection";
import { BooleanSetting, StringListSetting, StringSetting } from "./Inputs";
import { SettingStateContext } from "./context";
@@ -23,9 +26,12 @@ export const SettingsServicesPanel: React.FC = () => {
const intl = useIntl();
const Toast = useToast();
- const { dlna, loading: configLoading, error, saveDLNA } = React.useContext(
- SettingStateContext
- );
+ const {
+ dlna,
+ loading: configLoading,
+ error,
+ saveDLNA,
+ } = React.useContext(SettingStateContext);
// undefined to hide dialog, true for enable, false for disable
const [enableDisable, setEnableDisable] = useState(
@@ -233,7 +239,7 @@ export const SettingsServicesPanel: React.FC = () => {
const capitalised = `${text[0].toUpperCase()}${text.slice(1)}`;
return (
- {
Duration to {text} for - in minutes.
-
+
);
}
function renderTempWhitelistDialog() {
return (
- {
Duration to allow for - in minutes.
-
+
);
}
diff --git a/ui/v2.5/src/components/Settings/SettingsSystemPanel.tsx b/ui/v2.5/src/components/Settings/SettingsSystemPanel.tsx
index 46d02ba80..c5b0f36c1 100644
--- a/ui/v2.5/src/components/Settings/SettingsSystemPanel.tsx
+++ b/ui/v2.5/src/components/Settings/SettingsSystemPanel.tsx
@@ -1,12 +1,13 @@
import React from "react";
import * as GQL from "src/core/generated-graphql";
-import { LoadingIndicator } from "src/components/Shared";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { SettingSection } from "./SettingSection";
import {
BooleanSetting,
ModalSetting,
NumberSetting,
SelectSetting,
+ StringListSetting,
StringSetting,
} from "./Inputs";
import { SettingStateContext } from "./context";
@@ -14,11 +15,13 @@ import {
VideoPreviewInput,
VideoPreviewSettingsInput,
} from "./GeneratePreviewOptions";
+import { useIntl } from "react-intl";
export const SettingsConfigurationPanel: React.FC = () => {
- const { general, loading, error, saveGeneral } = React.useContext(
- SettingStateContext
- );
+ const intl = useIntl();
+
+ const { general, loading, error, saveGeneral } =
+ React.useContext(SettingStateContext);
const transcodeQualities = [
GQL.StreamingResolutionEnum.Low,
@@ -94,20 +97,23 @@ export const SettingsConfigurationPanel: React.FC = () => {
return GQL.HashAlgorithm.Md5;
}
+ function blobStorageTypeToID(value: GQL.BlobsStorageType | undefined) {
+ switch (value) {
+ case GQL.BlobsStorageType.Database:
+ return "blobs_storage_type.database";
+ case GQL.BlobsStorageType.Filesystem:
+ return "blobs_storage_type.filesystem";
+ }
+
+ return "blobs_storage_type.database";
+ }
+
if (error) return {error.message}
;
if (loading) return
- saveGeneral({ databasePath: v })}
- />
-
{
onChange={(v) => saveGeneral({ generatedPath: v })}
/>
+ saveGeneral({ cachePath: v })}
+ />
+
{
onChange={(v) => saveGeneral({ metadataPath: v })}
/>
- saveGeneral({ cachePath: v })}
- />
-
{
/>
+
+ saveGeneral({ databasePath: v })}
+ />
+
+ saveGeneral({ blobsStorage: v as GQL.BlobsStorageType })
+ }
+ >
+ {Object.values(GQL.BlobsStorageType).map((q) => (
+
+ ))}
+
+ saveGeneral({ blobsPath: v })}
+ />
+
+
{
))}
+
+ saveGeneral({ transcodeHardwareAcceleration: v })}
+ />
+
+ saveGeneral({ transcodeInputArgs: v })}
+ value={general.transcodeInputArgs ?? []}
+ />
+ saveGeneral({ transcodeOutputArgs: v })}
+ value={general.transcodeOutputArgs ?? []}
+ />
+
+ saveGeneral({ liveTranscodeInputArgs: v })}
+ value={general.liveTranscodeInputArgs ?? []}
+ />
+ saveGeneral({ liveTranscodeOutputArgs: v })}
+ value={general.liveTranscodeOutputArgs ?? []}
+ />
@@ -285,6 +361,16 @@ export const SettingsConfigurationPanel: React.FC = () => {
/>
+
+ saveGeneral({ drawFunscriptHeatmapRange: v })}
+ />
+
+
= ({
}
return (
- = ({
{msg}
-
+
);
};
@@ -149,10 +152,12 @@ const CleanOptions: React.FC = ({
interface IDataManagementTasks {
setIsBackupRunning: (v: boolean) => void;
+ setIsAnonymiseRunning: (v: boolean) => void;
}
export const DataManagementTasks: React.FC = ({
setIsBackupRunning,
+ setIsAnonymiseRunning,
}) => {
const intl = useIntl();
const Toast = useToast();
@@ -167,6 +172,17 @@ export const DataManagementTasks: React.FC = ({
dryRun: false,
});
+ const [migrateBlobsOptions, setMigrateBlobsOptions] =
+ useState({
+ deleteOld: true,
+ });
+
+ const [migrateSceneScreenshotsOptions, setMigrateSceneScreenshotsOptions] =
+ useState({
+ deleteFiles: false,
+ overwriteExisting: false,
+ });
+
type DialogOpenState = typeof dialogOpen;
function setDialogOpen(s: Partial) {
@@ -192,7 +208,7 @@ export const DataManagementTasks: React.FC = ({
function renderImportAlert() {
return (
- = ({
cancel={{ onClick: () => setDialogOpen({ importAlert: false }) }}
>
{intl.formatMessage({ id: "actions.tasks.import_warning" })}
-
+
);
}
@@ -253,13 +269,49 @@ export const DataManagementTasks: React.FC = ({
}
}
+ async function onMigrateSceneScreenshots() {
+ try {
+ await mutateMigrateSceneScreenshots(migrateSceneScreenshotsOptions);
+ Toast.success({
+ content: intl.formatMessage(
+ { id: "config.tasks.added_job_to_queue" },
+ {
+ operation_name: intl.formatMessage({
+ id: "actions.migrate_scene_screenshots",
+ }),
+ }
+ ),
+ });
+ } catch (err) {
+ Toast.error(err);
+ }
+ }
+
+ async function onMigrateBlobs() {
+ try {
+ await mutateMigrateBlobs(migrateBlobsOptions);
+ Toast.success({
+ content: intl.formatMessage(
+ { id: "config.tasks.added_job_to_queue" },
+ {
+ operation_name: intl.formatMessage({
+ id: "actions.migrate_blobs",
+ }),
+ }
+ ),
+ });
+ } catch (err) {
+ Toast.error(err);
+ }
+ }
+
async function onExport() {
try {
await mutateMetadataExport();
Toast.success({
content: intl.formatMessage(
{ id: "config.tasks.added_job_to_queue" },
- { operation_name: intl.formatMessage({ id: "actions.backup" }) }
+ { operation_name: intl.formatMessage({ id: "actions.export" }) }
),
});
} catch (err) {
@@ -286,6 +338,25 @@ export const DataManagementTasks: React.FC = ({
}
}
+ async function onAnonymise(download?: boolean) {
+ try {
+ setIsAnonymiseRunning(true);
+ const ret = await mutateAnonymiseDatabase({
+ download,
+ });
+
+ // download the result
+ if (download && ret.data && ret.data.anonymiseDatabase) {
+ const link = ret.data.anonymiseDatabase;
+ downloadFile(link);
+ }
+ } catch (e) {
+ Toast.error(e);
+ } finally {
+ setIsAnonymiseRunning(false);
+ }
+ }
+
return (
{renderImportAlert()}
@@ -361,7 +432,7 @@ export const DataManagementTasks: React.FC = ({
type="submit"
onClick={() => onExport()}
>
- = ({
+
+
+ [origFilename].anonymous.sqlite.[schemaVersion].[YYYYMMDD_HHMMSS]
+
+ ),
+ }
+ )}
+ >
+
+
+
+
+
+
+
+
= ({
+
+
+
+
+
+
+
+ setMigrateBlobsOptions({ ...migrateBlobsOptions, deleteOld: v })
+ }
+ />
+
+
+
+
+
+
+
+
+ setMigrateSceneScreenshotsOptions({
+ ...migrateSceneScreenshotsOptions,
+ overwriteExisting: v,
+ })
+ }
+ />
+
+
+ setMigrateSceneScreenshotsOptions({
+ ...migrateSceneScreenshotsOptions,
+ deleteFiles: v,
+ })
+ }
+ />
+
);
diff --git a/ui/v2.5/src/components/Settings/Tasks/DirectorySelectionDialog.tsx b/ui/v2.5/src/components/Settings/Tasks/DirectorySelectionDialog.tsx
index 84b1e0d5a..30e64ebcd 100644
--- a/ui/v2.5/src/components/Settings/Tasks/DirectorySelectionDialog.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/DirectorySelectionDialog.tsx
@@ -6,7 +6,8 @@ import {
import React, { useState } from "react";
import { Button, Col, Form, Row } from "react-bootstrap";
import { useIntl } from "react-intl";
-import { Icon, Modal } from "src/components/Shared";
+import { Icon } from "src/components/Shared/Icon";
+import { ModalComponent } from "src/components/Shared/Modal";
import { FolderSelect } from "src/components/Shared/FolderSelect/FolderSelect";
import { ConfigurationContext } from "src/hooks/Config";
@@ -17,12 +18,9 @@ interface IDirectorySelectionDialogProps {
onClose: (paths?: string[]) => void;
}
-export const DirectorySelectionDialog: React.FC = ({
- animation,
- allowEmpty = false,
- initialPaths = [],
- onClose,
-}) => {
+export const DirectorySelectionDialog: React.FC<
+ IDirectorySelectionDialogProps
+> = ({ animation, allowEmpty = false, initialPaths = [], onClose }) => {
const intl = useIntl();
const { configuration } = React.useContext(ConfigurationContext);
@@ -42,7 +40,7 @@ export const DirectorySelectionDialog: React.FC
}
return (
-
}
/>
-
+
);
};
diff --git a/ui/v2.5/src/components/Settings/Tasks/GenerateOptions.tsx b/ui/v2.5/src/components/Settings/Tasks/GenerateOptions.tsx
index 5e8864f26..4436bf179 100644
--- a/ui/v2.5/src/components/Settings/Tasks/GenerateOptions.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/GenerateOptions.tsx
@@ -26,6 +26,12 @@ export const GenerateOptions: React.FC = ({
return (
<>
+ setOptions({ covers: v })}
+ />
= (
}
return (
- = (
-
+
);
};
diff --git a/ui/v2.5/src/components/Settings/Tasks/JobTable.tsx b/ui/v2.5/src/components/Settings/Tasks/JobTable.tsx
index b88107434..2d394a5e0 100644
--- a/ui/v2.5/src/components/Settings/Tasks/JobTable.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/JobTable.tsx
@@ -6,7 +6,7 @@ import {
useJobsSubscribe,
} from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
-import { Icon } from "src/components/Shared";
+import { Icon } from "src/components/Shared/Icon";
import { useIntl } from "react-intl";
import {
faBan,
diff --git a/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx b/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
index 82c4c3b17..6069ef433 100644
--- a/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/LibraryTasks.tsx
@@ -7,18 +7,18 @@ import {
mutateMetadataGenerate,
useConfigureDefaults,
} from "src/core/StashService";
-import { withoutTypename } from "src/utils";
+import { withoutTypename } from "src/utils/data";
import { ConfigurationContext } from "src/hooks/Config";
import { IdentifyDialog } from "../../Dialogs/IdentifyDialog/IdentifyDialog";
import * as GQL from "src/core/generated-graphql";
import { DirectorySelectionDialog } from "./DirectorySelectionDialog";
import { ScanOptions } from "./ScanOptions";
-import { useToast } from "src/hooks";
+import { useToast } from "src/hooks/Toast";
import { GenerateOptions } from "./GenerateOptions";
import { SettingSection } from "../SettingSection";
import { BooleanSetting, Setting, SettingGroup } from "../Inputs";
import { ManualLink } from "src/components/Help/context";
-import { Icon } from "src/components/Shared";
+import { Icon } from "src/components/Shared/Icon";
import { faQuestionCircle } from "@fortawesome/free-solid-svg-icons";
interface IAutoTagOptions {
@@ -81,17 +81,16 @@ export const LibraryTasks: React.FC = () => {
});
const [scanOptions, setScanOptions] = useState({});
- const [
- autoTagOptions,
- setAutoTagOptions,
- ] = useState({
- performers: ["*"],
- studios: ["*"],
- tags: ["*"],
- });
+ const [autoTagOptions, setAutoTagOptions] =
+ useState({
+ performers: ["*"],
+ studios: ["*"],
+ tags: ["*"],
+ });
function getDefaultGenerateOptions(): GQL.GenerateMetadataInput {
return {
+ covers: true,
sprites: true,
phashes: true,
previews: true,
@@ -104,10 +103,8 @@ export const LibraryTasks: React.FC = () => {
};
}
- const [
- generateOptions,
- setGenerateOptions,
- ] = useState(getDefaultGenerateOptions());
+ const [generateOptions, setGenerateOptions] =
+ useState(getDefaultGenerateOptions());
type DialogOpenState = typeof dialogOpen;
diff --git a/ui/v2.5/src/components/Settings/Tasks/PluginTasks.tsx b/ui/v2.5/src/components/Settings/Tasks/PluginTasks.tsx
index d1d9ab9e9..396e1d66a 100644
--- a/ui/v2.5/src/components/Settings/Tasks/PluginTasks.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/PluginTasks.tsx
@@ -2,7 +2,7 @@ import React from "react";
import { useIntl } from "react-intl";
import { Button, Form } from "react-bootstrap";
import { mutateRunPluginTask, usePlugins } from "src/core/StashService";
-import { useToast } from "src/hooks";
+import { useToast } from "src/hooks/Toast";
import * as GQL from "src/core/generated-graphql";
import { SettingSection } from "../SettingSection";
import { Setting, SettingGroup } from "../Inputs";
diff --git a/ui/v2.5/src/components/Settings/Tasks/ScanOptions.tsx b/ui/v2.5/src/components/Settings/Tasks/ScanOptions.tsx
index 2f9497ee3..1a965ead3 100644
--- a/ui/v2.5/src/components/Settings/Tasks/ScanOptions.tsx
+++ b/ui/v2.5/src/components/Settings/Tasks/ScanOptions.tsx
@@ -12,6 +12,7 @@ export const ScanOptions: React.FC = ({
setOptions: setOptionsState,
}) => {
const {
+ scanGenerateCovers,
scanGeneratePreviews,
scanGenerateImagePreviews,
scanGenerateSprites,
@@ -25,6 +26,12 @@ export const ScanOptions: React.FC = ({
return (
<>
+ setOptions({ scanGenerateCovers: v })}
+ />
{
const intl = useIntl();
const [isBackupRunning, setIsBackupRunning] = useState(false);
+ const [isAnonymiseRunning, setIsAnonymiseRunning] = useState(false);
if (isBackupRunning) {
return (
@@ -18,6 +19,16 @@ export const SettingsTasksPanel: React.FC = () => {
);
}
+ if (isAnonymiseRunning) {
+ return (
+
-
({});
- const [pendingGeneral, setPendingGeneral] = useState<
- GQL.ConfigGeneralInput | undefined
- >();
+ const [pendingGeneral, setPendingGeneral] =
+ useState();
const [updateGeneralConfig] = useConfigureGeneral();
const [iface, setIface] = useState({});
- const [pendingInterface, setPendingInterface] = useState<
- GQL.ConfigInterfaceInput | undefined
- >();
+ const [pendingInterface, setPendingInterface] =
+ useState();
const [updateInterfaceConfig] = useConfigureInterface();
const [defaults, setDefaults] = useState({});
- const [pendingDefaults, setPendingDefaults] = useState<
- GQL.ConfigDefaultSettingsInput | undefined
- >();
+ const [pendingDefaults, setPendingDefaults] =
+ useState();
const [updateDefaultsConfig] = useConfigureDefaults();
const [scraping, setScraping] = useState({});
- const [pendingScraping, setPendingScraping] = useState<
- GQL.ConfigScrapingInput | undefined
- >();
+ const [pendingScraping, setPendingScraping] =
+ useState();
const [updateScrapingConfig] = useConfigureScraping();
const [dlna, setDLNA] = useState({});
- const [pendingDLNA, setPendingDLNA] = useState<
- GQL.ConfigDlnaInput | undefined
- >();
+ const [pendingDLNA, setPendingDLNA] = useState();
const [updateDLNAConfig] = useConfigureDLNA();
const [ui, setUI] = useState({});
- const [pendingUI, setPendingUI] = useState<{} | undefined>();
+ const [pendingUI, setPendingUI] = useState<{}>();
const [updateUIConfig] = useConfigureUI();
- const [updateSuccess, setUpdateSuccess] = useState();
+ const [updateSuccess, setUpdateSuccess] = useState();
const [apiKey, setApiKey] = useState("");
@@ -146,13 +134,7 @@ export const SettingsContext: React.FC = ({ children }) => {
setUI(data.configuration.ui);
}, [data, error]);
- const resetSuccess = useMemo(
- () =>
- debounce(() => {
- setUpdateSuccess(undefined);
- }, 4000),
- []
- );
+ const resetSuccess = useDebounce(() => setUpdateSuccess(undefined), [], 4000);
const onSuccess = useCallback(() => {
setUpdateSuccess(true);
@@ -160,24 +142,24 @@ export const SettingsContext: React.FC = ({ children }) => {
}, [resetSuccess]);
// saves the configuration if no further changes are made after a half second
- const saveGeneralConfig = useMemo(
- () =>
- debounce(async (input: GQL.ConfigGeneralInput) => {
- try {
- setUpdateSuccess(undefined);
- await updateGeneralConfig({
- variables: {
- input,
- },
- });
+ const saveGeneralConfig = useDebounce(
+ async (input: GQL.ConfigGeneralInput) => {
+ try {
+ setUpdateSuccess(undefined);
+ await updateGeneralConfig({
+ variables: {
+ input,
+ },
+ });
- setPendingGeneral(undefined);
- onSuccess();
- } catch (e) {
- setSaveError(e);
- }
- }, 500),
- [updateGeneralConfig, onSuccess]
+ setPendingGeneral(undefined);
+ onSuccess();
+ } catch (e) {
+ setSaveError(e);
+ }
+ },
+ [updateGeneralConfig, onSuccess],
+ 500
);
useEffect(() => {
@@ -210,24 +192,24 @@ export const SettingsContext: React.FC = ({ children }) => {
}
// saves the configuration if no further changes are made after a half second
- const saveInterfaceConfig = useMemo(
- () =>
- debounce(async (input: GQL.ConfigInterfaceInput) => {
- try {
- setUpdateSuccess(undefined);
- await updateInterfaceConfig({
- variables: {
- input,
- },
- });
+ const saveInterfaceConfig = useDebounce(
+ async (input: GQL.ConfigInterfaceInput) => {
+ try {
+ setUpdateSuccess(undefined);
+ await updateInterfaceConfig({
+ variables: {
+ input,
+ },
+ });
- setPendingInterface(undefined);
- onSuccess();
- } catch (e) {
- setSaveError(e);
- }
- }, 500),
- [updateInterfaceConfig, onSuccess]
+ setPendingInterface(undefined);
+ onSuccess();
+ } catch (e) {
+ setSaveError(e);
+ }
+ },
+ [updateInterfaceConfig, onSuccess],
+ 500
);
useEffect(() => {
@@ -260,24 +242,24 @@ export const SettingsContext: React.FC = ({ children }) => {
}
// saves the configuration if no further changes are made after a half second
- const saveDefaultsConfig = useMemo(
- () =>
- debounce(async (input: GQL.ConfigDefaultSettingsInput) => {
- try {
- setUpdateSuccess(undefined);
- await updateDefaultsConfig({
- variables: {
- input,
- },
- });
+ const saveDefaultsConfig = useDebounce(
+ async (input: GQL.ConfigDefaultSettingsInput) => {
+ try {
+ setUpdateSuccess(undefined);
+ await updateDefaultsConfig({
+ variables: {
+ input,
+ },
+ });
- setPendingDefaults(undefined);
- onSuccess();
- } catch (e) {
- setSaveError(e);
- }
- }, 500),
- [updateDefaultsConfig, onSuccess]
+ setPendingDefaults(undefined);
+ onSuccess();
+ } catch (e) {
+ setSaveError(e);
+ }
+ },
+ [updateDefaultsConfig, onSuccess],
+ 500
);
useEffect(() => {
@@ -310,24 +292,24 @@ export const SettingsContext: React.FC = ({ children }) => {
}
// saves the configuration if no further changes are made after a half second
- const saveScrapingConfig = useMemo(
- () =>
- debounce(async (input: GQL.ConfigScrapingInput) => {
- try {
- setUpdateSuccess(undefined);
- await updateScrapingConfig({
- variables: {
- input,
- },
- });
+ const saveScrapingConfig = useDebounce(
+ async (input: GQL.ConfigScrapingInput) => {
+ try {
+ setUpdateSuccess(undefined);
+ await updateScrapingConfig({
+ variables: {
+ input,
+ },
+ });
- setPendingScraping(undefined);
- onSuccess();
- } catch (e) {
- setSaveError(e);
- }
- }, 500),
- [updateScrapingConfig, onSuccess]
+ setPendingScraping(undefined);
+ onSuccess();
+ } catch (e) {
+ setSaveError(e);
+ }
+ },
+ [updateScrapingConfig, onSuccess],
+ 500
);
useEffect(() => {
@@ -360,24 +342,24 @@ export const SettingsContext: React.FC = ({ children }) => {
}
// saves the configuration if no further changes are made after a half second
- const saveDLNAConfig = useMemo(
- () =>
- debounce(async (input: GQL.ConfigDlnaInput) => {
- try {
- setUpdateSuccess(undefined);
- await updateDLNAConfig({
- variables: {
- input,
- },
- });
+ const saveDLNAConfig = useDebounce(
+ async (input: GQL.ConfigDlnaInput) => {
+ try {
+ setUpdateSuccess(undefined);
+ await updateDLNAConfig({
+ variables: {
+ input,
+ },
+ });
- setPendingDLNA(undefined);
- onSuccess();
- } catch (e) {
- setSaveError(e);
- }
- }, 500),
- [updateDLNAConfig, onSuccess]
+ setPendingDLNA(undefined);
+ onSuccess();
+ } catch (e) {
+ setSaveError(e);
+ }
+ },
+ [updateDLNAConfig, onSuccess],
+ 500
);
useEffect(() => {
@@ -410,24 +392,24 @@ export const SettingsContext: React.FC = ({ children }) => {
}
// saves the configuration if no further changes are made after a half second
- const saveUIConfig = useMemo(
- () =>
- debounce(async (input: IUIConfig) => {
- try {
- setUpdateSuccess(undefined);
- await updateUIConfig({
- variables: {
- input,
- },
- });
+ const saveUIConfig = useDebounce(
+ async (input: IUIConfig) => {
+ try {
+ setUpdateSuccess(undefined);
+ await updateUIConfig({
+ variables: {
+ input,
+ },
+ });
- setPendingUI(undefined);
- onSuccess();
- } catch (e) {
- setSaveError(e);
- }
- }, 500),
- [updateUIConfig, onSuccess]
+ setPendingUI(undefined);
+ onSuccess();
+ } catch (e) {
+ setSaveError(e);
+ }
+ },
+ [updateUIConfig, onSuccess],
+ 500
);
useEffect(() => {
diff --git a/ui/v2.5/src/components/Setup/Migrate.tsx b/ui/v2.5/src/components/Setup/Migrate.tsx
index 57ac073c8..9f27d7805 100644
--- a/ui/v2.5/src/components/Setup/Migrate.tsx
+++ b/ui/v2.5/src/components/Setup/Migrate.tsx
@@ -1,11 +1,11 @@
import React, { useEffect, useMemo, useState } from "react";
import { Button, Card, Container, Form } from "react-bootstrap";
import { useIntl, FormattedMessage } from "react-intl";
-import { getBaseURL } from "src/core/createClient";
+import { useHistory } from "react-router-dom";
import * as GQL from "src/core/generated-graphql";
import { useSystemStatus, mutateMigrate } from "src/core/StashService";
import { migrationNotes } from "src/docs/en/MigrationNotes";
-import { LoadingIndicator } from "../Shared";
+import { LoadingIndicator } from "../Shared/LoadingIndicator";
import { MarkdownPage } from "../Shared/MarkdownPage";
export const Migrate: React.FC = () => {
@@ -15,6 +15,7 @@ export const Migrate: React.FC = () => {
const [migrateError, setMigrateError] = useState("");
const intl = useIntl();
+ const history = useHistory();
// if database path includes path separators, then this is passed through
// to the migration path. Extract the base name of the database file.
@@ -109,8 +110,7 @@ export const Migrate: React.FC = () => {
systemStatus.systemStatus.status !== GQL.SystemStatusEnum.NeedsMigration
) {
// redirect to main page
- const newURL = new URL("/", window.location.toString());
- window.location.href = newURL.toString();
+ history.push("/");
return ([]);
const [showStashAlert, setShowStashAlert] = useState(false);
- const [generatedLocation, setGeneratedLocation] = useState("");
const [databaseFile, setDatabaseFile] = useState("");
+ const [generatedLocation, setGeneratedLocation] = useState("");
+ const [cacheLocation, setCacheLocation] = useState("");
+ const [blobsLocation, setBlobsLocation] = useState("blobs");
const [loading, setLoading] = useState(false);
const [setupError, setSetupError] = useState("");
const intl = useIntl();
+ const history = useHistory();
- const [showGeneratedDialog, setShowGeneratedDialog] = useState(false);
+ const [showGeneratedSelectDialog, setShowGeneratedSelectDialog] =
+ useState(false);
+ const [showCacheSelectDialog, setShowCacheSelectDialog] = useState(false);
+ const [showBlobsDialog, setShowBlobsDialog] = useState(false);
const { data: systemStatus, loading: statusLoading } = useSystemStatus();
@@ -111,7 +124,7 @@ export const Setup: React.FC = () => {
}
return (
- {
-
+
);
}
@@ -226,20 +239,36 @@ export const Setup: React.FC = () => {
);
}
- function onGeneratedClosed(d?: string) {
+ function onGeneratedSelectClosed(d?: string) {
if (d) {
setGeneratedLocation(d);
}
- setShowGeneratedDialog(false);
+ setShowGeneratedSelectDialog(false);
}
function maybeRenderGeneratedSelectDialog() {
- if (!showGeneratedDialog) {
+ if (!showGeneratedSelectDialog) {
return;
}
- return
+
+
+
+ {chunks},
+ }}
+ />
+
+
+ ) =>
+ setCacheLocation(e.currentTarget.value)
+ }
+ />
+
+
+
+
+
+ );
+ }
+ }
+
+ function maybeRenderBlobs() {
+ if (!configuration?.general.blobsPath) {
+ return (
+
+
+
+
+ {chunks},
+ }}
+ />
+
+
+ {chunks},
+ strong: (chunks: string) => {chunks},
+ }}
+ />
+
+
+ ) =>
+ setBlobsLocation(e.currentTarget.value)
+ }
+ />
+
+
@@ -321,6 +457,13 @@ export const Setup: React.FC = () => {
code: (chunks: string) => {chunks},
}}
/>
+
+ {chunks},
+ }}
+ />
{
/>
{maybeRenderGenerated()}
+ {maybeRenderCache()}
+ {maybeRenderBlobs()}
@@ -397,8 +542,19 @@ export const Setup: React.FC = () => {
configLocation,
databaseFile,
generatedLocation,
+ cacheLocation,
+ blobsLocation,
stashes,
});
+ // Set lastNoteSeen to hide release notes dialog
+ await saveUI({
+ variables: {
+ input: {
+ ...configuration?.ui,
+ lastNoteSeen: releaseNotes[0].date,
+ },
+ },
+ });
} catch (e) {
if (e instanceof Error) setSetupError(e.message ?? e.toString());
} finally {
@@ -457,6 +613,32 @@ export const Setup: React.FC = () => {
+
+ -
+
+ -
+
+ {cacheLocation !== ""
+ ? cacheLocation
+ : intl.formatMessage({
+ id: "setup.confirm.default_cache_location",
+ })}
+
+
+ -
+
+ -
+
+ {blobsLocation !== ""
+ ? blobsLocation
+ : intl.formatMessage({
+ id: "setup.confirm.default_blobs_location",
+ })}
+
+
+
@@ -576,7 +758,7 @@ export const Setup: React.FC = () => {
-
);
};
-
-export default CountryLabel;
diff --git a/ui/v2.5/src/components/Shared/CountrySelect.tsx b/ui/v2.5/src/components/Shared/CountrySelect.tsx
index e354279fd..659731725 100644
--- a/ui/v2.5/src/components/Shared/CountrySelect.tsx
+++ b/ui/v2.5/src/components/Shared/CountrySelect.tsx
@@ -1,25 +1,27 @@
import React from "react";
import Creatable from "react-select/creatable";
import { useIntl } from "react-intl";
-import { getCountries } from "src/utils";
-import CountryLabel from "./CountryLabel";
+import { getCountries } from "src/utils/country";
+import { CountryLabel } from "./CountryLabel";
interface IProps {
- value?: string | undefined;
+ value?: string;
onChange?: (value: string) => void;
disabled?: boolean;
className?: string;
showFlag?: boolean;
isClearable?: boolean;
+ menuPortalTarget?: HTMLElement | null;
}
-const CountrySelect: React.FC = ({
+export const CountrySelect: React.FC = ({
value,
onChange,
disabled = false,
isClearable = true,
showFlag,
className,
+ menuPortalTarget,
}) => {
const { locale } = useIntl();
const options = getCountries(locale);
@@ -44,8 +46,7 @@ const CountrySelect: React.FC = ({
IndicatorSeparator: null,
}}
className={`CountrySelect ${className}`}
+ menuPortalTarget={menuPortalTarget}
/>
);
};
-
-export default CountrySelect;
diff --git a/ui/v2.5/src/components/Shared/DateInput.tsx b/ui/v2.5/src/components/Shared/DateInput.tsx
new file mode 100644
index 000000000..aa57fd37f
--- /dev/null
+++ b/ui/v2.5/src/components/Shared/DateInput.tsx
@@ -0,0 +1,105 @@
+import { faCalendar } from "@fortawesome/free-regular-svg-icons";
+import React, { useMemo } from "react";
+import { Button, InputGroup, Form } from "react-bootstrap";
+import ReactDatePicker from "react-datepicker";
+import TextUtils from "src/utils/text";
+import { Icon } from "./Icon";
+
+import "react-datepicker/dist/react-datepicker.css";
+import { useIntl } from "react-intl";
+
+interface IProps {
+ disabled?: boolean;
+ value: string | undefined;
+ isTime?: boolean;
+ onValueChange(value: string): void;
+ placeholder?: string;
+ error?: string;
+}
+
+export const DateInput: React.FC = (props: IProps) => {
+ const intl = useIntl();
+
+ const date = useMemo(() => {
+ const toDate = props.isTime
+ ? TextUtils.stringToFuzzyDateTime
+ : TextUtils.stringToFuzzyDate;
+ if (props.value) {
+ const ret = toDate(props.value);
+ if (!ret || isNaN(ret.getTime())) {
+ return undefined;
+ }
+
+ return ret;
+ }
+ }, [props.value, props.isTime]);
+
+ function maybeRenderButton() {
+ if (!props.disabled) {
+ const ShowPickerButton = ({
+ onClick,
+ }: {
+ onClick: (
+ event: React.MouseEvent
+ ) => void;
+ }) => (
+
+ );
+
+ const dateToString = props.isTime
+ ? TextUtils.dateTimeToString
+ : TextUtils.dateToString;
+
+ return (
+ {
+ props.onValueChange(v ? dateToString(v) : "");
+ }}
+ customInput={React.createElement(ShowPickerButton)}
+ showMonthDropdown
+ showYearDropdown
+ scrollableMonthYearDropdown
+ scrollableYearDropdown
+ maxDate={new Date()}
+ yearDropdownItemNumber={100}
+ portalId="date-picker-portal"
+ showTimeSelect={props.isTime}
+ />
+ );
+ }
+ }
+
+ const placeholderText = intl.formatMessage({
+ id: props.isTime ? "datetime_format" : "date_format",
+ });
+
+ return (
+
+
+ ) =>
+ props.onValueChange(e.currentTarget.value)
+ }
+ placeholder={
+ !props.disabled
+ ? props.placeholder
+ ? `${props.placeholder} (${placeholderText})`
+ : placeholderText
+ : undefined
+ }
+ isInvalid={!!props.error}
+ />
+ {maybeRenderButton()}
+
+ {props.error}
+
+
+
+ );
+};
diff --git a/ui/v2.5/src/components/Shared/DeleteEntityDialog.tsx b/ui/v2.5/src/components/Shared/DeleteEntityDialog.tsx
index cf6284982..4fd5114c8 100644
--- a/ui/v2.5/src/components/Shared/DeleteEntityDialog.tsx
+++ b/ui/v2.5/src/components/Shared/DeleteEntityDialog.tsx
@@ -2,8 +2,8 @@ import React, { useState } from "react";
import { defineMessages, FormattedMessage, useIntl } from "react-intl";
import { FetchResult } from "@apollo/client";
-import Modal from "src/components/Shared/Modal";
-import { useToast } from "src/hooks";
+import { ModalComponent } from "./Modal";
+import { useToast } from "src/hooks/Toast";
import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
interface IDeletionEntity {
@@ -39,7 +39,7 @@ const messages = defineMessages({
},
});
-const DeleteEntityDialog: React.FC = ({
+export const DeleteEntityDialog: React.FC = ({
selected,
onClose,
singularEntity,
@@ -77,7 +77,7 @@ const DeleteEntityDialog: React.FC = ({
}
return (
- = ({
/>
)}
-
+
);
};
-
-export default DeleteEntityDialog;
diff --git a/ui/v2.5/src/components/Shared/DeleteFilesDialog.tsx b/ui/v2.5/src/components/Shared/DeleteFilesDialog.tsx
index 9e23c400f..e6898c87a 100644
--- a/ui/v2.5/src/components/Shared/DeleteFilesDialog.tsx
+++ b/ui/v2.5/src/components/Shared/DeleteFilesDialog.tsx
@@ -1,7 +1,7 @@
import React, { useState } from "react";
import { mutateDeleteFiles } from "src/core/StashService";
-import { Modal } from "src/components/Shared";
-import { useToast } from "src/hooks";
+import { ModalComponent } from "./Modal";
+import { useToast } from "src/hooks/Toast";
import { FormattedMessage, useIntl } from "react-intl";
import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
@@ -88,7 +88,7 @@ export const DeleteFilesDialog: React.FC = (
}
return (
- = (
>
{message}
{renderDeleteFileAlert()}
-
+
);
};
-
-export default DeleteFilesDialog;
diff --git a/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx b/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx
index 5c4854c02..fb5646ff5 100644
--- a/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx
+++ b/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx
@@ -1,7 +1,7 @@
import { Button, Modal } from "react-bootstrap";
import React, { useState } from "react";
import { FormattedMessage, useIntl } from "react-intl";
-import { ImageInput } from "src/components/Shared/ImageInput";
+import { ImageInput } from "./ImageInput";
import cx from "classnames";
interface IProps {
diff --git a/ui/v2.5/src/components/Shared/DurationInput.tsx b/ui/v2.5/src/components/Shared/DurationInput.tsx
index b5839790b..0e346acd7 100644
--- a/ui/v2.5/src/components/Shared/DurationInput.tsx
+++ b/ui/v2.5/src/components/Shared/DurationInput.tsx
@@ -5,8 +5,8 @@ import {
} from "@fortawesome/free-solid-svg-icons";
import React, { useState, useEffect } from "react";
import { Button, ButtonGroup, InputGroup, Form } from "react-bootstrap";
-import Icon from "src/components/Shared/Icon";
-import { DurationUtils } from "src/utils";
+import { Icon } from "./Icon";
+import DurationUtils from "src/utils/duration";
interface IProps {
disabled?: boolean;
diff --git a/ui/v2.5/src/components/Shared/ErrorMessage.tsx b/ui/v2.5/src/components/Shared/ErrorMessage.tsx
index 2e40a35df..b0cdb12f3 100644
--- a/ui/v2.5/src/components/Shared/ErrorMessage.tsx
+++ b/ui/v2.5/src/components/Shared/ErrorMessage.tsx
@@ -4,10 +4,8 @@ interface IProps {
error: string | ReactNode;
}
-const ErrorMessage: React.FC = ({ error }) => (
+export const ErrorMessage: React.FC = ({ error }) => (
Error: {error}
);
-
-export default ErrorMessage;
diff --git a/ui/v2.5/src/components/Shared/ExportDialog.tsx b/ui/v2.5/src/components/Shared/ExportDialog.tsx
index 3c0ad5b7c..bf855d732 100644
--- a/ui/v2.5/src/components/Shared/ExportDialog.tsx
+++ b/ui/v2.5/src/components/Shared/ExportDialog.tsx
@@ -1,8 +1,8 @@
import React, { useState } from "react";
import { Form } from "react-bootstrap";
import { mutateExportObjects } from "src/core/StashService";
-import Modal from "src/components/Shared/Modal";
-import useToast from "src/hooks/Toast";
+import { ModalComponent } from "./Modal";
+import { useToast } from "src/hooks/Toast";
import downloadFile from "src/utils/download";
import { ExportObjectsInput } from "src/core/generated-graphql";
import { useIntl } from "react-intl";
@@ -46,7 +46,7 @@ export const ExportDialog: React.FC = (
}
return (
- = (
/>
-
+
);
};
diff --git a/ui/v2.5/src/components/Shared/FolderSelect/FolderSelect.tsx b/ui/v2.5/src/components/Shared/FolderSelect/FolderSelect.tsx
index f6c6de544..9dfd61f5b 100644
--- a/ui/v2.5/src/components/Shared/FolderSelect/FolderSelect.tsx
+++ b/ui/v2.5/src/components/Shared/FolderSelect/FolderSelect.tsx
@@ -1,17 +1,20 @@
-import React, { useEffect, useState, useMemo } from "react";
+import React, { useEffect, useState } from "react";
import { FormattedMessage, useIntl } from "react-intl";
-import { Button, InputGroup, Form } from "react-bootstrap";
-import debounce from "lodash-es/debounce";
-import Icon from "src/components/Shared/Icon";
-import LoadingIndicator from "src/components/Shared/LoadingIndicator";
+import { Button, InputGroup, Form, Collapse } from "react-bootstrap";
+import { Icon } from "../Icon";
+import { LoadingIndicator } from "../LoadingIndicator";
import { useDirectory } from "src/core/StashService";
-import { faTimes } from "@fortawesome/free-solid-svg-icons";
+import { faEllipsis, faTimes } from "@fortawesome/free-solid-svg-icons";
+import { useDebouncedSetState } from "src/hooks/debounce";
interface IProps {
currentDirectory: string;
setCurrentDirectory: (value: string) => void;
defaultDirectories?: string[];
appendButton?: JSX.Element;
+ collapsible?: boolean;
+ quoteSpaced?: boolean;
+ hideError?: boolean;
}
export const FolderSelect: React.FC = ({
@@ -19,33 +22,43 @@ export const FolderSelect: React.FC = ({
setCurrentDirectory,
defaultDirectories,
appendButton,
+ collapsible = false,
+ quoteSpaced = false,
+ hideError = false,
}) => {
- const [debouncedDirectory, setDebouncedDirectory] = useState(
- currentDirectory
+ const [showBrowser, setShowBrowser] = React.useState(false);
+ const [directory, setDirectory] = useState(currentDirectory);
+
+ const isQuoted =
+ quoteSpaced && directory.startsWith('"') && directory.endsWith('"');
+ const { data, error, loading } = useDirectory(
+ isQuoted ? directory.slice(1, -1) : directory
);
- const { data, error, loading } = useDirectory(debouncedDirectory);
+
const intl = useIntl();
- const selectableDirectories: string[] = currentDirectory
- ? data?.directory.directories ?? defaultDirectories ?? []
- : defaultDirectories ?? [];
+ const defaultDirectoriesOrEmpty = defaultDirectories ?? [];
- const debouncedSetDirectory = useMemo(
- () =>
- debounce((input: string) => {
- setDebouncedDirectory(input);
- }, 250),
- []
- );
+ const selectableDirectories: string[] = currentDirectory
+ ? data?.directory.directories ??
+ (error && hideError ? [] : defaultDirectoriesOrEmpty)
+ : defaultDirectoriesOrEmpty;
+
+ const debouncedSetDirectory = useDebouncedSetState(setDirectory, 250);
useEffect(() => {
- if (currentDirectory === "" && !defaultDirectories && data?.directory.path)
- setCurrentDirectory(data.directory.path);
- }, [currentDirectory, setCurrentDirectory, data, defaultDirectories]);
+ if (currentDirectory !== directory) {
+ debouncedSetDirectory(currentDirectory);
+ }
+ }, [currentDirectory, directory, debouncedSetDirectory]);
function setInstant(value: string) {
+ if (quoteSpaced && value.includes(" ")) {
+ value = `"${value}"`;
+ }
+
setCurrentDirectory(value);
- setDebouncedDirectory(value);
+ setDirectory(value);
}
function setDebounced(value: string) {
@@ -74,6 +87,7 @@ export const FolderSelect: React.FC = ({
<>
) => {
setDebounced(e.currentTarget.value);
@@ -84,31 +98,43 @@ export const FolderSelect: React.FC = ({
{appendButton ? (
{appendButton}
) : undefined}
+ {collapsible ? (
+
+
+
+ ) : undefined}
{!data || !data.directory || loading ? (
{loading ? (
) : undefined}
- {error !== undefined && (
+ {!hideError && error !== undefined && (
Error: {error.message}
)}
-
- {topDirectory}
- {selectableDirectories.map((path) => {
- return (
- -
-
-
- );
- })}
-
+
+
+ {topDirectory}
+ {selectableDirectories.map((path) => {
+ return (
+ -
+
+
+ );
+ })}
+
+
);
};
diff --git a/ui/v2.5/src/components/Shared/GridCard.tsx b/ui/v2.5/src/components/Shared/GridCard.tsx
index f7ec2ee81..332bcaf04 100644
--- a/ui/v2.5/src/components/Shared/GridCard.tsx
+++ b/ui/v2.5/src/components/Shared/GridCard.tsx
@@ -2,7 +2,7 @@ import React from "react";
import { Card, Form } from "react-bootstrap";
import { Link } from "react-router-dom";
import cx from "classnames";
-import TruncatedText from "./TruncatedText";
+import { TruncatedText } from "./TruncatedText";
interface ICardProps {
className?: string;
@@ -10,7 +10,7 @@ interface ICardProps {
thumbnailSectionClassName?: string;
url: string;
pretitleIcon?: JSX.Element;
- title: string;
+ title: JSX.Element | string;
image: JSX.Element;
details?: JSX.Element;
overlays?: JSX.Element;
diff --git a/ui/v2.5/src/components/Shared/Icon.tsx b/ui/v2.5/src/components/Shared/Icon.tsx
index d1f2616f6..f5cb23964 100644
--- a/ui/v2.5/src/components/Shared/Icon.tsx
+++ b/ui/v2.5/src/components/Shared/Icon.tsx
@@ -9,7 +9,7 @@ interface IIcon {
size?: SizeProp;
}
-const Icon: React.FC = ({ icon, className, color, size }) => (
+export const Icon: React.FC = ({ icon, className, color, size }) => (
= ({ icon, className, color, size }) => (
size={size}
/>
);
-
-export default Icon;
diff --git a/ui/v2.5/src/components/Shared/ImageInput.tsx b/ui/v2.5/src/components/Shared/ImageInput.tsx
index f1ace6f83..cf25aa887 100644
--- a/ui/v2.5/src/components/Shared/ImageInput.tsx
+++ b/ui/v2.5/src/components/Shared/ImageInput.tsx
@@ -8,8 +8,8 @@ import {
Row,
} from "react-bootstrap";
import { useIntl } from "react-intl";
-import Modal from "./Modal";
-import Icon from "./Icon";
+import { ModalComponent } from "./Modal";
+import { Icon } from "./Icon";
import { faFile, faLink } from "@fortawesome/free-solid-svg-icons";
interface IImageInput {
@@ -64,7 +64,7 @@ export const ImageInput: React.FC = ({
function renderDialog() {
return (
- setIsShowDialog(false)}
header={intl.formatMessage({ id: "dialogs.set_image_url_title" })}
@@ -90,7 +90,7 @@ export const ImageInput: React.FC = ({
-
+
);
}
diff --git a/ui/v2.5/src/components/Shared/LoadingIndicator.tsx b/ui/v2.5/src/components/Shared/LoadingIndicator.tsx
index f52498f0b..3b9247c91 100644
--- a/ui/v2.5/src/components/Shared/LoadingIndicator.tsx
+++ b/ui/v2.5/src/components/Shared/LoadingIndicator.tsx
@@ -12,7 +12,7 @@ interface ILoadingProps {
const CLASSNAME = "LoadingIndicator";
const CLASSNAME_MESSAGE = `${CLASSNAME}-message`;
-const LoadingIndicator: React.FC = ({
+export const LoadingIndicator: React.FC = ({
message,
inline = false,
small = false,
@@ -27,5 +27,3 @@ const LoadingIndicator: React.FC = ({
)}
);
-
-export default LoadingIndicator;
diff --git a/ui/v2.5/src/components/Shared/MarkdownPage.tsx b/ui/v2.5/src/components/Shared/MarkdownPage.tsx
index b9fc93eba..c9713be55 100644
--- a/ui/v2.5/src/components/Shared/MarkdownPage.tsx
+++ b/ui/v2.5/src/components/Shared/MarkdownPage.tsx
@@ -1,11 +1,10 @@
import React, { useEffect, useState } from "react";
-import ReactMarkdown from "react-markdown";
-import gfm from "remark-gfm";
+import { Remark } from "react-remark";
+import remarkGfm from "remark-gfm";
interface IPageProps {
// page is a markdown module
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- page: any;
+ page: string;
}
export const MarkdownPage: React.FC = ({ page }) => {
@@ -20,8 +19,8 @@ export const MarkdownPage: React.FC = ({ page }) => {
}, [page, markdown]);
return (
-
- {markdown}
-
+
+ {markdown}
+
);
};
diff --git a/ui/v2.5/src/components/Shared/Modal.tsx b/ui/v2.5/src/components/Shared/Modal.tsx
index 8cf3b8029..df2e2f270 100644
--- a/ui/v2.5/src/components/Shared/Modal.tsx
+++ b/ui/v2.5/src/components/Shared/Modal.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { Button, Modal, Spinner, ModalProps } from "react-bootstrap";
-import Icon from "src/components/Shared/Icon";
+import { Icon } from "./Icon";
import { IconDefinition } from "@fortawesome/fontawesome-svg-core";
import { FormattedMessage } from "react-intl";
@@ -27,7 +27,7 @@ interface IModal {
const defaultOnHide = () => {};
-const ModalComponent: React.FC = ({
+export const ModalComponent: React.FC = ({
children,
show,
icon,
@@ -99,5 +99,3 @@ const ModalComponent: React.FC = ({
);
-
-export default ModalComponent;
diff --git a/ui/v2.5/src/components/Shared/MultiSet.tsx b/ui/v2.5/src/components/Shared/MultiSet.tsx
index 6f7aa08e4..c19922683 100644
--- a/ui/v2.5/src/components/Shared/MultiSet.tsx
+++ b/ui/v2.5/src/components/Shared/MultiSet.tsx
@@ -1,15 +1,9 @@
-import * as React from "react";
+import React from "react";
import { useIntl } from "react-intl";
import * as GQL from "src/core/generated-graphql";
import { Button, ButtonGroup } from "react-bootstrap";
-import { FilterSelect } from "./Select";
-
-type ValidTypes =
- | GQL.SlimPerformerDataFragment
- | GQL.SlimTagDataFragment
- | GQL.SlimStudioDataFragment
- | GQL.SlimMovieDataFragment;
+import { FilterSelect, SelectObject } from "./Select";
interface IMultiSetProps {
type: "performers" | "studios" | "tags" | "movies";
@@ -21,9 +15,7 @@ interface IMultiSetProps {
onSetMode: (mode: GQL.BulkUpdateIdMode) => void;
}
-const MultiSet: React.FunctionComponent = (
- props: IMultiSetProps
-) => {
+export const MultiSet: React.FC = (props) => {
const intl = useIntl();
const modes = [
GQL.BulkUpdateIdMode.Set,
@@ -31,7 +23,7 @@ const MultiSet: React.FunctionComponent = (
GQL.BulkUpdateIdMode.Remove,
];
- function onUpdate(items: ValidTypes[]) {
+ function onUpdate(items: SelectObject[]) {
props.onUpdate(items.map((i) => i.id));
}
@@ -102,5 +94,3 @@ const MultiSet: React.FunctionComponent = (
);
};
-
-export default MultiSet;
diff --git a/ui/v2.5/src/components/Shared/OperationButton.tsx b/ui/v2.5/src/components/Shared/OperationButton.tsx
index c71d9e139..89155467c 100644
--- a/ui/v2.5/src/components/Shared/OperationButton.tsx
+++ b/ui/v2.5/src/components/Shared/OperationButton.tsx
@@ -1,6 +1,6 @@
import React, { useState, useRef, useEffect } from "react";
import { Button, ButtonProps } from "react-bootstrap";
-import LoadingIndicator from "src/components/Shared/LoadingIndicator";
+import { LoadingIndicator } from "./LoadingIndicator";
interface IOperationButton extends ButtonProps {
operation?: () => Promise;
diff --git a/ui/v2.5/src/components/Shared/PercentInput.tsx b/ui/v2.5/src/components/Shared/PercentInput.tsx
index 783ead755..66357a05b 100644
--- a/ui/v2.5/src/components/Shared/PercentInput.tsx
+++ b/ui/v2.5/src/components/Shared/PercentInput.tsx
@@ -5,8 +5,8 @@ import {
} from "@fortawesome/free-solid-svg-icons";
import React, { useState, useEffect } from "react";
import { Button, ButtonGroup, InputGroup, Form } from "react-bootstrap";
-import Icon from "src/components/Shared/Icon";
-import { PercentUtils } from "src/utils";
+import { Icon } from "./Icon";
+import PercentUtils from "src/utils/percent";
interface IProps {
disabled?: boolean;
diff --git a/ui/v2.5/src/components/Shared/PerformerPopoverButton.tsx b/ui/v2.5/src/components/Shared/PerformerPopoverButton.tsx
index d12da10d3..9d0cfb6fe 100644
--- a/ui/v2.5/src/components/Shared/PerformerPopoverButton.tsx
+++ b/ui/v2.5/src/components/Shared/PerformerPopoverButton.tsx
@@ -5,7 +5,7 @@ import { Link } from "react-router-dom";
import * as GQL from "src/core/generated-graphql";
import { sortPerformers } from "src/core/performers";
import { HoverPopover } from "./HoverPopover";
-import Icon from "./Icon";
+import { Icon } from "./Icon";
import { TagLink } from "./TagLink";
interface IProps {
diff --git a/ui/v2.5/src/components/Shared/PopoverCountButton.tsx b/ui/v2.5/src/components/Shared/PopoverCountButton.tsx
index 901424b98..6d6ef8571 100644
--- a/ui/v2.5/src/components/Shared/PopoverCountButton.tsx
+++ b/ui/v2.5/src/components/Shared/PopoverCountButton.tsx
@@ -3,6 +3,7 @@ import {
faImage,
faImages,
faPlayCircle,
+ faUser,
} from "@fortawesome/free-solid-svg-icons";
import React, { useMemo } from "react";
import { Button } from "react-bootstrap";
@@ -10,10 +11,10 @@ import { FormattedNumber, useIntl } from "react-intl";
import { Link } from "react-router-dom";
import { IUIConfig } from "src/core/config";
import { ConfigurationContext } from "src/hooks/Config";
-import { TextUtils } from "src/utils";
-import Icon from "./Icon";
+import TextUtils from "src/utils/text";
+import { Icon } from "./Icon";
-type PopoverLinkType = "scene" | "image" | "gallery" | "movie";
+type PopoverLinkType = "scene" | "image" | "gallery" | "movie" | "performer";
interface IProps {
className?: string;
@@ -44,6 +45,8 @@ export const PopoverCountButton: React.FC = ({
return faImages;
case "movie":
return faFilm;
+ case "performer":
+ return faUser;
}
}
@@ -69,6 +72,11 @@ export const PopoverCountButton: React.FC = ({
one: "movie",
other: "movies",
};
+ case "performer":
+ return {
+ one: "performer",
+ other: "performers",
+ };
}
}
diff --git a/ui/v2.5/src/components/Shared/Rating/RatingStars.tsx b/ui/v2.5/src/components/Shared/Rating/RatingStars.tsx
index e2801ee80..99e2e5be6 100644
--- a/ui/v2.5/src/components/Shared/Rating/RatingStars.tsx
+++ b/ui/v2.5/src/components/Shared/Rating/RatingStars.tsx
@@ -1,6 +1,6 @@
import React, { useState } from "react";
import { Button } from "react-bootstrap";
-import Icon from "src/components/Shared/Icon";
+import { Icon } from "../Icon";
import { faStar as fasStar } from "@fortawesome/free-solid-svg-icons";
import { faStar as farStar } from "@fortawesome/free-regular-svg-icons";
import {
@@ -32,7 +32,8 @@ export const RatingStars: React.FC = (
starPrecision: props.precision,
});
const stars = rating ? Math.floor(rating) : 0;
- const fraction = rating ? rating % 1 : 0;
+ // the upscaling was necesary to fix rounding issue present with tenth place precision
+ const fraction = rating ? ((rating * 10) % 10) / 10 : 0;
const max = 5;
const precision = getRatingPrecision(props.precision);
@@ -223,11 +224,28 @@ export const RatingStars: React.FC = (
);
};
+ const maybeRenderStarRatingNumber = () => {
+ const ratingFraction = getCurrentSelectedRating();
+ if (
+ !ratingFraction ||
+ (ratingFraction.rating == 0 && ratingFraction.fraction == 0)
+ ) {
+ return;
+ }
+
+ return (
+
+ {ratingFraction.rating + ratingFraction.fraction}
+
+ );
+ };
+
return (
{Array.from(Array(max)).map((value, index) =>
renderRatingButton(index + 1)
)}
+ {maybeRenderStarRatingNumber()}
);
};
diff --git a/ui/v2.5/src/components/Shared/Rating/styles.scss b/ui/v2.5/src/components/Shared/Rating/styles.scss
index 2784943bb..f7b463359 100644
--- a/ui/v2.5/src/components/Shared/Rating/styles.scss
+++ b/ui/v2.5/src/components/Shared/Rating/styles.scss
@@ -21,18 +21,50 @@
width: 0;
}
+ &.star-fill-10 .filled-star {
+ width: 10%;
+ }
+
+ &.star-fill-20 .filled-star {
+ width: 20%;
+ }
+
&.star-fill-25 .filled-star {
width: 35%;
}
+ &.star-fill-30 .filled-star {
+ width: 30%;
+ }
+
+ &.star-fill-40 .filled-star {
+ width: 40%;
+ }
+
&.star-fill-50 .filled-star {
width: 50%;
}
+ &.star-fill-60 .filled-star {
+ width: 60%;
+ }
+
&.star-fill-75 .filled-star {
width: 65%;
}
+ &.star-fill-70 .filled-star {
+ width: 70%;
+ }
+
+ &.star-fill-80 .filled-star {
+ width: 80%;
+ }
+
+ &.star-fill-90 .filled-star {
+ width: 90%;
+ }
+
&.star-fill-100 .filled-star {
width: 100%;
}
@@ -56,6 +88,11 @@
}
}
+.star-rating-number {
+ font-size: 1rem;
+ margin: auto 0.5rem;
+}
+
.rating-number.disabled {
align-items: center;
display: inline-flex;
diff --git a/ui/v2.5/src/components/Shared/ReassignFilesDialog.tsx b/ui/v2.5/src/components/Shared/ReassignFilesDialog.tsx
index 8a15359b2..7629d0379 100644
--- a/ui/v2.5/src/components/Shared/ReassignFilesDialog.tsx
+++ b/ui/v2.5/src/components/Shared/ReassignFilesDialog.tsx
@@ -1,10 +1,11 @@
import React, { useState } from "react";
-import { Modal, SceneSelect } from "src/components/Shared";
-import { useToast } from "src/hooks";
+import { ModalComponent } from "./Modal";
+import { SceneSelect } from "./Select";
+import { useToast } from "src/hooks/Toast";
import { useIntl } from "react-intl";
import { faSignOutAlt } from "@fortawesome/free-solid-svg-icons";
import { Col, Form, Row } from "react-bootstrap";
-import { FormUtils } from "src/utils";
+import FormUtils from "src/utils/form";
import { mutateSceneAssignFile } from "src/core/StashService";
interface IFile {
@@ -59,7 +60,7 @@ export const ReassignFilesDialog: React.FC = (
}
return (
- = (
-
+
);
};
-
-export default ReassignFilesDialog;
diff --git a/ui/v2.5/src/components/Shared/ScrapeDialog.tsx b/ui/v2.5/src/components/Shared/ScrapeDialog.tsx
index 57609635e..0a5b1b9b2 100644
--- a/ui/v2.5/src/components/Shared/ScrapeDialog.tsx
+++ b/ui/v2.5/src/components/Shared/ScrapeDialog.tsx
@@ -8,9 +8,9 @@ import {
FormControl,
Badge,
} from "react-bootstrap";
-import { CollapseButton } from "src/components/Shared/CollapseButton";
-import Icon from "src/components/Shared/Icon";
-import Modal from "src/components/Shared/Modal";
+import { CollapseButton } from "./CollapseButton";
+import { Icon } from "./Icon";
+import { ModalComponent } from "./Modal";
import isEqual from "lodash-es/isEqual";
import clone from "lodash-es/clone";
import { FormattedMessage, useIntl } from "react-intl";
@@ -20,8 +20,8 @@ import {
faPlus,
faTimes,
} from "@fortawesome/free-solid-svg-icons";
-import { getCountryByISO } from "src/utils";
-import CountrySelect from "./CountrySelect";
+import { getCountryByISO } from "src/utils/country";
+import { CountrySelect } from "./CountrySelect";
export class ScrapeResult {
public newValue?: T;
@@ -36,10 +36,13 @@ export class ScrapeResult {
) {
this.originalValue = originalValue ?? undefined;
this.newValue = newValue ?? undefined;
+ // NOTE: this means that zero values are treated as null
+ // this is incorrect for numbers and booleans, but correct for strings
+ const hasNewValue = !!this.newValue;
const valuesEqual = isEqual(originalValue, newValue);
- this.useNewValue = useNewValue ?? (!!this.newValue && !valuesEqual);
- this.scraped = !!this.newValue && !valuesEqual;
+ this.useNewValue = useNewValue ?? (hasNewValue && !valuesEqual);
+ this.scraped = hasNewValue && !valuesEqual;
}
public setOriginalValue(value?: T) {
@@ -67,6 +70,23 @@ export class ScrapeResult {
}
}
+// for types where !!value is a valid value (boolean and number)
+export class ZeroableScrapeResult extends ScrapeResult {
+ public constructor(
+ originalValue?: T | null,
+ newValue?: T | null,
+ useNewValue?: boolean
+ ) {
+ super(originalValue, newValue, useNewValue);
+
+ const hasNewValue = this.newValue !== undefined;
+
+ const valuesEqual = isEqual(originalValue, newValue);
+ this.useNewValue = useNewValue ?? (hasNewValue && !valuesEqual);
+ this.scraped = hasNewValue && !valuesEqual;
+ }
+}
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export function hasScrapedValues(values: ScrapeResult[]) {
return values.some((r) => r.scraped);
@@ -367,7 +387,7 @@ export const ScrapeDialog: React.FC = (
) => {
const intl = useIntl();
return (
- = (
{props.renderScrapeRows()}
-
+
);
};
diff --git a/ui/v2.5/src/components/Shared/Select.tsx b/ui/v2.5/src/components/Shared/Select.tsx
index 8b44b864c..195c52bd7 100644
--- a/ui/v2.5/src/components/Shared/Select.tsx
+++ b/ui/v2.5/src/components/Shared/Select.tsx
@@ -1,16 +1,15 @@
import React, { useEffect, useMemo, useState } from "react";
import Select, {
- ValueType,
- Styles,
+ OnChangeValue,
+ StylesConfig,
OptionProps,
components as reactSelectComponents,
- GroupedOptionsType,
- OptionsType,
- MenuListComponentProps,
- GroupTypeBase,
+ Options,
+ MenuListProps,
+ GroupBase,
+ OptionsOrGroups,
} from "react-select";
import CreatableSelect from "react-select/creatable";
-import debounce from "lodash-es/debounce";
import * as GQL from "src/core/generated-graphql";
import {
@@ -23,19 +22,21 @@ import {
useStudioCreate,
usePerformerCreate,
} from "src/core/StashService";
-import { useToast } from "src/hooks";
-import { SelectComponents } from "react-select/src/components";
+import { useToast } from "src/hooks/Toast";
+import { SelectComponents } from "react-select/dist/declarations/src/components";
import { ConfigurationContext } from "src/hooks/Config";
import { useIntl } from "react-intl";
import { objectTitle } from "src/core/files";
import { galleryTitle } from "src/core/galleries";
import { TagPopover } from "../Tags/TagPopover";
+import { defaultMaxOptionsShown, IUIConfig } from "src/core/config";
+import { useDebouncedSetState } from "src/hooks/debounce";
-export type ValidTypes =
- | GQL.SlimPerformerDataFragment
- | GQL.SlimTagDataFragment
- | GQL.SlimStudioDataFragment
- | GQL.SlimMovieDataFragment;
+export type SelectObject = {
+ id: string;
+ name?: string | null;
+ title?: string | null;
+};
type Option = { value: string; label: string };
interface ITypeProps {
@@ -53,7 +54,7 @@ interface ITypeProps {
interface IFilterProps {
ids?: string[];
initialIds?: string[];
- onSelect?: (item: ValidTypes[]) => void;
+ onSelect?: (item: SelectObject[]) => void;
noSelectionString?: string;
className?: string;
isMulti?: boolean;
@@ -65,22 +66,22 @@ interface IFilterProps {
interface ISelectProps {
className?: string;
items: Option[];
- selectedOptions?: ValueType;
+ selectedOptions?: OnChangeValue;
creatable?: boolean;
onCreateOption?: (value: string) => void;
isLoading: boolean;
isDisabled?: boolean;
- onChange: (item: ValueType) => void;
+ onChange: (item: OnChangeValue) => void;
initialIds?: string[];
isMulti: T;
isClearable?: boolean;
onInputChange?: (input: string) => void;
- components?: Partial>;
+ components?: Partial>>;
filterOption?: (option: Option, rawInput: string) => boolean;
isValidNewOption?: (
inputValue: string,
- value: ValueType,
- options: OptionsType
{result.data.findMovies.movies.map((p) => (
= ({ filterHook }) => {
selecting={selectedIds.size > 0}
selected={selectedIds.has(p.id)}
onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
- listData.onSelectChange(p.id, selected, shiftKey)
+ onSelectChange(p.id, selected, shiftKey)
}
/>
))}
-
- );
- }
- if (filter.displayMode === DisplayMode.List) {
- return TODO
; + ); + } + if (filter.displayMode === DisplayMode.List) { + returnTODO
; + } } + return ( + <> + {maybeRenderMovieExportDialog()} + {renderMovies()} + + ); } - return listData.template; + function renderEditDialog( + selectedMovies: GQL.MovieDataFragment[], + onClose: (applied: boolean) => void + ) { + returnPage not found.
; }; diff --git a/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx b/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx index 42453a1a6..aff7fa268 100644 --- a/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx +++ b/ui/v2.5/src/components/Performers/EditPerformersDialog.tsx @@ -3,9 +3,9 @@ import { Col, Form, Row } from "react-bootstrap"; import { FormattedMessage, useIntl } from "react-intl"; import { useBulkPerformerUpdate } from "src/core/StashService"; import * as GQL from "src/core/generated-graphql"; -import { Modal } from "src/components/Shared"; -import { useToast } from "src/hooks"; -import MultiSet from "../Shared/MultiSet"; +import { ModalComponent } from "../Shared/Modal"; +import { useToast } from "src/hooks/Toast"; +import { MultiSet } from "../Shared/MultiSet"; import { RatingSystem } from "../Shared/Rating/RatingSystem"; import { getAggregateInputValue, @@ -20,7 +20,7 @@ import { import { IndeterminateCheckbox } from "../Shared/IndeterminateCheckbox"; import { BulkUpdateTextInput } from "../Shared/BulkUpdateTextInput"; import { faPencilAlt } from "@fortawesome/free-solid-svg-icons"; -import { FormUtils } from "../../utils"; +import FormUtils from "src/utils/form"; interface IListOperationProps { selected: GQL.SlimPerformerDataFragment[]; @@ -29,6 +29,7 @@ interface IListOperationProps { const performerFields = [ "favorite", + "disambiguation", "url", "instagram", "twitter", @@ -59,10 +60,8 @@ export const EditPerformersDialog: React.FC
-
+ e.preventDefault()}>
+
+
);
}
+ function onToggleFavorite(v: boolean) {
+ if (performer.id) {
+ updatePerformer({
+ variables: {
+ input: {
+ id: performer.id,
+ favorite: v,
+ },
+ },
+ });
+ }
+ }
+
function maybeRenderScenesPopoverButton() {
if (!performer.scene_count) return;
@@ -197,7 +220,16 @@ export const PerformerCard: React.FC
+ {performer.name}
+ {performer.disambiguation && (
+
+ {` (${performer.disambiguation})`}
+
+ )}
+
+ }
image={
<>
- {imageEncoding ? (
+
-
+
);
};
diff --git a/ui/v2.5/src/components/Scenes/SceneRecommendationRow.tsx b/ui/v2.5/src/components/Scenes/SceneRecommendationRow.tsx
index 2d9aa7371..86ae558f0 100644
--- a/ui/v2.5/src/components/Scenes/SceneRecommendationRow.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneRecommendationRow.tsx
@@ -1,6 +1,6 @@
-import React, { FunctionComponent, useMemo } from "react";
+import React, { useMemo } from "react";
import { useFindScenes } from "src/core/StashService";
-import Slider from "react-slick";
+import Slider from "@ant-design/react-slick";
import { SceneCard } from "./SceneCard";
import { SceneQueue } from "src/models/sceneQueue";
import { ListFilterModel } from "src/models/list-filter/filter";
@@ -14,9 +14,7 @@ interface IProps {
header: string;
}
-export const SceneRecommendationRow: FunctionComponent
+ {encodingImage ? (
-
+
{
- const [imagePreview, setImagePreview] = useState();
- const [imageEncoding, setImageEncoding] = useState(false);
+ const [image, setImage] = useState();
+ const [encodingImage, setEncodingImage] = useState(false);
- function useQuery() {
- const { search } = useLocation();
- return React.useMemo(() => new URLSearchParams(search), [search]);
- }
+ const location = useLocation();
+ const query = useMemo(() => new URLSearchParams(location.search), [location]);
+ const performer = {
+ name: query.get("q") ?? undefined,
+ };
- const query = useQuery();
- const nameQuery = query.get("name");
-
- const activeImage = imagePreview ?? "";
const intl = useIntl();
- const onImageChange = (image?: string | null) => setImagePreview(image);
- const onImageEncoding = (isEncoding = false) => setImageEncoding(isEncoding);
-
function renderPerformerImage() {
- if (imageEncoding) {
+ if (encodingImage) {
return
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
index e8c4ffc3f..9a0aa9f07 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
@@ -1,8 +1,10 @@
import React from "react";
import { FormattedMessage, useIntl } from "react-intl";
-import { TagLink } from "src/components/Shared";
+import { TagLink } from "src/components/Shared/TagLink";
import * as GQL from "src/core/generated-graphql";
-import { TextUtils, getStashboxBase, getCountryByISO } from "src/utils";
+import TextUtils from "src/utils/text";
+import { getStashboxBase } from "src/utils/stashbox";
+import { getCountryByISO } from "src/utils/country";
import { TextField, URLField } from "src/utils/field";
import { cmToImperial, kgToLbs } from "src/utils/units";
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index d9370d9ad..b92330fad 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -13,26 +13,25 @@ import {
useTagCreate,
queryScrapePerformerURL,
} from "src/core/StashService";
-import {
- Icon,
- ImageInput,
- LoadingIndicator,
- CollapseButton,
- TagSelect,
- URLField,
- CountrySelect,
-} from "src/components/Shared";
-import { ImageUtils, getStashIDs } from "src/utils";
-import { useToast } from "src/hooks";
+import { Icon } from "src/components/Shared/Icon";
+import { ImageInput } from "src/components/Shared/ImageInput";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
+import { CollapseButton } from "src/components/Shared/CollapseButton";
+import { TagSelect } from "src/components/Shared/Select";
+import { CountrySelect } from "src/components/Shared/CountrySelect";
+import { URLField } from "src/components/Shared/URLField";
+import ImageUtils from "src/utils/image";
+import { getStashIDs } from "src/utils/stashIds";
+import { stashboxDisplayName } from "src/utils/stashbox";
+import { useToast } from "src/hooks/Toast";
import { Prompt, useHistory } from "react-router-dom";
import { useFormik } from "formik";
import {
- genderStrings,
genderToString,
+ stringGenderMap,
stringToGender,
} from "src/utils/gender";
import { ConfigurationContext } from "src/hooks/Config";
-import { stashboxDisplayName } from "src/utils/stashbox";
import { PerformerScrapeDialog } from "./PerformerScrapeDialog";
import PerformerScrapeModal from "./PerformerScrapeModal";
import PerformerStashBoxModal, { IStashBox } from "./PerformerStashBoxModal";
@@ -42,6 +41,9 @@ import {
faSyncAlt,
faTrashAlt,
} from "@fortawesome/free-solid-svg-icons";
+import { StringListInput } from "src/components/Shared/StringListInput";
+import isEqual from "lodash-es/isEqual";
+import { DateInput } from "src/components/Shared/DateInput";
const isScraper = (
scraper: GQL.Scraper | GQL.StashBox
@@ -49,26 +51,26 @@ const isScraper = (
interface IPerformerDetails {
performer: Partial;
- isNew?: boolean;
isVisible: boolean;
- onImageChange?: (image?: string | null) => void;
- onImageEncoding?: (loading?: boolean) => void;
- onCancelEditing?: () => void;
+ onCancel?: () => void;
+ setImage: (image?: string | null) => void;
+ setEncodingImage: (loading: boolean) => void;
}
export const PerformerEditPanel: React.FC = ({
performer,
- isNew,
isVisible,
- onImageChange,
- onImageEncoding,
- onCancelEditing,
+ onCancel,
+ setImage,
+ setEncodingImage,
}) => {
const Toast = useToast();
const history = useHistory();
+ const isNew = performer.id === undefined;
+
// Editing state
- const [scraper, setScraper] = useState();
+ const [scraper, setScraper] = useState();
const [newTags, setNewTags] = useState();
const [isScraperModalOpen, setIsScraperModalOpen] = useState(false);
@@ -81,18 +83,13 @@ export const PerformerEditPanel: React.FC = ({
const Scrapers = useListPerformerScrapers();
const [queryableScrapers, setQueryableScrapers] = useState([]);
- const [scrapedPerformer, setScrapedPerformer] = useState<
- GQL.ScrapedPerformer | undefined
- >();
+ const [scrapedPerformer, setScrapedPerformer] =
+ useState();
const { configuration: stashConfig } = React.useContext(ConfigurationContext);
- const imageEncoding = ImageUtils.usePasteImage(onImageLoad, true);
-
const [createTag] = useTagCreate();
const intl = useIntl();
- const genderOptions = [""].concat(genderStrings);
-
const labelXS = 3;
const labelXL = 2;
const fieldXS = 9;
@@ -100,62 +97,102 @@ export const PerformerEditPanel: React.FC = ({
const schema = yup.object({
name: yup.string().required(),
- aliases: yup.string().optional(),
- gender: yup.string().optional().oneOf(genderOptions),
- birthdate: yup.string().optional(),
- ethnicity: yup.string().optional(),
- eye_color: yup.string().optional(),
- country: yup.string().optional(),
- height_cm: yup.number().optional(),
- measurements: yup.string().optional(),
- fake_tits: yup.string().optional(),
- career_length: yup.string().optional(),
- tattoos: yup.string().optional(),
- piercings: yup.string().optional(),
- url: yup.string().optional(),
- twitter: yup.string().optional(),
- instagram: yup.string().optional(),
- tag_ids: yup.array(yup.string().required()).optional(),
- stash_ids: yup.mixed().optional(),
- image: yup.string().optional().nullable(),
- details: yup.string().optional(),
- death_date: yup.string().optional(),
- hair_color: yup.string().optional(),
- weight: yup.number().optional(),
- ignore_auto_tag: yup.boolean().optional(),
+ disambiguation: yup.string().ensure(),
+ alias_list: yup
+ .array(yup.string().required())
+ .defined()
+ .test({
+ name: "unique",
+ test: (value, context) => {
+ if (!value) return true;
+ const aliases = new Set(value);
+ aliases.add(context.parent.name);
+ return value.length + 1 === aliases.size;
+ },
+ message: intl.formatMessage({
+ id: "validation.aliases_must_be_unique",
+ }),
+ }),
+ gender: yup.string().ensure(),
+ birthdate: yup
+ .string()
+ .ensure()
+ .test({
+ name: "date",
+ test: (value) => {
+ if (!value) return true;
+ if (!value.match(/^\d{4}-\d{2}-\d{2}$/)) return false;
+ if (Number.isNaN(Date.parse(value))) return false;
+ return true;
+ },
+ message: intl.formatMessage({ id: "validation.date_invalid_form" }),
+ }),
+ death_date: yup
+ .string()
+ .ensure()
+ .test({
+ name: "date",
+ test: (value) => {
+ if (!value) return true;
+ if (!value.match(/^\d{4}-\d{2}-\d{2}$/)) return false;
+ if (Number.isNaN(Date.parse(value))) return false;
+ return true;
+ },
+ message: intl.formatMessage({ id: "validation.date_invalid_form" }),
+ }),
+ country: yup.string().ensure(),
+ ethnicity: yup.string().ensure(),
+ hair_color: yup.string().ensure(),
+ eye_color: yup.string().ensure(),
+ height_cm: yup.number().nullable().defined().default(null),
+ weight: yup.number().nullable().defined().default(null),
+ measurements: yup.string().ensure(),
+ fake_tits: yup.string().ensure(),
+ tattoos: yup.string().ensure(),
+ piercings: yup.string().ensure(),
+ career_length: yup.string().ensure(),
+ url: yup.string().ensure(),
+ twitter: yup.string().ensure(),
+ instagram: yup.string().ensure(),
+ details: yup.string().ensure(),
+ tag_ids: yup.array(yup.string().required()).defined(),
+ ignore_auto_tag: yup.boolean().defined(),
+ stash_ids: yup.mixed().defined(),
+ image: yup.string().nullable().optional(),
});
const initialValues = {
name: performer.name ?? "",
- aliases: performer.aliases ?? "",
- gender: genderToString(performer.gender ?? undefined),
+ disambiguation: performer.disambiguation ?? "",
+ alias_list: performer.alias_list ?? [],
+ gender: (performer.gender as GQL.GenderEnum) ?? "",
birthdate: performer.birthdate ?? "",
- ethnicity: performer.ethnicity ?? "",
- eye_color: performer.eye_color ?? "",
+ death_date: performer.death_date ?? "",
country: performer.country ?? "",
- height_cm: performer.height_cm ?? undefined,
+ ethnicity: performer.ethnicity ?? "",
+ hair_color: performer.hair_color ?? "",
+ eye_color: performer.eye_color ?? "",
+ height_cm: performer.height_cm ?? null,
+ weight: performer.weight ?? null,
measurements: performer.measurements ?? "",
fake_tits: performer.fake_tits ?? "",
- career_length: performer.career_length ?? "",
tattoos: performer.tattoos ?? "",
piercings: performer.piercings ?? "",
+ career_length: performer.career_length ?? "",
url: performer.url ?? "",
twitter: performer.twitter ?? "",
instagram: performer.instagram ?? "",
- tag_ids: (performer.tags ?? []).map((t) => t.id),
- stash_ids: performer.stash_ids ?? undefined,
- image: undefined,
details: performer.details ?? "",
- death_date: performer.death_date ?? "",
- hair_color: performer.hair_color ?? "",
- weight: performer.weight ?? undefined,
+ tag_ids: (performer.tags ?? []).map((t) => t.id),
ignore_auto_tag: performer.ignore_auto_tag ?? false,
+ stash_ids: getStashIDs(performer.stash_ids),
};
- type InputValues = typeof initialValues;
+ type InputValues = yup.InferType;
- const formik = useFormik({
+ const formik = useFormik({
initialValues,
+ enableReinitialize: true,
validationSchema: schema,
onSubmit: (values) => onSave(values),
});
@@ -165,20 +202,16 @@ export const PerformerEditPanel: React.FC = ({
return;
}
- let retEnum: GQL.GenderEnum | undefined;
-
// try to translate from enum values first
- const upperGender = scrapedGender?.toUpperCase();
+ const upperGender = scrapedGender.toUpperCase();
const asEnum = genderToString(upperGender);
if (asEnum) {
- retEnum = stringToGender(asEnum);
+ return stringToGender(asEnum);
} else {
// try to match against gender strings
const caseInsensitive = true;
- retEnum = stringToGender(scrapedGender, caseInsensitive);
+ return stringToGender(scrapedGender, caseInsensitive);
}
-
- return genderToString(retEnum);
}
function renderNewTags() {
@@ -262,9 +295,14 @@ export const PerformerEditPanel: React.FC = ({
if (state.name) {
formik.setFieldValue("name", state.name);
}
-
+ if (state.disambiguation) {
+ formik.setFieldValue("disambiguation", state.disambiguation);
+ }
if (state.aliases) {
- formik.setFieldValue("aliases", state.aliases);
+ formik.setFieldValue(
+ "alias_list",
+ state.aliases.split(",").map((a) => a.trim())
+ );
}
if (state.birthdate) {
formik.setFieldValue("birthdate", state.birthdate);
@@ -307,10 +345,10 @@ export const PerformerEditPanel: React.FC = ({
}
if (state.gender) {
// gender is a string in the scraper data
- formik.setFieldValue(
- "gender",
- translateScrapedGender(state.gender ?? undefined)
- );
+ const newGender = translateScrapedGender(state.gender);
+ if (newGender) {
+ formik.setFieldValue("gender", newGender);
+ }
}
if (state.tags) {
// map tags to their ids and filter out those not found
@@ -323,15 +361,14 @@ export const PerformerEditPanel: React.FC = ({
// 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
- // overwrite if image was cleared (`null`)
- // otherwise follow existing behaviour (`undefined`)
+ // overwrite if image is unset
if (
- (!isNew || [null, undefined].includes(formik.values.image)) &&
+ (!isNew || !formik.values.image) &&
state.images &&
state.images.length > 0
) {
const imageStr = state.images[0];
- formik.setFieldValue("image", imageStr ?? undefined);
+ formik.setFieldValue("image", imageStr);
}
if (state.details) {
formik.setFieldValue("details", state.details);
@@ -360,31 +397,50 @@ export const PerformerEditPanel: React.FC = ({
}
}
- function onImageLoad(imageData: string) {
+ const encodingImage = ImageUtils.usePasteImage(onImageLoad);
+
+ useEffect(() => {
+ setImage(formik.values.image);
+ }, [formik.values.image, setImage]);
+
+ useEffect(() => {
+ setEncodingImage(encodingImage);
+ }, [setEncodingImage, encodingImage]);
+
+ function onImageLoad(imageData: string | null) {
formik.setFieldValue("image", imageData);
}
- async function onSave(performerInput: InputValues) {
+ function onImageChange(event: React.FormEvent) {
+ ImageUtils.onImageChange(event, onImageLoad);
+ }
+
+ async function onSave(input: InputValues) {
setIsLoading(true);
try {
if (isNew) {
- const input = getCreateValues(performerInput);
const result = await createPerformer({
variables: {
- input,
+ input: {
+ ...input,
+ gender: input.gender || null,
+ height_cm: input.height_cm || null,
+ weight: input.weight || null,
+ },
},
});
if (result.data?.performerCreate) {
history.push(`/performers/${result.data.performerCreate.id}`);
}
} else {
- const input = getUpdateValues(performerInput);
-
await updatePerformer({
variables: {
input: {
+ id: performer.id!,
...input,
- stash_ids: getStashIDs(performerInput?.stash_ids),
+ gender: input.gender || null,
+ height_cm: input.height_cm || null,
+ weight: input.weight || null,
},
},
});
@@ -394,12 +450,17 @@ export const PerformerEditPanel: React.FC = ({
setIsLoading(false);
return;
}
- if (!isNew && onCancelEditing) {
- onCancelEditing();
+ if (!isNew && onCancel) {
+ onCancel();
}
setIsLoading(false);
}
+ function onCancelEditing() {
+ setImage(undefined);
+ onCancel?.();
+ }
+
// set up hotkeys
useEffect(() => {
if (isVisible) {
@@ -417,18 +478,6 @@ export const PerformerEditPanel: React.FC = ({
}
});
- useEffect(() => {
- if (onImageChange) {
- onImageChange(formik.values.image);
- }
- return () => onImageChange?.();
- }, [formik.values.image, onImageChange]);
-
- useEffect(() => onImageEncoding?.(imageEncoding), [
- onImageEncoding,
- imageEncoding,
- ]);
-
useEffect(() => {
const newQueryableScrapers = (
Scrapers?.data?.listPerformerScrapers ?? []
@@ -441,33 +490,6 @@ export const PerformerEditPanel: React.FC = ({
if (isLoading) return ) {
- ImageUtils.onImageChange(event, onImageLoad);
- }
-
- function onImageChangeURL(url: string) {
- formik.setFieldValue("image", url);
- }
-
async function onReloadScrapers() {
setIsLoading(true);
try {
@@ -633,9 +655,9 @@ export const PerformerEditPanel: React.FC = ({
return;
}
- const currentPerformer: Partial = {
+ const currentPerformer = {
...formik.values,
- gender: stringToGender(formik.values.gender),
+ gender: formik.values.gender || null,
image: formik.values.image ?? performer.image_path,
};
@@ -662,22 +684,16 @@ export const PerformerEditPanel: React.FC = ({
function renderButtons(classNames: string) {
return (
= ({
const performers = data?.scrapeSinglePerformer ?? [];
- const onInputChange = debounce((input: string) => {
- setQuery(input);
- }, 500);
+ const onInputChange = useDebouncedSetState(setQuery, 500);
useEffect(() => inputRef.current?.focus(), []);
return (
- = ({
))}
@@ -89,7 +89,7 @@ const PerformerStashBoxModal: React.FC = ({
query !== "" &&
-
+
);
};
diff --git a/ui/v2.5/src/components/Performers/PerformerList.tsx b/ui/v2.5/src/components/Performers/PerformerList.tsx
index 0cd8902ae..cdfc37f09 100644
--- a/ui/v2.5/src/components/Performers/PerformerList.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerList.tsx
@@ -3,33 +3,48 @@ import React, { useState } from "react";
import { useIntl } from "react-intl";
import { useHistory } from "react-router-dom";
import Mousetrap from "mousetrap";
-import {
- FindPerformersQueryResult,
- SlimPerformerDataFragment,
-} from "src/core/generated-graphql";
+import * as GQL from "src/core/generated-graphql";
import {
queryFindPerformers,
+ useFindPerformers,
usePerformersDestroy,
} from "src/core/StashService";
-import { usePerformersList } from "src/hooks";
-import { showWhenSelected, PersistanceLevel } from "src/hooks/ListHook";
+import {
+ makeItemList,
+ PersistanceLevel,
+ showWhenSelected,
+} from "../List/ItemList";
import { ListFilterModel } from "src/models/list-filter/filter";
import { DisplayMode } from "src/models/list-filter/types";
-import { PerformerTagger } from "src/components/Tagger";
-import { ExportDialog, DeleteEntityDialog } from "src/components/Shared";
+import { PerformerTagger } from "../Tagger/performers/PerformerTagger";
+import { ExportDialog } from "../Shared/ExportDialog";
+import { DeleteEntityDialog } from "../Shared/DeleteEntityDialog";
import { IPerformerCardExtraCriteria, PerformerCard } from "./PerformerCard";
import { PerformerListTable } from "./PerformerListTable";
import { EditPerformersDialog } from "./EditPerformersDialog";
+const PerformerItemList = makeItemList({
+ filterMode: GQL.FilterMode.Performers,
+ useResult: useFindPerformers,
+ getItems(result: GQL.FindPerformersQueryResult) {
+ return result?.data?.findPerformers?.performers ?? [];
+ },
+ getCount(result: GQL.FindPerformersQueryResult) {
+ return result?.data?.findPerformers?.count ?? 0;
+ },
+});
+
interface IPerformerList {
filterHook?: (filter: ListFilterModel) => ListFilterModel;
persistState?: PersistanceLevel;
+ alterQuery?: boolean;
extraCriteria?: IPerformerCardExtraCriteria;
}
export const PerformerList: React.FC = ({
filterHook,
persistState,
+ alterQuery,
extraCriteria,
}) => {
const intl = useIntl();
@@ -40,7 +55,7 @@ export const PerformerList: React.FC = ({
const otherOperations = [
{
text: intl.formatMessage({ id: "actions.open_random" }),
- onClick: getRandom,
+ onClick: openRandom,
},
{
text: intl.formatMessage({ id: "actions.export" }),
@@ -53,18 +68,36 @@ export const PerformerList: React.FC = ({
},
];
- const addKeybinds = (
- result: FindPerformersQueryResult,
+ function addKeybinds(
+ result: GQL.FindPerformersQueryResult,
filter: ListFilterModel
- ) => {
+ ) {
Mousetrap.bind("p r", () => {
- getRandom(result, filter);
+ openRandom(result, filter);
});
return () => {
Mousetrap.unbind("p r");
};
- };
+ }
+
+ async function openRandom(
+ result: GQL.FindPerformersQueryResult,
+ filter: ListFilterModel
+ ) {
+ if (result.data?.findPerformers) {
+ const { count } = result.data.findPerformers;
+ const index = Math.floor(Math.random() * count);
+ const filterCopy = cloneDeep(filter);
+ filterCopy.itemsPerPage = 1;
+ filterCopy.currentPage = index + 1;
+ const singleResult = await queryFindPerformers(filterCopy);
+ if (singleResult.data.findPerformers.performers.length === 1) {
+ const { id } = singleResult.data.findPerformers.performers[0]!;
+ history.push(`/performers/${id}`);
+ }
+ }
+ }
async function onExport() {
setIsExportAll(false);
@@ -76,96 +109,35 @@ export const PerformerList: React.FC = ({
setIsExportDialogOpen(true);
}
- function maybeRenderPerformerExportDialog(selectedIds: Set) {
- if (isExportDialogOpen) {
- return (
- <>
- {
- setIsExportDialogOpen(false);
- }}
- />
-
- );
- }
- }
-
- function renderEditPerformersDialog(
- selectedPerformers: SlimPerformerDataFragment[],
- onClose: (applied: boolean) => void
+ function renderContent(
+ result: GQL.FindPerformersQueryResult,
+ filter: ListFilterModel,
+ selectedIds: Set,
+ onSelectChange: (id: string, selected: boolean, shiftKey: boolean) => void
) {
- return (
- <>
- setIsExportDialogOpen(false)}
+ />
+
+ );
}
}
- }
- function renderContent(
- result: FindPerformersQueryResult,
- filter: ListFilterModel,
- selectedIds: Set
- ) {
- if (!result.data?.findPerformers) {
- return;
- }
- if (filter.displayMode === DisplayMode.Grid) {
- return (
- <>
- {maybeRenderPerformerExportDialog(selectedIds)}
+ function renderPerformers() {
+ if (!result.data?.findPerformers) return;
+
+ if (filter.displayMode === DisplayMode.Grid) {
+ return (
= (
-
- {performer.aliases ? performer.aliases : ""}
+ {performer.alias_list ? performer.alias_list.join(", ") : ""}
{performer.favorite && (
{renderMovies(scene)}
-
- {scene.gallery && (
-
- )}
-
+ {renderGalleries(scene)}
);
};
@@ -144,7 +144,7 @@ export const SceneListTable: React.FC = (
-
diff --git a/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx b/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
index 9958b0432..af6635940 100644
--- a/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMarkerList.tsx
@@ -2,25 +2,41 @@ import cloneDeep from "lodash-es/cloneDeep";
import React from "react";
import { useHistory } from "react-router-dom";
import { useIntl } from "react-intl";
-import { Helmet } from "react-helmet";
-import { TITLE_SUFFIX } from "src/components/Shared";
import Mousetrap from "mousetrap";
-import { FindSceneMarkersQueryResult } from "src/core/generated-graphql";
-import { queryFindSceneMarkers } from "src/core/StashService";
-import { NavUtils } from "src/utils";
-import { useSceneMarkersList } from "src/hooks";
-import { PersistanceLevel } from "src/hooks/ListHook";
+import * as GQL from "src/core/generated-graphql";
+import {
+ queryFindSceneMarkers,
+ useFindSceneMarkers,
+} from "src/core/StashService";
+import NavUtils from "src/utils/navigation";
+import { makeItemList, PersistanceLevel } from "../List/ItemList";
import { ListFilterModel } from "src/models/list-filter/filter";
import { DisplayMode } from "src/models/list-filter/types";
import { WallPanel } from "../Wall/WallPanel";
+const SceneMarkerItemList = makeItemList({
+ filterMode: GQL.FilterMode.SceneMarkers,
+ useResult: useFindSceneMarkers,
+ getItems(result: GQL.FindSceneMarkersQueryResult) {
+ return result?.data?.findSceneMarkers?.scene_markers ?? [];
+ },
+ getCount(result: GQL.FindSceneMarkersQueryResult) {
+ return result?.data?.findSceneMarkers?.count ?? 0;
+ },
+});
+
interface ISceneMarkerList {
filterHook?: (filter: ListFilterModel) => ListFilterModel;
+ alterQuery?: boolean;
}
-export const SceneMarkerList: React.FC = ({ filterHook }) => {
+export const SceneMarkerList: React.FC = ({
+ filterHook,
+ alterQuery,
+}) => {
const intl = useIntl();
const history = useHistory();
+
const otherOperations = [
{
text: intl.formatMessage({ id: "actions.play_random" }),
@@ -28,10 +44,10 @@ export const SceneMarkerList: React.FC = ({ filterHook }) => {
},
];
- const addKeybinds = (
- result: FindSceneMarkersQueryResult,
+ function addKeybinds(
+ result: GQL.FindSceneMarkersQueryResult,
filter: ListFilterModel
- ) => {
+ ) {
Mousetrap.bind("p r", () => {
playRandom(result, filter);
});
@@ -39,18 +55,10 @@ export const SceneMarkerList: React.FC = ({ filterHook }) => {
return () => {
Mousetrap.unbind("p r");
};
- };
-
- const listData = useSceneMarkersList({
- otherOperations,
- renderContent,
- filterHook,
- addKeybinds,
- persistState: PersistanceLevel.ALL,
- });
+ }
async function playRandom(
- result: FindSceneMarkersQueryResult,
+ result: GQL.FindSceneMarkersQueryResult,
filter: ListFilterModel
) {
// query for a random scene
@@ -62,7 +70,7 @@ export const SceneMarkerList: React.FC = ({ filterHook }) => {
filterCopy.itemsPerPage = 1;
filterCopy.currentPage = index + 1;
const singleResult = await queryFindSceneMarkers(filterCopy);
- if (singleResult?.data?.findSceneMarkers?.scene_markers?.length === 1) {
+ if (singleResult.data.findSceneMarkers.scene_markers.length === 1) {
// navigate to the scene player page
const url = NavUtils.makeSceneMarkerUrl(
singleResult.data.findSceneMarkers.scene_markers[0]
@@ -73,29 +81,27 @@ export const SceneMarkerList: React.FC = ({ filterHook }) => {
}
function renderContent(
- result: FindSceneMarkersQueryResult,
+ result: GQL.FindSceneMarkersQueryResult,
filter: ListFilterModel
) {
- if (!result?.data?.findSceneMarkers) return;
+ if (!result.data?.findSceneMarkers) return;
+
if (filter.displayMode === DisplayMode.Wall) {
return (
= ({
);
const [rating, setRating] = useState(
- new ScrapeResult(dest.rating100)
+ new ZeroableScrapeResult(dest.rating100)
);
+ // zero values can be treated as missing for these fields
const [oCounter, setOCounter] = useState(
new ScrapeResult(dest.o_counter)
);
@@ -119,6 +119,10 @@ const SceneMergeDetails: React.FC = ({
const [stashIDs, setStashIDs] = useState(new ScrapeResult([]));
+ const [organized, setOrganized] = useState(
+ new ZeroableScrapeResult(dest.organized)
+ );
+
const [image, setImage] = useState>(
new ScrapeResult(dest.paths.screenshot)
);
@@ -133,7 +137,7 @@ const SceneMergeDetails: React.FC = ({
setLoading(true);
const destData = await ImageUtils.imageToDataURL(dest.paths.screenshot);
- const srcData = await ImageUtils.imageToDataURL(src.paths!.screenshot!);
+ const srcData = await ImageUtils.imageToDataURL(src.paths.screenshot!);
// keep destination image by default
const useNewValue = false;
@@ -230,6 +234,13 @@ const SceneMergeDetails: React.FC = ({
)
);
+ setOrganized(
+ new ScrapeResult(
+ dest.organized ?? false,
+ sources.every((s) => s.organized)
+ )
+ );
+
setStashIDs(
new ScrapeResult(
dest.stash_ids,
@@ -289,6 +300,7 @@ const SceneMergeDetails: React.FC = ({
movies,
tags,
details,
+ organized,
stashIDs,
image,
]);
@@ -304,6 +316,7 @@ const SceneMergeDetails: React.FC = ({
movies,
tags,
details,
+ organized,
stashIDs,
image,
]);
@@ -325,6 +338,9 @@ const SceneMergeDetails: React.FC = ({
);
}
+ const trueString = intl.formatMessage({ id: "true" });
+ const falseString = intl.formatMessage({ id: "false" });
+
return (
<>
= ({
result={details}
onChange={(value) => setDetails(value)}
/>
+ (
+ {}}
+ className="bg-secondary text-white border-secondary"
+ />
+ )}
+ renderNewField={() => (
+ {}}
+ className="bg-secondary text-white border-secondary"
+ />
+ )}
+ onChange={(value) => setOrganized(value)}
+ />
= ({
}),
tag_ids: tags.getNewValue(),
details: details.getNewValue(),
+ organized: organized.getNewValue(),
stash_ids: stashIDs.getNewValue(),
cover_image: coverImage,
};
@@ -658,7 +696,7 @@ export const SceneMergeModal: React.FC = ({
}
return (
- = ({
+
+
+
- {!isNew && onCancelEditing ? (
-
-
+
);
};
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerStashBoxModal.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerStashBoxModal.tsx
index b9c7f4316..5b508ea1f 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerStashBoxModal.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerStashBoxModal.tsx
@@ -1,11 +1,12 @@
import React, { useEffect, useRef, useState } from "react";
-import debounce from "lodash-es/debounce";
import { Button, Form } from "react-bootstrap";
import { useIntl } from "react-intl";
import * as GQL from "src/core/generated-graphql";
-import { Modal, LoadingIndicator } from "src/components/Shared";
+import { ModalComponent } from "src/components/Shared/Modal";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
import { stashboxDisplayName } from "src/utils/stashbox";
+import { useDebouncedSetState } from "src/hooks/debounce";
const CLASSNAME = "PerformerScrapeModal";
const CLASSNAME_LIST = `${CLASSNAME}-list`;
@@ -43,14 +44,12 @@ const PerformerStashBoxModal: React.FCNo results found.
)}
{result.data.findPerformers.performers.map((p) => (
= ({
selecting={selectedIds.size > 0}
selected={selectedIds.has(p.id)}
onSelectedChanged={(selected: boolean, shiftKey: boolean) =>
- listData.onSelectChange(p.id, selected, shiftKey)
+ onSelectChange(p.id, selected, shiftKey)
}
extraCriteria={extraCriteria}
/>
))}
-
- );
- }
- if (filter.displayMode === DisplayMode.List) {
- return (
- {performer.name}
++ {performer.name} + {performer.disambiguation && ( + + {` (${performer.disambiguation})`} + + )} +
+
diff --git a/ui/v2.5/src/components/ScenePlayer/index.ts b/ui/v2.5/src/components/ScenePlayer/index.ts
deleted file mode 100644
index 04a525412..000000000
--- a/ui/v2.5/src/components/ScenePlayer/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./ScenePlayer";
diff --git a/ui/v2.5/src/components/ScenePlayer/styles.scss b/ui/v2.5/src/components/ScenePlayer/styles.scss
index 76a8ba73e..8e717892f 100644
--- a/ui/v2.5/src/components/ScenePlayer/styles.scss
+++ b/ui/v2.5/src/components/ScenePlayer/styles.scss
@@ -382,7 +382,7 @@ $sceneTabWidth: 450px;
}
#scrubber-position-indicator {
- background-color: #ccc;
+ background-color: rgba(255, 255, 255, 0.7);
height: 20px;
left: -100%;
position: absolute;
@@ -426,6 +426,14 @@ $sceneTabWidth: 450px;
}
}
+.scrubber-heatmap {
+ background-size: 100% 100%;
+ height: 20px;
+ left: 0;
+ position: absolute;
+ right: 0;
+}
+
.scrubber-tag {
background-color: #000;
cursor: pointer;
diff --git a/ui/v2.5/src/components/ScenePlayer/track-activity.ts b/ui/v2.5/src/components/ScenePlayer/track-activity.ts
index f4ed2eb49..6b5cbd051 100644
--- a/ui/v2.5/src/components/ScenePlayer/track-activity.ts
+++ b/ui/v2.5/src/components/ScenePlayer/track-activity.ts
@@ -10,12 +10,10 @@ class TrackActivityPlugin extends videojs.getPlugin("plugin") {
incrementPlayCount: () => Promise = () => {
return Promise.resolve();
};
- saveActivity: (
- resumeTime: number,
- playDuration: number
- ) => Promise = () => {
- return Promise.resolve();
- };
+ saveActivity: (resumeTime: number, playDuration: number) => Promise =
+ () => {
+ return Promise.resolve();
+ };
private enabled = false;
private playCountIncremented = false;
diff --git a/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx b/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx
index c98785e1c..6a17ff5bf 100644
--- a/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/DeleteScenesDialog.tsx
@@ -2,8 +2,8 @@ import React, { useState } from "react";
import { Form } from "react-bootstrap";
import { useScenesDestroy } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
-import { Modal } from "src/components/Shared";
-import { useToast } from "src/hooks";
+import { ModalComponent } from "src/components/Shared/Modal";
+import { useToast } from "src/hooks/Toast";
import { ConfigurationContext } from "src/hooks/Config";
import { FormattedMessage, useIntl } from "react-intl";
import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
@@ -126,7 +126,7 @@ export const DeleteScenesDialog: React.FC = (
}
return (
- = (
onChange={() => setDeleteGenerated(!deleteGenerated)}
/>
-
+
);
};
diff --git a/ui/v2.5/src/components/Scenes/EditScenesDialog.tsx b/ui/v2.5/src/components/Scenes/EditScenesDialog.tsx
index 34947060f..9fed7f54b 100644
--- a/ui/v2.5/src/components/Scenes/EditScenesDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/EditScenesDialog.tsx
@@ -4,10 +4,11 @@ import { FormattedMessage, useIntl } from "react-intl";
import isEqual from "lodash-es/isEqual";
import { useBulkSceneUpdate } from "src/core/StashService";
import * as GQL from "src/core/generated-graphql";
-import { StudioSelect, Modal } from "src/components/Shared";
-import { useToast } from "src/hooks";
-import { FormUtils } from "src/utils";
-import MultiSet from "../Shared/MultiSet";
+import { StudioSelect } from "../Shared/Select";
+import { ModalComponent } from "../Shared/Modal";
+import { MultiSet } from "../Shared/MultiSet";
+import { useToast } from "src/hooks/Toast";
+import FormUtils from "src/utils/form";
import { RatingSystem } from "../Shared/Rating/RatingSystem";
import {
getAggregateInputIDs,
@@ -32,10 +33,8 @@ export const EditScenesDialog: React.FC = (
const Toast = useToast();
const [rating100, setRating] = useState();
const [studioId, setStudioId] = useState();
- const [
- performerMode,
- setPerformerMode,
- ] = React.useState(GQL.BulkUpdateIdMode.Add);
+ const [performerMode, setPerformerMode] =
+ React.useState(GQL.BulkUpdateIdMode.Add);
const [performerIds, setPerformerIds] = useState();
const [existingPerformerIds, setExistingPerformerIds] = useState();
const [tagMode, setTagMode] = React.useState(
@@ -243,7 +242,7 @@ export const EditScenesDialog: React.FC = (
function render() {
return (
- = (
/>
-
+
);
}
diff --git a/ui/v2.5/src/components/Scenes/SceneCard.tsx b/ui/v2.5/src/components/Scenes/SceneCard.tsx
index b7b79c0e7..3205fdcb8 100644
--- a/ui/v2.5/src/components/Scenes/SceneCard.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneCard.tsx
@@ -3,14 +3,13 @@ import { Button, ButtonGroup } from "react-bootstrap";
import { Link } from "react-router-dom";
import cx from "classnames";
import * as GQL from "src/core/generated-graphql";
-import {
- Icon,
- TagLink,
- HoverPopover,
- SweatDrops,
- TruncatedText,
-} from "src/components/Shared";
-import { NavUtils, TextUtils } from "src/utils";
+import { Icon } from "../Shared/Icon";
+import { TagLink } from "../Shared/TagLink";
+import { HoverPopover } from "../Shared/HoverPopover";
+import { SweatDrops } from "../Shared/SweatDrops";
+import { TruncatedText } from "../Shared/TruncatedText";
+import NavUtils from "src/utils/navigation";
+import TextUtils from "src/utils/text";
import { SceneQueue } from "src/models/sceneQueue";
import { ConfigurationContext } from "src/hooks/Config";
import { PerformerPopoverButton } from "../Shared/PerformerPopoverButton";
@@ -99,9 +98,8 @@ export const SceneCard: React.FC = (
);
// studio image is missing if it uses the default
- const missingStudioImage = props.scene.studio?.image_path?.endsWith(
- "?default=true"
- );
+ const missingStudioImage =
+ props.scene.studio?.image_path?.endsWith("?default=true");
const showStudioAsText =
missingStudioImage || (configuration?.interface.showStudioAsText ?? false);
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/ExternalPlayerButton.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/ExternalPlayerButton.tsx
index 8ee4d992c..eef8db914 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/ExternalPlayerButton.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/ExternalPlayerButton.tsx
@@ -2,7 +2,7 @@ import { faExternalLinkAlt } from "@fortawesome/free-solid-svg-icons";
import React from "react";
import { Button } from "react-bootstrap";
import { useIntl } from "react-intl";
-import Icon from "src/components/Shared/Icon";
+import { Icon } from "src/components/Shared/Icon";
import { objectTitle } from "src/core/files";
import { SceneDataFragment } from "src/core/generated-graphql";
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/OCounterButton.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/OCounterButton.tsx
index 19d9e337d..8fdb7dfd7 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/OCounterButton.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/OCounterButton.tsx
@@ -2,7 +2,9 @@ import { faBan, faMinus } from "@fortawesome/free-solid-svg-icons";
import React, { useState } from "react";
import { Button, ButtonGroup, Dropdown, DropdownButton } from "react-bootstrap";
import { useIntl } from "react-intl";
-import { Icon, LoadingIndicator, SweatDrops } from "src/components/Shared";
+import { Icon } from "src/components/Shared/Icon";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
+import { SweatDrops } from "src/components/Shared/SweatDrops";
export interface IOCounterButtonProps {
value: number;
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/OrganizedButton.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/OrganizedButton.tsx
index 63e82f9d2..4d0d7dd51 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/OrganizedButton.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/OrganizedButton.tsx
@@ -1,7 +1,7 @@
import React from "react";
import cx from "classnames";
import { Button, Spinner } from "react-bootstrap";
-import Icon from "src/components/Shared/Icon";
+import { Icon } from "src/components/Shared/Icon";
import { defineMessages, useIntl } from "react-intl";
import { faBox } from "@fortawesome/free-solid-svg-icons";
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/QueueViewer.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/QueueViewer.tsx
index 09b575a68..1f4b8f740 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/QueueViewer.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/QueueViewer.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
import { Link } from "react-router-dom";
import cx from "classnames";
import { Button, Form, Spinner } from "react-bootstrap";
-import Icon from "src/components/Shared/Icon";
+import { Icon } from "src/components/Shared/Icon";
import { useIntl } from "react-intl";
import {
faChevronDown,
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
index 1e7a8163f..21ba9d5c4 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
@@ -1,13 +1,5 @@
import { Tab, Nav, Dropdown, Button, ButtonGroup } from "react-bootstrap";
-import queryString from "query-string";
-import React, {
- useEffect,
- useState,
- useMemo,
- useContext,
- lazy,
- useRef,
-} from "react";
+import React, { useEffect, useState, useMemo, useContext, useRef } from "react";
import { FormattedMessage, useIntl } from "react-intl";
import { useParams, useLocation, useHistory, Link } from "react-router-dom";
import { Helmet } from "react-helmet";
@@ -24,8 +16,11 @@ import {
queryFindScenesByID,
} from "src/core/StashService";
-import Icon from "src/components/Shared/Icon";
-import { useToast } from "src/hooks";
+import { ErrorMessage } from "src/components/Shared/ErrorMessage";
+import { LoadingIndicator } from "src/components/Shared/LoadingIndicator";
+import { Icon } from "src/components/Shared/Icon";
+import { Counter } from "src/components/Shared/Counter";
+import { useToast } from "src/hooks/Toast";
import SceneQueue, { QueuedScene } from "src/models/sceneQueue";
import { ListFilterModel } from "src/models/list-filter/filter";
import Mousetrap from "mousetrap";
@@ -34,31 +29,39 @@ import { OrganizedButton } from "./OrganizedButton";
import { ConfigurationContext } from "src/hooks/Config";
import { getPlayerPosition } from "src/components/ScenePlayer/util";
import { faEllipsisV } from "@fortawesome/free-solid-svg-icons";
+import { lazyComponent } from "src/utils/lazyComponent";
-const SubmitStashBoxDraft = lazy(
+const SubmitStashBoxDraft = lazyComponent(
() => import("src/components/Dialogs/SubmitDraft")
);
-const ScenePlayer = lazy(
+const ScenePlayer = lazyComponent(
() => import("src/components/ScenePlayer/ScenePlayer")
);
-const GalleryViewer = lazy(
+const GalleryViewer = lazyComponent(
() => import("src/components/Galleries/GalleryViewer")
);
-const ExternalPlayerButton = lazy(() => import("./ExternalPlayerButton"));
+const ExternalPlayerButton = lazyComponent(
+ () => import("./ExternalPlayerButton")
+);
-const QueueViewer = lazy(() => import("./QueueViewer"));
-const SceneMarkersPanel = lazy(() => import("./SceneMarkersPanel"));
-const SceneFileInfoPanel = lazy(() => import("./SceneFileInfoPanel"));
-const SceneEditPanel = lazy(() => import("./SceneEditPanel"));
-const SceneDetailPanel = lazy(() => import("./SceneDetailPanel"));
-const SceneMoviePanel = lazy(() => import("./SceneMoviePanel"));
-const SceneGalleriesPanel = lazy(() => import("./SceneGalleriesPanel"));
-const DeleteScenesDialog = lazy(() => import("../DeleteScenesDialog"));
-const GenerateDialog = lazy(() => import("../../Dialogs/GenerateDialog"));
-const SceneVideoFilterPanel = lazy(() => import("./SceneVideoFilterPanel"));
+const QueueViewer = lazyComponent(() => import("./QueueViewer"));
+const SceneMarkersPanel = lazyComponent(() => import("./SceneMarkersPanel"));
+const SceneFileInfoPanel = lazyComponent(() => import("./SceneFileInfoPanel"));
+const SceneEditPanel = lazyComponent(() => import("./SceneEditPanel"));
+const SceneDetailPanel = lazyComponent(() => import("./SceneDetailPanel"));
+const SceneMoviePanel = lazyComponent(() => import("./SceneMoviePanel"));
+const SceneGalleriesPanel = lazyComponent(
+ () => import("./SceneGalleriesPanel")
+);
+const DeleteScenesDialog = lazyComponent(() => import("../DeleteScenesDialog"));
+const GenerateDialog = lazyComponent(
+ () => import("../../Dialogs/GenerateDialog")
+);
+const SceneVideoFilterPanel = lazyComponent(
+ () => import("./SceneVideoFilterPanel")
+);
import { objectPath, objectTitle } from "src/core/files";
-import { Counter } from "src/components/Shared";
interface IProps {
scene: GQL.SceneDataFragment;
@@ -140,7 +143,9 @@ const ScenePage: React.FC = ({
Mousetrap.bind("e", () => setActiveTabKey("scene-edit-panel"));
Mousetrap.bind("k", () => setActiveTabKey("scene-markers-panel"));
Mousetrap.bind("i", () => setActiveTabKey("scene-file-info-panel"));
- Mousetrap.bind("o", () => onIncrementClick());
+ Mousetrap.bind("o", () => {
+ onIncrementClick();
+ });
Mousetrap.bind("p n", () => onQueueNext());
Mousetrap.bind("p p", () => onQueuePrevious());
Mousetrap.bind("p r", () => onQueueRandom());
@@ -514,10 +519,10 @@ const SceneLoader: React.FC = () => {
const location = useLocation();
const history = useHistory();
const { configuration } = useContext(ConfigurationContext);
- const { data, loading } = useFindScene(id ?? "");
+ const { data, loading, error } = useFindScene(id ?? "");
const queryParams = useMemo(
- () => queryString.parse(location.search, { decode: false }),
+ () => new URLSearchParams(location.search),
[location.search]
);
const sceneQueue = useMemo(
@@ -525,13 +530,13 @@ const SceneLoader: React.FC = () => {
[queryParams]
);
const queryContinue = useMemo(() => {
- let cont = queryParams.continue;
- if (cont !== undefined) {
+ let cont = queryParams.get("continue");
+ if (cont) {
return cont === "true";
} else {
return !!configuration?.interface.continuePlaylistDefault;
}
- }, [configuration?.interface.continuePlaylistDefault, queryParams.continue]);
+ }, [configuration?.interface.continuePlaylistDefault, queryParams]);
const [queueScenes, setQueueScenes] = useState([]);
@@ -543,14 +548,13 @@ const SceneLoader: React.FC = () => {
const _setTimestamp = useRef<(value: number) => void>();
const initialTimestamp = useMemo(() => {
- const t = Array.isArray(queryParams.t) ? queryParams.t[0] : queryParams.t;
- return Number.parseInt(t ?? "0", 10);
+ return Number.parseInt(queryParams.get("t") ?? "0", 10);
}, [queryParams]);
const [queueTotal, setQueueTotal] = useState(0);
const [queueStart, setQueueStart] = useState(1);
- const autoplay = queryParams.autoplay === "true";
+ const autoplay = queryParams.get("autoplay") === "true";
const currentQueueIndex = queueScenes
? queueScenes.findIndex((s) => s.id === id)
: -1;
@@ -728,32 +732,32 @@ const SceneLoader: React.FC = () => {
}
}
+ if (loading) return
- {!loading && scene ? (
- {
const intl = useIntl();
- // create scene from provided scene id if applicable
- const queryParams = queryString.parse(location.search);
+ const location = useLocation();
+ const query = useMemo(() => new URLSearchParams(location.search), [location]);
- const fromSceneID = (queryParams?.from_scene_id ?? "") as string;
- const { data, loading } = useFindScene(fromSceneID ?? "");
+ // create scene from provided scene id if applicable
+ const { data, loading } = useFindScene(query.get("from_scene_id") ?? "");
const [loadingCoverImage, setLoadingCoverImage] = useState(false);
- const [coverImage, setCoverImage] = useState(undefined);
+ const [coverImage, setCoverImage] = useState();
const scene = useMemo(() => {
if (data?.findScene) {
@@ -26,8 +26,10 @@ const SceneCreate: React.FC = () => {
};
}
- return {};
- }, [data?.findScene]);
+ return {
+ title: query.get("q") ?? undefined,
+ };
+ }, [data?.findScene, query]);
useEffect(() => {
async function fetchCoverImage() {
@@ -62,6 +64,7 @@ const SceneCreate: React.FC = () => {
import("./SceneScrapeDialog"));
-const SceneQueryModal = lazy(() => import("./SceneQueryModal"));
+const SceneScrapeDialog = lazyComponent(() => import("./SceneScrapeDialog"));
+const SceneQueryModal = lazyComponent(() => import("./SceneQueryModal"));
interface IProps {
scene: Partial;
+ fileID?: string;
initialCoverImage?: string;
isNew?: boolean;
isVisible: boolean;
@@ -61,6 +68,7 @@ interface IProps {
export const SceneEditPanel: React.FC = ({
scene,
+ fileID,
initialCoverImage,
isNew = false,
isVisible,
@@ -70,10 +78,6 @@ export const SceneEditPanel: React.FC = ({
const Toast = useToast();
const history = useHistory();
- const queryParams = queryString.parse(location.search);
-
- const fileID = (queryParams?.file_id ?? "") as string;
-
const [galleries, setGalleries] = useState<{ id: string; title: string }[]>(
[]
);
@@ -82,17 +86,13 @@ export const SceneEditPanel: React.FC = ({
const [fragmentScrapers, setFragmentScrapers] = useState([]);
const [queryableScrapers, setQueryableScrapers] = useState([]);
- const [scraper, setScraper] = useState();
- const [
- isScraperQueryModalOpen,
- setIsScraperQueryModalOpen,
- ] = useState(false);
+ const [scraper, setScraper] = useState();
+ const [isScraperQueryModalOpen, setIsScraperQueryModalOpen] =
+ useState(false);
const [scrapedScene, setScrapedScene] = useState();
- const [endpoint, setEndpoint] = useState();
+ const [endpoint, setEndpoint] = useState();
- const [coverImagePreview, setCoverImagePreview] = useState<
- string | undefined
- >();
+ const [coverImagePreview, setCoverImagePreview] = useState();
useEffect(() => {
setCoverImagePreview(
@@ -104,7 +104,7 @@ export const SceneEditPanel: React.FC = ({
setGalleries(
scene.galleries?.map((g) => ({
id: g.id,
- title: objectTitle(g),
+ title: galleryTitle(g),
})) ?? []
);
}, [scene.galleries]);
@@ -117,53 +117,66 @@ export const SceneEditPanel: React.FC = ({
const [updateScene] = useSceneUpdate();
const schema = yup.object({
- title: yup.string().optional().nullable(),
- code: yup.string().optional().nullable(),
- details: yup.string().optional().nullable(),
- director: yup.string().optional().nullable(),
- url: yup.string().optional().nullable(),
- date: yup.string().optional().nullable(),
- rating100: yup.number().optional().nullable(),
- gallery_ids: yup.array(yup.string().required()).optional().nullable(),
- studio_id: yup.string().optional().nullable(),
- performer_ids: yup.array(yup.string().required()).optional().nullable(),
+ title: yup.string().ensure(),
+ code: yup.string().ensure(),
+ url: yup.string().ensure(),
+ date: yup
+ .string()
+ .ensure()
+ .test({
+ name: "date",
+ test: (value) => {
+ if (!value) return true;
+ if (!value.match(/^\d{4}-\d{2}-\d{2}$/)) return false;
+ if (Number.isNaN(Date.parse(value))) return false;
+ return true;
+ },
+ message: intl.formatMessage({ id: "validation.date_invalid_form" }),
+ }),
+ director: yup.string().ensure(),
+ rating100: yup.number().nullable().defined(),
+ gallery_ids: yup.array(yup.string().required()).defined(),
+ studio_id: yup.string().required().nullable(),
+ performer_ids: yup.array(yup.string().required()).defined(),
movies: yup
- .object({
- movie_id: yup.string().required(),
- scene_index: yup.string().optional().nullable(),
- })
- .optional()
- .nullable(),
- tag_ids: yup.array(yup.string().required()).optional().nullable(),
- cover_image: yup.string().optional().nullable(),
- stash_ids: yup.mixed().optional().nullable(),
+ .array(
+ yup.object({
+ movie_id: yup.string().required(),
+ scene_index: yup.number().nullable().defined(),
+ })
+ )
+ .defined(),
+ tag_ids: yup.array(yup.string().required()).defined(),
+ stash_ids: yup.mixed().defined(),
+ details: yup.string().ensure(),
+ cover_image: yup.string().nullable().optional(),
});
const initialValues = useMemo(
() => ({
title: scene.title ?? "",
code: scene.code ?? "",
- details: scene.details ?? "",
- director: scene.director ?? "",
url: scene.url ?? "",
date: scene.date ?? "",
+ director: scene.director ?? "",
rating100: scene.rating100 ?? null,
gallery_ids: (scene.galleries ?? []).map((g) => g.id),
- studio_id: scene.studio?.id,
+ studio_id: scene.studio?.id ?? null,
performer_ids: (scene.performers ?? []).map((p) => p.id),
movies: (scene.movies ?? []).map((m) => {
- return { movie_id: m.movie.id, scene_index: m.scene_index };
+ return { movie_id: m.movie.id, scene_index: m.scene_index ?? null };
}),
tag_ids: (scene.tags ?? []).map((t) => t.id),
- cover_image: initialCoverImage,
stash_ids: getStashIDs(scene.stash_ids),
+ details: scene.details ?? "",
+ cover_image: initialCoverImage,
}),
[scene, initialCoverImage]
);
- type InputValues = typeof initialValues;
+ type InputValues = yup.InferType;
- const formik = useFormik({
+ const formik = useFormik({
initialValues,
enableReinitialize: true,
validationSchema: schema,
@@ -187,6 +200,12 @@ export const SceneEditPanel: React.FC = ({
);
}
+ useRatingKeybinds(
+ isVisible,
+ stashConfig?.ui?.ratingSystemOptions?.type,
+ setRating
+ );
+
useEffect(() => {
if (isVisible) {
Mousetrap.bind("s s", () => {
@@ -198,35 +217,9 @@ export const SceneEditPanel: React.FC = ({
}
});
- // numeric keypresses get caught by jwplayer, so blur the element
- // if the rating sequence is started
- Mousetrap.bind("r", () => {
- if (document.activeElement instanceof HTMLElement) {
- document.activeElement.blur();
- }
-
- Mousetrap.bind("0", () => setRating(NaN));
- Mousetrap.bind("1", () => setRating(20));
- Mousetrap.bind("2", () => setRating(40));
- Mousetrap.bind("3", () => setRating(60));
- Mousetrap.bind("4", () => setRating(80));
- Mousetrap.bind("5", () => setRating(100));
-
- setTimeout(() => {
- Mousetrap.unbind("0");
- Mousetrap.unbind("1");
- Mousetrap.unbind("2");
- Mousetrap.unbind("3");
- Mousetrap.unbind("4");
- Mousetrap.unbind("5");
- }, 1000);
- });
-
return () => {
Mousetrap.unbind("s s");
Mousetrap.unbind("d d");
-
- Mousetrap.unbind("r");
};
}
});
@@ -245,15 +238,6 @@ export const SceneEditPanel: React.FC = ({
setQueryableScrapers(newQueryableScrapers);
}, [Scrapers, stashConfig]);
- const imageEncoding = ImageUtils.usePasteImage(onImageLoad, true);
-
- function getSceneInput(input: InputValues): GQL.SceneUpdateInput {
- return {
- id: scene.id!,
- ...input,
- };
- }
-
function setMovieIds(movieIds: string[]) {
const existingMovies = formik.values.movies;
@@ -265,29 +249,22 @@ export const SceneEditPanel: React.FC = ({
return {
movie_id: m,
+ scene_index: null,
};
});
formik.setFieldValue("movies", newMovies);
}
- function getCreateValues(values: InputValues): GQL.SceneCreateInput {
- return {
- ...values,
- };
- }
-
async function onSave(input: InputValues) {
setIsLoading(true);
try {
if (!isNew) {
- const updateValues = getSceneInput(input);
const result = await updateScene({
variables: {
input: {
- ...updateValues,
id: scene.id!,
- rating100: input.rating100 ?? null,
+ ...input,
},
},
});
@@ -300,20 +277,17 @@ export const SceneEditPanel: React.FC = ({
}
),
});
+ formik.resetForm();
}
} else {
- const createValues = getCreateValues(input);
const result = await mutateCreateScene({
- ...createValues,
- file_ids: fileID ? [fileID as string] : undefined,
+ ...input,
+ file_ids: fileID ? [fileID] : undefined,
});
if (result.data?.sceneCreate?.id) {
history.push(`/scenes/${result.data?.sceneCreate.id}`);
}
}
-
- // clear the cover image so that it doesn't appear dirty
- formik.resetForm({ values: formik.values });
} catch (e) {
Toast.error(e);
}
@@ -341,6 +315,8 @@ export const SceneEditPanel: React.FC = ({
);
}
+ const encodingImage = ImageUtils.usePasteImage(onImageLoad);
+
function onImageLoad(imageData: string) {
setCoverImagePreview(imageData);
formik.setFieldValue("cover_image", imageData);
@@ -434,9 +410,13 @@ export const SceneEditPanel: React.FC = ({
return;
}
- const currentScene = getSceneInput(formik.values);
+ const currentScene = {
+ id: scene.id!,
+ ...formik.values,
+ };
+
if (!currentScene.cover_image) {
- currentScene.cover_image = scene.paths!.screenshot;
+ currentScene.cover_image = scene.paths?.screenshot;
}
return (
@@ -691,7 +671,7 @@ export const SceneEditPanel: React.FC = ({
function renderTextField(field: string, title: string, placeholder?: string) {
return (
-
+
{FormUtils.renderLabel({
title,
})}
@@ -702,13 +682,16 @@ export const SceneEditPanel: React.FC = ({
{...formik.getFieldProps(field)}
isInvalid={!!formik.getFieldMeta(field).error}
/>
+
+ {formik.getFieldMeta(field).error}
+
);
}
const image = useMemo(() => {
- if (imageEncoding) {
+ if (encodingImage) {
return = ({
}
return ;
- }, [imageEncoding, coverImagePreview, intl]);
+ }, [encodingImage, coverImagePreview, intl]);
if (isLoading) return = ({
- {renderTextField(
- "date",
- intl.formatMessage({ id: "date" }),
- "YYYY-MM-DD"
- )}
+
+
+ {FormUtils.renderLabel({
+ title: intl.formatMessage({ id: "date" }),
+ })}
+ formik.setFieldValue("date", value)}
+ error={formik.errors.date}
+ />
+
+
+
{renderTextField(
"director",
intl.formatMessage({ id: "director" })
@@ -920,9 +914,8 @@ export const SceneEditPanel: React.FC = ({
+
+
+
+ + {intl.formatMessage({ + id: "config.about.build_hash", + })} +
+{hashString}
+
+
+
+
+
+
+
-
- )}
-
-
- - {intl.formatMessage({ - id: "config.about.latest_version_build_hash", - })} -
-
- {dataLatest.latestversion.shorthash}{" "}
- {hasNew
- ? intl.formatMessage({
- id: "config.about.new_version_notice",
- })
- : undefined}
-
-
-
-
-
-
-
- {error.message}
; if (loading) return{intl.formatMessage({ id: "actions.tasks.import_warning" })}
-
+
+
+
+
+
+ setMigrateBlobsOptions({ ...migrateBlobsOptions, deleteOld: v })
+ }
+ />
+
+
+
+
+
+
+
+
+ setMigrateSceneScreenshotsOptions({
+ ...migrateSceneScreenshotsOptions,
+ overwriteExisting: v,
+ })
+ }
+ />
+
+
+ setMigrateSceneScreenshotsOptions({
+ ...migrateSceneScreenshotsOptions,
+ deleteFiles: v,
+ })
+ }
+ />
+
@@ -28,7 +39,10 @@ export const SettingsTasksPanel: React.FC = () => {
-
({});
- const [pendingGeneral, setPendingGeneral] = useState<
- GQL.ConfigGeneralInput | undefined
- >();
+ const [pendingGeneral, setPendingGeneral] =
+ useState();
const [updateGeneralConfig] = useConfigureGeneral();
const [iface, setIface] = useState({});
- const [pendingInterface, setPendingInterface] = useState<
- GQL.ConfigInterfaceInput | undefined
- >();
+ const [pendingInterface, setPendingInterface] =
+ useState();
const [updateInterfaceConfig] = useConfigureInterface();
const [defaults, setDefaults] = useState({});
- const [pendingDefaults, setPendingDefaults] = useState<
- GQL.ConfigDefaultSettingsInput | undefined
- >();
+ const [pendingDefaults, setPendingDefaults] =
+ useState();
const [updateDefaultsConfig] = useConfigureDefaults();
const [scraping, setScraping] = useState({});
- const [pendingScraping, setPendingScraping] = useState<
- GQL.ConfigScrapingInput | undefined
- >();
+ const [pendingScraping, setPendingScraping] =
+ useState();
const [updateScrapingConfig] = useConfigureScraping();
const [dlna, setDLNA] = useState({});
- const [pendingDLNA, setPendingDLNA] = useState<
- GQL.ConfigDlnaInput | undefined
- >();
+ const [pendingDLNA, setPendingDLNA] = useState();
const [updateDLNAConfig] = useConfigureDLNA();
const [ui, setUI] = useState({});
- const [pendingUI, setPendingUI] = useState<{} | undefined>();
+ const [pendingUI, setPendingUI] = useState<{}>();
const [updateUIConfig] = useConfigureUI();
- const [updateSuccess, setUpdateSuccess] = useState();
+ const [updateSuccess, setUpdateSuccess] = useState();
const [apiKey, setApiKey] = useState("");
@@ -146,13 +134,7 @@ export const SettingsContext: React.FC = ({ children }) => {
setUI(data.configuration.ui);
}, [data, error]);
- const resetSuccess = useMemo(
- () =>
- debounce(() => {
- setUpdateSuccess(undefined);
- }, 4000),
- []
- );
+ const resetSuccess = useDebounce(() => setUpdateSuccess(undefined), [], 4000);
const onSuccess = useCallback(() => {
setUpdateSuccess(true);
@@ -160,24 +142,24 @@ export const SettingsContext: React.FC = ({ children }) => {
}, [resetSuccess]);
// saves the configuration if no further changes are made after a half second
- const saveGeneralConfig = useMemo(
- () =>
- debounce(async (input: GQL.ConfigGeneralInput) => {
- try {
- setUpdateSuccess(undefined);
- await updateGeneralConfig({
- variables: {
- input,
- },
- });
+ const saveGeneralConfig = useDebounce(
+ async (input: GQL.ConfigGeneralInput) => {
+ try {
+ setUpdateSuccess(undefined);
+ await updateGeneralConfig({
+ variables: {
+ input,
+ },
+ });
- setPendingGeneral(undefined);
- onSuccess();
- } catch (e) {
- setSaveError(e);
- }
- }, 500),
- [updateGeneralConfig, onSuccess]
+ setPendingGeneral(undefined);
+ onSuccess();
+ } catch (e) {
+ setSaveError(e);
+ }
+ },
+ [updateGeneralConfig, onSuccess],
+ 500
);
useEffect(() => {
@@ -210,24 +192,24 @@ export const SettingsContext: React.FC = ({ children }) => {
}
// saves the configuration if no further changes are made after a half second
- const saveInterfaceConfig = useMemo(
- () =>
- debounce(async (input: GQL.ConfigInterfaceInput) => {
- try {
- setUpdateSuccess(undefined);
- await updateInterfaceConfig({
- variables: {
- input,
- },
- });
+ const saveInterfaceConfig = useDebounce(
+ async (input: GQL.ConfigInterfaceInput) => {
+ try {
+ setUpdateSuccess(undefined);
+ await updateInterfaceConfig({
+ variables: {
+ input,
+ },
+ });
- setPendingInterface(undefined);
- onSuccess();
- } catch (e) {
- setSaveError(e);
- }
- }, 500),
- [updateInterfaceConfig, onSuccess]
+ setPendingInterface(undefined);
+ onSuccess();
+ } catch (e) {
+ setSaveError(e);
+ }
+ },
+ [updateInterfaceConfig, onSuccess],
+ 500
);
useEffect(() => {
@@ -260,24 +242,24 @@ export const SettingsContext: React.FC = ({ children }) => {
}
// saves the configuration if no further changes are made after a half second
- const saveDefaultsConfig = useMemo(
- () =>
- debounce(async (input: GQL.ConfigDefaultSettingsInput) => {
- try {
- setUpdateSuccess(undefined);
- await updateDefaultsConfig({
- variables: {
- input,
- },
- });
+ const saveDefaultsConfig = useDebounce(
+ async (input: GQL.ConfigDefaultSettingsInput) => {
+ try {
+ setUpdateSuccess(undefined);
+ await updateDefaultsConfig({
+ variables: {
+ input,
+ },
+ });
- setPendingDefaults(undefined);
- onSuccess();
- } catch (e) {
- setSaveError(e);
- }
- }, 500),
- [updateDefaultsConfig, onSuccess]
+ setPendingDefaults(undefined);
+ onSuccess();
+ } catch (e) {
+ setSaveError(e);
+ }
+ },
+ [updateDefaultsConfig, onSuccess],
+ 500
);
useEffect(() => {
@@ -310,24 +292,24 @@ export const SettingsContext: React.FC = ({ children }) => {
}
// saves the configuration if no further changes are made after a half second
- const saveScrapingConfig = useMemo(
- () =>
- debounce(async (input: GQL.ConfigScrapingInput) => {
- try {
- setUpdateSuccess(undefined);
- await updateScrapingConfig({
- variables: {
- input,
- },
- });
+ const saveScrapingConfig = useDebounce(
+ async (input: GQL.ConfigScrapingInput) => {
+ try {
+ setUpdateSuccess(undefined);
+ await updateScrapingConfig({
+ variables: {
+ input,
+ },
+ });
- setPendingScraping(undefined);
- onSuccess();
- } catch (e) {
- setSaveError(e);
- }
- }, 500),
- [updateScrapingConfig, onSuccess]
+ setPendingScraping(undefined);
+ onSuccess();
+ } catch (e) {
+ setSaveError(e);
+ }
+ },
+ [updateScrapingConfig, onSuccess],
+ 500
);
useEffect(() => {
@@ -360,24 +342,24 @@ export const SettingsContext: React.FC = ({ children }) => {
}
// saves the configuration if no further changes are made after a half second
- const saveDLNAConfig = useMemo(
- () =>
- debounce(async (input: GQL.ConfigDlnaInput) => {
- try {
- setUpdateSuccess(undefined);
- await updateDLNAConfig({
- variables: {
- input,
- },
- });
+ const saveDLNAConfig = useDebounce(
+ async (input: GQL.ConfigDlnaInput) => {
+ try {
+ setUpdateSuccess(undefined);
+ await updateDLNAConfig({
+ variables: {
+ input,
+ },
+ });
- setPendingDLNA(undefined);
- onSuccess();
- } catch (e) {
- setSaveError(e);
- }
- }, 500),
- [updateDLNAConfig, onSuccess]
+ setPendingDLNA(undefined);
+ onSuccess();
+ } catch (e) {
+ setSaveError(e);
+ }
+ },
+ [updateDLNAConfig, onSuccess],
+ 500
);
useEffect(() => {
@@ -410,24 +392,24 @@ export const SettingsContext: React.FC = ({ children }) => {
}
// saves the configuration if no further changes are made after a half second
- const saveUIConfig = useMemo(
- () =>
- debounce(async (input: IUIConfig) => {
- try {
- setUpdateSuccess(undefined);
- await updateUIConfig({
- variables: {
- input,
- },
- });
+ const saveUIConfig = useDebounce(
+ async (input: IUIConfig) => {
+ try {
+ setUpdateSuccess(undefined);
+ await updateUIConfig({
+ variables: {
+ input,
+ },
+ });
- setPendingUI(undefined);
- onSuccess();
- } catch (e) {
- setSaveError(e);
- }
- }, 500),
- [updateUIConfig, onSuccess]
+ setPendingUI(undefined);
+ onSuccess();
+ } catch (e) {
+ setSaveError(e);
+ }
+ },
+ [updateUIConfig, onSuccess],
+ 500
);
useEffect(() => {
diff --git a/ui/v2.5/src/components/Setup/Migrate.tsx b/ui/v2.5/src/components/Setup/Migrate.tsx
index 57ac073c8..9f27d7805 100644
--- a/ui/v2.5/src/components/Setup/Migrate.tsx
+++ b/ui/v2.5/src/components/Setup/Migrate.tsx
@@ -1,11 +1,11 @@
import React, { useEffect, useMemo, useState } from "react";
import { Button, Card, Container, Form } from "react-bootstrap";
import { useIntl, FormattedMessage } from "react-intl";
-import { getBaseURL } from "src/core/createClient";
+import { useHistory } from "react-router-dom";
import * as GQL from "src/core/generated-graphql";
import { useSystemStatus, mutateMigrate } from "src/core/StashService";
import { migrationNotes } from "src/docs/en/MigrationNotes";
-import { LoadingIndicator } from "../Shared";
+import { LoadingIndicator } from "../Shared/LoadingIndicator";
import { MarkdownPage } from "../Shared/MarkdownPage";
export const Migrate: React.FC = () => {
@@ -15,6 +15,7 @@ export const Migrate: React.FC = () => {
const [migrateError, setMigrateError] = useState("");
const intl = useIntl();
+ const history = useHistory();
// if database path includes path separators, then this is passed through
// to the migration path. Extract the base name of the database file.
@@ -109,8 +110,7 @@ export const Migrate: React.FC = () => {
systemStatus.systemStatus.status !== GQL.SystemStatusEnum.NeedsMigration
) {
// redirect to main page
- const newURL = new URL("/", window.location.toString());
- window.location.href = newURL.toString();
+ history.push("/");
return ([]);
const [showStashAlert, setShowStashAlert] = useState(false);
- const [generatedLocation, setGeneratedLocation] = useState("");
const [databaseFile, setDatabaseFile] = useState("");
+ const [generatedLocation, setGeneratedLocation] = useState("");
+ const [cacheLocation, setCacheLocation] = useState("");
+ const [blobsLocation, setBlobsLocation] = useState("blobs");
const [loading, setLoading] = useState(false);
const [setupError, setSetupError] = useState("");
const intl = useIntl();
+ const history = useHistory();
- const [showGeneratedDialog, setShowGeneratedDialog] = useState(false);
+ const [showGeneratedSelectDialog, setShowGeneratedSelectDialog] =
+ useState(false);
+ const [showCacheSelectDialog, setShowCacheSelectDialog] = useState(false);
+ const [showBlobsDialog, setShowBlobsDialog] = useState(false);
const { data: systemStatus, loading: statusLoading } = useSystemStatus();
@@ -111,7 +124,7 @@ export const Setup: React.FC = () => {
}
return (
- {
+
);
}
@@ -226,20 +239,36 @@ export const Setup: React.FC = () => {
);
}
- function onGeneratedClosed(d?: string) {
+ function onGeneratedSelectClosed(d?: string) {
if (d) {
setGeneratedLocation(d);
}
- setShowGeneratedDialog(false);
+ setShowGeneratedSelectDialog(false);
}
function maybeRenderGeneratedSelectDialog() {
- if (!showGeneratedDialog) {
+ if (!showGeneratedSelectDialog) {
return;
}
- return
+
+
+
+ ) =>
+ setCacheLocation(e.currentTarget.value)
+ }
+ />
+
+
+
+
+
+ );
+ }
+ }
+
+ function maybeRenderBlobs() {
+ if (!configuration?.general.blobsPath) {
+ return (
+
+
+
+
+ ) =>
+ setBlobsLocation(e.currentTarget.value)
+ }
+ />
+
+
@@ -321,6 +457,13 @@ export const Setup: React.FC = () => {
code: (chunks: string) =>
+ {chunks},
+ }}
+ />
{
/>
{maybeRenderGenerated()}
+ {maybeRenderCache()}
+ {maybeRenderBlobs()}
= ({ page }) => {
@@ -20,8 +19,8 @@ export const MarkdownPage: React.FC = ({ page }) => {
}, [page, markdown]);
return (
-
- {markdown}
-
+ = ({
+export const ModalComponent: React.FC = ({
children,
show,
icon,
@@ -99,5 +99,3 @@ const ModalComponent: React.FC = ({
);
-
-export default ModalComponent;
diff --git a/ui/v2.5/src/components/Shared/MultiSet.tsx b/ui/v2.5/src/components/Shared/MultiSet.tsx
index 6f7aa08e4..c19922683 100644
--- a/ui/v2.5/src/components/Shared/MultiSet.tsx
+++ b/ui/v2.5/src/components/Shared/MultiSet.tsx
@@ -1,15 +1,9 @@
-import * as React from "react";
+import React from "react";
import { useIntl } from "react-intl";
import * as GQL from "src/core/generated-graphql";
import { Button, ButtonGroup } from "react-bootstrap";
-import { FilterSelect } from "./Select";
-
-type ValidTypes =
- | GQL.SlimPerformerDataFragment
- | GQL.SlimTagDataFragment
- | GQL.SlimStudioDataFragment
- | GQL.SlimMovieDataFragment;
+import { FilterSelect, SelectObject } from "./Select";
interface IMultiSetProps {
type: "performers" | "studios" | "tags" | "movies";
@@ -21,9 +15,7 @@ interface IMultiSetProps {
onSetMode: (mode: GQL.BulkUpdateIdMode) => void;
}
-const MultiSet: React.FunctionComponent = (
- props: IMultiSetProps
-) => {
+export const MultiSet: React.FC = (props) => {
const intl = useIntl();
const modes = [
GQL.BulkUpdateIdMode.Set,
@@ -31,7 +23,7 @@ const MultiSet: React.FunctionComponent = (
GQL.BulkUpdateIdMode.Remove,
];
- function onUpdate(items: ValidTypes[]) {
+ function onUpdate(items: SelectObject[]) {
props.onUpdate(items.map((i) => i.id));
}
@@ -102,5 +94,3 @@ const MultiSet: React.FunctionComponent = (
);
};
-
-export default MultiSet;
diff --git a/ui/v2.5/src/components/Shared/OperationButton.tsx b/ui/v2.5/src/components/Shared/OperationButton.tsx
index c71d9e139..89155467c 100644
--- a/ui/v2.5/src/components/Shared/OperationButton.tsx
+++ b/ui/v2.5/src/components/Shared/OperationButton.tsx
@@ -1,6 +1,6 @@
import React, { useState, useRef, useEffect } from "react";
import { Button, ButtonProps } from "react-bootstrap";
-import LoadingIndicator from "src/components/Shared/LoadingIndicator";
+import { LoadingIndicator } from "./LoadingIndicator";
interface IOperationButton extends ButtonProps {
operation?: () => Promise-
+
+
+ {chunks},
+ }}
+ />
+
+
+
+ {chunks},
+ }}
+ />
+
+ {chunks},
+ strong: (chunks: string) => {chunks},
+ }}
+ />
+
{chunks},
}}
/>
+ +
@@ -397,8 +542,19 @@ export const Setup: React.FC = () => {
configLocation,
databaseFile,
generatedLocation,
+ cacheLocation,
+ blobsLocation,
stashes,
});
+ // Set lastNoteSeen to hide release notes dialog
+ await saveUI({
+ variables: {
+ input: {
+ ...configuration?.ui,
+ lastNoteSeen: releaseNotes[0].date,
+ },
+ },
+ });
} catch (e) {
if (e instanceof Error) setSetupError(e.message ?? e.toString());
} finally {
@@ -457,6 +613,32 @@ export const Setup: React.FC = () => {
+
= ({
+export const LoadingIndicator: React.FC = ({
message,
inline = false,
small = false,
@@ -27,5 +27,3 @@ const LoadingIndicator: React.FC = ({
)}
);
-
-export default LoadingIndicator;
diff --git a/ui/v2.5/src/components/Shared/MarkdownPage.tsx b/ui/v2.5/src/components/Shared/MarkdownPage.tsx
index b9fc93eba..c9713be55 100644
--- a/ui/v2.5/src/components/Shared/MarkdownPage.tsx
+++ b/ui/v2.5/src/components/Shared/MarkdownPage.tsx
@@ -1,11 +1,10 @@
import React, { useEffect, useState } from "react";
-import ReactMarkdown from "react-markdown";
-import gfm from "remark-gfm";
+import { Remark } from "react-remark";
+import remarkGfm from "remark-gfm";
interface IPageProps {
// page is a markdown module
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- page: any;
+ page: string;
}
export const MarkdownPage: React.FC-
+
-
+
+
+ -
+
+ {cacheLocation !== "" + ? cacheLocation + : intl.formatMessage({ + id: "setup.confirm.default_cache_location", + })} ++
+ -
+
+
+ -
+
+ {blobsLocation !== "" + ? blobsLocation + : intl.formatMessage({ + id: "setup.confirm.default_blobs_location", + })} ++
+
@@ -576,7 +758,7 @@ export const Setup: React.FC = () => {
= ({
+export const CountrySelect: React.FC = ({
value,
onChange,
disabled = false,
isClearable = true,
showFlag,
className,
+ menuPortalTarget,
}) => {
const { locale } = useIntl();
const options = getCountries(locale);
@@ -44,8 +46,7 @@ const CountrySelect: React.FC = ({
IndicatorSeparator: null,
}}
className={`CountrySelect ${className}`}
+ menuPortalTarget={menuPortalTarget}
/>
);
};
-
-export default CountrySelect;
diff --git a/ui/v2.5/src/components/Shared/DateInput.tsx b/ui/v2.5/src/components/Shared/DateInput.tsx
new file mode 100644
index 000000000..aa57fd37f
--- /dev/null
+++ b/ui/v2.5/src/components/Shared/DateInput.tsx
@@ -0,0 +1,105 @@
+import { faCalendar } from "@fortawesome/free-regular-svg-icons";
+import React, { useMemo } from "react";
+import { Button, InputGroup, Form } from "react-bootstrap";
+import ReactDatePicker from "react-datepicker";
+import TextUtils from "src/utils/text";
+import { Icon } from "./Icon";
+
+import "react-datepicker/dist/react-datepicker.css";
+import { useIntl } from "react-intl";
+
+interface IProps {
+ disabled?: boolean;
+ value: string | undefined;
+ isTime?: boolean;
+ onValueChange(value: string): void;
+ placeholder?: string;
+ error?: string;
+}
+
+export const DateInput: React.FC = (props: IProps) => {
+ const intl = useIntl();
+
+ const date = useMemo(() => {
+ const toDate = props.isTime
+ ? TextUtils.stringToFuzzyDateTime
+ : TextUtils.stringToFuzzyDate;
+ if (props.value) {
+ const ret = toDate(props.value);
+ if (!ret || isNaN(ret.getTime())) {
+ return undefined;
+ }
+
+ return ret;
+ }
+ }, [props.value, props.isTime]);
+
+ function maybeRenderButton() {
+ if (!props.disabled) {
+ const ShowPickerButton = ({
+ onClick,
+ }: {
+ onClick: (
+ event: React.MouseEvent
+ ) => void;
+ }) => (
+
+ );
+
+ const dateToString = props.isTime
+ ? TextUtils.dateTimeToString
+ : TextUtils.dateToString;
+
+ return (
+ {
+ props.onValueChange(v ? dateToString(v) : "");
+ }}
+ customInput={React.createElement(ShowPickerButton)}
+ showMonthDropdown
+ showYearDropdown
+ scrollableMonthYearDropdown
+ scrollableYearDropdown
+ maxDate={new Date()}
+ yearDropdownItemNumber={100}
+ portalId="date-picker-portal"
+ showTimeSelect={props.isTime}
+ />
+ );
+ }
+ }
+
+ const placeholderText = intl.formatMessage({
+ id: props.isTime ? "datetime_format" : "date_format",
+ });
+
+ return (
+ = ({
+export const DeleteEntityDialog: React.FC = ({
selected,
onClose,
singularEntity,
@@ -77,7 +77,7 @@ const DeleteEntityDialog: React.FC = ({
}
return (
- = ({
/>
)}
-
+
);
};
-
-export default DeleteEntityDialog;
diff --git a/ui/v2.5/src/components/Shared/DeleteFilesDialog.tsx b/ui/v2.5/src/components/Shared/DeleteFilesDialog.tsx
index 9e23c400f..e6898c87a 100644
--- a/ui/v2.5/src/components/Shared/DeleteFilesDialog.tsx
+++ b/ui/v2.5/src/components/Shared/DeleteFilesDialog.tsx
@@ -1,7 +1,7 @@
import React, { useState } from "react";
import { mutateDeleteFiles } from "src/core/StashService";
-import { Modal } from "src/components/Shared";
-import { useToast } from "src/hooks";
+import { ModalComponent } from "./Modal";
+import { useToast } from "src/hooks/Toast";
import { FormattedMessage, useIntl } from "react-intl";
import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
@@ -88,7 +88,7 @@ export const DeleteFilesDialog: React.FC = (
}
return (
- = (
>
+
);
};
-
-export default DeleteFilesDialog;
diff --git a/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx b/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx
index 5c4854c02..fb5646ff5 100644
--- a/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx
+++ b/ui/v2.5/src/components/Shared/DetailsEditNavbar.tsx
@@ -1,7 +1,7 @@
import { Button, Modal } from "react-bootstrap";
import React, { useState } from "react";
import { FormattedMessage, useIntl } from "react-intl";
-import { ImageInput } from "src/components/Shared/ImageInput";
+import { ImageInput } from "./ImageInput";
import cx from "classnames";
interface IProps {
diff --git a/ui/v2.5/src/components/Shared/DurationInput.tsx b/ui/v2.5/src/components/Shared/DurationInput.tsx
index b5839790b..0e346acd7 100644
--- a/ui/v2.5/src/components/Shared/DurationInput.tsx
+++ b/ui/v2.5/src/components/Shared/DurationInput.tsx
@@ -5,8 +5,8 @@ import {
} from "@fortawesome/free-solid-svg-icons";
import React, { useState, useEffect } from "react";
import { Button, ButtonGroup, InputGroup, Form } from "react-bootstrap";
-import Icon from "src/components/Shared/Icon";
-import { DurationUtils } from "src/utils";
+import { Icon } from "./Icon";
+import DurationUtils from "src/utils/duration";
interface IProps {
disabled?: boolean;
diff --git a/ui/v2.5/src/components/Shared/ErrorMessage.tsx b/ui/v2.5/src/components/Shared/ErrorMessage.tsx
index 2e40a35df..b0cdb12f3 100644
--- a/ui/v2.5/src/components/Shared/ErrorMessage.tsx
+++ b/ui/v2.5/src/components/Shared/ErrorMessage.tsx
@@ -4,10 +4,8 @@ interface IProps {
error: string | ReactNode;
}
-const ErrorMessage: React.FC = ({ error }) => (
+export const ErrorMessage: React.FC = ({ error }) => (
);
-
-export default ErrorMessage;
diff --git a/ui/v2.5/src/components/Shared/ExportDialog.tsx b/ui/v2.5/src/components/Shared/ExportDialog.tsx
index 3c0ad5b7c..bf855d732 100644
--- a/ui/v2.5/src/components/Shared/ExportDialog.tsx
+++ b/ui/v2.5/src/components/Shared/ExportDialog.tsx
@@ -1,8 +1,8 @@
import React, { useState } from "react";
import { Form } from "react-bootstrap";
import { mutateExportObjects } from "src/core/StashService";
-import Modal from "src/components/Shared/Modal";
-import useToast from "src/hooks/Toast";
+import { ModalComponent } from "./Modal";
+import { useToast } from "src/hooks/Toast";
import downloadFile from "src/utils/download";
import { ExportObjectsInput } from "src/core/generated-graphql";
import { useIntl } from "react-intl";
@@ -46,7 +46,7 @@ export const ExportDialog: React.FC = (
}
return (
- = (
/>
-
+
);
};
diff --git a/ui/v2.5/src/components/Shared/FolderSelect/FolderSelect.tsx b/ui/v2.5/src/components/Shared/FolderSelect/FolderSelect.tsx
index f6c6de544..9dfd61f5b 100644
--- a/ui/v2.5/src/components/Shared/FolderSelect/FolderSelect.tsx
+++ b/ui/v2.5/src/components/Shared/FolderSelect/FolderSelect.tsx
@@ -1,17 +1,20 @@
-import React, { useEffect, useState, useMemo } from "react";
+import React, { useEffect, useState } from "react";
import { FormattedMessage, useIntl } from "react-intl";
-import { Button, InputGroup, Form } from "react-bootstrap";
-import debounce from "lodash-es/debounce";
-import Icon from "src/components/Shared/Icon";
-import LoadingIndicator from "src/components/Shared/LoadingIndicator";
+import { Button, InputGroup, Form, Collapse } from "react-bootstrap";
+import { Icon } from "../Icon";
+import { LoadingIndicator } from "../LoadingIndicator";
import { useDirectory } from "src/core/StashService";
-import { faTimes } from "@fortawesome/free-solid-svg-icons";
+import { faEllipsis, faTimes } from "@fortawesome/free-solid-svg-icons";
+import { useDebouncedSetState } from "src/hooks/debounce";
interface IProps {
currentDirectory: string;
setCurrentDirectory: (value: string) => void;
defaultDirectories?: string[];
appendButton?: JSX.Element;
+ collapsible?: boolean;
+ quoteSpaced?: boolean;
+ hideError?: boolean;
}
export const FolderSelect: React.FC = ({
@@ -19,33 +22,43 @@ export const FolderSelect: React.FC = ({
setCurrentDirectory,
defaultDirectories,
appendButton,
+ collapsible = false,
+ quoteSpaced = false,
+ hideError = false,
}) => {
- const [debouncedDirectory, setDebouncedDirectory] = useState(
- currentDirectory
+ const [showBrowser, setShowBrowser] = React.useState(false);
+ const [directory, setDirectory] = useState(currentDirectory);
+
+ const isQuoted =
+ quoteSpaced && directory.startsWith('"') && directory.endsWith('"');
+ const { data, error, loading } = useDirectory(
+ isQuoted ? directory.slice(1, -1) : directory
);
- const { data, error, loading } = useDirectory(debouncedDirectory);
+
const intl = useIntl();
- const selectableDirectories: string[] = currentDirectory
- ? data?.directory.directories ?? defaultDirectories ?? []
- : defaultDirectories ?? [];
+ const defaultDirectoriesOrEmpty = defaultDirectories ?? [];
- const debouncedSetDirectory = useMemo(
- () =>
- debounce((input: string) => {
- setDebouncedDirectory(input);
- }, 250),
- []
- );
+ const selectableDirectories: string[] = currentDirectory
+ ? data?.directory.directories ??
+ (error && hideError ? [] : defaultDirectoriesOrEmpty)
+ : defaultDirectoriesOrEmpty;
+
+ const debouncedSetDirectory = useDebouncedSetState(setDirectory, 250);
useEffect(() => {
- if (currentDirectory === "" && !defaultDirectories && data?.directory.path)
- setCurrentDirectory(data.directory.path);
- }, [currentDirectory, setCurrentDirectory, data, defaultDirectories]);
+ if (currentDirectory !== directory) {
+ debouncedSetDirectory(currentDirectory);
+ }
+ }, [currentDirectory, directory, debouncedSetDirectory]);
function setInstant(value: string) {
+ if (quoteSpaced && value.includes(" ")) {
+ value = `"${value}"`;
+ }
+
setCurrentDirectory(value);
- setDebouncedDirectory(value);
+ setDirectory(value);
}
function setDebounced(value: string) {
@@ -74,6 +87,7 @@ export const FolderSelect: React.FC = ({
<>
) => {
setDebounced(e.currentTarget.value);
@@ -84,31 +98,43 @@ export const FolderSelect: React.FC = ({
{appendButton ? (
{appendButton}
) : undefined}
+ {collapsible ? (
+
+
+
+ ) : undefined}
{!data || !data.directory || loading ? (
{loading ? (
) : undefined}
- {error !== undefined && (
+ {!hideError && error !== undefined && (
+
);
};
diff --git a/ui/v2.5/src/components/Shared/GridCard.tsx b/ui/v2.5/src/components/Shared/GridCard.tsx
index f7ec2ee81..332bcaf04 100644
--- a/ui/v2.5/src/components/Shared/GridCard.tsx
+++ b/ui/v2.5/src/components/Shared/GridCard.tsx
@@ -2,7 +2,7 @@ import React from "react";
import { Card, Form } from "react-bootstrap";
import { Link } from "react-router-dom";
import cx from "classnames";
-import TruncatedText from "./TruncatedText";
+import { TruncatedText } from "./TruncatedText";
interface ICardProps {
className?: string;
@@ -10,7 +10,7 @@ interface ICardProps {
thumbnailSectionClassName?: string;
url: string;
pretitleIcon?: JSX.Element;
- title: string;
+ title: JSX.Element | string;
image: JSX.Element;
details?: JSX.Element;
overlays?: JSX.Element;
diff --git a/ui/v2.5/src/components/Shared/Icon.tsx b/ui/v2.5/src/components/Shared/Icon.tsx
index d1f2616f6..f5cb23964 100644
--- a/ui/v2.5/src/components/Shared/Icon.tsx
+++ b/ui/v2.5/src/components/Shared/Icon.tsx
@@ -9,7 +9,7 @@ interface IIcon {
size?: SizeProp;
}
-const Icon: React.FC = ({ icon, className, color, size }) => (
+export const Icon: React.FC = ({ icon, className, color, size }) => (
= ({ icon, className, color, size }) => (
size={size}
/>
);
-
-export default Icon;
diff --git a/ui/v2.5/src/components/Shared/ImageInput.tsx b/ui/v2.5/src/components/Shared/ImageInput.tsx
index f1ace6f83..cf25aa887 100644
--- a/ui/v2.5/src/components/Shared/ImageInput.tsx
+++ b/ui/v2.5/src/components/Shared/ImageInput.tsx
@@ -8,8 +8,8 @@ import {
Row,
} from "react-bootstrap";
import { useIntl } from "react-intl";
-import Modal from "./Modal";
-import Icon from "./Icon";
+import { ModalComponent } from "./Modal";
+import { Icon } from "./Icon";
import { faFile, faLink } from "@fortawesome/free-solid-svg-icons";
interface IImageInput {
@@ -64,7 +64,7 @@ export const ImageInput: React.FC = ({
function renderDialog() {
return (
- setIsShowDialog(false)}
header={intl.formatMessage({ id: "dialogs.set_image_url_title" })}
@@ -90,7 +90,7 @@ export const ImageInput: React.FC = ({
-
+
);
}
diff --git a/ui/v2.5/src/components/Shared/LoadingIndicator.tsx b/ui/v2.5/src/components/Shared/LoadingIndicator.tsx
index f52498f0b..3b9247c91 100644
--- a/ui/v2.5/src/components/Shared/LoadingIndicator.tsx
+++ b/ui/v2.5/src/components/Shared/LoadingIndicator.tsx
@@ -12,7 +12,7 @@ interface ILoadingProps {
const CLASSNAME = "LoadingIndicator";
const CLASSNAME_MESSAGE = `${CLASSNAME}-message`;
-const LoadingIndicator: React.FC
-
);
};
-
-export default CountryLabel;
diff --git a/ui/v2.5/src/components/Shared/CountrySelect.tsx b/ui/v2.5/src/components/Shared/CountrySelect.tsx
index e354279fd..659731725 100644
--- a/ui/v2.5/src/components/Shared/CountrySelect.tsx
+++ b/ui/v2.5/src/components/Shared/CountrySelect.tsx
@@ -1,25 +1,27 @@
import React from "react";
import Creatable from "react-select/creatable";
import { useIntl } from "react-intl";
-import { getCountries } from "src/utils";
-import CountryLabel from "./CountryLabel";
+import { getCountries } from "src/utils/country";
+import { CountryLabel } from "./CountryLabel";
interface IProps {
- value?: string | undefined;
+ value?: string;
onChange?: (value: string) => void;
disabled?: boolean;
className?: string;
showFlag?: boolean;
isClearable?: boolean;
+ menuPortalTarget?: HTMLElement | null;
}
-const CountrySelect: React.FC
+
+ ) =>
+ props.onValueChange(e.currentTarget.value)
+ }
+ placeholder={
+ !props.disabled
+ ? props.placeholder
+ ? `${props.placeholder} (${placeholderText})`
+ : placeholderText
+ : undefined
+ }
+ isInvalid={!!props.error}
+ />
+ {maybeRenderButton()}
+
+ {props.error}
+
+
+
+ );
+};
diff --git a/ui/v2.5/src/components/Shared/DeleteEntityDialog.tsx b/ui/v2.5/src/components/Shared/DeleteEntityDialog.tsx
index cf6284982..4fd5114c8 100644
--- a/ui/v2.5/src/components/Shared/DeleteEntityDialog.tsx
+++ b/ui/v2.5/src/components/Shared/DeleteEntityDialog.tsx
@@ -2,8 +2,8 @@ import React, { useState } from "react";
import { defineMessages, FormattedMessage, useIntl } from "react-intl";
import { FetchResult } from "@apollo/client";
-import Modal from "src/components/Shared/Modal";
-import { useToast } from "src/hooks";
+import { ModalComponent } from "./Modal";
+import { useToast } from "src/hooks/Toast";
import { faTrashAlt } from "@fortawesome/free-solid-svg-icons";
interface IDeletionEntity {
@@ -39,7 +39,7 @@ const messages = defineMessages({
},
});
-const DeleteEntityDialog: React.FC{message}
{renderDeleteFileAlert()} -Error: {error}
Error: {error.message}
)} --
- {topDirectory}
- {selectableDirectories.map((path) => {
- return (
-
- - - - ); - })} -
-
+ {topDirectory}
+ {selectableDirectories.map((path) => {
+ return (
+
- + + + ); + })} +
+ {markdown}
+
);
};
diff --git a/ui/v2.5/src/components/Shared/Modal.tsx b/ui/v2.5/src/components/Shared/Modal.tsx
index 8cf3b8029..df2e2f270 100644
--- a/ui/v2.5/src/components/Shared/Modal.tsx
+++ b/ui/v2.5/src/components/Shared/Modal.tsx
@@ -1,6 +1,6 @@
import React from "react";
import { Button, Modal, Spinner, ModalProps } from "react-bootstrap";
-import Icon from "src/components/Shared/Icon";
+import { Icon } from "./Icon";
import { IconDefinition } from "@fortawesome/fontawesome-svg-core";
import { FormattedMessage } from "react-intl";
@@ -27,7 +27,7 @@ interface IModal {
const defaultOnHide = () => {};
-const ModalComponent: React.FC
{Array.from(Array(max)).map((value, index) =>
renderRatingButton(index + 1)
)}
+ {maybeRenderStarRatingNumber()}
);
};
diff --git a/ui/v2.5/src/components/Shared/Rating/styles.scss b/ui/v2.5/src/components/Shared/Rating/styles.scss
index 2784943bb..f7b463359 100644
--- a/ui/v2.5/src/components/Shared/Rating/styles.scss
+++ b/ui/v2.5/src/components/Shared/Rating/styles.scss
@@ -21,18 +21,50 @@
width: 0;
}
+ &.star-fill-10 .filled-star {
+ width: 10%;
+ }
+
+ &.star-fill-20 .filled-star {
+ width: 20%;
+ }
+
&.star-fill-25 .filled-star {
width: 35%;
}
+ &.star-fill-30 .filled-star {
+ width: 30%;
+ }
+
+ &.star-fill-40 .filled-star {
+ width: 40%;
+ }
+
&.star-fill-50 .filled-star {
width: 50%;
}
+ &.star-fill-60 .filled-star {
+ width: 60%;
+ }
+
&.star-fill-75 .filled-star {
width: 65%;
}
+ &.star-fill-70 .filled-star {
+ width: 70%;
+ }
+
+ &.star-fill-80 .filled-star {
+ width: 80%;
+ }
+
+ &.star-fill-90 .filled-star {
+ width: 90%;
+ }
+
&.star-fill-100 .filled-star {
width: 100%;
}
@@ -56,6 +88,11 @@
}
}
+.star-rating-number {
+ font-size: 1rem;
+ margin: auto 0.5rem;
+}
+
.rating-number.disabled {
align-items: center;
display: inline-flex;
diff --git a/ui/v2.5/src/components/Shared/ReassignFilesDialog.tsx b/ui/v2.5/src/components/Shared/ReassignFilesDialog.tsx
index 8a15359b2..7629d0379 100644
--- a/ui/v2.5/src/components/Shared/ReassignFilesDialog.tsx
+++ b/ui/v2.5/src/components/Shared/ReassignFilesDialog.tsx
@@ -1,10 +1,11 @@
import React, { useState } from "react";
-import { Modal, SceneSelect } from "src/components/Shared";
-import { useToast } from "src/hooks";
+import { ModalComponent } from "./Modal";
+import { SceneSelect } from "./Select";
+import { useToast } from "src/hooks/Toast";
import { useIntl } from "react-intl";
import { faSignOutAlt } from "@fortawesome/free-solid-svg-icons";
import { Col, Form, Row } from "react-bootstrap";
-import { FormUtils } from "src/utils";
+import FormUtils from "src/utils/form";
import { mutateSceneAssignFile } from "src/core/StashService";
interface IFile {
@@ -59,7 +60,7 @@ export const ReassignFilesDialog: React.FC