mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-06-23 15:30:34 -04:00
* Took care of some notes in the code * Fixed an issue where Extra might get flagged as special too early, if in a word like Extraordinary * Moved Tag cleanup code into Scanner service. Added a SplitQuery to another heavy API. Refactored Scan loop to remove parallelism and use async instead. * Lots of rework on the codebase to support detailed messages and easier management of message sending. Need to take a break on this work. * Progress is being made, but slowly. Code is broken in this commit. * Progress is being made, but slowly. Code is broken in this commit. * Fixed merge issue * Fixed unit tests * CoverUpdate is now hooked into new ProgressEvent structure * Refactored code to remove custom observables and have everything use standard messages$ * Refactored a ton of instances to NotificationProgressEvent style and tons of the UI to respect that too. UI is still a bit buggy, but wholistically the work is done. * Working much better. Sometimes events come in too fast. Currently cover update progress doesn't display on UI * Fixed unit tests * Removed SignalREvent to minimize internal event types. Updated the UI to use progress bars. Finished SiteThemeService. * Merged metadata refresh progress events and changed library scan events to merge cleaner in the UI * Changed RefreshMetadataProgress to CoverUpdateProgress to reflect the event better. * Theme Cleanup (#1089) * Fixed e-ink theme not properly applying correctly * Fixed some seed changes. Changed card checkboxes to use our themed ones * Fixed recently added carousel not going to recently-added page * Fixed an issue where no results found would show when searching for a library name * Cleaned up list a bit, typeahead dropdown still needs work * Added a TODO to streamline series-card component * Removed ng-lazyload-image module since we don't use it. We use lazysizes * Darken card on hover * Fixing accordion focus style * ux pass updates - Fixed typeahead width - Fixed changelog download buttons - Fixed a select - Fixed various input box-shadows - Fixed all anchors to only have underline on hover - Added navtab hover and active effects * more ux pass - Fixed spacing on theme cards - Fixed some light theme issues - Exposed text-muted-color for theme card subtitle color * UX pass fixes - Changed back to bright green for primary on dark theme - Changed fa icon to black on e-ink * Merged changelog component * Fixed anchor buttons text decoration * Changed nav tabs to have a background color instead of open active state * When user is not authenticated, make sure we set default theme (dark) * Cleanup on carousel * Updated Users tab to use small buttons with icons to align with Library tab * Cleaned up brand to not underline, removed default link underline on hover in dropdown and pill tabs * Fixed collection detail posters not rendering Co-authored-by: Robbie Davis <robbie@therobbiedavis.com> * Bump versions by dotnet-bump-version. * Tweaked some of the emitting code * Some css, but pretty bad. Robbie please save me * Removed a todo * styling update * Only send filename on FileScanProgress * Some console.log spam cleanup * Various updates * Show events widget activity based on activeEvents * progress bar color updates * Code cleanup Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
155 lines
5.9 KiB
C#
155 lines
5.9 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.Data;
|
|
using API.Entities;
|
|
using API.Entities.Enums.Theme;
|
|
using API.SignalR;
|
|
using Kavita.Common;
|
|
using Microsoft.AspNetCore.SignalR;
|
|
|
|
namespace API.Services.Tasks;
|
|
|
|
public interface ISiteThemeService
|
|
{
|
|
Task<string> GetContent(int themeId);
|
|
Task Scan();
|
|
Task UpdateDefault(int themeId);
|
|
}
|
|
|
|
public class SiteThemeService : ISiteThemeService
|
|
{
|
|
private readonly IDirectoryService _directoryService;
|
|
private readonly IUnitOfWork _unitOfWork;
|
|
private readonly IEventHub _eventHub;
|
|
|
|
public SiteThemeService(IDirectoryService directoryService, IUnitOfWork unitOfWork, IEventHub eventHub)
|
|
{
|
|
_directoryService = directoryService;
|
|
_unitOfWork = unitOfWork;
|
|
_eventHub = eventHub;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Given a themeId, return the content inside that file
|
|
/// </summary>
|
|
/// <param name="themeId"></param>
|
|
/// <returns></returns>
|
|
/// <exception cref="KavitaException"></exception>
|
|
public async Task<string> GetContent(int themeId)
|
|
{
|
|
var theme = await _unitOfWork.SiteThemeRepository.GetThemeDto(themeId);
|
|
if (theme == null) throw new KavitaException("Theme file missing or invalid");
|
|
var themeFile = _directoryService.FileSystem.Path.Join(_directoryService.SiteThemeDirectory, theme.FileName);
|
|
if (string.IsNullOrEmpty(themeFile) || !_directoryService.FileSystem.File.Exists(themeFile))
|
|
throw new KavitaException("Theme file missing or invalid");
|
|
|
|
return await _directoryService.FileSystem.File.ReadAllTextAsync(themeFile);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Scans the site theme directory for custom css files and updates what the system has on store
|
|
/// </summary>
|
|
public async Task Scan()
|
|
{
|
|
_directoryService.ExistOrCreate(_directoryService.SiteThemeDirectory);
|
|
var reservedNames = Seed.DefaultThemes.Select(t => t.NormalizedName).ToList();
|
|
var themeFiles = _directoryService.GetFilesWithExtension(Parser.Parser.NormalizePath(_directoryService.SiteThemeDirectory), @"\.css")
|
|
.Where(name => !reservedNames.Contains(Parser.Parser.Normalize(name))).ToList();
|
|
|
|
var allThemes = (await _unitOfWork.SiteThemeRepository.GetThemes()).ToList();
|
|
|
|
// First remove any files from allThemes that are User Defined and not on disk
|
|
var userThemes = allThemes.Where(t => t.Provider == ThemeProvider.User).ToList();
|
|
foreach (var userTheme in userThemes)
|
|
{
|
|
var filepath = Parser.Parser.NormalizePath(
|
|
_directoryService.FileSystem.Path.Join(_directoryService.SiteThemeDirectory, userTheme.FileName));
|
|
if (_directoryService.FileSystem.File.Exists(filepath)) continue;
|
|
|
|
// I need to do the removal different. I need to update all user preferences to use DefaultTheme
|
|
allThemes.Remove(userTheme);
|
|
await RemoveTheme(userTheme);
|
|
}
|
|
|
|
// Add new custom themes
|
|
var allThemeNames = allThemes.Select(t => t.NormalizedName).ToList();
|
|
foreach (var themeFile in themeFiles)
|
|
{
|
|
var themeName =
|
|
Parser.Parser.Normalize(_directoryService.FileSystem.Path.GetFileNameWithoutExtension(themeFile));
|
|
if (allThemeNames.Contains(themeName)) continue;
|
|
|
|
_unitOfWork.SiteThemeRepository.Add(new SiteTheme()
|
|
{
|
|
Name = _directoryService.FileSystem.Path.GetFileNameWithoutExtension(themeFile),
|
|
NormalizedName = themeName,
|
|
FileName = _directoryService.FileSystem.Path.GetFileName(themeFile),
|
|
Provider = ThemeProvider.User,
|
|
IsDefault = false,
|
|
});
|
|
|
|
await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress,
|
|
MessageFactory.SiteThemeProgressEvent(_directoryService.FileSystem.Path.GetFileName(themeFile), themeName, ProgressEventType.Updated));
|
|
}
|
|
|
|
|
|
if (_unitOfWork.HasChanges())
|
|
{
|
|
await _unitOfWork.CommitAsync();
|
|
}
|
|
|
|
await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress,
|
|
MessageFactory.SiteThemeProgressEvent("", "", ProgressEventType.Ended));
|
|
|
|
}
|
|
|
|
/// <summary>
|
|
/// Removes the theme and any references to it from Pref and sets them to the default at the time.
|
|
/// This commits to DB.
|
|
/// </summary>
|
|
/// <param name="theme"></param>
|
|
private async Task RemoveTheme(SiteTheme theme)
|
|
{
|
|
var prefs = await _unitOfWork.UserRepository.GetAllPreferencesByThemeAsync(theme.Id);
|
|
var defaultTheme = await _unitOfWork.SiteThemeRepository.GetDefaultTheme();
|
|
foreach (var pref in prefs)
|
|
{
|
|
pref.Theme = defaultTheme;
|
|
_unitOfWork.UserRepository.Update(pref);
|
|
}
|
|
_unitOfWork.SiteThemeRepository.Remove(theme);
|
|
await _unitOfWork.CommitAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Updates the themeId to the default theme, all others are marked as non-default
|
|
/// </summary>
|
|
/// <param name="themeId"></param>
|
|
/// <returns></returns>
|
|
/// <exception cref="KavitaException">If theme does not exist</exception>
|
|
public async Task UpdateDefault(int themeId)
|
|
{
|
|
try
|
|
{
|
|
var theme = await _unitOfWork.SiteThemeRepository.GetThemeDto(themeId);
|
|
if (theme == null) throw new KavitaException("Theme file missing or invalid");
|
|
|
|
foreach (var siteTheme in await _unitOfWork.SiteThemeRepository.GetThemes())
|
|
{
|
|
siteTheme.IsDefault = (siteTheme.Id == themeId);
|
|
_unitOfWork.SiteThemeRepository.Update(siteTheme);
|
|
}
|
|
|
|
if (!_unitOfWork.HasChanges()) return;
|
|
await _unitOfWork.CommitAsync();
|
|
}
|
|
catch (Exception)
|
|
{
|
|
await _unitOfWork.RollbackAsync();
|
|
throw;
|
|
}
|
|
}
|
|
}
|