gabehf/Fladder
1
0
Fork 0
mirror of https://github.com/gabehf/Fladder.git synced 2026-03-10 07:50:28 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: Improve library search screen (#477)

Browse source 
Co-authored-by: PartyDonut <PartyDonut@users.noreply.github.com>
This commit is contained in:
PartyDonut 2025-08-28 23:26:10 +02:00 • committed by GitHub
parent 571b682b80
commit d22d340181
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
41 changed files with 2881 additions and 2026 deletions
Download patch file Download diff file Expand all files Collapse all files

44
lib/providers/favourites_provider.dart
View file

@ -44,23 +44,33 @@ class FavouritesNotifier extends StateNotifier<FavouritesModel> {
}
Future<List<ItemBaseModel>?> _loadLibrary({ViewModel? viewModel}) async {
final response = await api.itemsGet(
parentId: viewModel?.id,
isFavorite: true,
limit: 10,
sortOrder: [SortOrder.ascending],
sortBy: [ItemSortBy.seriessortname, ItemSortBy.sortname, ItemSortBy.datelastcontentadded],
);
final response2 = await api.itemsGet(
parentId: viewModel?.id,
isFavorite: true,
recursive: true,
limit: 10,
includeItemTypes: [BaseItemKind.photo, BaseItemKind.episode, BaseItemKind.video, BaseItemKind.collectionfolder],
sortOrder: [SortOrder.ascending],
sortBy: [ItemSortBy.seriessortname, ItemSortBy.sortname, ItemSortBy.datelastcontentadded],
);
return [...?response.body?.items, ...?response2.body?.items];
final kinds = [
BaseItemKind.movie,
BaseItemKind.episode,
BaseItemKind.series,
BaseItemKind.video,
BaseItemKind.photo,
BaseItemKind.book,
BaseItemKind.photoalbum,
];
final futures = kinds.map((kind) => fetchTypes(viewModel?.id, [kind])).toList();
final results = await Future.wait(futures);
return results.expand((list) => list).toList();
}
Future<List<ItemBaseModel>> fetchTypes(String? id, List<BaseItemKind>? includeItemTypes) async {
return (await api.itemsGet(
parentId: id,
isFavorite: true,
recursive: true,
limit: 15,
includeItemTypes: includeItemTypes,
sortOrder: [SortOrder.ascending],
sortBy: [ItemSortBy.seriessortname, ItemSortBy.sortname, ItemSortBy.datelastcontentadded],
))
.body
?.items ??
[];
}
Future<Response<List<ItemBaseModel>>?> _fetchPeople() async {

2
lib/providers/library_filters_provider.dart
View file

@ -10,7 +10,7 @@ class LibraryFilters extends _$LibraryFilters {
@override
List<LibraryFiltersModel> build(List<String> ids) => ref.watch(
userProvider
.select((value) => (value?.savedFilters ?? []).where((element) => element.containsSameIds(ids)).toList()),
.select((value) => (value?.libraryFilters ?? []).where((element) => element.containsSameIds(ids)).toList()),
);
void removeFilter(LibraryFiltersModel model) => ref.read(userProvider.notifier).removeFilter(model);

2
lib/providers/library_filters_provider.g.dart
View file

@ -6,7 +6,7 @@ part of 'library_filters_provider.dart';
// RiverpodGenerator
// **************************************************************************
String _$libraryFiltersHash() => r'fd98699d8d7c1db6daefa6e53d5d90f989a8f776';
String _$libraryFiltersHash() => r'2fae16f2bf8f9aee08b047d8615a47ee794b30b0';
/// Copied from Dart SDK
class _SystemHash {

3
lib/providers/library_screen_provider.dart
View file

@ -66,7 +66,8 @@ class LibraryScreen extends _$LibraryScreen {
Future<void> fetchAllLibraries() async {
final views = await ref.read(viewsProvider.notifier).fetchViews();
state = state.copyWith(views: views?.views ?? []);
state = state.copyWith(
views: views?.views.where((element) => element.collectionType != CollectionType.folders).toList() ?? []);
if (state.views.isEmpty) return;
final viewModel = state.selectedViewModel ?? state.views.firstOrNull;
if (viewModel == null) return;

194
lib/providers/library_search_provider.dart
View file

@ -13,6 +13,7 @@ import 'package:fladder/models/item_base_model.dart';
import 'package:fladder/models/items/folder_model.dart';
import 'package:fladder/models/items/item_shared_models.dart';
import 'package:fladder/models/items/photos_model.dart';
import 'package:fladder/models/library_filter_model.dart';
import 'package:fladder/models/library_filters_model.dart';
import 'package:fladder/models/library_search/library_search_model.dart';
import 'package:fladder/models/library_search/library_search_options.dart';
@ -49,15 +50,14 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
set loading(bool loading) => state = state.copyWith(loading: loading);
bool loadedFilters = false;
bool wasInitialized = false;
bool get loading => state.loading;
Future<void> initRefresh(
List<String>? folderId,
String? viewModelId,
bool? favourites,
SortingOrder? sortOrder,
SortingOptions? sortingOptions,
LibraryFilterModel filters,
) async {
loading = true;
state = state.resetLazyLoad();
@ -65,12 +65,23 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
if (folderId != null) {
await loadFolders(folderId: folderId);
} else {
await loadViews(viewModelId, favourites, sortOrder, sortingOptions);
await loadViews(viewModelId, filters);
}
}
await loadFilters();
if (!wasInitialized) {
wasInitialized = true;
state = state.copyWith(
filters: state.filters.copyWith(
types: state.filters.types.replaceMap(filters.types, enabledOnly: true),
genres: state.filters.genres.replaceMap(filters.genres, enabledOnly: true),
),
);
}
await loadMore(init: true);
loading = false;
}
@ -125,11 +136,11 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
List<ItemBaseModel> newPosters = results.nonNulls.expand((element) => element.items).toList();
if (state.views.included.length > 1) {
if (state.sortingOption == SortingOptions.random) {
if (state.filters.sortingOption == SortingOptions.random) {
newPosters = newPosters.random();
} else {
newPosters = newPosters.sorted(
(a, b) => sortItems(a, b, state.sortingOption, state.sortOrder),
(a, b) => sortItems(a, b, state.filters.sortingOption, state.filters.sortOrder),
);
}
}
@ -145,7 +156,7 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
} else if (state.views.hasEnabled) {
await handleViewLoading();
} else {
if (state.searchQuery.isEmpty && !state.favourites) {
if (state.searchQuery.isEmpty && !state.filters.favourites) {
state = state.copyWith(posters: []);
} else {
final response = await _loadLibrary(recursive: true);
@ -156,12 +167,9 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
loading = false;
}
//Pas viewmodel otherwise select first
Future<void> loadViews(
String? viewModelId,
bool? favourites,
SortingOrder? sortOrder,
SortingOptions? sortingOptions,
LibraryFilterModel filters,
) async {
final response = await api.usersUserIdViewsGet(includeHidden: false);
final createdViews = response.body?.items?.map((e) => ViewModel.fromBodyDto(e, ref));
@ -178,34 +186,28 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
views: views,
);
if (sortOrder == null && sortingOptions == null && favourites == null) {
final findFavouriteFilter = ref
.read(libraryFiltersProvider(views.included.map((e) => e.id).toList()))
.firstWhereOrNull((element) => element.isFavourite);
if (findFavouriteFilter != null) {
loadModel(findFavouriteFilter);
}
final findFavouriteFilter = ref
.read(libraryFiltersProvider(views.included.map((e) => e.id).toList()))
.firstWhereOrNull((element) => element.isFavourite);
if (findFavouriteFilter != null) {
loadModel(findFavouriteFilter.filter);
} else {
state = state.copyWith(
sortOrder: sortOrder,
sortingOption: sortingOptions,
favourites: favourites,
);
loadModel(filters);
}
}
Future<void> loadFolders({List<String>? folderId}) async {
final response = await api.itemsGet(
ids: folderId ?? state.folderOverwrite.map((e) => e.id).toList(),
sortBy: state.sortingOption.toSortBy,
sortOrder: [state.sortOrder.sortOrder],
sortBy: state.filters.sortingOption.toSortBy,
sortOrder: [state.filters.sortOrder.sortOrder],
fields: [
ItemFields.parentid,
ItemFields.primaryimageaspectratio,
],
);
state = state.copyWith(folderOverwrite: response.body?.items.toList());
state = state.copyWith(folderOverwrite: response.body?.items.toList() ?? []);
}
Future<void> loadFilters() async {
@ -225,11 +227,15 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
final tags = mappedList
.expand((element) => element?.tags ?? <String>[])
.sorted((a, b) => a.toLowerCase().compareTo(b.toLowerCase()));
var tempFilters = tempState.filters;
tempState = tempState.copyWith(
types: state.types.setAll(false).setKeys(enabledCollections, true),
genres: {for (var element in genres) element.name: false}.replaceMap(tempState.genres),
studios: {for (var element in studios) element: false}.replaceMap(tempState.studios),
tags: {for (var element in tags) element: false}.replaceMap(tempState.tags),
filters: tempFilters.copyWith(
types: tempFilters.types.setAll(false).setKeys(enabledCollections, true),
genres: {for (var element in genres) element.name: false}.replaceMap(tempFilters.genres),
studios: {for (var element in studios) element: false}.replaceMap(tempFilters.studios),
tags: {for (var element in tags) element: false}.replaceMap(tempFilters.tags),
recursive: state.views.included.firstOrNull?.collectionType.searchRecursive ?? true,
),
);
state = tempState;
}
@ -261,18 +267,18 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
final response = await api.itemsGet(
parentId: viewModel?.id ?? id,
searchTerm: searchString,
genres: state.genres.included,
tags: state.tags.included,
recursive: searchString?.isNotEmpty == true ? true : recursive ?? state.recursive,
officialRatings: state.officialRatings.included,
years: state.years.included,
genres: state.filters.genres.included,
tags: state.filters.tags.included,
recursive: searchString?.isNotEmpty == true ? true : recursive ?? state.filters.recursive,
officialRatings: state.filters.officialRatings.included,
years: state.filters.years.included,
isMissing: false,
limit: (limit ?? 0) > 0 ? limit : null,
startIndex: (limit ?? 0) > 0 ? startIndex : null,
collapseBoxSetItems: false,
studioIds: state.studios.included.map((e) => e.id).toList(),
sortBy: shuffle == true ? [ItemSortBy.random] : state.sortingOption.toSortBy,
sortOrder: [state.sortOrder.sortOrder],
studioIds: state.filters.studios.included.map((e) => e.id).toList(),
sortBy: shuffle == true ? [ItemSortBy.random] : state.filters.sortingOption.toSortBy,
sortOrder: [state.filters.sortOrder.sortOrder],
fields: {
ItemFields.genres,
ItemFields.parentid,
@ -286,10 +292,10 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
if (viewModel?.collectionType == CollectionType.tvshows) ItemFields.childcount,
}.toList(),
filters: [
...state.filters.included,
if (state.favourites) ItemFilter.isfavorite,
...state.filters.itemFilters.included,
if (state.filters.favourites) ItemFilter.isfavorite,
],
includeItemTypes: state.types.included.map((e) => e.dtoKind).toList(),
includeItemTypes: state.filters.types.included.map((e) => e.dtoKind).toList(),
);
return response.body;
}
@ -344,53 +350,58 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
ref.read(userProvider.notifier).addSearchQuery(query);
}
void toggleFavourite() => state = state.copyWith(favourites: !state.favourites);
void toggleRecursive() => state = state.copyWith(recursive: !state.recursive);
void toggleType(FladderItemType type) => state = state.copyWith(types: state.types.toggleKey(type));
void toggleFavourite() =>
state = state.copyWith(filters: state.filters.copyWith(favourites: !state.filters.favourites));
void toggleRecursive() =>
state = state.copyWith(filters: state.filters.copyWith(recursive: !state.filters.recursive));
void toggleType(FladderItemType type) =>
state = state.copyWith(filters: state.filters.copyWith(types: state.filters.types.toggleKey(type)));
void toggleView(ViewModel view) => state = state.copyWith(views: state.views.toggleKey(view));
void toggleGenre(String genre) => state = state.copyWith(genres: state.genres.toggleKey(genre));
void toggleStudio(Studio studio) => state = state.copyWith(studios: state.studios.toggleKey(studio));
void toggleTag(String tag) => state = state.copyWith(tags: state.tags.toggleKey(tag));
void toggleRatings(String officialRatings) =>
state = state.copyWith(officialRatings: state.officialRatings.toggleKey(officialRatings));
void toggleYears(int year) => state = state.copyWith(years: state.years.toggleKey(year));
void toggleFilters(ItemFilter filter) => state = state.copyWith(filters: state.filters.toggleKey(filter));
void toggleGenre(String genre) =>
state = state.copyWith(filters: state.filters.copyWith(genres: state.filters.genres.toggleKey(genre)));
void toggleStudio(Studio studio) =>
state = state.copyWith(filters: state.filters.copyWith(studios: state.filters.studios.toggleKey(studio)));
void toggleTag(String tag) =>
state = state.copyWith(filters: state.filters.copyWith(tags: state.filters.tags.toggleKey(tag)));
void toggleRatings(String officialRatings) => state = state.copyWith(
filters: state.filters.copyWith(officialRatings: state.filters.officialRatings.toggleKey(officialRatings)));
void toggleYears(int year) =>
state = state.copyWith(filters: state.filters.copyWith(years: state.filters.years.toggleKey(year)));
void toggleFilters(ItemFilter filter) =>
state = state.copyWith(filters: state.filters.copyWith(itemFilters: state.filters.itemFilters.toggleKey(filter)));
void setViews(Map<ViewModel, bool> views) {
loadedFilters = false;
state = state.copyWith(views: views).setFiltersToDefault();
}
void setGenres(Map<String, bool> genres) => state = state.copyWith(genres: genres);
void setStudios(Map<Studio, bool> studios) => state = state.copyWith(studios: studios);
void setTags(Map<String, bool> tags) => state = state.copyWith(tags: tags);
void setTypes(Map<FladderItemType, bool> types) => state = state.copyWith(types: types);
void setRatings(Map<String, bool> officialRatings) => state = state.copyWith(officialRatings: officialRatings);
void setYears(Map<int, bool> years) => state = state.copyWith(years: years);
void setFilters(Map<ItemFilter, bool> filters) => state = state.copyWith(filters: filters);
void setGenres(Map<String, bool> genres) => state = state.copyWith(filters: state.filters.copyWith(genres: genres));
void setStudios(Map<Studio, bool> studios) =>
state = state.copyWith(filters: state.filters.copyWith(studios: studios));
void setTags(Map<String, bool> tags) => state = state.copyWith(filters: state.filters.copyWith(tags: tags));
void setTypes(Map<FladderItemType, bool> types) =>
state = state.copyWith(filters: state.filters.copyWith(types: types));
void setRatings(Map<String, bool> officialRatings) =>
state = state.copyWith(filters: state.filters.copyWith(officialRatings: officialRatings));
void setYears(Map<int, bool> years) => state = state.copyWith(filters: state.filters.copyWith(years: years));
void setFilters(Map<ItemFilter, bool> filters) =>
state = state.copyWith(filters: state.filters.copyWith(itemFilters: filters));
void setSortBy(SortingOptions e) => state = state.copyWith(filters: state.filters.copyWith(sortingOption: e));
void setSortOrder(SortingOrder e) => state = state.copyWith(filters: state.filters.copyWith(sortOrder: e));
void toggleEmptyShows() =>
state = state.copyWith(filters: state.filters.copyWith(hideEmptyShows: !state.filters.hideEmptyShows));
void setGroupBy(GroupBy groupBy) => state = state.copyWith(filters: state.filters.copyWith(groupBy: groupBy));
void clearAllFilters() {
state = state.copyWith(
genres: state.genres.setAll(false),
tags: state.tags.setAll(false),
officialRatings: state.officialRatings.setAll(false),
years: state.years.setAll(false),
searchQuery: '',
favourites: false,
recursive: false,
studios: state.studios.setAll(false),
filters: state.filters.setAll(false),
hideEmptyShows: false,
filters: state.filters.clear(),
);
}
void setSortBy(SortingOptions e) => state = state.copyWith(sortingOption: e);
void setSortOrder(SortingOrder e) => state = state.copyWith(sortOrder: e);
void setHideEmpty(bool value) => state = state.copyWith(hideEmptyShows: value);
void setGroupBy(GroupBy groupBy) => state = state.copyWith(groupBy: groupBy);
void setFolderId(ItemBaseModel item) {
if (state.folderOverwrite.contains(item)) return;
state = state.copyWith(folderOverwrite: [...state.folderOverwrite, item]);
@ -402,7 +413,7 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
void clearFolderOverWrite() => state = state.copyWith(folderOverwrite: []);
void toggleSelectMode() =>
state = state.copyWith(selecteMode: !state.selecteMode, selectedPosters: !state.selecteMode == false ? [] : null);
state = state.copyWith(selecteMode: !state.selecteMode, selectedPosters: !state.selecteMode == false ? [] : []);
void toggleSelection(ItemBaseModel item) {
if (state.selectedPosters.contains(item)) {
@ -539,11 +550,11 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
List<ItemBaseModel> newPosters = results.nonNulls.expand((element) => element.items).toList();
if (state.views.included.length > 1) {
if (shuffle || state.sortingOption == SortingOptions.random) {
if (shuffle || state.filters.sortingOption == SortingOptions.random) {
newPosters = newPosters.random();
} else {
newPosters = newPosters.sorted(
(a, b) => sortItems(a, b, state.sortingOption, state.sortOrder),
(a, b) => sortItems(a, b, state.filters.sortingOption, state.filters.sortOrder),
);
}
}
@ -556,7 +567,7 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
} else if (state.views.hasEnabled) {
await handleViewLoading();
} else {
if (state.searchQuery.isEmpty && !state.favourites) {
if (state.searchQuery.isEmpty && !state.filters.favourites) {
itemsToPlay = [];
} else {
final response = await _loadLibrary(recursive: true, shuffle: shuffle);
@ -601,7 +612,8 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
List<PhotoModel> albumItems = [];
if (!state.types.included.containsAny([FladderItemType.video, FladderItemType.photo]) && state.recursive) {
if (!state.filters.types.included.containsAny([FladderItemType.video, FladderItemType.photo]) &&
state.filters.recursive) {
for (var album in itemsToPlay.where(
(element) => element is PhotoAlbumModel || element is FolderModel,
)) {
@ -622,8 +634,8 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
ItemFields.primaryimageaspectratio,
}.toList(),
filters: [
...state.filters.included,
if (state.favourites) ItemFilter.isfavorite,
...state.filters.itemFilters.included,
if (state.filters.favourites) ItemFilter.isfavorite,
],
sortBy: shuffle ? [ItemSortBy.random] : null,
);
@ -683,23 +695,7 @@ class LibrarySearchNotifier extends StateNotifier<LibrarySearchModel> {
state = state.copyWith();
}
void loadModel(LibraryFiltersModel model) {
state = state.copyWith(
genres: state.genres.replaceMap(model.genres),
filters: state.filters.replaceMap(model.filters),
studios: state.studios.replaceMap(model.studios),
tags: state.tags.replaceMap(model.tags),
years: state.years.replaceMap(model.years),
officialRatings: state.officialRatings.replaceMap(model.officialRatings),
types: state.types.replaceMap(model.types),
sortingOption: model.sortingOption,
sortOrder: model.sortOrder,
favourites: model.favourites,
hideEmptyShows: model.hideEmptyShows,
recursive: model.recursive,
groupBy: model.groupBy,
);
}
void loadModel(LibraryFilterModel model) => state = state.copyWith(filters: state.filters.loadModel(model));
void saveFiltersNew(String newName) =>
ref.read(filterProvider.notifier).saveFilter(LibraryFiltersModel.fromLibrarySearch(newName, state));

14
lib/providers/user_provider.dart
View file

@ -189,16 +189,16 @@ class User extends _$User {
}
void removeFilter(LibraryFiltersModel model) {
final currentList = ((state?.savedFilters ?? [])).toList(growable: true);
final currentList = ((state?.libraryFilters ?? [])).toList(growable: true);
currentList.remove(model);
state = state?.copyWith(savedFilters: currentList);
userState = state?.copyWith(libraryFilters: currentList);
}
void saveFilter(LibraryFiltersModel model) {
final currentList = (state?.savedFilters ?? []).toList(growable: true);
final currentList = (state?.libraryFilters ?? []).toList(growable: true);
if (currentList.firstWhereOrNull((value) => value.id == model.id) != null) {
state = state?.copyWith(
savedFilters: currentList.map(
userState = state?.copyWith(
libraryFilters: currentList.map(
(e) {
if (e.id == model.id) {
return model;
@ -210,11 +210,11 @@ class User extends _$User {
},
).toList());
} else {
state = state?.copyWith(savedFilters: [model, ...currentList]);
userState = state?.copyWith(libraryFilters: [model, ...currentList]);
}
}
void deleteAllFilters() => state = state?.copyWith(savedFilters: []);
void deleteAllFilters() => userState = state?.copyWith(libraryFilters: []);
String? createDownloadUrl(ItemBaseModel item) =>
Uri.encodeFull("${state?.server}/Items/${item.id}/Download?api_key=${state?.credentials.token}");

2
lib/providers/user_provider.g.dart
View file

@ -24,7 +24,7 @@ final showSyncButtonProviderProvider = AutoDisposeProvider<bool>.internal(
@Deprecated('Will be removed in 3.0. Use Ref instead')
// ignore: unused_element
typedef ShowSyncButtonProviderRef = AutoDisposeProviderRef<bool>;
String _$userHash() => r'24b34a88eae11aec1e377a82d1e507f293b7816a';
String _$userHash() => r'2b2a9f10a3bbb2c7ce51a926e7fb6e807a0e6377';
/// See also [User].
@ProviderFor(User)