mirror of
				https://github.com/Kareadita/Kavita.git
				synced 2025-11-04 03:27:05 -05:00 
			
		
		
		
	* Started the migration to bootstrap 5. Introduced a breakpoint system that bootstrap reflects for our screens. * sr only migrated * mr/ml -> me/ms * pl/pr -> ps/pe * btn-block * removed input-group-append * Added form-label to all labels * Added some style overrides for inputs * Replaced form-group with mb-3 * Ignore journal files * Update media to d-flex/flex-grow-1 * Fixed reading list detail page * For develop builds, don't inline critical styles * Fixed some downstream security issues * Fixed a layout issue in series detail * Fixed issue with btn-light not having background color. Updated layout for series detail metadata * Cleaned up nav search * Laid out the organization for custom theme components. Update _inputs.scss with variable overrides and depending on theme, it will just work. * Lots of theming work * Added inputs to the theme page * Login and input placeholder changes - Fixed login screen centering issue on all devices - Changed the format of the login screen - Change the input placeholder color * Added checkbox styles * Refactored tagbadges and removed some ngdeep selectors * Added nav bar component and refactored some styles into event widget * Cleaned nav events again and made dedicated popover body * Finished pagination component * Fixed up some styles with buttons * refactored dropdown component * Update accordion component * Refactored breadcrumbs and rating star. Fixed a missing style for cards * Fixed some styling issues on person badge, added modal component, and some global styles * Finished moving everything within dark to component files * Fixed up filter buttons, move card styles into a component theme, fixed slider style * Refactored library card and grouped typeahead * Updated normal typeahead component and reduced amount of ngdeep selector * Refactored grid breakpoints to be available by css variable, but it's hardcoded into the app * Ensure breakpoints are defined per theme * Fixed up some styling overrides and customization for nav links and alt button * Removed some deep styles, moved css out of splash container and brough back labels for login page * Finished css variable refactor * Refactored all the theme variable definitions into files for each theme. * Added back bootstrap overrides * Added a note about bootstrap theme colors being not-possible to swap out at runtime * Cleaned up some dead code * Implemented the ability to set a custom theme on the site. Cleaned up misc code throughout. * Additional changes - Fixed nav where "kavita" was not hiding correctly on small viewports - Fixed search bar to make the behavior more consistent - Fixed accordion buttons - Changed accordion buttons to be more responsive - Added radio button colors - Fixed radios on theme test page - Changed login and reset password card layouts to be more consistent. - Added primary color shade for when darker shading is needed. * Built a basic site, allow the user to apply different themes, refactored nav service code out. * Implemented the ability update a user's theme * Added unit tests for Scan and Get Content in SiteThemeService. * Fixed a bug in the login code and Pref code which wasn't joining on SiteTheme table. Wrote Unit tests and the UI component to manage current theme. * Implemented scan so that it manages custom themes with unit tests * Component updates - Repositioning style ordering - Adding indicator override - Adding select styles * SignlaR integration, some fixes when creating custom entities, one single migration. Just login functionality left. * More ui updated - Added .no-hover to prevent hover on elements where not needed - Changed all selects I could find to appropriate class - Changed up nav tabs to work more like bootstrap tabs than pills - Added padding to top of some containers to make styles consistent - Added ability to change navbar fontawesome icon colors - removed some unecessary inline styling - Changed radio button to appropriate class - Toned down primate color, a bit too bright for dark theme. - Added ability to change button fontawesome icon color * nav-tab fix for series-detail * Added themes folder to gitignore * Adding card overlay * Fixing up light theme * Everything is done. Only bug is that color-scheme isn't being set properly from css variable. * Checkboxes have pointer by default. Confirm/Confirm email use default (dark) theme by default * Fixed an error where color-scheme wasn't reflecting correctly on themes on first load * Fixed user preferences not available on login * Changing dual radios to switches and color tweaks * disabled primary APCA fix * button APCA fixes * Fixed some timing issues with first load and image service * Fixed swiper issues from upgrade * Changed themes to be scss files again and adjusted Seed code * Migrated carousel to css variables. Fixed a broken animation for search. * Cleaned up some backend smells * Fixed white border outline on nav tabs, added some variables for header * Nav bar has been css variable-ified * Added some basic eink stuff to make the app useable Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
		
			
				
	
	
		
			195 lines
		
	
	
		
			7.4 KiB
		
	
	
	
		
			C#
		
	
	
	
	
	
			
		
		
	
	
			195 lines
		
	
	
		
			7.4 KiB
		
	
	
	
		
			C#
		
	
	
	
	
	
using System;
 | 
						|
using System.Threading;
 | 
						|
using System.Threading.Tasks;
 | 
						|
using API.Data;
 | 
						|
using API.Entities.Enums;
 | 
						|
using API.Helpers.Converters;
 | 
						|
using API.Services.Tasks;
 | 
						|
using Hangfire;
 | 
						|
using Microsoft.Extensions.Logging;
 | 
						|
 | 
						|
namespace API.Services;
 | 
						|
 | 
						|
public interface ITaskScheduler
 | 
						|
{
 | 
						|
    Task ScheduleTasks();
 | 
						|
    Task ScheduleStatsTasks();
 | 
						|
    void ScheduleUpdaterTasks();
 | 
						|
    void ScanLibrary(int libraryId, bool forceUpdate = false);
 | 
						|
    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 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 ISiteThemeService _siteThemeService;
 | 
						|
 | 
						|
    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,
 | 
						|
        ISiteThemeService siteThemeService)
 | 
						|
    {
 | 
						|
        _cacheService = cacheService;
 | 
						|
        _logger = logger;
 | 
						|
        _scannerService = scannerService;
 | 
						|
        _unitOfWork = unitOfWork;
 | 
						|
        _metadataService = metadataService;
 | 
						|
        _backupService = backupService;
 | 
						|
        _cleanupService = cleanupService;
 | 
						|
        _statsService = statsService;
 | 
						|
        _versionUpdaterService = versionUpdaterService;
 | 
						|
        _siteThemeService = siteThemeService;
 | 
						|
    }
 | 
						|
 | 
						|
    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 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(() => _siteThemeService.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, bool forceUpdate = false)
 | 
						|
    {
 | 
						|
        _logger.LogInformation("Enqueuing library scan for: {LibraryId}", libraryId);
 | 
						|
        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 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);
 | 
						|
    }
 | 
						|
}
 |