chore: save last played track index

instead of path
namidaco · Oct 26, 2023 · 0ab0292 · 0ab0292
1 parent d761003
commit 0ab0292
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/lib/controller/audio_handler.dart b/lib/controller/audio_handler.dart
@@ -540,7 +540,7 @@ class NamidaAudioVideoHandler<Q extends Playable> extends BasicAudioHandler<Q> {
     startSleepAfterMinCount();
     startCounterToAListen(pi);
     increaseListenTime();
-    settings.save(lastPlayedTrackPath: tr.path);
+    settings.save(lastPlayedTrackIndex: index);
     Lyrics.inst.updateLyrics(tr);
   }
 

diff --git a/lib/controller/queue_controller.dart b/lib/controller/queue_controller.dart
@@ -200,12 +200,10 @@ class QueueController {
 
     if (latestQueue.isEmpty) return;
 
-    final latestTrack = settings.lastPlayedTrackPath.value.toTrack();
-
-    final index = latestQueue.indexOf(latestTrack).toIf(0, -1);
+    final index = settings.lastPlayedTrackIndex.value;
 
     await Player.inst.playOrPause(
-      index,
+      index > latestQueue.length - 1 ? 0 : index,
       latestQueue,
       QueueSource.playerQueue,
       startPlaying: false,

diff --git a/lib/controller/settings_controller.dart b/lib/controller/settings_controller.dart
@@ -136,7 +136,7 @@ class SettingsController {
   final RxInt playerPlayFadeDurInMilli = 300.obs;
   final RxInt playerPauseFadeDurInMilli = 300.obs;
   final RxInt minTrackDurationToRestoreLastPosInMinutes = 5.obs;
-  final RxString lastPlayedTrackPath = ''.obs;
+  final RxInt lastPlayedTrackIndex = 0.obs;
   final RxBool displayFavouriteButtonInNotification = false.obs;
   final RxBool enableSearchCleanup = true.obs;
   final RxBool enableBottomNavBar = true.obs;
@@ -384,7 +384,7 @@ class SettingsController {
       playerPlayFadeDurInMilli.value = json['playerPlayFadeDurInMilli'] ?? playerPlayFadeDurInMilli.value;
       playerPauseFadeDurInMilli.value = json['playerPauseFadeDurInMilli'] as int? ?? playerPauseFadeDurInMilli.value;
       minTrackDurationToRestoreLastPosInMinutes.value = json['minTrackDurationToRestoreLastPosInMinutes'] ?? minTrackDurationToRestoreLastPosInMinutes.value;
-      lastPlayedTrackPath.value = json['lastPlayedTrackPath'] ?? lastPlayedTrackPath.value;
+      lastPlayedTrackIndex.value = json['lastPlayedTrackIndex'] ?? lastPlayedTrackIndex.value;
       displayFavouriteButtonInNotification.value = json['displayFavouriteButtonInNotification'] ?? displayFavouriteButtonInNotification.value;
       enableSearchCleanup.value = json['enableSearchCleanup'] ?? enableSearchCleanup.value;
       enableBottomNavBar.value = json['enableBottomNavBar'] ?? enableBottomNavBar.value;
@@ -581,7 +581,7 @@ class SettingsController {
       'playerPlayFadeDurInMilli': playerPlayFadeDurInMilli.value,
       'playerPauseFadeDurInMilli': playerPauseFadeDurInMilli.value,
       'minTrackDurationToRestoreLastPosInMinutes': minTrackDurationToRestoreLastPosInMinutes.value,
-      'lastPlayedTrackPath': lastPlayedTrackPath.value,
+      'lastPlayedTrackIndex': lastPlayedTrackIndex.value,
       'displayFavouriteButtonInNotification': displayFavouriteButtonInNotification.value,
       'enableSearchCleanup': enableSearchCleanup.value,
       'enableBottomNavBar': enableBottomNavBar.value,
@@ -749,7 +749,7 @@ class SettingsController {
     int? playerPlayFadeDurInMilli,
     int? playerPauseFadeDurInMilli,
     int? minTrackDurationToRestoreLastPosInMinutes,
-    String? lastPlayedTrackPath,
+    int? lastPlayedTrackIndex,
     bool? displayFavouriteButtonInNotification,
     bool? enableSearchCleanup,
     bool? enableBottomNavBar,
@@ -1135,8 +1135,8 @@ class SettingsController {
     if (minTrackDurationToRestoreLastPosInMinutes != null) {
       this.minTrackDurationToRestoreLastPosInMinutes.value = minTrackDurationToRestoreLastPosInMinutes;
     }
-    if (lastPlayedTrackPath != null) {
-      this.lastPlayedTrackPath.value = lastPlayedTrackPath;
+    if (lastPlayedTrackIndex != null) {
+      this.lastPlayedTrackIndex.value = lastPlayedTrackIndex;
     }
     if (displayFavouriteButtonInNotification != null) {
       this.displayFavouriteButtonInNotification.value = displayFavouriteButtonInNotification;