2020-09-15 07:28:53 +00:00
|
|
|
package scene
|
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
|
|
|
"math"
|
|
|
|
"strconv"
|
|
|
|
|
|
|
|
"github.com/stashapp/stash/pkg/manager/jsonschema"
|
|
|
|
"github.com/stashapp/stash/pkg/models"
|
|
|
|
"github.com/stashapp/stash/pkg/utils"
|
|
|
|
)
|
|
|
|
|
|
|
|
// ToBasicJSON converts a scene object into its JSON object equivalent. It
|
|
|
|
// does not convert the relationships to other objects, with the exception
|
|
|
|
// of cover image.
|
|
|
|
func ToBasicJSON(reader models.SceneReader, scene *models.Scene) (*jsonschema.Scene, error) {
|
|
|
|
newSceneJSON := jsonschema.Scene{
|
|
|
|
CreatedAt: models.JSONTime{Time: scene.CreatedAt.Timestamp},
|
|
|
|
UpdatedAt: models.JSONTime{Time: scene.UpdatedAt.Timestamp},
|
|
|
|
}
|
|
|
|
|
|
|
|
if scene.Checksum.Valid {
|
|
|
|
newSceneJSON.Checksum = scene.Checksum.String
|
|
|
|
}
|
|
|
|
|
|
|
|
if scene.OSHash.Valid {
|
|
|
|
newSceneJSON.OSHash = scene.OSHash.String
|
|
|
|
}
|
|
|
|
|
2021-04-11 23:04:40 +00:00
|
|
|
if scene.Phash.Valid {
|
|
|
|
newSceneJSON.Phash = utils.PhashToString(scene.Phash.Int64)
|
|
|
|
}
|
|
|
|
|
2020-09-15 07:28:53 +00:00
|
|
|
if scene.Title.Valid {
|
|
|
|
newSceneJSON.Title = scene.Title.String
|
|
|
|
}
|
|
|
|
|
|
|
|
if scene.URL.Valid {
|
|
|
|
newSceneJSON.URL = scene.URL.String
|
|
|
|
}
|
|
|
|
|
|
|
|
if scene.Date.Valid {
|
|
|
|
newSceneJSON.Date = utils.GetYMDFromDatabaseDate(scene.Date.String)
|
|
|
|
}
|
|
|
|
|
|
|
|
if scene.Rating.Valid {
|
|
|
|
newSceneJSON.Rating = int(scene.Rating.Int64)
|
|
|
|
}
|
|
|
|
|
2020-12-17 21:06:49 +00:00
|
|
|
newSceneJSON.Organized = scene.Organized
|
2020-09-15 07:28:53 +00:00
|
|
|
newSceneJSON.OCounter = scene.OCounter
|
|
|
|
|
|
|
|
if scene.Details.Valid {
|
|
|
|
newSceneJSON.Details = scene.Details.String
|
|
|
|
}
|
|
|
|
|
|
|
|
newSceneJSON.File = getSceneFileJSON(scene)
|
|
|
|
|
2021-01-18 01:23:20 +00:00
|
|
|
cover, err := reader.GetCover(scene.ID)
|
2020-09-15 07:28:53 +00:00
|
|
|
if 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
|
|
|
return nil, fmt.Errorf("error getting scene cover: %v", err)
|
2020-09-15 07:28:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if len(cover) > 0 {
|
|
|
|
newSceneJSON.Cover = utils.GetBase64StringFromData(cover)
|
|
|
|
}
|
|
|
|
|
|
|
|
return &newSceneJSON, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func getSceneFileJSON(scene *models.Scene) *jsonschema.SceneFile {
|
|
|
|
ret := &jsonschema.SceneFile{}
|
|
|
|
|
2020-11-04 23:26:51 +00:00
|
|
|
if scene.FileModTime.Valid {
|
|
|
|
ret.ModTime = models.JSONTime{Time: scene.FileModTime.Timestamp}
|
|
|
|
}
|
|
|
|
|
2020-09-15 07:28:53 +00:00
|
|
|
if scene.Size.Valid {
|
|
|
|
ret.Size = scene.Size.String
|
|
|
|
}
|
|
|
|
|
|
|
|
if scene.Duration.Valid {
|
|
|
|
ret.Duration = getDecimalString(scene.Duration.Float64)
|
|
|
|
}
|
|
|
|
|
|
|
|
if scene.VideoCodec.Valid {
|
|
|
|
ret.VideoCodec = scene.VideoCodec.String
|
|
|
|
}
|
|
|
|
|
|
|
|
if scene.AudioCodec.Valid {
|
|
|
|
ret.AudioCodec = scene.AudioCodec.String
|
|
|
|
}
|
|
|
|
|
|
|
|
if scene.Format.Valid {
|
|
|
|
ret.Format = scene.Format.String
|
|
|
|
}
|
|
|
|
|
|
|
|
if scene.Width.Valid {
|
|
|
|
ret.Width = int(scene.Width.Int64)
|
|
|
|
}
|
|
|
|
|
|
|
|
if scene.Height.Valid {
|
|
|
|
ret.Height = int(scene.Height.Int64)
|
|
|
|
}
|
|
|
|
|
|
|
|
if scene.Framerate.Valid {
|
|
|
|
ret.Framerate = getDecimalString(scene.Framerate.Float64)
|
|
|
|
}
|
|
|
|
|
|
|
|
if scene.Bitrate.Valid {
|
|
|
|
ret.Bitrate = int(scene.Bitrate.Int64)
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetStudioName returns the name of the provided scene's studio. It returns an
|
|
|
|
// empty string if there is no studio assigned to the scene.
|
|
|
|
func GetStudioName(reader models.StudioReader, scene *models.Scene) (string, error) {
|
|
|
|
if scene.StudioID.Valid {
|
|
|
|
studio, err := reader.Find(int(scene.StudioID.Int64))
|
|
|
|
if err != nil {
|
|
|
|
return "", err
|
|
|
|
}
|
|
|
|
|
|
|
|
if studio != nil {
|
|
|
|
return studio.Name.String, nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return "", nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetTagNames returns a slice of tag names corresponding to the provided
|
|
|
|
// scene's tags.
|
|
|
|
func GetTagNames(reader models.TagReader, scene *models.Scene) ([]string, error) {
|
|
|
|
tags, err := reader.FindBySceneID(scene.ID)
|
|
|
|
if 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
|
|
|
return nil, fmt.Errorf("error getting scene tags: %v", err)
|
2020-09-15 07:28:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return getTagNames(tags), nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func getTagNames(tags []*models.Tag) []string {
|
|
|
|
var results []string
|
|
|
|
for _, tag := range tags {
|
|
|
|
if tag.Name != "" {
|
|
|
|
results = append(results, tag.Name)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return results
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetDependentTagIDs returns a slice of unique tag IDs that this scene references.
|
2021-01-18 01:23:20 +00:00
|
|
|
func GetDependentTagIDs(tags models.TagReader, markerReader models.SceneMarkerReader, scene *models.Scene) ([]int, error) {
|
2020-09-15 07:28:53 +00:00
|
|
|
var ret []int
|
|
|
|
|
|
|
|
t, err := tags.FindBySceneID(scene.ID)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, tt := range t {
|
|
|
|
ret = utils.IntAppendUnique(ret, tt.ID)
|
|
|
|
}
|
|
|
|
|
|
|
|
sm, err := markerReader.FindBySceneID(scene.ID)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, smm := range sm {
|
|
|
|
ret = utils.IntAppendUnique(ret, smm.PrimaryTagID)
|
|
|
|
smmt, err := tags.FindBySceneMarkerID(smm.ID)
|
|
|
|
if 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
|
|
|
return nil, fmt.Errorf("invalid tags for scene marker: %v", err)
|
2020-09-15 07:28:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
for _, smmtt := range smmt {
|
|
|
|
ret = utils.IntAppendUnique(ret, smmtt.ID)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetSceneMoviesJSON returns a slice of SceneMovie JSON representation objects
|
|
|
|
// corresponding to the provided scene's scene movie relationships.
|
2021-01-18 01:23:20 +00:00
|
|
|
func GetSceneMoviesJSON(movieReader models.MovieReader, sceneReader models.SceneReader, scene *models.Scene) ([]jsonschema.SceneMovie, error) {
|
|
|
|
sceneMovies, err := sceneReader.GetMovies(scene.ID)
|
2020-09-15 07:28:53 +00:00
|
|
|
if 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
|
|
|
return nil, fmt.Errorf("error getting scene movies: %v", err)
|
2020-09-15 07:28:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
var results []jsonschema.SceneMovie
|
|
|
|
for _, sceneMovie := range sceneMovies {
|
|
|
|
movie, err := movieReader.Find(sceneMovie.MovieID)
|
|
|
|
if 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
|
|
|
return nil, fmt.Errorf("error getting movie: %v", err)
|
2020-09-15 07:28:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if movie.Name.Valid {
|
|
|
|
sceneMovieJSON := jsonschema.SceneMovie{
|
|
|
|
MovieName: movie.Name.String,
|
|
|
|
SceneIndex: int(sceneMovie.SceneIndex.Int64),
|
|
|
|
}
|
|
|
|
results = append(results, sceneMovieJSON)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return results, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetDependentMovieIDs returns a slice of movie IDs that this scene references.
|
2021-01-18 01:23:20 +00:00
|
|
|
func GetDependentMovieIDs(sceneReader models.SceneReader, scene *models.Scene) ([]int, error) {
|
2020-09-15 07:28:53 +00:00
|
|
|
var ret []int
|
|
|
|
|
2021-01-18 01:23:20 +00:00
|
|
|
m, err := sceneReader.GetMovies(scene.ID)
|
2020-09-15 07:28:53 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, mm := range m {
|
|
|
|
ret = append(ret, mm.MovieID)
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetSceneMarkersJSON returns a slice of SceneMarker JSON representation
|
|
|
|
// objects corresponding to the provided scene's markers.
|
|
|
|
func GetSceneMarkersJSON(markerReader models.SceneMarkerReader, tagReader models.TagReader, scene *models.Scene) ([]jsonschema.SceneMarker, error) {
|
|
|
|
sceneMarkers, err := markerReader.FindBySceneID(scene.ID)
|
|
|
|
if 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
|
|
|
return nil, fmt.Errorf("error getting scene markers: %v", err)
|
2020-09-15 07:28:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
var results []jsonschema.SceneMarker
|
|
|
|
|
|
|
|
for _, sceneMarker := range sceneMarkers {
|
|
|
|
primaryTag, err := tagReader.Find(sceneMarker.PrimaryTagID)
|
|
|
|
if 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
|
|
|
return nil, fmt.Errorf("invalid primary tag for scene marker: %v", err)
|
2020-09-15 07:28:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
sceneMarkerTags, err := tagReader.FindBySceneMarkerID(sceneMarker.ID)
|
|
|
|
if 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
|
|
|
return nil, fmt.Errorf("invalid tags for scene marker: %v", err)
|
2020-09-15 07:28:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
sceneMarkerJSON := jsonschema.SceneMarker{
|
|
|
|
Title: sceneMarker.Title,
|
|
|
|
Seconds: getDecimalString(sceneMarker.Seconds),
|
|
|
|
PrimaryTag: primaryTag.Name,
|
|
|
|
Tags: getTagNames(sceneMarkerTags),
|
|
|
|
CreatedAt: models.JSONTime{Time: sceneMarker.CreatedAt.Timestamp},
|
|
|
|
UpdatedAt: models.JSONTime{Time: sceneMarker.UpdatedAt.Timestamp},
|
|
|
|
}
|
|
|
|
|
|
|
|
results = append(results, sceneMarkerJSON)
|
|
|
|
}
|
|
|
|
|
|
|
|
return results, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func getDecimalString(num float64) string {
|
|
|
|
if num == 0 {
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
|
|
|
|
precision := getPrecision(num)
|
|
|
|
if precision == 0 {
|
|
|
|
precision = 1
|
|
|
|
}
|
|
|
|
return fmt.Sprintf("%."+strconv.Itoa(precision)+"f", num)
|
|
|
|
}
|
|
|
|
|
|
|
|
func getPrecision(num float64) int {
|
|
|
|
if num == 0 {
|
|
|
|
return 0
|
|
|
|
}
|
|
|
|
|
|
|
|
e := 1.0
|
|
|
|
p := 0
|
|
|
|
for (math.Round(num*e) / e) != num {
|
|
|
|
e *= 10
|
|
|
|
p++
|
|
|
|
}
|
|
|
|
return p
|
|
|
|
}
|