mirror of
				https://github.com/Kareadita/Kavita.git
				synced 2025-11-04 03:27:05 -05: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>
		
			
				
	
	
		
			313 lines
		
	
	
		
			11 KiB
		
	
	
	
		
			C#
		
	
	
	
	
	
			
		
		
	
	
			313 lines
		
	
	
		
			11 KiB
		
	
	
	
		
			C#
		
	
	
	
	
	
using System;
 | 
						|
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.Data.Metadata;
 | 
						|
using API.Entities;
 | 
						|
using API.Entities.Enums;
 | 
						|
using API.Parser;
 | 
						|
using API.Services;
 | 
						|
using API.Services.Tasks.Scanner;
 | 
						|
using API.SignalR;
 | 
						|
using API.Tests.Helpers;
 | 
						|
using AutoMapper;
 | 
						|
using Microsoft.Data.Sqlite;
 | 
						|
using Microsoft.EntityFrameworkCore;
 | 
						|
using Microsoft.EntityFrameworkCore.Infrastructure;
 | 
						|
using Microsoft.Extensions.Logging;
 | 
						|
using NSubstitute;
 | 
						|
using Xunit;
 | 
						|
 | 
						|
namespace API.Tests.Services;
 | 
						|
 | 
						|
internal class MockReadingItemService : IReadingItemService
 | 
						|
{
 | 
						|
    private readonly DefaultParser _defaultParser;
 | 
						|
 | 
						|
    public MockReadingItemService(DefaultParser defaultParser)
 | 
						|
    {
 | 
						|
        _defaultParser = defaultParser;
 | 
						|
    }
 | 
						|
 | 
						|
    public ComicInfo GetComicInfo(string filePath)
 | 
						|
    {
 | 
						|
        return null;
 | 
						|
    }
 | 
						|
 | 
						|
    public int GetNumberOfPages(string filePath, MangaFormat format)
 | 
						|
    {
 | 
						|
        return 1;
 | 
						|
    }
 | 
						|
 | 
						|
    public string GetCoverImage(string fileFilePath, string fileName, MangaFormat format)
 | 
						|
    {
 | 
						|
        return string.Empty;
 | 
						|
    }
 | 
						|
 | 
						|
    public void Extract(string fileFilePath, string targetDirectory, MangaFormat format, int imageCount = 1)
 | 
						|
    {
 | 
						|
        throw new System.NotImplementedException();
 | 
						|
    }
 | 
						|
 | 
						|
    public ParserInfo Parse(string path, string rootPath, LibraryType type)
 | 
						|
    {
 | 
						|
        return _defaultParser.Parse(path, rootPath, type);
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
public class ParseScannedFilesTests
 | 
						|
{
 | 
						|
    private readonly ILogger<ParseScannedFiles> _logger = Substitute.For<ILogger<ParseScannedFiles>>();
 | 
						|
    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 ParseScannedFilesTests()
 | 
						|
    {
 | 
						|
        var contextOptions = new DbContextOptionsBuilder()
 | 
						|
            .UseSqlite(CreateInMemoryDatabase())
 | 
						|
            .Options;
 | 
						|
        _connection = RelationalOptionsExtension.Extract(contextOptions).Connection;
 | 
						|
 | 
						|
        _context = new DataContext(contextOptions);
 | 
						|
        Task.Run(SeedDb).GetAwaiter().GetResult();
 | 
						|
 | 
						|
        _unitOfWork = new UnitOfWork(_context, Substitute.For<IMapper>(), null);
 | 
						|
 | 
						|
        // Since ProcessFile relies on _readingItemService, we can implement our own versions of _readingItemService so we have control over how the calls work
 | 
						|
    }
 | 
						|
 | 
						|
    #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);
 | 
						|
 | 
						|
        _context.Library.Add(new Library()
 | 
						|
        {
 | 
						|
            Name = "Manga",
 | 
						|
            Folders = new List<FolderPath>()
 | 
						|
            {
 | 
						|
                new FolderPath()
 | 
						|
                {
 | 
						|
                    Path = DataDirectory
 | 
						|
                }
 | 
						|
            }
 | 
						|
        });
 | 
						|
        return await _context.SaveChangesAsync() > 0;
 | 
						|
    }
 | 
						|
 | 
						|
    private async Task ResetDB()
 | 
						|
    {
 | 
						|
        _context.Series.RemoveRange(_context.Series.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
 | 
						|
 | 
						|
    #region GetInfosByName
 | 
						|
 | 
						|
    [Fact]
 | 
						|
    public void GetInfosByName_ShouldReturnGivenMatchingSeriesName()
 | 
						|
    {
 | 
						|
        var fileSystem = new MockFileSystem();
 | 
						|
        var ds = new DirectoryService(Substitute.For<ILogger<DirectoryService>>(), fileSystem);
 | 
						|
        var psf = new ParseScannedFiles(Substitute.For<ILogger<ParseScannedFiles>>(), ds,
 | 
						|
            new MockReadingItemService(new DefaultParser(ds)), Substitute.For<IEventHub>());
 | 
						|
 | 
						|
        var infos = new List<ParserInfo>()
 | 
						|
        {
 | 
						|
            ParserInfoFactory.CreateParsedInfo("Accel World", "1", "0", "Accel World v1.cbz", false),
 | 
						|
            ParserInfoFactory.CreateParsedInfo("Accel World", "2", "0", "Accel World v2.cbz", false)
 | 
						|
        };
 | 
						|
        var parsedSeries = new Dictionary<ParsedSeries, List<ParserInfo>>
 | 
						|
        {
 | 
						|
            {
 | 
						|
                new ParsedSeries()
 | 
						|
                {
 | 
						|
                    Format = MangaFormat.Archive,
 | 
						|
                    Name = "Accel World",
 | 
						|
                    NormalizedName = API.Parser.Parser.Normalize("Accel World")
 | 
						|
                },
 | 
						|
                infos
 | 
						|
            },
 | 
						|
            {
 | 
						|
                new ParsedSeries()
 | 
						|
                {
 | 
						|
                    Format = MangaFormat.Pdf,
 | 
						|
                    Name = "Accel World",
 | 
						|
                    NormalizedName = API.Parser.Parser.Normalize("Accel World")
 | 
						|
                },
 | 
						|
                new List<ParserInfo>()
 | 
						|
            }
 | 
						|
        };
 | 
						|
 | 
						|
        var series = DbFactory.Series("Accel World");
 | 
						|
        series.Format = MangaFormat.Pdf;
 | 
						|
 | 
						|
        Assert.Empty(ParseScannedFiles.GetInfosByName(parsedSeries, series));
 | 
						|
 | 
						|
        series.Format = MangaFormat.Archive;
 | 
						|
        Assert.Equal(2, ParseScannedFiles.GetInfosByName(parsedSeries, series).Count());
 | 
						|
 | 
						|
    }
 | 
						|
 | 
						|
    [Fact]
 | 
						|
    public void GetInfosByName_ShouldReturnGivenMatchingNormalizedSeriesName()
 | 
						|
    {
 | 
						|
        var fileSystem = new MockFileSystem();
 | 
						|
        var ds = new DirectoryService(Substitute.For<ILogger<DirectoryService>>(), fileSystem);
 | 
						|
        var psf = new ParseScannedFiles(Substitute.For<ILogger<ParseScannedFiles>>(), ds,
 | 
						|
            new MockReadingItemService(new DefaultParser(ds)), Substitute.For<IEventHub>());
 | 
						|
 | 
						|
        var infos = new List<ParserInfo>()
 | 
						|
        {
 | 
						|
            ParserInfoFactory.CreateParsedInfo("Accel World", "1", "0", "Accel World v1.cbz", false),
 | 
						|
            ParserInfoFactory.CreateParsedInfo("Accel World", "2", "0", "Accel World v2.cbz", false)
 | 
						|
        };
 | 
						|
        var parsedSeries = new Dictionary<ParsedSeries, List<ParserInfo>>
 | 
						|
        {
 | 
						|
            {
 | 
						|
                new ParsedSeries()
 | 
						|
                {
 | 
						|
                    Format = MangaFormat.Archive,
 | 
						|
                    Name = "Accel World",
 | 
						|
                    NormalizedName = API.Parser.Parser.Normalize("Accel World")
 | 
						|
                },
 | 
						|
                infos
 | 
						|
            },
 | 
						|
            {
 | 
						|
                new ParsedSeries()
 | 
						|
                {
 | 
						|
                    Format = MangaFormat.Pdf,
 | 
						|
                    Name = "Accel World",
 | 
						|
                    NormalizedName = API.Parser.Parser.Normalize("Accel World")
 | 
						|
                },
 | 
						|
                new List<ParserInfo>()
 | 
						|
            }
 | 
						|
        };
 | 
						|
 | 
						|
        var series = DbFactory.Series("accel world");
 | 
						|
        series.Format = MangaFormat.Archive;
 | 
						|
        Assert.Equal(2, ParseScannedFiles.GetInfosByName(parsedSeries, series).Count());
 | 
						|
 | 
						|
    }
 | 
						|
 | 
						|
    #endregion
 | 
						|
 | 
						|
    #region MergeName
 | 
						|
 | 
						|
    [Fact]
 | 
						|
    public async Task MergeName_ShouldMergeMatchingFormatAndName()
 | 
						|
    {
 | 
						|
        var fileSystem = new MockFileSystem();
 | 
						|
        fileSystem.AddDirectory("C:/Data/");
 | 
						|
        fileSystem.AddFile("C:/Data/Accel World v1.cbz", new MockFileData(string.Empty));
 | 
						|
        fileSystem.AddFile("C:/Data/Accel World v2.cbz", new MockFileData(string.Empty));
 | 
						|
        fileSystem.AddFile("C:/Data/Accel World v2.pdf", new MockFileData(string.Empty));
 | 
						|
 | 
						|
        var ds = new DirectoryService(Substitute.For<ILogger<DirectoryService>>(), fileSystem);
 | 
						|
        var psf = new ParseScannedFiles(Substitute.For<ILogger<ParseScannedFiles>>(), ds,
 | 
						|
            new MockReadingItemService(new DefaultParser(ds)), Substitute.For<IEventHub>());
 | 
						|
 | 
						|
 | 
						|
        await psf.ScanLibrariesForSeries(LibraryType.Manga, new List<string>() {"C:/Data/"}, "libraryName");
 | 
						|
 | 
						|
        Assert.Equal("Accel World", psf.MergeName(ParserInfoFactory.CreateParsedInfo("Accel World", "1", "0", "Accel World v1.cbz", false)));
 | 
						|
        Assert.Equal("Accel World", psf.MergeName(ParserInfoFactory.CreateParsedInfo("accel_world", "1", "0", "Accel World v1.cbz", false)));
 | 
						|
        Assert.Equal("Accel World", psf.MergeName(ParserInfoFactory.CreateParsedInfo("accelworld", "1", "0", "Accel World v1.cbz", false)));
 | 
						|
    }
 | 
						|
 | 
						|
    [Fact]
 | 
						|
    public async Task MergeName_ShouldMerge_MismatchedFormatSameName()
 | 
						|
    {
 | 
						|
        var fileSystem = new MockFileSystem();
 | 
						|
        fileSystem.AddDirectory("C:/Data/");
 | 
						|
        fileSystem.AddFile("C:/Data/Accel World v1.cbz", new MockFileData(string.Empty));
 | 
						|
        fileSystem.AddFile("C:/Data/Accel World v2.cbz", new MockFileData(string.Empty));
 | 
						|
        fileSystem.AddFile("C:/Data/Accel World v2.pdf", new MockFileData(string.Empty));
 | 
						|
 | 
						|
        var ds = new DirectoryService(Substitute.For<ILogger<DirectoryService>>(), fileSystem);
 | 
						|
        var psf = new ParseScannedFiles(Substitute.For<ILogger<ParseScannedFiles>>(), ds,
 | 
						|
            new MockReadingItemService(new DefaultParser(ds)), Substitute.For<IEventHub>());
 | 
						|
 | 
						|
 | 
						|
        await psf.ScanLibrariesForSeries(LibraryType.Manga, new List<string>() {"C:/Data/"}, "libraryName");
 | 
						|
 | 
						|
        Assert.Equal("Accel World", psf.MergeName(ParserInfoFactory.CreateParsedInfo("Accel World", "1", "0", "Accel World v1.epub", false)));
 | 
						|
        Assert.Equal("Accel World", psf.MergeName(ParserInfoFactory.CreateParsedInfo("accel_world", "1", "0", "Accel World v1.epub", false)));
 | 
						|
    }
 | 
						|
 | 
						|
    #endregion
 | 
						|
 | 
						|
    #region ScanLibrariesForSeries
 | 
						|
 | 
						|
    [Fact]
 | 
						|
    public async Task ScanLibrariesForSeries_ShouldFindFiles()
 | 
						|
    {
 | 
						|
        var fileSystem = new MockFileSystem();
 | 
						|
        fileSystem.AddDirectory("C:/Data/");
 | 
						|
        fileSystem.AddFile("C:/Data/Accel World v1.cbz", new MockFileData(string.Empty));
 | 
						|
        fileSystem.AddFile("C:/Data/Accel World v2.cbz", new MockFileData(string.Empty));
 | 
						|
        fileSystem.AddFile("C:/Data/Accel World v2.pdf", new MockFileData(string.Empty));
 | 
						|
        fileSystem.AddFile("C:/Data/Nothing.pdf", new MockFileData(string.Empty));
 | 
						|
 | 
						|
        var ds = new DirectoryService(Substitute.For<ILogger<DirectoryService>>(), fileSystem);
 | 
						|
        var psf = new ParseScannedFiles(Substitute.For<ILogger<ParseScannedFiles>>(), ds,
 | 
						|
            new MockReadingItemService(new DefaultParser(ds)), Substitute.For<IEventHub>());
 | 
						|
 | 
						|
 | 
						|
        var parsedSeries = await psf.ScanLibrariesForSeries(LibraryType.Manga, new List<string>() {"C:/Data/"}, "libraryName");
 | 
						|
 | 
						|
        Assert.Equal(3, parsedSeries.Values.Count);
 | 
						|
        Assert.NotEmpty(parsedSeries.Keys.Where(p => p.Format == MangaFormat.Archive && p.Name.Equals("Accel World")));
 | 
						|
 | 
						|
    }
 | 
						|
 | 
						|
 | 
						|
    #endregion
 | 
						|
}
 |