From 19198beadf349b6baa97c7076d0d128ec6a0d49a Mon Sep 17 00:00:00 2001 From: Joe Milazzo Date: Mon, 24 Apr 2023 18:51:15 -0500 Subject: [PATCH] Reading List Bug (#1943) * Refactored how we calculate start and end dates for a reading list generated from Scan. * Cleaned up the logging messages a bit * By default, allow DB statements to include params, since there's no PPI involved. --- API/Extensions/ApplicationServiceExtensions.cs | 3 ++- API/Services/ReadingListService.cs | 5 +++-- API/Services/Tasks/Scanner/ProcessSeries.cs | 1 - Kavita.Common/Configuration.cs | 3 +++ openapi.json | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/API/Extensions/ApplicationServiceExtensions.cs b/API/Extensions/ApplicationServiceExtensions.cs index 164b58751..765c6e120 100644 --- a/API/Extensions/ApplicationServiceExtensions.cs +++ b/API/Extensions/ApplicationServiceExtensions.cs @@ -70,7 +70,8 @@ public static class ApplicationServiceExtensions { options.UseSqlite("Data source=config/kavita.db"); options.EnableDetailedErrors(); - options.EnableSensitiveDataLogging(env.IsDevelopment()); + + options.EnableSensitiveDataLogging(); }); } } diff --git a/API/Services/ReadingListService.cs b/API/Services/ReadingListService.cs index 8c99da39f..e26bc7bf9 100644 --- a/API/Services/ReadingListService.cs +++ b/API/Services/ReadingListService.cs @@ -297,7 +297,7 @@ public class ReadingListService : IReadingListService /// /// Calculates the Start month/year and Ending month/year /// - /// Reading list should have all items + /// Reading list should have all items and Chapters public async Task CalculateStartAndEndDates(ReadingList readingListWithItems) { var items = readingListWithItems.Items; @@ -497,11 +497,12 @@ public class ReadingListService : IReadingListService readingList.Items = items; await CalculateReadingListAgeRating(readingList); - await CalculateStartAndEndDates(readingList); if (_unitOfWork.HasChanges()) { await _unitOfWork.CommitAsync(); } + await CalculateStartAndEndDates(await _unitOfWork.ReadingListRepository.GetReadingListByTitleAsync(arcPair.Item1, user.Id, ReadingListIncludes.Items | ReadingListIncludes.ItemChapter)); + await _unitOfWork.CommitAsync(); } } } diff --git a/API/Services/Tasks/Scanner/ProcessSeries.cs b/API/Services/Tasks/Scanner/ProcessSeries.cs index 563f88f75..18c3e2d16 100644 --- a/API/Services/Tasks/Scanner/ProcessSeries.cs +++ b/API/Services/Tasks/Scanner/ProcessSeries.cs @@ -500,7 +500,6 @@ public class ProcessSeries : IProcessSeries _logger.LogDebug("[ScannerService] Updating {DistinctVolumes} volumes on {SeriesName}", distinctVolumes.Count, series.Name); foreach (var volumeNumber in distinctVolumes) { - _logger.LogTrace("[ScannerService] Looking up volume for {VolumeNumber}", volumeNumber); Volume? volume; try { diff --git a/Kavita.Common/Configuration.cs b/Kavita.Common/Configuration.cs index 96719addb..cde819cb7 100644 --- a/Kavita.Common/Configuration.cs +++ b/Kavita.Common/Configuration.cs @@ -304,8 +304,11 @@ public static class Configuration private sealed class AppSettings { public string TokenKey { get; set; } + // ReSharper disable once MemberHidesStaticFromOuterClass public int Port { get; set; } + // ReSharper disable once MemberHidesStaticFromOuterClass public string IpAddresses { get; set; } + // ReSharper disable once MemberHidesStaticFromOuterClass public string BaseUrl { get; set; } } } diff --git a/openapi.json b/openapi.json index c4c08e989..b0f3dfcee 100644 --- a/openapi.json +++ b/openapi.json @@ -7,7 +7,7 @@ "name": "GPL-3.0", "url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE" }, - "version": "0.7.1.38" + "version": "0.7.1.41" }, "servers": [ {