From a8795cf0c926eb89b6392fae1a5e7169758ab185 Mon Sep 17 00:00:00 2001 From: PartyDonut <42371342+PartyDonut@users.noreply.github.com> Date: Sun, 1 Jun 2025 15:29:38 +0200 Subject: [PATCH] fix: Use sortName instead of name for searches/library views (#359) Co-authored-by: PartyDonut --- lib/models/library_filters_model.g.dart | 2 +- lib/models/library_search/library_search_model.dart | 2 +- lib/models/library_search/library_search_model.mapper.dart | 2 +- lib/models/library_search/library_search_options.dart | 7 +++---- lib/providers/items/book_details_provider.dart | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/models/library_filters_model.g.dart b/lib/models/library_filters_model.g.dart index 6956352..4f6e79a 100644 --- a/lib/models/library_filters_model.g.dart +++ b/lib/models/library_filters_model.g.dart @@ -93,7 +93,7 @@ const _$FladderItemTypeEnumMap = { }; const _$SortingOptionsEnumMap = { - SortingOptions.name: 'name', + SortingOptions.sortName: 'sortName', SortingOptions.communityRating: 'communityRating', SortingOptions.parentalRating: 'parentalRating', SortingOptions.dateAdded: 'dateAdded', diff --git a/lib/models/library_search/library_search_model.dart b/lib/models/library_search/library_search_model.dart index adf7fbe..3e9df53 100644 --- a/lib/models/library_search/library_search_model.dart +++ b/lib/models/library_search/library_search_model.dart @@ -77,7 +77,7 @@ class LibrarySearchModel with LibrarySearchModelMappable { FladderItemType.video: true, }, this.favourites = false, - this.sortingOption = SortingOptions.name, + this.sortingOption = SortingOptions.sortName, this.sortOrder = SortingOrder.ascending, this.hideEmptyShows = true, this.recursive = false, diff --git a/lib/models/library_search/library_search_model.mapper.dart b/lib/models/library_search/library_search_model.mapper.dart index 601c4df..53e2469 100644 --- a/lib/models/library_search/library_search_model.mapper.dart +++ b/lib/models/library_search/library_search_model.mapper.dart @@ -94,7 +94,7 @@ class LibrarySearchModelMapper extends ClassMapperBase { v.sortingOption; static const Field _f$sortingOption = Field('sortingOption', _$sortingOption, - opt: true, def: SortingOptions.name); + opt: true, def: SortingOptions.sortName); static SortingOrder _$sortOrder(LibrarySearchModel v) => v.sortOrder; static const Field _f$sortOrder = Field('sortOrder', _$sortOrder, opt: true, def: SortingOrder.ascending); diff --git a/lib/models/library_search/library_search_options.dart b/lib/models/library_search/library_search_options.dart index dbefed0..aa81c67 100644 --- a/lib/models/library_search/library_search_options.dart +++ b/lib/models/library_search/library_search_options.dart @@ -6,9 +6,8 @@ import 'package:fladder/models/item_base_model.dart'; import 'package:fladder/util/localization_helper.dart'; enum SortingOptions { - name([ItemSortBy.name]), + sortName([ItemSortBy.sortname]), communityRating([ItemSortBy.communityrating]), - // criticsRating([ItemSortBy.criticrating]), parentalRating([ItemSortBy.officialrating]), dateAdded([ItemSortBy.datecreated]), dateLastContentAdded([ItemSortBy.datelastcontentadded]), @@ -23,10 +22,10 @@ enum SortingOptions { const SortingOptions(this.value); final List value; - List get toSortBy => [...value, ItemSortBy.name]; + List get toSortBy => [...value, ItemSortBy.sortname]; String label(BuildContext context) => switch (this) { - name => context.localized.name, + sortName => context.localized.name, communityRating => context.localized.communityRating, parentalRating => context.localized.parentalRating, dateAdded => context.localized.dateAdded, diff --git a/lib/providers/items/book_details_provider.dart b/lib/providers/items/book_details_provider.dart index 4109879..e3aeda9 100644 --- a/lib/providers/items/book_details_provider.dart +++ b/lib/providers/items/book_details_provider.dart @@ -117,7 +117,7 @@ class BookDetailsProviderNotifier extends StateNotifier { siblingsResponse = await api.itemsGet( parentId: parentModel.id, recursive: true, - sortBy: SortingOptions.name.toSortBy, + sortBy: SortingOptions.sortName.toSortBy, fields: [ ItemFields.genres, ItemFields.parentid,