
* Refactored the drawer into offcanvas component. Had to write some hacks to emulate how bootstrap's javascript implementation works as ngBootstrap doesn't have a component yet. * Cleaned up some of the code * Rewrote drawer to align it with the new design * First pass, refactored table of content into it's own component * Refactored all of the settings logic into a separate component. Everything is broken. * More settings on on reactive form * More code cleanup on settings * Misc fixes around the drawer code. Fixed a bug where range sliders were inheriting background color of normal text inputs * Fixed dark mode with book reader. We now clear the theme from the main app so book reader is self-contained. Styles for dark mode are injected into the reading-section. Styles that were previously in scss are now only for the actual menu system. * Cleaned up drawer styling on header * Removed an ngIf statement for click to paginate * Tweaked the accent style to have smaller font size and adjusted style on light mode. Cleaned up some clearTimeout code in a further effort to streamline codebase. * Refactored Dark mode into a basic theme. Currently styles are hardcoded. * Patched book theme in from themes branch * Patched in the backend for Book Theme (not tested yet) * Fixed a bug in seeding code for book themes. Started integration of themes into the reader settings * Everything except managing themes is working. Themes are a bit shakey, having second thoughts if we should have them or not. * Reverted the ability to do custom user book themes. Code is stable with system themes. * Stablize the Styles (#1128) * Fixed a bug where adding multiple series to reading list would throw an error on UI, but it was successful. * When a series has a reading list, we now show the connection on Series detail. * Removed all baseurl code from UI and not-connected component since we no longer use it. * Fixed tag badges not showing a border. Added last read time to the series detail page * Fixed up error interceptor to remove no-connection code * Changed implementation for series detail. Book libraries will never send chapters back. Volume 0 volumes will not be sent in volumes ever. Fixed up more renaming logic on books to send more accurate representations to the UI. * Cleaned up the selected tab and tab display logic * Fixed a bad where statement in reading lists for series * Fixed up tab logic again * Fixed a small margin on search backdrop * Made badge expander button smaller to align with badges * Fixed a few UIs due to .form-group and .form-row being removed * Updated Theme component page to help with style testing * Added more components to theme tester * Cleaned up some styling * Fixed opacity on search item hover * Bump versions by dotnet-bump-version. * Tweaked the accordion styles for light mode * Set dark book theme as default. Refactored resetSettings to be much cleaner * Started the refactor to allow book themes to affect global css variables * Fixed some issues with my css variable declarations * Fixed a close model state update * Lots of work, but dark mode on the book reader is basically done. We have to code the themes much like the site themes * Some black theme enhancements * Started working on column layout in book reader. * Cleaned up the CSS on Reader Settings * Hooked up reading direction * Got column and double column layout working * Implemented some basic virtual paging and hooked in book color theme and layout mode into user preferences. * Migration wrote, can edit page layout and color theme on book reader. Removed book dark mode since no longer needed. Fixed a bug on login/register forms where when input is focused, text is white and not black. * When loading book reader, apply column layout. * Lots of work around 2 column layout, working on images not splitting. Still not working, committing so i can merge develop in and validate code with new manga reader. * Fixed images being split into 2 BUT regression on each page boundary, total reading height is smaller and smaller * Fixed some rendering bugs where toggling column layouts would shrink images on screen constantly. Fixed a bug where bottom bar wouldn't render on column layout in some conditions (this might need to be reworked) * Started progress on progress work * Updated .NET to 6.0.4 * Fixed a bug where DataContextModelSnapshot was being removed on build thus new migrations were broken. * Tweaked the code around progress saving so that we don't loose track of last scroll element on page load * Trying to restore progress, but stuck * Extra merge stuff * Fixed a bug where volumes that are a range fail to generate series detail * No gutters on whole app. Book reader backend now applies the image class automatically at the backend. * Added wiki documentation into invite user flow and register admin user to help users understand email isn't required and they can host their own service. * Removed bottom padding * Refactored the document height to be set and removed on nav service, so the book reader and manga reader aren't broken. * Fixed the height of the action bar to simplify logic and keep the code cleaner. Refactored book service image scoping to be much more streamlined and efficient * Fixed the height of action bar to 62px and adjusted code to use the hardcoded px. (code commented) * Removed commented out code from fixed action bar height * Progress restoration seems to be working * Code cleanup * Ensure the bottom action bar is at the bottom of the viewport on small pages * Fixed book fonts not setting properly and added OpenDyslexic font. * Fixed up some font issues * Updated drawer so all sections are open by default * Switched some LINQ to use MinBy * When navigating between pages and column layout, adjust the shift for the user. * Removed some debug code * Blacklist .qpkg folders and don't scan Recently-Snapshot or recycle folders. * Renamed the scale width to be scoped to kavita to avoid conflicts. * Refactored ngx-sliders out to use normal range instead. Changed up the preferences to separate image and book settinngs into own accordion. * updated user preferences for new migration options (not committed yet) * Removed some debug code * Remove console.logs * Migration committed, let's release this to users. * A lot of crazy code just to ensure that when you close drawer the toggle reflectst that state.
264 lines
9.1 KiB
C#
264 lines
9.1 KiB
C#
using System.Collections.Generic;
|
|
using System.Data.Common;
|
|
using System.IO.Abstractions.TestingHelpers;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.Data;
|
|
using API.Entities;
|
|
using API.Entities.Enums;
|
|
using API.Entities.Enums.Theme;
|
|
using API.Helpers;
|
|
using API.Services;
|
|
using API.Services.Tasks;
|
|
using API.SignalR;
|
|
using AutoMapper;
|
|
using Kavita.Common;
|
|
using Microsoft.AspNetCore.SignalR;
|
|
using Microsoft.Data.Sqlite;
|
|
using Microsoft.EntityFrameworkCore;
|
|
using Microsoft.EntityFrameworkCore.Infrastructure;
|
|
using Microsoft.Extensions.Logging;
|
|
using NSubstitute;
|
|
using Xunit;
|
|
|
|
namespace API.Tests.Services;
|
|
|
|
public class SiteThemeServiceTests
|
|
{
|
|
private readonly ILogger<ThemeService> _logger = Substitute.For<ILogger<ThemeService>>();
|
|
private readonly IEventHub _messageHub = Substitute.For<IEventHub>();
|
|
|
|
private readonly DbConnection _connection;
|
|
private readonly DataContext _context;
|
|
private readonly IUnitOfWork _unitOfWork;
|
|
|
|
private const string CacheDirectory = "C:/kavita/config/cache/";
|
|
private const string CoverImageDirectory = "C:/kavita/config/covers/";
|
|
private const string BackupDirectory = "C:/kavita/config/backups/";
|
|
private const string BookmarkDirectory = "C:/kavita/config/bookmarks/";
|
|
private const string SiteThemeDirectory = "C:/kavita/config/themes/";
|
|
|
|
public SiteThemeServiceTests()
|
|
{
|
|
var contextOptions = new DbContextOptionsBuilder()
|
|
.UseSqlite(CreateInMemoryDatabase())
|
|
.Options;
|
|
_connection = RelationalOptionsExtension.Extract(contextOptions).Connection;
|
|
|
|
_context = new DataContext(contextOptions);
|
|
Task.Run(SeedDb).GetAwaiter().GetResult();
|
|
|
|
var config = new MapperConfiguration(cfg => cfg.AddProfile<AutoMapperProfiles>());
|
|
var mapper = config.CreateMapper();
|
|
_unitOfWork = new UnitOfWork(_context, mapper, null);
|
|
}
|
|
|
|
#region Setup
|
|
|
|
private static DbConnection CreateInMemoryDatabase()
|
|
{
|
|
var connection = new SqliteConnection("Filename=:memory:");
|
|
|
|
connection.Open();
|
|
|
|
return connection;
|
|
}
|
|
|
|
private async Task<bool> SeedDb()
|
|
{
|
|
await _context.Database.MigrateAsync();
|
|
var filesystem = CreateFileSystem();
|
|
|
|
await Seed.SeedSettings(_context, new DirectoryService(Substitute.For<ILogger<DirectoryService>>(), filesystem));
|
|
|
|
var setting = await _context.ServerSetting.Where(s => s.Key == ServerSettingKey.CacheDirectory).SingleAsync();
|
|
setting.Value = CacheDirectory;
|
|
|
|
setting = await _context.ServerSetting.Where(s => s.Key == ServerSettingKey.BackupDirectory).SingleAsync();
|
|
setting.Value = BackupDirectory;
|
|
|
|
setting = await _context.ServerSetting.Where(s => s.Key == ServerSettingKey.BookmarkDirectory).SingleAsync();
|
|
setting.Value = BookmarkDirectory;
|
|
|
|
_context.ServerSetting.Update(setting);
|
|
|
|
_context.AppUser.Add(new AppUser()
|
|
{
|
|
UserName = "Joe",
|
|
UserPreferences = new AppUserPreferences
|
|
{
|
|
Theme = Seed.DefaultThemes[1]
|
|
}
|
|
});
|
|
|
|
_context.Library.Add(new Library()
|
|
{
|
|
Name = "Manga",
|
|
Folders = new List<FolderPath>()
|
|
{
|
|
new FolderPath()
|
|
{
|
|
Path = "C:/data/"
|
|
}
|
|
}
|
|
});
|
|
return await _context.SaveChangesAsync() > 0;
|
|
}
|
|
|
|
private static MockFileSystem CreateFileSystem()
|
|
{
|
|
var fileSystem = new MockFileSystem();
|
|
fileSystem.Directory.SetCurrentDirectory("C:/kavita/");
|
|
fileSystem.AddDirectory("C:/kavita/config/");
|
|
fileSystem.AddDirectory(CacheDirectory);
|
|
fileSystem.AddDirectory(CoverImageDirectory);
|
|
fileSystem.AddDirectory(BackupDirectory);
|
|
fileSystem.AddDirectory(BookmarkDirectory);
|
|
fileSystem.AddDirectory(SiteThemeDirectory);
|
|
fileSystem.AddDirectory("C:/data/");
|
|
|
|
return fileSystem;
|
|
}
|
|
|
|
private async Task ResetDb()
|
|
{
|
|
_context.SiteTheme.RemoveRange(_context.SiteTheme);
|
|
await _context.SaveChangesAsync();
|
|
}
|
|
|
|
#endregion
|
|
|
|
[Fact]
|
|
public async Task Scan_ShouldFindCustomFile()
|
|
{
|
|
await ResetDb();
|
|
var filesystem = CreateFileSystem();
|
|
filesystem.AddFile($"{SiteThemeDirectory}custom.css", new MockFileData(""));
|
|
var ds = new DirectoryService(Substitute.For<ILogger<DirectoryService>>(), filesystem);
|
|
var siteThemeService = new ThemeService(ds, _unitOfWork, _messageHub);
|
|
await siteThemeService.Scan();
|
|
|
|
Assert.NotNull(await _unitOfWork.SiteThemeRepository.GetThemeDtoByName("custom"));
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Scan_ShouldOnlyInsertOnceOnSecondScan()
|
|
{
|
|
await ResetDb();
|
|
var filesystem = CreateFileSystem();
|
|
filesystem.AddFile($"{SiteThemeDirectory}custom.css", new MockFileData(""));
|
|
var ds = new DirectoryService(Substitute.For<ILogger<DirectoryService>>(), filesystem);
|
|
var siteThemeService = new ThemeService(ds, _unitOfWork, _messageHub);
|
|
await siteThemeService.Scan();
|
|
|
|
Assert.NotNull(await _unitOfWork.SiteThemeRepository.GetThemeDtoByName("custom"));
|
|
|
|
await siteThemeService.Scan();
|
|
|
|
var customThemes = (await _unitOfWork.SiteThemeRepository.GetThemeDtos()).Where(t =>
|
|
API.Parser.Parser.Normalize(t.Name).Equals(API.Parser.Parser.Normalize("custom")));
|
|
Assert.Single(customThemes);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task Scan_ShouldDeleteWhenFileDoesntExistOnSecondScan()
|
|
{
|
|
await ResetDb();
|
|
var filesystem = CreateFileSystem();
|
|
filesystem.AddFile($"{SiteThemeDirectory}custom.css", new MockFileData(""));
|
|
var ds = new DirectoryService(Substitute.For<ILogger<DirectoryService>>(), filesystem);
|
|
var siteThemeService = new ThemeService(ds, _unitOfWork, _messageHub);
|
|
await siteThemeService.Scan();
|
|
|
|
Assert.NotNull(await _unitOfWork.SiteThemeRepository.GetThemeDtoByName("custom"));
|
|
|
|
filesystem.RemoveFile($"{SiteThemeDirectory}custom.css");
|
|
await siteThemeService.Scan();
|
|
|
|
var customThemes = (await _unitOfWork.SiteThemeRepository.GetThemeDtos()).Where(t =>
|
|
API.Parser.Parser.Normalize(t.Name).Equals(API.Parser.Parser.Normalize("custom")));
|
|
|
|
Assert.Empty(customThemes);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task GetContent_ShouldReturnContent()
|
|
{
|
|
await ResetDb();
|
|
var filesystem = CreateFileSystem();
|
|
filesystem.AddFile($"{SiteThemeDirectory}custom.css", new MockFileData("123"));
|
|
var ds = new DirectoryService(Substitute.For<ILogger<DirectoryService>>(), filesystem);
|
|
var siteThemeService = new ThemeService(ds, _unitOfWork, _messageHub);
|
|
|
|
_context.SiteTheme.Add(new SiteTheme()
|
|
{
|
|
Name = "Custom",
|
|
NormalizedName = API.Parser.Parser.Normalize("Custom"),
|
|
Provider = ThemeProvider.User,
|
|
FileName = "custom.css",
|
|
IsDefault = false
|
|
});
|
|
await _context.SaveChangesAsync();
|
|
|
|
var content = await siteThemeService.GetContent((await _unitOfWork.SiteThemeRepository.GetThemeDtoByName("Custom")).Id);
|
|
Assert.NotNull(content);
|
|
Assert.NotEmpty(content);
|
|
Assert.Equal("123", content);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task UpdateDefault_ShouldHaveOneDefault()
|
|
{
|
|
await ResetDb();
|
|
var filesystem = CreateFileSystem();
|
|
filesystem.AddFile($"{SiteThemeDirectory}custom.css", new MockFileData("123"));
|
|
var ds = new DirectoryService(Substitute.For<ILogger<DirectoryService>>(), filesystem);
|
|
var siteThemeService = new ThemeService(ds, _unitOfWork, _messageHub);
|
|
|
|
_context.SiteTheme.Add(new SiteTheme()
|
|
{
|
|
Name = "Custom",
|
|
NormalizedName = API.Parser.Parser.Normalize("Custom"),
|
|
Provider = ThemeProvider.User,
|
|
FileName = "custom.css",
|
|
IsDefault = false
|
|
});
|
|
await _context.SaveChangesAsync();
|
|
|
|
var customTheme = (await _unitOfWork.SiteThemeRepository.GetThemeDtoByName("Custom"));
|
|
|
|
await siteThemeService.UpdateDefault(customTheme.Id);
|
|
|
|
|
|
|
|
Assert.Equal(customTheme.Id, (await _unitOfWork.SiteThemeRepository.GetDefaultTheme()).Id);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task UpdateDefault_ShouldThrowOnInvalidId()
|
|
{
|
|
await ResetDb();
|
|
var filesystem = CreateFileSystem();
|
|
filesystem.AddFile($"{SiteThemeDirectory}custom.css", new MockFileData("123"));
|
|
var ds = new DirectoryService(Substitute.For<ILogger<DirectoryService>>(), filesystem);
|
|
var siteThemeService = new ThemeService(ds, _unitOfWork, _messageHub);
|
|
|
|
_context.SiteTheme.Add(new SiteTheme()
|
|
{
|
|
Name = "Custom",
|
|
NormalizedName = API.Parser.Parser.Normalize("Custom"),
|
|
Provider = ThemeProvider.User,
|
|
FileName = "custom.css",
|
|
IsDefault = false
|
|
});
|
|
await _context.SaveChangesAsync();
|
|
|
|
|
|
|
|
var ex = await Assert.ThrowsAsync<KavitaException>(async () => await siteThemeService.UpdateDefault(10));
|
|
Assert.Equal("Theme file missing or invalid", ex.Message);
|
|
|
|
}
|
|
|
|
|
|
}
|