Custom keybinds, Default language per Library, and bugfixes

API.Tests/Repository/SeriesRepositoryTests.cs

@@ -17,109 +17,19 @@
 using Microsoft.Extensions.Logging;
 using NSubstitute;
 using Xunit;
+using Xunit.Abstractions;
 
 namespace API.Tests.Repository;
 
 #nullable enable
 
-public class SeriesRepositoryTests
+public class SeriesRepositoryTests(ITestOutputHelper testOutputHelper): AbstractDbTest(testOutputHelper)
 {
-    private readonly IUnitOfWork _unitOfWork;
 
-    private readonly DbConnection? _connection;
-    private readonly DataContext _context;
-
-    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 DataDirectory = "C:/data/";
-
-    public SeriesRepositoryTests()
-    {
-        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;
-
-        _context.ServerSetting.Update(setting);
-
-        var lib = new LibraryBuilder("Manga")
-            .WithFolderPath(new FolderPathBuilder("C:/data/").Build())
-            .Build();
-
-        _context.AppUser.Add(new AppUser()
-        {
-            UserName = "majora2007",
-            Libraries = new List<Library>()
-            {
-                lib
-            }
-        });
-
-        return await _context.SaveChangesAsync() > 0;
-    }
-
-    private async Task ResetDb()
-    {
-        _context.Series.RemoveRange(_context.Series.ToList());
-        _context.AppUserRating.RemoveRange(_context.AppUserRating.ToList());
-        _context.Genre.RemoveRange(_context.Genre.ToList());
-        _context.CollectionTag.RemoveRange(_context.CollectionTag.ToList());
-        _context.Person.RemoveRange(_context.Person.ToList());
-
-        await _context.SaveChangesAsync();
-    }
-
-    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(DataDirectory);
-
-        return fileSystem;
-    }
-
-    #endregion
-
-    private async Task SetupSeriesData()
+    private async Task SetupSeriesData(IUnitOfWork unitOfWork)
     {
         var library = new LibraryBuilder("GetFullSeriesByAnyName Manga", LibraryType.Manga)
-            .WithFolderPath(new FolderPathBuilder("C:/data/manga/").Build())
+            .WithFolderPath(new FolderPathBuilder(DataDirectory+"manga/").Build())
             .WithSeries(new SeriesBuilder("The Idaten Deities Know Only Peace")
                 .WithLocalizedName("Heion Sedai no Idaten-tachi")
                 .WithFormat(MangaFormat.Archive)
@@ -130,8 +40,8 @@ private async Task SetupSeriesData()
                 .Build())
             .Build();
 
-        _unitOfWork.LibraryRepository.Add(library);
-        await _unitOfWork.CommitAsync();
+        unitOfWork.LibraryRepository.Add(library);
+        await unitOfWork.CommitAsync();
     }
 
 
@@ -142,11 +52,11 @@ private async Task SetupSeriesData()
     [InlineData("Hitomi-chan wa Hitomishiri", MangaFormat.Archive, "", "Hitomi-chan is Shy With Strangers")]
     public async Task GetFullSeriesByAnyName_Should(string seriesName, MangaFormat format, string localizedName, string? expected)
     {
-        await ResetDb();
-        await SetupSeriesData();
+        var (unitOfWork, _, _) = await CreateDatabase();
+        await SetupSeriesData(unitOfWork);
 
         var series =
-            await _unitOfWork.SeriesRepository.GetFullSeriesByAnyName(seriesName, localizedName,
+            await unitOfWork.SeriesRepository.GetFullSeriesByAnyName(seriesName, localizedName,
                 2, format, false);
         if (expected == null)
         {
@@ -165,8 +75,8 @@ await _unitOfWork.SeriesRepository.GetFullSeriesByAnyName(seriesName, localizedN
     [InlineData(0, "", null)] // Case 3: Return null if neither exist
     public async Task GetPlusSeriesDto_Should_PrioritizeAniListId_Correctly(int externalAniListId, string? webLinks, int? expectedAniListId)
     {
-        // Arrange
-        await ResetDb();
+        var (unitOfWork, _, _) = await CreateDatabase();
+        await SetupSeriesData(unitOfWork);
 
         var series = new SeriesBuilder("Test Series")
             .WithFormat(MangaFormat.Archive)
@@ -195,12 +105,12 @@ public async Task GetPlusSeriesDto_Should_PrioritizeAniListId_Correctly(int exte
             ReleaseYear = 2021
         };
 
-        _unitOfWork.LibraryRepository.Add(library);
-        _unitOfWork.SeriesRepository.Add(series);
-        await _unitOfWork.CommitAsync();
+        unitOfWork.LibraryRepository.Add(library);
+        unitOfWork.SeriesRepository.Add(series);
+        await unitOfWork.CommitAsync();
 
         // Act
-        var result = await _unitOfWork.SeriesRepository.GetPlusSeriesDto(series.Id);
+        var result = await unitOfWork.SeriesRepository.GetPlusSeriesDto(series.Id);
 
         // Assert
         Assert.NotNull(result);

API/Controllers/LibraryController.cs

@@ -182,18 +182,15 @@ public ActionResult<IEnumerable<DirectoryDto>> GetDirectories(string? path)
     /// <returns></returns>
     [Authorize(Policy = "RequireAdminRole")]
     [HttpPost("has-files-at-root")]
-    public ActionResult<IDictionary<string, bool>> AnyFilesAtRoot(CheckForFilesInFolderRootsDto dto)
+    public ActionResult<IList<string>> AnyFilesAtRoot(CheckForFilesInFolderRootsDto dto)
     {
-        var results = new Dictionary<string, bool>();
-        foreach (var root in dto.Roots)
-        {
-            results.TryAdd(root,
-                _directoryService
-                    .GetFilesWithCertainExtensions(root, Parser.SupportedExtensions, SearchOption.TopDirectoryOnly)
-                    .Any());
-        }
+        var foldersWithFilesAtRoot = dto.Roots
+            .Where(root => _directoryService
+                .GetFilesWithCertainExtensions(root, Parser.SupportedExtensions, SearchOption.TopDirectoryOnly)
+                .Any())
+            .ToList();
 
-        return Ok(results);
+        return Ok(foldersWithFilesAtRoot);
     }
 
     /// <summary>
@@ -658,6 +655,7 @@ private void UpdateLibrarySettings(UpdateLibraryDto dto, Library library, bool u
         library.EnableMetadata = dto.EnableMetadata;
         library.RemovePrefixForSortName = dto.RemovePrefixForSortName;
         library.InheritWebLinksFromFirstChapter = dto.InheritWebLinksFromFirstChapter;
+        library.DefaultLanguage = dto.DefaultLanguage;
 
         library.LibraryFileTypes = dto.FileGroupTypes
             .Select(t => new LibraryFileTypeGroup() {FileTypeGroup = t, LibraryId = library.Id})

API/Controllers/UploadController.cs

@@ -14,6 +14,7 @@
 using Flurl.Http;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.Logging;
 
 namespace API.Controllers;
@@ -62,9 +63,15 @@ public UploadController(IUnitOfWork unitOfWork, IImageService imageService, ILog
     public async Task<ActionResult<string>> GetImageFromFile(UploadUrlDto dto)
     {
         var dateString = $"{DateTime.UtcNow.ToShortDateString()}_{DateTime.UtcNow.ToLongTimeString()}".Replace('/', '_').Replace(':', '_');
-        var format = _directoryService.FileSystem.Path.GetExtension(dto.Url.Split('?')[0]).Replace(".", string.Empty);
         try
         {
+            var format = await dto.Url.GetFileFormatAsync();
+            if (string.IsNullOrEmpty(format))
+            {
+                // Fallback to unreliable parsing if needed
+                format = _directoryService.FileSystem.Path.GetExtension(dto.Url.Split('?')[0]).Replace(".", string.Empty);
+            }
+
             var path = await dto.Url
                 .DownloadFileAsync(_directoryService.TempDirectory, $"coverupload_{dateString}.{format}");
 
@@ -499,7 +506,7 @@ public async Task<ActionResult> UploadPersonCoverImageFromUrl(UploadFileDto uplo
             var person = await _unitOfWork.PersonRepository.GetPersonById(uploadFileDto.Id);
             if (person == null) return BadRequest(await _localizationService.Translate(User.GetUserId(), "person-doesnt-exist"));
 
-            await _coverDbService.SetPersonCoverByUrl(person, uploadFileDto.Url, true);
+            await _coverDbService.SetPersonCoverByUrl(person, uploadFileDto.Url, chooseBetterImage:false);
             return Ok();
         }
         catch (Exception e)

API/Controllers/UsersController.cs

@@ -121,6 +121,7 @@ public async Task<ActionResult<UserPreferencesDto>> UpdatePreferences(UserPrefer
         existingPreferences.ColorScapeEnabled = preferencesDto.ColorScapeEnabled;
         existingPreferences.BookReaderHighlightSlots = preferencesDto.BookReaderHighlightSlots;
         existingPreferences.DataSaver = preferencesDto.DataSaver;
+        existingPreferences.CustomKeyBinds = preferencesDto.CustomKeyBinds;
 
         var allLibs = (await _unitOfWork.LibraryRepository.GetLibrariesForUserIdAsync(user.Id))
             .Select(l => l.Id).ToList();

API/DTOs/Dashboard/UpdateStreamPositionDto.cs

@@ -2,8 +2,12 @@
 
 public sealed record UpdateStreamPositionDto
 {
+    public string StreamName { get; set; }
+    public int Id { get; set; }
     public int FromPosition { get; set; }
     public int ToPosition { get; set; }
-    public int Id { get; set; }
-    public string StreamName { get; set; }
+    /// <summary>
+    /// If the <see cref="ToPosition"/> has taken into account non-visible items
+    /// </summary>
+    public bool PositionIncludesInvisible { get; set; }
 }

API/DTOs/LibraryDto.cs

@@ -77,4 +77,6 @@ public sealed record LibraryDto
     public bool RemovePrefixForSortName { get; set; } = false;
     /// <inheritdoc cref="Library.InheritWebLinksFromFirstChapter"/>
     public bool InheritWebLinksFromFirstChapter { get; init; }
+    /// <inheritdoc cref="Library.DefaultLanguage"/>
+    public string DefaultLanguage { get; init; }
 }

API/DTOs/UpdateLibraryDto.cs

@@ -48,6 +48,8 @@ public sealed record UpdateLibraryDto
     /// <inheritdoc cref="Library.InheritWebLinksFromFirstChapter"/>
     [Required]
     public bool InheritWebLinksFromFirstChapter { get; init; }
+    /// <inheritdoc cref="Library.DefaultLanguage"/>
+    public string DefaultLanguage { get; init; }
     /// <summary>
     /// What types of files to allow the scanner to pickup
     /// </summary>

API/DTOs/UserPreferencesDto.cs

@@ -40,6 +40,9 @@ public sealed record UserPreferencesDto
     /// <inheritdoc cref="API.Entities.AppUserPreferences.DataSaver"/>
     [Required]
     public bool DataSaver { get; set; } = false;
+    /// <inheritdoc cref="API.Entities.AppUserPreferences.CustomKeyBinds"/>
+    [Required]
+    public Dictionary<KeyBindTarget, IList<KeyBind>> CustomKeyBinds { get; set; } = [];
 
     /// <inheritdoc cref="API.Entities.AppUserPreferences.AniListScrobblingEnabled"/>
     public bool AniListScrobblingEnabled { get; set; }

API/Data/DataContext.cs

@@ -155,6 +155,9 @@ protected override void OnModelCreating(ModelBuilder builder)
         builder.Entity<Library>()
             .Property(b => b.EnableMetadata)
             .HasDefaultValue(true);
+        builder.Entity<Library>()
+            .Property(l => l.DefaultLanguage)
+            .HasDefaultValue(string.Empty);
 
         builder.Entity<Chapter>()
             .Property(b => b.WebLinks)
@@ -293,6 +296,12 @@ protected override void OnModelCreating(ModelBuilder builder)
             .HasColumnType("TEXT")
             .HasDefaultValue(new List<HighlightSlot>());
 
+        builder.Entity<AppUserPreferences>()
+            .Property(p => p.CustomKeyBinds)
+            .HasJsonConversion([])
+            .HasColumnType("TEXT")
+            .HasDefaultValue(new Dictionary<KeyBindTarget, IList<KeyBind>>());
+
         builder.Entity<AppUser>()
             .Property(user => user.IdentityProvider)
             .HasDefaultValue(IdentityProvider.Kavita);