Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-06 08:26:00 +01:00
Code Issues Projects Releases Wiki Activity

Fix make generate-dataloaders and the extra time import

Browse source
This commit is contained in:
stashcoder42 2025-07-01 09:35:17 -04:00
parent 1bcf2e262c
commit 682f15e63d
2 changed files with 55 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
internal/api/loaders/dataloaders.go
View file

@ -32,7 +32,34 @@ import (
// Work around bug in dataloaden https://github.com/vektah/dataloaden/issues/54
type Time struct {
time.Time
time.Time
}
// Helper functions for time conversion
func timeToTime(t *time.Time) *Time {
if t == nil {
return nil
}
return &Time{*t}
}
func timesToTimes(times []*time.Time) []*Time {
result := make([]*Time, len(times))
for i, t := range times {
result[i] = timeToTime(t)
}
return result
}
func timeSlicesToTimeSlices(timeSlices [][]time.Time) [][]Time {
result := make([][]Time, len(timeSlices))
for i, slice := range timeSlices {
result[i] = make([]Time, len(slice))
for j, t := range slice {
result[i][j] = Time{t}
}
}
return result
}
type contextKey struct{ name string }
@ -357,35 +384,44 @@ func (m Middleware) fetchScenesPlayCount(ctx context.Context) func(keys []int) (
}
}
func (m Middleware) fetchScenesOHistory(ctx context.Context) func(keys []int) ([][]time.Time, []error) {
return func(keys []int) (ret [][]time.Time, errs []error) {
func (m Middleware) fetchScenesOHistory(ctx context.Context) func(keys []int) ([][]Time, []error) {
return func(keys []int) (ret [][]Time, errs []error) {
var timeRet [][]time.Time
err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
var err error
ret, err = m.Repository.Scene.GetManyODates(ctx, keys)
timeRet, err = m.Repository.Scene.GetManyODates(ctx, keys)
return err
})
ret = timeSlicesToTimeSlices(timeRet)
return ret, toErrorSlice(err)
}
}
func (m Middleware) fetchScenesPlayHistory(ctx context.Context) func(keys []int) ([][]time.Time, []error) {
return func(keys []int) (ret [][]time.Time, errs []error) {
func (m Middleware) fetchScenesPlayHistory(ctx context.Context) func(keys []int) ([][]Time, []error) {
return func(keys []int) (ret [][]Time, errs []error) {
var timeRet [][]time.Time
err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
var err error
ret, err = m.Repository.Scene.GetManyViewDates(ctx, keys)
timeRet, err = m.Repository.Scene.GetManyViewDates(ctx, keys)
return err
})
ret = timeSlicesToTimeSlices(timeRet)
return ret, toErrorSlice(err)
}
}
func (m Middleware) fetchScenesLastPlayed(ctx context.Context) func(keys []int) ([]*time.Time, []error) {
return func(keys []int) (ret []*time.Time, errs []error) {
func (m Middleware) fetchScenesLastPlayed(ctx context.Context) func(keys []int) ([]*Time, []error) {
return func(keys []int) (ret []*Time, errs []error) {
var timeRet []*time.Time
err := m.Repository.WithDB(ctx, func(ctx context.Context) error {
var err error
ret, err = m.Repository.Scene.GetManyLastViewed(ctx, keys)
timeRet, err = m.Repository.Scene.GetManyLastViewed(ctx, keys)
return err
})
ret = timesToTimes(timeRet)
return ret, toErrorSlice(err)
}
}

16
internal/api/resolver_model_scene.go
View file

@ -367,7 +367,11 @@ func (r *sceneResolver) LastPlayedAt(ctx context.Context, obj *models.Scene) (*t
return nil, err
}
return ret, nil
if ret == nil {
return nil, nil
}
return &ret.Time, nil
}
func (r *sceneResolver) PlayCount(ctx context.Context, obj *models.Scene) (*int, error) {
@ -385,11 +389,10 @@ func (r *sceneResolver) PlayHistory(ctx context.Context, obj *models.Scene) ([]*
return nil, err
}
// convert to pointer slice
// convert to pointer slice of time.Time
ptrRet := make([]*time.Time, len(ret))
for i, t := range ret {
tt := t
ptrRet[i] = &tt
ptrRet[i] = &t.Time
}
return ptrRet, nil
@ -401,11 +404,10 @@ func (r *sceneResolver) OHistory(ctx context.Context, obj *models.Scene) ([]*tim
return nil, err
}
// convert to pointer slice
// convert to pointer slice of time.Time
ptrRet := make([]*time.Time, len(ret))
for i, t := range ret {
tt := t
ptrRet[i] = &tt
ptrRet[i] = &t.Time
}
return ptrRet, nil