Show duration and filesize in results (#1776)

* Add new query interface
* Refactor query builder
* Change Query interface
* Return duration and filesize in scene query
* Adjust UI for scene metadata
* Introduce new image query interface
* Change image Query interface
* Add megapixels and size to image query
* Update image UI

Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>

pkg/api/resolver_query_find_image.go

@@ -4,7 +4,9 @@ import (
 	"context"
 	"strconv"
 
+	"github.com/99designs/gqlgen/graphql"
 	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
 )
 
 func (r *queryResolver) FindImage(ctx context.Context, id *string, checksum *string) (*models.Image, error) {
@@ -39,14 +41,32 @@ func (r *queryResolver) FindImage(ctx context.Context, id *string, checksum *str
 func (r *queryResolver) FindImages(ctx context.Context, imageFilter *models.ImageFilterType, imageIds []int, filter *models.FindFilterType) (ret *models.FindImagesResultType, err error) {
 	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
 		qb := repo.Image()
-		images, total, err := qb.Query(imageFilter, filter)
+
+		fields := graphql.CollectAllFields(ctx)
+
+		result, err := qb.Query(models.ImageQueryOptions{
+			QueryOptions: models.QueryOptions{
+				FindFilter: filter,
+				Count:      utils.StrInclude(fields, "count"),
+			},
+			ImageFilter: imageFilter,
+			Megapixels:  utils.StrInclude(fields, "megapixels"),
+			TotalSize:   utils.StrInclude(fields, "filesize"),
+		})
+		if err != nil {
+			return err
+		}
+
+		images, err := result.Resolve()
 		if err != nil {
 			return err
 		}
 
 		ret = &models.FindImagesResultType{
-			Count:  total,
-			Images: images,
+			Count:      result.Count,
+			Images:     images,
+			Megapixels: result.Megapixels,
+			Filesize:   result.TotalSize,
 		}
 
 		return nil

pkg/api/resolver_query_find_scene.go

@@ -4,8 +4,10 @@ import (
 	"context"
 	"strconv"
 
+	"github.com/99designs/gqlgen/graphql"
 	"github.com/stashapp/stash/pkg/manager"
 	"github.com/stashapp/stash/pkg/models"
+	"github.com/stashapp/stash/pkg/utils"
 )
 
 func (r *queryResolver) FindScene(ctx context.Context, id *string, checksum *string) (*models.Scene, error) {
@@ -65,16 +67,34 @@ func (r *queryResolver) FindSceneByHash(ctx context.Context, input models.SceneH
 func (r *queryResolver) FindScenes(ctx context.Context, sceneFilter *models.SceneFilterType, sceneIDs []int, filter *models.FindFilterType) (ret *models.FindScenesResultType, err error) {
 	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
 		var scenes []*models.Scene
-		var total int
 		var err error
 
+		fields := graphql.CollectAllFields(ctx)
+		result := &models.SceneQueryResult{}
+
 		if len(sceneIDs) > 0 {
 			scenes, err = repo.Scene().FindMany(sceneIDs)
 			if err == nil {
-				total = len(scenes)
+				result.Count = len(scenes)
+				for _, s := range scenes {
+					result.TotalDuration += s.Duration.Float64
+					size, _ := strconv.Atoi(s.Size.String)
+					result.TotalSize += size
+				}
 			}
 		} else {
-			scenes, total, err = repo.Scene().Query(sceneFilter, filter)
+			result, err = repo.Scene().Query(models.SceneQueryOptions{
+				QueryOptions: models.QueryOptions{
+					FindFilter: filter,
+					Count:      utils.StrInclude(fields, "count"),
+				},
+				SceneFilter:   sceneFilter,
+				TotalDuration: utils.StrInclude(fields, "duration"),
+				TotalSize:     utils.StrInclude(fields, "filesize"),
+			})
+			if err == nil {
+				scenes, err = result.Resolve()
+			}
 		}
 
 		if err != nil {
@@ -82,8 +102,10 @@ func (r *queryResolver) FindScenes(ctx context.Context, sceneFilter *models.Scen
 		}
 
 		ret = &models.FindScenesResultType{
-			Count:  total,
-			Scenes: scenes,
+			Count:    result.Count,
+			Scenes:   scenes,
+			Duration: result.TotalDuration,
+			Filesize: result.TotalSize,
 		}
 
 		return nil
@@ -114,14 +136,31 @@ func (r *queryResolver) FindScenesByPathRegex(ctx context.Context, filter *model
 			queryFilter.Q = nil
 		}
 
-		scenes, total, err := repo.Scene().Query(sceneFilter, queryFilter)
+		fields := graphql.CollectAllFields(ctx)
+
+		result, err := repo.Scene().Query(models.SceneQueryOptions{
+			QueryOptions: models.QueryOptions{
+				FindFilter: queryFilter,
+				Count:      utils.StrInclude(fields, "count"),
+			},
+			SceneFilter:   sceneFilter,
+			TotalDuration: utils.StrInclude(fields, "duration"),
+			TotalSize:     utils.StrInclude(fields, "filesize"),
+		})
+		if err != nil {
+			return err
+		}
+
+		scenes, err := result.Resolve()
 		if err != nil {
 			return err
 		}
 
 		ret = &models.FindScenesResultType{
-			Count:  total,
-			Scenes: scenes,
+			Count:    result.Count,
+			Scenes:   scenes,
+			Duration: result.TotalDuration,
+			Filesize: result.TotalSize,
 		}
 
 		return nil