AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't scrobble unless there is any progress on a series.

Browse source
This commit is contained in:
Joseph Milazzo 2025-06-20 10:08:16 -05:00
parent 169d819de5
commit 397c1c7220
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
API/Services/Plus/ScrobblingService.cs
View file

@ -453,15 +453,18 @@ public class ScrobblingService : IScrobblingService
_logger.LogInformation("Processing Scrobbling reading event for {AppUserId} on {SeriesName}", userId, series.Name); _logger.LogInformation("Processing Scrobbling reading event for {AppUserId} on {SeriesName}", userId, series.Name);
if (await CheckIfCannotScrobble(userId, seriesId, series)) return; if (await CheckIfCannotScrobble(userId, seriesId, series)) return;
var isAnyProgressOnSeries = await _unitOfWork.AppUserProgressRepository.HasAnyProgressOnSeriesAsync(seriesId, userId);
var volumeNumber = (int) await _unitOfWork.AppUserProgressRepository.GetHighestFullyReadVolumeForSeries(seriesId, userId); var volumeNumber = (int) await _unitOfWork.AppUserProgressRepository.GetHighestFullyReadVolumeForSeries(seriesId, userId);
var chapterNumber = await _unitOfWork.AppUserProgressRepository.GetHighestFullyReadChapterForSeries(seriesId, userId); var chapterNumber = await _unitOfWork.AppUserProgressRepository.GetHighestFullyReadChapterForSeries(seriesId, userId);
// Check if there is an existing not yet processed event, if so update it // Check if there is an existing not yet processed event, if so update it
var existingEvt = await _unitOfWork.ScrobbleRepository.GetEvent(userId, series.Id, var existingEvt = await _unitOfWork.ScrobbleRepository.GetEvent(userId, series.Id,
ScrobbleEventType.ChapterRead, true); ScrobbleEventType.ChapterRead, true);
if (existingEvt is {IsProcessed: false}) if (existingEvt is {IsProcessed: false})
{ {
if (volumeNumber == 0 && chapterNumber == 0) if (!isAnyProgressOnSeries)
{ {
_unitOfWork.ScrobbleRepository.Remove(existingEvt); _unitOfWork.ScrobbleRepository.Remove(existingEvt);
await _unitOfWork.CommitAsync(); await _unitOfWork.CommitAsync();
@ -483,7 +486,7 @@ public class ScrobblingService : IScrobblingService
return; return;
} }
if (volumeNumber == 0 && chapterNumber == 0) if (!isAnyProgressOnSeries)
{ {
// Do not create a new scrobble event if there is no progress // Do not create a new scrobble event if there is no progress
return; return;
@ -594,23 +597,23 @@ public class ScrobblingService : IScrobblingService
foreach (var webLink in webLinks.Split(',')) foreach (var webLink in webLinks.Split(','))
{ {
if (!webLink.StartsWith(website)) continue; if (!webLink.StartsWith(website)) continue;
var tokens = webLink.Split(website)[1].Split('/'); var tokens = webLink.Split(website)[1].Split('/');
var value = tokens[index]; var value = tokens[index];
if (typeof(T) == typeof(int?)) if (typeof(T) == typeof(int?))
{ {
if (int.TryParse(value, CultureInfo.InvariantCulture, out var intValue)) if (int.TryParse(value, CultureInfo.InvariantCulture, out var intValue)) return (T)(object)intValue;
return (T)(object)intValue;
} }
else if (typeof(T) == typeof(int)) else if (typeof(T) == typeof(int))
{ {
if (int.TryParse(value, CultureInfo.InvariantCulture, out var intValue)) if (int.TryParse(value, CultureInfo.InvariantCulture, out var intValue)) return (T)(object)intValue;
return (T)(object)intValue;
return default; return default;
} }
else if (typeof(T) == typeof(long?)) else if (typeof(T) == typeof(long?))
{ {
if (long.TryParse(value, CultureInfo.InvariantCulture, out var longValue)) if (long.TryParse(value, CultureInfo.InvariantCulture, out var longValue)) return (T)(object)longValue;
return (T)(object)longValue;
} }
else if (typeof(T) == typeof(string)) else if (typeof(T) == typeof(string))
{ {