mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-31 04:04:19 -04:00
* Cleaned up some styles on the progress bar in book reader * Fixed up some phone-hidden classes and added titles around the codebase. Stat reporting on first run now takes into account that admin user wont exist. * Fixed manage library page not updating last scan time when a notification event comes in. * Integrated SeriesSort ComicInfo tag (somehow it got missed) * Some minor style changes and no results found for bookmarks on chapter detail modal * Fixed the labels in action bar on book reader so Prev/Next are in same place * Cleaned up some responsive styles around images and reduced custom classes in light of new display classes on collection detail and series detail pages * Fixed an issue with webkit browsers and book reader where the scroll to would fail as the document wasn't fully rendered. A 10ms delay seems to fix the issue. * Cleaned up some code and filtering for collections. Collection detail is missing filtering functionality somehow, disabled the button and will add in future release * Correctly validate and show a message when a user is not an admin or has change password role when going through forget password flow. * Fixed a bug on manage libraries where library last scan didn't work on first scan of a library, due to there being no updated series. * Fixed a rendering issue with text being focused on confirm email page textboxes. Fixed a bug where when deleting a theme that was default, Kavita didn't reset Dark as the default theme. * Cleaned up the naming and styles for side nav active item hover * Fixed event widget to have correct styling on eink and light * Tried to fix a rendering issue on side nav for light themes, but can't figure it out * On light more, ensure switches are green * Fixed a bug where opening a page with a preselected filter, the filter toggle button would require 2 clicks to collapse * Reverted the revert of On Deck. * Improved the upload by url experience by sending a custom fail error to UI when a url returns 401. * When deleting a library, emit a series removed event for each series removed so user's dashboards/screens update. * Fixed an api throwing an error due to text being sent back instead of json. * Fixed a refresh bug with refreshing pending invites after deleting an invite. Ensure we always refresh pending invites even if user cancel's from invite, as they might invite, then hit cancel, where invite is still active. * Fixed a bug where invited users with + in the email would fail due to validation, but UI wouldn't properly inform user.
170 lines
6.5 KiB
C#
170 lines
6.5 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();
|
|
}
|
|
|
|
// if there are no default themes, reselect Dark as default
|
|
var postSaveThemes = (await _unitOfWork.SiteThemeRepository.GetThemes()).ToList();
|
|
if (!postSaveThemes.Any(t => t.IsDefault))
|
|
{
|
|
var defaultThemeName = Seed.DefaultThemes.Single(t => t.IsDefault).NormalizedName;
|
|
var theme = postSaveThemes.SingleOrDefault(t => t.NormalizedName == defaultThemeName);
|
|
if (theme != null)
|
|
{
|
|
theme.IsDefault = true;
|
|
_unitOfWork.SiteThemeRepository.Update(theme);
|
|
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;
|
|
}
|
|
}
|
|
}
|