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

Code cleanup

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

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

@ -38,7 +38,7 @@ public enum ScrobbleProvider
Kavita = 0, Kavita = 0,
AniList = 1, AniList = 1,
Mal = 2, Mal = 2,
[Obsolete] [Obsolete("No longer supported")]
GoogleBooks = 3, GoogleBooks = 3,
Cbr = 4 Cbr = 4
} }
@ -350,52 +350,10 @@ public class ScrobblingService : IScrobblingService
#region Scrobble ingest #region Scrobble ingest
public async Task ScrobbleReviewUpdate(int userId, int seriesId, string? reviewTitle, string reviewBody) public Task ScrobbleReviewUpdate(int userId, int seriesId, string? reviewTitle, string reviewBody)
{ {
// Currently disabled until at least hardcover is implemented // Currently disabled until at least hardcover is implemented
return; return Task.CompletedTask;
if (!await _licenseService.HasActiveLicense()) return;
var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId, SeriesIncludes.Metadata | SeriesIncludes.Library);
if (series == null) throw new KavitaException(await _localizationService.Translate(userId, "series-doesnt-exist"));
_logger.LogInformation("Processing Scrobbling review event for {AppUserId} on {SeriesName}", userId, series.Name);
if (await CheckIfCannotScrobble(userId, seriesId, series)) return;
if (IsAniListReviewValid(reviewTitle, reviewBody))
{
_logger.LogDebug(
"Rejecting Scrobble event for {Series}. Review is not long enough to meet requirements", series.Name);
return;
}
var existingEvt = await _unitOfWork.ScrobbleRepository.GetEvent(userId, series.Id,
ScrobbleEventType.Review);
if (existingEvt is {IsProcessed: false})
{
_logger.LogDebug("Overriding Review scrobble event for {Series}", existingEvt.Series.Name);
existingEvt.ReviewBody = reviewBody;
existingEvt.ReviewTitle = reviewTitle;
_unitOfWork.ScrobbleRepository.Update(existingEvt);
await _unitOfWork.CommitAsync();
return;
}
var evt = new ScrobbleEvent()
{
SeriesId = series.Id,
LibraryId = series.LibraryId,
ScrobbleEventType = ScrobbleEventType.Review,
AniListId = ExtractId<int?>(series.Metadata.WebLinks, AniListWeblinkWebsite),
MalId = GetMalId(series),
AppUserId = userId,
Format = series.Library.Type.ConvertToPlusMediaFormat(series.Format),
ReviewBody = reviewBody,
ReviewTitle = reviewTitle
};
_unitOfWork.ScrobbleRepository.Attach(evt);
await _unitOfWork.CommitAsync();
_logger.LogDebug("Added Scrobbling Review update on {SeriesName} with Userid {AppUserId} ", series.Name, userId);
} }
public async Task ScrobbleRatingUpdate(int userId, int seriesId, float rating) public async Task ScrobbleRatingUpdate(int userId, int seriesId, float rating)
@ -739,14 +697,6 @@ public class ScrobblingService : IScrobblingService
.Where(e => !erroredSeries.Contains(e.SeriesId)) .Where(e => !erroredSeries.Contains(e.SeriesId))
.ToList(); .ToList();
/*// Clear any events that are already on error table
var erroredEvents = await _unitOfWork.ScrobbleRepository.GetAllEventsWithSeriesIds(erroredSeries);
if (erroredEvents.Count > 0)
{
_unitOfWork.ScrobbleRepository.Remove(erroredEvents);
await _unitOfWork.CommitAsync();
}*/
return new ScrobbleSyncContext return new ScrobbleSyncContext
{ {
ReadEvents = readEvents, ReadEvents = readEvents,
@ -897,7 +847,7 @@ public class ScrobblingService : IScrobblingService
ScrobbleEventType = evt.ScrobbleEventType, ScrobbleEventType = evt.ScrobbleEventType,
ChapterNumber = evt.ChapterNumber, ChapterNumber = evt.ChapterNumber,
VolumeNumber = (int?) evt.VolumeNumber, VolumeNumber = (int?) evt.VolumeNumber,
AniListToken = evt.AppUser.AniListAccessToken ?? "", AniListToken = evt.AppUser.AniListAccessToken ?? string.Empty,
SeriesName = evt.Series.Name, SeriesName = evt.Series.Name,
LocalizedSeriesName = evt.Series.LocalizedName, LocalizedSeriesName = evt.Series.LocalizedName,
Year = evt.Series.Metadata.ReleaseYear Year = evt.Series.Metadata.ReleaseYear
@ -925,7 +875,7 @@ public class ScrobblingService : IScrobblingService
AniListId = evt.AniListId, AniListId = evt.AniListId,
MALId = (int?) evt.MalId, MALId = (int?) evt.MalId,
ScrobbleEventType = evt.ScrobbleEventType, ScrobbleEventType = evt.ScrobbleEventType,
AniListToken = evt.AppUser.AniListAccessToken ?? "", AniListToken = evt.AppUser.AniListAccessToken ?? string.Empty,
SeriesName = evt.Series.Name, SeriesName = evt.Series.Name,
LocalizedSeriesName = evt.Series.LocalizedName, LocalizedSeriesName = evt.Series.LocalizedName,
Rating = evt.Rating, Rating = evt.Rating,
@ -956,7 +906,7 @@ public class ScrobblingService : IScrobblingService
ScrobbleEventType = evt.ScrobbleEventType, ScrobbleEventType = evt.ScrobbleEventType,
ChapterNumber = evt.ChapterNumber, ChapterNumber = evt.ChapterNumber,
VolumeNumber = (int?) evt.VolumeNumber, VolumeNumber = (int?) evt.VolumeNumber,
AniListToken = evt.AppUser.AniListAccessToken ?? "", AniListToken = evt.AppUser.AniListAccessToken ?? string.Empty,
SeriesName = evt.Series.Name, SeriesName = evt.Series.Name,
LocalizedSeriesName = evt.Series.LocalizedName, LocalizedSeriesName = evt.Series.LocalizedName,
ScrobbleDateUtc = evt.LastModifiedUtc, ScrobbleDateUtc = evt.LastModifiedUtc,
@ -1027,10 +977,16 @@ public class ScrobblingService : IScrobblingService
// We need to handle the encoding and changing it to the old one until we can update the API layer to handle these // We need to handle the encoding and changing it to the old one until we can update the API layer to handle these
// which could happen in v0.8.3 // which could happen in v0.8.3
if (data.VolumeNumber is Parser.SpecialVolumeNumber or Parser.DefaultChapterNumber) if (data.VolumeNumber is Parser.SpecialVolumeNumber or Parser.DefaultChapterNumber)
{
data.VolumeNumber = 0; data.VolumeNumber = 0;
}
if (data.ChapterNumber is Parser.DefaultChapterNumber) if (data.ChapterNumber is Parser.DefaultChapterNumber)
{
data.ChapterNumber = 0; data.ChapterNumber = 0;
}
return data; return data;
} }