mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-06-21 14:30:33 -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>
265 lines
9.1 KiB
C#
265 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<SiteThemeService> _logger = Substitute.For<ILogger<SiteThemeService>>();
|
|
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 SiteThemeService(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 SiteThemeService(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 SiteThemeService(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 SiteThemeService(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 SiteThemeService(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 SiteThemeService(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);
|
|
|
|
}
|
|
|
|
|
|
}
|