4d99597966
The watchlist catalog page silently returned the stored list order while its sort dropdown claimed "Date Added", and mirroring a provider's list order (e.g. MDBList) was off by default, so synced watchlists appeared in first-sync-time order with no way to tell what was happening. - Web: the watchlist source now uses the same source-order sentinel as collections — the dropdown shows "List Order" as the default, and an explicit "Date Added" pick sends sort=added_at instead of being stripped (previously indistinguishable from the default). - Server: on personal lists (watchlist/favorites) an explicit added_at sort now takes the source-order path, where added_at means "date added to the list"; the query executor path sorted by the library's created_at instead. History keeps the executor path since its ID loading ignores the sort. - watchsync: new connections default sync_watchlist_order_enabled to true, with a migration flipping existing rows to match. Providers without the provides_watchlist_order capability ignore the flag at sync time. Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
88 lines
3.1 KiB
Go
88 lines
3.1 KiB
Go
package catalog
|
|
|
|
import (
|
|
"net/url"
|
|
"testing"
|
|
)
|
|
|
|
func TestParseCatalogMediaScope_AllowsEbook(t *testing.T) {
|
|
if got := parseCatalogMediaScope(" ebook "); got != "ebook" {
|
|
t.Fatalf("expected ebook media scope, got %q", got)
|
|
}
|
|
}
|
|
|
|
func TestParseCatalogMediaScope_AllowsManga(t *testing.T) {
|
|
if got := parseCatalogMediaScope(" manga "); got != "manga" {
|
|
t.Fatalf("expected manga media scope, got %q", got)
|
|
}
|
|
}
|
|
|
|
func TestParseCatalogRequest_PersonalSourceOrder(t *testing.T) {
|
|
cases := []struct {
|
|
name string
|
|
values url.Values
|
|
useSourceOrder bool
|
|
}{
|
|
{"watchlist default", url.Values{"source": {"watchlist"}}, true},
|
|
// added_at means "date added to the list" and is applied on the
|
|
// source-order path by loadPersonalSourceIDs.
|
|
{"watchlist explicit added_at", url.Values{"source": {"watchlist"}, "sort": {"added_at"}, "order": {"desc"}}, true},
|
|
{"favorites explicit added_at", url.Values{"source": {"favorites"}, "sort": {"added_at"}}, true},
|
|
{"watchlist metadata sort", url.Values{"source": {"watchlist"}, "sort": {"title"}}, false},
|
|
// History ID loading ignores the sort, so it keeps the executor path.
|
|
{"history explicit added_at", url.Values{"source": {"history"}, "sort": {"added_at"}}, false},
|
|
}
|
|
for _, tc := range cases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
req, err := ParseCatalogRequest(tc.values)
|
|
if err != nil {
|
|
t.Fatalf("ParseCatalogRequest returned error: %v", err)
|
|
}
|
|
if req.UseSourceOrder != tc.useSourceOrder {
|
|
t.Fatalf("UseSourceOrder = %v, want %v", req.UseSourceOrder, tc.useSourceOrder)
|
|
}
|
|
if sort := tc.values.Get("sort"); sort != "" && req.Query.Sort.Field != sort {
|
|
t.Fatalf("sort field = %q, want %q", req.Query.Sort.Field, sort)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestParseCatalogRequest_AllowsCollectionOverlayParams(t *testing.T) {
|
|
values := url.Values{
|
|
"source": {"user_collection"},
|
|
"collection_id": {"col-7"},
|
|
"type": {"movie"},
|
|
"sort": {"title"},
|
|
"order": {"asc"},
|
|
"groups[0][match]": {"all"},
|
|
"groups[0][rules][0][field]": {"watched"},
|
|
"groups[0][rules][0][op]": {"is"},
|
|
"groups[0][rules][0][value]": {"false"},
|
|
"groups[1][match]": {"all"},
|
|
"groups[1][rules][0][field]": {"resolution"},
|
|
"groups[1][rules][0][op]": {"is"},
|
|
"groups[1][rules][0][value]": {"4K"},
|
|
}
|
|
|
|
req, err := ParseCatalogRequest(values)
|
|
if err != nil {
|
|
t.Fatalf("ParseCatalogRequest returned error: %v", err)
|
|
}
|
|
if req.Source != CatalogSourceUserCollection || req.CollectionID != "col-7" {
|
|
t.Fatalf("unexpected collection source: source=%q collection=%q", req.Source, req.CollectionID)
|
|
}
|
|
if req.UseSourceOrder {
|
|
t.Fatal("explicit sort should opt out of source order")
|
|
}
|
|
if req.Query.MediaScope != "movie" {
|
|
t.Fatalf("media scope = %q, want movie", req.Query.MediaScope)
|
|
}
|
|
if req.Query.Sort != (QuerySort{Field: "title", Order: "asc"}) {
|
|
t.Fatalf("sort = %+v, want title asc", req.Query.Sort)
|
|
}
|
|
if len(req.Query.Groups) != 2 {
|
|
t.Fatalf("groups = %+v, want two overlay groups", req.Query.Groups)
|
|
}
|
|
}
|