mirror of
https://github.com/stashapp/stash.git
synced 2025-12-18 04:44:37 +03:00
Restructure data layer (#2532)
* Add new txn manager interface * Add txn management to sqlite * Rename get to getByID * Add contexts to repository methods * Update query builders * Add context to reader writer interfaces * Use repository in resolver * Tighten interfaces * Tighten interfaces in dlna * Tighten interfaces in match package * Tighten interfaces in scraper package * Tighten interfaces in scan code * Tighten interfaces on autotag package * Remove ReaderWriter usage * Merge database package into sqlite
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package performer
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/stashapp/stash/pkg/models"
|
||||
@@ -9,8 +10,13 @@ import (
|
||||
"github.com/stashapp/stash/pkg/utils"
|
||||
)
|
||||
|
||||
type ImageStashIDGetter interface {
|
||||
GetImage(ctx context.Context, performerID int) ([]byte, error)
|
||||
GetStashIDs(ctx context.Context, performerID int) ([]*models.StashID, error)
|
||||
}
|
||||
|
||||
// ToJSON converts a Performer object into its JSON equivalent.
|
||||
func ToJSON(reader models.PerformerReader, performer *models.Performer) (*jsonschema.Performer, error) {
|
||||
func ToJSON(ctx context.Context, reader ImageStashIDGetter, performer *models.Performer) (*jsonschema.Performer, error) {
|
||||
newPerformerJSON := jsonschema.Performer{
|
||||
IgnoreAutoTag: performer.IgnoreAutoTag,
|
||||
CreatedAt: json.JSONTime{Time: performer.CreatedAt.Timestamp},
|
||||
@@ -84,7 +90,7 @@ func ToJSON(reader models.PerformerReader, performer *models.Performer) (*jsonsc
|
||||
newPerformerJSON.Weight = int(performer.Weight.Int64)
|
||||
}
|
||||
|
||||
image, err := reader.GetImage(performer.ID)
|
||||
image, err := reader.GetImage(ctx, performer.ID)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("error getting performers image: %v", err)
|
||||
}
|
||||
@@ -93,7 +99,7 @@ func ToJSON(reader models.PerformerReader, performer *models.Performer) (*jsonsc
|
||||
newPerformerJSON.Image = utils.GetBase64StringFromData(image)
|
||||
}
|
||||
|
||||
stashIDs, _ := reader.GetStashIDs(performer.ID)
|
||||
stashIDs, _ := reader.GetStashIDs(ctx, performer.ID)
|
||||
var ret []models.StashID
|
||||
for _, stashID := range stashIDs {
|
||||
newJoin := models.StashID{
|
||||
|
||||
Reference in New Issue
Block a user