一堆乱七八糟的修改

播放页面增加桌面版

lib/api/api_provider.dart

@@ -9,10 +9,11 @@ import 'package:http/http.dart';
 import 'package:logging/logging.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:shelfsdk/audiobookshelf_api.dart';
+import 'package:vaani/db/cache/cache_key.dart';
 import 'package:vaani/db/cache_manager.dart';
-import 'package:vaani/models/error_response.dart';
-import 'package:vaani/settings/api_settings_provider.dart';
-import 'package:vaani/settings/models/authenticated_user.dart';
+import 'package:vaani/shared/utils/error_response.dart';
+import 'package:vaani/features/settings/api_settings_provider.dart';
+import 'package:vaani/features/settings/models/authenticated_user.dart';
 import 'package:vaani/shared/extensions/obfuscation.dart';
 
 part 'api_provider.g.dart';
@@ -154,15 +155,14 @@ class PersonalizedView extends _$PersonalizedView {
     }
     // try to find in cache
     // final cacheKey = 'personalizedView:${apiSettings.activeLibraryId}';
-    final key = 'personalizedView:${apiSettings.activeLibraryId! + user.id}';
-    final cachedRes = await apiResponseCacheManager.getFileFromMemory(
-          key,
-        ) ??
-        await apiResponseCacheManager.getFileFromCache(key);
-    if (cachedRes != null) {
-      _logger.fine('reading from cache: $cachedRes for key: $key');
+    // final key = 'personalizedView:${apiSettings.activeLibraryId! + user.id}';
+    final key = CacheKey.personalized(apiSettings.activeLibraryId! + user.id);
+    final cachedFile = await apiResponseCacheManager.getFileFromCache(key);
+    if (cachedFile != null) {
+      _logger.fine('reading from cache: $cachedFile for key: $key');
       try {
-        final resJson = jsonDecode(await cachedRes.file.readAsString()) as List;
+        final resJson =
+            jsonDecode(await cachedFile.file.readAsString()) as List;
         final res = [
           for (final item in resJson)
             Shelf.fromJson(item as Map<String, dynamic>),
@@ -170,7 +170,7 @@ class PersonalizedView extends _$PersonalizedView {
         _logger.fine('successfully read from cache key: $key');
         yield res;
       } catch (e) {
-        _logger.warning('error reading from cache: $e\n$cachedRes');
+        _logger.warning('error reading from cache: $e\n$cachedFile');
       }
     }
 

lib/api/api_provider.g.dart

@@ -662,7 +662,7 @@ class _LoginProviderElement
   AuthenticatedUser? get user => (origin as LoginProvider).user;
 }
 
-String _$personalizedViewHash() => r'425e89d99d7e4712b4d6a688f3a12442bd66584f';
+String _$personalizedViewHash() => r'e3c3e041f925f041db2145e8ca0dbb07268ecc47';
 
 /// fetch the personalized view
 ///

lib/api/authenticated_users_provider.dart

@@ -3,9 +3,10 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:vaani/api/server_provider.dart'
     show audiobookShelfServerProvider;
 import 'package:vaani/db/storage.dart';
-import 'package:vaani/settings/api_settings_provider.dart';
-import 'package:vaani/settings/models/audiobookshelf_server.dart';
-import 'package:vaani/settings/models/authenticated_user.dart' as model;
+import 'package:vaani/features/settings/api_settings_provider.dart';
+import 'package:vaani/features/settings/models/audiobookshelf_server.dart';
+import 'package:vaani/features/settings/models/authenticated_user.dart'
+    as model;
 import 'package:vaani/shared/extensions/obfuscation.dart';
 
 part 'authenticated_users_provider.g.dart';

lib/api/library_item_provider.dart

@@ -1,11 +1,13 @@
 import 'dart:convert';
 
+import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:logging/logging.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:shelfsdk/audiobookshelf_api.dart' as shelfsdk;
 import 'package:vaani/api/api_provider.dart';
 import 'package:vaani/db/cache/cache_key.dart';
 import 'package:vaani/db/cache_manager.dart';
+import 'package:vaani/globals.dart';
 import 'package:vaani/shared/extensions/model_conversions.dart';
 
 part 'library_item_provider.g.dart';
@@ -26,8 +28,8 @@ class LibraryItem extends _$LibraryItem {
 
     // look for the item in the cache
     final key = CacheKey.libraryItem(id);
-    final cachedFile = await apiResponseCacheManager.getFileFromMemory(key) ??
-        await apiResponseCacheManager.getFileFromCache(key);
+    final cachedFile = await apiResponseCacheManager.getFileFromCache(key);
+
     if (cachedFile != null) {
       _logger.fine(
         'LibraryItemProvider reading from cache for $id from ${cachedFile.file}',
@@ -69,3 +71,39 @@ class LibraryItem extends _$LibraryItem {
     }
   }
 }
+
+@riverpod
+Future<shelfsdk.PlaybackSessionExpanded?> playBackSession(
+  Ref ref,
+  String libraryItemId,
+) async {
+  final api = ref.watch(authenticatedApiProvider);
+  final playBack = await api.items.play(
+    libraryItemId: libraryItemId,
+    parameters: shelfsdk.PlayItemReqParams(
+      deviceInfo: shelfsdk.DeviceInfoReqParams(
+        clientVersion: appVersion,
+        manufacturer: deviceManufacturer,
+        model: deviceModel,
+        sdkVersion: deviceSdkVersion,
+        clientName: appName,
+        deviceName: deviceName,
+      ),
+      forceDirectPlay: false,
+      forceTranscode: false,
+      supportedMimeTypes: [
+        "audio/flac",
+        "audio/mpeg",
+        "audio/mp4",
+        "audio/ogg",
+        "audio/aac",
+        "audio/webm",
+      ],
+    ),
+  );
+
+  if (playBack == null) {
+    return null;
+  }
+  return playBack.asExpanded;
+}

lib/api/library_item_provider.g.dart

@@ -6,7 +6,7 @@ part of 'library_item_provider.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$libraryItemHash() => r'a3cfa7f912e9498a70b5782899018b6964d6445c';
+String _$playBackSessionHash() => r'1bc00653e0041e839d8569192b6bc90d96b4ca4f';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -29,6 +29,144 @@ class _SystemHash {
   }
 }
 
+/// See also [playBackSession].
+@ProviderFor(playBackSession)
+const playBackSessionProvider = PlayBackSessionFamily();
+
+/// See also [playBackSession].
+class PlayBackSessionFamily
+    extends Family<AsyncValue<shelfsdk.PlaybackSessionExpanded?>> {
+  /// See also [playBackSession].
+  const PlayBackSessionFamily();
+
+  /// See also [playBackSession].
+  PlayBackSessionProvider call(
+    String libraryItemId,
+  ) {
+    return PlayBackSessionProvider(
+      libraryItemId,
+    );
+  }
+
+  @override
+  PlayBackSessionProvider getProviderOverride(
+    covariant PlayBackSessionProvider provider,
+  ) {
+    return call(
+      provider.libraryItemId,
+    );
+  }
+
+  static const Iterable<ProviderOrFamily>? _dependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
+
+  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
+
+  @override
+  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
+      _allTransitiveDependencies;
+
+  @override
+  String? get name => r'playBackSessionProvider';
+}
+
+/// See also [playBackSession].
+class PlayBackSessionProvider
+    extends AutoDisposeFutureProvider<shelfsdk.PlaybackSessionExpanded?> {
+  /// See also [playBackSession].
+  PlayBackSessionProvider(
+    String libraryItemId,
+  ) : this._internal(
+          (ref) => playBackSession(
+            ref as PlayBackSessionRef,
+            libraryItemId,
+          ),
+          from: playBackSessionProvider,
+          name: r'playBackSessionProvider',
+          debugGetCreateSourceHash:
+              const bool.fromEnvironment('dart.vm.product')
+                  ? null
+                  : _$playBackSessionHash,
+          dependencies: PlayBackSessionFamily._dependencies,
+          allTransitiveDependencies:
+              PlayBackSessionFamily._allTransitiveDependencies,
+          libraryItemId: libraryItemId,
+        );
+
+  PlayBackSessionProvider._internal(
+    super._createNotifier, {
+    required super.name,
+    required super.dependencies,
+    required super.allTransitiveDependencies,
+    required super.debugGetCreateSourceHash,
+    required super.from,
+    required this.libraryItemId,
+  }) : super.internal();
+
+  final String libraryItemId;
+
+  @override
+  Override overrideWith(
+    FutureOr<shelfsdk.PlaybackSessionExpanded?> Function(
+            PlayBackSessionRef provider)
+        create,
+  ) {
+    return ProviderOverride(
+      origin: this,
+      override: PlayBackSessionProvider._internal(
+        (ref) => create(ref as PlayBackSessionRef),
+        from: from,
+        name: null,
+        dependencies: null,
+        allTransitiveDependencies: null,
+        debugGetCreateSourceHash: null,
+        libraryItemId: libraryItemId,
+      ),
+    );
+  }
+
+  @override
+  AutoDisposeFutureProviderElement<shelfsdk.PlaybackSessionExpanded?>
+      createElement() {
+    return _PlayBackSessionProviderElement(this);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return other is PlayBackSessionProvider &&
+        other.libraryItemId == libraryItemId;
+  }
+
+  @override
+  int get hashCode {
+    var hash = _SystemHash.combine(0, runtimeType.hashCode);
+    hash = _SystemHash.combine(hash, libraryItemId.hashCode);
+
+    return _SystemHash.finish(hash);
+  }
+}
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+mixin PlayBackSessionRef
+    on AutoDisposeFutureProviderRef<shelfsdk.PlaybackSessionExpanded?> {
+  /// The parameter `libraryItemId` of this provider.
+  String get libraryItemId;
+}
+
+class _PlayBackSessionProviderElement
+    extends AutoDisposeFutureProviderElement<shelfsdk.PlaybackSessionExpanded?>
+    with PlayBackSessionRef {
+  _PlayBackSessionProviderElement(super.provider);
+
+  @override
+  String get libraryItemId => (origin as PlayBackSessionProvider).libraryItemId;
+}
+
+String _$libraryItemHash() => r'8032b2d3ca6a8a2a6217cd32f11cd4b35919f49e';
+
 abstract class _$LibraryItem
     extends BuildlessStreamNotifier<shelfsdk.LibraryItemExpanded> {
   late final String id;

lib/api/library_provider.dart

@@ -1,11 +1,13 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart' show Ref;
 import 'package:logging/logging.dart' show Logger;
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-
-import 'package:shelfsdk/audiobookshelf_api.dart' show Library;
+import 'package:shelfsdk/audiobookshelf_api.dart'
+    show GetLibrarysItemsReqParams, Library, LibraryItemMinified;
 import 'package:vaani/api/api_provider.dart' show authenticatedApiProvider;
-import 'package:vaani/settings/api_settings_provider.dart'
+import 'package:vaani/features/settings/api_settings_provider.dart'
     show apiSettingsProvider;
+import 'package:vaani/shared/extensions/model_conversions.dart';
+
 part 'library_provider.g.dart';
 
 final _logger = Logger('LibraryProvider');
@@ -56,3 +58,27 @@ class Libraries extends _$Libraries {
     return libraries;
   }
 }
+
+// 查询库下所有项目
+@riverpod
+Future<List<LibraryItemMinified>> currentLibraryItems(Ref ref) async {
+  final api = ref.watch(authenticatedApiProvider);
+  final libraryId =
+      ref.watch(apiSettingsProvider.select((s) => s.activeLibraryId));
+  if (libraryId == null) {
+    _logger.warning('No active library id found');
+    return [];
+  }
+  final items = await api.libraries.getItems(
+    libraryId: libraryId,
+    parameters: const GetLibrarysItemsReqParams(
+      limit: 18,
+      page: 1,
+      minified: true,
+    ),
+  );
+  if (items == null) {
+    return [];
+  }
+  return items.results.map((v) => v.asMinified).toList();
+}

lib/api/library_provider.g.dart

@@ -173,6 +173,26 @@ final currentLibraryProvider = AutoDisposeFutureProvider<Library?>.internal(
 @Deprecated('Will be removed in 3.0. Use Ref instead')
 // ignore: unused_element
 typedef CurrentLibraryRef = AutoDisposeFutureProviderRef<Library?>;
+String _$currentLibraryItemsHash() =>
+    r'2e2ce270c46bedf0b779399772df89a23803fe50';
+
+/// See also [currentLibraryItems].
+@ProviderFor(currentLibraryItems)
+final currentLibraryItemsProvider =
+    AutoDisposeFutureProvider<List<LibraryItemMinified>>.internal(
+  currentLibraryItems,
+  name: r'currentLibraryItemsProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$currentLibraryItemsHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+@Deprecated('Will be removed in 3.0. Use Ref instead')
+// ignore: unused_element
+typedef CurrentLibraryItemsRef
+    = AutoDisposeFutureProviderRef<List<LibraryItemMinified>>;
 String _$librariesHash() => r'95ebd4d1ac0cc2acf7617dc22895eff0ca30600f';
 
 /// See also [Libraries].

lib/api/server_provider.dart

@@ -2,8 +2,9 @@ import 'package:logging/logging.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 import 'package:vaani/api/authenticated_users_provider.dart';
 import 'package:vaani/db/storage.dart';
-import 'package:vaani/settings/api_settings_provider.dart';
-import 'package:vaani/settings/models/audiobookshelf_server.dart' as model;
+import 'package:vaani/features/settings/api_settings_provider.dart';
+import 'package:vaani/features/settings/models/audiobookshelf_server.dart'
+    as model;
 import 'package:vaani/shared/extensions/obfuscation.dart';
 
 part 'server_provider.g.dart';