Merge pull request #936 from Maxr1998/offline-listen-log-tweaks

Use same logic for playback stop events and offline listen log
jmshrv · Oct 31, 2024 · 34cda03 · 34cda03
2 parents 9996889 + 4e1cfe9
commit 34cda03
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/lib/services/offline_listen_helper.dart b/lib/services/offline_listen_helper.dart
@@ -57,6 +57,7 @@ class OfflineListenLogHelper {
   /// The [timestamp] provided to this function should be in seconds
   /// and marks the time the track was stopped.
   Future<void> _logOfflineListen(OfflineListen listen) {
+    _logger.info("Storing offline listen for ${listen.name}");
     return Future.wait([
       Hive.box<OfflineListen>("OfflineListens").add(listen),
       _exportOfflineListenToFile(listen)

diff --git a/lib/services/playback_history_service.dart b/lib/services/playback_history_service.dart
@@ -338,19 +338,21 @@ class PlaybackHistoryService {
     PlaybackState? previousState,
     bool skippingForward,
   ) async {
+    final shouldReportPreviousTrack = previousItem != null &&
+        previousState != null &&
+        // don't submit stop events for idle tracks (at position 0 and not playing)
+        (previousState.playing ||
+            previousState.updatePosition != Duration.zero);
+
     if (FinampSettingsHelper.finampSettings.isOffline) {
-      if (previousItem != null) {
+      if (shouldReportPreviousTrack) {
         await _offlineListenLogHelper.logOfflineListen(previousItem.item);
       }
       return;
     }
 
     jellyfin_models.PlaybackProgressInfo? previousTrackPlaybackData;
-    if (previousItem != null &&
-        previousState != null &&
-        // don't submit stop events for idle tracks (at position 0 and not playing)
-        (previousState.playing ||
-            previousState.updatePosition != Duration.zero)) {
+    if (shouldReportPreviousTrack) {
       previousTrackPlaybackData = generatePlaybackProgressInfoFromState(
         previousItem,
         previousState,