mirror of
				https://github.com/Kareadita/Kavita.git
				synced 2025-11-04 03:27:05 -05:00 
			
		
		
		
	* Started with the redesign of the cover image chooser redesign to be less click intensive for volume/chapter images. Made some headings bold in card detail drawer. * Tweaked the styles * Moved where the info cards show * Added an ability to open a page settings drawer * Cleaned up some old code that isn't needed anymore. * Started implementing a list view. Refactored some title code to a dedicated component * List view implemented but way too many API calls. Either need caching or adjusting the SeriesDetail api. * Fixed a bug where if the progress bar didn't render on a card item while a download was in progress, the download indicator would be removed. * Large refactor to move a lot of the needed fields to the chapter and volume dtos for series detail. All fields are noted when only used in series detail. * Implemented cards for other tabs (except related) * Fixed the unit test which needed a mocked reader service call. * More cleanup around age rating and removing old code from the refactor. Commented out sorting till i feel motivated to work on that. * Some cleanup and restored cards as initial layout. Time to test this out and see if there is value add. * Added ability for Chapters tab to show the volume chapters belong to (if applicable) * Adding style fixes * Cover image updates, don't allow the first image (which is what is currently set) to respond to cover changes. Hide the ID field on list item for series detail. * Refactored the title for list item to be injectable * Cleaned up the selection code to make it less finicky on mobile when tap scrolling. * Refactored chapter tab to show volume as well on list view. * Ensure word count shows for Volumes * Started adding virtual scrolling, pushing up so Robbie can mess around * Started adding virtual scrolling, pushing up so Robbie can mess around * Fixed a bug where all chapters would come under specials * Show title data as accent if set. * Style fixes for virtual scroller * Restyling scroll * Implemented a way to show storyline with virtual scrolling * Show Word Count for chapters and cleaned up some logics. * I might have card layout working with virtual scroll code. * Some cleanup to hide more system like properties from info bar on series detail page. Fixed some missing time estimate info on storyline chapters. * Fixed a regression on series service when I integrated VolumeTitle. * Refactored read time to the backend. Added WordCount to the volume itself so we don't need to calculate on frontend. When asking to analyze files from a series, force the calculation. * Fixed SeriesDetail api code * Fixed up the code in the drawer to better update list/card mode * Basic infinite scroll implemented, however due to how we are updating the list to render, we are re-rending cards that haven't been touched. * Updated how we render and layout data for infinite scroll on library detail. It's almost there. * Started laying foundation for loading pages backwards. Removed lazy loading of images since we are now using virtual paging. * Hooked in some basic code to allow user to load a prev page with infinite scroll. * Fixed up series detail api and undid the non-lazy loaded images. Changed the router to help with this infinite loading on Firefox issue. * Fixed up some naming issues with Series Detail and added a new test. * This is an infinite scroll without pagination implementation. It is not fully done, but off to a good start. Virtual scroller with jump bar is working pretty well, def needs more polishing and tweaking. There are hacks in this implementation that need to be revisited. * Refactored code so that we don't use any pagination and load all results by default. * Misc code cleanup from build warnings. * Cleaned up some logic for how to display titles in list view. * More title cleanup for specials * Hooked up page layout to user preferences and renamed an existing user pref name to match the dto. * Swapped out everything but storyline with virtual-scroller over CDK * Removed CDK from series detail. * Default value for migration on page layout * Updating card layout for library detail page * fixing height for mobile * Moved scrollbar * Tweaked some styling for layouts when there is no data * Refactored the series cards into their own component to make it re-usable. * More tweaks on series info cards layout and enhanced a few pages with trackby functions. * Removed some dead code * Added download on series detail to actionables to fit in with new scroll strategy. * Fixed language not being updated and sent to the backend for series update. * Fixed a bad migration (if you ran any prior migration in this branch, you need to undo before you use this commit) * Adding sticky tabs * fixed mobile gap on sticky tab * Enhanced the card title for books to show number up front. * Adjusted the gutters on admin dashboard * Removed debug code * Removing duplicate book title * Cleaned up old references to cdk scroller * Implemented a basic jump bar scaling algorithm. Not perfect, but works pretty well. * Code smells 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 = false)
 | 
						|
    {
 | 
						|
        _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);
 | 
						|
    }
 | 
						|
}
 |