Skip to content

Commit a2b5855

Browse files
removed item type filtering
1 parent 0d4f2c4 commit a2b5855

6 files changed

Lines changed: 7 additions & 58 deletions

File tree

lib/data/repositories/multi_server_repository.dart

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import '../models/aggregated_item.dart';
1111
import '../models/aggregated_library.dart';
1212
import '../models/home_row.dart';
1313
import '../services/media_server_client_factory.dart';
14-
import '../utils/latest_media_item_types.dart';
1514
import '../utils/playlist_utils.dart';
1615

1716
class ServerUserSession {
@@ -329,15 +328,11 @@ class MultiServerRepository {
329328
final name = data['Name'] as String? ?? '';
330329
final displayName =
331330
hasMultiple ? '$name (${session.server.name})' : name;
332-
final includeItemTypes = latestIncludeTypesForCollection(
333-
collectionType?.toLowerCase(),
334-
);
335331

336332
try {
337333
final latestResponse = await _withTimeout(
338334
() => session.client.itemsApi.getLatestItems(
339335
parentId: id,
340-
includeItemTypes: includeItemTypes,
341336
limit: _defaultLimit,
342337
fields: _fields,
343338
),

lib/data/services/row_data_source.dart

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,11 @@ class RowDataSource {
117117
Future<HomeRow> loadLatestMedia(
118118
String parentId,
119119
String libraryName,
120-
String serverId, {
121-
List<String>? includeItemTypes,
122-
}) async {
120+
String serverId,
121+
) async {
123122
final response = await _getLatestItemsWithFallback(
124123
parentId: parentId,
125124
limit: _defaultLimit,
126-
includeItemTypes: includeItemTypes,
127125
);
128126
return _buildRow(
129127
id: 'latest_$parentId',
@@ -537,12 +535,10 @@ class RowDataSource {
537535
Future<Map<String, dynamic>> _getLatestItemsWithFallback({
538536
required String parentId,
539537
required int limit,
540-
List<String>? includeItemTypes,
541538
}) async {
542539
try {
543540
final response = await _client.itemsApi.getLatestItems(
544541
parentId: parentId,
545-
includeItemTypes: includeItemTypes,
546542
limit: limit,
547543
fields: _fields,
548544
);
@@ -552,7 +548,6 @@ class RowDataSource {
552548
if (statusCode < 500) rethrow;
553549
final response = await _client.itemsApi.getLatestItems(
554550
parentId: parentId,
555-
includeItemTypes: includeItemTypes,
556551
limit: limit,
557552
fields: _fallbackFields,
558553
);

lib/data/utils/latest_media_item_types.dart

Lines changed: 0 additions & 14 deletions
This file was deleted.

lib/data/viewmodels/library_view_view_model.dart

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,7 @@ class LibraryViewViewModel extends ChangeNotifier {
6868
case 'movies':
6969
return Future.wait([
7070
_dataSource.loadLibraryResume(libraryId, _serverId),
71-
_dataSource.loadLatestMedia(
72-
libraryId,
73-
_libraryName,
74-
_serverId,
75-
includeItemTypes: const ['Movie'],
76-
),
71+
_dataSource.loadLatestMedia(libraryId, _libraryName, _serverId),
7772
_dataSource.loadLibraryFavorites(libraryId, _serverId,
7873
includeItemTypes: ['Movie']),
7974
_dataSource.loadLibraryCollections(libraryId, _serverId),
@@ -82,23 +77,13 @@ class LibraryViewViewModel extends ChangeNotifier {
8277
return Future.wait([
8378
_dataSource.loadLibraryResume(libraryId, _serverId),
8479
_dataSource.loadLibraryNextUp(libraryId, _serverId),
85-
_dataSource.loadLatestMedia(
86-
libraryId,
87-
_libraryName,
88-
_serverId,
89-
includeItemTypes: const ['Series'],
90-
),
80+
_dataSource.loadLatestMedia(libraryId, _libraryName, _serverId),
9181
_dataSource.loadLibraryFavorites(libraryId, _serverId,
9282
includeItemTypes: ['Series']),
9383
]);
9484
case 'music':
9585
return Future.wait([
96-
_dataSource.loadLatestMedia(
97-
libraryId,
98-
_libraryName,
99-
_serverId,
100-
includeItemTypes: const ['MusicAlbum'],
101-
),
86+
_dataSource.loadLatestMedia(libraryId, _libraryName, _serverId),
10287
_dataSource.loadLibraryLastPlayed(libraryId, _serverId,
10388
includeItemTypes: ['Audio']),
10489
_dataSource.loadLibraryFavorites(libraryId, _serverId,

lib/data/viewmodels/music_browse_view_model.dart

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,7 @@ class MusicBrowseViewModel extends ChangeNotifier {
5050

5151
try {
5252
final results = await Future.wait([
53-
_dataSource.loadLatestMedia(
54-
libraryId,
55-
_libraryName,
56-
_serverId,
57-
includeItemTypes: const ['MusicAlbum'],
58-
),
53+
_dataSource.loadLatestMedia(libraryId, _libraryName, _serverId),
5954
_dataSource.loadLibraryLastPlayed(libraryId, _serverId,
6055
includeItemTypes: ['Audio']),
6156
_dataSource.loadLibraryFavorites(libraryId, _serverId,

lib/ui/screens/home/home_view_model.dart

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import '../../../data/models/aggregated_item.dart';
77
import '../../../data/models/home_row.dart';
88
import '../../../data/repositories/multi_server_repository.dart';
99
import '../../../data/services/row_data_source.dart';
10-
import '../../../data/utils/latest_media_item_types.dart';
1110
import '../../../data/viewmodels/media_bar_view_model.dart';
1211
import '../../../preference/preference_constants.dart';
1312
import '../../../preference/user_preferences.dart';
@@ -231,14 +230,8 @@ class HomeViewModel extends ChangeNotifier {
231230
final tasks = filteredViews.map((data) async {
232231
final id = data['Id'] as String;
233232
final name = data['Name'] as String? ?? '';
234-
final collectionType = (data['CollectionType'] as String?)?.toLowerCase();
235233
try {
236-
final row = await _dataSource.loadLatestMedia(
237-
id,
238-
name,
239-
_serverId,
240-
includeItemTypes: latestIncludeTypesForCollection(collectionType),
241-
);
234+
final row = await _dataSource.loadLatestMedia(id, name, _serverId);
242235
return row.items.isNotEmpty ? row : null;
243236
} catch (_) {
244237
return null;

0 commit comments

Comments
 (0)