fix: 重复标记已观看时，同步api检查状态

kookxiang · May 8, 2023 · b04e6ec · b04e6ec
1 parent adae824
commit b04e6ec
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/Jellyfin.Plugin.Bangumi/BangumiApi.cs b/Jellyfin.Plugin.Bangumi/BangumiApi.cs
@@ -202,6 +202,11 @@ public async Task UpdateCollectionStatus(string accessToken, int subjectId, Coll
         await SendRequest(request, accessToken, token);
     }
 
+    public async Task<EpisodeCollectionInfo?> GetEpisodeStatus(string accessToken, int episodeId, CancellationToken token)
+    {
+        return await SendRequest<EpisodeCollectionInfo>($"https://api.bgm.tv/v0/users/-/collections/-/episodes/{episodeId}", accessToken, token);
+    }
+
     public async Task UpdateEpisodeStatus(string accessToken, int subjectId, int episodeId, EpisodeCollectionType status, CancellationToken token)
     {
         var request = new HttpRequestMessage(HttpMethod.Put, $"https://api.bgm.tv/v0/users/-/collections/-/episodes/{episodeId}");

diff --git a/Jellyfin.Plugin.Bangumi/PlaybackScrobbler.cs b/Jellyfin.Plugin.Bangumi/PlaybackScrobbler.cs
@@ -78,7 +78,7 @@ private void OnUserDataSaved(object? sender, UserDataSaveEventArgs e)
                 GetPlaybackHistory(e.UserId).Remove(e.UserData.Key);
                 _log.LogInformation("mark {Name} (#{Id}) as new for user #{User}", e.Item.Name, e.Item.Id, e.UserId);
                 if (Configuration.ReportManualStatusChangeToBangumi)
-                    ReportPlaybackStatus(e.Item, e.UserId, true).ConfigureAwait(false);
+                    ReportPlaybackStatus(e.Item, e.UserId, false).ConfigureAwait(false);
                 break;
 
             case UserDataSaveReason.PlaybackFinished when e.UserData.Played:
@@ -130,8 +130,12 @@ private async Task ReportPlaybackStatus(BaseItem item, Guid userId, bool played)
 
         if (item.GetUserDataKeys().Intersect(GetPlaybackHistory(userId)).Any())
         {
-            _log.LogInformation("item {Name} (#{Id}) has been played before, ignored", item.Name, item.Id);
-            return;
+            var episodeStatus = await _api.GetEpisodeStatus(user.AccessToken, episodeId,  CancellationToken.None);
+            if (played && episodeStatus is {Type: EpisodeCollectionType.Watched})
+            {
+                _log.LogInformation("item {Name} (#{Id}) has been marked as watched before, ignored", item.Name, item.Id);
+                return;
+            }
         }
 
         try