chore: 优化进度条显示

lib/features/player/providers/abs_provider.dart

@@ -2,64 +2,24 @@ import 'package:collection/collection.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:just_audio/just_audio.dart' as audio;
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:shelfsdk/audiobookshelf_api.dart' as api;
+import 'package:shelfsdk/audiobookshelf_api.dart' as shelfsdk;
 import 'package:vaani/api/api_provider.dart';
 import 'package:vaani/api/library_item_provider.dart';
 import 'package:vaani/db/available_boxes.dart';
 import 'package:vaani/db/cache/cache_key.dart';
 import 'package:vaani/features/downloads/providers/download_manager.dart';
 import 'package:vaani/features/per_book_settings/providers/book_settings_provider.dart';
-import 'package:vaani/features/player/core/abs_audio_player.dart'
-    show AbsAudioPlayer;
+import 'package:vaani/features/player/core/abs_audio_player.dart';
 import 'package:vaani/features/settings/app_settings_provider.dart';
 import 'package:vaani/shared/extensions/box.dart';
 import 'package:vaani/shared/extensions/model_conversions.dart';
 
 part 'abs_provider.g.dart';
 
-/// 音频播放器 配置
-// @Riverpod(keepAlive: true)
-// Future<AudioHandler> configurePlayer(Ref ref) async {
-//   final player = ref.read(absPlayerProvider);
-//   // for playing audio on windows, linux
-
-//   // for configuring how this app will interact with other audio apps
-//   final session = await AudioSession.instance;
-//   await session.configure(const AudioSessionConfiguration.speech());
-
-//   final audioService = await AudioService.init(
-//     builder: () => AbsAudioHandler(player),
-//     config: const AudioServiceConfig(
-//       androidNotificationChannelId: 'dr.blank.vaani.channel.audio',
-//       androidNotificationChannelName: 'ABSPlayback',
-//       androidNotificationChannelDescription:
-//           'Needed to control audio from lock screen',
-//       androidNotificationOngoing: false,
-//       androidStopForegroundOnPause: false,
-//       androidNotificationIcon: 'drawable/ic_stat_logo',
-//       preloadArtwork: true,
-//       // fastForwardInterval: Duration(seconds: 20),
-//       // rewindInterval: Duration(seconds: 20),
-//     ),
-//   );
-
-//   _logger.finer('created simple player');
-//   return audioService;
-// }
-
-// just_audio 播放器
-// @Riverpod(keepAlive: true)
-// core.AbsAudioPlayer audioPlayer(Ref ref) {
-//   final player = AbsPlatformAudioPlayer();
-//   // final player = AbsMpvAudioPlayer();
-//   ref.onDispose(player.dispose);
-//   return player;
-// }
-
 // 播放器激活状态
 @riverpod
 bool playerActive(Ref ref) {
-  return false;
+  return ref.watch(currentBookProvider) != null;
 }
 
 @Riverpod(keepAlive: true)
@@ -76,23 +36,23 @@ class AbsPlayer extends _$AbsPlayer {
   @override
   AbsAudioPlayer build() {
     final audioPlayer = ref.watch(simpleAudioPlayerProvider);
-    return AbsAudioPlayer(audioPlayer);
+    return AbsAudioPlayer(audioPlayer, ref);
   }
 
   Future<void> load(
-    api.BookExpanded book, {
+    shelfsdk.BookExpanded book, {
     Duration? initialPosition,
     bool play = true,
+    bool force = false,
   }) async {
-    if (state.book == book || state.book?.libraryItemId == book.libraryItemId) {
+    if (!force &&
+        (state.book == book ||
+            state.book?.libraryItemId == book.libraryItemId)) {
       state.playOrPause();
       return;
     }
     final api = ref.read(authenticatedApiProvider);
-
     final downloadManager = ref.read(simpleDownloadManagerProvider);
-    print(downloadManager.basePath);
-
     final libItem =
         await ref.read(libraryItemProvider(book.libraryItemId).future);
     final downloadedUris = await downloadManager.getDownloadedFilesUri(libItem);
@@ -112,6 +72,7 @@ class AbsPlayer extends _$AbsPlayer {
       downloadedUris: downloadedUris,
       start: bookSettings.playerSettings.skipChapterStart,
       end: bookSettings.playerSettings.skipChapterEnd,
+      force: force,
     );
     // set the volume
     await state.setVolume(
@@ -131,67 +92,6 @@ class AbsPlayer extends _$AbsPlayer {
   }
 }
 
-/// 音频播放器 riverpod状态
-// @Riverpod(keepAlive: true)
-// class AbsPlayer extends _$AbsPlayer {
-//   @override
-//   core.AbsAudioPlayer build() {
-//     final audioPlayer = ref.watch(audioPlayerProvider);
-//     return audioPlayer;
-//   }
-
-//   Future<void> load(
-//     api.BookExpanded book, {
-//     Duration? initialPosition,
-//     bool play = true,
-//   }) async {
-//     if (state.book == book || state.book?.libraryItemId == book.libraryItemId) {
-//       state.playOrPause();
-//       return;
-//     }
-//     final api = ref.read(authenticatedApiProvider);
-
-//     final downloadManager = ref.read(simpleDownloadManagerProvider);
-//     print(downloadManager.basePath);
-
-//     final libItem =
-//         await ref.read(libraryItemProvider(book.libraryItemId).future);
-//     final downloadedUris = await downloadManager.getDownloadedFilesUri(libItem);
-
-//     final bookSettings = ref.read(bookSettingsProvider(book.libraryItemId));
-//     var bookPlayerSettings = bookSettings.playerSettings;
-//     var appPlayerSettings = ref.read(appSettingsProvider).playerSettings;
-
-//     var configurePlayerForEveryBook =
-//         appPlayerSettings.configurePlayerForEveryBook;
-
-//     await state.load(
-//       book,
-//       baseUrl: api.baseUrl,
-//       token: api.token!,
-//       initialPosition: initialPosition,
-//       downloadedUris: downloadedUris,
-//       start: bookSettings.playerSettings.skipChapterStart,
-//       end: bookSettings.playerSettings.skipChapterEnd,
-//     );
-//     // set the volume
-//     await state.setVolume(
-//       configurePlayerForEveryBook
-//           ? bookPlayerSettings.preferredDefaultVolume ??
-//               appPlayerSettings.preferredDefaultVolume
-//           : appPlayerSettings.preferredDefaultVolume,
-//     );
-//     // set the speed
-//     await state.setSpeed(
-//       configurePlayerForEveryBook
-//           ? bookPlayerSettings.preferredDefaultSpeed ??
-//               appPlayerSettings.preferredDefaultSpeed
-//           : appPlayerSettings.preferredDefaultSpeed,
-//     );
-//     if (play) await state.play();
-//   }
-// }
-
 @riverpod
 class PlayerState extends _$PlayerState {
   @override
@@ -218,21 +118,24 @@ class PlayerState extends _$PlayerState {
 }
 
 @riverpod
-Future<Duration?> currentTime(Ref ref, String libraryItemId) async {
-  final me = await ref.watch(meProvider.future);
-  final userProgress = me.mediaProgress
-      ?.firstWhereOrNull((element) => element.libraryItemId == libraryItemId);
-  return userProgress?.currentTime;
+class CurrentTime extends _$CurrentTime {
+  @override
+  Future<shelfsdk.MediaProgress?> build(String libraryItemId) async {
+    final me = await ref.watch(meProvider.future);
+    final userProgress = me.mediaProgress
+        ?.firstWhereOrNull((element) => element.libraryItemId == libraryItemId);
+    return userProgress;
+  }
 }
 
 @riverpod
 class CurrentBook extends _$CurrentBook {
   @override
-  api.BookExpanded? build() {
+  shelfsdk.BookExpanded? build() {
     listenSelf((previous, next) {
       if (previous == null && next == null) {
-        final activeLibraryItemId = AvailableHiveBoxes.basicBox
-            .getAs<String>(CacheKey.activeLibraryItemId);
+        final activeLibraryItemId =
+            HiveBoxes.basicBox.getAs<String>(CacheKey.activeLibraryItemId);
         if (activeLibraryItemId != null) {
           update(activeLibraryItemId, play: false);
         }
@@ -240,31 +143,29 @@ class CurrentBook extends _$CurrentBook {
     });
     return null;
   }
-  // @override
-  // api.BookExpanded? build() {
-  //   final player = ref.read(absPlayerProvider);
-  //   player.bookStream.listen((book) {
-  //     if (book != state) {
-  //       state = book;
-  //     }
-  //   });
-  //   return player.book;
-  // }
 
-  Future<void> update(String libraryItemId, {bool play = true}) async {
-    if (state?.libraryItemId == libraryItemId) {
+  Future<void> update(
+    String libraryItemId, {
+    bool play = true,
+    bool force = false,
+    Duration? currentTime,
+  }) async {
+    if (!force && (state?.libraryItemId == libraryItemId)) {
       ref.read(absPlayerProvider).playOrPause();
       return;
     }
     final book = await ref.read(libraryItemProvider(libraryItemId).future);
     state = book.media.asBookExpanded;
-    final currentTime =
+    final mediaProgress =
         await ref.read(currentTimeProvider(libraryItemId).future);
-    await ref
-        .read(absPlayerProvider.notifier)
-        .load(state!, initialPosition: currentTime, play: play);
+    await ref.read(absPlayerProvider.notifier).load(
+          state!,
+          initialPosition: currentTime ?? mediaProgress?.currentTime,
+          play: play,
+          force: force,
+        );
     if (play) {
-      AvailableHiveBoxes.basicBox.put(
+      HiveBoxes.basicBox.put(
         CacheKey.activeLibraryItemId,
         libraryItemId,
       );
@@ -275,7 +176,7 @@ class CurrentBook extends _$CurrentBook {
 @riverpod
 class CurrentChapter extends _$CurrentChapter {
   @override
-  api.BookChapter? build() {
+  shelfsdk.BookChapter? build() {
     final player = ref.read(absPlayerProvider);
     player.chapterStream.listen((chapter) {
       if (chapter != state) {
@@ -286,7 +187,48 @@ class CurrentChapter extends _$CurrentChapter {
   }
 }
 
+/// 进度条显示
+// 进度条总时长
 @riverpod
-Stream<Duration> positionChapter(Ref ref) {
-  return ref.read(absPlayerProvider).positionInChapterStream;
+Duration total(Ref ref) {
+  final currentBook = ref.watch(currentBookProvider);
+  final currentChapter = ref.watch(currentChapterProvider);
+  final playerSettings =
+      ref.watch(appSettingsProvider.select((v) => v.playerSettings));
+  final showChapterProgress =
+      playerSettings.expandedPlayerSettings.showChapterProgress;
+  return showChapterProgress
+      ? ((currentChapter?.end ?? Duration.zero) -
+          (currentChapter?.start ?? Duration.zero))
+      : currentBook?.duration ?? Duration.zero;
+}
+
+// 进度条当前时长
+@riverpod
+Stream<Duration> progress(Ref ref) {
+  final player = ref.read(absPlayerProvider);
+  final playerSettings =
+      ref.watch(appSettingsProvider.select((v) => v.playerSettings));
+  final showChapterProgress =
+      playerSettings.expandedPlayerSettings.showChapterProgress;
+  return player.positionStream.map((position) {
+    return showChapterProgress
+        ? player.getPositionInChapter(position)
+        : player.getPositionInBook(position);
+  });
+}
+
+// 进度条已加载时长
+@riverpod
+Stream<Duration> progressBuffered(Ref ref) {
+  final player = ref.read(absPlayerProvider);
+  final playerSettings =
+      ref.watch(appSettingsProvider.select((v) => v.playerSettings));
+  final showChapterProgress =
+      playerSettings.expandedPlayerSettings.showChapterProgress;
+  return player.bufferedPositionStream.map((position) {
+    return showChapterProgress
+        ? player.getPositionInChapter(position)
+        : player.getPositionInBook(position);
+  });
 }