mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-30 19:54:14 -04:00
* Adding some code for Robbie * See more on series detail metadata area is now at the bottom on the section * Cleaned up subtitle headings to use a single class for offset with actionables * Added some markup for the new design, waiting for Robbie to finish it off * styling age-rating badge * Started hooking up basic analyze file service and hooks in the UI. Basic code to implement the count is implemented and in benchmarks. * Hooked up analyze ui to backend * Refactored Series Detail metadata area to use a new icon/title design * Cleaned up the new design * Pushing for robbie to do css * Massive performance improvement to scan series where we only need to scan folders reported that have series in them, rather than the whole library. * Removed theme page as we no longer need it. Added WordCount to DTOs so the UI can show them. Added new pipe to format numbers in compact mode. * Hooked up actual reading time based on user's words per hour * Refactor some magic numbers to consts * Hooked in progress reporting for series word count * Hooked up analyze files * Re-implemented time to read on comics * Removed the word Last Read * Show proper language name instead of iso tag on series detail page. Added some error handling on word count code. * Reworked error handling * Fixed some security vulnerabilities in npm. * Handle a case where there are no text nodes and instead of returning an empty list, htmlagilitypack returns null. * Tweaked the styles a bit on the icon-and-title * Code cleanup Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
216 lines
8.3 KiB
C#
216 lines
8.3 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using API.Data;
|
|
using API.Entities.Enums;
|
|
using API.Helpers.Converters;
|
|
using API.Services.Tasks;
|
|
using API.Services.Tasks.Metadata;
|
|
using Hangfire;
|
|
using Hangfire.Storage;
|
|
using Microsoft.Extensions.Logging;
|
|
|
|
namespace API.Services;
|
|
|
|
public interface ITaskScheduler
|
|
{
|
|
Task ScheduleTasks();
|
|
Task ScheduleStatsTasks();
|
|
void ScheduleUpdaterTasks();
|
|
void ScanLibrary(int libraryId);
|
|
void CleanupChapters(int[] chapterIds);
|
|
void RefreshMetadata(int libraryId, bool forceUpdate = true);
|
|
void RefreshSeriesMetadata(int libraryId, int seriesId, bool forceUpdate = false);
|
|
void ScanSeries(int libraryId, int seriesId, bool forceUpdate = false);
|
|
void AnalyzeFilesForSeries(int libraryId, int seriesId, bool forceUpdate = false);
|
|
void AnalyzeFilesForLibrary(int libraryId, bool forceUpdate = false);
|
|
void CancelStatsTasks();
|
|
Task RunStatCollection();
|
|
void ScanSiteThemes();
|
|
|
|
|
|
}
|
|
public class TaskScheduler : ITaskScheduler
|
|
{
|
|
private readonly ICacheService _cacheService;
|
|
private readonly ILogger<TaskScheduler> _logger;
|
|
private readonly IScannerService _scannerService;
|
|
private readonly IUnitOfWork _unitOfWork;
|
|
private readonly IMetadataService _metadataService;
|
|
private readonly IBackupService _backupService;
|
|
private readonly ICleanupService _cleanupService;
|
|
|
|
private readonly IStatsService _statsService;
|
|
private readonly IVersionUpdaterService _versionUpdaterService;
|
|
private readonly IThemeService _themeService;
|
|
private readonly IWordCountAnalyzerService _wordCountAnalyzerService;
|
|
|
|
public static BackgroundJobServer Client => new BackgroundJobServer();
|
|
private static readonly Random Rnd = new Random();
|
|
|
|
|
|
public TaskScheduler(ICacheService cacheService, ILogger<TaskScheduler> logger, IScannerService scannerService,
|
|
IUnitOfWork unitOfWork, IMetadataService metadataService, IBackupService backupService,
|
|
ICleanupService cleanupService, IStatsService statsService, IVersionUpdaterService versionUpdaterService,
|
|
IThemeService themeService, IWordCountAnalyzerService wordCountAnalyzerService)
|
|
{
|
|
_cacheService = cacheService;
|
|
_logger = logger;
|
|
_scannerService = scannerService;
|
|
_unitOfWork = unitOfWork;
|
|
_metadataService = metadataService;
|
|
_backupService = backupService;
|
|
_cleanupService = cleanupService;
|
|
_statsService = statsService;
|
|
_versionUpdaterService = versionUpdaterService;
|
|
_themeService = themeService;
|
|
_wordCountAnalyzerService = wordCountAnalyzerService;
|
|
}
|
|
|
|
public async Task ScheduleTasks()
|
|
{
|
|
_logger.LogInformation("Scheduling reoccurring tasks");
|
|
|
|
var setting = (await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.TaskScan)).Value;
|
|
if (setting != null)
|
|
{
|
|
var scanLibrarySetting = setting;
|
|
_logger.LogDebug("Scheduling Scan Library Task for {Setting}", scanLibrarySetting);
|
|
RecurringJob.AddOrUpdate("scan-libraries", () => _scannerService.ScanLibraries(),
|
|
() => CronConverter.ConvertToCronNotation(scanLibrarySetting), TimeZoneInfo.Local);
|
|
}
|
|
else
|
|
{
|
|
RecurringJob.AddOrUpdate("scan-libraries", () => _scannerService.ScanLibraries(), Cron.Daily, TimeZoneInfo.Local);
|
|
}
|
|
|
|
setting = (await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.TaskBackup)).Value;
|
|
if (setting != null)
|
|
{
|
|
_logger.LogDebug("Scheduling Backup Task for {Setting}", setting);
|
|
RecurringJob.AddOrUpdate("backup", () => _backupService.BackupDatabase(), () => CronConverter.ConvertToCronNotation(setting), TimeZoneInfo.Local);
|
|
}
|
|
else
|
|
{
|
|
RecurringJob.AddOrUpdate("backup", () => _backupService.BackupDatabase(), Cron.Weekly, TimeZoneInfo.Local);
|
|
}
|
|
|
|
RecurringJob.AddOrUpdate("cleanup", () => _cleanupService.Cleanup(), Cron.Daily, TimeZoneInfo.Local);
|
|
RecurringJob.AddOrUpdate("cleanup-db", () => _cleanupService.CleanupDbEntries(), Cron.Daily, TimeZoneInfo.Local);
|
|
}
|
|
|
|
#region StatsTasks
|
|
|
|
|
|
public async Task ScheduleStatsTasks()
|
|
{
|
|
var allowStatCollection = (await _unitOfWork.SettingsRepository.GetSettingsDtoAsync()).AllowStatCollection;
|
|
if (!allowStatCollection)
|
|
{
|
|
_logger.LogDebug("User has opted out of stat collection, not registering tasks");
|
|
return;
|
|
}
|
|
|
|
_logger.LogDebug("Scheduling stat collection daily");
|
|
RecurringJob.AddOrUpdate("report-stats", () => _statsService.Send(), Cron.Daily(Rnd.Next(0, 22)), TimeZoneInfo.Local);
|
|
}
|
|
|
|
public void AnalyzeFilesForLibrary(int libraryId, bool forceUpdate = false)
|
|
{
|
|
BackgroundJob.Enqueue(() => _wordCountAnalyzerService.ScanLibrary(libraryId, forceUpdate));
|
|
}
|
|
|
|
public void CancelStatsTasks()
|
|
{
|
|
_logger.LogDebug("Cancelling/Removing StatsTasks");
|
|
|
|
RecurringJob.RemoveIfExists("report-stats");
|
|
}
|
|
|
|
/// <summary>
|
|
/// First time run stat collection. Executes immediately on a background thread. Does not block.
|
|
/// </summary>
|
|
public async Task RunStatCollection()
|
|
{
|
|
var allowStatCollection = (await _unitOfWork.SettingsRepository.GetSettingsDtoAsync()).AllowStatCollection;
|
|
if (!allowStatCollection)
|
|
{
|
|
_logger.LogDebug("User has opted out of stat collection, not sending stats");
|
|
return;
|
|
}
|
|
BackgroundJob.Enqueue(() => _statsService.Send());
|
|
}
|
|
|
|
public void ScanSiteThemes()
|
|
{
|
|
_logger.LogInformation("Starting Site Theme scan");
|
|
BackgroundJob.Enqueue(() => _themeService.Scan());
|
|
}
|
|
|
|
#endregion
|
|
|
|
#region UpdateTasks
|
|
|
|
public void ScheduleUpdaterTasks()
|
|
{
|
|
_logger.LogInformation("Scheduling Auto-Update tasks");
|
|
// Schedule update check between noon and 6pm local time
|
|
RecurringJob.AddOrUpdate("check-updates", () => CheckForUpdate(), Cron.Daily(Rnd.Next(12, 18)), TimeZoneInfo.Local);
|
|
}
|
|
#endregion
|
|
|
|
public void ScanLibrary(int libraryId)
|
|
{
|
|
_logger.LogInformation("Enqueuing library scan for: {LibraryId}", libraryId);
|
|
// TODO: If a library scan is already queued up for libraryId, don't do anything
|
|
BackgroundJob.Enqueue(() => _scannerService.ScanLibrary(libraryId));
|
|
// When we do a scan, force cache to re-unpack in case page numbers change
|
|
BackgroundJob.Enqueue(() => _cleanupService.CleanupCacheDirectory());
|
|
}
|
|
|
|
public void CleanupChapters(int[] chapterIds)
|
|
{
|
|
BackgroundJob.Enqueue(() => _cacheService.CleanupChapters(chapterIds));
|
|
}
|
|
|
|
public void RefreshMetadata(int libraryId, bool forceUpdate = true)
|
|
{
|
|
_logger.LogInformation("Enqueuing library metadata refresh for: {LibraryId}", libraryId);
|
|
BackgroundJob.Enqueue(() => _metadataService.RefreshMetadata(libraryId, forceUpdate));
|
|
}
|
|
|
|
public void RefreshSeriesMetadata(int libraryId, int seriesId, bool forceUpdate = true)
|
|
{
|
|
_logger.LogInformation("Enqueuing series metadata refresh for: {SeriesId}", seriesId);
|
|
BackgroundJob.Enqueue(() => _metadataService.RefreshMetadataForSeries(libraryId, seriesId, forceUpdate));
|
|
}
|
|
|
|
public void ScanSeries(int libraryId, int seriesId, bool forceUpdate = false)
|
|
{
|
|
_logger.LogInformation("Enqueuing series scan for: {SeriesId}", seriesId);
|
|
BackgroundJob.Enqueue(() => _scannerService.ScanSeries(libraryId, seriesId, CancellationToken.None));
|
|
}
|
|
|
|
public void AnalyzeFilesForSeries(int libraryId, int seriesId, bool forceUpdate = false)
|
|
{
|
|
_logger.LogInformation("Enqueuing analyze files scan for: {SeriesId}", seriesId);
|
|
BackgroundJob.Enqueue(() => _wordCountAnalyzerService.ScanSeries(libraryId, seriesId, forceUpdate));
|
|
}
|
|
|
|
public void BackupDatabase()
|
|
{
|
|
BackgroundJob.Enqueue(() => _backupService.BackupDatabase());
|
|
}
|
|
|
|
/// <summary>
|
|
/// Not an external call. Only public so that we can call this for a Task
|
|
/// </summary>
|
|
// ReSharper disable once MemberCanBePrivate.Global
|
|
public async Task CheckForUpdate()
|
|
{
|
|
var update = await _versionUpdaterService.CheckForUpdate();
|
|
await _versionUpdaterService.PushUpdate(update);
|
|
}
|
|
}
|