2021-01-18 01:23:20 +00:00
|
|
|
package sqlite
|
|
|
|
|
|
|
|
import (
|
|
|
|
"database/sql"
|
Errorlint sweep + minor linter tweaks (#1796)
* Replace error assertions with Go 1.13 style
Use `errors.As(..)` over type assertions. This enables better use of
wrapped errors in the future, and lets us pass some errorlint checks
in the process.
The rewrite is entirely mechanical, and uses a standard idiom for
doing so.
* Use Go 1.13's errors.Is(..)
Rather than directly checking for error equality, use errors.Is(..).
This protects against error wrapping issues in the future.
Even though something like sql.ErrNoRows doesn't need the wrapping, do
so anyway, for the sake of consistency throughout the code base.
The change almost lets us pass the `errorlint` Go checker except for
a missing case in `js.go` which is to be handled separately; it isn't
mechanical, like these changes are.
* Remove goconst
goconst isn't a useful linter in many cases, because it's false positive
rate is high. It's 100% for the current code base.
* Avoid direct comparison of errors in recover()
Assert that we are catching an error from recover(). If we are,
check that the error caught matches errStop.
* Enable the "errorlint" checker
Configure the checker to avoid checking for errorf wraps. These are
often false positives since the suggestion is to blanket wrap errors
with %w, and that exposes the underlying API which you might not want
to do.
The other warnings are good however, and with the current patch stack,
the code base passes all these checks as well.
* Configure rowserrcheck
The project uses sqlx. Configure rowserrcheck to include said package.
* Mechanically rewrite a large set of errors
Mechanically search for errors that look like
fmt.Errorf("...%s", err.Error())
and rewrite those into
fmt.Errorf("...%v", err)
The `fmt` package is error-aware and knows how to call err.Error()
itself.
The rationale is that this is more idiomatic Go; it paves the
way for using error wrapping later with %w in some sites.
This patch only addresses the entirely mechanical rewriting caught by
a project-side search/replace. There are more individual sites not
addressed by this patch.
2021-10-12 03:03:08 +00:00
|
|
|
"errors"
|
2021-01-18 01:23:20 +00:00
|
|
|
"fmt"
|
|
|
|
|
|
|
|
"github.com/stashapp/stash/pkg/models"
|
|
|
|
)
|
|
|
|
|
|
|
|
const movieTable = "movies"
|
2021-06-03 10:52:19 +00:00
|
|
|
const movieIDColumn = "movie_id"
|
2021-01-18 01:23:20 +00:00
|
|
|
|
|
|
|
type movieQueryBuilder struct {
|
|
|
|
repository
|
|
|
|
}
|
|
|
|
|
|
|
|
func NewMovieReaderWriter(tx dbi) *movieQueryBuilder {
|
|
|
|
return &movieQueryBuilder{
|
|
|
|
repository{
|
|
|
|
tx: tx,
|
|
|
|
tableName: movieTable,
|
|
|
|
idColumn: idColumn,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (qb *movieQueryBuilder) Create(newObject models.Movie) (*models.Movie, error) {
|
|
|
|
var ret models.Movie
|
|
|
|
if err := qb.insertObject(newObject, &ret); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return &ret, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (qb *movieQueryBuilder) Update(updatedObject models.MoviePartial) (*models.Movie, error) {
|
|
|
|
const partial = true
|
|
|
|
if err := qb.update(updatedObject.ID, updatedObject, partial); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return qb.Find(updatedObject.ID)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (qb *movieQueryBuilder) UpdateFull(updatedObject models.Movie) (*models.Movie, error) {
|
|
|
|
const partial = false
|
|
|
|
if err := qb.update(updatedObject.ID, updatedObject, partial); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return qb.Find(updatedObject.ID)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (qb *movieQueryBuilder) Destroy(id int) error {
|
|
|
|
return qb.destroyExisting([]int{id})
|
|
|
|
}
|
|
|
|
|
|
|
|
func (qb *movieQueryBuilder) Find(id int) (*models.Movie, error) {
|
|
|
|
var ret models.Movie
|
|
|
|
if err := qb.get(id, &ret); err != nil {
|
Errorlint sweep + minor linter tweaks (#1796)
* Replace error assertions with Go 1.13 style
Use `errors.As(..)` over type assertions. This enables better use of
wrapped errors in the future, and lets us pass some errorlint checks
in the process.
The rewrite is entirely mechanical, and uses a standard idiom for
doing so.
* Use Go 1.13's errors.Is(..)
Rather than directly checking for error equality, use errors.Is(..).
This protects against error wrapping issues in the future.
Even though something like sql.ErrNoRows doesn't need the wrapping, do
so anyway, for the sake of consistency throughout the code base.
The change almost lets us pass the `errorlint` Go checker except for
a missing case in `js.go` which is to be handled separately; it isn't
mechanical, like these changes are.
* Remove goconst
goconst isn't a useful linter in many cases, because it's false positive
rate is high. It's 100% for the current code base.
* Avoid direct comparison of errors in recover()
Assert that we are catching an error from recover(). If we are,
check that the error caught matches errStop.
* Enable the "errorlint" checker
Configure the checker to avoid checking for errorf wraps. These are
often false positives since the suggestion is to blanket wrap errors
with %w, and that exposes the underlying API which you might not want
to do.
The other warnings are good however, and with the current patch stack,
the code base passes all these checks as well.
* Configure rowserrcheck
The project uses sqlx. Configure rowserrcheck to include said package.
* Mechanically rewrite a large set of errors
Mechanically search for errors that look like
fmt.Errorf("...%s", err.Error())
and rewrite those into
fmt.Errorf("...%v", err)
The `fmt` package is error-aware and knows how to call err.Error()
itself.
The rationale is that this is more idiomatic Go; it paves the
way for using error wrapping later with %w in some sites.
This patch only addresses the entirely mechanical rewriting caught by
a project-side search/replace. There are more individual sites not
addressed by this patch.
2021-10-12 03:03:08 +00:00
|
|
|
if errors.Is(err, sql.ErrNoRows) {
|
2021-01-18 01:23:20 +00:00
|
|
|
return nil, nil
|
|
|
|
}
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return &ret, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (qb *movieQueryBuilder) FindMany(ids []int) ([]*models.Movie, error) {
|
|
|
|
var movies []*models.Movie
|
|
|
|
for _, id := range ids {
|
|
|
|
movie, err := qb.Find(id)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
if movie == nil {
|
|
|
|
return nil, fmt.Errorf("movie with id %d not found", id)
|
|
|
|
}
|
|
|
|
|
|
|
|
movies = append(movies, movie)
|
|
|
|
}
|
|
|
|
|
|
|
|
return movies, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (qb *movieQueryBuilder) FindByName(name string, nocase bool) (*models.Movie, error) {
|
|
|
|
query := "SELECT * FROM movies WHERE name = ?"
|
|
|
|
if nocase {
|
|
|
|
query += " COLLATE NOCASE"
|
|
|
|
}
|
|
|
|
query += " LIMIT 1"
|
|
|
|
args := []interface{}{name}
|
|
|
|
return qb.queryMovie(query, args)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (qb *movieQueryBuilder) FindByNames(names []string, nocase bool) ([]*models.Movie, error) {
|
|
|
|
query := "SELECT * FROM movies WHERE name"
|
|
|
|
if nocase {
|
|
|
|
query += " COLLATE NOCASE"
|
|
|
|
}
|
|
|
|
query += " IN " + getInBinding(len(names))
|
|
|
|
var args []interface{}
|
|
|
|
for _, name := range names {
|
|
|
|
args = append(args, name)
|
|
|
|
}
|
|
|
|
return qb.queryMovies(query, args)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (qb *movieQueryBuilder) Count() (int, error) {
|
|
|
|
return qb.runCountQuery(qb.buildCountQuery("SELECT movies.id FROM movies"), nil)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (qb *movieQueryBuilder) All() ([]*models.Movie, error) {
|
|
|
|
return qb.queryMovies(selectAll("movies")+qb.getMovieSort(nil), nil)
|
|
|
|
}
|
|
|
|
|
2021-06-03 10:52:19 +00:00
|
|
|
func (qb *movieQueryBuilder) makeFilter(movieFilter *models.MovieFilterType) *filterBuilder {
|
|
|
|
query := &filterBuilder{}
|
|
|
|
|
2021-06-22 23:10:20 +00:00
|
|
|
query.handleCriterion(stringCriterionHandler(movieFilter.Name, "movies.name"))
|
|
|
|
query.handleCriterion(stringCriterionHandler(movieFilter.Director, "movies.director"))
|
|
|
|
query.handleCriterion(stringCriterionHandler(movieFilter.Synopsis, "movies.synopsis"))
|
|
|
|
query.handleCriterion(intCriterionHandler(movieFilter.Rating, "movies.rating"))
|
|
|
|
query.handleCriterion(durationCriterionHandler(movieFilter.Duration, "movies.duration"))
|
2021-06-21 05:48:28 +00:00
|
|
|
query.handleCriterion(movieIsMissingCriterionHandler(qb, movieFilter.IsMissing))
|
|
|
|
query.handleCriterion(stringCriterionHandler(movieFilter.URL, "movies.url"))
|
|
|
|
query.handleCriterion(movieStudioCriterionHandler(qb, movieFilter.Studios))
|
2021-09-07 02:16:33 +00:00
|
|
|
query.handleCriterion(moviePerformersCriterionHandler(qb, movieFilter.Performers))
|
2021-06-03 10:52:19 +00:00
|
|
|
|
|
|
|
return query
|
|
|
|
}
|
|
|
|
|
2021-01-18 01:23:20 +00:00
|
|
|
func (qb *movieQueryBuilder) Query(movieFilter *models.MovieFilterType, findFilter *models.FindFilterType) ([]*models.Movie, int, error) {
|
|
|
|
if findFilter == nil {
|
|
|
|
findFilter = &models.FindFilterType{}
|
|
|
|
}
|
|
|
|
if movieFilter == nil {
|
|
|
|
movieFilter = &models.MovieFilterType{}
|
|
|
|
}
|
|
|
|
|
2021-04-09 05:05:11 +00:00
|
|
|
query := qb.newQuery()
|
2021-10-25 00:40:13 +00:00
|
|
|
distinctIDs(&query, movieTable)
|
2021-01-18 01:23:20 +00:00
|
|
|
|
|
|
|
if q := findFilter.Q; q != nil && *q != "" {
|
|
|
|
searchColumns := []string{"movies.name"}
|
|
|
|
clause, thisArgs := getSearchBinding(searchColumns, *q, false)
|
2021-04-09 05:05:11 +00:00
|
|
|
query.addWhere(clause)
|
|
|
|
query.addArg(thisArgs...)
|
2021-01-18 01:23:20 +00:00
|
|
|
}
|
|
|
|
|
2021-06-03 10:52:19 +00:00
|
|
|
filter := qb.makeFilter(movieFilter)
|
2021-01-18 01:23:20 +00:00
|
|
|
|
2021-06-03 10:52:19 +00:00
|
|
|
query.addFilter(filter)
|
2021-04-09 05:05:11 +00:00
|
|
|
|
|
|
|
query.sortAndPagination = qb.getMovieSort(findFilter) + getPagination(findFilter)
|
|
|
|
idsResult, countResult, err := query.executeFind()
|
2021-01-18 01:23:20 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, 0, err
|
|
|
|
}
|
|
|
|
|
|
|
|
var movies []*models.Movie
|
|
|
|
for _, id := range idsResult {
|
|
|
|
movie, err := qb.Find(id)
|
|
|
|
if err != nil {
|
|
|
|
return nil, 0, err
|
|
|
|
}
|
|
|
|
|
|
|
|
movies = append(movies, movie)
|
|
|
|
}
|
|
|
|
|
|
|
|
return movies, countResult, nil
|
|
|
|
}
|
|
|
|
|
2021-06-03 10:52:19 +00:00
|
|
|
func movieIsMissingCriterionHandler(qb *movieQueryBuilder, isMissing *string) criterionHandlerFunc {
|
|
|
|
return func(f *filterBuilder) {
|
|
|
|
if isMissing != nil && *isMissing != "" {
|
|
|
|
switch *isMissing {
|
|
|
|
case "front_image":
|
|
|
|
f.addJoin("movies_images", "", "movies_images.movie_id = movies.id")
|
|
|
|
f.addWhere("movies_images.front_image IS NULL")
|
|
|
|
case "back_image":
|
|
|
|
f.addJoin("movies_images", "", "movies_images.movie_id = movies.id")
|
|
|
|
f.addWhere("movies_images.back_image IS NULL")
|
|
|
|
case "scenes":
|
|
|
|
f.addJoin("movies_scenes", "", "movies_scenes.movie_id = movies.id")
|
|
|
|
f.addWhere("movies_scenes.scene_id IS NULL")
|
|
|
|
default:
|
|
|
|
f.addWhere("(movies." + *isMissing + " IS NULL OR TRIM(movies." + *isMissing + ") = '')")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func movieStudioCriterionHandler(qb *movieQueryBuilder, studios *models.HierarchicalMultiCriterionInput) criterionHandlerFunc {
|
|
|
|
h := hierarchicalMultiCriterionHandlerBuilder{
|
Tag hierarchy (#1519)
* Add migration script for tag relations table
* Expand hierarchical filter features
Expand the features of the hierarchical multi input filter with support
for using a relations table, which only has parent_id and child_id
columns, and support adding an additional intermediate table to join on,
for example for scenes and tags which are linked by the scenes_tags
table as well.
* Add hierarchical filtering for tags
* Add hierarchical tags support to scene markers
Refactor filtering of scene markers to filterBuilder and in the process
add support for hierarchical tags as well.
* List parent and child tags on tag details page
* Support setting parent and child tags
Add support for setting parent and child tags during tag creation and
tag updates.
* Validate no loops are created in tags hierarchy
* Update tag merging to support tag hierarcy
* Add unit tests for tags.EnsureUniqueHierarchy
* Fix applying recursive to with clause
The SQL `RECURSIVE` of a `WITH` clause only needs to be applied once,
imediately after the `WITH`. So this fixes the query building to do just
that, automatically applying the `RECURSIVE` keyword when any added with
clause is added as recursive.
* Rename hierarchical root id column
* Rewrite hierarchical filtering for performance
Completely rewrite the hierarchical filtering to optimize for
performance. Doing the recursive query in combination with a complex
query seems to break SQLite optimizing some things which means that the
recursive part might be 2,5 second slower than adding a static
`VALUES()` list. This is mostly noticable in case of the tag hierarchy
where setting an exclusion with any depth (or depth: all) being applied
has this performance impact of 2,5 second. "Include" also suffered this
issue, but some rewritten query by joining in the *_tags table in one
pass and applying a `WHERE x IS NOT NULL` filter did seem to optimize
that case. But that optimization isn't applied to the `IS NULL` filter
of "exclude". Running a simple query beforehand to get all (recursive)
items and then applying them to the query doesn't have this performance
penalty.
* Remove UI references to child studios and tags
* Add parents to tag export
* Support importing of parent relationship for tags
* Assign stable ids to parent / child badges
* Silence Apollo warning on parents/children fields on tags
Silence warning triggered by Apollo GraphQL by explicitly instructing it
to use the incoming parents/children values. By default it already does
this, but it triggers a warning as it might be unintended that it uses
the incoming values (instead of for example merging both arrays).
Setting merge to false still applies the same behaviour (use only
incoming values) but silences the warning as it's explicitly configured
to work like this.
* Rework detecting unique tag hierarchy
Completely rework the unique tag hierarchy to detect invalid hierarchies
for which a tag is "added in the middle". So when there are tags A <- B
and A <- C, you could previously edit tag B and add tag C as a sub tag
without it being noticed as parent A being applied twice (to tag C).
While afterwards saving tag C would fail as tag A was applied as parent
twice. The updated code correctly detects this scenario as well.
Furthermore the error messaging has been reworked a bit and the message
now mentions both the direct parent / sub tag as well as the tag which
would results in the error. So in aboves example it would now show the
message that tag C can't be applied because tag A already is a parent.
* Update relations on cached tags when needed
Update the relations on cached tags when a tag is created / updated /
deleted so these always reflect the correct state. Otherwise (re)opening
a tag might still show the old relations untill the page is fully
reloaded or the list is navigated. But this obviously is strange when
you for example have tag A, create or update tag B to have a relation to
tag A, and from tags B page click through to tag A and it doesn't show
that it is linked to tag B.
2021-09-09 04:58:43 +00:00
|
|
|
tx: qb.tx,
|
|
|
|
|
2021-06-03 10:52:19 +00:00
|
|
|
primaryTable: movieTable,
|
|
|
|
foreignTable: studioTable,
|
|
|
|
foreignFK: studioIDColumn,
|
|
|
|
derivedTable: "studio",
|
|
|
|
parentFK: "parent_id",
|
|
|
|
}
|
|
|
|
|
|
|
|
return h.handler(studios)
|
|
|
|
}
|
|
|
|
|
2021-09-07 02:16:33 +00:00
|
|
|
func moviePerformersCriterionHandler(qb *movieQueryBuilder, performers *models.MultiCriterionInput) criterionHandlerFunc {
|
|
|
|
return func(f *filterBuilder) {
|
2021-11-06 22:34:33 +00:00
|
|
|
if performers != nil {
|
|
|
|
if performers.Modifier == models.CriterionModifierIsNull || performers.Modifier == models.CriterionModifierNotNull {
|
|
|
|
var notClause string
|
|
|
|
if performers.Modifier == models.CriterionModifierNotNull {
|
|
|
|
notClause = "NOT"
|
|
|
|
}
|
|
|
|
|
|
|
|
f.addJoin("movies_scenes", "", "movies.id = movies_scenes.movie_id")
|
|
|
|
f.addJoin("performers_scenes", "", "movies_scenes.scene_id = performers_scenes.scene_id")
|
|
|
|
|
|
|
|
f.addWhere(fmt.Sprintf("performers_scenes.performer_id IS %s NULL", notClause))
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(performers.Value) == 0 {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
2021-09-07 02:16:33 +00:00
|
|
|
var args []interface{}
|
|
|
|
for _, arg := range performers.Value {
|
|
|
|
args = append(args, arg)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Hack, can't apply args to join, nor inner join on a left join, so use CTE instead
|
|
|
|
f.addWith(`movies_performers AS (
|
|
|
|
SELECT movies_scenes.movie_id, performers_scenes.performer_id
|
|
|
|
FROM movies_scenes
|
|
|
|
INNER JOIN performers_scenes ON movies_scenes.scene_id = performers_scenes.scene_id
|
|
|
|
WHERE performers_scenes.performer_id IN`+getInBinding(len(performers.Value))+`
|
|
|
|
)`, args...)
|
|
|
|
f.addJoin("movies_performers", "", "movies.id = movies_performers.movie_id")
|
|
|
|
|
Enable gocritic (#1848)
* Don't capitalize local variables
ValidCodecs -> validCodecs
* Capitalize deprecation markers
A deprecated marker should be capitalized.
* Use re.MustCompile for static regexes
If the regex fails to compile, it's a programmer error, and should be
treated as such. The regex is entirely static.
* Simplify else-if constructions
Rewrite
else { if cond {}}
to
else if cond {}
* Use a switch statement to analyze formats
Break an if-else chain. While here, simplify code flow.
Also introduce a proper static error for unsupported image formats,
paving the way for being able to check against the error.
* Rewrite ifElse chains into switch statements
The "Effective Go" https://golang.org/doc/effective_go#switch document
mentions it is more idiomatic to write if-else chains as switches when
it is possible.
Find all the plain rewrite occurrences in the code base and rewrite.
In some cases, the if-else chains are replaced by a switch scrutinizer.
That is, the code sequence
if x == 1 {
..
} else if x == 2 {
..
} else if x == 3 {
...
}
can be rewritten into
switch x {
case 1:
..
case 2:
..
case 3:
..
}
which is clearer for the compiler: it can decide if the switch is
better served by a jump-table then a branch-chain.
* Rewrite switches, introduce static errors
Introduce two new static errors:
* `ErrNotImplmented`
* `ErrNotSupported`
And use these rather than forming new generative errors whenever the
code is called. Code can now test on the errors (since they are static
and the pointers to them wont change).
Also rewrite ifElse chains into switches in this part of the code base.
* Introduce a StashBoxError in configuration
Since all stashbox errors are the same, treat them as such in the code
base. While here, rewrite an ifElse chain.
In the future, it might be beneifical to refactor configuration errors
into one error which can handle missing fields, which context the error
occurs in and so on. But for now, try to get an overview of the error
categories by hoisting them into static errors.
* Get rid of an else-block in transaction handling
If we succesfully `recover()`, we then always `panic()`. This means the
rest of the code is not reachable, so we can avoid having an else-block
here.
It also solves an ifElse-chain style check in the code base.
* Use strings.ReplaceAll
Rewrite
strings.Replace(s, o, n, -1)
into
strings.ReplaceAll(s, o, n)
To make it consistent and clear that we are doing an all-replace in the
string rather than replacing parts of it. It's more of a nitpick since
there are no implementation differences: the stdlib implementation is
just to supply -1.
* Rewrite via gocritic's assignOp
Statements of the form
x = x + e
is rewritten into
x += e
where applicable.
* Formatting
* Review comments handled
Stash-box is a proper noun.
Rewrite a switch into an if-chain which returns on the first error
encountered.
* Use context.TODO() over context.Background()
Patch in the same vein as everything else: use the TODO() marker so we
can search for it later and link it into the context tree/tentacle once
it reaches down to this level in the code base.
* Tell the linter to ignore a section in manager_tasks.go
The section is less readable, so mark it with a nolint for now. Because
the rewrite enables a ifElseChain, also mark that as nolint for now.
* Use strings.ReplaceAll over strings.Replace
* Apply an ifElse rewrite
else { if .. { .. } } rewrite into else if { .. }
* Use switch-statements over ifElseChains
Rewrite chains of if-else into switch statements. Where applicable,
add an early nil-guard to simplify case analysis. Also, in
ScanTask's Start(..), invert the logic to outdent the whole block, and
help the reader: if it's not a scene, the function flow is now far more
local to the top of the function, and it's clear that the rest of the
function has to do with scene management.
* Enable gocritic on the code base.
Disable appendAssign for now since we aren't passing that check yet.
* Document the nolint additions
* Document StashBoxBatchPerformerTagInput
2021-10-18 03:12:40 +00:00
|
|
|
switch performers.Modifier {
|
|
|
|
case models.CriterionModifierIncludes:
|
2021-09-07 02:16:33 +00:00
|
|
|
f.addWhere("movies_performers.performer_id IS NOT NULL")
|
Enable gocritic (#1848)
* Don't capitalize local variables
ValidCodecs -> validCodecs
* Capitalize deprecation markers
A deprecated marker should be capitalized.
* Use re.MustCompile for static regexes
If the regex fails to compile, it's a programmer error, and should be
treated as such. The regex is entirely static.
* Simplify else-if constructions
Rewrite
else { if cond {}}
to
else if cond {}
* Use a switch statement to analyze formats
Break an if-else chain. While here, simplify code flow.
Also introduce a proper static error for unsupported image formats,
paving the way for being able to check against the error.
* Rewrite ifElse chains into switch statements
The "Effective Go" https://golang.org/doc/effective_go#switch document
mentions it is more idiomatic to write if-else chains as switches when
it is possible.
Find all the plain rewrite occurrences in the code base and rewrite.
In some cases, the if-else chains are replaced by a switch scrutinizer.
That is, the code sequence
if x == 1 {
..
} else if x == 2 {
..
} else if x == 3 {
...
}
can be rewritten into
switch x {
case 1:
..
case 2:
..
case 3:
..
}
which is clearer for the compiler: it can decide if the switch is
better served by a jump-table then a branch-chain.
* Rewrite switches, introduce static errors
Introduce two new static errors:
* `ErrNotImplmented`
* `ErrNotSupported`
And use these rather than forming new generative errors whenever the
code is called. Code can now test on the errors (since they are static
and the pointers to them wont change).
Also rewrite ifElse chains into switches in this part of the code base.
* Introduce a StashBoxError in configuration
Since all stashbox errors are the same, treat them as such in the code
base. While here, rewrite an ifElse chain.
In the future, it might be beneifical to refactor configuration errors
into one error which can handle missing fields, which context the error
occurs in and so on. But for now, try to get an overview of the error
categories by hoisting them into static errors.
* Get rid of an else-block in transaction handling
If we succesfully `recover()`, we then always `panic()`. This means the
rest of the code is not reachable, so we can avoid having an else-block
here.
It also solves an ifElse-chain style check in the code base.
* Use strings.ReplaceAll
Rewrite
strings.Replace(s, o, n, -1)
into
strings.ReplaceAll(s, o, n)
To make it consistent and clear that we are doing an all-replace in the
string rather than replacing parts of it. It's more of a nitpick since
there are no implementation differences: the stdlib implementation is
just to supply -1.
* Rewrite via gocritic's assignOp
Statements of the form
x = x + e
is rewritten into
x += e
where applicable.
* Formatting
* Review comments handled
Stash-box is a proper noun.
Rewrite a switch into an if-chain which returns on the first error
encountered.
* Use context.TODO() over context.Background()
Patch in the same vein as everything else: use the TODO() marker so we
can search for it later and link it into the context tree/tentacle once
it reaches down to this level in the code base.
* Tell the linter to ignore a section in manager_tasks.go
The section is less readable, so mark it with a nolint for now. Because
the rewrite enables a ifElseChain, also mark that as nolint for now.
* Use strings.ReplaceAll over strings.Replace
* Apply an ifElse rewrite
else { if .. { .. } } rewrite into else if { .. }
* Use switch-statements over ifElseChains
Rewrite chains of if-else into switch statements. Where applicable,
add an early nil-guard to simplify case analysis. Also, in
ScanTask's Start(..), invert the logic to outdent the whole block, and
help the reader: if it's not a scene, the function flow is now far more
local to the top of the function, and it's clear that the rest of the
function has to do with scene management.
* Enable gocritic on the code base.
Disable appendAssign for now since we aren't passing that check yet.
* Document the nolint additions
* Document StashBoxBatchPerformerTagInput
2021-10-18 03:12:40 +00:00
|
|
|
case models.CriterionModifierIncludesAll:
|
2021-09-07 02:16:33 +00:00
|
|
|
f.addWhere("movies_performers.performer_id IS NOT NULL")
|
|
|
|
f.addHaving("COUNT(DISTINCT movies_performers.performer_id) = ?", len(performers.Value))
|
Enable gocritic (#1848)
* Don't capitalize local variables
ValidCodecs -> validCodecs
* Capitalize deprecation markers
A deprecated marker should be capitalized.
* Use re.MustCompile for static regexes
If the regex fails to compile, it's a programmer error, and should be
treated as such. The regex is entirely static.
* Simplify else-if constructions
Rewrite
else { if cond {}}
to
else if cond {}
* Use a switch statement to analyze formats
Break an if-else chain. While here, simplify code flow.
Also introduce a proper static error for unsupported image formats,
paving the way for being able to check against the error.
* Rewrite ifElse chains into switch statements
The "Effective Go" https://golang.org/doc/effective_go#switch document
mentions it is more idiomatic to write if-else chains as switches when
it is possible.
Find all the plain rewrite occurrences in the code base and rewrite.
In some cases, the if-else chains are replaced by a switch scrutinizer.
That is, the code sequence
if x == 1 {
..
} else if x == 2 {
..
} else if x == 3 {
...
}
can be rewritten into
switch x {
case 1:
..
case 2:
..
case 3:
..
}
which is clearer for the compiler: it can decide if the switch is
better served by a jump-table then a branch-chain.
* Rewrite switches, introduce static errors
Introduce two new static errors:
* `ErrNotImplmented`
* `ErrNotSupported`
And use these rather than forming new generative errors whenever the
code is called. Code can now test on the errors (since they are static
and the pointers to them wont change).
Also rewrite ifElse chains into switches in this part of the code base.
* Introduce a StashBoxError in configuration
Since all stashbox errors are the same, treat them as such in the code
base. While here, rewrite an ifElse chain.
In the future, it might be beneifical to refactor configuration errors
into one error which can handle missing fields, which context the error
occurs in and so on. But for now, try to get an overview of the error
categories by hoisting them into static errors.
* Get rid of an else-block in transaction handling
If we succesfully `recover()`, we then always `panic()`. This means the
rest of the code is not reachable, so we can avoid having an else-block
here.
It also solves an ifElse-chain style check in the code base.
* Use strings.ReplaceAll
Rewrite
strings.Replace(s, o, n, -1)
into
strings.ReplaceAll(s, o, n)
To make it consistent and clear that we are doing an all-replace in the
string rather than replacing parts of it. It's more of a nitpick since
there are no implementation differences: the stdlib implementation is
just to supply -1.
* Rewrite via gocritic's assignOp
Statements of the form
x = x + e
is rewritten into
x += e
where applicable.
* Formatting
* Review comments handled
Stash-box is a proper noun.
Rewrite a switch into an if-chain which returns on the first error
encountered.
* Use context.TODO() over context.Background()
Patch in the same vein as everything else: use the TODO() marker so we
can search for it later and link it into the context tree/tentacle once
it reaches down to this level in the code base.
* Tell the linter to ignore a section in manager_tasks.go
The section is less readable, so mark it with a nolint for now. Because
the rewrite enables a ifElseChain, also mark that as nolint for now.
* Use strings.ReplaceAll over strings.Replace
* Apply an ifElse rewrite
else { if .. { .. } } rewrite into else if { .. }
* Use switch-statements over ifElseChains
Rewrite chains of if-else into switch statements. Where applicable,
add an early nil-guard to simplify case analysis. Also, in
ScanTask's Start(..), invert the logic to outdent the whole block, and
help the reader: if it's not a scene, the function flow is now far more
local to the top of the function, and it's clear that the rest of the
function has to do with scene management.
* Enable gocritic on the code base.
Disable appendAssign for now since we aren't passing that check yet.
* Document the nolint additions
* Document StashBoxBatchPerformerTagInput
2021-10-18 03:12:40 +00:00
|
|
|
case models.CriterionModifierExcludes:
|
2021-09-07 02:16:33 +00:00
|
|
|
f.addWhere("movies_performers.performer_id IS NULL")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-01-18 01:23:20 +00:00
|
|
|
func (qb *movieQueryBuilder) getMovieSort(findFilter *models.FindFilterType) string {
|
|
|
|
var sort string
|
|
|
|
var direction string
|
|
|
|
if findFilter == nil {
|
|
|
|
sort = "name"
|
|
|
|
direction = "ASC"
|
|
|
|
} else {
|
|
|
|
sort = findFilter.GetSort("name")
|
|
|
|
direction = findFilter.GetDirection()
|
|
|
|
}
|
|
|
|
|
2021-06-03 23:21:17 +00:00
|
|
|
switch sort {
|
|
|
|
case "name": // #943 - override name sorting to use natural sort
|
2021-01-18 01:23:20 +00:00
|
|
|
return " ORDER BY " + getColumn("movies", sort) + " COLLATE NATURAL_CS " + direction
|
2021-06-03 23:21:17 +00:00
|
|
|
case "scenes_count": // generic getSort won't work for this
|
|
|
|
return getCountSort(movieTable, moviesScenesTable, movieIDColumn, direction)
|
|
|
|
default:
|
|
|
|
return getSort(sort, direction, "movies")
|
2021-01-18 01:23:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (qb *movieQueryBuilder) queryMovie(query string, args []interface{}) (*models.Movie, error) {
|
|
|
|
results, err := qb.queryMovies(query, args)
|
|
|
|
if err != nil || len(results) < 1 {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return results[0], nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (qb *movieQueryBuilder) queryMovies(query string, args []interface{}) ([]*models.Movie, error) {
|
|
|
|
var ret models.Movies
|
|
|
|
if err := qb.query(query, args, &ret); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return []*models.Movie(ret), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (qb *movieQueryBuilder) UpdateImages(movieID int, frontImage []byte, backImage []byte) error {
|
|
|
|
// Delete the existing cover and then create new
|
|
|
|
if err := qb.DestroyImages(movieID); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
_, err := qb.tx.Exec(
|
|
|
|
`INSERT INTO movies_images (movie_id, front_image, back_image) VALUES (?, ?, ?)`,
|
|
|
|
movieID,
|
|
|
|
frontImage,
|
|
|
|
backImage,
|
|
|
|
)
|
|
|
|
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
func (qb *movieQueryBuilder) DestroyImages(movieID int) error {
|
|
|
|
// Delete the existing joins
|
|
|
|
_, err := qb.tx.Exec("DELETE FROM movies_images WHERE movie_id = ?", movieID)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
func (qb *movieQueryBuilder) GetFrontImage(movieID int) ([]byte, error) {
|
|
|
|
query := `SELECT front_image from movies_images WHERE movie_id = ?`
|
|
|
|
return getImage(qb.tx, query, movieID)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (qb *movieQueryBuilder) GetBackImage(movieID int) ([]byte, error) {
|
|
|
|
query := `SELECT back_image from movies_images WHERE movie_id = ?`
|
|
|
|
return getImage(qb.tx, query, movieID)
|
|
|
|
}
|
2021-09-27 01:31:49 +00:00
|
|
|
|
|
|
|
func (qb *movieQueryBuilder) FindByPerformerID(performerID int) ([]*models.Movie, error) {
|
|
|
|
query := `SELECT DISTINCT movies.*
|
|
|
|
FROM movies
|
|
|
|
INNER JOIN movies_scenes ON movies.id = movies_scenes.movie_id
|
|
|
|
INNER JOIN performers_scenes ON performers_scenes.scene_id = movies_scenes.scene_id
|
|
|
|
WHERE performers_scenes.performer_id = ?
|
|
|
|
`
|
|
|
|
args := []interface{}{performerID}
|
|
|
|
return qb.queryMovies(query, args)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (qb *movieQueryBuilder) CountByPerformerID(performerID int) (int, error) {
|
|
|
|
query := `SELECT COUNT(DISTINCT movies_scenes.movie_id) AS count
|
|
|
|
FROM movies_scenes
|
|
|
|
INNER JOIN performers_scenes ON performers_scenes.scene_id = movies_scenes.scene_id
|
|
|
|
WHERE performers_scenes.performer_id = ?
|
|
|
|
`
|
|
|
|
args := []interface{}{performerID}
|
|
|
|
return qb.runCountQuery(query, args)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (qb *movieQueryBuilder) FindByStudioID(studioID int) ([]*models.Movie, error) {
|
|
|
|
query := `SELECT movies.*
|
|
|
|
FROM movies
|
|
|
|
WHERE movies.studio_id = ?
|
|
|
|
`
|
|
|
|
args := []interface{}{studioID}
|
|
|
|
return qb.queryMovies(query, args)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (qb *movieQueryBuilder) CountByStudioID(studioID int) (int, error) {
|
|
|
|
query := `SELECT COUNT(1) AS count
|
|
|
|
FROM movies
|
|
|
|
WHERE movies.studio_id = ?
|
|
|
|
`
|
|
|
|
args := []interface{}{studioID}
|
|
|
|
return qb.runCountQuery(query, args)
|
|
|
|
}
|