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>
This commit is contained in:
kermieisinthehouse
2021-10-24 17:40:13 -07:00
committed by GitHub
parent 1b411e3f43
commit 4dd56c3d82
49 changed files with 788 additions and 229 deletions

View File

@@ -141,9 +141,19 @@ func TestSceneQueryQ(t *testing.T) {
func queryScene(t *testing.T, sqb models.SceneReader, sceneFilter *models.SceneFilterType, findFilter *models.FindFilterType) []*models.Scene {
t.Helper()
scenes, _, err := sqb.Query(sceneFilter, findFilter)
result, err := sqb.Query(models.SceneQueryOptions{
QueryOptions: models.QueryOptions{
FindFilter: findFilter,
},
SceneFilter: sceneFilter,
})
if err != nil {
t.Errorf("Error querying scene: %s", err.Error())
t.Errorf("Error querying scene: %v", err)
}
scenes, err := result.Resolve()
if err != nil {
t.Errorf("Error resolving scenes: %v", err)
}
return scenes
@@ -346,17 +356,21 @@ func TestSceneIllegalQuery(t *testing.T) {
withTxn(func(r models.Repository) error {
sqb := r.Scene()
_, _, err := sqb.Query(sceneFilter, nil)
queryOptions := models.SceneQueryOptions{
SceneFilter: sceneFilter,
}
_, err := sqb.Query(queryOptions)
assert.NotNil(err)
sceneFilter.Or = nil
sceneFilter.Not = &subFilter
_, _, err = sqb.Query(sceneFilter, nil)
_, err = sqb.Query(queryOptions)
assert.NotNil(err)
sceneFilter.And = nil
sceneFilter.Or = &subFilter
_, _, err = sqb.Query(sceneFilter, nil)
_, err = sqb.Query(queryOptions)
assert.NotNil(err)
return nil