diff --git a/.browserslistrc b/.browserslistrc index 427441dc9..6784945a5 100644 --- a/.browserslistrc +++ b/.browserslistrc @@ -8,10 +8,4 @@ # You can see what browsers were selected by your queries by running: # npx browserslist -last 1 Chrome version -last 1 Firefox version -last 2 Edge major versions -last 2 Safari major versions -last 2 iOS major versions -Firefox ESR -not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line. +defaults \ No newline at end of file diff --git a/.editorconfig b/.editorconfig index c24677846..c82009e40 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,6 +1,7 @@ # Editor configuration, see https://editorconfig.org root = true + [*] charset = utf-8 indent_style = space @@ -22,3 +23,7 @@ indent_size = 2 [*.csproj] indent_size = 2 + +[*.cs] +# Disable SonarLint warning S1075 (Don't use hardcoded url) +dotnet_diagnostic.S1075.severity = none diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 52c31b52b..805c3b61d 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -25,10 +25,10 @@ body: - type: dropdown id: version attributes: - label: Kavita Version Number - If you don not see your version number listed, please update Kavita and see if your issue still persists. + label: Kavita Version Number - If you don't see your version number listed, please update Kavita and see if your issue still persists. multiple: false options: - - 0.8.4.2 - Stable + - 0.8.7 - Stable - Nightly Testing Branch validations: required: true diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 6aaef02d9..044864734 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -17,7 +17,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Install Swashbuckle CLI shell: powershell diff --git a/.github/workflows/canary-workflow.yml b/.github/workflows/canary-workflow.yml index 57ec316e4..b919030b0 100644 --- a/.github/workflows/canary-workflow.yml +++ b/.github/workflows/canary-workflow.yml @@ -9,7 +9,7 @@ on: jobs: build: name: Upload Kavita.Common for Version Bump - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout Repo uses: actions/checkout@v4 @@ -24,7 +24,7 @@ jobs: version: name: Bump version needs: [ build ] - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 with: @@ -33,7 +33,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Bump versions uses: SiqiLu/dotnet-bump-version@2.0.0 @@ -45,7 +45,7 @@ jobs: canary: name: Build Canary Docker needs: [ build, version ] - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 permissions: packages: write contents: read @@ -98,7 +98,7 @@ jobs: - name: Compile dotnet app uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Install Swashbuckle CLI run: dotnet tool install -g Swashbuckle.AspNetCore.Cli diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 391776dd8..7ce4276bc 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -13,7 +13,7 @@ name: "CodeQL" on: push: - branches: [ "develop", "main" ] + branches: [ "develop"] pull_request: # The branches below must be a subset of the branches above branches: [ "develop" ] @@ -38,7 +38,7 @@ jobs: strategy: fail-fast: false matrix: - language: [ 'csharp', 'javascript-typescript', 'python' ] + language: [ 'csharp', 'javascript-typescript' ] # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ] # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both @@ -48,9 +48,10 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Install Swashbuckle CLI - shell: bash - run: dotnet tool install -g Swashbuckle.AspNetCore.Cli + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 9.0.x # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/develop-workflow.yml b/.github/workflows/develop-workflow.yml index 939cda4e5..006127645 100644 --- a/.github/workflows/develop-workflow.yml +++ b/.github/workflows/develop-workflow.yml @@ -7,7 +7,7 @@ on: jobs: debug: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Debug Info run: | @@ -17,7 +17,7 @@ jobs: echo "Matches Develop: ${{ github.ref == 'refs/heads/develop' }}" build: name: Upload Kavita.Common for Version Bump - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 if: github.ref == 'refs/heads/develop' steps: - name: Checkout Repo @@ -33,7 +33,7 @@ jobs: version: name: Bump version needs: [ build ] - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 if: github.ref == 'refs/heads/develop' steps: - uses: actions/checkout@v4 @@ -43,7 +43,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Bump versions uses: majora2007/dotnet-bump-version@v0.0.10 @@ -55,7 +55,7 @@ jobs: develop: name: Build Nightly Docker needs: [ build, version ] - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 if: github.ref == 'refs/heads/develop' permissions: packages: write @@ -128,7 +128,7 @@ jobs: - name: Compile dotnet app uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Install Swashbuckle CLI run: dotnet tool install -g Swashbuckle.AspNetCore.Cli diff --git a/.github/workflows/openapi-gen.yml b/.github/workflows/openapi-gen.yml new file mode 100644 index 000000000..45446d045 --- /dev/null +++ b/.github/workflows/openapi-gen.yml @@ -0,0 +1,68 @@ +name: Generate OpenAPI Documentation + +on: + push: + branches: [ 'develop', '!release/**' ] + paths: + - '**/*.cs' + - '**/*.csproj' + pull_request: + branches: [ 'develop', '!release/**' ] + workflow_dispatch: + +jobs: + generate-openapi: + runs-on: ubuntu-latest + # Only run on direct pushes to develop, not PRs + if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.repository_owner == 'Kareadita' + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 9.0.x + + - name: Install dependencies + run: dotnet restore + + - name: Build project + run: dotnet build API/API.csproj --configuration Debug + + - name: Get Swashbuckle version + id: swashbuckle-version + run: | + VERSION=$(grep -o '> $GITHUB_OUTPUT + echo "Found Swashbuckle.AspNetCore version: $VERSION" + + - name: Install matching Swashbuckle CLI tool + run: | + dotnet new tool-manifest --force + dotnet tool install Swashbuckle.AspNetCore.Cli --version ${{ steps.swashbuckle-version.outputs.VERSION }} + + - name: Generate OpenAPI file + run: dotnet swagger tofile --output openapi.json API/bin/Debug/net9.0/API.dll v1 + + - name: Check for changes + id: git-check + run: | + git add openapi.json + git diff --staged --quiet openapi.json || echo "has_changes=true" >> $GITHUB_OUTPUT + + - name: Commit and push if changed + if: steps.git-check.outputs.has_changes == 'true' + run: | + git config --local user.email "action@github.com" + git config --local user.name "GitHub Action" + + git commit -m "Update OpenAPI documentation" openapi.json + + # Pull latest changes with rebase to avoid merge commits + git pull --rebase origin develop + + git push + env: + GITHUB_TOKEN: ${{ secrets.REPO_GHA_PAT }} diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index 7482deb0b..51589221f 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -1,15 +1,13 @@ name: Validate PR Body on: - push: - branches: '**' pull_request: branches: [ main, develop, canary ] types: [synchronize] jobs: check_pr: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Extract branch name shell: bash diff --git a/.github/workflows/release-workflow.yml b/.github/workflows/release-workflow.yml index 95e4dc7e3..757ce1075 100644 --- a/.github/workflows/release-workflow.yml +++ b/.github/workflows/release-workflow.yml @@ -10,7 +10,7 @@ on: jobs: debug: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Debug Info run: | @@ -20,13 +20,13 @@ jobs: echo "Matches Develop: ${{ github.ref == 'refs/heads/develop' }}" if_merged: if: github.event.pull_request.merged == true && contains(github.head_ref, 'release') - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - run: | echo The PR was merged build: name: Upload Kavita.Common for Version Bump - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 if: github.event.pull_request.merged == true && contains(github.head_ref, 'release') steps: - name: Checkout Repo @@ -43,7 +43,7 @@ jobs: name: Build Stable and Nightly Docker if Release needs: [ build ] if: github.event.pull_request.merged == true && contains(github.head_ref, 'release') - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 permissions: packages: write contents: read @@ -106,7 +106,7 @@ jobs: - name: Compile dotnet app uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.0.x + dotnet-version: 9.0.x - name: Install Swashbuckle CLI run: dotnet tool install -g Swashbuckle.AspNetCore.Cli diff --git a/.gitignore b/.gitignore index 71a904556..1cffb441d 100644 --- a/.gitignore +++ b/.gitignore @@ -513,6 +513,7 @@ UI/Web/dist/ /API/config/stats/ /API/config/bookmarks/ /API/config/favicons/ +/API/config/cache-long/ /API/config/kavita.db /API/config/kavita.db-shm /API/config/kavita.db-wal diff --git a/API.Benchmark/API.Benchmark.csproj b/API.Benchmark/API.Benchmark.csproj index 222213438..ec9c1884f 100644 --- a/API.Benchmark/API.Benchmark.csproj +++ b/API.Benchmark/API.Benchmark.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 Exe @@ -10,8 +10,8 @@ - - + + @@ -26,5 +26,10 @@ Always + + + PreserveNewest + + diff --git a/API.Benchmark/Data/AesopsFables.epub b/API.Benchmark/Data/AesopsFables.epub new file mode 100644 index 000000000..d2ab9a8b2 Binary files /dev/null and b/API.Benchmark/Data/AesopsFables.epub differ diff --git a/API.Benchmark/KoreaderHashBenchmark.cs b/API.Benchmark/KoreaderHashBenchmark.cs new file mode 100644 index 000000000..c0abfd2ad --- /dev/null +++ b/API.Benchmark/KoreaderHashBenchmark.cs @@ -0,0 +1,41 @@ +using API.Helpers.Builders; +using BenchmarkDotNet.Attributes; +using BenchmarkDotNet.Order; +using System; +using API.Entities.Enums; + +namespace API.Benchmark +{ + [StopOnFirstError] + [MemoryDiagnoser] + [RankColumn] + [Orderer(SummaryOrderPolicy.FastestToSlowest)] + [SimpleJob(launchCount: 1, warmupCount: 5, invocationCount: 20)] + public class KoreaderHashBenchmark + { + private const string sourceEpub = "./Data/AesopsFables.epub"; + + [Benchmark(Baseline = true)] + public void TestBuildManga_baseline() + { + var file = new MangaFileBuilder(sourceEpub, MangaFormat.Epub) + .Build(); + if (file == null) + { + throw new Exception("Failed to build manga file"); + } + } + + [Benchmark] + public void TestBuildManga_withHash() + { + var file = new MangaFileBuilder(sourceEpub, MangaFormat.Epub) + .WithHash() + .Build(); + if (file == null) + { + throw new Exception("Failed to build manga file"); + } + } + } +} diff --git a/API.Tests/API.Tests.csproj b/API.Tests/API.Tests.csproj index df946c10b..a571a6e72 100644 --- a/API.Tests/API.Tests.csproj +++ b/API.Tests/API.Tests.csproj @@ -1,22 +1,22 @@ - net8.0 + net9.0 false - - + + - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -28,6 +28,7 @@ + @@ -35,4 +36,10 @@ + + + PreserveNewest + + + diff --git a/API.Tests/AbstractDbTest.cs b/API.Tests/AbstractDbTest.cs index 9f45ca619..9c5f3e726 100644 --- a/API.Tests/AbstractDbTest.cs +++ b/API.Tests/AbstractDbTest.cs @@ -1,6 +1,5 @@ -using System.Collections.Generic; +using System; using System.Data.Common; -using System.IO.Abstractions.TestingHelpers; using System.Linq; using System.Threading.Tasks; using API.Data; @@ -11,7 +10,6 @@ using API.Helpers.Builders; using API.Services; using AutoMapper; using Hangfire; -using Microsoft.AspNetCore.Identity; using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; @@ -20,40 +18,34 @@ using NSubstitute; namespace API.Tests; -public abstract class AbstractDbTest +public abstract class AbstractDbTest : AbstractFsTest , IDisposable { - protected readonly DbConnection _connection; - protected readonly DataContext _context; - protected readonly IUnitOfWork _unitOfWork; - - - protected const string CacheDirectory = "C:/kavita/config/cache/"; - protected const string CoverImageDirectory = "C:/kavita/config/covers/"; - protected const string BackupDirectory = "C:/kavita/config/backups/"; - protected const string LogDirectory = "C:/kavita/config/logs/"; - protected const string BookmarkDirectory = "C:/kavita/config/bookmarks/"; - protected const string SiteThemeDirectory = "C:/kavita/config/themes/"; - protected const string TempDirectory = "C:/kavita/config/temp/"; - protected const string DataDirectory = "C:/data/"; + protected readonly DataContext Context; + protected readonly IUnitOfWork UnitOfWork; + protected readonly IMapper Mapper; + private readonly DbConnection _connection; + private bool _disposed; protected AbstractDbTest() { - var contextOptions = new DbContextOptionsBuilder() + var contextOptions = new DbContextOptionsBuilder() .UseSqlite(CreateInMemoryDatabase()) + .EnableSensitiveDataLogging() .Options; + _connection = RelationalOptionsExtension.Extract(contextOptions).Connection; - _context = new DataContext(contextOptions); + Context = new DataContext(contextOptions); + + Context.Database.EnsureCreated(); // Ensure DB schema is created + Task.Run(SeedDb).GetAwaiter().GetResult(); var config = new MapperConfiguration(cfg => cfg.AddProfile()); - var mapper = config.CreateMapper(); + Mapper = config.CreateMapper(); - // Set up Hangfire to use in-memory storage for testing GlobalConfiguration.Configuration.UseInMemoryStorage(); - - - _unitOfWork = new UnitOfWork(_context, mapper, null); + UnitOfWork = new UnitOfWork(Context, Mapper, null); } private static DbConnection CreateInMemoryDatabase() @@ -66,47 +58,79 @@ public abstract class AbstractDbTest private async Task SeedDb() { - await _context.Database.MigrateAsync(); - var filesystem = CreateFileSystem(); + try + { + await Context.Database.EnsureCreatedAsync(); + var filesystem = CreateFileSystem(); - await Seed.SeedSettings(_context, new DirectoryService(Substitute.For>(), filesystem)); + await Seed.SeedSettings(Context, new DirectoryService(Substitute.For>(), filesystem)); - var setting = await _context.ServerSetting.Where(s => s.Key == ServerSettingKey.CacheDirectory).SingleAsync(); - setting.Value = CacheDirectory; + 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.BackupDirectory).SingleAsync(); + setting.Value = BackupDirectory; - setting = await _context.ServerSetting.Where(s => s.Key == ServerSettingKey.BookmarkDirectory).SingleAsync(); - setting.Value = BookmarkDirectory; + setting = await Context.ServerSetting.Where(s => s.Key == ServerSettingKey.BookmarkDirectory).SingleAsync(); + setting.Value = BookmarkDirectory; - setting = await _context.ServerSetting.Where(s => s.Key == ServerSettingKey.TotalLogs).SingleAsync(); - setting.Value = "10"; + setting = await Context.ServerSetting.Where(s => s.Key == ServerSettingKey.TotalLogs).SingleAsync(); + setting.Value = "10"; - _context.ServerSetting.Update(setting); + Context.ServerSetting.Update(setting); - _context.Library.Add(new LibraryBuilder("Manga") - .WithFolderPath(new FolderPathBuilder("C:/data/").Build()) - .Build()); - return await _context.SaveChangesAsync() > 0; + + Context.Library.Add(new LibraryBuilder("Manga") + .WithAllowMetadataMatching(true) + .WithFolderPath(new FolderPathBuilder(DataDirectory).Build()) + .Build()); + + await Context.SaveChangesAsync(); + + await Seed.SeedMetadataSettings(Context); + + return true; + } + catch (Exception ex) + { + Console.WriteLine($"[SeedDb] Error: {ex.Message}"); + return false; + } } protected abstract Task ResetDb(); - protected static MockFileSystem CreateFileSystem() + public void Dispose() { - 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(LogDirectory); - fileSystem.AddDirectory(TempDirectory); - fileSystem.AddDirectory(DataDirectory); + Dispose(true); + GC.SuppressFinalize(this); + } - return fileSystem; + protected virtual void Dispose(bool disposing) + { + if (_disposed) return; + + if (disposing) + { + Context?.Dispose(); + _connection?.Dispose(); + } + + _disposed = true; + } + + /// + /// Add a role to an existing User. Commits. + /// + /// + /// + protected async Task AddUserWithRole(int userId, string roleName) + { + var role = new AppRole { Id = userId, Name = roleName, NormalizedName = roleName.ToUpper() }; + + await Context.Roles.AddAsync(role); + await Context.UserRoles.AddAsync(new AppUserRole { UserId = userId, RoleId = userId }); + + await Context.SaveChangesAsync(); } } diff --git a/API.Tests/AbstractFsTest.cs b/API.Tests/AbstractFsTest.cs new file mode 100644 index 000000000..965a7ad78 --- /dev/null +++ b/API.Tests/AbstractFsTest.cs @@ -0,0 +1,44 @@ + + +using System.IO; +using System.IO.Abstractions; +using System.IO.Abstractions.TestingHelpers; +using API.Services.Tasks.Scanner.Parser; + +namespace API.Tests; + +public abstract class AbstractFsTest +{ + + protected static readonly string Root = Parser.NormalizePath(Path.GetPathRoot(Directory.GetCurrentDirectory())); + protected static readonly string ConfigDirectory = Root + "kavita/config/"; + protected static readonly string CacheDirectory = ConfigDirectory + "cache/"; + protected static readonly string CacheLongDirectory = ConfigDirectory + "cache-long/"; + protected static readonly string CoverImageDirectory = ConfigDirectory + "covers/"; + protected static readonly string BackupDirectory = ConfigDirectory + "backups/"; + protected static readonly string LogDirectory = ConfigDirectory + "logs/"; + protected static readonly string BookmarkDirectory = ConfigDirectory + "bookmarks/"; + protected static readonly string SiteThemeDirectory = ConfigDirectory + "themes/"; + protected static readonly string TempDirectory = ConfigDirectory + "temp/"; + protected static readonly string ThemesDirectory = ConfigDirectory + "theme"; + protected static readonly string DataDirectory = Root + "data/"; + + protected static MockFileSystem CreateFileSystem() + { + var fileSystem = new MockFileSystem(); + fileSystem.Directory.SetCurrentDirectory(Root + "kavita/"); + fileSystem.AddDirectory(Root + "kavita/config/"); + fileSystem.AddDirectory(CacheDirectory); + fileSystem.AddDirectory(CacheLongDirectory); + fileSystem.AddDirectory(CoverImageDirectory); + fileSystem.AddDirectory(BackupDirectory); + fileSystem.AddDirectory(BookmarkDirectory); + fileSystem.AddDirectory(SiteThemeDirectory); + fileSystem.AddDirectory(LogDirectory); + fileSystem.AddDirectory(TempDirectory); + fileSystem.AddDirectory(DataDirectory); + fileSystem.AddDirectory(ThemesDirectory); + + return fileSystem; + } +} diff --git a/API.Tests/Converters/CronConverterTests.cs b/API.Tests/Converters/CronConverterTests.cs index 4e214e8f1..5568c89d0 100644 --- a/API.Tests/Converters/CronConverterTests.cs +++ b/API.Tests/Converters/CronConverterTests.cs @@ -1,5 +1,4 @@ using API.Helpers.Converters; -using Hangfire; using Xunit; namespace API.Tests.Converters; diff --git a/API.Tests/Data/AesopsFables.epub b/API.Tests/Data/AesopsFables.epub new file mode 100644 index 000000000..d2ab9a8b2 Binary files /dev/null and b/API.Tests/Data/AesopsFables.epub differ diff --git a/API.Tests/Extensions/ChapterListExtensionsTests.cs b/API.Tests/Extensions/ChapterListExtensionsTests.cs index d27903ca9..f19a0cede 100644 --- a/API.Tests/Extensions/ChapterListExtensionsTests.cs +++ b/API.Tests/Extensions/ChapterListExtensionsTests.cs @@ -142,7 +142,7 @@ public class ChapterListExtensionsTests CreateChapter("darker than black", "1", CreateFile("/manga/darker than black.cbz", MangaFormat.Archive), false), }; - Assert.Equal(chapterList.First(), chapterList.GetFirstChapterWithFiles()); + Assert.Equal(chapterList[0], chapterList.GetFirstChapterWithFiles()); } [Fact] @@ -150,13 +150,13 @@ public class ChapterListExtensionsTests { var chapterList = new List() { - CreateChapter("darker than black", API.Services.Tasks.Scanner.Parser.Parser.DefaultChapter, CreateFile("/manga/darker than black.cbz", MangaFormat.Archive), true), + CreateChapter("darker than black", Parser.DefaultChapter, CreateFile("/manga/darker than black.cbz", MangaFormat.Archive), true), CreateChapter("darker than black", "1", CreateFile("/manga/darker than black.cbz", MangaFormat.Archive), false), }; - chapterList.First().Files = new List(); + chapterList[0].Files = new List(); - Assert.Equal(chapterList.Last(), chapterList.GetFirstChapterWithFiles()); + Assert.Equal(chapterList[^1], chapterList.GetFirstChapterWithFiles()); } @@ -181,7 +181,7 @@ public class ChapterListExtensionsTests CreateChapter("detective comics", API.Services.Tasks.Scanner.Parser.Parser.DefaultChapter, CreateFile("/manga/detective comics #001.cbz", MangaFormat.Archive), true) }; - chapterList[0].ReleaseDate = new DateTime(10, 1, 1); + chapterList[0].ReleaseDate = new DateTime(10, 1, 1, 0, 0, 0, DateTimeKind.Utc); chapterList[1].ReleaseDate = DateTime.MinValue; Assert.Equal(0, chapterList.MinimumReleaseYear()); @@ -196,8 +196,8 @@ public class ChapterListExtensionsTests CreateChapter("detective comics", API.Services.Tasks.Scanner.Parser.Parser.DefaultChapter, CreateFile("/manga/detective comics #001.cbz", MangaFormat.Archive), true) }; - chapterList[0].ReleaseDate = new DateTime(2002, 1, 1); - chapterList[1].ReleaseDate = new DateTime(2012, 2, 1); + chapterList[0].ReleaseDate = new DateTime(2002, 1, 1, 0, 0, 0, DateTimeKind.Utc); + chapterList[1].ReleaseDate = new DateTime(2012, 2, 1, 0, 0, 0, DateTimeKind.Utc); Assert.Equal(2002, chapterList.MinimumReleaseYear()); } diff --git a/API.Tests/Extensions/EncodeFormatExtensionsTests.cs b/API.Tests/Extensions/EncodeFormatExtensionsTests.cs new file mode 100644 index 000000000..a02de84aa --- /dev/null +++ b/API.Tests/Extensions/EncodeFormatExtensionsTests.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using API.Entities.Enums; +using API.Extensions; +using Xunit; + +namespace API.Tests.Extensions; + +public class EncodeFormatExtensionsTests +{ + [Fact] + public void GetExtension_ShouldReturnCorrectExtensionForAllValues() + { + // Arrange + var expectedExtensions = new Dictionary + { + { EncodeFormat.PNG, ".png" }, + { EncodeFormat.WEBP, ".webp" }, + { EncodeFormat.AVIF, ".avif" } + }; + + // Act & Assert + foreach (var format in Enum.GetValues(typeof(EncodeFormat)).Cast()) + { + var extension = format.GetExtension(); + Assert.Equal(expectedExtensions[format], extension); + } + } + +} diff --git a/API.Tests/Extensions/ParserInfoListExtensionsTests.cs b/API.Tests/Extensions/ParserInfoListExtensionsTests.cs index 325b19c5d..227dd2b32 100644 --- a/API.Tests/Extensions/ParserInfoListExtensionsTests.cs +++ b/API.Tests/Extensions/ParserInfoListExtensionsTests.cs @@ -7,7 +7,6 @@ using API.Extensions; using API.Helpers.Builders; using API.Services; using API.Services.Tasks.Scanner.Parser; -using API.Tests.Helpers; using Microsoft.Extensions.Logging; using NSubstitute; using Xunit; diff --git a/API.Tests/Extensions/QueryableExtensionsTests.cs b/API.Tests/Extensions/QueryableExtensionsTests.cs index 4ea9a5a4b..96d74b46d 100644 --- a/API.Tests/Extensions/QueryableExtensionsTests.cs +++ b/API.Tests/Extensions/QueryableExtensionsTests.cs @@ -1,11 +1,9 @@ using System.Collections.Generic; using System.Linq; -using API.Data; using API.Data.Misc; using API.Entities; using API.Entities.Enums; -using API.Entities.Metadata; -using API.Extensions; +using API.Entities.Person; using API.Extensions.QueryExtensions; using API.Helpers.Builders; using Xunit; @@ -69,7 +67,7 @@ public class QueryableExtensionsTests [Theory] [InlineData(true, 2)] - [InlineData(false, 1)] + [InlineData(false, 2)] public void RestrictAgainstAgeRestriction_Genre_ShouldRestrictEverythingAboveTeen(bool includeUnknowns, int expectedCount) { var items = new List() @@ -96,7 +94,7 @@ public class QueryableExtensionsTests [Theory] [InlineData(true, 2)] - [InlineData(false, 1)] + [InlineData(false, 2)] public void RestrictAgainstAgeRestriction_Tag_ShouldRestrictEverythingAboveTeen(bool includeUnknowns, int expectedCount) { var items = new List() diff --git a/API.Tests/Extensions/SeriesFilterTests.cs b/API.Tests/Extensions/SeriesFilterTests.cs index 7d88ff4fe..ba42be8a1 100644 --- a/API.Tests/Extensions/SeriesFilterTests.cs +++ b/API.Tests/Extensions/SeriesFilterTests.cs @@ -24,9 +24,9 @@ public class SeriesFilterTests : AbstractDbTest { protected override async Task ResetDb() { - _context.Series.RemoveRange(_context.Series); - _context.AppUser.RemoveRange(_context.AppUser); - await _context.SaveChangesAsync(); + Context.Series.RemoveRange(Context.Series); + Context.AppUser.RemoveRange(Context.AppUser); + await Context.SaveChangesAsync(); } #region HasProgress @@ -54,18 +54,18 @@ public class SeriesFilterTests : AbstractDbTest .WithLibrary(library) .Build(); - _context.Users.Add(user); - _context.Library.Add(library); - await _context.SaveChangesAsync(); + Context.Users.Add(user); + Context.Library.Add(library); + await Context.SaveChangesAsync(); // Create read progress on Partial and Full - var readerService = new ReaderService(_unitOfWork, Substitute.For>(), + var readerService = new ReaderService(UnitOfWork, Substitute.For>(), Substitute.For(), Substitute.For(), Substitute.For(), Substitute.For()); // Select Partial and set pages read to 5 on first chapter - var partialSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(2); + var partialSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(2); var partialChapter = partialSeries.Volumes.First().Chapters.First(); Assert.True(await readerService.SaveReadingProgress(new ProgressDto() @@ -78,7 +78,7 @@ public class SeriesFilterTests : AbstractDbTest }, user.Id)); // Select Full and set pages read to 10 on first chapter - var fullSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(3); + var fullSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(3); var fullChapter = fullSeries.Volumes.First().Chapters.First(); Assert.True(await readerService.SaveReadingProgress(new ProgressDto() @@ -98,7 +98,7 @@ public class SeriesFilterTests : AbstractDbTest { var user = await SetupHasProgress(); - var queryResult = await _context.Series.HasReadingProgress(true, FilterComparison.LessThan, 50, user.Id) + var queryResult = await Context.Series.HasReadingProgress(true, FilterComparison.LessThan, 50, user.Id) .ToListAsync(); Assert.Single(queryResult); @@ -111,7 +111,7 @@ public class SeriesFilterTests : AbstractDbTest var user = await SetupHasProgress(); // Query series with progress <= 50% - var queryResult = await _context.Series.HasReadingProgress(true, FilterComparison.LessThanEqual, 50, user.Id) + var queryResult = await Context.Series.HasReadingProgress(true, FilterComparison.LessThanEqual, 50, user.Id) .ToListAsync(); Assert.Equal(2, queryResult.Count); @@ -125,7 +125,7 @@ public class SeriesFilterTests : AbstractDbTest var user = await SetupHasProgress(); // Query series with progress > 50% - var queryResult = await _context.Series.HasReadingProgress(true, FilterComparison.GreaterThan, 50, user.Id) + var queryResult = await Context.Series.HasReadingProgress(true, FilterComparison.GreaterThan, 50, user.Id) .ToListAsync(); Assert.Single(queryResult); @@ -138,7 +138,7 @@ public class SeriesFilterTests : AbstractDbTest var user = await SetupHasProgress(); // Query series with progress == 100% - var queryResult = await _context.Series.HasReadingProgress(true, FilterComparison.Equal, 100, user.Id) + var queryResult = await Context.Series.HasReadingProgress(true, FilterComparison.Equal, 100, user.Id) .ToListAsync(); Assert.Single(queryResult); @@ -151,7 +151,7 @@ public class SeriesFilterTests : AbstractDbTest var user = await SetupHasProgress(); // Query series with progress < 100% - var queryResult = await _context.Series.HasReadingProgress(true, FilterComparison.LessThan, 100, user.Id) + var queryResult = await Context.Series.HasReadingProgress(true, FilterComparison.LessThan, 100, user.Id) .ToListAsync(); Assert.Equal(2, queryResult.Count); @@ -165,7 +165,7 @@ public class SeriesFilterTests : AbstractDbTest var user = await SetupHasProgress(); // Query series with progress <= 100% - var queryResult = await _context.Series.HasReadingProgress(true, FilterComparison.LessThanEqual, 100, user.Id) + var queryResult = await Context.Series.HasReadingProgress(true, FilterComparison.LessThanEqual, 100, user.Id) .ToListAsync(); Assert.Equal(3, queryResult.Count); @@ -188,16 +188,16 @@ public class SeriesFilterTests : AbstractDbTest .WithLibrary(library) .Build(); - _context.Users.Add(user); - _context.Library.Add(library); - await _context.SaveChangesAsync(); + Context.Users.Add(user); + Context.Library.Add(library); + await Context.SaveChangesAsync(); - var readerService = new ReaderService(_unitOfWork, Substitute.For>(), + var readerService = new ReaderService(UnitOfWork, Substitute.For>(), Substitute.For(), Substitute.For(), Substitute.For(), Substitute.For()); // Set progress to 99.99% (99/100 pages read) - var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1); + var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1); var chapter = series.Volumes.First().Chapters.First(); Assert.True(await readerService.SaveReadingProgress(new ProgressDto() @@ -210,7 +210,7 @@ public class SeriesFilterTests : AbstractDbTest }, user.Id)); // Query series with progress < 100% - var queryResult = await _context.Series.HasReadingProgress(true, FilterComparison.LessThan, 100, user.Id) + var queryResult = await Context.Series.HasReadingProgress(true, FilterComparison.LessThan, 100, user.Id) .ToListAsync(); Assert.Single(queryResult); @@ -246,9 +246,9 @@ public class SeriesFilterTests : AbstractDbTest .WithLibrary(library) .Build(); - _context.Users.Add(user); - _context.Library.Add(library); - await _context.SaveChangesAsync(); + Context.Users.Add(user); + Context.Library.Add(library); + await Context.SaveChangesAsync(); return user; } @@ -258,7 +258,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasLanguage(); - var foundSeries = await _context.Series.HasLanguage(true, FilterComparison.Equal, ["en"]).ToListAsync(); + var foundSeries = await Context.Series.HasLanguage(true, FilterComparison.Equal, ["en"]).ToListAsync(); Assert.Single(foundSeries); Assert.Equal("en", foundSeries[0].Metadata.Language); } @@ -268,7 +268,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasLanguage(); - var foundSeries = await _context.Series.HasLanguage(true, FilterComparison.NotEqual, ["en"]).ToListAsync(); + var foundSeries = await Context.Series.HasLanguage(true, FilterComparison.NotEqual, ["en"]).ToListAsync(); Assert.Equal(2, foundSeries.Count); Assert.DoesNotContain(foundSeries, s => s.Metadata.Language == "en"); } @@ -278,7 +278,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasLanguage(); - var foundSeries = await _context.Series.HasLanguage(true, FilterComparison.Contains, ["en", "fr"]).ToListAsync(); + var foundSeries = await Context.Series.HasLanguage(true, FilterComparison.Contains, ["en", "fr"]).ToListAsync(); Assert.Equal(2, foundSeries.Count); Assert.Contains(foundSeries, s => s.Metadata.Language == "en"); Assert.Contains(foundSeries, s => s.Metadata.Language == "fr"); @@ -289,7 +289,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasLanguage(); - var foundSeries = await _context.Series.HasLanguage(true, FilterComparison.NotContains, ["en", "fr"]).ToListAsync(); + var foundSeries = await Context.Series.HasLanguage(true, FilterComparison.NotContains, ["en", "fr"]).ToListAsync(); Assert.Single(foundSeries); Assert.Equal("es", foundSeries[0].Metadata.Language); } @@ -300,11 +300,11 @@ public class SeriesFilterTests : AbstractDbTest await SetupHasLanguage(); // Since "MustContains" matches all the provided languages, no series should match in this case. - var foundSeries = await _context.Series.HasLanguage(true, FilterComparison.MustContains, ["en", "fr"]).ToListAsync(); + var foundSeries = await Context.Series.HasLanguage(true, FilterComparison.MustContains, ["en", "fr"]).ToListAsync(); Assert.Empty(foundSeries); // Single language should work. - foundSeries = await _context.Series.HasLanguage(true, FilterComparison.MustContains, ["en"]).ToListAsync(); + foundSeries = await Context.Series.HasLanguage(true, FilterComparison.MustContains, ["en"]).ToListAsync(); Assert.Single(foundSeries); Assert.Equal("en", foundSeries[0].Metadata.Language); } @@ -314,7 +314,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasLanguage(); - var foundSeries = await _context.Series.HasLanguage(true, FilterComparison.Matches, ["e"]).ToListAsync(); + var foundSeries = await Context.Series.HasLanguage(true, FilterComparison.Matches, ["e"]).ToListAsync(); Assert.Equal(2, foundSeries.Count); Assert.Contains("en", foundSeries.Select(s => s.Metadata.Language)); Assert.Contains("es", foundSeries.Select(s => s.Metadata.Language)); @@ -325,7 +325,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasLanguage(); - var foundSeries = await _context.Series.HasLanguage(false, FilterComparison.Equal, ["en"]).ToListAsync(); + var foundSeries = await Context.Series.HasLanguage(false, FilterComparison.Equal, ["en"]).ToListAsync(); Assert.Equal(3, foundSeries.Count); } @@ -334,7 +334,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasLanguage(); - var foundSeries = await _context.Series.HasLanguage(true, FilterComparison.Equal, new List()).ToListAsync(); + var foundSeries = await Context.Series.HasLanguage(true, FilterComparison.Equal, new List()).ToListAsync(); Assert.Equal(3, foundSeries.Count); } @@ -345,7 +345,7 @@ public class SeriesFilterTests : AbstractDbTest await Assert.ThrowsAsync(async () => { - await _context.Series.HasLanguage(true, FilterComparison.GreaterThan, ["en"]).ToListAsync(); + await Context.Series.HasLanguage(true, FilterComparison.GreaterThan, ["en"]).ToListAsync(); }); } @@ -379,9 +379,9 @@ public class SeriesFilterTests : AbstractDbTest .WithLibrary(library) .Build(); - _context.Users.Add(user); - _context.Library.Add(library); - await _context.SaveChangesAsync(); + Context.Users.Add(user); + Context.Library.Add(library); + await Context.SaveChangesAsync(); return user; } @@ -391,7 +391,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasAverageRating(); - var series = await _context.Series.HasAverageRating(true, FilterComparison.Equal, 100).ToListAsync(); + var series = await Context.Series.HasAverageRating(true, FilterComparison.Equal, 100).ToListAsync(); Assert.Single(series); Assert.Equal("Full", series[0].Name); } @@ -401,7 +401,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasAverageRating(); - var series = await _context.Series.HasAverageRating(true, FilterComparison.GreaterThan, 50).ToListAsync(); + var series = await Context.Series.HasAverageRating(true, FilterComparison.GreaterThan, 50).ToListAsync(); Assert.Single(series); Assert.Equal("Full", series[0].Name); } @@ -411,7 +411,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasAverageRating(); - var series = await _context.Series.HasAverageRating(true, FilterComparison.GreaterThanEqual, 50).ToListAsync(); + var series = await Context.Series.HasAverageRating(true, FilterComparison.GreaterThanEqual, 50).ToListAsync(); Assert.Equal(2, series.Count); Assert.Contains(series, s => s.Name == "Partial"); Assert.Contains(series, s => s.Name == "Full"); @@ -422,7 +422,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasAverageRating(); - var series = await _context.Series.HasAverageRating(true, FilterComparison.LessThan, 50).ToListAsync(); + var series = await Context.Series.HasAverageRating(true, FilterComparison.LessThan, 50).ToListAsync(); Assert.Single(series); Assert.Equal("None", series[0].Name); } @@ -432,7 +432,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasAverageRating(); - var series = await _context.Series.HasAverageRating(true, FilterComparison.LessThanEqual, 50).ToListAsync(); + var series = await Context.Series.HasAverageRating(true, FilterComparison.LessThanEqual, 50).ToListAsync(); Assert.Equal(2, series.Count); Assert.Contains(series, s => s.Name == "None"); Assert.Contains(series, s => s.Name == "Partial"); @@ -443,7 +443,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasAverageRating(); - var series = await _context.Series.HasAverageRating(true, FilterComparison.NotEqual, 100).ToListAsync(); + var series = await Context.Series.HasAverageRating(true, FilterComparison.NotEqual, 100).ToListAsync(); Assert.Equal(2, series.Count); Assert.DoesNotContain(series, s => s.Name == "Full"); } @@ -453,7 +453,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasAverageRating(); - var series = await _context.Series.HasAverageRating(false, FilterComparison.Equal, 100).ToListAsync(); + var series = await Context.Series.HasAverageRating(false, FilterComparison.Equal, 100).ToListAsync(); Assert.Equal(3, series.Count); } @@ -462,7 +462,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasAverageRating(); - var series = await _context.Series.HasAverageRating(true, FilterComparison.Equal, -1).ToListAsync(); + var series = await Context.Series.HasAverageRating(true, FilterComparison.Equal, -1).ToListAsync(); Assert.Single(series); Assert.Equal("None", series[0].Name); } @@ -474,7 +474,7 @@ public class SeriesFilterTests : AbstractDbTest await Assert.ThrowsAsync(async () => { - await _context.Series.HasAverageRating(true, FilterComparison.Contains, 50).ToListAsync(); + await Context.Series.HasAverageRating(true, FilterComparison.Contains, 50).ToListAsync(); }); } @@ -485,7 +485,7 @@ public class SeriesFilterTests : AbstractDbTest await Assert.ThrowsAsync(async () => { - await _context.Series.HasAverageRating(true, (FilterComparison)999, 50).ToListAsync(); + await Context.Series.HasAverageRating(true, (FilterComparison)999, 50).ToListAsync(); }); } @@ -519,9 +519,9 @@ public class SeriesFilterTests : AbstractDbTest .WithLibrary(library) .Build(); - _context.Users.Add(user); - _context.Library.Add(library); - await _context.SaveChangesAsync(); + Context.Users.Add(user); + Context.Library.Add(library); + await Context.SaveChangesAsync(); return user; } @@ -531,7 +531,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasPublicationStatus(); - var foundSeries = await _context.Series.HasPublicationStatus(true, FilterComparison.Equal, new List { PublicationStatus.Cancelled }).ToListAsync(); + var foundSeries = await Context.Series.HasPublicationStatus(true, FilterComparison.Equal, new List { PublicationStatus.Cancelled }).ToListAsync(); Assert.Single(foundSeries); Assert.Equal("Cancelled", foundSeries[0].Name); } @@ -541,7 +541,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasPublicationStatus(); - var foundSeries = await _context.Series.HasPublicationStatus(true, FilterComparison.Contains, new List { PublicationStatus.Cancelled, PublicationStatus.Completed }).ToListAsync(); + var foundSeries = await Context.Series.HasPublicationStatus(true, FilterComparison.Contains, new List { PublicationStatus.Cancelled, PublicationStatus.Completed }).ToListAsync(); Assert.Equal(2, foundSeries.Count); Assert.Contains(foundSeries, s => s.Name == "Cancelled"); Assert.Contains(foundSeries, s => s.Name == "Completed"); @@ -552,7 +552,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasPublicationStatus(); - var foundSeries = await _context.Series.HasPublicationStatus(true, FilterComparison.NotContains, new List { PublicationStatus.Cancelled }).ToListAsync(); + var foundSeries = await Context.Series.HasPublicationStatus(true, FilterComparison.NotContains, new List { PublicationStatus.Cancelled }).ToListAsync(); Assert.Equal(2, foundSeries.Count); Assert.Contains(foundSeries, s => s.Name == "OnGoing"); Assert.Contains(foundSeries, s => s.Name == "Completed"); @@ -563,7 +563,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasPublicationStatus(); - var foundSeries = await _context.Series.HasPublicationStatus(true, FilterComparison.NotEqual, new List { PublicationStatus.OnGoing }).ToListAsync(); + var foundSeries = await Context.Series.HasPublicationStatus(true, FilterComparison.NotEqual, new List { PublicationStatus.OnGoing }).ToListAsync(); Assert.Equal(2, foundSeries.Count); Assert.Contains(foundSeries, s => s.Name == "Cancelled"); Assert.Contains(foundSeries, s => s.Name == "Completed"); @@ -574,7 +574,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasPublicationStatus(); - var foundSeries = await _context.Series.HasPublicationStatus(false, FilterComparison.Equal, new List { PublicationStatus.Cancelled }).ToListAsync(); + var foundSeries = await Context.Series.HasPublicationStatus(false, FilterComparison.Equal, new List { PublicationStatus.Cancelled }).ToListAsync(); Assert.Equal(3, foundSeries.Count); } @@ -583,7 +583,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasPublicationStatus(); - var foundSeries = await _context.Series.HasPublicationStatus(true, FilterComparison.Equal, new List()).ToListAsync(); + var foundSeries = await Context.Series.HasPublicationStatus(true, FilterComparison.Equal, new List()).ToListAsync(); Assert.Equal(3, foundSeries.Count); } @@ -594,7 +594,7 @@ public class SeriesFilterTests : AbstractDbTest await Assert.ThrowsAsync(async () => { - await _context.Series.HasPublicationStatus(true, FilterComparison.BeginsWith, new List { PublicationStatus.Cancelled }).ToListAsync(); + await Context.Series.HasPublicationStatus(true, FilterComparison.BeginsWith, new List { PublicationStatus.Cancelled }).ToListAsync(); }); } @@ -605,7 +605,7 @@ public class SeriesFilterTests : AbstractDbTest await Assert.ThrowsAsync(async () => { - await _context.Series.HasPublicationStatus(true, (FilterComparison)999, new List { PublicationStatus.Cancelled }).ToListAsync(); + await Context.Series.HasPublicationStatus(true, (FilterComparison)999, new List { PublicationStatus.Cancelled }).ToListAsync(); }); } #endregion @@ -637,9 +637,9 @@ public class SeriesFilterTests : AbstractDbTest .WithLibrary(library) .Build(); - _context.Users.Add(user); - _context.Library.Add(library); - await _context.SaveChangesAsync(); + Context.Users.Add(user); + Context.Library.Add(library); + await Context.SaveChangesAsync(); return user; } @@ -649,7 +649,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasAgeRating(); - var foundSeries = await _context.Series.HasAgeRating(true, FilterComparison.Equal, [AgeRating.G]).ToListAsync(); + var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.Equal, [AgeRating.G]).ToListAsync(); Assert.Single(foundSeries); Assert.Equal("G", foundSeries[0].Name); } @@ -659,7 +659,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasAgeRating(); - var foundSeries = await _context.Series.HasAgeRating(true, FilterComparison.Contains, new List { AgeRating.G, AgeRating.Mature }).ToListAsync(); + var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.Contains, new List { AgeRating.G, AgeRating.Mature }).ToListAsync(); Assert.Equal(2, foundSeries.Count); Assert.Contains(foundSeries, s => s.Name == "G"); Assert.Contains(foundSeries, s => s.Name == "Mature"); @@ -670,7 +670,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasAgeRating(); - var foundSeries = await _context.Series.HasAgeRating(true, FilterComparison.NotContains, new List { AgeRating.Unknown }).ToListAsync(); + var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.NotContains, new List { AgeRating.Unknown }).ToListAsync(); Assert.Equal(2, foundSeries.Count); Assert.Contains(foundSeries, s => s.Name == "G"); Assert.Contains(foundSeries, s => s.Name == "Mature"); @@ -681,7 +681,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasAgeRating(); - var foundSeries = await _context.Series.HasAgeRating(true, FilterComparison.NotEqual, new List { AgeRating.G }).ToListAsync(); + var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.NotEqual, new List { AgeRating.G }).ToListAsync(); Assert.Equal(2, foundSeries.Count); Assert.Contains(foundSeries, s => s.Name == "Unknown"); Assert.Contains(foundSeries, s => s.Name == "Mature"); @@ -692,7 +692,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasAgeRating(); - var foundSeries = await _context.Series.HasAgeRating(true, FilterComparison.GreaterThan, new List { AgeRating.Unknown }).ToListAsync(); + var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.GreaterThan, new List { AgeRating.Unknown }).ToListAsync(); Assert.Equal(2, foundSeries.Count); Assert.Contains(foundSeries, s => s.Name == "G"); Assert.Contains(foundSeries, s => s.Name == "Mature"); @@ -703,7 +703,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasAgeRating(); - var foundSeries = await _context.Series.HasAgeRating(true, FilterComparison.GreaterThanEqual, new List { AgeRating.G }).ToListAsync(); + var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.GreaterThanEqual, new List { AgeRating.G }).ToListAsync(); Assert.Equal(2, foundSeries.Count); Assert.Contains(foundSeries, s => s.Name == "G"); Assert.Contains(foundSeries, s => s.Name == "Mature"); @@ -714,7 +714,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasAgeRating(); - var foundSeries = await _context.Series.HasAgeRating(true, FilterComparison.LessThan, new List { AgeRating.Mature }).ToListAsync(); + var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.LessThan, new List { AgeRating.Mature }).ToListAsync(); Assert.Equal(2, foundSeries.Count); Assert.Contains(foundSeries, s => s.Name == "Unknown"); Assert.Contains(foundSeries, s => s.Name == "G"); @@ -725,7 +725,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasAgeRating(); - var foundSeries = await _context.Series.HasAgeRating(true, FilterComparison.LessThanEqual, new List { AgeRating.G }).ToListAsync(); + var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.LessThanEqual, new List { AgeRating.G }).ToListAsync(); Assert.Equal(2, foundSeries.Count); Assert.Contains(foundSeries, s => s.Name == "Unknown"); Assert.Contains(foundSeries, s => s.Name == "G"); @@ -736,7 +736,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasAgeRating(); - var foundSeries = await _context.Series.HasAgeRating(false, FilterComparison.Equal, new List { AgeRating.G }).ToListAsync(); + var foundSeries = await Context.Series.HasAgeRating(false, FilterComparison.Equal, new List { AgeRating.G }).ToListAsync(); Assert.Equal(3, foundSeries.Count); } @@ -745,7 +745,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasAgeRating(); - var foundSeries = await _context.Series.HasAgeRating(true, FilterComparison.Equal, new List()).ToListAsync(); + var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.Equal, new List()).ToListAsync(); Assert.Equal(3, foundSeries.Count); } @@ -756,7 +756,7 @@ public class SeriesFilterTests : AbstractDbTest await Assert.ThrowsAsync(async () => { - await _context.Series.HasAgeRating(true, FilterComparison.BeginsWith, new List { AgeRating.G }).ToListAsync(); + await Context.Series.HasAgeRating(true, FilterComparison.BeginsWith, new List { AgeRating.G }).ToListAsync(); }); } @@ -767,7 +767,7 @@ public class SeriesFilterTests : AbstractDbTest await Assert.ThrowsAsync(async () => { - await _context.Series.HasAgeRating(true, (FilterComparison)999, new List { AgeRating.G }).ToListAsync(); + await Context.Series.HasAgeRating(true, (FilterComparison)999, new List { AgeRating.G }).ToListAsync(); }); } @@ -801,9 +801,9 @@ public class SeriesFilterTests : AbstractDbTest .WithLibrary(library) .Build(); - _context.Users.Add(user); - _context.Library.Add(library); - await _context.SaveChangesAsync(); + Context.Users.Add(user); + Context.Library.Add(library); + await Context.SaveChangesAsync(); return user; } @@ -813,7 +813,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasReleaseYear(); - var foundSeries = await _context.Series.HasReleaseYear(true, FilterComparison.Equal, 2020).ToListAsync(); + var foundSeries = await Context.Series.HasReleaseYear(true, FilterComparison.Equal, 2020).ToListAsync(); Assert.Single(foundSeries); Assert.Equal("2020", foundSeries[0].Name); } @@ -823,7 +823,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasReleaseYear(); - var foundSeries = await _context.Series.HasReleaseYear(true, FilterComparison.GreaterThan, 2000).ToListAsync(); + var foundSeries = await Context.Series.HasReleaseYear(true, FilterComparison.GreaterThan, 2000).ToListAsync(); Assert.Equal(2, foundSeries.Count); Assert.Contains(foundSeries, s => s.Name == "2020"); Assert.Contains(foundSeries, s => s.Name == "2025"); @@ -834,7 +834,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasReleaseYear(); - var foundSeries = await _context.Series.HasReleaseYear(true, FilterComparison.LessThan, 2025).ToListAsync(); + var foundSeries = await Context.Series.HasReleaseYear(true, FilterComparison.LessThan, 2025).ToListAsync(); Assert.Equal(2, foundSeries.Count); Assert.Contains(foundSeries, s => s.Name == "2000"); Assert.Contains(foundSeries, s => s.Name == "2020"); @@ -845,7 +845,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasReleaseYear(); - var foundSeries = await _context.Series.HasReleaseYear(true, FilterComparison.IsInLast, 5).ToListAsync(); + var foundSeries = await Context.Series.HasReleaseYear(true, FilterComparison.IsInLast, 5).ToListAsync(); Assert.Equal(2, foundSeries.Count); } @@ -854,7 +854,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasReleaseYear(); - var foundSeries = await _context.Series.HasReleaseYear(true, FilterComparison.IsNotInLast, 5).ToListAsync(); + var foundSeries = await Context.Series.HasReleaseYear(true, FilterComparison.IsNotInLast, 5).ToListAsync(); Assert.Single(foundSeries); Assert.Contains(foundSeries, s => s.Name == "2000"); } @@ -864,7 +864,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasReleaseYear(); - var foundSeries = await _context.Series.HasReleaseYear(false, FilterComparison.Equal, 2020).ToListAsync(); + var foundSeries = await Context.Series.HasReleaseYear(false, FilterComparison.Equal, 2020).ToListAsync(); Assert.Equal(3, foundSeries.Count); } @@ -873,7 +873,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasReleaseYear(); - var foundSeries = await _context.Series.HasReleaseYear(true, FilterComparison.Equal, null).ToListAsync(); + var foundSeries = await Context.Series.HasReleaseYear(true, FilterComparison.Equal, null).ToListAsync(); Assert.Equal(3, foundSeries.Count); } @@ -889,10 +889,10 @@ public class SeriesFilterTests : AbstractDbTest .Build()) .Build(); - _context.Library.Add(library); - await _context.SaveChangesAsync(); + Context.Library.Add(library); + await Context.SaveChangesAsync(); - var foundSeries = await _context.Series.HasReleaseYear(true, FilterComparison.IsEmpty, 0).ToListAsync(); + var foundSeries = await Context.Series.HasReleaseYear(true, FilterComparison.IsEmpty, 0).ToListAsync(); Assert.Single(foundSeries); Assert.Equal("EmptyYear", foundSeries[0].Name); } @@ -925,28 +925,26 @@ public class SeriesFilterTests : AbstractDbTest .WithLibrary(library) .Build(); - _context.Users.Add(user); - _context.Library.Add(library); - await _context.SaveChangesAsync(); + Context.Users.Add(user); + Context.Library.Add(library); + await Context.SaveChangesAsync(); - - var seriesService = new SeriesService(_unitOfWork, Substitute.For(), - Substitute.For(), Substitute.For>(), - Substitute.For(), Substitute.For()); + var ratingService = new RatingService(UnitOfWork, Substitute.For(), Substitute.For>()); // Select 0 Rating - var zeroRating = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(2); + var zeroRating = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(2); + Assert.NotNull(zeroRating); - Assert.True(await seriesService.UpdateRating(user, new UpdateSeriesRatingDto() + Assert.True(await ratingService.UpdateSeriesRating(user, new UpdateRatingDto() { SeriesId = zeroRating.Id, UserRating = 0 })); // Select 4.5 Rating - var partialRating = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(3); + var partialRating = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(3); - Assert.True(await seriesService.UpdateRating(user, new UpdateSeriesRatingDto() + Assert.True(await ratingService.UpdateSeriesRating(user, new UpdateRatingDto() { SeriesId = partialRating.Id, UserRating = 4.5f @@ -960,7 +958,7 @@ public class SeriesFilterTests : AbstractDbTest { var user = await SetupHasRating(); - var foundSeries = await _context.Series + var foundSeries = await Context.Series .HasRating(true, FilterComparison.Equal, 4.5f, user.Id) .ToListAsync(); @@ -973,7 +971,7 @@ public class SeriesFilterTests : AbstractDbTest { var user = await SetupHasRating(); - var foundSeries = await _context.Series + var foundSeries = await Context.Series .HasRating(true, FilterComparison.GreaterThan, 0, user.Id) .ToListAsync(); @@ -986,7 +984,7 @@ public class SeriesFilterTests : AbstractDbTest { var user = await SetupHasRating(); - var foundSeries = await _context.Series + var foundSeries = await Context.Series .HasRating(true, FilterComparison.LessThan, 4.5f, user.Id) .ToListAsync(); @@ -999,7 +997,7 @@ public class SeriesFilterTests : AbstractDbTest { var user = await SetupHasRating(); - var foundSeries = await _context.Series + var foundSeries = await Context.Series .HasRating(true, FilterComparison.IsEmpty, 0, user.Id) .ToListAsync(); @@ -1012,7 +1010,7 @@ public class SeriesFilterTests : AbstractDbTest { var user = await SetupHasRating(); - var foundSeries = await _context.Series + var foundSeries = await Context.Series .HasRating(true, FilterComparison.GreaterThanEqual, 4.5f, user.Id) .ToListAsync(); @@ -1025,7 +1023,7 @@ public class SeriesFilterTests : AbstractDbTest { var user = await SetupHasRating(); - var foundSeries = await _context.Series + var foundSeries = await Context.Series .HasRating(true, FilterComparison.LessThanEqual, 0, user.Id) .ToListAsync(); @@ -1103,9 +1101,9 @@ public class SeriesFilterTests : AbstractDbTest .WithLibrary(library) .Build(); - _context.Users.Add(user); - _context.Library.Add(library); - await _context.SaveChangesAsync(); + Context.Users.Add(user); + Context.Library.Add(library); + await Context.SaveChangesAsync(); return user; } @@ -1115,7 +1113,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasName(); - var foundSeries = await _context.Series + var foundSeries = await Context.Series .HasName(true, FilterComparison.Equal, "My Dress-Up Darling") .ToListAsync(); @@ -1128,7 +1126,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasName(); - var foundSeries = await _context.Series + var foundSeries = await Context.Series .HasName(true, FilterComparison.Equal, "Ijiranaide, Nagatoro-san") .ToListAsync(); @@ -1141,7 +1139,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasName(); - var foundSeries = await _context.Series + var foundSeries = await Context.Series .HasName(true, FilterComparison.BeginsWith, "My Dress") .ToListAsync(); @@ -1154,7 +1152,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasName(); - var foundSeries = await _context.Series + var foundSeries = await Context.Series .HasName(true, FilterComparison.BeginsWith, "Sono Bisque") .ToListAsync(); @@ -1167,7 +1165,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasName(); - var foundSeries = await _context.Series + var foundSeries = await Context.Series .HasName(true, FilterComparison.EndsWith, "Nagatoro") .ToListAsync(); @@ -1180,7 +1178,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasName(); - var foundSeries = await _context.Series + var foundSeries = await Context.Series .HasName(true, FilterComparison.Matches, "Toy With Me") .ToListAsync(); @@ -1193,7 +1191,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasName(); - var foundSeries = await _context.Series + var foundSeries = await Context.Series .HasName(true, FilterComparison.NotEqual, "My Dress-Up Darling") .ToListAsync(); @@ -1237,9 +1235,9 @@ public class SeriesFilterTests : AbstractDbTest .WithLibrary(library) .Build(); - _context.Users.Add(user); - _context.Library.Add(library); - await _context.SaveChangesAsync(); + Context.Users.Add(user); + Context.Library.Add(library); + await Context.SaveChangesAsync(); return user; } @@ -1249,7 +1247,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasSummary(); - var foundSeries = await _context.Series + var foundSeries = await Context.Series .HasSummary(true, FilterComparison.Equal, "I like hippos") .ToListAsync(); @@ -1262,7 +1260,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasSummary(); - var foundSeries = await _context.Series + var foundSeries = await Context.Series .HasSummary(true, FilterComparison.BeginsWith, "I like h") .ToListAsync(); @@ -1275,7 +1273,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasSummary(); - var foundSeries = await _context.Series + var foundSeries = await Context.Series .HasSummary(true, FilterComparison.EndsWith, "apples") .ToListAsync(); @@ -1288,7 +1286,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasSummary(); - var foundSeries = await _context.Series + var foundSeries = await Context.Series .HasSummary(true, FilterComparison.Matches, "like ducks") .ToListAsync(); @@ -1301,7 +1299,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasSummary(); - var foundSeries = await _context.Series + var foundSeries = await Context.Series .HasSummary(true, FilterComparison.NotEqual, "I like ducks") .ToListAsync(); @@ -1314,7 +1312,7 @@ public class SeriesFilterTests : AbstractDbTest { await SetupHasSummary(); - var foundSeries = await _context.Series + var foundSeries = await Context.Series .HasSummary(true, FilterComparison.IsEmpty, string.Empty) .ToListAsync(); diff --git a/API.Tests/Extensions/VersionExtensionTests.cs b/API.Tests/Extensions/VersionExtensionTests.cs new file mode 100644 index 000000000..e19fd7312 --- /dev/null +++ b/API.Tests/Extensions/VersionExtensionTests.cs @@ -0,0 +1,81 @@ +using System; +using API.Extensions; +using Xunit; + +namespace API.Tests.Extensions; + +public class VersionHelperTests +{ + [Fact] + public void CompareWithoutRevision_ShouldReturnTrue_WhenMajorMinorBuildMatch() + { + // Arrange + var v1 = new Version(1, 2, 3, 4); + var v2 = new Version(1, 2, 3, 5); + + // Act + var result = v1.CompareWithoutRevision(v2); + + // Assert + Assert.True(result); + } + + [Fact] + public void CompareWithoutRevision_ShouldHandleBuildlessVersions() + { + // Arrange + var v1 = new Version(1, 2); + var v2 = new Version(1, 2); + + // Act + var result = v1.CompareWithoutRevision(v2); + + // Assert + Assert.True(result); + } + + [Theory] + [InlineData(1, 2, 3, 1, 2, 4)] + [InlineData(1, 2, 3, 1, 2, 0)] + public void CompareWithoutRevision_ShouldReturnFalse_WhenBuildDiffers( + int major1, int minor1, int build1, + int major2, int minor2, int build2) + { + var v1 = new Version(major1, minor1, build1); + var v2 = new Version(major2, minor2, build2); + + var result = v1.CompareWithoutRevision(v2); + + Assert.False(result); + } + + [Theory] + [InlineData(1, 2, 3, 1, 3, 3)] + [InlineData(1, 2, 3, 1, 0, 3)] + public void CompareWithoutRevision_ShouldReturnFalse_WhenMinorDiffers( + int major1, int minor1, int build1, + int major2, int minor2, int build2) + { + var v1 = new Version(major1, minor1, build1); + var v2 = new Version(major2, minor2, build2); + + var result = v1.CompareWithoutRevision(v2); + + Assert.False(result); + } + + [Theory] + [InlineData(1, 2, 3, 2, 2, 3)] + [InlineData(1, 2, 3, 0, 2, 3)] + public void CompareWithoutRevision_ShouldReturnFalse_WhenMajorDiffers( + int major1, int minor1, int build1, + int major2, int minor2, int build2) + { + var v1 = new Version(major1, minor1, build1); + var v2 = new Version(major2, minor2, build2); + + var result = v1.CompareWithoutRevision(v2); + + Assert.False(result); + } +} diff --git a/API.Tests/Extensions/VolumeListExtensionsTests.cs b/API.Tests/Extensions/VolumeListExtensionsTests.cs index b8b734c51..bbb8f215c 100644 --- a/API.Tests/Extensions/VolumeListExtensionsTests.cs +++ b/API.Tests/Extensions/VolumeListExtensionsTests.cs @@ -3,7 +3,6 @@ using API.Entities; using API.Entities.Enums; using API.Extensions; using API.Helpers.Builders; -using API.Tests.Helpers; using Xunit; namespace API.Tests.Extensions; diff --git a/API.Tests/Helpers/BookSortTitlePrefixHelperTests.cs b/API.Tests/Helpers/BookSortTitlePrefixHelperTests.cs new file mode 100644 index 000000000..e1f585806 --- /dev/null +++ b/API.Tests/Helpers/BookSortTitlePrefixHelperTests.cs @@ -0,0 +1,178 @@ +using API.Helpers; +using Xunit; + +namespace API.Tests.Helpers; + +public class BookSortTitlePrefixHelperTests +{ + [Theory] + [InlineData("The Avengers", "Avengers")] + [InlineData("A Game of Thrones", "Game of Thrones")] + [InlineData("An American Tragedy", "American Tragedy")] + public void TestEnglishPrefixes(string inputString, string expected) + { + Assert.Equal(expected, BookSortTitlePrefixHelper.GetSortTitle(inputString)); + } + + [Theory] + [InlineData("El Quijote", "Quijote")] + [InlineData("La Casa de Papel", "Casa de Papel")] + [InlineData("Los Miserables", "Miserables")] + [InlineData("Las Vegas", "Vegas")] + [InlineData("Un Mundo Feliz", "Mundo Feliz")] + [InlineData("Una Historia", "Historia")] + public void TestSpanishPrefixes(string inputString, string expected) + { + Assert.Equal(expected, BookSortTitlePrefixHelper.GetSortTitle(inputString)); + } + + [Theory] + [InlineData("Le Petit Prince", "Petit Prince")] + [InlineData("La Belle et la Bête", "Belle et la Bête")] + [InlineData("Les Misérables", "Misérables")] + [InlineData("Un Amour de Swann", "Amour de Swann")] + [InlineData("Une Vie", "Vie")] + [InlineData("Des Souris et des Hommes", "Souris et des Hommes")] + public void TestFrenchPrefixes(string inputString, string expected) + { + Assert.Equal(expected, BookSortTitlePrefixHelper.GetSortTitle(inputString)); + } + + [Theory] + [InlineData("Der Herr der Ringe", "Herr der Ringe")] + [InlineData("Die Verwandlung", "Verwandlung")] + [InlineData("Das Kapital", "Kapital")] + [InlineData("Ein Sommernachtstraum", "Sommernachtstraum")] + [InlineData("Eine Geschichte", "Geschichte")] + public void TestGermanPrefixes(string inputString, string expected) + { + Assert.Equal(expected, BookSortTitlePrefixHelper.GetSortTitle(inputString)); + } + + [Theory] + [InlineData("Il Nome della Rosa", "Nome della Rosa")] + [InlineData("La Divina Commedia", "Divina Commedia")] + [InlineData("Lo Hobbit", "Hobbit")] + [InlineData("Gli Ultimi", "Ultimi")] + [InlineData("Le Città Invisibili", "Città Invisibili")] + [InlineData("Un Giorno", "Giorno")] + [InlineData("Una Notte", "Notte")] + public void TestItalianPrefixes(string inputString, string expected) + { + Assert.Equal(expected, BookSortTitlePrefixHelper.GetSortTitle(inputString)); + } + + [Theory] + [InlineData("O Alquimista", "Alquimista")] + [InlineData("A Moreninha", "Moreninha")] + [InlineData("Os Lusíadas", "Lusíadas")] + [InlineData("As Meninas", "Meninas")] + [InlineData("Um Defeito de Cor", "Defeito de Cor")] + [InlineData("Uma História", "História")] + public void TestPortuguesePrefixes(string inputString, string expected) + { + Assert.Equal(expected, BookSortTitlePrefixHelper.GetSortTitle(inputString)); + } + + [Theory] + [InlineData("", "")] // Empty string returns empty + [InlineData("Book", "Book")] // Single word, no change + [InlineData("Avengers", "Avengers")] // No prefix, no change + public void TestNoPrefixCases(string inputString, string expected) + { + Assert.Equal(expected, BookSortTitlePrefixHelper.GetSortTitle(inputString)); + } + + [Theory] + [InlineData("The", "The")] // Just a prefix word alone + [InlineData("A", "A")] // Just single letter prefix alone + [InlineData("Le", "Le")] // French prefix alone + public void TestPrefixWordAlone(string inputString, string expected) + { + Assert.Equal(expected, BookSortTitlePrefixHelper.GetSortTitle(inputString)); + } + + [Theory] + [InlineData("THE AVENGERS", "AVENGERS")] // All caps + [InlineData("the avengers", "avengers")] // All lowercase + [InlineData("The AVENGERS", "AVENGERS")] // Mixed case + [InlineData("tHe AvEnGeRs", "AvEnGeRs")] // Random case + public void TestCaseInsensitivity(string inputString, string expected) + { + Assert.Equal(expected, BookSortTitlePrefixHelper.GetSortTitle(inputString)); + } + + [Theory] + [InlineData("Then Came You", "Then Came You")] // "The" + "n" = not a prefix + [InlineData("And Then There Were None", "And Then There Were None")] // "An" + "d" = not a prefix + [InlineData("Elsewhere", "Elsewhere")] // "El" + "sewhere" = not a prefix (no space) + [InlineData("Lesson Plans", "Lesson Plans")] // "Les" + "son" = not a prefix (no space) + [InlineData("Theory of Everything", "Theory of Everything")] // "The" + "ory" = not a prefix + public void TestFalsePositivePrefixes(string inputString, string expected) + { + Assert.Equal(expected, BookSortTitlePrefixHelper.GetSortTitle(inputString)); + } + + [Theory] + [InlineData("The ", "The ")] // Prefix with only space after - returns original + [InlineData("La ", "La ")] // Same for other languages + [InlineData("El ", "El ")] // Same for Spanish + public void TestPrefixWithOnlySpaceAfter(string inputString, string expected) + { + Assert.Equal(expected, BookSortTitlePrefixHelper.GetSortTitle(inputString)); + } + + [Theory] + [InlineData("The Multiple Spaces", " Multiple Spaces")] // Doesn't trim extra spaces from remainder + [InlineData("Le Petit Prince", " Petit Prince")] // Leading space preserved in remainder + public void TestSpaceHandling(string inputString, string expected) + { + Assert.Equal(expected, BookSortTitlePrefixHelper.GetSortTitle(inputString)); + } + + [Theory] + [InlineData("The The Matrix", "The Matrix")] // Removes first "The", leaves second + [InlineData("A A Clockwork Orange", "A Clockwork Orange")] // Removes first "A", leaves second + [InlineData("El El Cid", "El Cid")] // Spanish version + public void TestRepeatedPrefixes(string inputString, string expected) + { + Assert.Equal(expected, BookSortTitlePrefixHelper.GetSortTitle(inputString)); + } + + [Theory] + [InlineData("L'Étranger", "L'Étranger")] // French contraction - no space, no change + [InlineData("D'Artagnan", "D'Artagnan")] // Contraction - no space, no change + [InlineData("The-Matrix", "The-Matrix")] // Hyphen instead of space - no change + [InlineData("The.Avengers", "The.Avengers")] // Period instead of space - no change + public void TestNonSpaceSeparators(string inputString, string expected) + { + Assert.Equal(expected, BookSortTitlePrefixHelper.GetSortTitle(inputString)); + } + + [Theory] + [InlineData("三国演义", "三国演义")] // Chinese - no processing due to CJK detection + [InlineData("한국어", "한국어")] // Korean - not in CJK range, would be processed normally + public void TestCjkLanguages(string inputString, string expected) + { + // NOTE: These don't do anything, I am waiting for user input on if these are needed + Assert.Equal(expected, BookSortTitlePrefixHelper.GetSortTitle(inputString)); + } + + [Theory] + [InlineData("नमस्ते दुनिया", "नमस्ते दुनिया")] // Hindi - not CJK, processed normally + [InlineData("مرحبا بالعالم", "مرحبا بالعالم")] // Arabic - not CJK, processed normally + [InlineData("שלום עולם", "שלום עולם")] // Hebrew - not CJK, processed normally + public void TestNonLatinNonCjkScripts(string inputString, string expected) + { + Assert.Equal(expected, BookSortTitlePrefixHelper.GetSortTitle(inputString)); + } + + [Theory] + [InlineData("в мире", "мире")] // Russian "в" (in) - should be removed + [InlineData("на столе", "столе")] // Russian "на" (on) - should be removed + [InlineData("с друзьями", "друзьями")] // Russian "с" (with) - should be removed + public void TestRussianPrefixes(string inputString, string expected) + { + Assert.Equal(expected, BookSortTitlePrefixHelper.GetSortTitle(inputString)); + } +} diff --git a/API.Tests/Helpers/CacheHelperTests.cs b/API.Tests/Helpers/CacheHelperTests.cs index 82f496a7b..3962ba2df 100644 --- a/API.Tests/Helpers/CacheHelperTests.cs +++ b/API.Tests/Helpers/CacheHelperTests.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.IO; using System.IO.Abstractions.TestingHelpers; -using API.Entities; using API.Entities.Enums; using API.Helpers; using API.Helpers.Builders; @@ -11,9 +10,9 @@ using Xunit; namespace API.Tests.Helpers; -public class CacheHelperTests +public class CacheHelperTests: AbstractFsTest { - private const string TestCoverImageDirectory = @"c:\"; + private static readonly string TestCoverImageDirectory = Root; private const string TestCoverImageFile = "thumbnail.jpg"; private readonly string _testCoverPath = Path.Join(TestCoverImageDirectory, TestCoverImageFile); private const string TestCoverArchive = @"file in folder.zip"; @@ -37,24 +36,29 @@ public class CacheHelperTests [Theory] [InlineData("", false)] - [InlineData("C:/", false)] [InlineData(null, false)] public void CoverImageExists_DoesFileExist(string coverImage, bool exists) { Assert.Equal(exists, _cacheHelper.CoverImageExists(coverImage)); } + [Fact] + public void CoverImageExists_DoesFileExistRoot() + { + Assert.False(_cacheHelper.CoverImageExists(Root)); + } + [Fact] public void CoverImageExists_FileExists() { - Assert.True(_cacheHelper.CoverImageExists(TestCoverArchive)); + Assert.True(_cacheHelper.CoverImageExists(Path.Join(TestCoverImageDirectory, TestCoverArchive))); } [Fact] public void ShouldUpdateCoverImage_OnFirstRun() { - var file = new MangaFileBuilder(TestCoverArchive, MangaFormat.Archive) + var file = new MangaFileBuilder(Path.Join(TestCoverImageDirectory, TestCoverArchive), MangaFormat.Archive) .WithLastModified(DateTime.Now) .Build(); Assert.True(_cacheHelper.ShouldUpdateCoverImage(null, file, DateTime.Now.Subtract(TimeSpan.FromMinutes(1)), @@ -65,7 +69,7 @@ public class CacheHelperTests public void ShouldUpdateCoverImage_ShouldNotUpdateOnSecondRunWithCoverImageSetNotLocked() { // Represents first run - var file = new MangaFileBuilder(TestCoverArchive, MangaFormat.Archive) + var file = new MangaFileBuilder(Path.Join(TestCoverImageDirectory, TestCoverArchive), MangaFormat.Archive) .WithLastModified(DateTime.Now) .Build(); Assert.False(_cacheHelper.ShouldUpdateCoverImage(_testCoverPath, file, DateTime.Now.Subtract(TimeSpan.FromMinutes(1)), @@ -76,7 +80,7 @@ public class CacheHelperTests public void ShouldUpdateCoverImage_ShouldNotUpdateOnSecondRunWithCoverImageSetNotLocked_2() { // Represents first run - var file = new MangaFileBuilder(TestCoverArchive, MangaFormat.Archive) + var file = new MangaFileBuilder(Path.Join(TestCoverImageDirectory, TestCoverArchive), MangaFormat.Archive) .WithLastModified(DateTime.Now) .Build(); Assert.False(_cacheHelper.ShouldUpdateCoverImage(_testCoverPath, file, DateTime.Now, @@ -87,7 +91,7 @@ public class CacheHelperTests public void ShouldUpdateCoverImage_ShouldNotUpdateOnSecondRunWithCoverImageSetLocked() { // Represents first run - var file = new MangaFileBuilder(TestCoverArchive, MangaFormat.Archive) + var file = new MangaFileBuilder(Path.Join(TestCoverImageDirectory, TestCoverArchive), MangaFormat.Archive) .WithLastModified(DateTime.Now) .Build(); Assert.False(_cacheHelper.ShouldUpdateCoverImage(_testCoverPath, file, DateTime.Now.Subtract(TimeSpan.FromMinutes(1)), @@ -98,7 +102,7 @@ public class CacheHelperTests public void ShouldUpdateCoverImage_ShouldNotUpdateOnSecondRunWithCoverImageSetLocked_Modified() { // Represents first run - var file = new MangaFileBuilder(TestCoverArchive, MangaFormat.Archive) + var file = new MangaFileBuilder(Path.Join(TestCoverImageDirectory, TestCoverArchive), MangaFormat.Archive) .WithLastModified(DateTime.Now) .Build(); Assert.False(_cacheHelper.ShouldUpdateCoverImage(_testCoverPath, file, DateTime.Now.Subtract(TimeSpan.FromMinutes(1)), @@ -122,7 +126,7 @@ public class CacheHelperTests var cacheHelper = new CacheHelper(fileService); var created = DateTime.Now.Subtract(TimeSpan.FromHours(1)); - var file = new MangaFileBuilder(TestCoverArchive, MangaFormat.Archive) + var file = new MangaFileBuilder(Path.Join(TestCoverImageDirectory, TestCoverArchive), MangaFormat.Archive) .WithLastModified(DateTime.Now.Subtract(TimeSpan.FromMinutes(1))) .Build(); @@ -133,9 +137,10 @@ public class CacheHelperTests [Fact] public void HasFileNotChangedSinceCreationOrLastScan_NotChangedSinceCreated() { + var now = DateTimeOffset.Now; var filesystemFile = new MockFileData("") { - LastWriteTime = DateTimeOffset.Now + LastWriteTime =now, }; var fileSystem = new MockFileSystem(new Dictionary { @@ -147,12 +152,12 @@ public class CacheHelperTests var cacheHelper = new CacheHelper(fileService); var chapter = new ChapterBuilder("1") - .WithLastModified(filesystemFile.LastWriteTime.DateTime) - .WithCreated(filesystemFile.LastWriteTime.DateTime) + .WithLastModified(now.DateTime) + .WithCreated(now.DateTime) .Build(); - var file = new MangaFileBuilder(TestCoverArchive, MangaFormat.Archive) - .WithLastModified(filesystemFile.LastWriteTime.DateTime) + var file = new MangaFileBuilder(Path.Join(TestCoverImageDirectory, TestCoverArchive), MangaFormat.Archive) + .WithLastModified(now.DateTime) .Build(); Assert.True(cacheHelper.IsFileUnmodifiedSinceCreationOrLastScan(chapter, false, file)); } @@ -160,9 +165,10 @@ public class CacheHelperTests [Fact] public void HasFileNotChangedSinceCreationOrLastScan_NotChangedSinceLastModified() { + var now = DateTimeOffset.Now; var filesystemFile = new MockFileData("") { - LastWriteTime = DateTimeOffset.Now + LastWriteTime = now, }; var fileSystem = new MockFileSystem(new Dictionary { @@ -174,12 +180,12 @@ public class CacheHelperTests var cacheHelper = new CacheHelper(fileService); var chapter = new ChapterBuilder("1") - .WithLastModified(filesystemFile.LastWriteTime.DateTime) - .WithCreated(filesystemFile.LastWriteTime.DateTime) + .WithLastModified(now.DateTime) + .WithCreated(now.DateTime) .Build(); - var file = new MangaFileBuilder(TestCoverArchive, MangaFormat.Archive) - .WithLastModified(filesystemFile.LastWriteTime.DateTime) + var file = new MangaFileBuilder(Path.Join(TestCoverImageDirectory, TestCoverArchive), MangaFormat.Archive) + .WithLastModified(now.DateTime) .Build(); Assert.True(cacheHelper.IsFileUnmodifiedSinceCreationOrLastScan(chapter, false, file)); @@ -188,9 +194,10 @@ public class CacheHelperTests [Fact] public void HasFileNotChangedSinceCreationOrLastScan_NotChangedSinceLastModified_ForceUpdate() { + var now = DateTimeOffset.Now; var filesystemFile = new MockFileData("") { - LastWriteTime = DateTimeOffset.Now + LastWriteTime = now.DateTime, }; var fileSystem = new MockFileSystem(new Dictionary { @@ -202,12 +209,12 @@ public class CacheHelperTests var cacheHelper = new CacheHelper(fileService); var chapter = new ChapterBuilder("1") - .WithLastModified(filesystemFile.LastWriteTime.DateTime) - .WithCreated(filesystemFile.LastWriteTime.DateTime) + .WithLastModified(now.DateTime) + .WithCreated(now.DateTime) .Build(); - var file = new MangaFileBuilder(TestCoverArchive, MangaFormat.Archive) - .WithLastModified(filesystemFile.LastWriteTime.DateTime) + var file = new MangaFileBuilder(Path.Join(TestCoverImageDirectory, TestCoverArchive), MangaFormat.Archive) + .WithLastModified(now.DateTime) .Build(); Assert.False(cacheHelper.IsFileUnmodifiedSinceCreationOrLastScan(chapter, true, file)); } @@ -215,10 +222,11 @@ public class CacheHelperTests [Fact] public void IsFileUnmodifiedSinceCreationOrLastScan_ModifiedSinceLastScan() { + var now = DateTimeOffset.Now; var filesystemFile = new MockFileData("") { - LastWriteTime = DateTimeOffset.Now, - CreationTime = DateTimeOffset.Now + LastWriteTime = now.DateTime, + CreationTime = now.DateTime }; var fileSystem = new MockFileSystem(new Dictionary { @@ -234,8 +242,8 @@ public class CacheHelperTests .WithCreated(DateTime.Now.Subtract(TimeSpan.FromMinutes(10))) .Build(); - var file = new MangaFileBuilder(TestCoverArchive, MangaFormat.Archive) - .WithLastModified(filesystemFile.LastWriteTime.DateTime) + var file = new MangaFileBuilder(Path.Join(TestCoverImageDirectory, TestCoverArchive), MangaFormat.Archive) + .WithLastModified(now.DateTime) .Build(); Assert.False(cacheHelper.IsFileUnmodifiedSinceCreationOrLastScan(chapter, false, file)); } @@ -243,9 +251,10 @@ public class CacheHelperTests [Fact] public void HasFileNotChangedSinceCreationOrLastScan_ModifiedSinceLastScan_ButLastModifiedSame() { + var now = DateTimeOffset.Now; var filesystemFile = new MockFileData("") { - LastWriteTime = DateTimeOffset.Now + LastWriteTime =now.DateTime }; var fileSystem = new MockFileSystem(new Dictionary { @@ -262,7 +271,7 @@ public class CacheHelperTests .Build(); var file = new MangaFileBuilder(Path.Join(TestCoverImageDirectory, TestCoverArchive), MangaFormat.Archive) - .WithLastModified(filesystemFile.LastWriteTime.DateTime) + .WithLastModified(now.DateTime) .Build(); Assert.False(cacheHelper.IsFileUnmodifiedSinceCreationOrLastScan(chapter, false, file)); diff --git a/API.Tests/Helpers/KoreaderHelperTests.cs b/API.Tests/Helpers/KoreaderHelperTests.cs new file mode 100644 index 000000000..66d287a5d --- /dev/null +++ b/API.Tests/Helpers/KoreaderHelperTests.cs @@ -0,0 +1,60 @@ +using API.DTOs.Koreader; +using API.DTOs.Progress; +using API.Helpers; +using System.Runtime.CompilerServices; +using Xunit; + +namespace API.Tests.Helpers; + + +public class KoreaderHelperTests +{ + + [Theory] + [InlineData("/body/DocFragment[11]/body/div/a", 10, null)] + [InlineData("/body/DocFragment[1]/body/div/p[40]", 0, 40)] + [InlineData("/body/DocFragment[8]/body/div/p[28]/text().264", 7, 28)] + public void GetEpubPositionDto(string koreaderPosition, int page, int? pNumber) + { + var expected = EmptyProgressDto(); + expected.BookScrollId = pNumber.HasValue ? $"//html[1]/BODY/APP-ROOT[1]/DIV[1]/DIV[1]/DIV[1]/APP-BOOK-READER[1]/DIV[1]/DIV[2]/DIV[1]/DIV[1]/DIV[1]/P[{pNumber}]" : null; + expected.PageNum = page; + var actual = EmptyProgressDto(); + + KoreaderHelper.UpdateProgressDto(actual, koreaderPosition); + Assert.Equal(expected.BookScrollId, actual.BookScrollId); + Assert.Equal(expected.PageNum, actual.PageNum); + } + + + [Theory] + [InlineData("//html[1]/BODY/APP-ROOT[1]/DIV[1]/DIV[1]/DIV[1]/APP-BOOK-READER[1]/DIV[1]/DIV[2]/DIV[1]/DIV[1]/DIV[1]/P[20]", 5, "/body/DocFragment[6]/body/div/p[20]")] + [InlineData(null, 10, "/body/DocFragment[11]/body/div/a")] + public void GetKoreaderPosition(string scrollId, int page, string koreaderPosition) + { + var given = EmptyProgressDto(); + given.BookScrollId = scrollId; + given.PageNum = page; + + Assert.Equal(koreaderPosition, KoreaderHelper.GetKoreaderPosition(given)); + } + + [Theory] + [InlineData("./Data/AesopsFables.epub", "8795ACA4BF264B57C1EEDF06A0CEE688")] + public void GetKoreaderHash(string filePath, string hash) + { + Assert.Equal(KoreaderHelper.HashContents(filePath), hash); + } + + private ProgressDto EmptyProgressDto() + { + return new ProgressDto + { + ChapterId = 0, + PageNum = 0, + VolumeId = 0, + SeriesId = 0, + LibraryId = 0 + }; + } +} diff --git a/API.Tests/Helpers/OrderableHelperTests.cs b/API.Tests/Helpers/OrderableHelperTests.cs index a6d741be1..15f9e6268 100644 --- a/API.Tests/Helpers/OrderableHelperTests.cs +++ b/API.Tests/Helpers/OrderableHelperTests.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using API.Entities; using API.Helpers; @@ -49,17 +50,14 @@ public class OrderableHelperTests [Fact] public void ReorderItems_InvalidPosition_NoChange() { - // Arrange var items = new List { new AppUserSideNavStream { Id = 1, Order = 0, Name = "A" }, new AppUserSideNavStream { Id = 2, Order = 1, Name = "A" }, }; - // Act OrderableHelper.ReorderItems(items, 2, 3); // Position 3 is out of range - // Assert Assert.Equal(1, items[0].Id); // Item 1 should remain at position 0 Assert.Equal(2, items[1].Id); // Item 2 should remain at position 1 } @@ -80,7 +78,6 @@ public class OrderableHelperTests [Fact] public void ReorderItems_DoubleMove() { - // Arrange var items = new List { new AppUserSideNavStream { Id = 1, Order = 0, Name = "0" }, @@ -94,7 +91,6 @@ public class OrderableHelperTests // Move 4 -> 1 OrderableHelper.ReorderItems(items, 5, 1); - // Assert Assert.Equal(1, items[0].Id); Assert.Equal(0, items[0].Order); Assert.Equal(5, items[1].Id); @@ -109,4 +105,98 @@ public class OrderableHelperTests Assert.Equal("034125", string.Join("", items.Select(s => s.Name))); } + + private static List CreateTestReadingListItems(int count = 4) + { + var items = new List(); + + for (var i = 0; i < count; i++) + { + items.Add(new ReadingListItem() { Id = i + 1, Order = count, ReadingListId = i + 1}); + } + + return items; + } + + [Fact] + public void ReorderItems_MoveItemToBeginning_CorrectOrder() + { + var items = CreateTestReadingListItems(); + + OrderableHelper.ReorderItems(items, 3, 0); + + Assert.Equal(3, items[0].Id); + Assert.Equal(1, items[1].Id); + Assert.Equal(2, items[2].Id); + Assert.Equal(4, items[3].Id); + + for (var i = 0; i < items.Count; i++) + { + Assert.Equal(i, items[i].Order); + } + } + + [Fact] + public void ReorderItems_MoveItemToEnd_CorrectOrder() + { + var items = CreateTestReadingListItems(); + + OrderableHelper.ReorderItems(items, 1, 3); + + Assert.Equal(2, items[0].Id); + Assert.Equal(3, items[1].Id); + Assert.Equal(4, items[2].Id); + Assert.Equal(1, items[3].Id); + + for (var i = 0; i < items.Count; i++) + { + Assert.Equal(i, items[i].Order); + } + } + + [Fact] + public void ReorderItems_MoveItemToMiddle_CorrectOrder() + { + var items = CreateTestReadingListItems(); + + OrderableHelper.ReorderItems(items, 4, 2); + + Assert.Equal(1, items[0].Id); + Assert.Equal(2, items[1].Id); + Assert.Equal(4, items[2].Id); + Assert.Equal(3, items[3].Id); + + for (var i = 0; i < items.Count; i++) + { + Assert.Equal(i, items[i].Order); + } + } + + [Fact] + public void ReorderItems_MoveItemToOutOfBoundsPosition_MovesToEnd() + { + var items = CreateTestReadingListItems(); + + OrderableHelper.ReorderItems(items, 2, 10); + + Assert.Equal(1, items[0].Id); + Assert.Equal(3, items[1].Id); + Assert.Equal(4, items[2].Id); + Assert.Equal(2, items[3].Id); + + for (var i = 0; i < items.Count; i++) + { + Assert.Equal(i, items[i].Order); + } + } + + [Fact] + public void ReorderItems_NegativePosition_ThrowsArgumentException() + { + var items = CreateTestReadingListItems(); + + Assert.Throws(() => + OrderableHelper.ReorderItems(items, 2, -1) + ); + } } diff --git a/API.Tests/Helpers/ParserInfoHelperTests.cs b/API.Tests/Helpers/ParserInfoHelperTests.cs index 70ce3aa69..0bb7efb9b 100644 --- a/API.Tests/Helpers/ParserInfoHelperTests.cs +++ b/API.Tests/Helpers/ParserInfoHelperTests.cs @@ -1,8 +1,5 @@ using System.Collections.Generic; -using API.Entities; using API.Entities.Enums; -using API.Entities.Metadata; -using API.Extensions; using API.Helpers; using API.Helpers.Builders; using API.Services.Tasks.Scanner; diff --git a/API.Tests/Helpers/PersonHelperTests.cs b/API.Tests/Helpers/PersonHelperTests.cs index a25af7a07..47dab48da 100644 --- a/API.Tests/Helpers/PersonHelperTests.cs +++ b/API.Tests/Helpers/PersonHelperTests.cs @@ -1,14 +1,9 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using API.Data; -using API.DTOs; -using API.Entities; using API.Entities.Enums; using API.Helpers; using API.Helpers.Builders; -using API.Services.Tasks.Scanner.Parser; using Xunit; namespace API.Tests.Helpers; @@ -17,127 +12,215 @@ public class PersonHelperTests : AbstractDbTest { protected override async Task ResetDb() { - _context.Series.RemoveRange(_context.Series.ToList()); - await _context.SaveChangesAsync(); + Context.Series.RemoveRange(Context.Series.ToList()); + Context.Person.RemoveRange(Context.Person.ToList()); + Context.Library.RemoveRange(Context.Library.ToList()); + Context.Series.RemoveRange(Context.Series.ToList()); + await Context.SaveChangesAsync(); } - // - // // 1. Test adding new people and keeping existing ones - // [Fact] - // public async Task UpdateChapterPeopleAsync_AddNewPeople_ExistingPersonRetained() - // { - // var existingPerson = new PersonBuilder("Joe Shmo").Build(); - // var chapter = new ChapterBuilder("1").Build(); - // - // // Create an existing person and assign them to the series with a role - // var series = new SeriesBuilder("Test 1") - // .WithFormat(MangaFormat.Archive) - // .WithMetadata(new SeriesMetadataBuilder() - // .WithPerson(existingPerson, PersonRole.Editor) - // .Build()) - // .WithVolume(new VolumeBuilder("1").WithChapter(chapter).Build()) - // .Build(); - // - // _unitOfWork.SeriesRepository.Add(series); - // await _unitOfWork.CommitAsync(); - // - // // Call UpdateChapterPeopleAsync with one existing and one new person - // await PersonHelper.UpdateChapterPeopleAsync(chapter, new List { "Joe Shmo", "New Person" }, PersonRole.Editor, _unitOfWork); - // - // // Assert existing person retained and new person added - // var people = await _unitOfWork.PersonRepository.GetAllPeople(); - // Assert.Contains(people, p => p.Name == "Joe Shmo"); - // Assert.Contains(people, p => p.Name == "New Person"); - // - // var chapterPeople = chapter.People.Select(cp => cp.Person.Name).ToList(); - // Assert.Contains("Joe Shmo", chapterPeople); - // Assert.Contains("New Person", chapterPeople); - // } - // - // // 2. Test removing a person no longer in the list - // [Fact] - // public async Task UpdateChapterPeopleAsync_RemovePeople() - // { - // var existingPerson1 = new PersonBuilder("Joe Shmo").Build(); - // var existingPerson2 = new PersonBuilder("Jane Doe").Build(); - // var chapter = new ChapterBuilder("1").Build(); - // - // var series = new SeriesBuilder("Test 1") - // .WithVolume(new VolumeBuilder("1") - // .WithChapter(new ChapterBuilder("1") - // .WithPerson(existingPerson1, PersonRole.Editor) - // .WithPerson(existingPerson2, PersonRole.Editor) - // .Build()) - // .Build()) - // .Build(); - // - // _unitOfWork.SeriesRepository.Add(series); - // await _unitOfWork.CommitAsync(); - // - // // Call UpdateChapterPeopleAsync with only one person - // await PersonHelper.UpdateChapterPeopleAsync(chapter, new List { "Joe Shmo" }, PersonRole.Editor, _unitOfWork); - // - // var people = await _unitOfWork.PersonRepository.GetAllPeople(); - // Assert.DoesNotContain(people, p => p.Name == "Jane Doe"); - // - // var chapterPeople = chapter.People.Select(cp => cp.Person.Name).ToList(); - // Assert.Contains("Joe Shmo", chapterPeople); - // Assert.DoesNotContain("Jane Doe", chapterPeople); - // } - // - // // 3. Test no changes when the list of people is the same - // [Fact] - // public async Task UpdateChapterPeopleAsync_NoChanges() - // { - // var existingPerson = new PersonBuilder("Joe Shmo").Build(); - // var chapter = new ChapterBuilder("1").Build(); - // - // var series = new SeriesBuilder("Test 1") - // .WithVolume(new VolumeBuilder("1") - // .WithChapter(new ChapterBuilder("1") - // .WithPerson(existingPerson, PersonRole.Editor) - // .Build()) - // .Build()) - // .Build(); - // - // _unitOfWork.SeriesRepository.Add(series); - // await _unitOfWork.CommitAsync(); - // - // // Call UpdateChapterPeopleAsync with the same list - // await PersonHelper.UpdateChapterPeopleAsync(chapter, new List { "Joe Shmo" }, PersonRole.Editor, _unitOfWork); - // - // var people = await _unitOfWork.PersonRepository.GetAllPeople(); - // Assert.Contains(people, p => p.Name == "Joe Shmo"); - // - // var chapterPeople = chapter.People.Select(cp => cp.Person.Name).ToList(); - // Assert.Contains("Joe Shmo", chapterPeople); - // Assert.Single(chapter.People); // No duplicate entries - // } - // - // // 4. Test multiple roles for a person - // [Fact] - // public async Task UpdateChapterPeopleAsync_MultipleRoles() - // { - // var person = new PersonBuilder("Joe Shmo").Build(); - // var chapter = new ChapterBuilder("1").Build(); - // - // var series = new SeriesBuilder("Test 1") - // .WithVolume(new VolumeBuilder("1") - // .WithChapter(new ChapterBuilder("1") - // .WithPerson(person, PersonRole.Writer) // Assign person as Writer - // .Build()) - // .Build()) - // .Build(); - // - // _unitOfWork.SeriesRepository.Add(series); - // await _unitOfWork.CommitAsync(); - // - // // Add same person as Editor - // await PersonHelper.UpdateChapterPeopleAsync(chapter, new List { "Joe Shmo" }, PersonRole.Editor, _unitOfWork); - // - // // Ensure that the same person is assigned with two roles - // var chapterPeople = chapter.People.Where(cp => cp.Person.Name == "Joe Shmo").ToList(); - // Assert.Equal(2, chapterPeople.Count); // One for each role - // Assert.Contains(chapterPeople, cp => cp.Role == PersonRole.Writer); - // Assert.Contains(chapterPeople, cp => cp.Role == PersonRole.Editor); - // } + + // 1. Test adding new people and keeping existing ones + [Fact] + public async Task UpdateChapterPeopleAsync_AddNewPeople_ExistingPersonRetained() + { + await ResetDb(); + + var library = new LibraryBuilder("My Library") + .Build(); + + UnitOfWork.LibraryRepository.Add(library); + await UnitOfWork.CommitAsync(); + + var existingPerson = new PersonBuilder("Joe Shmo").Build(); + var chapter = new ChapterBuilder("1").Build(); + + // Create an existing person and assign them to the series with a role + var series = new SeriesBuilder("Test 1") + .WithLibraryId(library.Id) + .WithFormat(MangaFormat.Archive) + .WithMetadata(new SeriesMetadataBuilder() + .WithPerson(existingPerson, PersonRole.Editor) + .Build()) + .WithVolume(new VolumeBuilder("1").WithChapter(chapter).Build()) + .Build(); + + UnitOfWork.SeriesRepository.Add(series); + await UnitOfWork.CommitAsync(); + + // Call UpdateChapterPeopleAsync with one existing and one new person + await PersonHelper.UpdateChapterPeopleAsync(chapter, new List { "Joe Shmo", "New Person" }, PersonRole.Editor, UnitOfWork); + + // Assert existing person retained and new person added + var people = await UnitOfWork.PersonRepository.GetAllPeople(); + Assert.Contains(people, p => p.Name == "Joe Shmo"); + Assert.Contains(people, p => p.Name == "New Person"); + + var chapterPeople = chapter.People.Select(cp => cp.Person.Name).ToList(); + Assert.Contains("Joe Shmo", chapterPeople); + Assert.Contains("New Person", chapterPeople); + } + + // 2. Test removing a person no longer in the list + [Fact] + public async Task UpdateChapterPeopleAsync_RemovePeople() + { + await ResetDb(); + + var library = new LibraryBuilder("My Library") + .Build(); + + UnitOfWork.LibraryRepository.Add(library); + await UnitOfWork.CommitAsync(); + + var existingPerson1 = new PersonBuilder("Joe Shmo").Build(); + var existingPerson2 = new PersonBuilder("Jane Doe").Build(); + var chapter = new ChapterBuilder("1") + .WithPerson(existingPerson1, PersonRole.Editor) + .WithPerson(existingPerson2, PersonRole.Editor) + .Build(); + + var series = new SeriesBuilder("Test 1") + .WithLibraryId(library.Id) + .WithVolume(new VolumeBuilder("1") + .WithChapter(chapter) + .Build()) + .Build(); + + UnitOfWork.SeriesRepository.Add(series); + await UnitOfWork.CommitAsync(); + + // Call UpdateChapterPeopleAsync with only one person + await PersonHelper.UpdateChapterPeopleAsync(chapter, new List { "Joe Shmo" }, PersonRole.Editor, UnitOfWork); + + // PersonHelper does not remove the Person from the global DbSet itself + await UnitOfWork.PersonRepository.RemoveAllPeopleNoLongerAssociated(); + + var people = await UnitOfWork.PersonRepository.GetAllPeople(); + Assert.DoesNotContain(people, p => p.Name == "Jane Doe"); + + var chapterPeople = chapter.People.Select(cp => cp.Person.Name).ToList(); + Assert.Contains("Joe Shmo", chapterPeople); + Assert.DoesNotContain("Jane Doe", chapterPeople); + } + + // 3. Test no changes when the list of people is the same + [Fact] + public async Task UpdateChapterPeopleAsync_NoChanges() + { + await ResetDb(); + + var library = new LibraryBuilder("My Library") + .Build(); + + UnitOfWork.LibraryRepository.Add(library); + await UnitOfWork.CommitAsync(); + + var existingPerson = new PersonBuilder("Joe Shmo").Build(); + var chapter = new ChapterBuilder("1").WithPerson(existingPerson, PersonRole.Editor).Build(); + + var series = new SeriesBuilder("Test 1") + .WithLibraryId(library.Id) + .WithVolume(new VolumeBuilder("1") + .WithChapter(chapter) + .Build()) + .Build(); + + UnitOfWork.SeriesRepository.Add(series); + await UnitOfWork.CommitAsync(); + + // Call UpdateChapterPeopleAsync with the same list + await PersonHelper.UpdateChapterPeopleAsync(chapter, new List { "Joe Shmo" }, PersonRole.Editor, UnitOfWork); + + var people = await UnitOfWork.PersonRepository.GetAllPeople(); + Assert.Contains(people, p => p.Name == "Joe Shmo"); + + var chapterPeople = chapter.People.Select(cp => cp.Person.Name).ToList(); + Assert.Contains("Joe Shmo", chapterPeople); + Assert.Single(chapter.People); // No duplicate entries + } + + // 4. Test multiple roles for a person + [Fact] + public async Task UpdateChapterPeopleAsync_MultipleRoles() + { + await ResetDb(); + + var library = new LibraryBuilder("My Library") + .Build(); + + UnitOfWork.LibraryRepository.Add(library); + await UnitOfWork.CommitAsync(); + + var person = new PersonBuilder("Joe Shmo").Build(); + var chapter = new ChapterBuilder("1").WithPerson(person, PersonRole.Writer).Build(); + + var series = new SeriesBuilder("Test 1") + .WithLibraryId(library.Id) + .WithVolume(new VolumeBuilder("1") + .WithChapter(chapter) + .Build()) + .Build(); + + UnitOfWork.SeriesRepository.Add(series); + await UnitOfWork.CommitAsync(); + + // Add same person as Editor + await PersonHelper.UpdateChapterPeopleAsync(chapter, new List { "Joe Shmo" }, PersonRole.Editor, UnitOfWork); + + // Ensure that the same person is assigned with two roles + var chapterPeople = chapter + .People + .Where(cp => + cp.Person.Name == "Joe Shmo") + .ToList(); + Assert.Equal(2, chapterPeople.Count); // One for each role + Assert.Contains(chapterPeople, cp => cp.Role == PersonRole.Writer); + Assert.Contains(chapterPeople, cp => cp.Role == PersonRole.Editor); + } + + [Fact] + public async Task UpdateChapterPeopleAsync_MatchOnAlias_NoChanges() + { + await ResetDb(); + + var library = new LibraryBuilder("My Library") + .Build(); + + UnitOfWork.LibraryRepository.Add(library); + await UnitOfWork.CommitAsync(); + + var person = new PersonBuilder("Joe Doe") + .WithAlias("Jonny Doe") + .Build(); + + var chapter = new ChapterBuilder("1") + .WithPerson(person, PersonRole.Editor) + .Build(); + + var series = new SeriesBuilder("Test 1") + .WithLibraryId(library.Id) + .WithVolume(new VolumeBuilder("1") + .WithChapter(chapter) + .Build()) + .Build(); + + UnitOfWork.SeriesRepository.Add(series); + await UnitOfWork.CommitAsync(); + + // Add on Name + await PersonHelper.UpdateChapterPeopleAsync(chapter, new List { "Joe Doe" }, PersonRole.Editor, UnitOfWork); + await UnitOfWork.CommitAsync(); + + var allPeople = await UnitOfWork.PersonRepository.GetAllPeople(); + Assert.Single(allPeople); + + // Add on alias + await PersonHelper.UpdateChapterPeopleAsync(chapter, new List { "Jonny Doe" }, PersonRole.Editor, UnitOfWork); + await UnitOfWork.CommitAsync(); + + allPeople = await UnitOfWork.PersonRepository.GetAllPeople(); + Assert.Single(allPeople); + } + + // TODO: Unit tests for series } diff --git a/API.Tests/Helpers/RandfHelper.cs b/API.Tests/Helpers/RandfHelper.cs new file mode 100644 index 000000000..d8c007df7 --- /dev/null +++ b/API.Tests/Helpers/RandfHelper.cs @@ -0,0 +1,124 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; + +namespace API.Tests.Helpers; + +public class RandfHelper +{ + private static readonly Random Random = new (); + + /// + /// Returns true if all simple fields are equal + /// + /// + /// + /// fields to ignore, note that the names are very weird sometimes + /// + /// + /// + public static bool AreSimpleFieldsEqual(object obj1, object obj2, IList ignoreFields) + { + if (obj1 == null || obj2 == null) + throw new ArgumentNullException("Neither object can be null."); + + Type type1 = obj1.GetType(); + Type type2 = obj2.GetType(); + + if (type1 != type2) + throw new ArgumentException("Objects must be of the same type."); + + FieldInfo[] fields = type1.GetFields(BindingFlags.Public | BindingFlags.Instance | BindingFlags.NonPublic); + + foreach (var field in fields) + { + if (field.IsInitOnly) continue; + if (ignoreFields.Contains(field.Name)) continue; + + Type fieldType = field.FieldType; + + if (IsRelevantType(fieldType)) + { + object value1 = field.GetValue(obj1); + object value2 = field.GetValue(obj2); + + if (!Equals(value1, value2)) + { + throw new ArgumentException("Fields must be of the same type: " + field.Name + " was " + value1 + " and " + value2); + } + } + } + + return true; + } + + private static bool IsRelevantType(Type type) + { + return type.IsPrimitive + || type == typeof(string) + || type.IsEnum; + } + + /// + /// Sets all simple fields of the given object to a random value + /// + /// + /// Simple is, primitive, string, or enum + /// + public static void SetRandomValues(object obj) + { + if (obj == null) throw new ArgumentNullException(nameof(obj)); + + Type type = obj.GetType(); + FieldInfo[] fields = type.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); + + foreach (var field in fields) + { + if (field.IsInitOnly) continue; // Skip readonly fields + + object value = GenerateRandomValue(field.FieldType); + if (value != null) + { + field.SetValue(obj, value); + } + } + } + + private static object GenerateRandomValue(Type type) + { + if (type == typeof(int)) + return Random.Next(); + if (type == typeof(float)) + return (float)Random.NextDouble() * 100; + if (type == typeof(double)) + return Random.NextDouble() * 100; + if (type == typeof(bool)) + return Random.Next(2) == 1; + if (type == typeof(char)) + return (char)Random.Next('A', 'Z' + 1); + if (type == typeof(byte)) + return (byte)Random.Next(0, 256); + if (type == typeof(short)) + return (short)Random.Next(short.MinValue, short.MaxValue); + if (type == typeof(long)) + return (long)(Random.NextDouble() * long.MaxValue); + if (type == typeof(string)) + return GenerateRandomString(10); + if (type.IsEnum) + { + var values = Enum.GetValues(type); + return values.GetValue(Random.Next(values.Length)); + } + + // Unsupported type + return null; + } + + private static string GenerateRandomString(int length) + { + const string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; + return new string(Enumerable.Repeat(chars, length) + .Select(s => s[Random.Next(s.Length)]).ToArray()); + } +} diff --git a/API.Tests/Helpers/RateLimiterTests.cs b/API.Tests/Helpers/RateLimiterTests.cs index c05ce4e6d..e9b0030b9 100644 --- a/API.Tests/Helpers/RateLimiterTests.cs +++ b/API.Tests/Helpers/RateLimiterTests.cs @@ -1,4 +1,5 @@ using System; +using System.Threading.Tasks; using API.Helpers; using Xunit; @@ -33,7 +34,7 @@ public class RateLimiterTests } [Fact] - public void AcquireTokens_Refill() + public async Task AcquireTokens_Refill() { // Arrange var limiter = new RateLimiter(2, TimeSpan.FromSeconds(1)); @@ -43,14 +44,14 @@ public class RateLimiterTests limiter.TryAcquire("test_key"); // Wait for refill - System.Threading.Thread.Sleep(1100); + await Task.Delay(1100); // Assert Assert.True(limiter.TryAcquire("test_key")); } [Fact] - public void AcquireTokens_Refill_WithOff() + public async Task AcquireTokens_Refill_WithOff() { // Arrange var limiter = new RateLimiter(2, TimeSpan.FromSeconds(10), false); @@ -60,7 +61,7 @@ public class RateLimiterTests limiter.TryAcquire("test_key"); // Wait for refill - System.Threading.Thread.Sleep(2100); + await Task.Delay(2100); // Assert Assert.False(limiter.TryAcquire("test_key")); diff --git a/API.Tests/Helpers/ReviewHelperTests.cs b/API.Tests/Helpers/ReviewHelperTests.cs new file mode 100644 index 000000000..b221c3c70 --- /dev/null +++ b/API.Tests/Helpers/ReviewHelperTests.cs @@ -0,0 +1,258 @@ +using API.Helpers; +using System.Collections.Generic; +using System.Linq; +using Xunit; +using API.DTOs.SeriesDetail; + +namespace API.Tests.Helpers; + +public class ReviewHelperTests +{ + #region SelectSpectrumOfReviews Tests + + [Fact] + public void SelectSpectrumOfReviews_WhenLessThan10Reviews_ReturnsAllReviews() + { + // Arrange + var reviews = CreateReviewList(8); + + // Act + var result = ReviewHelper.SelectSpectrumOfReviews(reviews).ToList(); + + // Assert + Assert.Equal(8, result.Count); + Assert.Equal(reviews, result.OrderByDescending(r => r.Score)); + } + + [Fact] + public void SelectSpectrumOfReviews_WhenMoreThan10Reviews_Returns10Reviews() + { + // Arrange + var reviews = CreateReviewList(20); + + // Act + var result = ReviewHelper.SelectSpectrumOfReviews(reviews).ToList(); + + // Assert + Assert.Equal(10, result.Count); + Assert.Equal(reviews[0], result.First()); + Assert.Equal(reviews[19], result.Last()); + } + + [Fact] + public void SelectSpectrumOfReviews_WithExactly10Reviews_ReturnsAllReviews() + { + // Arrange + var reviews = CreateReviewList(10); + + // Act + var result = ReviewHelper.SelectSpectrumOfReviews(reviews).ToList(); + + // Assert + Assert.Equal(10, result.Count); + } + + [Fact] + public void SelectSpectrumOfReviews_WithLargeNumberOfReviews_ReturnsCorrectSpectrum() + { + // Arrange + var reviews = CreateReviewList(100); + + // Act + var result = ReviewHelper.SelectSpectrumOfReviews(reviews).ToList(); + + // Assert + Assert.Equal(10, result.Count); + Assert.Contains(reviews[0], result); + Assert.Contains(reviews[1], result); + Assert.Contains(reviews[98], result); + Assert.Contains(reviews[99], result); + } + + [Fact] + public void SelectSpectrumOfReviews_WithEmptyList_ReturnsEmptyList() + { + // Arrange + var reviews = new List(); + + // Act + var result = ReviewHelper.SelectSpectrumOfReviews(reviews).ToList(); + + // Assert + Assert.Empty(result); + } + + [Fact] + public void SelectSpectrumOfReviews_ResultsOrderedByScoreDescending() + { + // Arrange + var reviews = new List + { + new UserReviewDto { Tagline = "1", Score = 3 }, + new UserReviewDto { Tagline = "2", Score = 5 }, + new UserReviewDto { Tagline = "3", Score = 1 }, + new UserReviewDto { Tagline = "4", Score = 4 }, + new UserReviewDto { Tagline = "5", Score = 2 } + }; + + // Act + var result = ReviewHelper.SelectSpectrumOfReviews(reviews).ToList(); + + // Assert + Assert.Equal(5, result.Count); + Assert.Equal(5, result[0].Score); + Assert.Equal(4, result[1].Score); + Assert.Equal(3, result[2].Score); + Assert.Equal(2, result[3].Score); + Assert.Equal(1, result[4].Score); + } + + #endregion + + #region GetCharacters Tests + + [Fact] + public void GetCharacters_WithNullBody_ReturnsNull() + { + // Arrange + string body = null; + + // Act + var result = ReviewHelper.GetCharacters(body); + + // Assert + Assert.Null(result); + } + + [Fact] + public void GetCharacters_WithEmptyBody_ReturnsEmptyString() + { + // Arrange + var body = string.Empty; + + // Act + var result = ReviewHelper.GetCharacters(body); + + // Assert + Assert.Equal(string.Empty, result); + } + + [Fact] + public void GetCharacters_WithNoTextNodes_ReturnsEmptyString() + { + // Arrange + const string body = "
"; + + // Act + var result = ReviewHelper.GetCharacters(body); + + // Assert + Assert.Equal(string.Empty, result); + } + + [Fact] + public void GetCharacters_WithLessCharactersThanLimit_ReturnsFullText() + { + // Arrange + var body = "

This is a short review.

"; + + // Act + var result = ReviewHelper.GetCharacters(body); + + // Assert + Assert.Equal("This is a short review.…", result); + } + + [Fact] + public void GetCharacters_WithMoreCharactersThanLimit_TruncatesText() + { + // Arrange + var body = "

" + new string('a', 200) + "

"; + + // Act + var result = ReviewHelper.GetCharacters(body); + + // Assert + Assert.Equal(new string('a', 175) + "…", result); + Assert.Equal(176, result.Length); // 175 characters + ellipsis + } + + [Fact] + public void GetCharacters_IgnoresScriptTags() + { + // Arrange + const string body = "

Visible text

"; + + // Act + var result = ReviewHelper.GetCharacters(body); + + // Assert + Assert.Equal("Visible text…", result); + Assert.DoesNotContain("hidden", result); + } + + [Fact] + public void GetCharacters_RemovesMarkdownSymbols() + { + // Arrange + const string body = "

This is **bold** and _italic_ text with [link](url).

"; + + // Act + var result = ReviewHelper.GetCharacters(body); + + // Assert + Assert.Equal("This is bold and italic text with link.…", result); + } + + [Fact] + public void GetCharacters_HandlesComplexMarkdownAndHtml() + { + // Arrange + const string body = """ + +
+

# Header

+

This is ~~strikethrough~~ and __underlined__ text

+

~~~code block~~~

+

+++highlighted+++

+

img123(image.jpg)

+
+ """; + + // Act + var result = ReviewHelper.GetCharacters(body); + + // Assert + Assert.DoesNotContain("~~", result); + Assert.DoesNotContain("__", result); + Assert.DoesNotContain("~~~", result); + Assert.DoesNotContain("+++", result); + Assert.DoesNotContain("img123(", result); + Assert.Contains("Header", result); + Assert.Contains("strikethrough", result); + Assert.Contains("underlined", result); + Assert.Contains("code block", result); + Assert.Contains("highlighted", result); + } + + #endregion + + #region Helper Methods + + private static List CreateReviewList(int count) + { + var reviews = new List(); + for (var i = 0; i < count; i++) + { + reviews.Add(new UserReviewDto + { + Tagline = $"{i + 1}", + Score = count - i // This makes them ordered by score descending initially + }); + } + return reviews; + } + + #endregion +} + diff --git a/API.Tests/Helpers/ScannerHelper.cs b/API.Tests/Helpers/ScannerHelper.cs index e164d015e..653efebb1 100644 --- a/API.Tests/Helpers/ScannerHelper.cs +++ b/API.Tests/Helpers/ScannerHelper.cs @@ -26,6 +26,7 @@ using NSubstitute; using Xunit.Abstractions; namespace API.Tests.Helpers; +#nullable enable public class ScannerHelper { @@ -63,10 +64,10 @@ public class ScannerHelper return library; } - public ScannerService CreateServices() + public ScannerService CreateServices(DirectoryService ds = null, IFileSystem fs = null) { - var fs = new FileSystem(); - var ds = new DirectoryService(Substitute.For>(), fs); + fs ??= new FileSystem(); + ds ??= new DirectoryService(Substitute.For>(), fs); var archiveService = new ArchiveService(Substitute.For>(), ds, Substitute.For(), Substitute.For()); var readingItemService = new ReadingItemService(archiveService, Substitute.For(), @@ -133,7 +134,7 @@ public class ScannerHelper _testOutputHelper.WriteLine($"Test Directory Path: {testDirectory}"); - return testDirectory; + return Path.GetFullPath(testDirectory); } diff --git a/API.Tests/Helpers/SeriesHelperTests.cs b/API.Tests/Helpers/SeriesHelperTests.cs index a5b5a063b..22b4a3cd1 100644 --- a/API.Tests/Helpers/SeriesHelperTests.cs +++ b/API.Tests/Helpers/SeriesHelperTests.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Linq; -using API.Data; using API.Entities; using API.Entities.Enums; using API.Extensions; diff --git a/API.Tests/Helpers/StringHelperTests.cs b/API.Tests/Helpers/StringHelperTests.cs new file mode 100644 index 000000000..8f845c9b0 --- /dev/null +++ b/API.Tests/Helpers/StringHelperTests.cs @@ -0,0 +1,46 @@ +using API.Helpers; +using Xunit; + +namespace API.Tests.Helpers; + +public class StringHelperTests +{ + [Theory] + [InlineData( + "

A Perfect Marriage Becomes a Perfect Affair!



Every woman wishes for that happily ever after, but when time flies by and you've become a neglected housewife, what's a woman to do?

", + "

A Perfect Marriage Becomes a Perfect Affair!
Every woman wishes for that happily ever after, but when time flies by and you've become a neglected housewife, what's a woman to do?

" + )] + [InlineData( + "

Blog | Twitter | Pixiv | Pawoo

", + "

Blog | Twitter | Pixiv | Pawoo

" + )] + public void TestSquashBreaklines(string input, string expected) + { + Assert.Equal(expected, StringHelper.SquashBreaklines(input)); + } + + [Theory] + [InlineData( + "

A Perfect Marriage Becomes a Perfect Affair!
(Source: Anime News Network)

", + "

A Perfect Marriage Becomes a Perfect Affair!

" + )] + [InlineData( + "

A Perfect Marriage Becomes a Perfect Affair!

(Source: Anime News Network)", + "

A Perfect Marriage Becomes a Perfect Affair!

" + )] + public void TestRemoveSourceInDescription(string input, string expected) + { + Assert.Equal(expected, StringHelper.RemoveSourceInDescription(input)); + } + + + [Theory] + [InlineData( +"""Pawoo

""", +"""Pawoo

""" + )] + public void TestCorrectUrls(string input, string expected) + { + Assert.Equal(expected, StringHelper.CorrectUrls(input)); + } +} diff --git a/API.Tests/Parsers/BasicParserTests.cs b/API.Tests/Parsers/BasicParserTests.cs index ad040d59e..32673e0e6 100644 --- a/API.Tests/Parsers/BasicParserTests.cs +++ b/API.Tests/Parsers/BasicParserTests.cs @@ -1,4 +1,5 @@ -using System.IO.Abstractions.TestingHelpers; +using System.IO; +using System.IO.Abstractions.TestingHelpers; using API.Entities.Enums; using API.Services; using API.Services.Tasks.Scanner.Parser; @@ -8,59 +9,54 @@ using Xunit; namespace API.Tests.Parsers; -public class BasicParserTests +public class BasicParserTests : AbstractFsTest { private readonly BasicParser _parser; private readonly ILogger _dsLogger = Substitute.For>(); - private const string RootDirectory = "C:/Books/"; + private readonly string _rootDirectory; public BasicParserTests() { - var fileSystem = new MockFileSystem(); - fileSystem.AddDirectory("C:/Books/"); - fileSystem.AddFile("C:/Books/Harry Potter/Harry Potter - Vol 1.epub", new MockFileData("")); + var fileSystem = CreateFileSystem(); + _rootDirectory = Path.Join(DataDirectory, "Books/"); + fileSystem.AddDirectory(_rootDirectory); + fileSystem.AddFile($"{_rootDirectory}Harry Potter/Harry Potter - Vol 1.epub", new MockFileData("")); - fileSystem.AddFile("C:/Books/Accel World/Accel World - Volume 1.cbz", new MockFileData("")); - fileSystem.AddFile("C:/Books/Accel World/Accel World - Volume 1 Chapter 2.cbz", new MockFileData("")); - fileSystem.AddFile("C:/Books/Accel World/Accel World - Chapter 3.cbz", new MockFileData("")); - fileSystem.AddFile("C:/Books/Accel World/Accel World Gaiden SP01.cbz", new MockFileData("")); + fileSystem.AddFile($"{_rootDirectory}Accel World/Accel World - Volume 1.cbz", new MockFileData("")); + fileSystem.AddFile($"{_rootDirectory}Accel World/Accel World - Volume 1 Chapter 2.cbz", new MockFileData("")); + fileSystem.AddFile($"{_rootDirectory}Accel World/Accel World - Chapter 3.cbz", new MockFileData("")); + fileSystem.AddFile("$\"{RootDirectory}Accel World/Accel World Gaiden SP01.cbz", new MockFileData("")); - fileSystem.AddFile("C:/Books/Accel World/cover.png", new MockFileData("")); + fileSystem.AddFile($"{_rootDirectory}Accel World/cover.png", new MockFileData("")); - fileSystem.AddFile("C:/Books/Batman/Batman #1.cbz", new MockFileData("")); + fileSystem.AddFile($"{_rootDirectory}Batman/Batman #1.cbz", new MockFileData("")); var ds = new DirectoryService(_dsLogger, fileSystem); _parser = new BasicParser(ds, new ImageParser(ds)); } - #region Parse_Books - - - - #endregion - #region Parse_Manga /// - /// Tests that when there is a loose leaf cover in the manga library, that it is ignored + /// Tests that when there is a loose-leaf cover in the manga library, that it is ignored /// [Fact] public void Parse_MangaLibrary_JustCover_ShouldReturnNull() { - var actual = _parser.Parse(@"C:/Books/Accel World/cover.png", "C:/Books/Accel World/", - RootDirectory, LibraryType.Manga, null); + var actual = _parser.Parse($"{_rootDirectory}Accel World/cover.png", $"{_rootDirectory}Accel World/", + _rootDirectory, LibraryType.Manga); Assert.Null(actual); } /// - /// Tests that when there is a loose leaf cover in the manga library, that it is ignored + /// Tests that when there is a loose-leaf cover in the manga library, that it is ignored /// [Fact] public void Parse_MangaLibrary_OtherImage_ShouldReturnNull() { - var actual = _parser.Parse(@"C:/Books/Accel World/page 01.png", "C:/Books/Accel World/", - RootDirectory, LibraryType.Manga, null); + var actual = _parser.Parse($"{_rootDirectory}Accel World/page 01.png", $"{_rootDirectory}Accel World/", + _rootDirectory, LibraryType.Manga); Assert.NotNull(actual); } @@ -70,8 +66,8 @@ public class BasicParserTests [Fact] public void Parse_MangaLibrary_VolumeAndChapterInFilename() { - var actual = _parser.Parse("C:/Books/Mujaki no Rakuen/Mujaki no Rakuen Vol12 ch76.cbz", "C:/Books/Mujaki no Rakuen/", - RootDirectory, LibraryType.Manga, null); + var actual = _parser.Parse($"{_rootDirectory}Mujaki no Rakuen/Mujaki no Rakuen Vol12 ch76.cbz", $"{_rootDirectory}Mujaki no Rakuen/", + _rootDirectory, LibraryType.Manga); Assert.NotNull(actual); Assert.Equal("Mujaki no Rakuen", actual.Series); @@ -86,9 +82,9 @@ public class BasicParserTests [Fact] public void Parse_MangaLibrary_JustVolumeInFilename() { - var actual = _parser.Parse("C:/Books/Shimoneta to Iu Gainen ga Sonzai Shinai Taikutsu na Sekai Man-hen/Vol 1.cbz", - "C:/Books/Shimoneta to Iu Gainen ga Sonzai Shinai Taikutsu na Sekai Man-hen/", - RootDirectory, LibraryType.Manga, null); + var actual = _parser.Parse($"{_rootDirectory}Shimoneta to Iu Gainen ga Sonzai Shinai Taikutsu na Sekai Man-hen/Vol 1.cbz", + $"{_rootDirectory}Shimoneta to Iu Gainen ga Sonzai Shinai Taikutsu na Sekai Man-hen/", + _rootDirectory, LibraryType.Manga); Assert.NotNull(actual); Assert.Equal("Shimoneta to Iu Gainen ga Sonzai Shinai Taikutsu na Sekai Man-hen", actual.Series); @@ -103,9 +99,9 @@ public class BasicParserTests [Fact] public void Parse_MangaLibrary_JustChapterInFilename() { - var actual = _parser.Parse("C:/Books/Beelzebub/Beelzebub_01_[Noodles].zip", - "C:/Books/Beelzebub/", - RootDirectory, LibraryType.Manga, null); + var actual = _parser.Parse($"{_rootDirectory}Beelzebub/Beelzebub_01_[Noodles].zip", + $"{_rootDirectory}Beelzebub/", + _rootDirectory, LibraryType.Manga); Assert.NotNull(actual); Assert.Equal("Beelzebub", actual.Series); @@ -120,9 +116,9 @@ public class BasicParserTests [Fact] public void Parse_MangaLibrary_SpecialMarkerInFilename() { - var actual = _parser.Parse("C:/Books/Summer Time Rendering/Specials/Record 014 (between chapter 083 and ch084) SP11.cbr", - "C:/Books/Summer Time Rendering/", - RootDirectory, LibraryType.Manga, null); + var actual = _parser.Parse($"{_rootDirectory}Summer Time Rendering/Specials/Record 014 (between chapter 083 and ch084) SP11.cbr", + $"{_rootDirectory}Summer Time Rendering/", + _rootDirectory, LibraryType.Manga); Assert.NotNull(actual); Assert.Equal("Summer Time Rendering", actual.Series); @@ -133,36 +129,54 @@ public class BasicParserTests /// - /// Tests that when the filename parses as a speical, it appropriately parses + /// Tests that when the filename parses as a special, it appropriately parses /// [Fact] public void Parse_MangaLibrary_SpecialInFilename() { - var actual = _parser.Parse("C:/Books/Summer Time Rendering/Volume SP01.cbr", - "C:/Books/Summer Time Rendering/", - RootDirectory, LibraryType.Manga, null); + var actual = _parser.Parse($"{_rootDirectory}Summer Time Rendering/Volume SP01.cbr", + $"{_rootDirectory}Summer Time Rendering/", + _rootDirectory, LibraryType.Manga); Assert.NotNull(actual); Assert.Equal("Summer Time Rendering", actual.Series); - Assert.Equal("Volume SP01", actual.Title); + Assert.Equal("Volume", actual.Title); Assert.Equal(Parser.SpecialVolume, actual.Volumes); Assert.Equal(Parser.DefaultChapter, actual.Chapters); Assert.True(actual.IsSpecial); } /// - /// Tests that when the filename parses as a speical, it appropriately parses + /// Tests that when the filename parses as a special, it appropriately parses /// [Fact] public void Parse_MangaLibrary_SpecialInFilename2() { var actual = _parser.Parse("M:/Kimi wa Midara na Boku no Joou/Specials/[Renzokusei] Special 1 SP02.zip", "M:/Kimi wa Midara na Boku no Joou/", - RootDirectory, LibraryType.Manga, null); + _rootDirectory, LibraryType.Manga); Assert.NotNull(actual); Assert.Equal("Kimi wa Midara na Boku no Joou", actual.Series); - Assert.Equal("[Renzokusei] Special 1 SP02", actual.Title); + Assert.Equal("[Renzokusei] Special 1", actual.Title); + Assert.Equal(Parser.SpecialVolume, actual.Volumes); + Assert.Equal(Parser.DefaultChapter, actual.Chapters); + Assert.True(actual.IsSpecial); + } + + /// + /// Tests that when the filename parses as a special, it appropriately parses + /// + [Fact] + public void Parse_MangaLibrary_SpecialInFilename_StrangeNaming() + { + var actual = _parser.Parse($"{_rootDirectory}My Dress-Up Darling/SP01 1. Special Name.cbz", + _rootDirectory, + _rootDirectory, LibraryType.Manga); + Assert.NotNull(actual); + + Assert.Equal("My Dress-Up Darling", actual.Series); + Assert.Equal("1. Special Name", actual.Title); Assert.Equal(Parser.SpecialVolume, actual.Volumes); Assert.Equal(Parser.DefaultChapter, actual.Chapters); Assert.True(actual.IsSpecial); @@ -174,9 +188,9 @@ public class BasicParserTests [Fact] public void Parse_MangaLibrary_EditionInFilename() { - var actual = _parser.Parse("C:/Books/Air Gear/Air Gear Omnibus v01 (2016) (Digital) (Shadowcat-Empire).cbz", - "C:/Books/Air Gear/", - RootDirectory, LibraryType.Manga, null); + var actual = _parser.Parse($"{_rootDirectory}Air Gear/Air Gear Omnibus v01 (2016) (Digital) (Shadowcat-Empire).cbz", + $"{_rootDirectory}Air Gear/", + _rootDirectory, LibraryType.Manga); Assert.NotNull(actual); Assert.Equal("Air Gear", actual.Series); @@ -195,9 +209,9 @@ public class BasicParserTests [Fact] public void Parse_MangaBooks_JustVolumeInFilename() { - var actual = _parser.Parse("C:/Books/Epubs/Harrison, Kim - The Good, The Bad, and the Undead - Hollows Vol 2.5.epub", - "C:/Books/Epubs/", - RootDirectory, LibraryType.Manga, null); + var actual = _parser.Parse($"{_rootDirectory}Epubs/Harrison, Kim - The Good, The Bad, and the Undead - Hollows Vol 2.5.epub", + $"{_rootDirectory}Epubs/", + _rootDirectory, LibraryType.Manga); Assert.NotNull(actual); Assert.Equal("Harrison, Kim - The Good, The Bad, and the Undead - Hollows", actual.Series); diff --git a/API.Tests/Parsers/BookParserTests.cs b/API.Tests/Parsers/BookParserTests.cs index 6be0fe386..90147ac6b 100644 --- a/API.Tests/Parsers/BookParserTests.cs +++ b/API.Tests/Parsers/BookParserTests.cs @@ -1,5 +1,4 @@ using System.IO.Abstractions.TestingHelpers; -using API.Data.Metadata; using API.Entities.Enums; using API.Services; using API.Services.Tasks.Scanner.Parser; diff --git a/API.Tests/Parsers/ComicVineParserTests.cs b/API.Tests/Parsers/ComicVineParserTests.cs index f01e98afd..2f4fd568e 100644 --- a/API.Tests/Parsers/ComicVineParserTests.cs +++ b/API.Tests/Parsers/ComicVineParserTests.cs @@ -36,7 +36,7 @@ public class ComicVineParserTests public void Parse_SeriesWithComicInfo() { var actual = _parser.Parse("C:/Comics/Birds of Prey (2002)/Birds of Prey 001 (2002).cbz", "C:/Comics/Birds of Prey (2002)/", - RootDirectory, LibraryType.ComicVine, new ComicInfo() + RootDirectory, LibraryType.ComicVine, true, new ComicInfo() { Series = "Birds of Prey", Volume = "2002" @@ -54,7 +54,7 @@ public class ComicVineParserTests public void Parse_SeriesWithDirectoryNameAsSeriesYear() { var actual = _parser.Parse("C:/Comics/Birds of Prey (2002)/Birds of Prey 001 (2002).cbz", "C:/Comics/Birds of Prey (2002)/", - RootDirectory, LibraryType.ComicVine, null); + RootDirectory, LibraryType.ComicVine, true, null); Assert.NotNull(actual); Assert.Equal("Birds of Prey (2002)", actual.Series); @@ -69,7 +69,7 @@ public class ComicVineParserTests public void Parse_SeriesWithADirectoryNameAsSeriesYear() { var actual = _parser.Parse("C:/Comics/DC Comics/Birds of Prey (1999)/Birds of Prey 001 (1999).cbz", "C:/Comics/DC Comics/", - RootDirectory, LibraryType.ComicVine, null); + RootDirectory, LibraryType.ComicVine, true, null); Assert.NotNull(actual); Assert.Equal("Birds of Prey (1999)", actual.Series); @@ -84,7 +84,7 @@ public class ComicVineParserTests public void Parse_FallbackToDirectoryNameOnly() { var actual = _parser.Parse("C:/Comics/DC Comics/Blood Syndicate/Blood Syndicate 001 (1999).cbz", "C:/Comics/DC Comics/", - RootDirectory, LibraryType.ComicVine, null); + RootDirectory, LibraryType.ComicVine, true, null); Assert.NotNull(actual); Assert.Equal("Blood Syndicate", actual.Series); diff --git a/API.Tests/Parsers/DefaultParserTests.cs b/API.Tests/Parsers/DefaultParserTests.cs index 733b55d62..244c08b97 100644 --- a/API.Tests/Parsers/DefaultParserTests.cs +++ b/API.Tests/Parsers/DefaultParserTests.cs @@ -33,7 +33,7 @@ public class DefaultParserTests [InlineData("C:/", "C:/Something Random/Mujaki no Rakuen SP01.cbz", "Something Random")] public void ParseFromFallbackFolders_FallbackShouldParseSeries(string rootDir, string inputPath, string expectedSeries) { - var actual = _defaultParser.Parse(inputPath, rootDir, rootDir, LibraryType.Manga, null); + var actual = _defaultParser.Parse(inputPath, rootDir, rootDir, LibraryType.Manga, true, null); if (actual == null) { Assert.NotNull(actual); @@ -74,7 +74,7 @@ public class DefaultParserTests fs.AddFile(inputFile, new MockFileData("")); var ds = new DirectoryService(Substitute.For>(), fs); var parser = new BasicParser(ds, new ImageParser(ds)); - var actual = parser.Parse(inputFile, rootDirectory, rootDirectory, LibraryType.Manga, null); + var actual = parser.Parse(inputFile, rootDirectory, rootDirectory, LibraryType.Manga, true, null); _defaultParser.ParseFromFallbackFolders(inputFile, rootDirectory, LibraryType.Manga, ref actual); Assert.Equal(expectedParseInfo, actual.Series); } @@ -90,7 +90,7 @@ public class DefaultParserTests fs.AddFile(inputFile, new MockFileData("")); var ds = new DirectoryService(Substitute.For>(), fs); var parser = new BasicParser(ds, new ImageParser(ds)); - var actual = parser.Parse(inputFile, rootDirectory, rootDirectory, LibraryType.Manga, null); + var actual = parser.Parse(inputFile, rootDirectory, rootDirectory, LibraryType.Manga, true, null); _defaultParser.ParseFromFallbackFolders(inputFile, rootDirectory, LibraryType.Manga, ref actual); Assert.Equal(expectedParseInfo, actual.Series); } @@ -251,7 +251,7 @@ public class DefaultParserTests foreach (var file in expected.Keys) { var expectedInfo = expected[file]; - var actual = _defaultParser.Parse(file, rootPath, rootPath, LibraryType.Manga, null); + var actual = _defaultParser.Parse(file, rootPath, rootPath, LibraryType.Manga, true, null); if (expectedInfo == null) { Assert.Null(actual); @@ -289,7 +289,7 @@ public class DefaultParserTests Chapters = "8", Filename = "13.jpg", Format = MangaFormat.Image, FullFilePath = filepath, IsSpecial = false }; - var actual2 = _defaultParser.Parse(filepath, @"E:/Manga/Monster #8", "E:/Manga", LibraryType.Manga, null); + var actual2 = _defaultParser.Parse(filepath, @"E:/Manga/Monster #8", "E:/Manga", LibraryType.Manga, true, null); Assert.NotNull(actual2); _testOutputHelper.WriteLine($"Validating {filepath}"); Assert.Equal(expectedInfo2.Format, actual2.Format); @@ -315,7 +315,7 @@ public class DefaultParserTests FullFilePath = filepath, IsSpecial = false }; - actual2 = _defaultParser.Parse(filepath, @"E:/Manga/Extra layer for no reason/", "E:/Manga",LibraryType.Manga, null); + actual2 = _defaultParser.Parse(filepath, @"E:/Manga/Extra layer for no reason/", "E:/Manga",LibraryType.Manga, true, null); Assert.NotNull(actual2); _testOutputHelper.WriteLine($"Validating {filepath}"); Assert.Equal(expectedInfo2.Format, actual2.Format); @@ -341,7 +341,7 @@ public class DefaultParserTests FullFilePath = filepath, IsSpecial = false }; - actual2 = _defaultParser.Parse(filepath, @"E:/Manga/Extra layer for no reason/", "E:/Manga", LibraryType.Manga, null); + actual2 = _defaultParser.Parse(filepath, @"E:/Manga/Extra layer for no reason/", "E:/Manga", LibraryType.Manga, true, null); Assert.NotNull(actual2); _testOutputHelper.WriteLine($"Validating {filepath}"); Assert.Equal(expectedInfo2.Format, actual2.Format); @@ -383,7 +383,7 @@ public class DefaultParserTests FullFilePath = filepath }; - var actual = parser.Parse(filepath, rootPath, rootPath, LibraryType.Manga, null); + var actual = parser.Parse(filepath, rootPath, rootPath, LibraryType.Manga, true, null); Assert.NotNull(actual); _testOutputHelper.WriteLine($"Validating {filepath}"); @@ -412,7 +412,7 @@ public class DefaultParserTests FullFilePath = filepath }; - actual = parser.Parse(filepath, rootPath, rootPath, LibraryType.Manga, null); + actual = parser.Parse(filepath, rootPath, rootPath, LibraryType.Manga, true, null); Assert.NotNull(actual); _testOutputHelper.WriteLine($"Validating {filepath}"); Assert.Equal(expected.Format, actual.Format); @@ -475,7 +475,7 @@ public class DefaultParserTests foreach (var file in expected.Keys) { var expectedInfo = expected[file]; - var actual = _defaultParser.Parse(file, rootPath, rootPath, LibraryType.Comic, null); + var actual = _defaultParser.Parse(file, rootPath, rootPath, LibraryType.Comic, true, null); if (expectedInfo == null) { Assert.Null(actual); diff --git a/API.Tests/Parsers/ImageParserTests.cs b/API.Tests/Parsers/ImageParserTests.cs index f95c98ddf..63df1926e 100644 --- a/API.Tests/Parsers/ImageParserTests.cs +++ b/API.Tests/Parsers/ImageParserTests.cs @@ -34,7 +34,7 @@ public class ImageParserTests public void Parse_SeriesWithDirectoryName() { var actual = _parser.Parse("C:/Comics/Birds of Prey/Chapter 01/01.jpg", "C:/Comics/Birds of Prey/", - RootDirectory, LibraryType.Image, null); + RootDirectory, LibraryType.Image, true, null); Assert.NotNull(actual); Assert.Equal("Birds of Prey", actual.Series); @@ -48,7 +48,7 @@ public class ImageParserTests public void Parse_SeriesWithNoNestedChapter() { var actual = _parser.Parse("C:/Comics/Birds of Prey/Chapter 01 page 01.jpg", "C:/Comics/", - RootDirectory, LibraryType.Image, null); + RootDirectory, LibraryType.Image, true, null); Assert.NotNull(actual); Assert.Equal("Birds of Prey", actual.Series); @@ -62,7 +62,7 @@ public class ImageParserTests public void Parse_SeriesWithLooseImages() { var actual = _parser.Parse("C:/Comics/Birds of Prey/page 01.jpg", "C:/Comics/", - RootDirectory, LibraryType.Image, null); + RootDirectory, LibraryType.Image, true, null); Assert.NotNull(actual); Assert.Equal("Birds of Prey", actual.Series); diff --git a/API.Tests/Parsers/PdfParserTests.cs b/API.Tests/Parsers/PdfParserTests.cs index 72088526d..08bf9f25d 100644 --- a/API.Tests/Parsers/PdfParserTests.cs +++ b/API.Tests/Parsers/PdfParserTests.cs @@ -35,7 +35,7 @@ public class PdfParserTests { var actual = _parser.Parse("C:/Books/A Dictionary of Japanese Food - Ingredients and Culture/A Dictionary of Japanese Food - Ingredients and Culture.pdf", "C:/Books/A Dictionary of Japanese Food - Ingredients and Culture/", - RootDirectory, LibraryType.Book, null); + RootDirectory, LibraryType.Book, true, null); Assert.NotNull(actual); Assert.Equal("A Dictionary of Japanese Food - Ingredients and Culture", actual.Series); diff --git a/API.Tests/Parsing/ImageParsingTests.cs b/API.Tests/Parsing/ImageParsingTests.cs index 3d78d9372..362b4b08c 100644 --- a/API.Tests/Parsing/ImageParsingTests.cs +++ b/API.Tests/Parsing/ImageParsingTests.cs @@ -34,7 +34,7 @@ public class ImageParsingTests Chapters = "8", Filename = "13.jpg", Format = MangaFormat.Image, FullFilePath = filepath, IsSpecial = false }; - var actual2 = _parser.Parse(filepath, @"E:\Manga\Monster #8", "E:/Manga", LibraryType.Image, null); + var actual2 = _parser.Parse(filepath, @"E:\Manga\Monster #8", "E:/Manga", LibraryType.Image, true, null); Assert.NotNull(actual2); _testOutputHelper.WriteLine($"Validating {filepath}"); Assert.Equal(expectedInfo2.Format, actual2.Format); @@ -60,7 +60,7 @@ public class ImageParsingTests FullFilePath = filepath, IsSpecial = false }; - actual2 = _parser.Parse(filepath, @"E:\Manga\Extra layer for no reason\", "E:/Manga", LibraryType.Image, null); + actual2 = _parser.Parse(filepath, @"E:\Manga\Extra layer for no reason\", "E:/Manga", LibraryType.Image, true, null); Assert.NotNull(actual2); _testOutputHelper.WriteLine($"Validating {filepath}"); Assert.Equal(expectedInfo2.Format, actual2.Format); @@ -86,7 +86,7 @@ public class ImageParsingTests FullFilePath = filepath, IsSpecial = false }; - actual2 = _parser.Parse(filepath, @"E:\Manga\Extra layer for no reason\", "E:/Manga", LibraryType.Image, null); + actual2 = _parser.Parse(filepath, @"E:\Manga\Extra layer for no reason\", "E:/Manga", LibraryType.Image, true, null); Assert.NotNull(actual2); _testOutputHelper.WriteLine($"Validating {filepath}"); Assert.Equal(expectedInfo2.Format, actual2.Format); diff --git a/API.Tests/Parsing/MangaParsingTests.cs b/API.Tests/Parsing/MangaParsingTests.cs index a975cc7ee..53f2bc4c9 100644 --- a/API.Tests/Parsing/MangaParsingTests.cs +++ b/API.Tests/Parsing/MangaParsingTests.cs @@ -1,18 +1,10 @@ using API.Entities.Enums; using Xunit; -using Xunit.Abstractions; namespace API.Tests.Parsing; public class MangaParsingTests { - private readonly ITestOutputHelper _testOutputHelper; - - public MangaParsingTests(ITestOutputHelper testOutputHelper) - { - _testOutputHelper = testOutputHelper; - } - [Theory] [InlineData("Killing Bites Vol. 0001 Ch. 0001 - Galactica Scanlations (gb)", "1")] [InlineData("My Girlfriend Is Shobitch v01 - ch. 09 - pg. 008.png", "1")] @@ -76,7 +68,6 @@ public class MangaParsingTests [InlineData("Манга Тома 1-4", "1-4")] [InlineData("Манга Том 1-4", "1-4")] [InlineData("조선왕조실톡 106화", "106")] - [InlineData("죽음 13회", "13")] [InlineData("동의보감 13장", "13")] [InlineData("몰?루 아카이브 7.5권", "7.5")] [InlineData("63권#200", "63")] @@ -84,6 +75,7 @@ public class MangaParsingTests [InlineData("Accel World Chapter 001 Volume 002", "2")] [InlineData("Accel World Volume 2", "2")] [InlineData("Nagasarete Airantou - Vol. 30 Ch. 187.5 - Vol.31 Omake", "30")] + [InlineData("Zom 100 - Bucket List of the Dead v01", "1")] public void ParseVolumeTest(string filename, string expected) { Assert.Equal(expected, API.Services.Tasks.Scanner.Parser.Parser.ParseVolume(filename, LibraryType.Manga)); @@ -212,6 +204,8 @@ public class MangaParsingTests [InlineData("不安の種\uff0b - 01", "不安の種\uff0b")] [InlineData("Giant Ojou-sama - Ch. 33.5 - Volume 04 Bonus Chapter", "Giant Ojou-sama")] [InlineData("[218565]-(C92) [BRIO (Puyocha)] Mika-nee no Tanryoku Shidou - Mika s Guide to Self-Confidence (THE IDOLM@STE", "")] + [InlineData("Monster #8 Ch. 001", "Monster #8")] + [InlineData("Zom 100 - Bucket List of the Dead v01", "Zom 100 - Bucket List of the Dead")] public void ParseSeriesTest(string filename, string expected) { Assert.Equal(expected, API.Services.Tasks.Scanner.Parser.Parser.ParseSeries(filename, LibraryType.Manga)); @@ -304,6 +298,7 @@ public class MangaParsingTests [InlineData("เด็กคนนี้ขอลาออกจากการเป็นเจ้าของปราสาท เล่ม 1 ตอนที่ 3", "3")] [InlineData("Max Level Returner ตอนที่ 5", "5")] [InlineData("หนึ่งความคิด นิจนิรันดร์ บทที่ 112", "112")] + [InlineData("Monster #8 Ch. 001", "1")] public void ParseChaptersTest(string filename, string expected) { Assert.Equal(expected, API.Services.Tasks.Scanner.Parser.Parser.ParseChapter(filename, LibraryType.Manga)); diff --git a/API.Tests/Parsing/ParserInfoTests.cs b/API.Tests/Parsing/ParserInfoTests.cs index 61ae8ecf2..cbb8ae99a 100644 --- a/API.Tests/Parsing/ParserInfoTests.cs +++ b/API.Tests/Parsing/ParserInfoTests.cs @@ -11,14 +11,14 @@ public class ParserInfoTests { var p1 = new ParserInfo() { - Chapters = API.Services.Tasks.Scanner.Parser.Parser.DefaultChapter, + Chapters = Parser.DefaultChapter, Edition = "", Format = MangaFormat.Archive, FullFilePath = "/manga/darker than black.cbz", IsSpecial = false, Series = "darker than black", Title = "darker than black", - Volumes = API.Services.Tasks.Scanner.Parser.Parser.LooseLeafVolume + Volumes = Parser.LooseLeafVolume }; var p2 = new ParserInfo() @@ -30,7 +30,7 @@ public class ParserInfoTests IsSpecial = false, Series = "darker than black", Title = "Darker Than Black", - Volumes = API.Services.Tasks.Scanner.Parser.Parser.LooseLeafVolume + Volumes = Parser.LooseLeafVolume }; var expected = new ParserInfo() @@ -42,7 +42,7 @@ public class ParserInfoTests IsSpecial = false, Series = "darker than black", Title = "darker than black", - Volumes = API.Services.Tasks.Scanner.Parser.Parser.LooseLeafVolume + Volumes = Parser.LooseLeafVolume }; p1.Merge(p2); @@ -62,12 +62,12 @@ public class ParserInfoTests IsSpecial = true, Series = "darker than black", Title = "darker than black", - Volumes = API.Services.Tasks.Scanner.Parser.Parser.LooseLeafVolume + Volumes = Parser.LooseLeafVolume }; var p2 = new ParserInfo() { - Chapters = API.Services.Tasks.Scanner.Parser.Parser.DefaultChapter, + Chapters = Parser.DefaultChapter, Edition = "", Format = MangaFormat.Archive, FullFilePath = "/manga/darker than black.cbz", diff --git a/API.Tests/Parsing/ParsingTests.cs b/API.Tests/Parsing/ParsingTests.cs index a3a49762d..7d5da4f9c 100644 --- a/API.Tests/Parsing/ParsingTests.cs +++ b/API.Tests/Parsing/ParsingTests.cs @@ -1,6 +1,5 @@ using System.Globalization; using System.Linq; -using System.Runtime.InteropServices; using Xunit; using static API.Services.Tasks.Scanner.Parser.Parser; @@ -11,9 +10,13 @@ public class ParsingTests [Fact] public void ShouldWork() { - var s = 6.5f + ""; + var s = 6.5f.ToString(CultureInfo.InvariantCulture); var a = float.Parse(s, CultureInfo.InvariantCulture); Assert.Equal(6.5f, a); + + s = 6.5f + ""; + a = float.Parse(s, CultureInfo.CurrentCulture); + Assert.Equal(6.5f, a); } // [Theory] @@ -40,6 +43,7 @@ public class ParsingTests [InlineData("DEAD Tube Prologue", "DEAD Tube Prologue")] [InlineData("DEAD Tube Prologue SP01", "DEAD Tube Prologue")] [InlineData("DEAD_Tube_Prologue SP01", "DEAD Tube Prologue")] + [InlineData("SP01 1. DEAD Tube Prologue", "1. DEAD Tube Prologue")] public void CleanSpecialTitleTest(string input, string expected) { Assert.Equal(expected, CleanSpecialTitle(input)); @@ -247,6 +251,7 @@ public class ParsingTests [InlineData("ch1/backcover.png", false)] [InlineData("backcover.png", false)] [InlineData("back_cover.png", false)] + [InlineData("LD Blacklands #1 35 (back cover).png", false)] public void IsCoverImageTest(string inputPath, bool expected) { Assert.Equal(expected, IsCoverImage(inputPath)); diff --git a/API.Tests/Repository/CollectionTagRepositoryTests.cs b/API.Tests/Repository/CollectionTagRepositoryTests.cs index 6abf3f7e7..5318260be 100644 --- a/API.Tests/Repository/CollectionTagRepositoryTests.cs +++ b/API.Tests/Repository/CollectionTagRepositoryTests.cs @@ -15,7 +15,6 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.Extensions.Logging; using NSubstitute; -using Xunit; namespace API.Tests.Repository; diff --git a/API.Tests/Repository/GenreRepositoryTests.cs b/API.Tests/Repository/GenreRepositoryTests.cs new file mode 100644 index 000000000..d197a91ba --- /dev/null +++ b/API.Tests/Repository/GenreRepositoryTests.cs @@ -0,0 +1,280 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using API.DTOs.Metadata.Browse; +using API.Entities; +using API.Entities.Enums; +using API.Entities.Metadata; +using API.Helpers; +using API.Helpers.Builders; +using Xunit; + +namespace API.Tests.Repository; + +public class GenreRepositoryTests : AbstractDbTest +{ + private AppUser _fullAccess; + private AppUser _restrictedAccess; + private AppUser _restrictedAgeAccess; + + protected override async Task ResetDb() + { + Context.Genre.RemoveRange(Context.Genre); + Context.Library.RemoveRange(Context.Library); + await Context.SaveChangesAsync(); + } + + private TestGenreSet CreateTestGenres() + { + return new TestGenreSet + { + SharedSeriesChaptersGenre = new GenreBuilder("Shared Series Chapter Genre").Build(), + SharedSeriesGenre = new GenreBuilder("Shared Series Genre").Build(), + SharedChaptersGenre = new GenreBuilder("Shared Chapters Genre").Build(), + Lib0SeriesChaptersGenre = new GenreBuilder("Lib0 Series Chapter Genre").Build(), + Lib0SeriesGenre = new GenreBuilder("Lib0 Series Genre").Build(), + Lib0ChaptersGenre = new GenreBuilder("Lib0 Chapters Genre").Build(), + Lib1SeriesChaptersGenre = new GenreBuilder("Lib1 Series Chapter Genre").Build(), + Lib1SeriesGenre = new GenreBuilder("Lib1 Series Genre").Build(), + Lib1ChaptersGenre = new GenreBuilder("Lib1 Chapters Genre").Build(), + Lib1ChapterAgeGenre = new GenreBuilder("Lib1 Chapter Age Genre").Build() + }; + } + + private async Task SeedDbWithGenres(TestGenreSet genres) + { + await CreateTestUsers(); + await AddGenresToContext(genres); + await CreateLibrariesWithGenres(genres); + await AssignLibrariesToUsers(); + } + + private async Task CreateTestUsers() + { + _fullAccess = new AppUserBuilder("amelia", "amelia@example.com").Build(); + _restrictedAccess = new AppUserBuilder("mila", "mila@example.com").Build(); + _restrictedAgeAccess = new AppUserBuilder("eva", "eva@example.com").Build(); + _restrictedAgeAccess.AgeRestriction = AgeRating.Teen; + _restrictedAgeAccess.AgeRestrictionIncludeUnknowns = true; + + Context.Users.Add(_fullAccess); + Context.Users.Add(_restrictedAccess); + Context.Users.Add(_restrictedAgeAccess); + await Context.SaveChangesAsync(); + } + + private async Task AddGenresToContext(TestGenreSet genres) + { + var allGenres = genres.GetAllGenres(); + Context.Genre.AddRange(allGenres); + await Context.SaveChangesAsync(); + } + + private async Task CreateLibrariesWithGenres(TestGenreSet genres) + { + var lib0 = new LibraryBuilder("lib0") + .WithSeries(new SeriesBuilder("lib0-s0") + .WithMetadata(new SeriesMetadataBuilder() + .WithGenres([genres.SharedSeriesChaptersGenre, genres.SharedSeriesGenre, genres.Lib0SeriesChaptersGenre, genres.Lib0SeriesGenre]) + .Build()) + .WithVolume(new VolumeBuilder("1") + .WithChapter(new ChapterBuilder("1") + .WithGenres([genres.SharedSeriesChaptersGenre, genres.SharedChaptersGenre, genres.Lib0SeriesChaptersGenre, genres.Lib0ChaptersGenre]) + .Build()) + .WithChapter(new ChapterBuilder("2") + .WithGenres([genres.SharedSeriesChaptersGenre, genres.SharedChaptersGenre, genres.Lib1SeriesChaptersGenre, genres.Lib1ChaptersGenre]) + .Build()) + .Build()) + .Build()) + .Build(); + + var lib1 = new LibraryBuilder("lib1") + .WithSeries(new SeriesBuilder("lib1-s0") + .WithMetadata(new SeriesMetadataBuilder() + .WithGenres([genres.SharedSeriesChaptersGenre, genres.SharedSeriesGenre, genres.Lib1SeriesChaptersGenre, genres.Lib1SeriesGenre]) + .WithAgeRating(AgeRating.Mature17Plus) + .Build()) + .WithVolume(new VolumeBuilder("1") + .WithChapter(new ChapterBuilder("1") + .WithGenres([genres.SharedSeriesChaptersGenre, genres.SharedChaptersGenre, genres.Lib1SeriesChaptersGenre, genres.Lib1ChaptersGenre]) + .Build()) + .WithChapter(new ChapterBuilder("2") + .WithGenres([genres.SharedSeriesChaptersGenre, genres.SharedChaptersGenre, genres.Lib1SeriesChaptersGenre, genres.Lib1ChaptersGenre, genres.Lib1ChapterAgeGenre]) + .WithAgeRating(AgeRating.Mature17Plus) + .Build()) + .Build()) + .Build()) + .WithSeries(new SeriesBuilder("lib1-s1") + .WithMetadata(new SeriesMetadataBuilder() + .WithGenres([genres.SharedSeriesChaptersGenre, genres.SharedSeriesGenre, genres.Lib1SeriesChaptersGenre, genres.Lib1SeriesGenre]) + .Build()) + .WithVolume(new VolumeBuilder("1") + .WithChapter(new ChapterBuilder("1") + .WithGenres([genres.SharedSeriesChaptersGenre, genres.SharedChaptersGenre, genres.Lib1SeriesChaptersGenre, genres.Lib1ChaptersGenre]) + .Build()) + .WithChapter(new ChapterBuilder("2") + .WithGenres([genres.SharedSeriesChaptersGenre, genres.SharedChaptersGenre, genres.Lib1SeriesChaptersGenre, genres.Lib1ChaptersGenre]) + .Build()) + .Build()) + .Build()) + .Build(); + + Context.Library.Add(lib0); + Context.Library.Add(lib1); + await Context.SaveChangesAsync(); + } + + private async Task AssignLibrariesToUsers() + { + var lib0 = Context.Library.First(l => l.Name == "lib0"); + var lib1 = Context.Library.First(l => l.Name == "lib1"); + + _fullAccess.Libraries.Add(lib0); + _fullAccess.Libraries.Add(lib1); + _restrictedAccess.Libraries.Add(lib1); + _restrictedAgeAccess.Libraries.Add(lib1); + + await Context.SaveChangesAsync(); + } + + private static Predicate ContainsGenreCheck(Genre genre) + { + return g => g.Id == genre.Id; + } + + private static void AssertGenrePresent(IEnumerable genres, Genre expectedGenre) + { + Assert.Contains(genres, ContainsGenreCheck(expectedGenre)); + } + + private static void AssertGenreNotPresent(IEnumerable genres, Genre expectedGenre) + { + Assert.DoesNotContain(genres, ContainsGenreCheck(expectedGenre)); + } + + private static BrowseGenreDto GetGenreDto(IEnumerable genres, Genre genre) + { + return genres.First(dto => dto.Id == genre.Id); + } + + [Fact] + public async Task GetBrowseableGenre_FullAccess_ReturnsAllGenresWithCorrectCounts() + { + // Arrange + await ResetDb(); + var genres = CreateTestGenres(); + await SeedDbWithGenres(genres); + + // Act + var fullAccessGenres = await UnitOfWork.GenreRepository.GetBrowseableGenre(_fullAccess.Id, new UserParams()); + + // Assert + Assert.Equal(genres.GetAllGenres().Count, fullAccessGenres.TotalCount); + + foreach (var genre in genres.GetAllGenres()) + { + AssertGenrePresent(fullAccessGenres, genre); + } + + // Verify counts - 1 lib0 series, 2 lib1 series = 3 total series + Assert.Equal(3, GetGenreDto(fullAccessGenres, genres.SharedSeriesChaptersGenre).SeriesCount); + Assert.Equal(6, GetGenreDto(fullAccessGenres, genres.SharedSeriesChaptersGenre).ChapterCount); + Assert.Equal(1, GetGenreDto(fullAccessGenres, genres.Lib0SeriesGenre).SeriesCount); + } + + [Fact] + public async Task GetBrowseableGenre_RestrictedAccess_ReturnsOnlyAccessibleGenres() + { + // Arrange + await ResetDb(); + var genres = CreateTestGenres(); + await SeedDbWithGenres(genres); + + // Act + var restrictedAccessGenres = await UnitOfWork.GenreRepository.GetBrowseableGenre(_restrictedAccess.Id, new UserParams()); + + // Assert - Should see: 3 shared + 4 library 1 specific = 7 genres + Assert.Equal(7, restrictedAccessGenres.TotalCount); + + // Verify shared and Library 1 genres are present + AssertGenrePresent(restrictedAccessGenres, genres.SharedSeriesChaptersGenre); + AssertGenrePresent(restrictedAccessGenres, genres.SharedSeriesGenre); + AssertGenrePresent(restrictedAccessGenres, genres.SharedChaptersGenre); + AssertGenrePresent(restrictedAccessGenres, genres.Lib1SeriesChaptersGenre); + AssertGenrePresent(restrictedAccessGenres, genres.Lib1SeriesGenre); + AssertGenrePresent(restrictedAccessGenres, genres.Lib1ChaptersGenre); + AssertGenrePresent(restrictedAccessGenres, genres.Lib1ChapterAgeGenre); + + // Verify Library 0 specific genres are not present + AssertGenreNotPresent(restrictedAccessGenres, genres.Lib0SeriesChaptersGenre); + AssertGenreNotPresent(restrictedAccessGenres, genres.Lib0SeriesGenre); + AssertGenreNotPresent(restrictedAccessGenres, genres.Lib0ChaptersGenre); + + // Verify counts - 2 lib1 series + Assert.Equal(2, GetGenreDto(restrictedAccessGenres, genres.SharedSeriesChaptersGenre).SeriesCount); + Assert.Equal(4, GetGenreDto(restrictedAccessGenres, genres.SharedSeriesChaptersGenre).ChapterCount); + Assert.Equal(2, GetGenreDto(restrictedAccessGenres, genres.Lib1SeriesGenre).SeriesCount); + Assert.Equal(4, GetGenreDto(restrictedAccessGenres, genres.Lib1ChaptersGenre).ChapterCount); + Assert.Equal(1, GetGenreDto(restrictedAccessGenres, genres.Lib1ChapterAgeGenre).ChapterCount); + } + + [Fact] + public async Task GetBrowseableGenre_RestrictedAgeAccess_FiltersAgeRestrictedContent() + { + // Arrange + await ResetDb(); + var genres = CreateTestGenres(); + await SeedDbWithGenres(genres); + + // Act + var restrictedAgeAccessGenres = await UnitOfWork.GenreRepository.GetBrowseableGenre(_restrictedAgeAccess.Id, new UserParams()); + + // Assert - Should see: 3 shared + 3 lib1 specific = 6 genres (age-restricted genre filtered out) + Assert.Equal(6, restrictedAgeAccessGenres.TotalCount); + + // Verify accessible genres are present + AssertGenrePresent(restrictedAgeAccessGenres, genres.SharedSeriesChaptersGenre); + AssertGenrePresent(restrictedAgeAccessGenres, genres.SharedSeriesGenre); + AssertGenrePresent(restrictedAgeAccessGenres, genres.SharedChaptersGenre); + AssertGenrePresent(restrictedAgeAccessGenres, genres.Lib1SeriesChaptersGenre); + AssertGenrePresent(restrictedAgeAccessGenres, genres.Lib1SeriesGenre); + AssertGenrePresent(restrictedAgeAccessGenres, genres.Lib1ChaptersGenre); + + // Verify age-restricted genre is filtered out + AssertGenreNotPresent(restrictedAgeAccessGenres, genres.Lib1ChapterAgeGenre); + + // Verify counts - 1 series lib1 (age-restricted series filtered out) + Assert.Equal(1, GetGenreDto(restrictedAgeAccessGenres, genres.SharedSeriesChaptersGenre).SeriesCount); + Assert.Equal(1, GetGenreDto(restrictedAgeAccessGenres, genres.Lib1SeriesGenre).SeriesCount); + + // These values represent a bug - chapters are not properly filtered when their series is age-restricted + // Should be 2, but currently returns 3 due to the filtering issue + Assert.Equal(3, GetGenreDto(restrictedAgeAccessGenres, genres.SharedSeriesChaptersGenre).ChapterCount); + Assert.Equal(3, GetGenreDto(restrictedAgeAccessGenres, genres.Lib1ChaptersGenre).ChapterCount); + } + + private class TestGenreSet + { + public Genre SharedSeriesChaptersGenre { get; set; } + public Genre SharedSeriesGenre { get; set; } + public Genre SharedChaptersGenre { get; set; } + public Genre Lib0SeriesChaptersGenre { get; set; } + public Genre Lib0SeriesGenre { get; set; } + public Genre Lib0ChaptersGenre { get; set; } + public Genre Lib1SeriesChaptersGenre { get; set; } + public Genre Lib1SeriesGenre { get; set; } + public Genre Lib1ChaptersGenre { get; set; } + public Genre Lib1ChapterAgeGenre { get; set; } + + public List GetAllGenres() + { + return + [ + SharedSeriesChaptersGenre, SharedSeriesGenre, SharedChaptersGenre, + Lib0SeriesChaptersGenre, Lib0SeriesGenre, Lib0ChaptersGenre, + Lib1SeriesChaptersGenre, Lib1SeriesGenre, Lib1ChaptersGenre, Lib1ChapterAgeGenre + ]; + } + } +} diff --git a/API.Tests/Repository/PersonRepositoryTests.cs b/API.Tests/Repository/PersonRepositoryTests.cs new file mode 100644 index 000000000..a2b19cc0c --- /dev/null +++ b/API.Tests/Repository/PersonRepositoryTests.cs @@ -0,0 +1,342 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using API.DTOs.Metadata.Browse; +using API.DTOs.Metadata.Browse.Requests; +using API.Entities; +using API.Entities.Enums; +using API.Entities.Person; +using API.Helpers; +using API.Helpers.Builders; +using Xunit; + +namespace API.Tests.Repository; + +public class PersonRepositoryTests : AbstractDbTest +{ + private AppUser _fullAccess; + private AppUser _restrictedAccess; + private AppUser _restrictedAgeAccess; + + protected override async Task ResetDb() + { + Context.Person.RemoveRange(Context.Person.ToList()); + Context.Library.RemoveRange(Context.Library.ToList()); + Context.AppUser.RemoveRange(Context.AppUser.ToList()); + await UnitOfWork.CommitAsync(); + } + + private async Task SeedDb() + { + _fullAccess = new AppUserBuilder("amelia", "amelia@example.com").Build(); + _restrictedAccess = new AppUserBuilder("mila", "mila@example.com").Build(); + _restrictedAgeAccess = new AppUserBuilder("eva", "eva@example.com").Build(); + _restrictedAgeAccess.AgeRestriction = AgeRating.Teen; + _restrictedAgeAccess.AgeRestrictionIncludeUnknowns = true; + + Context.AppUser.Add(_fullAccess); + Context.AppUser.Add(_restrictedAccess); + Context.AppUser.Add(_restrictedAgeAccess); + await Context.SaveChangesAsync(); + + var people = CreateTestPeople(); + Context.Person.AddRange(people); + await Context.SaveChangesAsync(); + + var libraries = CreateTestLibraries(people); + Context.Library.AddRange(libraries); + await Context.SaveChangesAsync(); + + _fullAccess.Libraries.Add(libraries[0]); // lib0 + _fullAccess.Libraries.Add(libraries[1]); // lib1 + _restrictedAccess.Libraries.Add(libraries[1]); // lib1 only + _restrictedAgeAccess.Libraries.Add(libraries[1]); // lib1 only + + await Context.SaveChangesAsync(); + } + + private static List CreateTestPeople() + { + return new List + { + new PersonBuilder("Shared Series Chapter Person").Build(), + new PersonBuilder("Shared Series Person").Build(), + new PersonBuilder("Shared Chapters Person").Build(), + new PersonBuilder("Lib0 Series Chapter Person").Build(), + new PersonBuilder("Lib0 Series Person").Build(), + new PersonBuilder("Lib0 Chapters Person").Build(), + new PersonBuilder("Lib1 Series Chapter Person").Build(), + new PersonBuilder("Lib1 Series Person").Build(), + new PersonBuilder("Lib1 Chapters Person").Build(), + new PersonBuilder("Lib1 Chapter Age Person").Build() + }; + } + + private static List CreateTestLibraries(List people) + { + var lib0 = new LibraryBuilder("lib0") + .WithSeries(new SeriesBuilder("lib0-s0") + .WithMetadata(new SeriesMetadataBuilder() + .WithPerson(GetPersonByName(people, "Shared Series Chapter Person"), PersonRole.Writer) + .WithPerson(GetPersonByName(people, "Shared Series Person"), PersonRole.Writer) + .WithPerson(GetPersonByName(people, "Lib0 Series Chapter Person"), PersonRole.Writer) + .WithPerson(GetPersonByName(people, "Lib0 Series Person"), PersonRole.Writer) + .Build()) + .WithVolume(new VolumeBuilder("1") + .WithChapter(new ChapterBuilder("1") + .WithPerson(GetPersonByName(people, "Shared Series Chapter Person"), PersonRole.Colorist) + .WithPerson(GetPersonByName(people, "Shared Chapters Person"), PersonRole.Colorist) + .WithPerson(GetPersonByName(people, "Lib0 Series Chapter Person"), PersonRole.Colorist) + .WithPerson(GetPersonByName(people, "Lib0 Chapters Person"), PersonRole.Colorist) + .Build()) + .WithChapter(new ChapterBuilder("2") + .WithPerson(GetPersonByName(people, "Shared Series Chapter Person"), PersonRole.Editor) + .WithPerson(GetPersonByName(people, "Shared Chapters Person"), PersonRole.Editor) + .WithPerson(GetPersonByName(people, "Lib0 Series Chapter Person"), PersonRole.Editor) + .WithPerson(GetPersonByName(people, "Lib0 Chapters Person"), PersonRole.Editor) + .Build()) + .Build()) + .Build()) + .Build(); + + var lib1 = new LibraryBuilder("lib1") + .WithSeries(new SeriesBuilder("lib1-s0") + .WithMetadata(new SeriesMetadataBuilder() + .WithPerson(GetPersonByName(people, "Shared Series Chapter Person"), PersonRole.Letterer) + .WithPerson(GetPersonByName(people, "Shared Series Person"), PersonRole.Letterer) + .WithPerson(GetPersonByName(people, "Lib1 Series Chapter Person"), PersonRole.Letterer) + .WithPerson(GetPersonByName(people, "Lib1 Series Person"), PersonRole.Letterer) + .WithAgeRating(AgeRating.Mature17Plus) + .Build()) + .WithVolume(new VolumeBuilder("1") + .WithChapter(new ChapterBuilder("1") + .WithPerson(GetPersonByName(people, "Shared Series Chapter Person"), PersonRole.Imprint) + .WithPerson(GetPersonByName(people, "Shared Chapters Person"), PersonRole.Imprint) + .WithPerson(GetPersonByName(people, "Lib1 Series Chapter Person"), PersonRole.Imprint) + .WithPerson(GetPersonByName(people, "Lib1 Chapters Person"), PersonRole.Imprint) + .Build()) + .WithChapter(new ChapterBuilder("2") + .WithPerson(GetPersonByName(people, "Shared Series Chapter Person"), PersonRole.CoverArtist) + .WithPerson(GetPersonByName(people, "Shared Chapters Person"), PersonRole.CoverArtist) + .WithPerson(GetPersonByName(people, "Lib1 Series Chapter Person"), PersonRole.CoverArtist) + .WithPerson(GetPersonByName(people, "Lib1 Chapters Person"), PersonRole.CoverArtist) + .WithPerson(GetPersonByName(people, "Lib1 Chapter Age Person"), PersonRole.CoverArtist) + .WithAgeRating(AgeRating.Mature17Plus) + .Build()) + .Build()) + .Build()) + .WithSeries(new SeriesBuilder("lib1-s1") + .WithMetadata(new SeriesMetadataBuilder() + .WithPerson(GetPersonByName(people, "Shared Series Chapter Person"), PersonRole.Inker) + .WithPerson(GetPersonByName(people, "Shared Series Person"), PersonRole.Inker) + .WithPerson(GetPersonByName(people, "Lib1 Series Chapter Person"), PersonRole.Inker) + .WithPerson(GetPersonByName(people, "Lib1 Series Person"), PersonRole.Inker) + .Build()) + .WithVolume(new VolumeBuilder("1") + .WithChapter(new ChapterBuilder("1") + .WithPerson(GetPersonByName(people, "Shared Series Chapter Person"), PersonRole.Team) + .WithPerson(GetPersonByName(people, "Shared Chapters Person"), PersonRole.Team) + .WithPerson(GetPersonByName(people, "Lib1 Series Chapter Person"), PersonRole.Team) + .WithPerson(GetPersonByName(people, "Lib1 Chapters Person"), PersonRole.Team) + .Build()) + .WithChapter(new ChapterBuilder("2") + .WithPerson(GetPersonByName(people, "Shared Series Chapter Person"), PersonRole.Translator) + .WithPerson(GetPersonByName(people, "Shared Chapters Person"), PersonRole.Translator) + .WithPerson(GetPersonByName(people, "Lib1 Series Chapter Person"), PersonRole.Translator) + .WithPerson(GetPersonByName(people, "Lib1 Chapters Person"), PersonRole.Translator) + .Build()) + .Build()) + .Build()) + .Build(); + + return new List { lib0, lib1 }; + } + + private static Person GetPersonByName(List people, string name) + { + return people.First(p => p.Name == name); + } + + private Person GetPersonByName(string name) + { + return Context.Person.First(p => p.Name == name); + } + + private static Predicate ContainsPersonCheck(Person person) + { + return p => p.Id == person.Id; + } + + [Fact] + public async Task GetBrowsePersonDtos() + { + await ResetDb(); + await SeedDb(); + + // Get people from database for assertions + var sharedSeriesChaptersPerson = GetPersonByName("Shared Series Chapter Person"); + var lib0SeriesPerson = GetPersonByName("Lib0 Series Person"); + var lib1SeriesPerson = GetPersonByName("Lib1 Series Person"); + var lib1ChapterAgePerson = GetPersonByName("Lib1 Chapter Age Person"); + var allPeople = Context.Person.ToList(); + + var fullAccessPeople = + await UnitOfWork.PersonRepository.GetBrowsePersonDtos(_fullAccess.Id, new BrowsePersonFilterDto(), + new UserParams()); + Assert.Equal(allPeople.Count, fullAccessPeople.TotalCount); + + foreach (var person in allPeople) + Assert.Contains(fullAccessPeople, ContainsPersonCheck(person)); + + // 1 series in lib0, 2 series in lib1 + Assert.Equal(3, fullAccessPeople.First(dto => dto.Id == sharedSeriesChaptersPerson.Id).SeriesCount); + // 3 series with each 2 chapters + Assert.Equal(6, fullAccessPeople.First(dto => dto.Id == sharedSeriesChaptersPerson.Id).ChapterCount); + // 1 series in lib0 + Assert.Equal(1, fullAccessPeople.First(dto => dto.Id == lib0SeriesPerson.Id).SeriesCount); + // 2 series in lib1 + Assert.Equal(2, fullAccessPeople.First(dto => dto.Id == lib1SeriesPerson.Id).SeriesCount); + + var restrictedAccessPeople = + await UnitOfWork.PersonRepository.GetBrowsePersonDtos(_restrictedAccess.Id, new BrowsePersonFilterDto(), + new UserParams()); + + Assert.Equal(7, restrictedAccessPeople.TotalCount); + + Assert.Contains(restrictedAccessPeople, ContainsPersonCheck(GetPersonByName("Shared Series Chapter Person"))); + Assert.Contains(restrictedAccessPeople, ContainsPersonCheck(GetPersonByName("Shared Series Person"))); + Assert.Contains(restrictedAccessPeople, ContainsPersonCheck(GetPersonByName("Shared Chapters Person"))); + Assert.Contains(restrictedAccessPeople, ContainsPersonCheck(GetPersonByName("Lib1 Series Chapter Person"))); + Assert.Contains(restrictedAccessPeople, ContainsPersonCheck(GetPersonByName("Lib1 Series Person"))); + Assert.Contains(restrictedAccessPeople, ContainsPersonCheck(GetPersonByName("Lib1 Chapters Person"))); + Assert.Contains(restrictedAccessPeople, ContainsPersonCheck(GetPersonByName("Lib1 Chapter Age Person"))); + + // 2 series in lib1, no series in lib0 + Assert.Equal(2, restrictedAccessPeople.First(dto => dto.Id == sharedSeriesChaptersPerson.Id).SeriesCount); + // 2 series with each 2 chapters + Assert.Equal(4, restrictedAccessPeople.First(dto => dto.Id == sharedSeriesChaptersPerson.Id).ChapterCount); + // 2 series in lib1 + Assert.Equal(2, restrictedAccessPeople.First(dto => dto.Id == lib1SeriesPerson.Id).SeriesCount); + + var restrictedAgeAccessPeople = await UnitOfWork.PersonRepository.GetBrowsePersonDtos(_restrictedAgeAccess.Id, + new BrowsePersonFilterDto(), new UserParams()); + + // Note: There is a potential bug here where a person in a different chapter of an age restricted series will show up + Assert.Equal(6, restrictedAgeAccessPeople.TotalCount); + + // No access to the age restricted chapter + Assert.DoesNotContain(restrictedAgeAccessPeople, ContainsPersonCheck(lib1ChapterAgePerson)); + } + + [Fact] + public async Task GetRolesForPersonByName() + { + await ResetDb(); + await SeedDb(); + + var sharedSeriesPerson = GetPersonByName("Shared Series Person"); + var sharedChaptersPerson = GetPersonByName("Shared Chapters Person"); + var lib1ChapterAgePerson = GetPersonByName("Lib1 Chapter Age Person"); + + var sharedSeriesRoles = await UnitOfWork.PersonRepository.GetRolesForPersonByName(sharedSeriesPerson.Id, _fullAccess.Id); + var chapterRoles = await UnitOfWork.PersonRepository.GetRolesForPersonByName(sharedChaptersPerson.Id, _fullAccess.Id); + var ageChapterRoles = await UnitOfWork.PersonRepository.GetRolesForPersonByName(lib1ChapterAgePerson.Id, _fullAccess.Id); + Assert.Equal(3, sharedSeriesRoles.Count()); + Assert.Equal(6, chapterRoles.Count()); + Assert.Single(ageChapterRoles); + + var restrictedRoles = await UnitOfWork.PersonRepository.GetRolesForPersonByName(sharedSeriesPerson.Id, _restrictedAccess.Id); + var restrictedChapterRoles = await UnitOfWork.PersonRepository.GetRolesForPersonByName(sharedChaptersPerson.Id, _restrictedAccess.Id); + var restrictedAgePersonChapterRoles = await UnitOfWork.PersonRepository.GetRolesForPersonByName(lib1ChapterAgePerson.Id, _restrictedAccess.Id); + Assert.Equal(2, restrictedRoles.Count()); + Assert.Equal(4, restrictedChapterRoles.Count()); + Assert.Single(restrictedAgePersonChapterRoles); + + var restrictedAgeRoles = await UnitOfWork.PersonRepository.GetRolesForPersonByName(sharedSeriesPerson.Id, _restrictedAgeAccess.Id); + var restrictedAgeChapterRoles = await UnitOfWork.PersonRepository.GetRolesForPersonByName(sharedChaptersPerson.Id, _restrictedAgeAccess.Id); + var restrictedAgeAgePersonChapterRoles = await UnitOfWork.PersonRepository.GetRolesForPersonByName(lib1ChapterAgePerson.Id, _restrictedAgeAccess.Id); + Assert.Single(restrictedAgeRoles); + Assert.Equal(2, restrictedAgeChapterRoles.Count()); + // Note: There is a potential bug here where a person in a different chapter of an age restricted series will show up + Assert.Empty(restrictedAgeAgePersonChapterRoles); + } + + [Fact] + public async Task GetPersonDtoByName() + { + await ResetDb(); + await SeedDb(); + + var allPeople = Context.Person.ToList(); + + foreach (var person in allPeople) + { + Assert.NotNull(await UnitOfWork.PersonRepository.GetPersonDtoByName(person.Name, _fullAccess.Id)); + } + + Assert.Null(await UnitOfWork.PersonRepository.GetPersonDtoByName("Lib0 Chapters Person", _restrictedAccess.Id)); + Assert.NotNull(await UnitOfWork.PersonRepository.GetPersonDtoByName("Shared Series Person", _restrictedAccess.Id)); + Assert.NotNull(await UnitOfWork.PersonRepository.GetPersonDtoByName("Lib1 Series Person", _restrictedAccess.Id)); + + Assert.Null(await UnitOfWork.PersonRepository.GetPersonDtoByName("Lib0 Chapters Person", _restrictedAgeAccess.Id)); + Assert.NotNull(await UnitOfWork.PersonRepository.GetPersonDtoByName("Lib1 Series Person", _restrictedAgeAccess.Id)); + // Note: There is a potential bug here where a person in a different chapter of an age restricted series will show up + Assert.Null(await UnitOfWork.PersonRepository.GetPersonDtoByName("Lib1 Chapter Age Person", _restrictedAgeAccess.Id)); + } + + [Fact] + public async Task GetSeriesKnownFor() + { + await ResetDb(); + await SeedDb(); + + var sharedSeriesPerson = GetPersonByName("Shared Series Person"); + var lib1SeriesPerson = GetPersonByName("Lib1 Series Person"); + + var series = await UnitOfWork.PersonRepository.GetSeriesKnownFor(sharedSeriesPerson.Id, _fullAccess.Id); + Assert.Equal(3, series.Count()); + + series = await UnitOfWork.PersonRepository.GetSeriesKnownFor(sharedSeriesPerson.Id, _restrictedAccess.Id); + Assert.Equal(2, series.Count()); + + series = await UnitOfWork.PersonRepository.GetSeriesKnownFor(sharedSeriesPerson.Id, _restrictedAgeAccess.Id); + Assert.Single(series); + + series = await UnitOfWork.PersonRepository.GetSeriesKnownFor(lib1SeriesPerson.Id, _restrictedAgeAccess.Id); + Assert.Single(series); + } + + [Fact] + public async Task GetChaptersForPersonByRole() + { + await ResetDb(); + await SeedDb(); + + var sharedChaptersPerson = GetPersonByName("Shared Chapters Person"); + + // Lib0 + var chapters = await UnitOfWork.PersonRepository.GetChaptersForPersonByRole(sharedChaptersPerson.Id, _fullAccess.Id, PersonRole.Colorist); + var restrictedChapters = await UnitOfWork.PersonRepository.GetChaptersForPersonByRole(sharedChaptersPerson.Id, _restrictedAccess.Id, PersonRole.Colorist); + var restrictedAgeChapters = await UnitOfWork.PersonRepository.GetChaptersForPersonByRole(sharedChaptersPerson.Id, _restrictedAgeAccess.Id, PersonRole.Colorist); + Assert.Single(chapters); + Assert.Empty(restrictedChapters); + Assert.Empty(restrictedAgeChapters); + + // Lib1 - age restricted series + chapters = await UnitOfWork.PersonRepository.GetChaptersForPersonByRole(sharedChaptersPerson.Id, _fullAccess.Id, PersonRole.Imprint); + restrictedChapters = await UnitOfWork.PersonRepository.GetChaptersForPersonByRole(sharedChaptersPerson.Id, _restrictedAccess.Id, PersonRole.Imprint); + restrictedAgeChapters = await UnitOfWork.PersonRepository.GetChaptersForPersonByRole(sharedChaptersPerson.Id, _restrictedAgeAccess.Id, PersonRole.Imprint); + Assert.Single(chapters); + Assert.Single(restrictedChapters); + Assert.Empty(restrictedAgeChapters); + + // Lib1 - not age restricted series + chapters = await UnitOfWork.PersonRepository.GetChaptersForPersonByRole(sharedChaptersPerson.Id, _fullAccess.Id, PersonRole.Team); + restrictedChapters = await UnitOfWork.PersonRepository.GetChaptersForPersonByRole(sharedChaptersPerson.Id, _restrictedAccess.Id, PersonRole.Team); + restrictedAgeChapters = await UnitOfWork.PersonRepository.GetChaptersForPersonByRole(sharedChaptersPerson.Id, _restrictedAgeAccess.Id, PersonRole.Team); + Assert.Single(chapters); + Assert.Single(restrictedChapters); + Assert.Single(restrictedAgeChapters); + } +} diff --git a/API.Tests/Repository/SeriesRepositoryTests.cs b/API.Tests/Repository/SeriesRepositoryTests.cs index 73ed58a5a..5705e1bc0 100644 --- a/API.Tests/Repository/SeriesRepositoryTests.cs +++ b/API.Tests/Repository/SeriesRepositoryTests.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using API.Data; using API.Entities; using API.Entities.Enums; -using API.Extensions; using API.Helpers; using API.Helpers.Builders; using API.Services; diff --git a/API.Tests/Repository/TagRepositoryTests.cs b/API.Tests/Repository/TagRepositoryTests.cs new file mode 100644 index 000000000..229082eb6 --- /dev/null +++ b/API.Tests/Repository/TagRepositoryTests.cs @@ -0,0 +1,278 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using API.DTOs.Metadata.Browse; +using API.Entities; +using API.Entities.Enums; +using API.Entities.Metadata; +using API.Helpers; +using API.Helpers.Builders; +using Xunit; + +namespace API.Tests.Repository; + +public class TagRepositoryTests : AbstractDbTest +{ + private AppUser _fullAccess; + private AppUser _restrictedAccess; + private AppUser _restrictedAgeAccess; + + protected override async Task ResetDb() + { + Context.Tag.RemoveRange(Context.Tag); + Context.Library.RemoveRange(Context.Library); + await Context.SaveChangesAsync(); + } + + private TestTagSet CreateTestTags() + { + return new TestTagSet + { + SharedSeriesChaptersTag = new TagBuilder("Shared Series Chapter Tag").Build(), + SharedSeriesTag = new TagBuilder("Shared Series Tag").Build(), + SharedChaptersTag = new TagBuilder("Shared Chapters Tag").Build(), + Lib0SeriesChaptersTag = new TagBuilder("Lib0 Series Chapter Tag").Build(), + Lib0SeriesTag = new TagBuilder("Lib0 Series Tag").Build(), + Lib0ChaptersTag = new TagBuilder("Lib0 Chapters Tag").Build(), + Lib1SeriesChaptersTag = new TagBuilder("Lib1 Series Chapter Tag").Build(), + Lib1SeriesTag = new TagBuilder("Lib1 Series Tag").Build(), + Lib1ChaptersTag = new TagBuilder("Lib1 Chapters Tag").Build(), + Lib1ChapterAgeTag = new TagBuilder("Lib1 Chapter Age Tag").Build() + }; + } + + private async Task SeedDbWithTags(TestTagSet tags) + { + await CreateTestUsers(); + await AddTagsToContext(tags); + await CreateLibrariesWithTags(tags); + await AssignLibrariesToUsers(); + } + + private async Task CreateTestUsers() + { + _fullAccess = new AppUserBuilder("amelia", "amelia@example.com").Build(); + _restrictedAccess = new AppUserBuilder("mila", "mila@example.com").Build(); + _restrictedAgeAccess = new AppUserBuilder("eva", "eva@example.com").Build(); + _restrictedAgeAccess.AgeRestriction = AgeRating.Teen; + _restrictedAgeAccess.AgeRestrictionIncludeUnknowns = true; + + Context.Users.Add(_fullAccess); + Context.Users.Add(_restrictedAccess); + Context.Users.Add(_restrictedAgeAccess); + await Context.SaveChangesAsync(); + } + + private async Task AddTagsToContext(TestTagSet tags) + { + var allTags = tags.GetAllTags(); + Context.Tag.AddRange(allTags); + await Context.SaveChangesAsync(); + } + + private async Task CreateLibrariesWithTags(TestTagSet tags) + { + var lib0 = new LibraryBuilder("lib0") + .WithSeries(new SeriesBuilder("lib0-s0") + .WithMetadata(new SeriesMetadata + { + Tags = [tags.SharedSeriesChaptersTag, tags.SharedSeriesTag, tags.Lib0SeriesChaptersTag, tags.Lib0SeriesTag] + }) + .WithVolume(new VolumeBuilder("1") + .WithChapter(new ChapterBuilder("1") + .WithTags([tags.SharedSeriesChaptersTag, tags.SharedChaptersTag, tags.Lib0SeriesChaptersTag, tags.Lib0ChaptersTag]) + .Build()) + .WithChapter(new ChapterBuilder("2") + .WithTags([tags.SharedSeriesChaptersTag, tags.SharedChaptersTag, tags.Lib1SeriesChaptersTag, tags.Lib1ChaptersTag]) + .Build()) + .Build()) + .Build()) + .Build(); + + var lib1 = new LibraryBuilder("lib1") + .WithSeries(new SeriesBuilder("lib1-s0") + .WithMetadata(new SeriesMetadataBuilder() + .WithTags([tags.SharedSeriesChaptersTag, tags.SharedSeriesTag, tags.Lib1SeriesChaptersTag, tags.Lib1SeriesTag]) + .WithAgeRating(AgeRating.Mature17Plus) + .Build()) + .WithVolume(new VolumeBuilder("1") + .WithChapter(new ChapterBuilder("1") + .WithTags([tags.SharedSeriesChaptersTag, tags.SharedChaptersTag, tags.Lib1SeriesChaptersTag, tags.Lib1ChaptersTag]) + .Build()) + .WithChapter(new ChapterBuilder("2") + .WithTags([tags.SharedSeriesChaptersTag, tags.SharedChaptersTag, tags.Lib1SeriesChaptersTag, tags.Lib1ChaptersTag, tags.Lib1ChapterAgeTag]) + .WithAgeRating(AgeRating.Mature17Plus) + .Build()) + .Build()) + .Build()) + .WithSeries(new SeriesBuilder("lib1-s1") + .WithMetadata(new SeriesMetadataBuilder() + .WithTags([tags.SharedSeriesChaptersTag, tags.SharedSeriesTag, tags.Lib1SeriesChaptersTag, tags.Lib1SeriesTag]) + .Build()) + .WithVolume(new VolumeBuilder("1") + .WithChapter(new ChapterBuilder("1") + .WithTags([tags.SharedSeriesChaptersTag, tags.SharedChaptersTag, tags.Lib1SeriesChaptersTag, tags.Lib1ChaptersTag]) + .Build()) + .WithChapter(new ChapterBuilder("2") + .WithTags([tags.SharedSeriesChaptersTag, tags.SharedChaptersTag, tags.Lib1SeriesChaptersTag, tags.Lib1ChaptersTag]) + .WithAgeRating(AgeRating.Mature17Plus) + .Build()) + .Build()) + .Build()) + .Build(); + + Context.Library.Add(lib0); + Context.Library.Add(lib1); + await Context.SaveChangesAsync(); + } + + private async Task AssignLibrariesToUsers() + { + var lib0 = Context.Library.First(l => l.Name == "lib0"); + var lib1 = Context.Library.First(l => l.Name == "lib1"); + + _fullAccess.Libraries.Add(lib0); + _fullAccess.Libraries.Add(lib1); + _restrictedAccess.Libraries.Add(lib1); + _restrictedAgeAccess.Libraries.Add(lib1); + + await Context.SaveChangesAsync(); + } + + private static Predicate ContainsTagCheck(Tag tag) + { + return t => t.Id == tag.Id; + } + + private static void AssertTagPresent(IEnumerable tags, Tag expectedTag) + { + Assert.Contains(tags, ContainsTagCheck(expectedTag)); + } + + private static void AssertTagNotPresent(IEnumerable tags, Tag expectedTag) + { + Assert.DoesNotContain(tags, ContainsTagCheck(expectedTag)); + } + + private static BrowseTagDto GetTagDto(IEnumerable tags, Tag tag) + { + return tags.First(dto => dto.Id == tag.Id); + } + + [Fact] + public async Task GetBrowseableTag_FullAccess_ReturnsAllTagsWithCorrectCounts() + { + // Arrange + await ResetDb(); + var tags = CreateTestTags(); + await SeedDbWithTags(tags); + + // Act + var fullAccessTags = await UnitOfWork.TagRepository.GetBrowseableTag(_fullAccess.Id, new UserParams()); + + // Assert + Assert.Equal(tags.GetAllTags().Count, fullAccessTags.TotalCount); + + foreach (var tag in tags.GetAllTags()) + { + AssertTagPresent(fullAccessTags, tag); + } + + // Verify counts - 1 series lib0, 2 series lib1 = 3 total series + Assert.Equal(3, GetTagDto(fullAccessTags, tags.SharedSeriesChaptersTag).SeriesCount); + Assert.Equal(6, GetTagDto(fullAccessTags, tags.SharedSeriesChaptersTag).ChapterCount); + Assert.Equal(1, GetTagDto(fullAccessTags, tags.Lib0SeriesTag).SeriesCount); + } + + [Fact] + public async Task GetBrowseableTag_RestrictedAccess_ReturnsOnlyAccessibleTags() + { + // Arrange + await ResetDb(); + var tags = CreateTestTags(); + await SeedDbWithTags(tags); + + // Act + var restrictedAccessTags = await UnitOfWork.TagRepository.GetBrowseableTag(_restrictedAccess.Id, new UserParams()); + + // Assert - Should see: 3 shared + 4 library 1 specific = 7 tags + Assert.Equal(7, restrictedAccessTags.TotalCount); + + // Verify shared and Library 1 tags are present + AssertTagPresent(restrictedAccessTags, tags.SharedSeriesChaptersTag); + AssertTagPresent(restrictedAccessTags, tags.SharedSeriesTag); + AssertTagPresent(restrictedAccessTags, tags.SharedChaptersTag); + AssertTagPresent(restrictedAccessTags, tags.Lib1SeriesChaptersTag); + AssertTagPresent(restrictedAccessTags, tags.Lib1SeriesTag); + AssertTagPresent(restrictedAccessTags, tags.Lib1ChaptersTag); + AssertTagPresent(restrictedAccessTags, tags.Lib1ChapterAgeTag); + + // Verify Library 0 specific tags are not present + AssertTagNotPresent(restrictedAccessTags, tags.Lib0SeriesChaptersTag); + AssertTagNotPresent(restrictedAccessTags, tags.Lib0SeriesTag); + AssertTagNotPresent(restrictedAccessTags, tags.Lib0ChaptersTag); + + // Verify counts - 2 series lib1 + Assert.Equal(2, GetTagDto(restrictedAccessTags, tags.SharedSeriesChaptersTag).SeriesCount); + Assert.Equal(4, GetTagDto(restrictedAccessTags, tags.SharedSeriesChaptersTag).ChapterCount); + Assert.Equal(2, GetTagDto(restrictedAccessTags, tags.Lib1SeriesTag).SeriesCount); + Assert.Equal(4, GetTagDto(restrictedAccessTags, tags.Lib1ChaptersTag).ChapterCount); + } + + [Fact] + public async Task GetBrowseableTag_RestrictedAgeAccess_FiltersAgeRestrictedContent() + { + // Arrange + await ResetDb(); + var tags = CreateTestTags(); + await SeedDbWithTags(tags); + + // Act + var restrictedAgeAccessTags = await UnitOfWork.TagRepository.GetBrowseableTag(_restrictedAgeAccess.Id, new UserParams()); + + // Assert - Should see: 3 shared + 3 lib1 specific = 6 tags (age-restricted tag filtered out) + Assert.Equal(6, restrictedAgeAccessTags.TotalCount); + + // Verify accessible tags are present + AssertTagPresent(restrictedAgeAccessTags, tags.SharedSeriesChaptersTag); + AssertTagPresent(restrictedAgeAccessTags, tags.SharedSeriesTag); + AssertTagPresent(restrictedAgeAccessTags, tags.SharedChaptersTag); + AssertTagPresent(restrictedAgeAccessTags, tags.Lib1SeriesChaptersTag); + AssertTagPresent(restrictedAgeAccessTags, tags.Lib1SeriesTag); + AssertTagPresent(restrictedAgeAccessTags, tags.Lib1ChaptersTag); + + // Verify age-restricted tag is filtered out + AssertTagNotPresent(restrictedAgeAccessTags, tags.Lib1ChapterAgeTag); + + // Verify counts - 1 series lib1 (age-restricted series filtered out) + Assert.Equal(1, GetTagDto(restrictedAgeAccessTags, tags.SharedSeriesChaptersTag).SeriesCount); + Assert.Equal(2, GetTagDto(restrictedAgeAccessTags, tags.SharedSeriesChaptersTag).ChapterCount); + Assert.Equal(1, GetTagDto(restrictedAgeAccessTags, tags.Lib1SeriesTag).SeriesCount); + Assert.Equal(2, GetTagDto(restrictedAgeAccessTags, tags.Lib1ChaptersTag).ChapterCount); + } + + private class TestTagSet + { + public Tag SharedSeriesChaptersTag { get; set; } + public Tag SharedSeriesTag { get; set; } + public Tag SharedChaptersTag { get; set; } + public Tag Lib0SeriesChaptersTag { get; set; } + public Tag Lib0SeriesTag { get; set; } + public Tag Lib0ChaptersTag { get; set; } + public Tag Lib1SeriesChaptersTag { get; set; } + public Tag Lib1SeriesTag { get; set; } + public Tag Lib1ChaptersTag { get; set; } + public Tag Lib1ChapterAgeTag { get; set; } + + public List GetAllTags() + { + return + [ + SharedSeriesChaptersTag, SharedSeriesTag, SharedChaptersTag, + Lib0SeriesChaptersTag, Lib0SeriesTag, Lib0ChaptersTag, + Lib1SeriesChaptersTag, Lib1SeriesTag, Lib1ChaptersTag, Lib1ChapterAgeTag + ]; + } + } +} diff --git a/API.Tests/Services/ArchiveServiceTests.cs b/API.Tests/Services/ArchiveServiceTests.cs index 260676843..8cf93df37 100644 --- a/API.Tests/Services/ArchiveServiceTests.cs +++ b/API.Tests/Services/ArchiveServiceTests.cs @@ -7,7 +7,6 @@ using System.Linq; using API.Archive; using API.Entities.Enums; using API.Services; -using EasyCaching.Core; using Microsoft.Extensions.Logging; using NetVips; using NSubstitute; diff --git a/API.Tests/Services/BackupServiceTests.cs b/API.Tests/Services/BackupServiceTests.cs index c4ca95a11..aac5724f7 100644 --- a/API.Tests/Services/BackupServiceTests.cs +++ b/API.Tests/Services/BackupServiceTests.cs @@ -1,10 +1,8 @@ -using System.Collections.Generic; -using System.Data.Common; +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.Helpers.Builders; using API.Services; @@ -21,7 +19,7 @@ using Xunit; namespace API.Tests.Services; -public class BackupServiceTests +public class BackupServiceTests: AbstractFsTest { private readonly ILogger _logger = Substitute.For>(); private readonly IUnitOfWork _unitOfWork; @@ -31,13 +29,6 @@ public class BackupServiceTests 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 LogDirectory = "C:/kavita/config/logs/"; - private const string ConfigDirectory = "C:/kavita/config/"; - private const string BookmarkDirectory = "C:/kavita/config/bookmarks"; - private const string ThemesDirectory = "C:/kavita/config/theme"; public BackupServiceTests() { @@ -82,7 +73,7 @@ public class BackupServiceTests _context.ServerSetting.Update(setting); _context.Library.Add(new LibraryBuilder("Manga") - .WithFolderPath(new FolderPathBuilder("C:/data/").Build()) + .WithFolderPath(new FolderPathBuilder(Root + "data/").Build()) .Build()); return await _context.SaveChangesAsync() > 0; } @@ -94,22 +85,6 @@ public class BackupServiceTests 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(LogDirectory); - fileSystem.AddDirectory(ThemesDirectory); - fileSystem.AddDirectory(BookmarkDirectory); - fileSystem.AddDirectory("C:/data/"); - - return fileSystem; - } - #endregion diff --git a/API.Tests/Services/BookServiceTests.cs b/API.Tests/Services/BookServiceTests.cs index 23716e2f7..5848c74ba 100644 --- a/API.Tests/Services/BookServiceTests.cs +++ b/API.Tests/Services/BookServiceTests.cs @@ -1,7 +1,8 @@ using System.IO; using System.IO.Abstractions; +using API.Entities.Enums; using API.Services; -using EasyCaching.Core; +using API.Services.Tasks.Scanner.Parser; using Microsoft.Extensions.Logging; using NSubstitute; using Xunit; @@ -81,4 +82,64 @@ public class BookServiceTests Assert.Equal("Accel World", comicInfo.Series); } + [Fact] + public void ShouldHaveComicInfoForPdf() + { + var testDirectory = Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/BookService"); + var document = Path.Join(testDirectory, "test.pdf"); + var comicInfo = _bookService.GetComicInfo(document); + Assert.NotNull(comicInfo); + Assert.Equal("Variations Chromatiques de concert", comicInfo.Title); + Assert.Equal("Georges Bizet \\(1838-1875\\)", comicInfo.Writer); + } + + //[Fact] + public void ShouldUsePdfInfoDict() + { + var testDirectory = Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/ScannerService/Library/Books/PDFs"); + var document = Path.Join(testDirectory, "Rollo at Work SP01.pdf"); + var comicInfo = _bookService.GetComicInfo(document); + Assert.NotNull(comicInfo); + Assert.Equal("Rollo at Work", comicInfo.Title); + Assert.Equal("Jacob Abbott", comicInfo.Writer); + Assert.Equal(2008, comicInfo.Year); + } + + [Fact] + public void ShouldHandleIndirectPdfObjects() + { + var testDirectory = Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/BookService"); + var document = Path.Join(testDirectory, "indirect.pdf"); + var comicInfo = _bookService.GetComicInfo(document); + Assert.NotNull(comicInfo); + Assert.Equal(2018, comicInfo.Year); + Assert.Equal(8, comicInfo.Month); + } + + [Fact] + public void FailGracefullyWithEncryptedPdf() + { + var testDirectory = Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/BookService"); + var document = Path.Join(testDirectory, "encrypted.pdf"); + var comicInfo = _bookService.GetComicInfo(document); + Assert.Null(comicInfo); + } + + [Fact] + public void SeriesFallBackToMetadataTitle() + { + var ds = new DirectoryService(Substitute.For>(), new FileSystem()); + var pdfParser = new PdfParser(ds); + + var testDirectory = Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/BookService"); + var filePath = Path.Join(testDirectory, "Bizet-Variations_Chromatiques_de_concert_Theme_A4.pdf"); + + var comicInfo = _bookService.GetComicInfo(filePath); + Assert.NotNull(comicInfo); + + var parserInfo = pdfParser.Parse(filePath, testDirectory, ds.GetParentDirectoryName(testDirectory), LibraryType.Book, true, comicInfo); + Assert.NotNull(parserInfo); + Assert.Equal(parserInfo.Title, comicInfo.Title); + Assert.Equal(parserInfo.Series, comicInfo.Title); + } } diff --git a/API.Tests/Services/BookmarkServiceTests.cs b/API.Tests/Services/BookmarkServiceTests.cs index 80a483833..596fbbc4d 100644 --- a/API.Tests/Services/BookmarkServiceTests.cs +++ b/API.Tests/Services/BookmarkServiceTests.cs @@ -9,12 +9,9 @@ using API.Data.Repositories; using API.DTOs.Reader; using API.Entities; using API.Entities.Enums; -using API.Entities.Metadata; -using API.Extensions; using API.Helpers; using API.Helpers.Builders; using API.Services; -using API.SignalR; using AutoMapper; using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; @@ -25,17 +22,12 @@ using Xunit; namespace API.Tests.Services; -public class BookmarkServiceTests +public class BookmarkServiceTests: AbstractFsTest { 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 BookmarkDirectory = "C:/kavita/config/bookmarks/"; - public BookmarkServiceTests() { @@ -88,7 +80,7 @@ Substitute.For()); _context.ServerSetting.Update(setting); _context.Library.Add(new LibraryBuilder("Manga") - .WithFolderPath(new FolderPathBuilder("C:/data/").Build()) + .WithFolderPath(new FolderPathBuilder(Root + "data/").Build()) .Build()); return await _context.SaveChangesAsync() > 0; } @@ -102,20 +94,6 @@ Substitute.For()); 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(BookmarkDirectory); - fileSystem.AddDirectory("C:/data/"); - - return fileSystem; - } - #endregion #region BookmarkPage diff --git a/API.Tests/Services/CacheServiceTests.cs b/API.Tests/Services/CacheServiceTests.cs index ba06525a3..caf1ae393 100644 --- a/API.Tests/Services/CacheServiceTests.cs +++ b/API.Tests/Services/CacheServiceTests.cs @@ -1,12 +1,10 @@ -using System.Collections.Generic; -using System.Data.Common; +using System.Data.Common; using System.IO; 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.Helpers.Builders; using API.Services; @@ -52,17 +50,17 @@ internal class MockReadingItemServiceForCacheService : IReadingItemService throw new System.NotImplementedException(); } - public ParserInfo Parse(string path, string rootPath, string libraryRoot, LibraryType type) + public ParserInfo Parse(string path, string rootPath, string libraryRoot, LibraryType type, bool enableMetadata = true) { throw new System.NotImplementedException(); } - public ParserInfo ParseFile(string path, string rootPath, string libraryRoot, LibraryType type) + public ParserInfo ParseFile(string path, string rootPath, string libraryRoot, LibraryType type, bool enableMetadata = true) { throw new System.NotImplementedException(); } } -public class CacheServiceTests +public class CacheServiceTests: AbstractFsTest { private readonly ILogger _logger = Substitute.For>(); private readonly IUnitOfWork _unitOfWork; @@ -71,11 +69,6 @@ public class CacheServiceTests 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 CacheServiceTests() { var contextOptions = new DbContextOptionsBuilder() @@ -118,7 +111,7 @@ public class CacheServiceTests _context.ServerSetting.Update(setting); _context.Library.Add(new LibraryBuilder("Manga") - .WithFolderPath(new FolderPathBuilder("C:/data/").Build()) + .WithFolderPath(new FolderPathBuilder(Root + "data/").Build()) .Build()); return await _context.SaveChangesAsync() > 0; } @@ -130,19 +123,6 @@ public class CacheServiceTests 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 Ensure @@ -263,7 +243,7 @@ public class CacheServiceTests .WithFile(new MangaFileBuilder($"{DataDirectory}2.epub", MangaFormat.Epub).Build()) .Build(); cs.GetCachedFile(c); - Assert.Same($"{DataDirectory}1.epub", cs.GetCachedFile(c)); + Assert.Equal($"{DataDirectory}1.epub", cs.GetCachedFile(c)); } #endregion diff --git a/API.Tests/Services/CleanupServiceTests.cs b/API.Tests/Services/CleanupServiceTests.cs index 2ebee8d1d..b0610aed5 100644 --- a/API.Tests/Services/CleanupServiceTests.cs +++ b/API.Tests/Services/CleanupServiceTests.cs @@ -1,16 +1,13 @@ using System; using System.Collections.Generic; using System.IO; -using System.IO.Abstractions; using System.IO.Abstractions.TestingHelpers; using System.Linq; using System.Threading.Tasks; -using API.Data; using API.Data.Repositories; using API.DTOs.Filtering; using API.Entities; using API.Entities.Enums; -using API.Entities.Metadata; using API.Extensions; using API.Helpers; using API.Helpers.Builders; @@ -30,14 +27,13 @@ public class CleanupServiceTests : AbstractDbTest private readonly IEventHub _messageHub = Substitute.For(); private readonly IReaderService _readerService; - public CleanupServiceTests() : base() { - _context.Library.Add(new LibraryBuilder("Manga") - .WithFolderPath(new FolderPathBuilder("C:/data/").Build()) + Context.Library.Add(new LibraryBuilder("Manga") + .WithFolderPath(new FolderPathBuilder(Root + "data/").Build()) .Build()); - _readerService = new ReaderService(_unitOfWork, Substitute.For>(), Substitute.For(), + _readerService = new ReaderService(UnitOfWork, Substitute.For>(), Substitute.For(), Substitute.For(), new DirectoryService(Substitute.For>(), new MockFileSystem()), Substitute.For()); } @@ -47,11 +43,11 @@ public class CleanupServiceTests : AbstractDbTest protected override async Task ResetDb() { - _context.Series.RemoveRange(_context.Series.ToList()); - _context.Users.RemoveRange(_context.Users.ToList()); - _context.AppUserBookmark.RemoveRange(_context.AppUserBookmark.ToList()); + Context.Series.RemoveRange(Context.Series.ToList()); + Context.Users.RemoveRange(Context.Users.ToList()); + Context.AppUserBookmark.RemoveRange(Context.AppUserBookmark.ToList()); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); } #endregion @@ -72,18 +68,18 @@ public class CleanupServiceTests : AbstractDbTest var s = new SeriesBuilder("Test 1").Build(); s.CoverImage = $"{ImageService.GetSeriesFormat(1)}.jpg"; s.LibraryId = 1; - _context.Series.Add(s); + Context.Series.Add(s); s = new SeriesBuilder("Test 2").Build(); s.CoverImage = $"{ImageService.GetSeriesFormat(3)}.jpg"; s.LibraryId = 1; - _context.Series.Add(s); + Context.Series.Add(s); s = new SeriesBuilder("Test 3").Build(); s.CoverImage = $"{ImageService.GetSeriesFormat(1000)}.jpg"; s.LibraryId = 1; - _context.Series.Add(s); + Context.Series.Add(s); var ds = new DirectoryService(Substitute.For>(), filesystem); - var cleanupService = new CleanupService(_logger, _unitOfWork, _messageHub, + var cleanupService = new CleanupService(_logger, UnitOfWork, _messageHub, ds); await cleanupService.DeleteSeriesCoverImages(); @@ -106,16 +102,16 @@ public class CleanupServiceTests : AbstractDbTest var s = new SeriesBuilder("Test 1").Build(); s.CoverImage = $"{ImageService.GetSeriesFormat(1)}.jpg"; s.LibraryId = 1; - _context.Series.Add(s); + Context.Series.Add(s); s = new SeriesBuilder("Test 2").Build(); s.CoverImage = $"{ImageService.GetSeriesFormat(3)}.jpg"; s.LibraryId = 1; - _context.Series.Add(s); + Context.Series.Add(s); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var ds = new DirectoryService(Substitute.For>(), filesystem); - var cleanupService = new CleanupService(_logger, _unitOfWork, _messageHub, + var cleanupService = new CleanupService(_logger, UnitOfWork, _messageHub, ds); await cleanupService.DeleteSeriesCoverImages(); @@ -137,7 +133,7 @@ public class CleanupServiceTests : AbstractDbTest await ResetDb(); // Add 2 series with cover images - _context.Series.Add(new SeriesBuilder("Test 1") + Context.Series.Add(new SeriesBuilder("Test 1") .WithVolume(new VolumeBuilder("1") .WithChapter(new ChapterBuilder(API.Services.Tasks.Scanner.Parser.Parser.DefaultChapter).WithCoverImage("v01_c01.jpg").Build()) .WithCoverImage("v01_c01.jpg") @@ -146,7 +142,7 @@ public class CleanupServiceTests : AbstractDbTest .WithLibraryId(1) .Build()); - _context.Series.Add(new SeriesBuilder("Test 2") + Context.Series.Add(new SeriesBuilder("Test 2") .WithVolume(new VolumeBuilder("1") .WithChapter(new ChapterBuilder(API.Services.Tasks.Scanner.Parser.Parser.DefaultChapter).WithCoverImage("v01_c03.jpg").Build()) .WithCoverImage("v01_c03.jpg") @@ -156,9 +152,9 @@ public class CleanupServiceTests : AbstractDbTest .Build()); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var ds = new DirectoryService(Substitute.For>(), filesystem); - var cleanupService = new CleanupService(_logger, _unitOfWork, _messageHub, + var cleanupService = new CleanupService(_logger, UnitOfWork, _messageHub, ds); await cleanupService.DeleteChapterCoverImages(); @@ -227,7 +223,7 @@ public class CleanupServiceTests : AbstractDbTest // Delete all Series to reset state await ResetDb(); - _context.Users.Add(new AppUser() + Context.Users.Add(new AppUser() { UserName = "Joe", ReadingLists = new List() @@ -243,9 +239,9 @@ public class CleanupServiceTests : AbstractDbTest } }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var ds = new DirectoryService(Substitute.For>(), filesystem); - var cleanupService = new CleanupService(_logger, _unitOfWork, _messageHub, + var cleanupService = new CleanupService(_logger, UnitOfWork, _messageHub, ds); await cleanupService.DeleteReadingListCoverImages(); @@ -264,7 +260,7 @@ public class CleanupServiceTests : AbstractDbTest filesystem.AddFile($"{CacheDirectory}02.jpg", new MockFileData("")); var ds = new DirectoryService(Substitute.For>(), filesystem); - var cleanupService = new CleanupService(_logger, _unitOfWork, _messageHub, + var cleanupService = new CleanupService(_logger, UnitOfWork, _messageHub, ds); cleanupService.CleanupCacheAndTempDirectories(); Assert.Empty(ds.GetFiles(CacheDirectory, searchOption: SearchOption.AllDirectories)); @@ -278,7 +274,7 @@ public class CleanupServiceTests : AbstractDbTest filesystem.AddFile($"{CacheDirectory}subdir/02.jpg", new MockFileData("")); var ds = new DirectoryService(Substitute.For>(), filesystem); - var cleanupService = new CleanupService(_logger, _unitOfWork, _messageHub, + var cleanupService = new CleanupService(_logger, UnitOfWork, _messageHub, ds); cleanupService.CleanupCacheAndTempDirectories(); Assert.Empty(ds.GetFiles(CacheDirectory, searchOption: SearchOption.AllDirectories)); @@ -301,7 +297,7 @@ public class CleanupServiceTests : AbstractDbTest filesystem.AddFile($"{BackupDirectory}randomfile.zip", filesystemFile); var ds = new DirectoryService(Substitute.For>(), filesystem); - var cleanupService = new CleanupService(_logger, _unitOfWork, _messageHub, + var cleanupService = new CleanupService(_logger, UnitOfWork, _messageHub, ds); await cleanupService.CleanupBackups(); Assert.Single(ds.GetFiles(BackupDirectory, searchOption: SearchOption.AllDirectories)); @@ -323,7 +319,7 @@ public class CleanupServiceTests : AbstractDbTest }); var ds = new DirectoryService(Substitute.For>(), filesystem); - var cleanupService = new CleanupService(_logger, _unitOfWork, _messageHub, + var cleanupService = new CleanupService(_logger, UnitOfWork, _messageHub, ds); await cleanupService.CleanupBackups(); Assert.True(filesystem.File.Exists($"{BackupDirectory}randomfile.zip")); @@ -347,7 +343,7 @@ public class CleanupServiceTests : AbstractDbTest } var ds = new DirectoryService(Substitute.For>(), filesystem); - var cleanupService = new CleanupService(_logger, _unitOfWork, _messageHub, + var cleanupService = new CleanupService(_logger, UnitOfWork, _messageHub, ds); await cleanupService.CleanupLogs(); Assert.Single(ds.GetFiles(LogDirectory, searchOption: SearchOption.AllDirectories)); @@ -376,7 +372,7 @@ public class CleanupServiceTests : AbstractDbTest var ds = new DirectoryService(Substitute.For>(), filesystem); - var cleanupService = new CleanupService(_logger, _unitOfWork, _messageHub, + var cleanupService = new CleanupService(_logger, UnitOfWork, _messageHub, ds); await cleanupService.CleanupLogs(); Assert.True(filesystem.File.Exists($"{LogDirectory}kavita20200911.log")); @@ -400,36 +396,36 @@ public class CleanupServiceTests : AbstractDbTest .Build(); series.Library = new LibraryBuilder("Test LIb").Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress); + var user = await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress); await _readerService.MarkChaptersUntilAsRead(user, 1, 5); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); // Validate correct chapters have read status - Assert.Equal(1, (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1)).PagesRead); + Assert.Equal(1, (await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1)).PagesRead); - var cleanupService = new CleanupService(Substitute.For>(), _unitOfWork, + var cleanupService = new CleanupService(Substitute.For>(), UnitOfWork, Substitute.For(), new DirectoryService(Substitute.For>(), new MockFileSystem())); // Delete the Chapter - _context.Chapter.Remove(c); - await _unitOfWork.CommitAsync(); - Assert.Empty(await _unitOfWork.AppUserProgressRepository.GetUserProgressForSeriesAsync(1, 1)); + Context.Chapter.Remove(c); + await UnitOfWork.CommitAsync(); + Assert.Empty(await UnitOfWork.AppUserProgressRepository.GetUserProgressForSeriesAsync(1, 1)); // NOTE: This may not be needed, the underlying DB structure seems fixed as of v0.7 await cleanupService.CleanupDbEntries(); - Assert.Empty(await _unitOfWork.AppUserProgressRepository.GetUserProgressForSeriesAsync(1, 1)); + Assert.Empty(await UnitOfWork.AppUserProgressRepository.GetUserProgressForSeriesAsync(1, 1)); } [Fact] @@ -440,7 +436,7 @@ public class CleanupServiceTests : AbstractDbTest .WithMetadata(new SeriesMetadataBuilder().Build()) .Build(); s.Library = new LibraryBuilder("Test LIb").Build(); - _context.Series.Add(s); + Context.Series.Add(s); var c = new AppUserCollection() { @@ -450,24 +446,24 @@ public class CleanupServiceTests : AbstractDbTest Items = new List() {s} }; - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007", Collections = new List() {c} }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var cleanupService = new CleanupService(Substitute.For>(), _unitOfWork, + var cleanupService = new CleanupService(Substitute.For>(), UnitOfWork, Substitute.For(), new DirectoryService(Substitute.For>(), new MockFileSystem())); // Delete the Chapter - _context.Series.Remove(s); - await _unitOfWork.CommitAsync(); + Context.Series.Remove(s); + await UnitOfWork.CommitAsync(); await cleanupService.CleanupDbEntries(); - Assert.Empty(await _unitOfWork.CollectionTagRepository.GetAllCollectionsAsync()); + Assert.Empty(await UnitOfWork.CollectionTagRepository.GetAllCollectionsAsync()); } #endregion @@ -484,15 +480,15 @@ public class CleanupServiceTests : AbstractDbTest .Build(); s.Library = new LibraryBuilder("Test LIb").Build(); - _context.Series.Add(s); + Context.Series.Add(s); var user = new AppUser() { UserName = "CleanupWantToRead_ShouldRemoveFullyReadSeries", }; - _context.AppUser.Add(user); + Context.AppUser.Add(user); - await _unitOfWork.CommitAsync(); + await UnitOfWork.CommitAsync(); // Add want to read user.WantToRead = new List() @@ -502,12 +498,12 @@ public class CleanupServiceTests : AbstractDbTest SeriesId = s.Id } }; - await _unitOfWork.CommitAsync(); + await UnitOfWork.CommitAsync(); await _readerService.MarkSeriesAsRead(user, s.Id); - await _unitOfWork.CommitAsync(); + await UnitOfWork.CommitAsync(); - var cleanupService = new CleanupService(Substitute.For>(), _unitOfWork, + var cleanupService = new CleanupService(Substitute.For>(), UnitOfWork, Substitute.For(), new DirectoryService(Substitute.For>(), new MockFileSystem())); @@ -515,12 +511,77 @@ public class CleanupServiceTests : AbstractDbTest await cleanupService.CleanupWantToRead(); var wantToRead = - await _unitOfWork.SeriesRepository.GetWantToReadForUserAsync(user.Id, new UserParams(), new FilterDto()); + await UnitOfWork.SeriesRepository.GetWantToReadForUserAsync(user.Id, new UserParams(), new FilterDto()); Assert.Equal(0, wantToRead.TotalCount); } #endregion + #region ConsolidateProgress + + [Fact] + public async Task ConsolidateProgress_ShouldRemoveDuplicates() + { + await ResetDb(); + + var s = new SeriesBuilder("Test ConsolidateProgress_ShouldRemoveDuplicates") + .WithVolume(new VolumeBuilder("1") + .WithChapter(new ChapterBuilder("1") + .WithPages(3) + .Build()) + .Build()) + .Build(); + + s.Library = new LibraryBuilder("Test Lib").Build(); + Context.Series.Add(s); + + var user = new AppUser() + { + UserName = "ConsolidateProgress_ShouldRemoveDuplicates", + }; + Context.AppUser.Add(user); + + await UnitOfWork.CommitAsync(); + + // Add 2 progress events + user.Progresses ??= []; + user.Progresses.Add(new AppUserProgress() + { + ChapterId = 1, + VolumeId = 1, + SeriesId = 1, + LibraryId = s.LibraryId, + PagesRead = 1, + }); + await UnitOfWork.CommitAsync(); + + // Add a duplicate with higher page number + user.Progresses.Add(new AppUserProgress() + { + ChapterId = 1, + VolumeId = 1, + SeriesId = 1, + LibraryId = s.LibraryId, + PagesRead = 3, + }); + await UnitOfWork.CommitAsync(); + + Assert.Equal(2, (await UnitOfWork.AppUserProgressRepository.GetAllProgress()).Count()); + + var cleanupService = new CleanupService(Substitute.For>(), UnitOfWork, + Substitute.For(), + new DirectoryService(Substitute.For>(), new MockFileSystem())); + + + await cleanupService.ConsolidateProgress(); + + var progress = await UnitOfWork.AppUserProgressRepository.GetAllProgress(); + + Assert.Single(progress); + Assert.True(progress.First().PagesRead == 3); + } + #endregion + #region EnsureChapterProgressIsCapped @@ -540,54 +601,54 @@ public class CleanupServiceTests : AbstractDbTest { new VolumeBuilder(API.Services.Tasks.Scanner.Parser.Parser.LooseLeafVolume).WithChapter(c).Build() }; - _context.Series.Add(s); + Context.Series.Add(s); var user = new AppUser() { UserName = "EnsureChapterProgressIsCapped", Progresses = new List() }; - _context.AppUser.Add(user); + Context.AppUser.Add(user); - await _unitOfWork.CommitAsync(); + await UnitOfWork.CommitAsync(); await _readerService.MarkChaptersAsRead(user, s.Id, new List() {c}); - await _unitOfWork.CommitAsync(); + await UnitOfWork.CommitAsync(); - var chapter = await _unitOfWork.ChapterRepository.GetChapterDtoAsync(c.Id); - await _unitOfWork.ChapterRepository.AddChapterModifiers(user.Id, chapter); + var chapter = await UnitOfWork.ChapterRepository.GetChapterDtoAsync(c.Id); + await UnitOfWork.ChapterRepository.AddChapterModifiers(user.Id, chapter); Assert.NotNull(chapter); Assert.Equal(2, chapter.PagesRead); // Update chapter to have 1 page c.Pages = 1; - _unitOfWork.ChapterRepository.Update(c); - await _unitOfWork.CommitAsync(); + UnitOfWork.ChapterRepository.Update(c); + await UnitOfWork.CommitAsync(); - chapter = await _unitOfWork.ChapterRepository.GetChapterDtoAsync(c.Id); - await _unitOfWork.ChapterRepository.AddChapterModifiers(user.Id, chapter); + chapter = await UnitOfWork.ChapterRepository.GetChapterDtoAsync(c.Id); + await UnitOfWork.ChapterRepository.AddChapterModifiers(user.Id, chapter); Assert.NotNull(chapter); Assert.Equal(2, chapter.PagesRead); Assert.Equal(1, chapter.Pages); - var cleanupService = new CleanupService(Substitute.For>(), _unitOfWork, + var cleanupService = new CleanupService(Substitute.For>(), UnitOfWork, Substitute.For(), new DirectoryService(Substitute.For>(), new MockFileSystem())); await cleanupService.EnsureChapterProgressIsCapped(); - chapter = await _unitOfWork.ChapterRepository.GetChapterDtoAsync(c.Id); - await _unitOfWork.ChapterRepository.AddChapterModifiers(user.Id, chapter); + chapter = await UnitOfWork.ChapterRepository.GetChapterDtoAsync(c.Id); + await UnitOfWork.ChapterRepository.AddChapterModifiers(user.Id, chapter); Assert.NotNull(chapter); Assert.Equal(1, chapter.PagesRead); - _context.AppUser.Remove(user); - await _unitOfWork.CommitAsync(); + Context.AppUser.Remove(user); + await UnitOfWork.CommitAsync(); } #endregion - // #region CleanupBookmarks + #region CleanupBookmarks // // [Fact] // public async Task CleanupBookmarks_LeaveAllFiles() @@ -724,5 +785,5 @@ public class CleanupServiceTests : AbstractDbTest // Assert.Equal(1, ds.FileSystem.Directory.GetDirectories($"{BookmarkDirectory}1/1/").Length); // } // - // #endregion + #endregion } diff --git a/API.Tests/Services/CollectionTagServiceTests.cs b/API.Tests/Services/CollectionTagServiceTests.cs index 85e8391fe..3414dd86b 100644 --- a/API.Tests/Services/CollectionTagServiceTests.cs +++ b/API.Tests/Services/CollectionTagServiceTests.cs @@ -1,6 +1,8 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using API.Constants; using API.Data; using API.Data.Repositories; using API.DTOs.Collection; @@ -10,6 +12,7 @@ using API.Helpers.Builders; using API.Services; using API.Services.Plus; using API.SignalR; +using Kavita.Common; using NSubstitute; using Xunit; @@ -20,24 +23,24 @@ public class CollectionTagServiceTests : AbstractDbTest private readonly ICollectionTagService _service; public CollectionTagServiceTests() { - _service = new CollectionTagService(_unitOfWork, Substitute.For()); + _service = new CollectionTagService(UnitOfWork, Substitute.For()); } protected override async Task ResetDb() { - _context.AppUserCollection.RemoveRange(_context.AppUserCollection.ToList()); - _context.Library.RemoveRange(_context.Library.ToList()); + Context.AppUserCollection.RemoveRange(Context.AppUserCollection.ToList()); + Context.Library.RemoveRange(Context.Library.ToList()); - await _unitOfWork.CommitAsync(); + await UnitOfWork.CommitAsync(); } private async Task SeedSeries() { - if (_context.AppUserCollection.Any()) return; + if (Context.AppUserCollection.Any()) return; var s1 = new SeriesBuilder("Series 1").WithMetadata(new SeriesMetadataBuilder().WithAgeRating(AgeRating.Mature).Build()).Build(); var s2 = new SeriesBuilder("Series 2").WithMetadata(new SeriesMetadataBuilder().WithAgeRating(AgeRating.G).Build()).Build(); - _context.Library.Add(new LibraryBuilder("Library 2", LibraryType.Manga) + Context.Library.Add(new LibraryBuilder("Library 2", LibraryType.Manga) .WithSeries(s1) .WithSeries(s2) .Build()); @@ -48,11 +51,69 @@ public class CollectionTagServiceTests : AbstractDbTest new AppUserCollectionBuilder("Tag 1").WithItems(new []{s1}).Build(), new AppUserCollectionBuilder("Tag 2").WithItems(new []{s1, s2}).WithIsPromoted(true).Build() }; - _unitOfWork.UserRepository.Add(user); + UnitOfWork.UserRepository.Add(user); - await _unitOfWork.CommitAsync(); + await UnitOfWork.CommitAsync(); } + #region DeleteTag + + [Fact] + public async Task DeleteTag_ShouldDeleteTag_WhenTagExists() + { + // Arrange + await SeedSeries(); + + var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections); + Assert.NotNull(user); + + // Act + var result = await _service.DeleteTag(1, user); + + // Assert + Assert.True(result); + var deletedTag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1); + Assert.Null(deletedTag); + Assert.Single(user.Collections); // Only one collection should remain + } + + [Fact] + public async Task DeleteTag_ShouldReturnTrue_WhenTagDoesNotExist() + { + // Arrange + await SeedSeries(); + var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections); + Assert.NotNull(user); + + // Act - Try to delete a non-existent tag + var result = await _service.DeleteTag(999, user); + + // Assert + Assert.True(result); // Should return true because the tag is already "deleted" + Assert.Equal(2, user.Collections.Count); // Both collections should remain + } + + [Fact] + public async Task DeleteTag_ShouldNotAffectOtherTags() + { + // Arrange + await SeedSeries(); + var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections); + Assert.NotNull(user); + + // Act + var result = await _service.DeleteTag(1, user); + + // Assert + Assert.True(result); + var remainingTag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(2); + Assert.NotNull(remainingTag); + Assert.Equal("Tag 2", remainingTag.Title); + Assert.True(remainingTag.Promoted); + } + + #endregion + #region UpdateTag [Fact] @@ -60,12 +121,12 @@ public class CollectionTagServiceTests : AbstractDbTest { await SeedSeries(); - var user = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections); + var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections); Assert.NotNull(user); user.Collections.Add(new AppUserCollectionBuilder("UpdateTag_ShouldUpdateFields").WithIsPromoted(true).Build()); - _unitOfWork.UserRepository.Update(user); - await _unitOfWork.CommitAsync(); + UnitOfWork.UserRepository.Update(user); + await UnitOfWork.CommitAsync(); await _service.UpdateTag(new AppUserCollectionDto() { @@ -76,7 +137,7 @@ public class CollectionTagServiceTests : AbstractDbTest AgeRating = AgeRating.Unknown }, 1); - var tag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(3); + var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(3); Assert.NotNull(tag); Assert.True(tag.Promoted); Assert.False(string.IsNullOrEmpty(tag.Summary)); @@ -90,12 +151,12 @@ public class CollectionTagServiceTests : AbstractDbTest { await SeedSeries(); - var user = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections); + var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections); Assert.NotNull(user); user.Collections.Add(new AppUserCollectionBuilder("UpdateTag_ShouldNotChangeTitle_WhenNotKavitaSource").WithSource(ScrobbleProvider.Mal).Build()); - _unitOfWork.UserRepository.Update(user); - await _unitOfWork.CommitAsync(); + UnitOfWork.UserRepository.Update(user); + await UnitOfWork.CommitAsync(); await _service.UpdateTag(new AppUserCollectionDto() { @@ -106,11 +167,194 @@ public class CollectionTagServiceTests : AbstractDbTest AgeRating = AgeRating.Unknown }, 1); - var tag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(3); + var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(3); Assert.NotNull(tag); Assert.Equal("UpdateTag_ShouldNotChangeTitle_WhenNotKavitaSource", tag.Title); Assert.False(string.IsNullOrEmpty(tag.Summary)); } + + [Fact] + public async Task UpdateTag_ShouldThrowException_WhenTagDoesNotExist() + { + // Arrange + await SeedSeries(); + + // Act & Assert + var exception = await Assert.ThrowsAsync(() => _service.UpdateTag(new AppUserCollectionDto() + { + Title = "Non-existent Tag", + Id = 999, // Non-existent ID + Promoted = false + }, 1)); + + Assert.Equal("collection-doesnt-exist", exception.Message); + } + + [Fact] + public async Task UpdateTag_ShouldThrowException_WhenUserDoesNotOwnTag() + { + // Arrange + await SeedSeries(); + + // Create a second user + var user2 = new AppUserBuilder("user2", "user2", Seed.DefaultThemes.First()).Build(); + UnitOfWork.UserRepository.Add(user2); + await UnitOfWork.CommitAsync(); + + // Act & Assert + var exception = await Assert.ThrowsAsync(() => _service.UpdateTag(new AppUserCollectionDto() + { + Title = "Tag 1", + Id = 1, // This belongs to user1 + Promoted = false + }, 2)); // User with ID 2 + + Assert.Equal("access-denied", exception.Message); + } + + [Fact] + public async Task UpdateTag_ShouldThrowException_WhenTitleIsEmpty() + { + // Arrange + await SeedSeries(); + + // Act & Assert + var exception = await Assert.ThrowsAsync(() => _service.UpdateTag(new AppUserCollectionDto() + { + Title = " ", // Empty after trimming + Id = 1, + Promoted = false + }, 1)); + + Assert.Equal("collection-tag-title-required", exception.Message); + } + + [Fact] + public async Task UpdateTag_ShouldThrowException_WhenTitleAlreadyExists() + { + // Arrange + await SeedSeries(); + + // Act & Assert + var exception = await Assert.ThrowsAsync(() => _service.UpdateTag(new AppUserCollectionDto() + { + Title = "Tag 2", // Already exists + Id = 1, // Trying to rename Tag 1 to Tag 2 + Promoted = false + }, 1)); + + Assert.Equal("collection-tag-duplicate", exception.Message); + } + + [Fact] + public async Task UpdateTag_ShouldUpdateCoverImageSettings() + { + // Arrange + await SeedSeries(); + + // Act + await _service.UpdateTag(new AppUserCollectionDto() + { + Title = "Tag 1", + Id = 1, + CoverImageLocked = true + }, 1); + + // Assert + var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1); + Assert.NotNull(tag); + Assert.True(tag.CoverImageLocked); + + // Now test unlocking the cover image + await _service.UpdateTag(new AppUserCollectionDto() + { + Title = "Tag 1", + Id = 1, + CoverImageLocked = false + }, 1); + + tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1); + Assert.NotNull(tag); + Assert.False(tag.CoverImageLocked); + Assert.Equal(string.Empty, tag.CoverImage); + } + + [Fact] + public async Task UpdateTag_ShouldAllowPromoteForAdminRole() + { + // Arrange + await SeedSeries(); + + // Setup a user with admin role + var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections); + Assert.NotNull(user); + await AddUserWithRole(user.Id, PolicyConstants.AdminRole); + + + // Act - Try to promote a tag that wasn't previously promoted + await _service.UpdateTag(new AppUserCollectionDto() + { + Title = "Tag 1", + Id = 1, + Promoted = true + }, 1); + + // Assert + var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1); + Assert.NotNull(tag); + Assert.True(tag.Promoted); + } + + [Fact] + public async Task UpdateTag_ShouldAllowPromoteForPromoteRole() + { + // Arrange + await SeedSeries(); + + // Setup a user with promote role + var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections); + Assert.NotNull(user); + + // Mock to return promote role for the user + await AddUserWithRole(user.Id, PolicyConstants.PromoteRole); + + // Act - Try to promote a tag that wasn't previously promoted + await _service.UpdateTag(new AppUserCollectionDto() + { + Title = "Tag 1", + Id = 1, + Promoted = true + }, 1); + + // Assert + var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1); + Assert.NotNull(tag); + Assert.True(tag.Promoted); + } + + [Fact] + public async Task UpdateTag_ShouldNotChangePromotion_WhenUserHasNoPermission() + { + // Arrange + await SeedSeries(); + + // Setup a user with no special roles + var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections); + Assert.NotNull(user); + + // Act - Try to promote a tag without proper role + await _service.UpdateTag(new AppUserCollectionDto() + { + Title = "Tag 1", + Id = 1, + Promoted = true + }, 1); + + // Assert + var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1); + Assert.NotNull(tag); + Assert.False(tag.Promoted); // Should remain unpromoted + } #endregion @@ -121,17 +365,17 @@ public class CollectionTagServiceTests : AbstractDbTest { await SeedSeries(); - var user = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections); + var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections); Assert.NotNull(user); // Tag 2 has 2 series - var tag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(2); + var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(2); Assert.NotNull(tag); await _service.RemoveTagFromSeries(tag, new[] {1}); - var userCollections = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections); + var userCollections = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections); Assert.Equal(2, userCollections!.Collections.Count); - Assert.Equal(1, tag.Items.Count); + Assert.Single(tag.Items); Assert.Equal(2, tag.Items.First().Id); } @@ -143,11 +387,11 @@ public class CollectionTagServiceTests : AbstractDbTest { await SeedSeries(); - var user = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections); + var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections); Assert.NotNull(user); // Tag 2 has 2 series - var tag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(2); + var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(2); Assert.NotNull(tag); await _service.RemoveTagFromSeries(tag, new[] {1}); @@ -163,18 +407,123 @@ public class CollectionTagServiceTests : AbstractDbTest { await SeedSeries(); - var user = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections); + var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections); Assert.NotNull(user); // Tag 1 has 1 series - var tag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(1); + var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1); Assert.NotNull(tag); await _service.RemoveTagFromSeries(tag, new[] {1}); - var tag2 = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(1); + var tag2 = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1); Assert.Null(tag2); } + [Fact] + public async Task RemoveTagFromSeries_ShouldReturnFalse_WhenTagIsNull() + { + // Act + var result = await _service.RemoveTagFromSeries(null, [1]); + + // Assert + Assert.False(result); + } + + [Fact] + public async Task RemoveTagFromSeries_ShouldHandleEmptySeriesIdsList() + { + // Arrange + await SeedSeries(); + + var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1); + Assert.NotNull(tag); + var initialItemCount = tag.Items.Count; + + // Act + var result = await _service.RemoveTagFromSeries(tag, Array.Empty()); + + // Assert + Assert.True(result); + tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1); + Assert.NotNull(tag); + Assert.Equal(initialItemCount, tag.Items.Count); // No items should be removed + } + + [Fact] + public async Task RemoveTagFromSeries_ShouldHandleNonExistentSeriesIds() + { + // Arrange + await SeedSeries(); + + var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1); + Assert.NotNull(tag); + var initialItemCount = tag.Items.Count; + + // Act - Try to remove a series that doesn't exist in the tag + var result = await _service.RemoveTagFromSeries(tag, [999]); + + // Assert + Assert.True(result); + tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1); + Assert.NotNull(tag); + Assert.Equal(initialItemCount, tag.Items.Count); // No items should be removed + } + + [Fact] + public async Task RemoveTagFromSeries_ShouldHandleNullItemsList() + { + // Arrange + await SeedSeries(); + + var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1); + Assert.NotNull(tag); + + // Force null items list + tag.Items = null; + UnitOfWork.CollectionTagRepository.Update(tag); + await UnitOfWork.CommitAsync(); + + // Act + var result = await _service.RemoveTagFromSeries(tag, [1]); + + // Assert + Assert.True(result); + // The tag should not be removed since the items list was null, not empty + var tagAfter = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1); + Assert.Null(tagAfter); + } + + [Fact] + public async Task RemoveTagFromSeries_ShouldUpdateAgeRating_WhenMultipleSeriesRemain() + { + // Arrange + await SeedSeries(); + + // Add a third series with a different age rating + var s3 = new SeriesBuilder("Series 3").WithMetadata(new SeriesMetadataBuilder().WithAgeRating(AgeRating.PG).Build()).Build(); + Context.Library.First().Series.Add(s3); + await UnitOfWork.CommitAsync(); + + // Add series 3 to tag 2 + var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(2); + Assert.NotNull(tag); + tag.Items.Add(s3); + UnitOfWork.CollectionTagRepository.Update(tag); + await UnitOfWork.CommitAsync(); + + // Act - Remove the series with Mature rating + await _service.RemoveTagFromSeries(tag, new[] {1}); + + // Assert + tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(2); + Assert.NotNull(tag); + Assert.Equal(2, tag.Items.Count); + + // The age rating should be updated to the highest remaining rating (PG) + Assert.Equal(AgeRating.PG, tag.AgeRating); + } + + #endregion } diff --git a/API.Tests/Services/CoverDbServiceTests.cs b/API.Tests/Services/CoverDbServiceTests.cs new file mode 100644 index 000000000..93217c3b5 --- /dev/null +++ b/API.Tests/Services/CoverDbServiceTests.cs @@ -0,0 +1,117 @@ +using System.IO; +using System.IO.Abstractions; +using System.Reflection; +using System.Threading.Tasks; +using API.Constants; +using API.Entities.Enums; +using API.Extensions; +using API.Services; +using API.Services.Tasks.Metadata; +using API.SignalR; +using EasyCaching.Core; +using Kavita.Common; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; +using NSubstitute; +using Xunit; + +namespace API.Tests.Services; + +public class CoverDbServiceTests : AbstractDbTest +{ + private readonly DirectoryService _directoryService; + private readonly IEasyCachingProviderFactory _cacheFactory = Substitute.For(); + private readonly ICoverDbService _coverDbService; + + private static readonly string FaviconPath = Path.Join(Directory.GetCurrentDirectory(), + "../../../Services/Test Data/CoverDbService/Favicons"); + /// + /// Path to download files temp to. Should be empty after each test. + /// + private static readonly string TempPath = Path.Join(Directory.GetCurrentDirectory(), + "../../../Services/Test Data/CoverDbService/Temp"); + + public CoverDbServiceTests() + { + _directoryService = new DirectoryService(Substitute.For>(), CreateFileSystem()); + var imageService = new ImageService(Substitute.For>(), _directoryService); + + _coverDbService = new CoverDbService(Substitute.For>(), _directoryService, _cacheFactory, + Substitute.For(), imageService, UnitOfWork, Substitute.For()); + } + + protected override Task ResetDb() + { + throw new System.NotImplementedException(); + } + + + #region Download Favicon + + /// + /// I cannot figure out how to test this code due to the reliance on the _directoryService.FaviconDirectory and not being + /// able to redirect it to the real filesystem. + /// + public async Task DownloadFaviconAsync_ShouldDownloadAndMatchExpectedFavicon() + { + // Arrange + var testUrl = "https://anilist.co/anime/6205/Kmpfer/"; + var encodeFormat = EncodeFormat.WEBP; + var expectedFaviconPath = Path.Combine(FaviconPath, "anilist.co.webp"); + + // Ensure TempPath exists + _directoryService.ExistOrCreate(TempPath); + + var baseUrl = "https://anilist.co"; + + // Ensure there is no cache result for this URL + var provider = Substitute.For(); + provider.GetAsync(baseUrl).Returns(new CacheValue(null, false)); + _cacheFactory.GetCachingProvider(EasyCacheProfiles.Favicon).Returns(provider); + + + // // Replace favicon directory with TempPath + // var directoryService = (DirectoryService)_directoryService; + // directoryService.FaviconDirectory = TempPath; + + // Hack: Swap FaviconDirectory with TempPath for ability to download real files + typeof(DirectoryService) + .GetField("FaviconDirectory", BindingFlags.NonPublic | BindingFlags.Instance) + ?.SetValue(_directoryService, TempPath); + + + // Act + var resultFilename = await _coverDbService.DownloadFaviconAsync(testUrl, encodeFormat); + var actualFaviconPath = Path.Combine(TempPath, resultFilename); + + // Assert file exists + Assert.True(File.Exists(actualFaviconPath), "Downloaded favicon does not exist in temp path"); + + // Load and compare similarity + + var similarity = expectedFaviconPath.CalculateSimilarity(actualFaviconPath); // Assuming you have this extension + Assert.True(similarity > 0.9f, $"Image similarity too low: {similarity}"); + } + + [Fact] + public async Task DownloadFaviconAsync_ShouldThrowKavitaException_WhenPreviouslyFailedUrlExistsInCache() + { + // Arrange + var testUrl = "https://example.com"; + var encodeFormat = EncodeFormat.WEBP; + + var provider = Substitute.For(); + provider.GetAsync(Arg.Any()) + .Returns(new CacheValue(string.Empty, true)); // Simulate previous failure + + _cacheFactory.GetCachingProvider(EasyCacheProfiles.Favicon).Returns(provider); + + // Act & Assert + await Assert.ThrowsAsync(() => + _coverDbService.DownloadFaviconAsync(testUrl, encodeFormat)); + } + + #endregion + + +} diff --git a/API.Tests/Services/DeviceServiceTests.cs b/API.Tests/Services/DeviceServiceTests.cs index 1d021c76d..cbcf70f82 100644 --- a/API.Tests/Services/DeviceServiceTests.cs +++ b/API.Tests/Services/DeviceServiceTests.cs @@ -18,13 +18,13 @@ public class DeviceServiceDbTests : AbstractDbTest public DeviceServiceDbTests() : base() { - _deviceService = new DeviceService(_unitOfWork, _logger, Substitute.For()); + _deviceService = new DeviceService(UnitOfWork, _logger, Substitute.For()); } protected override async Task ResetDb() { - _context.Users.RemoveRange(_context.Users.ToList()); - await _unitOfWork.CommitAsync(); + Context.Users.RemoveRange(Context.Users.ToList()); + await UnitOfWork.CommitAsync(); } @@ -39,8 +39,8 @@ public class DeviceServiceDbTests : AbstractDbTest Devices = new List() }; - _context.Users.Add(user); - await _unitOfWork.CommitAsync(); + Context.Users.Add(user); + await UnitOfWork.CommitAsync(); var device = await _deviceService.Create(new CreateDeviceDto() { @@ -62,8 +62,8 @@ public class DeviceServiceDbTests : AbstractDbTest Devices = new List() }; - _context.Users.Add(user); - await _unitOfWork.CommitAsync(); + Context.Users.Add(user); + await UnitOfWork.CommitAsync(); var device = await _deviceService.Create(new CreateDeviceDto() { diff --git a/API.Tests/Services/DirectoryServiceTests.cs b/API.Tests/Services/DirectoryServiceTests.cs index 737779f0f..c5216bebf 100644 --- a/API.Tests/Services/DirectoryServiceTests.cs +++ b/API.Tests/Services/DirectoryServiceTests.cs @@ -1,8 +1,10 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.IO; using System.IO.Abstractions.TestingHelpers; using System.Linq; +using System.Runtime.InteropServices; using System.Text; using System.Threading.Tasks; using API.Services; @@ -10,12 +12,19 @@ using Kavita.Common.Helpers; using Microsoft.Extensions.Logging; using NSubstitute; using Xunit; +using Xunit.Abstractions; namespace API.Tests.Services; -public class DirectoryServiceTests +public class DirectoryServiceTests: AbstractFsTest { private readonly ILogger _logger = Substitute.For>(); + private readonly ITestOutputHelper _testOutputHelper; + + public DirectoryServiceTests(ITestOutputHelper testOutputHelper) + { + _testOutputHelper = testOutputHelper; + } #region TraverseTreeParallelForEach @@ -373,9 +382,16 @@ public class DirectoryServiceTests #endregion #region IsDriveMounted + // The root directory (/) is always mounted on non windows [Fact] public void IsDriveMounted_DriveIsNotMounted() { + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + _testOutputHelper.WriteLine("Skipping test on non Windows platform"); + return; + } + const string testDirectory = "c:/manga/"; var fileSystem = new MockFileSystem(); fileSystem.AddFile($"{testDirectory}data-0.txt", new MockFileData("abc")); @@ -387,6 +403,12 @@ public class DirectoryServiceTests [Fact] public void IsDriveMounted_DriveIsMounted() { + if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + _testOutputHelper.WriteLine("Skipping test on non Windows platform"); + return; + } + const string testDirectory = "c:/manga/"; var fileSystem = new MockFileSystem(); fileSystem.AddFile($"{testDirectory}data-0.txt", new MockFileData("abc")); @@ -900,12 +922,14 @@ public class DirectoryServiceTests #region GetHumanReadableBytes [Theory] - [InlineData(1200, "1.17 KB")] - [InlineData(1, "1 B")] - [InlineData(10000000, "9.54 MB")] - [InlineData(10000000000, "9.31 GB")] - public void GetHumanReadableBytesTest(long bytes, string expected) + [InlineData(1200, 1.17, " KB")] + [InlineData(1, 1, " B")] + [InlineData(10000000, 9.54, " MB")] + [InlineData(10000000000, 9.31, " GB")] + public void GetHumanReadableBytesTest(long bytes, float number, string suffix) { + // GetHumanReadableBytes is user facing, should be in CultureInfo.CurrentCulture + var expected = number.ToString(CultureInfo.CurrentCulture) + suffix; Assert.Equal(expected, DirectoryService.GetHumanReadableBytes(bytes)); } #endregion @@ -1041,11 +1065,14 @@ public class DirectoryServiceTests #region GetParentDirectory [Theory] - [InlineData(@"C:/file.txt", "C:/")] - [InlineData(@"C:/folder/file.txt", "C:/folder")] - [InlineData(@"C:/folder/subfolder/file.txt", "C:/folder/subfolder")] + [InlineData(@"file.txt", "")] + [InlineData(@"folder/file.txt", "folder")] + [InlineData(@"folder/subfolder/file.txt", "folder/subfolder")] public void GetParentDirectoryName_ShouldFindParentOfFiles(string path, string expected) { + path = Root + path; + expected = Root + expected; + var fileSystem = new MockFileSystem(new Dictionary { { path, new MockFileData(string.Empty)} @@ -1055,11 +1082,14 @@ public class DirectoryServiceTests Assert.Equal(expected, ds.GetParentDirectoryName(path)); } [Theory] - [InlineData(@"C:/folder", "C:/")] - [InlineData(@"C:/folder/subfolder", "C:/folder")] - [InlineData(@"C:/folder/subfolder/another", "C:/folder/subfolder")] + [InlineData(@"folder", "")] + [InlineData(@"folder/subfolder", "folder")] + [InlineData(@"folder/subfolder/another", "folder/subfolder")] public void GetParentDirectoryName_ShouldFindParentOfDirectories(string path, string expected) { + path = Root + path; + expected = Root + expected; + var fileSystem = new MockFileSystem(); fileSystem.AddDirectory(path); diff --git a/API.Tests/Services/ExternalMetadataServiceTests.cs b/API.Tests/Services/ExternalMetadataServiceTests.cs new file mode 100644 index 000000000..973b7c6df --- /dev/null +++ b/API.Tests/Services/ExternalMetadataServiceTests.cs @@ -0,0 +1,3198 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using API.Constants; +using API.Data.Repositories; +using API.DTOs.KavitaPlus.Metadata; +using API.DTOs.Recommendation; +using API.DTOs.Scrobbling; +using API.Entities; +using API.Entities.Enums; +using API.Entities.Metadata; +using API.Entities.MetadataMatching; +using API.Entities.Person; +using API.Helpers.Builders; +using API.Services.Plus; +using API.Services.Tasks.Metadata; +using API.Services.Tasks.Scanner.Parser; +using API.SignalR; +using Hangfire; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; +using NSubstitute; +using Xunit; + +namespace API.Tests.Services; + +/// +/// Given these rely on Kavita+, this will not have any [Fact]/[Theory] on them and must be manually checked +/// +public class ExternalMetadataServiceTests : AbstractDbTest +{ + private readonly ExternalMetadataService _externalMetadataService; + private readonly Dictionary _genreLookup = new Dictionary(); + private readonly Dictionary _tagLookup = new Dictionary(); + private readonly Dictionary _personLookup = new Dictionary(); + + + public ExternalMetadataServiceTests() + { + // Set up Hangfire to use in-memory storage for testing + GlobalConfiguration.Configuration.UseInMemoryStorage(); + + _externalMetadataService = new ExternalMetadataService(UnitOfWork, Substitute.For>(), + Mapper, Substitute.For(), Substitute.For(), Substitute.For(), + Substitute.For(), Substitute.For()); + } + + #region Gloabl + + [Fact] + public async Task Off_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Summary"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = false; + metadataSettings.EnableSummary = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Summary = "Test" + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(string.Empty, postSeries.Metadata.Summary); + } + + #endregion + + #region Summary + + [Fact] + public async Task Summary_NoExisting_Off_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Summary"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableSummary = false; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Summary = "Test" + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(string.Empty, postSeries.Metadata.Summary); + } + + [Fact] + public async Task Summary_NoExisting_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Summary"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableSummary = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Summary = "Test" + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.False(string.IsNullOrEmpty(postSeries.Metadata.Summary)); + Assert.Equal(series.Metadata.Summary, postSeries.Metadata.Summary); + } + + [Fact] + public async Task Summary_Existing_NoModification() + { + await ResetDb(); + + const string seriesName = "Test - Summary"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithSummary("This summary is not locked") + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableSummary = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Summary = "This should not write" + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.False(string.IsNullOrEmpty(postSeries.Metadata.Summary)); + Assert.Equal("This summary is not locked", postSeries.Metadata.Summary); + } + + [Fact] + public async Task Summary_Existing_Locked_NoModification() + { + await ResetDb(); + + const string seriesName = "Test - Summary"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithSummary("This summary is not locked", true) + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableSummary = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Summary = "This should not write" + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.False(string.IsNullOrEmpty(postSeries.Metadata.Summary)); + Assert.Equal("This summary is not locked", postSeries.Metadata.Summary); + } + + [Fact] + public async Task Summary_Existing_Locked_Override_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Summary"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithSummary("This summary is not locked", true) + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableSummary = true; + metadataSettings.Overrides = [MetadataSettingField.Summary]; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Summary = "This should write" + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.False(string.IsNullOrEmpty(postSeries.Metadata.Summary)); + Assert.Equal("This should write", postSeries.Metadata.Summary); + } + + + #endregion + + #region Release Year + + [Fact] + public async Task ReleaseYear_NoExisting_Off_NoModification() + { + await ResetDb(); + + const string seriesName = "Test - Release Year"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableStartDate = false; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + StartDate = DateTime.UtcNow + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(0, postSeries.Metadata.ReleaseYear); + } + + [Fact] + public async Task ReleaseYear_NoExisting_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Release Year"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableStartDate = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + StartDate = DateTime.UtcNow + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(DateTime.UtcNow.Year, postSeries.Metadata.ReleaseYear); + } + + [Fact] + public async Task ReleaseYear_Existing_NoModification() + { + await ResetDb(); + + const string seriesName = "Test - Release Year"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithReleaseYear(1990) + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableStartDate = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + StartDate = DateTime.UtcNow + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(1990, postSeries.Metadata.ReleaseYear); + } + + [Fact] + public async Task ReleaseYear_Existing_Locked_NoModification() + { + await ResetDb(); + + const string seriesName = "Test - Release Year"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithReleaseYear(1990, true) + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableStartDate = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + StartDate = DateTime.UtcNow + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(1990, postSeries.Metadata.ReleaseYear); + } + + [Fact] + public async Task ReleaseYear_Existing_Locked_Override_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Release Year"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithReleaseYear(1990, true) + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableStartDate = true; + metadataSettings.Overrides = [MetadataSettingField.StartDate]; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + StartDate = DateTime.UtcNow + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(DateTime.UtcNow.Year, postSeries.Metadata.ReleaseYear); + } + + #endregion + + #region LocalizedName + + [Fact] + public async Task LocalizedName_NoExisting_Off_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Localized Name"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithLocalizedNameAllowEmpty(string.Empty) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableLocalizedName = false; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Synonyms = [seriesName, "設定しないでください", "Kimchi"] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(string.Empty, postSeries.LocalizedName); + } + + [Fact] + public async Task LocalizedName_NoExisting_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Localized Name"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithLocalizedNameAllowEmpty(string.Empty) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableLocalizedName = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Synonyms = [seriesName, "設定しないでください", "Kimchi"] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal("Kimchi", postSeries.LocalizedName); + } + + [Fact] + public async Task LocalizedName_Existing_NoModification() + { + await ResetDb(); + + const string seriesName = "Test - Localized Name"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithLocalizedName("Localized Name here") + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableLocalizedName = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Synonyms = [seriesName, "設定しないでください", "Kimchi"] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal("Localized Name here", postSeries.LocalizedName); + } + + [Fact] + public async Task LocalizedName_Existing_Locked_NoModification() + { + await ResetDb(); + + const string seriesName = "Test - Localized Name"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithLocalizedName("Localized Name here", true) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableLocalizedName = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Synonyms = [seriesName, "設定しないでください", "Kimchi"] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal("Localized Name here", postSeries.LocalizedName); + } + + [Fact] + public async Task LocalizedName_Existing_Locked_Override_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Localized Name"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithLocalizedName("Localized Name here", true) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableLocalizedName = true; + metadataSettings.Overrides = [MetadataSettingField.LocalizedName]; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Synonyms = [seriesName, "設定しないでください", "Kimchi"] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal("Kimchi", postSeries.LocalizedName); + } + + [Fact] + public async Task LocalizedName_OnlyNonEnglishSynonyms_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Localized Name"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithLocalizedNameAllowEmpty(string.Empty) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableLocalizedName = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Synonyms = [seriesName, "設定しないでください"] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.True(string.IsNullOrEmpty(postSeries.LocalizedName)); + } + + #endregion + + #region Publication Status + + [Fact] + public async Task PublicationStatus_NoExisting_Off_NoModification() + { + await ResetDb(); + + const string seriesName = "Test - Publication Status"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .WithVolume(new VolumeBuilder("1") + .WithChapter(new ChapterBuilder("1").Build()) + .Build()) + .WithVolume(new VolumeBuilder("2") + .WithChapter(new ChapterBuilder("2").Build()) + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnablePublicationStatus = false; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Volumes = 2 + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(PublicationStatus.OnGoing, postSeries.Metadata.PublicationStatus); + } + + [Fact] + public async Task PublicationStatus_NoExisting_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Publication Status"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .WithVolume(new VolumeBuilder("1") + .WithChapter(new ChapterBuilder("1").Build()) + .Build()) + .WithVolume(new VolumeBuilder("2") + .WithChapter(new ChapterBuilder("2").Build()) + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnablePublicationStatus = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Volumes = 2 + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(PublicationStatus.Completed, postSeries.Metadata.PublicationStatus); + } + + [Fact] + public async Task PublicationStatus_Existing_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Publication Status"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithPublicationStatus(PublicationStatus.Hiatus) + .Build()) + .WithVolume(new VolumeBuilder("1") + .WithChapter(new ChapterBuilder("1").Build()) + .Build()) + .WithVolume(new VolumeBuilder("2") + .WithChapter(new ChapterBuilder("2").Build()) + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnablePublicationStatus = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Volumes = 2 + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(PublicationStatus.Completed, postSeries.Metadata.PublicationStatus); + } + + [Fact] + public async Task PublicationStatus_Existing_Locked_NoModification() + { + await ResetDb(); + + const string seriesName = "Test - Publication Status"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithPublicationStatus(PublicationStatus.Hiatus, true) + .Build()) + .WithVolume(new VolumeBuilder("1") + .WithChapter(new ChapterBuilder("1").Build()) + .Build()) + .WithVolume(new VolumeBuilder("2") + .WithChapter(new ChapterBuilder("2").Build()) + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnablePublicationStatus = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Volumes = 2 + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(PublicationStatus.Hiatus, postSeries.Metadata.PublicationStatus); + } + + [Fact] + public async Task PublicationStatus_Existing_Locked_Override_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Publication Status"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithPublicationStatus(PublicationStatus.Hiatus, true) + .Build()) + .WithVolume(new VolumeBuilder("1") + .WithChapter(new ChapterBuilder("1").Build()) + .Build()) + .WithVolume(new VolumeBuilder("2") + .WithChapter(new ChapterBuilder("2").Build()) + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnablePublicationStatus = true; + metadataSettings.Overrides = [MetadataSettingField.PublicationStatus]; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Volumes = 2 + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(PublicationStatus.Completed, postSeries.Metadata.PublicationStatus); + } + + [Fact] + public async Task PublicationStatus_Existing_CorrectState_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Publication Status"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithPublicationStatus(PublicationStatus.Hiatus) + .Build()) + .WithVolume(new VolumeBuilder("1") + .WithChapter(new ChapterBuilder("1").Build()) + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnablePublicationStatus = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Volumes = 2 + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(PublicationStatus.Ended, postSeries.Metadata.PublicationStatus); + } + + + [Fact] + public void IsSeriesCompleted_ExactMatch() + { + const string seriesName = "Test - Exact Match"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithMaxCount(5) + .WithTotalCount(5) + .Build()) + .Build(); + + var chapters = new List(); + var externalMetadata = new ExternalSeriesDetailDto { Chapters = 5, Volumes = 0 }; + + var result = ExternalMetadataService.IsSeriesCompleted(series, chapters, externalMetadata, Parser.DefaultChapterNumber); + + Assert.True(result); + } + + [Fact] + public void IsSeriesCompleted_Volumes_DecimalVolumes() + { + const string seriesName = "Test - Volume Complete"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithMaxCount(2) + .WithTotalCount(3) + .Build()) + .WithVolume(new VolumeBuilder("1").WithNumber(1).Build()) + .WithVolume(new VolumeBuilder("2").WithNumber(2).Build()) + .WithVolume(new VolumeBuilder("2.5").WithNumber(2.5f).Build()) + .Build(); + + var chapters = new List(); + // External metadata includes decimal volume 2.5 + var externalMetadata = new ExternalSeriesDetailDto { Chapters = 0, Volumes = 3 }; + + var result = ExternalMetadataService.IsSeriesCompleted(series, chapters, externalMetadata, 2); + + Assert.True(result); + Assert.Equal(3, series.Metadata.MaxCount); + Assert.Equal(3, series.Metadata.TotalCount); + } + + /// + /// This is validating that we get a completed even though we have a special chapter and AL doesn't count it + /// + [Fact] + public void IsSeriesCompleted_Volumes_HasSpecialAndDecimal_ExternalNoSpecial() + { + const string seriesName = "Test - Volume Complete"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithMaxCount(2) + .WithTotalCount(3) + .Build()) + .WithVolume(new VolumeBuilder("1").WithNumber(1).Build()) + .WithVolume(new VolumeBuilder("1.5").WithNumber(1.5f).Build()) + .WithVolume(new VolumeBuilder("2").WithNumber(2).Build()) + .WithVolume(new VolumeBuilder(Parser.SpecialVolume).Build()) + .Build(); + + var chapters = new List(); + // External metadata includes volume 1.5, but not the special + var externalMetadata = new ExternalSeriesDetailDto { Chapters = 0, Volumes = 3 }; + + var result = ExternalMetadataService.IsSeriesCompleted(series, chapters, externalMetadata, 2); + + Assert.True(result); + Assert.Equal(3, series.Metadata.MaxCount); + Assert.Equal(3, series.Metadata.TotalCount); + } + + /// + /// This unit test also illustrates the bug where you may get a false positive if you had Volumes 1,2, and 2.1. While + /// missing volume 3. With the external metadata expecting non-decimal volumes. + /// i.e. it would fail if we only had one decimal volume + /// + [Fact] + public void IsSeriesCompleted_Volumes_TooManyDecimalVolumes() + { + const string seriesName = "Test - Volume Complete"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithMaxCount(2) + .WithTotalCount(3) + .Build()) + .WithVolume(new VolumeBuilder("1").WithNumber(1).Build()) + .WithVolume(new VolumeBuilder("2").WithNumber(2).Build()) + .WithVolume(new VolumeBuilder("2.1").WithNumber(2.1f).Build()) + .WithVolume(new VolumeBuilder("2.2").WithNumber(2.2f).Build()) + .Build(); + + var chapters = new List(); + // External metadata includes no special or decimals. There are 3 volumes. And we're missing volume 3 + var externalMetadata = new ExternalSeriesDetailDto { Chapters = 0, Volumes = 3 }; + + var result = ExternalMetadataService.IsSeriesCompleted(series, chapters, externalMetadata, 2); + + Assert.False(result); + } + + [Fact] + public void IsSeriesCompleted_NoVolumes_GEQChapterCheck() + { + // We own 11 chapters, the external metadata expects 10 + const string seriesName = "Test - Chapter MaxCount, no volumes"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithMaxCount(11) + .WithTotalCount(10) + .Build()) + .Build(); + + var chapters = new List(); + var externalMetadata = new ExternalSeriesDetailDto { Chapters = 10, Volumes = 0 }; + + var result = ExternalMetadataService.IsSeriesCompleted(series, chapters, externalMetadata, Parser.DefaultChapterNumber); + + Assert.True(result); + Assert.Equal(11, series.Metadata.TotalCount); + Assert.Equal(11, series.Metadata.MaxCount); + } + + [Fact] + public void IsSeriesCompleted_NoVolumes_IncludeAllChaptersCheck() + { + const string seriesName = "Test - Chapter Count"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithMaxCount(7) + .WithTotalCount(10) + .Build()) + .Build(); + + var chapters = new List + { + new ChapterBuilder("0").Build(), + new ChapterBuilder("2").Build(), + new ChapterBuilder("3").Build(), + new ChapterBuilder("4").Build(), + new ChapterBuilder("5").Build(), + new ChapterBuilder("6").Build(), + new ChapterBuilder("7").Build(), + new ChapterBuilder("7.1").Build(), + new ChapterBuilder("7.2").Build(), + new ChapterBuilder("7.3").Build() + }; + // External metadata includes prologues (0) and extra's (7.X) + var externalMetadata = new ExternalSeriesDetailDto { Chapters = 10, Volumes = 0 }; + + var result = ExternalMetadataService.IsSeriesCompleted(series, chapters, externalMetadata, Parser.DefaultChapterNumber); + + Assert.True(result); + Assert.Equal(10, series.Metadata.TotalCount); + Assert.Equal(10, series.Metadata.MaxCount); + } + + [Fact] + public void IsSeriesCompleted_NotEnoughVolumes() + { + const string seriesName = "Test - Incomplete Volume"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithMaxCount(2) + .WithTotalCount(5) + .Build()) + .WithVolume(new VolumeBuilder("1").WithNumber(1).Build()) + .WithVolume(new VolumeBuilder("2").WithNumber(2).Build()) + .Build(); + + var chapters = new List(); + var externalMetadata = new ExternalSeriesDetailDto { Chapters = 0, Volumes = 5 }; + + var result = ExternalMetadataService.IsSeriesCompleted(series, chapters, externalMetadata, 2); + + Assert.False(result); + } + + [Fact] + public void IsSeriesCompleted_NoVolumes_NotEnoughChapters() + { + const string seriesName = "Test - Incomplete Chapter"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithMaxCount(5) + .WithTotalCount(8) + .Build()) + .Build(); + + var chapters = new List + { + new ChapterBuilder("1").Build(), + new ChapterBuilder("2").Build(), + new ChapterBuilder("3").Build() + }; + var externalMetadata = new ExternalSeriesDetailDto { Chapters = 10, Volumes = 0 }; + + var result = ExternalMetadataService.IsSeriesCompleted(series, chapters, externalMetadata, Parser.DefaultChapterNumber); + + Assert.False(result); + } + + + #endregion + + #region Age Rating + + [Fact] + public async Task AgeRating_NoExisting_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Age Rating"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.AgeRatingMappings = new Dictionary() + { + {"Ecchi", AgeRating.Teen}, // Genre + {"H", AgeRating.R18Plus}, // Tag + }; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Genres = ["Ecchi"] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(AgeRating.Teen, postSeries.Metadata.AgeRating); + } + + [Fact] + public async Task AgeRating_ExistingHigher_NoModification() + { + await ResetDb(); + + const string seriesName = "Test - Age Rating"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithAgeRating(AgeRating.Mature) + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.AgeRatingMappings = new Dictionary() + { + {"Ecchi", AgeRating.Teen}, // Genre + {"H", AgeRating.R18Plus}, // Tag + }; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Genres = ["Ecchi"] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(AgeRating.Mature, postSeries.Metadata.AgeRating); + } + + [Fact] + public async Task AgeRating_ExistingLower_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Age Rating"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithAgeRating(AgeRating.Everyone) + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.AgeRatingMappings = new Dictionary() + { + {"Ecchi", AgeRating.Teen}, // Genre + {"H", AgeRating.R18Plus}, // Tag + }; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Genres = ["Ecchi"] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(AgeRating.Teen, postSeries.Metadata.AgeRating); + } + + [Fact] + public async Task AgeRating_Existing_Locked_NoModification() + { + await ResetDb(); + + const string seriesName = "Test - Age Rating"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithAgeRating(AgeRating.Everyone, true) + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.AgeRatingMappings = new Dictionary() + { + {"Ecchi", AgeRating.Teen}, // Genre + {"H", AgeRating.R18Plus}, // Tag + }; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Genres = ["Ecchi"] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(AgeRating.Everyone, postSeries.Metadata.AgeRating); + } + + [Fact] + public async Task AgeRating_Existing_Locked_Override_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Age Rating"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithAgeRating(AgeRating.Everyone, true) + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.Overrides = [MetadataSettingField.AgeRating]; + metadataSettings.AgeRatingMappings = new Dictionary() + { + {"Ecchi", AgeRating.Teen}, // Genre + {"H", AgeRating.R18Plus}, // Tag + }; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Genres = ["Ecchi"] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(AgeRating.Teen, postSeries.Metadata.AgeRating); + } + + #endregion + + #region Genres + + [Fact] + public async Task Genres_NoExisting_Off_NoModification() + { + await ResetDb(); + + const string seriesName = "Test - Genres"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableGenres = false; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Genres = ["Ecchi"] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal([], postSeries.Metadata.Genres); + } + + [Fact] + public async Task Genres_NoExisting_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Genres"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableGenres = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Genres = ["Ecchi"] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(["Ecchi"], postSeries.Metadata.Genres.Select(g => g.Title)); + } + + [Fact] + public async Task Genres_Existing_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Genres"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithGenre(_genreLookup["Action"]) + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableGenres = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Genres = ["Ecchi"] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(["Ecchi"], postSeries.Metadata.Genres.Select(g => g.Title)); + } + + [Fact] + public async Task Genres_Existing_Locked_NoModification() + { + await ResetDb(); + + const string seriesName = "Test - Genres"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithGenre(_genreLookup["Action"], true) + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableGenres = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Genres = ["Ecchi"] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(["Action"], postSeries.Metadata.Genres.Select(g => g.Title)); + } + + [Fact] + public async Task Genres_Existing_Locked_Override_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Genres"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithGenre(_genreLookup["Action"], true) + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableGenres = true; + metadataSettings.Overrides = [MetadataSettingField.Genres]; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Genres = ["Ecchi"] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(["Ecchi"], postSeries.Metadata.Genres.Select(g => g.Title)); + } + + #endregion + + #region Tags + + [Fact] + public async Task Tags_NoExisting_Off_NoModification() + { + await ResetDb(); + + const string seriesName = "Test - Tags"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableTags = false; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Tags = [new MetadataTagDto() {Name = "Boxing"}] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal([], postSeries.Metadata.Tags); + } + + [Fact] + public async Task Tags_NoExisting_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Tags"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableTags = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Tags = [new MetadataTagDto() {Name = "Boxing"}] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(["Boxing"], postSeries.Metadata.Tags.Select(t => t.Title)); + } + + [Fact] + public async Task Tags_Existing_Locked_NoModification() + { + await ResetDb(); + + const string seriesName = "Test - Tags"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithTag(_tagLookup["H"], true) + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableTags = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Tags = [new MetadataTagDto() {Name = "Boxing"}] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(["H"], postSeries.Metadata.Tags.Select(t => t.Title)); + } + + [Fact] + public async Task Tags_Existing_Locked_Override_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Tags"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithTag(_tagLookup["H"], true) + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableTags = true; + metadataSettings.Overrides = [MetadataSettingField.Tags]; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Tags = [new MetadataTagDto() {Name = "Boxing"}] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(["Boxing"], postSeries.Metadata.Tags.Select(t => t.Title)); + } + + #endregion + + #region People - Writers/Artists + + [Fact] + public async Task People_Writer_NoExisting_Off_NoModification() + { + await ResetDb(); + + const string seriesName = "Test - People - Writer/Artists"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnablePeople = false; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Staff = [CreateStaff("John", "Doe", "Story")] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal([], postSeries.Metadata.People.Where(p => p.Role == PersonRole.Writer)); + } + + [Fact] + public async Task People_Writer_NoExisting_Modification() + { + await ResetDb(); + + const string seriesName = "Test - People - Writer/Artists"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnablePeople = true; + metadataSettings.FirstLastPeopleNaming = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Staff = [CreateStaff("John", "Doe", "Story")] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(["John Doe"], postSeries.Metadata.People.Where(p => p.Role == PersonRole.Writer).Select(p => p.Person.Name)); + } + + [Fact] + public async Task People_Writer_Locked_NoModification() + { + await ResetDb(); + + const string seriesName = "Test - People - Writer/Artists"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithPerson(_personLookup["Johnny Twowheeler"], PersonRole.Writer) + .Build()) + .Build(); + series.Metadata.WriterLocked = true; + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnablePeople = true; + metadataSettings.FirstLastPeopleNaming = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Staff = [CreateStaff("John", "Doe", "Story")] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(new[]{"Johnny Twowheeler"}.OrderBy(s => s), + postSeries.Metadata.People.Where(p => p.Role == PersonRole.Writer) + .Select(p => p.Person.Name) + .OrderBy(s => s)); + } + + [Fact] + public async Task People_Writer_Locked_Override_Modification() + { + await ResetDb(); + + const string seriesName = "Test - People - Writer/Artists"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithPerson(_personLookup["Johnny Twowheeler"], PersonRole.Writer) + .Build()) + .Build(); + series.Metadata.WriterLocked = true; + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnablePeople = true; + metadataSettings.FirstLastPeopleNaming = true; + metadataSettings.Overrides = [MetadataSettingField.People]; + metadataSettings.PersonRoles = [PersonRole.Writer]; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Staff = [CreateStaff("John", "Doe", "Story")] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(new[]{"John Doe", "Johnny Twowheeler"}.OrderBy(s => s), + postSeries.Metadata.People.Where(p => p.Role == PersonRole.Writer) + .Select(p => p.Person.Name) + .OrderBy(s => s)); + Assert.True( postSeries.Metadata.People.Where(p => p.Role == PersonRole.Writer) + .FirstOrDefault(p => p.Person.Name == "John Doe")!.KavitaPlusConnection); + } + + [Fact] + public async Task People_Writer_Locked_Override_ReverseNamingMatch_Modification() + { + await ResetDb(); + + const string seriesName = "Test - People - Writer/Artists"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithPerson(_personLookup["Johnny Twowheeler"], PersonRole.Writer) + .Build()) + .Build(); + series.Metadata.WriterLocked = true; + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnablePeople = true; + metadataSettings.FirstLastPeopleNaming = false; + metadataSettings.Overrides = [MetadataSettingField.People]; + metadataSettings.PersonRoles = [PersonRole.Writer]; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Staff = [CreateStaff("Twowheeler", "Johnny", "Story")] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(new[]{"Johnny Twowheeler"}.OrderBy(s => s), + postSeries.Metadata.People.Where(p => p.Role == PersonRole.Writer) + .Select(p => p.Person.Name) + .OrderBy(s => s)); + } + + [Fact] + public async Task People_Writer_Locked_Override_PersonRoleNotSet_NoModification() + { + await ResetDb(); + + const string seriesName = "Test - People - Writer/Artists"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithPerson(_personLookup["Johnny Twowheeler"], PersonRole.Writer) + .Build()) + .Build(); + series.Metadata.WriterLocked = true; + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnablePeople = true; + metadataSettings.FirstLastPeopleNaming = true; + metadataSettings.Overrides = [MetadataSettingField.People]; + metadataSettings.PersonRoles = []; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Staff = [CreateStaff("John", "Doe", "Story")] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(new[]{"Johnny Twowheeler"}.OrderBy(s => s), + postSeries.Metadata.People.Where(p => p.Role == PersonRole.Writer) + .Select(p => p.Person.Name) + .OrderBy(s => s)); + } + + + [Fact] + public async Task People_Writer_OverrideReMatchDeletesOld_Modification() + { + await ResetDb(); + + const string seriesName = "Test - People - Writer/Artists"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnablePeople = true; + metadataSettings.FirstLastPeopleNaming = true; + metadataSettings.Overrides = [MetadataSettingField.People]; + metadataSettings.PersonRoles = [PersonRole.Writer]; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Staff = [CreateStaff("John", "Doe", "Story")] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(new[]{"John Doe"}.OrderBy(s => s), + postSeries.Metadata.People.Where(p => p.Role == PersonRole.Writer) + .Select(p => p.Person.Name) + .OrderBy(s => s)); + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Staff = [CreateStaff("John", "Doe 2", "Story")] + }, 1); + + postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(new[]{"John Doe 2"}.OrderBy(s => s), + postSeries.Metadata.People.Where(p => p.Role == PersonRole.Writer) + .Select(p => p.Person.Name) + .OrderBy(s => s)); + } + + #endregion + + #region People Alias + + [Fact] + public async Task PeopleAliasing_AddAsAlias() + { + await ResetDb(); + + const string seriesName = "Test - People - Add as Alias"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + Context.Person.Add(new PersonBuilder("John Doe").Build()); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnablePeople = true; + metadataSettings.FirstLastPeopleNaming = true; + metadataSettings.Overrides = [MetadataSettingField.People]; + metadataSettings.PersonRoles = [PersonRole.Writer]; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Staff = [CreateStaff("Doe", "John", "Story")] + }, 1); + + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + + var allWriters = postSeries.Metadata.People.Where(p => p.Role == PersonRole.Writer).ToList(); + Assert.Single(allWriters); + + var johnDoe = allWriters[0].Person; + + Assert.Contains("Doe John", johnDoe.Aliases.Select(pa => pa.Alias)); + } + + [Fact] + public async Task PeopleAliasing_AddOnAlias() + { + await ResetDb(); + + const string seriesName = "Test - People - Add as Alias"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + + Context.Person.Add(new PersonBuilder("John Doe").WithAlias("Doe John").Build()); + + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnablePeople = true; + metadataSettings.FirstLastPeopleNaming = true; + metadataSettings.Overrides = [MetadataSettingField.People]; + metadataSettings.PersonRoles = [PersonRole.Writer]; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Staff = [CreateStaff("Doe", "John", "Story")] + }, 1); + + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + + var allWriters = postSeries.Metadata.People.Where(p => p.Role == PersonRole.Writer).ToList(); + Assert.Single(allWriters); + + var johnDoe = allWriters[0].Person; + + Assert.Contains("Doe John", johnDoe.Aliases.Select(pa => pa.Alias)); + } + + [Fact] + public async Task PeopleAliasing_DontAddAsAlias_SameButNotSwitched() + { + await ResetDb(); + + const string seriesName = "Test - People - Add as Alias"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnablePeople = true; + metadataSettings.FirstLastPeopleNaming = true; + metadataSettings.Overrides = [MetadataSettingField.People]; + metadataSettings.PersonRoles = [PersonRole.Writer]; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Staff = [CreateStaff("John", "Doe Doe", "Story"), CreateStaff("Doe", "John Doe", "Story")] + }, 1); + + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + + var allWriters = postSeries.Metadata.People.Where(p => p.Role == PersonRole.Writer).ToList(); + Assert.Equal(2, allWriters.Count); + } + + #endregion + + #region People - Characters + + [Fact] + public async Task People_Character_NoExisting_Off_NoModification() + { + await ResetDb(); + + const string seriesName = "Test - People - Character"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnablePeople = false; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Characters = [CreateCharacter("John", "Doe", CharacterRole.Main)] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal([], postSeries.Metadata.People.Where(p => p.Role == PersonRole.Character)); + } + + [Fact] + public async Task People_Character_NoExisting_Modification() + { + await ResetDb(); + + const string seriesName = "Test - People - Character"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnablePeople = true; + metadataSettings.FirstLastPeopleNaming = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Characters = [CreateCharacter("John", "Doe", CharacterRole.Main)] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(["John Doe"], postSeries.Metadata.People.Where(p => p.Role == PersonRole.Character).Select(p => p.Person.Name)); + } + + [Fact] + public async Task People_Character_Locked_NoModification() + { + await ResetDb(); + + const string seriesName = "Test - People - Character"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithPerson(_personLookup["Johnny Twowheeler"], PersonRole.Character) + .Build()) + .Build(); + series.Metadata.CharacterLocked = true; + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnablePeople = true; + metadataSettings.FirstLastPeopleNaming = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Characters = [CreateCharacter("John", "Doe", CharacterRole.Main)] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(new[]{"Johnny Twowheeler"}.OrderBy(s => s), + postSeries.Metadata.People.Where(p => p.Role == PersonRole.Character) + .Select(p => p.Person.Name) + .OrderBy(s => s)); + } + + [Fact] + public async Task People_Character_Locked_Override_Modification() + { + await ResetDb(); + + const string seriesName = "Test - People - Character"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithPerson(_personLookup["Johnny Twowheeler"], PersonRole.Character) + .Build()) + .Build(); + series.Metadata.WriterLocked = true; + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnablePeople = true; + metadataSettings.FirstLastPeopleNaming = true; + metadataSettings.Overrides = [MetadataSettingField.People]; + metadataSettings.PersonRoles = [PersonRole.Character]; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Characters = [CreateCharacter("John", "Doe", CharacterRole.Main)] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(new[]{"John Doe", "Johnny Twowheeler"}.OrderBy(s => s), + postSeries.Metadata.People.Where(p => p.Role == PersonRole.Character) + .Select(p => p.Person.Name) + .OrderBy(s => s)); + Assert.True( postSeries.Metadata.People.Where(p => p.Role == PersonRole.Character) + .FirstOrDefault(p => p.Person.Name == "John Doe")!.KavitaPlusConnection); + } + + [Fact] + public async Task People_Character_Locked_Override_ReverseNamingNoMatch_Modification() + { + await ResetDb(); + + const string seriesName = "Test - People - Character"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithPerson(_personLookup["Johnny Twowheeler"], PersonRole.Character) + .Build()) + .Build(); + series.Metadata.WriterLocked = true; + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnablePeople = true; + metadataSettings.FirstLastPeopleNaming = false; + metadataSettings.Overrides = [MetadataSettingField.People]; + metadataSettings.PersonRoles = [PersonRole.Character]; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Characters = [CreateCharacter("Twowheeler", "Johnny", CharacterRole.Main)] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(new[]{"Johnny Twowheeler", "Twowheeler Johnny"}.OrderBy(s => s), + postSeries.Metadata.People.Where(p => p.Role == PersonRole.Character) + .Select(p => p.Person.Name) + .OrderBy(s => s)); + } + + [Fact] + public async Task People_Character_Locked_Override_PersonRoleNotSet_NoModification() + { + await ResetDb(); + + const string seriesName = "Test - People - Character"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithPerson(_personLookup["Johnny Twowheeler"], PersonRole.Character) + .Build()) + .Build(); + series.Metadata.WriterLocked = true; + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnablePeople = true; + metadataSettings.FirstLastPeopleNaming = true; + metadataSettings.Overrides = [MetadataSettingField.People]; + metadataSettings.PersonRoles = []; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Characters = [CreateCharacter("John", "Doe", CharacterRole.Main)] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(new[]{"Johnny Twowheeler"}.OrderBy(s => s), + postSeries.Metadata.People.Where(p => p.Role == PersonRole.Character) + .Select(p => p.Person.Name) + .OrderBy(s => s)); + } + + + [Fact] + public async Task People_Character_OverrideReMatchDeletesOld_Modification() + { + await ResetDb(); + + const string seriesName = "Test - People - Character"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnablePeople = true; + metadataSettings.FirstLastPeopleNaming = true; + metadataSettings.Overrides = [MetadataSettingField.People]; + metadataSettings.PersonRoles = [PersonRole.Character]; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Characters = [CreateCharacter("John", "Doe", CharacterRole.Main)] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(new[]{"John Doe"}.OrderBy(s => s), + postSeries.Metadata.People.Where(p => p.Role == PersonRole.Character) + .Select(p => p.Person.Name) + .OrderBy(s => s)); + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Characters = [CreateCharacter("John", "Doe 2", CharacterRole.Main)] + }, 1); + + postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(new[]{"John Doe 2"}.OrderBy(s => s), + postSeries.Metadata.People.Where(p => p.Role == PersonRole.Character) + .Select(p => p.Person.Name) + .OrderBy(s => s)); + } + + #endregion + + #region Series Cover + // Not sure how to test this + #endregion + + #region Relationships + + // Not enabled + + // Non-Sequel + + [Fact] + public async Task Relationships_NonSequel() + { + await ResetDb(); + + const string seriesName = "Test - Relationships Side Story"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithFormat(MangaFormat.Archive) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + + var series2 = new SeriesBuilder("Test - Relationships Side Story - Target") + .WithLibraryId(1) + .WithFormat(MangaFormat.Archive) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .WithExternalMetadata(new ExternalSeriesMetadata() + { + AniListId = 10 + }) + .Build(); + Context.Series.Attach(series2); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableRelationships = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Relations = [new SeriesRelationship() + { + Relation = RelationKind.SideStory, + SeriesName = new ALMediaTitle() + { + PreferredTitle = series2.Name, + EnglishTitle = null, + NativeTitle = series2.Name, + RomajiTitle = series2.Name, + }, + AniListId = 10, + PlusMediaFormat = PlusMediaFormat.Manga + }] + }, 1); + + // Repull Series and validate what is overwritten + var sourceSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata | SeriesIncludes.Related); + Assert.NotNull(sourceSeries); + Assert.Single(sourceSeries.Relations); + Assert.Equal(series2.Name, sourceSeries.Relations.First().TargetSeries.Name); + } + + [Fact] + public async Task Relationships_NonSequel_LocalizedName() + { + await ResetDb(); + + const string seriesName = "Test - Relationships Side Story"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithFormat(MangaFormat.Archive) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + + var series2 = new SeriesBuilder("Test - Relationships Side Story - Target") + .WithLibraryId(1) + .WithLocalizedName("School bus") + .WithFormat(MangaFormat.Archive) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series2); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableRelationships = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Relations = [new SeriesRelationship() + { + Relation = RelationKind.SideStory, + SeriesName = new ALMediaTitle() + { + PreferredTitle = "School bus", + EnglishTitle = null, + NativeTitle = series2.Name, + RomajiTitle = series2.Name, + }, + AniListId = 10, + PlusMediaFormat = PlusMediaFormat.Manga + }] + }, 1); + + // Repull Series and validate what is overwritten + var sourceSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata | SeriesIncludes.Related); + Assert.NotNull(sourceSeries); + Assert.Single(sourceSeries.Relations); + Assert.Equal(series2.Name, sourceSeries.Relations.First().TargetSeries.Name); + } + + // Non-Sequel with no match due to Format difference + [Fact] + public async Task Relationships_NonSequel_FormatDifference() + { + await ResetDb(); + + const string seriesName = "Test - Relationships Side Story"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithFormat(MangaFormat.Archive) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + + var series2 = new SeriesBuilder("Test - Relationships Side Story - Target") + .WithLibraryId(1) + .WithLocalizedName("School bus") + .WithFormat(MangaFormat.Archive) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series2); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableRelationships = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Relations = [new SeriesRelationship() + { + Relation = RelationKind.SideStory, + SeriesName = new ALMediaTitle() + { + PreferredTitle = "School bus", + EnglishTitle = null, + NativeTitle = series2.Name, + RomajiTitle = series2.Name, + }, + AniListId = 10, + PlusMediaFormat = PlusMediaFormat.Book + }] + }, 1); + + // Repull Series and validate what is overwritten + var sourceSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata | SeriesIncludes.Related); + Assert.NotNull(sourceSeries); + Assert.Empty(sourceSeries.Relations); + } + + // Non-Sequel existing relationship with new link, both exist + [Fact] + public async Task Relationships_NonSequel_ExistingLink_DifferentType_BothExist() + { + await ResetDb(); + + var existingRelationshipSeries = new SeriesBuilder("Existing") + .WithLibraryId(1) + .Build(); + Context.Series.Attach(existingRelationshipSeries); + await Context.SaveChangesAsync(); + + const string seriesName = "Test - Relationships Side Story"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithFormat(MangaFormat.Archive) + .WithRelationship(existingRelationshipSeries.Id, RelationKind.Annual) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + + var series2 = new SeriesBuilder("Test - Relationships Side Story - Target") + .WithLibraryId(1) + .WithFormat(MangaFormat.Archive) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .WithExternalMetadata(new ExternalSeriesMetadata() + { + AniListId = 10 + }) + .Build(); + Context.Series.Attach(series2); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableRelationships = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Relations = [new SeriesRelationship() + { + Relation = RelationKind.SideStory, + SeriesName = new ALMediaTitle() + { + PreferredTitle = series2.Name, + EnglishTitle = null, + NativeTitle = series2.Name, + RomajiTitle = series2.Name, + }, + PlusMediaFormat = PlusMediaFormat.Manga + }] + }, 2); + + // Repull Series and validate what is overwritten + var sourceSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(2, SeriesIncludes.Metadata | SeriesIncludes.Related); + Assert.NotNull(sourceSeries); + Assert.Equal(seriesName, sourceSeries.Name); + + Assert.Contains(sourceSeries.Relations, r => r.RelationKind == RelationKind.Annual && r.TargetSeriesId == existingRelationshipSeries.Id); + Assert.Contains(sourceSeries.Relations, r => r.RelationKind == RelationKind.SideStory && r.TargetSeriesId == series2.Id); + } + + + + // Sequel/Prequel + [Fact] + public async Task Relationships_Sequel_CreatesPrequel() + { + await ResetDb(); + + const string seriesName = "Test - Relationships Source"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithFormat(MangaFormat.Archive) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + + var series2 = new SeriesBuilder("Test - Relationships Target") + .WithLibraryId(1) + .WithFormat(MangaFormat.Archive) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series2); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableRelationships = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Relations = [new SeriesRelationship() + { + Relation = RelationKind.Sequel, + SeriesName = new ALMediaTitle() + { + PreferredTitle = series2.Name, + EnglishTitle = null, + NativeTitle = series2.Name, + RomajiTitle = series2.Name, + }, + PlusMediaFormat = PlusMediaFormat.Manga + }] + }, 1); + + // Repull Series and validate what is overwritten + var sourceSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata | SeriesIncludes.Related); + Assert.NotNull(sourceSeries); + Assert.Single(sourceSeries.Relations); + Assert.Equal(series2.Name, sourceSeries.Relations.First().TargetSeries.Name); + + var sequel = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(2, SeriesIncludes.Metadata | SeriesIncludes.Related); + Assert.NotNull(sequel); + Assert.Equal(seriesName, sequel.Relations.First().TargetSeries.Name); + } + + [Fact] + public async Task Relationships_Prequel_CreatesSequel() + { + await ResetDb(); + + // ID 1: Blue Lock - Episode Nagi + var series = new SeriesBuilder("Blue Lock - Episode Nagi") + .WithLibraryId(1) + .WithFormat(MangaFormat.Archive) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + + // ID 2: Blue Lock + var series2 = new SeriesBuilder("Blue Lock") + .WithLibraryId(1) + .WithFormat(MangaFormat.Archive) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series2); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableRelationships = true; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + // Apply to Blue Lock - Episode Nagi (ID 1), setting Blue Lock (ID 2) as its prequel + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = "Blue Lock - Episode Nagi", // The series we're updating metadata for + Relations = [new SeriesRelationship() + { + Relation = RelationKind.Prequel, // Blue Lock is the prequel to Nagi + SeriesName = new ALMediaTitle() + { + PreferredTitle = "Blue Lock", + EnglishTitle = "Blue Lock", + NativeTitle = "ブルーロック", + RomajiTitle = "Blue Lock", + }, + PlusMediaFormat = PlusMediaFormat.Manga, + AniListId = 106130, + MalId = 114745, + Provider = ScrobbleProvider.AniList + }] + }, 1); // Apply to series ID 1 (Nagi) + + // Verify Blue Lock - Episode Nagi has Blue Lock as prequel + var nagiSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata | SeriesIncludes.Related); + Assert.NotNull(nagiSeries); + Assert.Single(nagiSeries.Relations); + Assert.Equal("Blue Lock", nagiSeries.Relations.First().TargetSeries.Name); + Assert.Equal(RelationKind.Prequel, nagiSeries.Relations.First().RelationKind); + + // Verify Blue Lock has Blue Lock - Episode Nagi as sequel + var blueLockSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(2, SeriesIncludes.Metadata | SeriesIncludes.Related); + Assert.NotNull(blueLockSeries); + Assert.Single(blueLockSeries.Relations); + Assert.Equal("Blue Lock - Episode Nagi", blueLockSeries.Relations.First().TargetSeries.Name); + Assert.Equal(RelationKind.Sequel, blueLockSeries.Relations.First().RelationKind); + } + + + #endregion + + #region Blacklist + + [Fact] + public async Task Blacklist_Genres() + { + await ResetDb(); + + const string seriesName = "Test - Blacklist Genres"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableTags = true; + metadataSettings.EnableGenres = true; + metadataSettings.Blacklist = ["Sports", "Action"]; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Genres = ["Boxing", "Sports", "Action"], + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(new[] {"Boxing"}.OrderBy(s => s), postSeries.Metadata.Genres.Select(t => t.Title).OrderBy(s => s)); + } + + + [Fact] + public async Task Blacklist_Tags() + { + await ResetDb(); + + const string seriesName = "Test - Blacklist Tags"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableTags = true; + metadataSettings.EnableGenres = true; + metadataSettings.Blacklist = ["Sports", "Action"]; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Tags = [new MetadataTagDto() {Name = "Boxing"}, new MetadataTagDto() {Name = "Sports"}, new MetadataTagDto() {Name = "Action"}] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(new[] {"Boxing"}.OrderBy(s => s), postSeries.Metadata.Tags.Select(t => t.Title).OrderBy(s => s)); + } + + // Blacklist Tag + + // Field Map then Blacklist Genre + + // Field Map then Blacklist Tag + + #endregion + + #region Whitelist + + [Fact] + public async Task Whitelist_Tags() + { + await ResetDb(); + + const string seriesName = "Test - Whitelist Tags"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableTags = true; + metadataSettings.Whitelist = ["Sports", "Action"]; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Tags = [new MetadataTagDto() {Name = "Boxing"}, new MetadataTagDto() {Name = "Sports"}, new MetadataTagDto() {Name = "Action"}] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(new[] {"Sports", "Action"}.OrderBy(s => s), postSeries.Metadata.Tags.Select(t => t.Title).OrderBy(s => s)); + } + + [Fact] + public async Task Whitelist_WithFieldMap_Tags() + { + await ResetDb(); + + const string seriesName = "Test - Whitelist Tags"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableTags = true; + metadataSettings.FieldMappings = [new MetadataFieldMapping() + { + SourceType = MetadataFieldType.Tag, + SourceValue = "Boxing", + DestinationType = MetadataFieldType.Tag, + DestinationValue = "Sports", + ExcludeFromSource = false + + }]; + metadataSettings.Whitelist = ["Sports", "Action"]; + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Tags = [new MetadataTagDto() {Name = "Boxing"}, new MetadataTagDto() {Name = "Action"}] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(new[] {"Sports", "Action"}.OrderBy(s => s), postSeries.Metadata.Tags.Select(t => t.Title).OrderBy(s => s)); + } + + #endregion + + #region Field Mapping + + [Fact] + public async Task FieldMap_GenreToGenre_KeepSource_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Genres Field Mapping"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableGenres = true; + metadataSettings.Overrides = [MetadataSettingField.Genres]; + metadataSettings.FieldMappings = [new MetadataFieldMapping() + { + SourceType = MetadataFieldType.Genre, + SourceValue = "Ecchi", + DestinationType = MetadataFieldType.Genre, + DestinationValue = "Fanservice", + ExcludeFromSource = false + + }]; + + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Genres = ["Ecchi"] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal( + new[] { "Ecchi", "Fanservice" }.OrderBy(s => s), + postSeries.Metadata.Genres.Select(g => g.Title).OrderBy(s => s) + ); + } + + [Fact] + public async Task FieldMap_GenreToGenre_RemoveSource_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Genres Field Mapping"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableGenres = true; + metadataSettings.Overrides = [MetadataSettingField.Genres]; + metadataSettings.FieldMappings = [new MetadataFieldMapping() + { + SourceType = MetadataFieldType.Genre, + SourceValue = "Ecchi", + DestinationType = MetadataFieldType.Genre, + DestinationValue = "Fanservice", + ExcludeFromSource = true + + }]; + + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Genres = ["Ecchi"] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(["Fanservice"], postSeries.Metadata.Genres.Select(g => g.Title)); + } + + [Fact] + public async Task FieldMap_TagToTag_KeepSource_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Tag Field Mapping"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableTags = true; + metadataSettings.FieldMappings = [new MetadataFieldMapping() + { + SourceType = MetadataFieldType.Tag, + SourceValue = "Ecchi", + DestinationType = MetadataFieldType.Tag, + DestinationValue = "Fanservice", + ExcludeFromSource = false + + }]; + + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Tags = [new MetadataTagDto() {Name = "Ecchi"}] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal( + new[] { "Ecchi", "Fanservice" }.OrderBy(s => s), + postSeries.Metadata.Tags.Select(g => g.Title).OrderBy(s => s) + ); + } + + [Fact] + public async Task Tags_Existing_FieldMap_RemoveSource_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Tag Field Mapping"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableTags = true; + metadataSettings.Overrides = [MetadataSettingField.Genres]; + metadataSettings.FieldMappings = [new MetadataFieldMapping() + { + SourceType = MetadataFieldType.Tag, + SourceValue = "Ecchi", + DestinationType = MetadataFieldType.Tag, + DestinationValue = "Fanservice", + ExcludeFromSource = true + + }]; + + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Tags = [new MetadataTagDto() {Name = "Ecchi"}] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal(["Fanservice"], postSeries.Metadata.Tags.Select(g => g.Title)); + } + + [Fact] + public async Task FieldMap_GenreToTag_KeepSource_Modification() + { + await ResetDb(); + + const string seriesName = "Test - Genres Field Mapping"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableGenres = true; + metadataSettings.EnableTags = true; + metadataSettings.Overrides = [MetadataSettingField.Genres, MetadataSettingField.Tags]; + metadataSettings.FieldMappings = [new MetadataFieldMapping() + { + SourceType = MetadataFieldType.Genre, + SourceValue = "Ecchi", + DestinationType = MetadataFieldType.Tag, + DestinationValue = "Fanservice", + ExcludeFromSource = false + + }]; + + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + Genres = ["Ecchi"] + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal( + new[] {"Ecchi"}.OrderBy(s => s), + postSeries.Metadata.Genres.Select(g => g.Title).OrderBy(s => s) + ); + Assert.Equal( + new[] {"Fanservice"}.OrderBy(s => s), + postSeries.Metadata.Tags.Select(g => g.Title).OrderBy(s => s) + ); + } + + + + [Fact] + public async Task FieldMap_GenreToGenre_RemoveSource_NoExternalGenre_NoModification() + { + await ResetDb(); + + const string seriesName = "Test - Genres Field Mapping"; + var series = new SeriesBuilder(seriesName) + .WithLibraryId(1) + .WithMetadata(new SeriesMetadataBuilder() + .WithGenre(_genreLookup["Action"]) + .Build()) + .Build(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = true; + metadataSettings.EnableGenres = true; + metadataSettings.EnableTags = true; + metadataSettings.Overrides = [MetadataSettingField.Genres, MetadataSettingField.Tags]; + metadataSettings.FieldMappings = [new MetadataFieldMapping() + { + SourceType = MetadataFieldType.Genre, + SourceValue = "Action", + DestinationType = MetadataFieldType.Genre, + DestinationValue = "Adventure", + ExcludeFromSource = true + + }]; + + Context.MetadataSettings.Update(metadataSettings); + await Context.SaveChangesAsync(); + + + await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto() + { + Name = seriesName, + }, 1); + + // Repull Series and validate what is overwritten + var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata); + Assert.NotNull(postSeries); + Assert.Equal( + new[] {"Action"}.OrderBy(s => s), + postSeries.Metadata.Genres.Select(g => g.Title).OrderBy(s => s) + ); + } + + #endregion + + + + protected override async Task ResetDb() + { + Context.Series.RemoveRange(Context.Series); + Context.AppUser.RemoveRange(Context.AppUser); + Context.Genre.RemoveRange(Context.Genre); + Context.Tag.RemoveRange(Context.Tag); + Context.Person.RemoveRange(Context.Person); + + var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings(); + metadataSettings.Enabled = false; + metadataSettings.EnableSummary = false; + metadataSettings.EnableCoverImage = false; + metadataSettings.EnableLocalizedName = false; + metadataSettings.EnableGenres = false; + metadataSettings.EnablePeople = false; + metadataSettings.EnableRelationships = false; + metadataSettings.EnableTags = false; + metadataSettings.EnablePublicationStatus = false; + metadataSettings.EnableStartDate = false; + metadataSettings.FieldMappings = []; + metadataSettings.AgeRatingMappings = new Dictionary(); + Context.MetadataSettings.Update(metadataSettings); + + await Context.SaveChangesAsync(); + + Context.AppUser.Add(new AppUserBuilder("Joe", "Joe") + .WithRole(PolicyConstants.AdminRole) + .WithLibrary(await Context.Library.FirstAsync(l => l.Id == 1)) + .Build()); + + // Create a bunch of Genres for this test and store their string in _genreLookup + _genreLookup.Clear(); + var g1 = new GenreBuilder("Action").Build(); + var g2 = new GenreBuilder("Ecchi").Build(); + Context.Genre.Add(g1); + Context.Genre.Add(g2); + _genreLookup.Add("Action", g1); + _genreLookup.Add("Ecchi", g2); + + _tagLookup.Clear(); + var t1 = new TagBuilder("H").Build(); + var t2 = new TagBuilder("Boxing").Build(); + Context.Tag.Add(t1); + Context.Tag.Add(t2); + _tagLookup.Add("H", t1); + _tagLookup.Add("Boxing", t2); + + _personLookup.Clear(); + var p1 = new PersonBuilder("Johnny Twowheeler").Build(); + var p2 = new PersonBuilder("Boxing").Build(); + Context.Person.Add(p1); + Context.Person.Add(p2); + _personLookup.Add("Johnny Twowheeler", p1); + _personLookup.Add("Batman Robin", p2); + + await Context.SaveChangesAsync(); + } + + private static SeriesStaffDto CreateStaff(string first, string last, string role) + { + return new SeriesStaffDto() {Name = $"{first} {last}", Role = role, Url = "", FirstName = first, LastName = last}; + } + + private static SeriesCharacter CreateCharacter(string first, string last, CharacterRole role) + { + return new SeriesCharacter() {Name = $"{first} {last}", Description = "", Url = "", ImageUrl = "", Role = role}; + } +} diff --git a/API.Tests/Services/ImageServiceTests.cs b/API.Tests/Services/ImageServiceTests.cs index ac3c3157f..f2c87e1ad 100644 --- a/API.Tests/Services/ImageServiceTests.cs +++ b/API.Tests/Services/ImageServiceTests.cs @@ -1,14 +1,9 @@ -using System.Drawing; -using System.IO; -using System.IO.Abstractions; +using System.IO; using System.Linq; using System.Text; using API.Entities.Enums; using API.Services; -using EasyCaching.Core; -using Microsoft.Extensions.Logging; using NetVips; -using NSubstitute; using Xunit; using Image = NetVips.Image; @@ -28,6 +23,7 @@ public class ImageServiceTests public void GenerateBaseline() { GenerateFiles(BaselinePattern); + Assert.True(true); } /// @@ -38,6 +34,7 @@ public class ImageServiceTests { GenerateFiles(OutputPattern); GenerateHtmlFile(); + Assert.True(true); } private void GenerateFiles(string outputExtension) @@ -159,15 +156,15 @@ public class ImageServiceTests // Step 4: Generate HTML file GenerateHtmlFileForColorScape(); - + Assert.True(true); } private static void GenerateColorImage(string hexColor, string outputPath) { - var color = ImageService.HexToRgb(hexColor); - using var colorImage = Image.Black(200, 100); - using var output = colorImage + new[] { color.R / 255.0, color.G / 255.0, color.B / 255.0 }; - output.WriteToFile(outputPath); + var (r, g, b) = ImageService.HexToRgb(hexColor); + using var blackImage = Image.Black(200, 100); + using var colorImage = blackImage.NewFromImage(r, g, b); + colorImage.WriteToFile(outputPath); } private void GenerateHtmlFileForColorScape() diff --git a/API.Tests/Services/ParseScannedFilesTests.cs b/API.Tests/Services/ParseScannedFilesTests.cs index ff4868a8c..a732b2526 100644 --- a/API.Tests/Services/ParseScannedFilesTests.cs +++ b/API.Tests/Services/ParseScannedFilesTests.cs @@ -1,27 +1,23 @@ using System; using System.Collections.Generic; -using System.Data.Common; +using System.IO; +using System.IO.Abstractions; using System.IO.Abstractions.TestingHelpers; using System.Linq; using System.Threading.Tasks; -using API.Data; using API.Data.Metadata; using API.Data.Repositories; -using API.Entities; using API.Entities.Enums; -using API.Extensions; -using API.Helpers.Builders; using API.Services; using API.Services.Tasks.Scanner; using API.Services.Tasks.Scanner.Parser; using API.SignalR; -using AutoMapper; -using Microsoft.Data.Sqlite; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; +using API.Tests.Helpers; +using Hangfire; using Microsoft.Extensions.Logging; using NSubstitute; using Xunit; +using Xunit.Abstractions; namespace API.Tests.Services; @@ -62,53 +58,55 @@ public class MockReadingItemService : IReadingItemService throw new NotImplementedException(); } - public ParserInfo Parse(string path, string rootPath, string libraryRoot, LibraryType type) + public ParserInfo Parse(string path, string rootPath, string libraryRoot, LibraryType type, bool enableMetadata) { if (_comicVineParser.IsApplicable(path, type)) { - return _comicVineParser.Parse(path, rootPath, libraryRoot, type, GetComicInfo(path)); + return _comicVineParser.Parse(path, rootPath, libraryRoot, type, enableMetadata, GetComicInfo(path)); } if (_imageParser.IsApplicable(path, type)) { - return _imageParser.Parse(path, rootPath, libraryRoot, type, GetComicInfo(path)); + return _imageParser.Parse(path, rootPath, libraryRoot, type, enableMetadata, GetComicInfo(path)); } if (_bookParser.IsApplicable(path, type)) { - return _bookParser.Parse(path, rootPath, libraryRoot, type, GetComicInfo(path)); + return _bookParser.Parse(path, rootPath, libraryRoot, type, enableMetadata, GetComicInfo(path)); } if (_pdfParser.IsApplicable(path, type)) { - return _pdfParser.Parse(path, rootPath, libraryRoot, type, GetComicInfo(path)); + return _pdfParser.Parse(path, rootPath, libraryRoot, type, enableMetadata, GetComicInfo(path)); } if (_basicParser.IsApplicable(path, type)) { - return _basicParser.Parse(path, rootPath, libraryRoot, type, GetComicInfo(path)); + return _basicParser.Parse(path, rootPath, libraryRoot, type, enableMetadata, GetComicInfo(path)); } return null; } - public ParserInfo ParseFile(string path, string rootPath, string libraryRoot, LibraryType type) + public ParserInfo ParseFile(string path, string rootPath, string libraryRoot, LibraryType type, bool enableMetadata) { - return Parse(path, rootPath, libraryRoot, type); + return Parse(path, rootPath, libraryRoot, type, enableMetadata); } } public class ParseScannedFilesTests : AbstractDbTest { private readonly ILogger _logger = Substitute.For>(); + private readonly ScannerHelper _scannerHelper; - public ParseScannedFilesTests() + public ParseScannedFilesTests(ITestOutputHelper testOutputHelper) { // Since ProcessFile relies on _readingItemService, we can implement our own versions of _readingItemService so we have control over how the calls work - + GlobalConfiguration.Configuration.UseInMemoryStorage(); + _scannerHelper = new ScannerHelper(UnitOfWork, testOutputHelper); } protected override async Task ResetDb() { - _context.Series.RemoveRange(_context.Series.ToList()); + Context.Series.RemoveRange(Context.Series.ToList()); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); } #region MergeName @@ -196,11 +194,11 @@ public class ParseScannedFilesTests : AbstractDbTest 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)); + fileSystem.AddDirectory(Root + "Data/"); + fileSystem.AddFile(Root + "Data/Accel World v1.cbz", new MockFileData(string.Empty)); + fileSystem.AddFile(Root + "Data/Accel World v2.cbz", new MockFileData(string.Empty)); + fileSystem.AddFile(Root + "Data/Accel World v2.pdf", new MockFileData(string.Empty)); + fileSystem.AddFile(Root + "Data/Nothing.pdf", new MockFileData(string.Empty)); var ds = new DirectoryService(Substitute.For>(), fileSystem); var psf = new ParseScannedFiles(Substitute.For>(), ds, @@ -208,13 +206,13 @@ public class ParseScannedFilesTests : AbstractDbTest var library = - await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(1, + await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(1, LibraryIncludes.Folders | LibraryIncludes.FileTypes); Assert.NotNull(library); library.Type = LibraryType.Manga; - var parsedSeries = await psf.ScanLibrariesForSeries(library, new List() {"C:/Data/"}, false, - await _unitOfWork.SeriesRepository.GetFolderPathMap(1)); + var parsedSeries = await psf.ScanLibrariesForSeries(library, new List() {Root + "Data/"}, false, + await UnitOfWork.SeriesRepository.GetFolderPathMap(1)); // Assert.Equal(3, parsedSeries.Values.Count); @@ -253,9 +251,9 @@ public class ParseScannedFilesTests : AbstractDbTest new MockReadingItemService(ds, Substitute.For()), Substitute.For()); var directoriesSeen = new HashSet(); - var library = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(1, + var library = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(1, LibraryIncludes.Folders | LibraryIncludes.FileTypes); - var scanResults = await psf.ScanFiles("C:/Data/", true, await _unitOfWork.SeriesRepository.GetFolderPathMap(1), library); + var scanResults = await psf.ScanFiles("C:/Data/", true, await UnitOfWork.SeriesRepository.GetFolderPathMap(1), library); foreach (var scanResult in scanResults) { directoriesSeen.Add(scanResult.Folder); @@ -272,13 +270,13 @@ public class ParseScannedFilesTests : AbstractDbTest var psf = new ParseScannedFiles(Substitute.For>(), ds, new MockReadingItemService(ds, Substitute.For()), Substitute.For()); - var library = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(1, + var library = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(1, LibraryIncludes.Folders | LibraryIncludes.FileTypes); Assert.NotNull(library); var directoriesSeen = new HashSet(); var scanResults = await psf.ScanFiles("C:/Data/", false, - await _unitOfWork.SeriesRepository.GetFolderPathMap(1), library); + await UnitOfWork.SeriesRepository.GetFolderPathMap(1), library); foreach (var scanResult in scanResults) { @@ -307,10 +305,10 @@ public class ParseScannedFilesTests : AbstractDbTest var psf = new ParseScannedFiles(Substitute.For>(), ds, new MockReadingItemService(ds, Substitute.For()), Substitute.For()); - var library = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(1, + var library = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(1, LibraryIncludes.Folders | LibraryIncludes.FileTypes); Assert.NotNull(library); - var scanResults = await psf.ScanFiles("C:/Data", true, await _unitOfWork.SeriesRepository.GetFolderPathMap(1), library); + var scanResults = await psf.ScanFiles("C:/Data", true, await UnitOfWork.SeriesRepository.GetFolderPathMap(1), library); Assert.Equal(2, scanResults.Count); } @@ -336,11 +334,11 @@ public class ParseScannedFilesTests : AbstractDbTest var psf = new ParseScannedFiles(Substitute.For>(), ds, new MockReadingItemService(ds, Substitute.For()), Substitute.For()); - var library = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(1, + var library = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(1, LibraryIncludes.Folders | LibraryIncludes.FileTypes); Assert.NotNull(library); var scanResults = await psf.ScanFiles("C:/Data", false, - await _unitOfWork.SeriesRepository.GetFolderPathMap(1), library); + await UnitOfWork.SeriesRepository.GetFolderPathMap(1), library); Assert.Single(scanResults); } @@ -349,4 +347,220 @@ public class ParseScannedFilesTests : AbstractDbTest #endregion + + // TODO: Add back in (removed for Hotfix v0.8.5.x) + //[Fact] + public async Task HasSeriesFolderNotChangedSinceLastScan_AllSeriesFoldersHaveChanges() + { + const string testcase = "Subfolders always scanning all series changes - Manga.json"; + var infos = new Dictionary(); + var library = await _scannerHelper.GenerateScannerData(testcase, infos); + var testDirectoryPath = library.Folders.First().Path; + + UnitOfWork.LibraryRepository.Update(library); + await UnitOfWork.CommitAsync(); + + var fs = new FileSystem(); + var ds = new DirectoryService(Substitute.For>(), fs); + var psf = new ParseScannedFiles(Substitute.For>(), ds, + new MockReadingItemService(ds, Substitute.For()), Substitute.For()); + + var scanner = _scannerHelper.CreateServices(ds, fs); + await scanner.ScanLibrary(library.Id); + + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + Assert.NotNull(postLib); + Assert.Equal(4, postLib.Series.Count); + + var spiceAndWolf = postLib.Series.First(x => x.Name == "Spice and Wolf"); + Assert.Equal(2, spiceAndWolf.Volumes.Count); + + var frieren = postLib.Series.First(x => x.Name == "Frieren - Beyond Journey's End"); + Assert.Single(frieren.Volumes); + + var executionerAndHerWayOfLife = postLib.Series.First(x => x.Name == "The Executioner and Her Way of Life"); + Assert.Equal(2, executionerAndHerWayOfLife.Volumes.Count); + + await Task.Delay(1100); // Ensure at least one second has passed since library scan + + // Add a new chapter to a volume of the series, and scan. Validate that only, and all directories of this + // series are marked as HasChanged + var executionerCopyDir = Path.Join(Path.Join(testDirectoryPath, "The Executioner and Her Way of Life"), + "The Executioner and Her Way of Life Vol. 1"); + File.Copy(Path.Join(executionerCopyDir, "The Executioner and Her Way of Life Vol. 1 Ch. 0001.cbz"), + Path.Join(executionerCopyDir, "The Executioner and Her Way of Life Vol. 1 Ch. 0002.cbz")); + + // 4 series, of which 2 have volumes as directories + var folderMap = await UnitOfWork.SeriesRepository.GetFolderPathMap(postLib.Id); + Assert.Equal(6, folderMap.Count); + + var res = await psf.ScanFiles(testDirectoryPath, true, folderMap, postLib); + var changes = res.Where(sc => sc.HasChanged).ToList(); + Assert.Equal(2, changes.Count); + // Only volumes of The Executioner and Her Way of Life should be marked as HasChanged (Spice and Wolf also has 2 volumes dirs) + Assert.Equal(2, changes.Count(sc => sc.Folder.Contains("The Executioner and Her Way of Life"))); + } + + [Fact] + public async Task HasSeriesFolderNotChangedSinceLastScan_PublisherLayout() + { + const string testcase = "Subfolder always scanning fix publisher layout - Comic.json"; + var infos = new Dictionary(); + var library = await _scannerHelper.GenerateScannerData(testcase, infos); + var testDirectoryPath = library.Folders.First().Path; + + UnitOfWork.LibraryRepository.Update(library); + await UnitOfWork.CommitAsync(); + + var fs = new FileSystem(); + var ds = new DirectoryService(Substitute.For>(), fs); + var psf = new ParseScannedFiles(Substitute.For>(), ds, + new MockReadingItemService(ds, Substitute.For()), Substitute.For()); + + var scanner = _scannerHelper.CreateServices(ds, fs); + await scanner.ScanLibrary(library.Id); + + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + Assert.NotNull(postLib); + Assert.Equal(4, postLib.Series.Count); + + var spiceAndWolf = postLib.Series.First(x => x.Name == "Spice and Wolf"); + Assert.Equal(2, spiceAndWolf.Volumes.Count); + + var frieren = postLib.Series.First(x => x.Name == "Frieren - Beyond Journey's End"); + Assert.Equal(2, frieren.Volumes.Count); + + await Task.Delay(1100); // Ensure at least one second has passed since library scan + + // Add a volume to a series, and scan. Ensure only this series is marked as HasChanged + var executionerCopyDir = Path.Join(Path.Join(testDirectoryPath, "YenPress"), "The Executioner and Her Way of Life"); + File.Copy(Path.Join(executionerCopyDir, "The Executioner and Her Way of Life Vol. 1.cbz"), + Path.Join(executionerCopyDir, "The Executioner and Her Way of Life Vol. 2.cbz")); + + var res = await psf.ScanFiles(testDirectoryPath, true, + await UnitOfWork.SeriesRepository.GetFolderPathMap(postLib.Id), postLib); + var changes = res.Count(sc => sc.HasChanged); + Assert.Equal(1, changes); + } + + // TODO: Add back in (removed for Hotfix v0.8.5.x) + //[Fact] + public async Task SubFoldersNoSubFolders_SkipAll() + { + const string testcase = "Subfolders and files at root - Manga.json"; + var infos = new Dictionary(); + var library = await _scannerHelper.GenerateScannerData(testcase, infos); + var testDirectoryPath = library.Folders.First().Path; + + UnitOfWork.LibraryRepository.Update(library); + await UnitOfWork.CommitAsync(); + + var fs = new FileSystem(); + var ds = new DirectoryService(Substitute.For>(), fs); + var psf = new ParseScannedFiles(Substitute.For>(), ds, + new MockReadingItemService(ds, Substitute.For()), Substitute.For()); + + var scanner = _scannerHelper.CreateServices(ds, fs); + await scanner.ScanLibrary(library.Id); + + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + Assert.NotNull(postLib); + Assert.Single(postLib.Series); + + var spiceAndWolf = postLib.Series.First(x => x.Name == "Spice and Wolf"); + Assert.Equal(3, spiceAndWolf.Volumes.Count); + Assert.Equal(4, spiceAndWolf.Volumes.Sum(v => v.Chapters.Count)); + + // Needs to be actual time as the write time is now, so if we set LastFolderChecked in the past + // it'll always a scan as it was changed since the last scan. + await Task.Delay(1100); // Ensure at least one second has passed since library scan + + var res = await psf.ScanFiles(testDirectoryPath, true, + await UnitOfWork.SeriesRepository.GetFolderPathMap(postLib.Id), postLib); + Assert.DoesNotContain(res, sc => sc.HasChanged); + } + + [Fact] + public async Task SubFoldersNoSubFolders_ScanAllAfterAddInRoot() + { + const string testcase = "Subfolders and files at root - Manga.json"; + var infos = new Dictionary(); + var library = await _scannerHelper.GenerateScannerData(testcase, infos); + var testDirectoryPath = library.Folders.First().Path; + + UnitOfWork.LibraryRepository.Update(library); + await UnitOfWork.CommitAsync(); + + var fs = new FileSystem(); + var ds = new DirectoryService(Substitute.For>(), fs); + var psf = new ParseScannedFiles(Substitute.For>(), ds, + new MockReadingItemService(ds, Substitute.For()), Substitute.For()); + + var scanner = _scannerHelper.CreateServices(ds, fs); + await scanner.ScanLibrary(library.Id); + + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + Assert.NotNull(postLib); + Assert.Single(postLib.Series); + + var spiceAndWolf = postLib.Series.First(x => x.Name == "Spice and Wolf"); + Assert.Equal(3, spiceAndWolf.Volumes.Count); + Assert.Equal(4, spiceAndWolf.Volumes.Sum(v => v.Chapters.Count)); + + spiceAndWolf.LastFolderScanned = DateTime.Now.Subtract(TimeSpan.FromMinutes(2)); + Context.Series.Update(spiceAndWolf); + await Context.SaveChangesAsync(); + + // Add file at series root + var spiceAndWolfDir = Path.Join(testDirectoryPath, "Spice and Wolf"); + File.Copy(Path.Join(spiceAndWolfDir, "Spice and Wolf Vol. 1.cbz"), + Path.Join(spiceAndWolfDir, "Spice and Wolf Vol. 4.cbz")); + + var res = await psf.ScanFiles(testDirectoryPath, true, + await UnitOfWork.SeriesRepository.GetFolderPathMap(postLib.Id), postLib); + var changes = res.Count(sc => sc.HasChanged); + Assert.Equal(2, changes); + } + + [Fact] + public async Task SubFoldersNoSubFolders_ScanAllAfterAddInSubFolder() + { + const string testcase = "Subfolders and files at root - Manga.json"; + var infos = new Dictionary(); + var library = await _scannerHelper.GenerateScannerData(testcase, infos); + var testDirectoryPath = library.Folders.First().Path; + + UnitOfWork.LibraryRepository.Update(library); + await UnitOfWork.CommitAsync(); + + var fs = new FileSystem(); + var ds = new DirectoryService(Substitute.For>(), fs); + var psf = new ParseScannedFiles(Substitute.For>(), ds, + new MockReadingItemService(ds, Substitute.For()), Substitute.For()); + + var scanner = _scannerHelper.CreateServices(ds, fs); + await scanner.ScanLibrary(library.Id); + + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + Assert.NotNull(postLib); + Assert.Single(postLib.Series); + + var spiceAndWolf = postLib.Series.First(x => x.Name == "Spice and Wolf"); + Assert.Equal(3, spiceAndWolf.Volumes.Count); + Assert.Equal(4, spiceAndWolf.Volumes.Sum(v => v.Chapters.Count)); + + spiceAndWolf.LastFolderScanned = DateTime.Now.Subtract(TimeSpan.FromMinutes(2)); + Context.Series.Update(spiceAndWolf); + await Context.SaveChangesAsync(); + + // Add file in subfolder + var spiceAndWolfDir = Path.Join(Path.Join(testDirectoryPath, "Spice and Wolf"), "Spice and Wolf Vol. 3"); + File.Copy(Path.Join(spiceAndWolfDir, "Spice and Wolf Vol. 3 Ch. 0011.cbz"), + Path.Join(spiceAndWolfDir, "Spice and Wolf Vol. 3 Ch. 0013.cbz")); + + var res = await psf.ScanFiles(testDirectoryPath, true, + await UnitOfWork.SeriesRepository.GetFolderPathMap(postLib.Id), postLib); + var changes = res.Count(sc => sc.HasChanged); + Assert.Equal(2, changes); + } } diff --git a/API.Tests/Services/PersonServiceTests.cs b/API.Tests/Services/PersonServiceTests.cs new file mode 100644 index 000000000..5c1929b1c --- /dev/null +++ b/API.Tests/Services/PersonServiceTests.cs @@ -0,0 +1,286 @@ +using System.Linq; +using System.Threading.Tasks; +using API.Data.Repositories; +using API.Entities; +using API.Entities.Enums; +using API.Entities.Person; +using API.Extensions; +using API.Helpers.Builders; +using API.Services; +using Xunit; + +namespace API.Tests.Services; + +public class PersonServiceTests: AbstractDbTest +{ + + [Fact] + public async Task PersonMerge_KeepNonEmptyMetadata() + { + var ps = new PersonService(UnitOfWork); + + var person1 = new Person + { + Name = "Casey Delores", + NormalizedName = "Casey Delores".ToNormalized(), + HardcoverId = "ANonEmptyId", + MalId = 12, + }; + + var person2 = new Person + { + Name= "Delores Casey", + NormalizedName = "Delores Casey".ToNormalized(), + Description = "Hi, I'm Delores Casey!", + Aliases = [new PersonAliasBuilder("Casey, Delores").Build()], + AniListId = 27, + }; + + UnitOfWork.PersonRepository.Attach(person1); + UnitOfWork.PersonRepository.Attach(person2); + await UnitOfWork.CommitAsync(); + + await ps.MergePeopleAsync(person2, person1); + + var allPeople = await UnitOfWork.PersonRepository.GetAllPeople(); + Assert.Single(allPeople); + + var person = allPeople[0]; + Assert.Equal("Casey Delores", person.Name); + Assert.NotEmpty(person.Description); + Assert.Equal(27, person.AniListId); + Assert.NotNull(person.HardcoverId); + Assert.NotEmpty(person.HardcoverId); + Assert.Contains(person.Aliases, pa => pa.Alias == "Delores Casey"); + Assert.Contains(person.Aliases, pa => pa.Alias == "Casey, Delores"); + } + + [Fact] + public async Task PersonMerge_MergedPersonDestruction() + { + var ps = new PersonService(UnitOfWork); + + var person1 = new Person + { + Name = "Casey Delores", + NormalizedName = "Casey Delores".ToNormalized(), + }; + + var person2 = new Person + { + Name = "Delores Casey", + NormalizedName = "Delores Casey".ToNormalized(), + }; + + UnitOfWork.PersonRepository.Attach(person1); + UnitOfWork.PersonRepository.Attach(person2); + await UnitOfWork.CommitAsync(); + + await ps.MergePeopleAsync(person2, person1); + var allPeople = await UnitOfWork.PersonRepository.GetAllPeople(); + Assert.Single(allPeople); + } + + [Fact] + public async Task PersonMerge_RetentionChapters() + { + var ps = new PersonService(UnitOfWork); + + var library = new LibraryBuilder("My Library").Build(); + UnitOfWork.LibraryRepository.Add(library); + await UnitOfWork.CommitAsync(); + + var user = new AppUserBuilder("Amelia", "amelia@localhost") + .WithLibrary(library).Build(); + UnitOfWork.UserRepository.Add(user); + + var person = new PersonBuilder("Jillian Cowan").Build(); + + var person2 = new PersonBuilder("Cowan Jillian").Build(); + + var chapter = new ChapterBuilder("1") + .WithPerson(person, PersonRole.Editor) + .Build(); + + var chapter2 = new ChapterBuilder("2") + .WithPerson(person2, PersonRole.Editor) + .Build(); + + var series = new SeriesBuilder("Test 1") + .WithLibraryId(library.Id) + .WithVolume(new VolumeBuilder("1") + .WithChapter(chapter) + .Build()) + .Build(); + + var series2 = new SeriesBuilder("Test 2") + .WithLibraryId(library.Id) + .WithVolume(new VolumeBuilder("2") + .WithChapter(chapter2) + .Build()) + .Build(); + + UnitOfWork.SeriesRepository.Add(series); + UnitOfWork.SeriesRepository.Add(series2); + await UnitOfWork.CommitAsync(); + + await ps.MergePeopleAsync(person2, person); + + var allPeople = await UnitOfWork.PersonRepository.GetAllPeople(); + Assert.Single(allPeople); + var mergedPerson = allPeople[0]; + + Assert.Equal("Jillian Cowan", mergedPerson.Name); + + var chapters = await UnitOfWork.PersonRepository.GetChaptersForPersonByRole(1, 1, PersonRole.Editor); + Assert.Equal(2, chapters.Count()); + + chapter = await UnitOfWork.ChapterRepository.GetChapterAsync(1, ChapterIncludes.People); + Assert.NotNull(chapter); + Assert.Single(chapter.People); + + chapter2 = await UnitOfWork.ChapterRepository.GetChapterAsync(2, ChapterIncludes.People); + Assert.NotNull(chapter2); + Assert.Single(chapter2.People); + + Assert.Equal(chapter.People.First().PersonId, chapter2.People.First().PersonId); + } + + [Fact] + public async Task PersonMerge_NoDuplicateChaptersOrSeries() + { + await ResetDb(); + + var ps = new PersonService(UnitOfWork); + + var library = new LibraryBuilder("My Library").Build(); + UnitOfWork.LibraryRepository.Add(library); + await UnitOfWork.CommitAsync(); + + var user = new AppUserBuilder("Amelia", "amelia@localhost") + .WithLibrary(library).Build(); + UnitOfWork.UserRepository.Add(user); + + var person = new PersonBuilder("Jillian Cowan").Build(); + + var person2 = new PersonBuilder("Cowan Jillian").Build(); + + var chapter = new ChapterBuilder("1") + .WithPerson(person, PersonRole.Editor) + .WithPerson(person2, PersonRole.Colorist) + .Build(); + + var chapter2 = new ChapterBuilder("2") + .WithPerson(person2, PersonRole.Editor) + .WithPerson(person, PersonRole.Editor) + .Build(); + + var series = new SeriesBuilder("Test 1") + .WithLibraryId(library.Id) + .WithVolume(new VolumeBuilder("1") + .WithChapter(chapter) + .Build()) + .WithMetadata(new SeriesMetadataBuilder() + .WithPerson(person, PersonRole.Editor) + .WithPerson(person2, PersonRole.Editor) + .Build()) + .Build(); + + var series2 = new SeriesBuilder("Test 2") + .WithLibraryId(library.Id) + .WithVolume(new VolumeBuilder("2") + .WithChapter(chapter2) + .Build()) + .WithMetadata(new SeriesMetadataBuilder() + .WithPerson(person, PersonRole.Editor) + .WithPerson(person2, PersonRole.Colorist) + .Build()) + .Build(); + + UnitOfWork.SeriesRepository.Add(series); + UnitOfWork.SeriesRepository.Add(series2); + await UnitOfWork.CommitAsync(); + + await ps.MergePeopleAsync(person2, person); + var allPeople = await UnitOfWork.PersonRepository.GetAllPeople(); + Assert.Single(allPeople); + + var mergedPerson = await UnitOfWork.PersonRepository.GetPersonById(person.Id, PersonIncludes.All); + Assert.NotNull(mergedPerson); + Assert.Equal(3, mergedPerson.ChapterPeople.Count); + Assert.Equal(3, mergedPerson.SeriesMetadataPeople.Count); + + chapter = await UnitOfWork.ChapterRepository.GetChapterAsync(chapter.Id, ChapterIncludes.People); + Assert.NotNull(chapter); + Assert.Equal(2, chapter.People.Count); + Assert.Single(chapter.People.Select(p => p.Person.Id).Distinct()); + Assert.Contains(chapter.People, p => p.Role == PersonRole.Editor); + Assert.Contains(chapter.People, p => p.Role == PersonRole.Colorist); + + chapter2 = await UnitOfWork.ChapterRepository.GetChapterAsync(chapter2.Id, ChapterIncludes.People); + Assert.NotNull(chapter2); + Assert.Single(chapter2.People); + Assert.Contains(chapter2.People, p => p.Role == PersonRole.Editor); + Assert.DoesNotContain(chapter2.People, p => p.Role == PersonRole.Colorist); + + series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(series.Id, SeriesIncludes.Metadata); + Assert.NotNull(series); + Assert.Single(series.Metadata.People); + Assert.Contains(series.Metadata.People, p => p.Role == PersonRole.Editor); + Assert.DoesNotContain(series.Metadata.People, p => p.Role == PersonRole.Colorist); + + series2 = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(series2.Id, SeriesIncludes.Metadata); + Assert.NotNull(series2); + Assert.Equal(2, series2.Metadata.People.Count); + Assert.Contains(series2.Metadata.People, p => p.Role == PersonRole.Editor); + Assert.Contains(series2.Metadata.People, p => p.Role == PersonRole.Colorist); + + + } + + [Fact] + public async Task PersonAddAlias_NoOverlap() + { + await ResetDb(); + + UnitOfWork.PersonRepository.Attach(new PersonBuilder("Jillian Cowan").Build()); + UnitOfWork.PersonRepository.Attach(new PersonBuilder("Jilly Cowan").WithAlias("Jolly Cowan").Build()); + await UnitOfWork.CommitAsync(); + + var ps = new PersonService(UnitOfWork); + + var person1 = await UnitOfWork.PersonRepository.GetPersonByNameOrAliasAsync("Jillian Cowan"); + var person2 = await UnitOfWork.PersonRepository.GetPersonByNameOrAliasAsync("Jilly Cowan"); + Assert.NotNull(person1); + Assert.NotNull(person2); + + // Overlap on Name + var success = await ps.UpdatePersonAliasesAsync(person1, ["Jilly Cowan"]); + Assert.False(success); + + // Overlap on alias + success = await ps.UpdatePersonAliasesAsync(person1, ["Jolly Cowan"]); + Assert.False(success); + + // No overlap + success = await ps.UpdatePersonAliasesAsync(person2, ["Jilly Joy Cowan"]); + Assert.True(success); + + // Some overlap + success = await ps.UpdatePersonAliasesAsync(person1, ["Jolly Cowan", "Jilly Joy Cowan"]); + Assert.False(success); + + // Some overlap + success = await ps.UpdatePersonAliasesAsync(person1, ["Jolly Cowan", "Jilly Joy Cowan"]); + Assert.False(success); + + Assert.Single(person2.Aliases); + } + + protected override async Task ResetDb() + { + Context.Person.RemoveRange(Context.Person.ToList()); + + await Context.SaveChangesAsync(); + } +} diff --git a/API.Tests/Services/ProcessSeriesTests.cs b/API.Tests/Services/ProcessSeriesTests.cs index ef5c45007..119e1bc10 100644 --- a/API.Tests/Services/ProcessSeriesTests.cs +++ b/API.Tests/Services/ProcessSeriesTests.cs @@ -1,23 +1,8 @@ -using System.IO; -using API.Data; -using API.Data.Metadata; -using API.Entities; -using API.Entities.Enums; -using API.Helpers; -using API.Helpers.Builders; -using API.Services; -using API.Services.Tasks.Metadata; -using API.Services.Tasks.Scanner; -using API.SignalR; -using Microsoft.Extensions.Logging; -using NSubstitute; -using Xunit; - -namespace API.Tests.Services; +namespace API.Tests.Services; public class ProcessSeriesTests { - + // TODO: Implement #region UpdateSeriesMetadata diff --git a/API.Tests/Services/RatingServiceTests.cs b/API.Tests/Services/RatingServiceTests.cs new file mode 100644 index 000000000..15f4541d7 --- /dev/null +++ b/API.Tests/Services/RatingServiceTests.cs @@ -0,0 +1,189 @@ +using System.Linq; +using System.Threading.Tasks; +using API.Data.Repositories; +using API.DTOs; +using API.Entities.Enums; +using API.Helpers.Builders; +using API.Services; +using API.Services.Plus; +using Hangfire; +using Hangfire.InMemory; +using Microsoft.Extensions.Logging; +using NSubstitute; +using Xunit; + +namespace API.Tests.Services; + +public class RatingServiceTests: AbstractDbTest +{ + private readonly RatingService _ratingService; + + public RatingServiceTests() + { + _ratingService = new RatingService(UnitOfWork, Substitute.For(), Substitute.For>()); + } + + [Fact] + public async Task UpdateRating_ShouldSetRating() + { + await ResetDb(); + + Context.Library.Add(new LibraryBuilder("Test LIb") + .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) + .WithSeries(new SeriesBuilder("Test") + + .WithVolume(new VolumeBuilder("1") + .WithChapter(new ChapterBuilder("1").WithPages(1).Build()) + .Build()) + .Build()) + .Build()); + + + await Context.SaveChangesAsync(); + + + var user = await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings); + + JobStorage.Current = new InMemoryStorage(); + var result = await _ratingService.UpdateSeriesRating(user, new UpdateRatingDto + { + SeriesId = 1, + UserRating = 3, + }); + + Assert.True(result); + + var ratings = (await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings))! + .Ratings; + Assert.NotEmpty(ratings); + Assert.Equal(3, ratings.First().Rating); + } + + [Fact] + public async Task UpdateRating_ShouldUpdateExistingRating() + { + await ResetDb(); + + Context.Library.Add(new LibraryBuilder("Test LIb") + .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) + .WithSeries(new SeriesBuilder("Test") + + .WithVolume(new VolumeBuilder("1") + .WithChapter(new ChapterBuilder("1").WithPages(1).Build()) + .Build()) + .Build()) + .Build()); + + + await Context.SaveChangesAsync(); + + var user = await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings); + + var result = await _ratingService.UpdateSeriesRating(user, new UpdateRatingDto + { + SeriesId = 1, + UserRating = 3, + }); + + Assert.True(result); + + JobStorage.Current = new InMemoryStorage(); + var ratings = (await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings)) + .Ratings; + Assert.NotEmpty(ratings); + Assert.Equal(3, ratings.First().Rating); + + // Update the DB again + + var result2 = await _ratingService.UpdateSeriesRating(user, new UpdateRatingDto + { + SeriesId = 1, + UserRating = 5, + }); + + Assert.True(result2); + + var ratings2 = (await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings)) + .Ratings; + Assert.NotEmpty(ratings2); + Assert.True(ratings2.Count == 1); + Assert.Equal(5, ratings2.First().Rating); + } + + [Fact] + public async Task UpdateRating_ShouldClampRatingAt5() + { + await ResetDb(); + + Context.Library.Add(new LibraryBuilder("Test LIb") + .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) + .WithSeries(new SeriesBuilder("Test") + + .WithVolume(new VolumeBuilder("1") + .WithChapter(new ChapterBuilder("1").WithPages(1).Build()) + .Build()) + .Build()) + .Build()); + + await Context.SaveChangesAsync(); + + var user = await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings); + + var result = await _ratingService.UpdateSeriesRating(user, new UpdateRatingDto + { + SeriesId = 1, + UserRating = 10, + }); + + Assert.True(result); + + JobStorage.Current = new InMemoryStorage(); + var ratings = (await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", + AppUserIncludes.Ratings)!) + .Ratings; + Assert.NotEmpty(ratings); + Assert.Equal(5, ratings.First().Rating); + } + + [Fact] + public async Task UpdateRating_ShouldReturnFalseWhenSeriesDoesntExist() + { + await ResetDb(); + + Context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book) + .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) + .WithSeries(new SeriesBuilder("Test") + + .WithVolume(new VolumeBuilder("1") + .WithChapter(new ChapterBuilder("1").WithPages(1).Build()) + .Build()) + .Build()) + .Build()); + + await Context.SaveChangesAsync(); + + var user = await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings); + + var result = await _ratingService.UpdateSeriesRating(user, new UpdateRatingDto + { + SeriesId = 2, + UserRating = 5, + }); + + Assert.False(result); + + var ratings = user.Ratings; + Assert.Empty(ratings); + } + protected override 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()); + Context.Library.RemoveRange(Context.Library.ToList()); + + await Context.SaveChangesAsync(); + } +} diff --git a/API.Tests/Services/ReaderServiceTests.cs b/API.Tests/Services/ReaderServiceTests.cs index 468c22681..0e4ab2701 100644 --- a/API.Tests/Services/ReaderServiceTests.cs +++ b/API.Tests/Services/ReaderServiceTests.cs @@ -1,30 +1,19 @@ using System.Collections.Generic; -using System.Data.Common; -using System.Globalization; using System.IO.Abstractions.TestingHelpers; using System.Linq; using System.Threading.Tasks; -using API.Data; using API.Data.Repositories; -using API.DTOs; using API.DTOs.Progress; using API.DTOs.Reader; using API.Entities; using API.Entities.Enums; -using API.Entities.Metadata; using API.Extensions; -using API.Helpers; using API.Helpers.Builders; using API.Services; using API.Services.Plus; -using API.Services.Tasks; using API.SignalR; -using API.Tests.Helpers; -using AutoMapper; using Hangfire; using Hangfire.InMemory; -using Microsoft.Data.Sqlite; -using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using NSubstitute; using Xunit; @@ -32,30 +21,16 @@ using Xunit.Abstractions; namespace API.Tests.Services; -public class ReaderServiceTests +public class ReaderServiceTests: AbstractDbTest { private readonly ITestOutputHelper _testOutputHelper; - private readonly IUnitOfWork _unitOfWork; - private readonly DataContext _context; private readonly ReaderService _readerService; - 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 ReaderServiceTests(ITestOutputHelper testOutputHelper) { _testOutputHelper = testOutputHelper; - var contextOptions = new DbContextOptionsBuilder().UseSqlite(CreateInMemoryDatabase()).Options; - _context = new DataContext(contextOptions); - Task.Run(SeedDb).GetAwaiter().GetResult(); - - var config = new MapperConfiguration(cfg => cfg.AddProfile()); - var mapper = config.CreateMapper(); - _unitOfWork = new UnitOfWork(_context, mapper, null); - _readerService = new ReaderService(_unitOfWork, Substitute.For>(), + _readerService = new ReaderService(UnitOfWork, Substitute.For>(), Substitute.For(), Substitute.For(), new DirectoryService(Substitute.For>(), new MockFileSystem()), Substitute.For()); @@ -63,55 +38,12 @@ public class ReaderServiceTests #region Setup - private static DbConnection CreateInMemoryDatabase() + + protected override async Task ResetDb() { - var connection = new SqliteConnection("Filename=:memory:"); + Context.Series.RemoveRange(Context.Series.ToList()); - connection.Open(); - - return connection; - } - - private async Task SeedDb() - { - await _context.Database.MigrateAsync(); - var filesystem = CreateFileSystem(); - - await Seed.SeedSettings(_context, - new DirectoryService(Substitute.For>(), 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 LibraryBuilder("Manga") - .WithFolderPath(new FolderPathBuilder("C:/data/").Build()) - .Build()); - 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; + await Context.SaveChangesAsync(); } #endregion @@ -145,10 +77,10 @@ public class ReaderServiceTests series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); Assert.Equal(0, (await _readerService.CapPageToChapter(1, -1)).Item1); @@ -173,14 +105,14 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); JobStorage.Current = new InMemoryStorage(); @@ -194,7 +126,7 @@ public class ReaderServiceTests }, 1); Assert.True(successful); - Assert.NotNull(await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1)); + Assert.NotNull(await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1)); } [Fact] @@ -211,14 +143,14 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); JobStorage.Current = new InMemoryStorage(); var successful = await _readerService.SaveReadingProgress(new ProgressDto() @@ -231,7 +163,7 @@ public class ReaderServiceTests }, 1); Assert.True(successful); - Assert.NotNull(await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1)); + Assert.NotNull(await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1)); Assert.True(await _readerService.SaveReadingProgress(new ProgressDto() { @@ -242,7 +174,9 @@ public class ReaderServiceTests BookScrollId = "/h1/" }, 1)); - Assert.Equal("/h1/", (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1)).BookScrollId); + var userProgress = await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1); + Assert.NotNull(userProgress); + Assert.Equal("/h1/", userProgress.BookScrollId); } @@ -268,22 +202,24 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var volumes = await _unitOfWork.VolumeRepository.GetVolumes(1); - await _readerService.MarkChaptersAsRead(await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1, volumes.First().Chapters); - await _context.SaveChangesAsync(); + var volumes = await UnitOfWork.VolumeRepository.GetVolumes(1); + await _readerService.MarkChaptersAsRead(await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1, volumes.First().Chapters); + await Context.SaveChangesAsync(); - Assert.Equal(2, (await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress)).Progresses.Count); + var userProgress = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress); + Assert.NotNull(userProgress); + Assert.Equal(2, userProgress.Progresses.Count); } #endregion @@ -306,27 +242,27 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var volumes = (await _unitOfWork.VolumeRepository.GetVolumes(1)).ToList(); - await _readerService.MarkChaptersAsRead(await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1, volumes.First().Chapters); + var volumes = (await UnitOfWork.VolumeRepository.GetVolumes(1)).ToList(); + await _readerService.MarkChaptersAsRead(await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1, volumes[0].Chapters); - await _context.SaveChangesAsync(); - Assert.Equal(2, (await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress)).Progresses.Count); + await Context.SaveChangesAsync(); + Assert.Equal(2, (await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress)).Progresses.Count); - await _readerService.MarkChaptersAsUnread(await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1, volumes.First().Chapters); - await _context.SaveChangesAsync(); + await _readerService.MarkChaptersAsUnread(await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1, volumes[0].Chapters); + await Context.SaveChangesAsync(); - var progresses = (await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress)).Progresses; + var progresses = (await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress)).Progresses; Assert.Equal(0, progresses.Max(p => p.PagesRead)); Assert.Equal(2, progresses.Count); } @@ -359,19 +295,19 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetNextChapterIdAsync(1, 1, 1, 1); - var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter); + var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter); Assert.NotNull(actualChapter); Assert.Equal("2", actualChapter.Range); } @@ -393,17 +329,17 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test Lib", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetNextChapterIdAsync(1, 1, 1, 1); - var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter); + var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter); Assert.NotNull(actualChapter); Assert.Equal("3-4", actualChapter.Volume.Name); Assert.Equal("1", actualChapter.Range); @@ -436,19 +372,19 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetNextChapterIdAsync(1, 2, 2, 1); - var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter); + var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter); Assert.NotNull(actualChapter); Assert.Equal("31", actualChapter.Range); } @@ -476,18 +412,18 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetNextChapterIdAsync(1, 1, 2, 1); - var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter); + var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter); Assert.NotNull(actualChapter); Assert.Equal("21", actualChapter.Range); } @@ -515,19 +451,19 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetNextChapterIdAsync(1, 1, 2, 1); - var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter); + var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter); Assert.NotNull(actualChapter); Assert.Equal("21", actualChapter.Range); } @@ -550,18 +486,18 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetNextChapterIdAsync(1, 2, 4, 1); Assert.NotEqual(-1, nextChapter); - var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter); + var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter); Assert.NotNull(actualChapter); Assert.Equal("21", actualChapter.Range); } @@ -587,21 +523,21 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetNextChapterIdAsync(1, 2, 3, 1); Assert.NotEqual(-1, nextChapter); - var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter); + var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter); Assert.NotNull(actualChapter); Assert.Equal(API.Services.Tasks.Scanner.Parser.Parser.DefaultChapter, actualChapter.Range); } @@ -624,13 +560,13 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.Series.Add(series); + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetNextChapterIdAsync(1, 2, 4, 1); Assert.Equal(-1, nextChapter); @@ -649,13 +585,13 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.Series.Add(series); + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetNextChapterIdAsync(1, 1, 2, 1); Assert.Equal(-1, nextChapter); @@ -674,13 +610,13 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.Series.Add(series); + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetNextChapterIdAsync(1, 1, 2, 1); Assert.Equal(-1, nextChapter); @@ -703,13 +639,13 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.Series.Add(series); + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetNextChapterIdAsync(1, 1, 2, 1); Assert.Equal(-1, nextChapter); @@ -739,13 +675,13 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.Series.Add(series); + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetNextChapterIdAsync(1, 2, 3, 1); Assert.Equal(-1, nextChapter); @@ -777,19 +713,19 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetNextChapterIdAsync(1, 1, 2, 1); Assert.NotEqual(-1, nextChapter); - var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter); + var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter); Assert.NotNull(actualChapter); Assert.Equal("A.cbz", actualChapter.Range); } @@ -815,19 +751,19 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetNextChapterIdAsync(1, 1, 2, 1); Assert.NotEqual(-1, nextChapter); - var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter); + var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter); Assert.NotNull(actualChapter); Assert.Equal("A.cbz", actualChapter.Range); } @@ -857,14 +793,14 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetNextChapterIdAsync(1, 3, 4, 1); Assert.Equal(-1, nextChapter); @@ -894,19 +830,19 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetNextChapterIdAsync(1, 2, 3, 1); Assert.NotEqual(-1, nextChapter); - var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter); + var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter); Assert.NotNull(actualChapter); Assert.Equal("B.cbz", actualChapter.Range); } @@ -927,21 +863,21 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); var user = new AppUserBuilder("majora2007", "fake").Build(); - _context.AppUser.Add(user); + Context.AppUser.Add(user); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); await _readerService.MarkChaptersAsRead(user, 1, new List() { - series.Volumes.First().Chapters.First() + series.Volumes[0].Chapters[0] }); var nextChapter = await _readerService.GetNextChapterIdAsync(1, 1, 1, 1); - var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter, ChapterIncludes.Volumes); + var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter, ChapterIncludes.Volumes); Assert.Equal(2, actualChapter.Volume.MinNumber); } @@ -973,19 +909,19 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var prevChapter = await _readerService.GetPrevChapterIdAsync(1, 1, 2, 1); - var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(prevChapter); + var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(prevChapter); Assert.NotNull(actualChapter); Assert.Equal("1", actualChapter.Range); } @@ -1013,18 +949,18 @@ public class ReaderServiceTests .Build()) .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.Series.Add(series); + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var prevChapter = await _readerService.GetPrevChapterIdAsync(1, 3, 5, 1); - var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(prevChapter); + var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(prevChapter); Assert.NotNull(actualChapter); Assert.Equal("22", actualChapter.Range); } @@ -1062,20 +998,20 @@ public class ReaderServiceTests .Build()) .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.Series.Add(series); + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); // prevChapter should be id from ch.21 from volume 2001 var prevChapter = await _readerService.GetPrevChapterIdAsync(1, 5, 7, 1); - var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(prevChapter); + var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(prevChapter); Assert.NotNull(actualChapter); Assert.Equal("21", actualChapter.Range); } @@ -1103,20 +1039,20 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var prevChapter = await _readerService.GetPrevChapterIdAsync(1, 2, 3, 1); - var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(prevChapter); + var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(prevChapter); Assert.NotNull(actualChapter); Assert.Equal("2", actualChapter.Range); } @@ -1139,21 +1075,21 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var prevChapter = await _readerService.GetPrevChapterIdAsync(1, 2, 3, 1); Assert.Equal(2, prevChapter); - var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(prevChapter); + var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(prevChapter); Assert.NotNull(actualChapter); Assert.Equal("2", actualChapter.Range); } @@ -1171,14 +1107,14 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); @@ -1199,14 +1135,14 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); @@ -1232,14 +1168,14 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var prevChapter = await _readerService.GetPrevChapterIdAsync(1, 2, 3, 1); Assert.Equal(-1, prevChapter); @@ -1269,20 +1205,20 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var prevChapter = await _readerService.GetPrevChapterIdAsync(1, 2,5, 1); - var chapterInfoDto = await _unitOfWork.ChapterRepository.GetChapterInfoDtoAsync(prevChapter); + var chapterInfoDto = await UnitOfWork.ChapterRepository.GetChapterInfoDtoAsync(prevChapter); Assert.Equal(1, chapterInfoDto.ChapterNumber.AsFloat()); // This is first chapter of first volume @@ -1303,14 +1239,14 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); @@ -1342,22 +1278,22 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var prevChapter = await _readerService.GetPrevChapterIdAsync(1, 2, 4, 1); Assert.NotEqual(-1, prevChapter); - var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(prevChapter); + var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(prevChapter); Assert.NotNull(actualChapter); Assert.Equal("A.cbz", actualChapter.Range); } @@ -1380,18 +1316,18 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var prevChapter = await _readerService.GetPrevChapterIdAsync(1, 1, 1, 1); Assert.NotEqual(-1, prevChapter); - var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(prevChapter); + var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(prevChapter); Assert.NotNull(actualChapter); Assert.Equal("22", actualChapter.Range); } @@ -1412,16 +1348,16 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); var user = new AppUserBuilder("majora2007", "fake").Build(); - _context.AppUser.Add(user); + Context.AppUser.Add(user); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetPrevChapterIdAsync(1, 2, 2, 1); - var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter, ChapterIncludes.Volumes); + var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter, ChapterIncludes.Volumes); Assert.Equal(1, actualChapter.Volume.MinNumber); } @@ -1454,15 +1390,15 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); @@ -1487,14 +1423,14 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); @@ -1526,14 +1462,14 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); @@ -1571,14 +1507,14 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); @@ -1606,7 +1542,7 @@ public class ReaderServiceTests VolumeId = 2 }, 1); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetContinuePoint(1, 1); @@ -1650,14 +1586,14 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); @@ -1679,7 +1615,7 @@ public class ReaderServiceTests VolumeId = 3 // Volume 2 id }, 1); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetContinuePoint(1, 1); @@ -1705,14 +1641,14 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetContinuePoint(1, 1); @@ -1738,14 +1674,14 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); @@ -1773,7 +1709,7 @@ public class ReaderServiceTests VolumeId = 2 }, 1); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetContinuePoint(1, 1); @@ -1800,15 +1736,15 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetContinuePoint(1, 1); @@ -1838,22 +1774,22 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); var user = new AppUser() { UserName = "majora2007" }; - _context.AppUser.Add(user); + Context.AppUser.Add(user); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); // Mark everything but chapter 101 as read await _readerService.MarkSeriesAsRead(user, 1); - await _unitOfWork.CommitAsync(); + await UnitOfWork.CommitAsync(); // Unmark last chapter as read - var vol = await _unitOfWork.VolumeRepository.GetVolumeByIdAsync(1); + var vol = await UnitOfWork.VolumeRepository.GetVolumeByIdAsync(1); foreach (var chapt in vol.Chapters) { await _readerService.SaveReadingProgress(new ProgressDto() @@ -1864,7 +1800,7 @@ public class ReaderServiceTests VolumeId = 1 }, 1); } - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetContinuePoint(1, 1); @@ -1892,22 +1828,22 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); var user = new AppUser() { UserName = "majora2007" }; - _context.AppUser.Add(user); + Context.AppUser.Add(user); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); // Mark everything but chapter 101 as read await _readerService.MarkSeriesAsRead(user, 1); - await _unitOfWork.CommitAsync(); + await UnitOfWork.CommitAsync(); // Unmark last chapter as read - var vol = await _unitOfWork.VolumeRepository.GetVolumeByIdAsync(1); + var vol = await UnitOfWork.VolumeRepository.GetVolumeByIdAsync(1); await _readerService.SaveReadingProgress(new ProgressDto() { PageNum = 0, @@ -1922,7 +1858,7 @@ public class ReaderServiceTests SeriesId = 1, VolumeId = 1 }, 1); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetContinuePoint(1, 1); @@ -1945,14 +1881,14 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); @@ -1979,7 +1915,7 @@ public class ReaderServiceTests VolumeId = 2 }, 1); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetContinuePoint(1, 1); @@ -2005,21 +1941,21 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); // Save progress on first volume chapters and 1st of second volume - var user = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress); + var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress); await _readerService.MarkSeriesAsRead(user, 1); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetContinuePoint(1, 1); @@ -2043,14 +1979,14 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); @@ -2077,7 +2013,7 @@ public class ReaderServiceTests VolumeId = 1 }, 1); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetContinuePoint(1, 1); @@ -2106,20 +2042,20 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var user = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress); + var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress); await _readerService.MarkSeriesAsRead(user, 1); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); // Add 2 new unread series to the Series series.Volumes[0].Chapters.Add(new ChapterBuilder("231") @@ -2128,8 +2064,8 @@ public class ReaderServiceTests series.Volumes[2].Chapters.Add(new ChapterBuilder("14.9") .WithPages(1) .Build()); - _context.Series.Attach(series); - await _context.SaveChangesAsync(); + Context.Series.Attach(series); + await Context.SaveChangesAsync(); // This tests that if you add a series later to a volume and a loose leaf chapter, we continue from that volume, rather than loose leaf var nextChapter = await _readerService.GetContinuePoint(1, 1); @@ -2169,26 +2105,26 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); // Save progress on first volume chapters and 1st of second volume - var user = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress); + var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress); await _readerService.MarkChaptersAsRead(user, 1, new List() { readChapter1, readChapter2 }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetContinuePoint(1, 1); @@ -2225,14 +2161,14 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); await _readerService.SaveReadingProgress(new ProgressDto() { @@ -2290,7 +2226,7 @@ public class ReaderServiceTests VolumeId = 2 }, 1); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetContinuePoint(1, 1); @@ -2319,14 +2255,14 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); await _readerService.SaveReadingProgress(new ProgressDto() { @@ -2336,7 +2272,7 @@ public class ReaderServiceTests VolumeId = 1 }, 1); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _readerService.GetContinuePoint(1, 1); @@ -2351,7 +2287,7 @@ public class ReaderServiceTests SeriesId = 1, VolumeId = 1 }, 1); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); nextChapter = await _readerService.GetContinuePoint(1, 1); @@ -2366,7 +2302,7 @@ public class ReaderServiceTests SeriesId = 1, VolumeId = 1 }, 1); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); nextChapter = await _readerService.GetContinuePoint(1, 1); @@ -2396,26 +2332,26 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress); + var user = await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress); await _readerService.MarkChaptersUntilAsRead(user, 1, 5); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); // Validate correct chapters have read status - Assert.Equal(1, (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1)).PagesRead); - Assert.Equal(1, (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(2, 1)).PagesRead); - Assert.Equal(1, (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(3, 1)).PagesRead); - Assert.Null((await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(4, 1))); + Assert.Equal(1, (await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1)).PagesRead); + Assert.Equal(1, (await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(2, 1)).PagesRead); + Assert.Equal(1, (await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(3, 1)).PagesRead); + Assert.Null((await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(4, 1))); } [Fact] @@ -2436,27 +2372,27 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress); + var user = await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress); await _readerService.MarkChaptersUntilAsRead(user, 1, 2.5f); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); // Validate correct chapters have read status - Assert.Equal(1, (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1)).PagesRead); - Assert.Equal(1, (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(2, 1)).PagesRead); - Assert.Equal(1, (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(3, 1)).PagesRead); - Assert.Null((await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(4, 1))); - Assert.Null((await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(5, 1))); + Assert.Equal(1, (await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1)).PagesRead); + Assert.Equal(1, (await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(2, 1)).PagesRead); + Assert.Equal(1, (await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(3, 1)).PagesRead); + Assert.Null((await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(4, 1))); + Assert.Null((await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(5, 1))); } [Fact] @@ -2474,23 +2410,24 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress); + var user = await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress); + Assert.NotNull(user); await _readerService.MarkChaptersUntilAsRead(user, 1, 2); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); // Validate correct chapters have read status - Assert.True(await _unitOfWork.AppUserProgressRepository.UserHasProgress(LibraryType.Manga, 1)); + Assert.True(await UnitOfWork.AppUserProgressRepository.UserHasProgress(LibraryType.Manga, 1)); } [Fact] @@ -2525,24 +2462,24 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress); + var user = await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress); const int markReadUntilNumber = 47; await _readerService.MarkChaptersUntilAsRead(user, 1, markReadUntilNumber); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var volumes = await _unitOfWork.VolumeRepository.GetVolumesDtoAsync(1, 1); + var volumes = await UnitOfWork.VolumeRepository.GetVolumesDtoAsync(1, 1); Assert.True(volumes.SelectMany(v => v.Chapters).All(c => { // Specials are ignored. @@ -2579,21 +2516,21 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - await _readerService.MarkSeriesAsRead(await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1); - await _context.SaveChangesAsync(); + await _readerService.MarkSeriesAsRead(await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1); + await Context.SaveChangesAsync(); - Assert.Equal(4, (await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress)).Progresses.Count); + Assert.Equal(4, (await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress)).Progresses.Count); } @@ -2614,27 +2551,27 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var volumes = (await _unitOfWork.VolumeRepository.GetVolumes(1)).ToList(); - await _readerService.MarkChaptersAsRead(await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1, volumes.First().Chapters); + var volumes = (await UnitOfWork.VolumeRepository.GetVolumes(1)).ToList(); + await _readerService.MarkChaptersAsRead(await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1, volumes[0].Chapters); - await _context.SaveChangesAsync(); - Assert.Equal(2, (await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress)).Progresses.Count); + await Context.SaveChangesAsync(); + Assert.Equal(2, (await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress)).Progresses.Count); - await _readerService.MarkSeriesAsUnread(await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1); - await _context.SaveChangesAsync(); + await _readerService.MarkSeriesAsUnread(await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1); + await Context.SaveChangesAsync(); - var progresses = (await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress)).Progresses; + var progresses = (await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress)).Progresses; Assert.Equal(0, progresses.Max(p => p.PagesRead)); Assert.Equal(2, progresses.Count); } @@ -2702,31 +2639,32 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress); + var user = await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress); await _readerService.MarkVolumesUntilAsRead(user, 1, 2002); - await _context.SaveChangesAsync(); + Assert.NotNull(user); + await Context.SaveChangesAsync(); // Validate loose leaf chapters don't get marked as read - Assert.Null((await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1))); - Assert.Null((await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(2, 1))); - Assert.Null((await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(3, 1))); + Assert.Null((await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1))); + Assert.Null((await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(2, 1))); + Assert.Null((await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(3, 1))); // Validate that volumes 1997 and 2002 both have their respective chapter 0 marked as read - Assert.Equal(1, (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(5, 1)).PagesRead); - Assert.Equal(1, (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(6, 1)).PagesRead); + Assert.Equal(1, (await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(5, 1)).PagesRead); + Assert.Equal(1, (await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(6, 1)).PagesRead); // Validate that the chapter 0 of the following volume (2003) is not read - Assert.Null(await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(7, 1)); + Assert.Null(await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(7, 1)); } @@ -2757,30 +2695,31 @@ public class ReaderServiceTests .Build(); series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build(); - _context.Series.Add(series); + Context.Series.Add(series); - _context.AppUser.Add(new AppUser() + Context.AppUser.Add(new AppUser() { UserName = "majora2007" }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress); + var user = await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress); + Assert.NotNull(user); await _readerService.MarkVolumesUntilAsRead(user, 1, 2002); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); // Validate loose leaf chapters don't get marked as read - Assert.Null((await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1))); - Assert.Null((await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(2, 1))); - Assert.Null((await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(3, 1))); + Assert.Null((await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1))); + Assert.Null((await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(2, 1))); + Assert.Null((await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(3, 1))); // Validate volumes chapter 0 have read status - Assert.Equal(1, (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(5, 1)).PagesRead); - Assert.Equal(1, (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(6, 1)).PagesRead); - Assert.Null((await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(3, 1))); + Assert.Equal(1, (await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(5, 1))?.PagesRead); + Assert.Equal(1, (await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(6, 1))?.PagesRead); + Assert.Null((await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(3, 1))); } #endregion diff --git a/API.Tests/Services/ReadingListServiceTests.cs b/API.Tests/Services/ReadingListServiceTests.cs index 6c24dd894..7a6ed3e0b 100644 --- a/API.Tests/Services/ReadingListServiceTests.cs +++ b/API.Tests/Services/ReadingListServiceTests.cs @@ -11,15 +11,11 @@ using API.DTOs.ReadingLists; using API.DTOs.ReadingLists.CBL; using API.Entities; using API.Entities.Enums; -using API.Entities.Metadata; -using API.Extensions; using API.Helpers; using API.Helpers.Builders; using API.Services; using API.Services.Plus; -using API.Services.Tasks; using API.SignalR; -using API.Tests.Helpers; using AutoMapper; using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; @@ -583,6 +579,93 @@ public class ReadingListServiceTests Assert.Equal(AgeRating.G, readingList.AgeRating); } + [Fact] + public async Task UpdateReadingListAgeRatingForSeries() + { + await ResetDb(); + var spiceAndWolf = new SeriesBuilder("Spice and Wolf") + .WithMetadata(new SeriesMetadataBuilder().Build()) + .WithVolumes([ + new VolumeBuilder("1") + .WithChapters([ + new ChapterBuilder("1").Build(), + new ChapterBuilder("2").Build(), + ]).Build() + ]).Build(); + spiceAndWolf.Metadata.AgeRating = AgeRating.Everyone; + + var othersidePicnic = new SeriesBuilder("Otherside Picnic ") + .WithMetadata(new SeriesMetadataBuilder().Build()) + .WithVolumes([ + new VolumeBuilder("1") + .WithChapters([ + new ChapterBuilder("1").Build(), + new ChapterBuilder("2").Build(), + ]).Build() + ]).Build(); + othersidePicnic.Metadata.AgeRating = AgeRating.Everyone; + + _context.AppUser.Add(new AppUser() + { + UserName = "Amelia", + ReadingLists = new List(), + Libraries = new List + { + new LibraryBuilder("Test Library", LibraryType.LightNovel) + .WithSeries(spiceAndWolf) + .WithSeries(othersidePicnic) + .Build(), + }, + }); + + await _context.SaveChangesAsync(); + var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync("Amelia", AppUserIncludes.ReadingLists); + Assert.NotNull(user); + + var myTestReadingList = new ReadingListBuilder("MyReadingList").Build(); + var mySecondTestReadingList = new ReadingListBuilder("MySecondReadingList").Build(); + var myThirdTestReadingList = new ReadingListBuilder("MyThirdReadingList").Build(); + user.ReadingLists = new List() + { + myTestReadingList, + mySecondTestReadingList, + myThirdTestReadingList, + }; + + + await _readingListService.AddChaptersToReadingList(spiceAndWolf.Id, new List {1, 2}, myTestReadingList); + await _readingListService.AddChaptersToReadingList(othersidePicnic.Id, new List {3, 4}, myTestReadingList); + await _readingListService.AddChaptersToReadingList(spiceAndWolf.Id, new List {1, 2}, myThirdTestReadingList); + await _readingListService.AddChaptersToReadingList(othersidePicnic.Id, new List {3, 4}, mySecondTestReadingList); + + + _unitOfWork.UserRepository.Update(user); + await _unitOfWork.CommitAsync(); + + await _readingListService.CalculateReadingListAgeRating(myTestReadingList); + await _readingListService.CalculateReadingListAgeRating(mySecondTestReadingList); + Assert.Equal(AgeRating.Everyone, myTestReadingList.AgeRating); + Assert.Equal(AgeRating.Everyone, mySecondTestReadingList.AgeRating); + Assert.Equal(AgeRating.Everyone, myThirdTestReadingList.AgeRating); + + await _readingListService.UpdateReadingListAgeRatingForSeries(othersidePicnic.Id, AgeRating.Mature); + await _unitOfWork.CommitAsync(); + + // Reading lists containing Otherside Picnic are updated + myTestReadingList = await _unitOfWork.ReadingListRepository.GetReadingListByIdAsync(1); + Assert.NotNull(myTestReadingList); + Assert.Equal(AgeRating.Mature, myTestReadingList.AgeRating); + + mySecondTestReadingList = await _unitOfWork.ReadingListRepository.GetReadingListByIdAsync(2); + Assert.NotNull(mySecondTestReadingList); + Assert.Equal(AgeRating.Mature, mySecondTestReadingList.AgeRating); + + // Unrelated reading list is not updated + myThirdTestReadingList = await _unitOfWork.ReadingListRepository.GetReadingListByIdAsync(3); + Assert.NotNull(myThirdTestReadingList); + Assert.Equal(AgeRating.Everyone, myThirdTestReadingList.AgeRating); + } + #endregion #region CalculateStartAndEndDates diff --git a/API.Tests/Services/ReadingProfileServiceTest.cs b/API.Tests/Services/ReadingProfileServiceTest.cs new file mode 100644 index 000000000..b3d81e5ac --- /dev/null +++ b/API.Tests/Services/ReadingProfileServiceTest.cs @@ -0,0 +1,561 @@ +using System.Linq; +using System.Threading.Tasks; +using API.Data.Repositories; +using API.DTOs; +using API.Entities; +using API.Entities.Enums; +using API.Helpers.Builders; +using API.Services; +using API.Tests.Helpers; +using Kavita.Common; +using Microsoft.EntityFrameworkCore; +using NSubstitute; +using Xunit; + +namespace API.Tests.Services; + +public class ReadingProfileServiceTest: AbstractDbTest +{ + + /// + /// Does not add a default reading profile + /// + /// + public async Task<(ReadingProfileService, AppUser, Library, Series)> Setup() + { + var user = new AppUserBuilder("amelia", "amelia@localhost").Build(); + Context.AppUser.Add(user); + await UnitOfWork.CommitAsync(); + + var series = new SeriesBuilder("Spice and Wolf").Build(); + + var library = new LibraryBuilder("Manga") + .WithSeries(series) + .Build(); + + user.Libraries.Add(library); + await UnitOfWork.CommitAsync(); + + var rps = new ReadingProfileService(UnitOfWork, Substitute.For(), Mapper); + user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.UserPreferences); + + return (rps, user, library, series); + } + + [Fact] + public async Task ImplicitProfileFirst() + { + await ResetDb(); + var (rps, user, library, series) = await Setup(); + + var profile = new AppUserReadingProfileBuilder(user.Id) + .WithKind(ReadingProfileKind.Implicit) + .WithSeries(series) + .WithName("Implicit Profile") + .Build(); + + var profile2 = new AppUserReadingProfileBuilder(user.Id) + .WithSeries(series) + .WithName("Non-implicit Profile") + .Build(); + + user.ReadingProfiles.Add(profile); + user.ReadingProfiles.Add(profile2); + await UnitOfWork.CommitAsync(); + + var seriesProfile = await rps.GetReadingProfileDtoForSeries(user.Id, series.Id); + Assert.NotNull(seriesProfile); + Assert.Equal("Implicit Profile", seriesProfile.Name); + + // Find parent + seriesProfile = await rps.GetReadingProfileDtoForSeries(user.Id, series.Id, true); + Assert.NotNull(seriesProfile); + Assert.Equal("Non-implicit Profile", seriesProfile.Name); + } + + [Fact] + public async Task CantDeleteDefaultReadingProfile() + { + await ResetDb(); + var (rps, user, _, _) = await Setup(); + + var profile = new AppUserReadingProfileBuilder(user.Id) + .WithKind(ReadingProfileKind.Default) + .Build(); + Context.AppUserReadingProfiles.Add(profile); + await UnitOfWork.CommitAsync(); + + await Assert.ThrowsAsync(async () => + { + await rps.DeleteReadingProfile(user.Id, profile.Id); + }); + + var profile2 = new AppUserReadingProfileBuilder(user.Id).Build(); + Context.AppUserReadingProfiles.Add(profile2); + await UnitOfWork.CommitAsync(); + + await rps.DeleteReadingProfile(user.Id, profile2.Id); + await UnitOfWork.CommitAsync(); + + var allProfiles = await Context.AppUserReadingProfiles.ToListAsync(); + Assert.Single(allProfiles); + } + + [Fact] + public async Task CreateImplicitSeriesReadingProfile() + { + await ResetDb(); + var (rps, user, _, series) = await Setup(); + + var dto = new UserReadingProfileDto + { + ReaderMode = ReaderMode.Webtoon, + ScalingOption = ScalingOption.FitToHeight, + WidthOverride = 53, + }; + + await rps.UpdateImplicitReadingProfile(user.Id, series.Id, dto); + + var profile = await rps.GetReadingProfileForSeries(user.Id, series.Id); + Assert.NotNull(profile); + Assert.Contains(profile.SeriesIds, s => s == series.Id); + Assert.Equal(ReadingProfileKind.Implicit, profile.Kind); + } + + [Fact] + public async Task UpdateImplicitReadingProfile_DoesNotCreateNew() + { + await ResetDb(); + var (rps, user, _, series) = await Setup(); + + var dto = new UserReadingProfileDto + { + ReaderMode = ReaderMode.Webtoon, + ScalingOption = ScalingOption.FitToHeight, + WidthOverride = 53, + }; + + await rps.UpdateImplicitReadingProfile(user.Id, series.Id, dto); + + var profile = await rps.GetReadingProfileForSeries(user.Id, series.Id); + Assert.NotNull(profile); + Assert.Contains(profile.SeriesIds, s => s == series.Id); + Assert.Equal(ReadingProfileKind.Implicit, profile.Kind); + + dto = new UserReadingProfileDto + { + ReaderMode = ReaderMode.LeftRight, + }; + + await rps.UpdateImplicitReadingProfile(user.Id, series.Id, dto); + profile = await rps.GetReadingProfileForSeries(user.Id, series.Id); + Assert.NotNull(profile); + Assert.Contains(profile.SeriesIds, s => s == series.Id); + Assert.Equal(ReadingProfileKind.Implicit, profile.Kind); + Assert.Equal(ReaderMode.LeftRight, profile.ReaderMode); + + var implicitCount = await Context.AppUserReadingProfiles + .Where(p => p.Kind == ReadingProfileKind.Implicit) + .CountAsync(); + Assert.Equal(1, implicitCount); + } + + [Fact] + public async Task GetCorrectProfile() + { + await ResetDb(); + var (rps, user, lib, series) = await Setup(); + + var profile = new AppUserReadingProfileBuilder(user.Id) + .WithSeries(series) + .WithName("Series Specific") + .Build(); + var profile2 = new AppUserReadingProfileBuilder(user.Id) + .WithLibrary(lib) + .WithName("Library Specific") + .Build(); + var profile3 = new AppUserReadingProfileBuilder(user.Id) + .WithKind(ReadingProfileKind.Default) + .WithName("Global") + .Build(); + Context.AppUserReadingProfiles.Add(profile); + Context.AppUserReadingProfiles.Add(profile2); + Context.AppUserReadingProfiles.Add(profile3); + + var series2 = new SeriesBuilder("Rainbows After Storms").Build(); + lib.Series.Add(series2); + + var lib2 = new LibraryBuilder("Manga2").Build(); + var series3 = new SeriesBuilder("A Tropical Fish Yearns for Snow").Build(); + lib2.Series.Add(series3); + + user.Libraries.Add(lib2); + await UnitOfWork.CommitAsync(); + + var p = await rps.GetReadingProfileDtoForSeries(user.Id, series.Id); + Assert.NotNull(p); + Assert.Equal("Series Specific", p.Name); + + p = await rps.GetReadingProfileDtoForSeries(user.Id, series2.Id); + Assert.NotNull(p); + Assert.Equal("Library Specific", p.Name); + + p = await rps.GetReadingProfileDtoForSeries(user.Id, series3.Id); + Assert.NotNull(p); + Assert.Equal("Global", p.Name); + } + + [Fact] + public async Task ReplaceReadingProfile() + { + await ResetDb(); + var (rps, user, lib, series) = await Setup(); + + var profile1 = new AppUserReadingProfileBuilder(user.Id) + .WithSeries(series) + .WithName("Profile 1") + .Build(); + + var profile2 = new AppUserReadingProfileBuilder(user.Id) + .WithName("Profile 2") + .Build(); + + Context.AppUserReadingProfiles.Add(profile1); + Context.AppUserReadingProfiles.Add(profile2); + await UnitOfWork.CommitAsync(); + + var profile = await rps.GetReadingProfileDtoForSeries(user.Id, series.Id); + Assert.NotNull(profile); + Assert.Equal("Profile 1", profile.Name); + + await rps.AddProfileToSeries(user.Id, profile2.Id, series.Id); + profile = await rps.GetReadingProfileDtoForSeries(user.Id, series.Id); + Assert.NotNull(profile); + Assert.Equal("Profile 2", profile.Name); + } + + [Fact] + public async Task DeleteReadingProfile() + { + await ResetDb(); + var (rps, user, lib, series) = await Setup(); + + var profile1 = new AppUserReadingProfileBuilder(user.Id) + .WithSeries(series) + .WithName("Profile 1") + .Build(); + + Context.AppUserReadingProfiles.Add(profile1); + await UnitOfWork.CommitAsync(); + + await rps.ClearSeriesProfile(user.Id, series.Id); + var profiles = await UnitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(user.Id); + Assert.DoesNotContain(profiles, rp => rp.SeriesIds.Contains(series.Id)); + + } + + [Fact] + public async Task BulkAddReadingProfiles() + { + await ResetDb(); + var (rps, user, lib, series) = await Setup(); + + for (var i = 0; i < 10; i++) + { + var generatedSeries = new SeriesBuilder($"Generated Series #{i}").Build(); + lib.Series.Add(generatedSeries); + } + + var profile = new AppUserReadingProfileBuilder(user.Id) + .WithSeries(series) + .WithName("Profile") + .Build(); + Context.AppUserReadingProfiles.Add(profile); + + var profile2 = new AppUserReadingProfileBuilder(user.Id) + .WithSeries(series) + .WithName("Profile2") + .Build(); + Context.AppUserReadingProfiles.Add(profile2); + + await UnitOfWork.CommitAsync(); + + var someSeriesIds = lib.Series.Take(lib.Series.Count / 2).Select(s => s.Id).ToList(); + await rps.BulkAddProfileToSeries(user.Id, profile.Id, someSeriesIds); + + foreach (var id in someSeriesIds) + { + var foundProfile = await rps.GetReadingProfileDtoForSeries(user.Id, id); + Assert.NotNull(foundProfile); + Assert.Equal(profile.Id, foundProfile.Id); + } + + var allIds = lib.Series.Select(s => s.Id).ToList(); + await rps.BulkAddProfileToSeries(user.Id, profile2.Id, allIds); + + foreach (var id in allIds) + { + var foundProfile = await rps.GetReadingProfileDtoForSeries(user.Id, id); + Assert.NotNull(foundProfile); + Assert.Equal(profile2.Id, foundProfile.Id); + } + + + } + + [Fact] + public async Task BulkAssignDeletesImplicit() + { + await ResetDb(); + var (rps, user, lib, series) = await Setup(); + + var implicitProfile = Mapper.Map(new AppUserReadingProfileBuilder(user.Id) + .Build()); + + var profile = new AppUserReadingProfileBuilder(user.Id) + .WithName("Profile 1") + .Build(); + Context.AppUserReadingProfiles.Add(profile); + + for (var i = 0; i < 10; i++) + { + var generatedSeries = new SeriesBuilder($"Generated Series #{i}").Build(); + lib.Series.Add(generatedSeries); + } + await UnitOfWork.CommitAsync(); + + var ids = lib.Series.Select(s => s.Id).ToList(); + + foreach (var id in ids) + { + await rps.UpdateImplicitReadingProfile(user.Id, id, implicitProfile); + var seriesProfile = await rps.GetReadingProfileDtoForSeries(user.Id, id); + Assert.NotNull(seriesProfile); + Assert.Equal(ReadingProfileKind.Implicit, seriesProfile.Kind); + } + + await rps.BulkAddProfileToSeries(user.Id, profile.Id, ids); + + foreach (var id in ids) + { + var seriesProfile = await rps.GetReadingProfileDtoForSeries(user.Id, id); + Assert.NotNull(seriesProfile); + Assert.Equal(ReadingProfileKind.User, seriesProfile.Kind); + } + + var implicitCount = await Context.AppUserReadingProfiles + .Where(p => p.Kind == ReadingProfileKind.Implicit) + .CountAsync(); + Assert.Equal(0, implicitCount); + } + + [Fact] + public async Task AddDeletesImplicit() + { + await ResetDb(); + var (rps, user, lib, series) = await Setup(); + + var implicitProfile = Mapper.Map(new AppUserReadingProfileBuilder(user.Id) + .WithKind(ReadingProfileKind.Implicit) + .Build()); + + var profile = new AppUserReadingProfileBuilder(user.Id) + .WithName("Profile 1") + .Build(); + Context.AppUserReadingProfiles.Add(profile); + await UnitOfWork.CommitAsync(); + + await rps.UpdateImplicitReadingProfile(user.Id, series.Id, implicitProfile); + + var seriesProfile = await rps.GetReadingProfileDtoForSeries(user.Id, series.Id); + Assert.NotNull(seriesProfile); + Assert.Equal(ReadingProfileKind.Implicit, seriesProfile.Kind); + + await rps.AddProfileToSeries(user.Id, profile.Id, series.Id); + + seriesProfile = await rps.GetReadingProfileDtoForSeries(user.Id, series.Id); + Assert.NotNull(seriesProfile); + Assert.Equal(ReadingProfileKind.User, seriesProfile.Kind); + + var implicitCount = await Context.AppUserReadingProfiles + .Where(p => p.Kind == ReadingProfileKind.Implicit) + .CountAsync(); + Assert.Equal(0, implicitCount); + } + + [Fact] + public async Task CreateReadingProfile() + { + await ResetDb(); + var (rps, user, lib, series) = await Setup(); + + var dto = new UserReadingProfileDto + { + Name = "Profile 1", + ReaderMode = ReaderMode.LeftRight, + EmulateBook = false, + }; + + await rps.CreateReadingProfile(user.Id, dto); + + var dto2 = new UserReadingProfileDto + { + Name = "Profile 2", + ReaderMode = ReaderMode.LeftRight, + EmulateBook = false, + }; + + await rps.CreateReadingProfile(user.Id, dto2); + + var dto3 = new UserReadingProfileDto + { + Name = "Profile 1", // Not unique name + ReaderMode = ReaderMode.LeftRight, + EmulateBook = false, + }; + + await Assert.ThrowsAsync(async () => + { + await rps.CreateReadingProfile(user.Id, dto3); + }); + + var allProfiles = Context.AppUserReadingProfiles.ToList(); + Assert.Equal(2, allProfiles.Count); + } + + [Fact] + public async Task ClearSeriesProfile_RemovesImplicitAndUnlinksExplicit() + { + await ResetDb(); + var (rps, user, _, series) = await Setup(); + + var implicitProfile = new AppUserReadingProfileBuilder(user.Id) + .WithSeries(series) + .WithKind(ReadingProfileKind.Implicit) + .WithName("Implicit Profile") + .Build(); + + var explicitProfile = new AppUserReadingProfileBuilder(user.Id) + .WithSeries(series) + .WithName("Explicit Profile") + .Build(); + + Context.AppUserReadingProfiles.Add(implicitProfile); + Context.AppUserReadingProfiles.Add(explicitProfile); + await UnitOfWork.CommitAsync(); + + var allBefore = await UnitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(user.Id); + Assert.Equal(2, allBefore.Count(rp => rp.SeriesIds.Contains(series.Id))); + + await rps.ClearSeriesProfile(user.Id, series.Id); + + var remainingProfiles = await Context.AppUserReadingProfiles.ToListAsync(); + Assert.Single(remainingProfiles); + Assert.Equal("Explicit Profile", remainingProfiles[0].Name); + Assert.Empty(remainingProfiles[0].SeriesIds); + + var profilesForSeries = await UnitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(user.Id); + Assert.DoesNotContain(profilesForSeries, rp => rp.SeriesIds.Contains(series.Id)); + } + + [Fact] + public async Task AddProfileToLibrary_AddsAndOverridesExisting() + { + await ResetDb(); + var (rps, user, lib, _) = await Setup(); + + var profile = new AppUserReadingProfileBuilder(user.Id) + .WithName("Library Profile") + .Build(); + Context.AppUserReadingProfiles.Add(profile); + await UnitOfWork.CommitAsync(); + + await rps.AddProfileToLibrary(user.Id, profile.Id, lib.Id); + await UnitOfWork.CommitAsync(); + + var linkedProfile = (await UnitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(user.Id)) + .FirstOrDefault(rp => rp.LibraryIds.Contains(lib.Id)); + Assert.NotNull(linkedProfile); + Assert.Equal(profile.Id, linkedProfile.Id); + + var newProfile = new AppUserReadingProfileBuilder(user.Id) + .WithName("New Profile") + .Build(); + Context.AppUserReadingProfiles.Add(newProfile); + await UnitOfWork.CommitAsync(); + + await rps.AddProfileToLibrary(user.Id, newProfile.Id, lib.Id); + await UnitOfWork.CommitAsync(); + + linkedProfile = (await UnitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(user.Id)) + .FirstOrDefault(rp => rp.LibraryIds.Contains(lib.Id)); + Assert.NotNull(linkedProfile); + Assert.Equal(newProfile.Id, linkedProfile.Id); + } + + [Fact] + public async Task ClearLibraryProfile_RemovesImplicitOrUnlinksExplicit() + { + await ResetDb(); + var (rps, user, lib, _) = await Setup(); + + var implicitProfile = new AppUserReadingProfileBuilder(user.Id) + .WithKind(ReadingProfileKind.Implicit) + .WithLibrary(lib) + .Build(); + Context.AppUserReadingProfiles.Add(implicitProfile); + await UnitOfWork.CommitAsync(); + + await rps.ClearLibraryProfile(user.Id, lib.Id); + var profile = (await UnitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(user.Id)) + .FirstOrDefault(rp => rp.LibraryIds.Contains(lib.Id)); + Assert.Null(profile); + + var explicitProfile = new AppUserReadingProfileBuilder(user.Id) + .WithLibrary(lib) + .Build(); + Context.AppUserReadingProfiles.Add(explicitProfile); + await UnitOfWork.CommitAsync(); + + await rps.ClearLibraryProfile(user.Id, lib.Id); + profile = (await UnitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(user.Id)) + .FirstOrDefault(rp => rp.LibraryIds.Contains(lib.Id)); + Assert.Null(profile); + + var stillExists = await Context.AppUserReadingProfiles.FindAsync(explicitProfile.Id); + Assert.NotNull(stillExists); + } + + /// + /// As response to #3793, I'm not sure if we want to keep this. It's not the most nice. But I think the idea of this test + /// is worth having. + /// + [Fact] + public void UpdateFields_UpdatesAll() + { + // Repeat to ensure booleans are flipped and actually tested + for (int i = 0; i < 10; i++) + { + var profile = new AppUserReadingProfile(); + var dto = new UserReadingProfileDto(); + + RandfHelper.SetRandomValues(profile); + RandfHelper.SetRandomValues(dto); + + ReadingProfileService.UpdateReaderProfileFields(profile, dto); + + var newDto = Mapper.Map(profile); + + Assert.True(RandfHelper.AreSimpleFieldsEqual(dto, newDto, + ["k__BackingField", "k__BackingField"])); + } + } + + + + protected override async Task ResetDb() + { + Context.AppUserReadingProfiles.RemoveRange(Context.AppUserReadingProfiles); + await UnitOfWork.CommitAsync(); + } +} diff --git a/API.Tests/Services/ScannerServiceTests.cs b/API.Tests/Services/ScannerServiceTests.cs index 2c09fe9b9..c337d2311 100644 --- a/API.Tests/Services/ScannerServiceTests.cs +++ b/API.Tests/Services/ScannerServiceTests.cs @@ -1,33 +1,16 @@ using System; using System.Collections.Generic; using System.IO; -using System.IO.Abstractions; -using System.IO.Compression; using System.Linq; -using System.Text; -using System.Text.Json; using System.Threading.Tasks; -using System.Xml; -using System.Xml.Serialization; -using API.Data; using API.Data.Metadata; using API.Data.Repositories; using API.Entities; using API.Entities.Enums; using API.Extensions; -using API.Helpers; -using API.Helpers.Builders; -using API.Services; -using API.Services.Plus; -using API.Services.Tasks; -using API.Services.Tasks.Metadata; -using API.Services.Tasks.Scanner; using API.Services.Tasks.Scanner.Parser; -using API.SignalR; using API.Tests.Helpers; using Hangfire; -using Microsoft.Extensions.Logging; -using NSubstitute; using Xunit; using Xunit.Abstractions; @@ -45,13 +28,35 @@ public class ScannerServiceTests : AbstractDbTest // Set up Hangfire to use in-memory storage for testing GlobalConfiguration.Configuration.UseInMemoryStorage(); - _scannerHelper = new ScannerHelper(_unitOfWork, testOutputHelper); + _scannerHelper = new ScannerHelper(UnitOfWork, testOutputHelper); } protected override async Task ResetDb() { - _context.Library.RemoveRange(_context.Library); - await _context.SaveChangesAsync(); + Context.Library.RemoveRange(Context.Library); + await Context.SaveChangesAsync(); + } + + + protected async Task SetAllSeriesLastScannedInThePast(Library library, TimeSpan? duration = null) + { + foreach (var series in library.Series) + { + await SetLastScannedInThePast(series, duration, false); + } + await Context.SaveChangesAsync(); + } + + protected async Task SetLastScannedInThePast(Series series, TimeSpan? duration = null, bool save = true) + { + duration ??= TimeSpan.FromMinutes(2); + series.LastFolderScanned = DateTime.Now.Subtract(duration.Value); + Context.Series.Update(series); + + if (save) + { + await Context.SaveChangesAsync(); + } } [Fact] @@ -61,7 +66,7 @@ public class ScannerServiceTests : AbstractDbTest var library = await _scannerHelper.GenerateScannerData(testcase); var scanner = _scannerHelper.CreateServices(); await scanner.ScanLibrary(library.Id); - var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); Assert.NotNull(postLib); Assert.Equal(4, postLib.Series.Count); @@ -74,7 +79,7 @@ public class ScannerServiceTests : AbstractDbTest var library = await _scannerHelper.GenerateScannerData(testcase); var scanner = _scannerHelper.CreateServices(); await scanner.ScanLibrary(library.Id); - var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); Assert.NotNull(postLib); Assert.Single(postLib.Series); @@ -85,11 +90,11 @@ public class ScannerServiceTests : AbstractDbTest [Fact] public async Task ScanLibrary_FlatSeries() { - var testcase = "Flat Series - Manga.json"; + const string testcase = "Flat Series - Manga.json"; var library = await _scannerHelper.GenerateScannerData(testcase); var scanner = _scannerHelper.CreateServices(); await scanner.ScanLibrary(library.Id); - var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); Assert.NotNull(postLib); Assert.Single(postLib.Series); @@ -101,11 +106,26 @@ public class ScannerServiceTests : AbstractDbTest [Fact] public async Task ScanLibrary_FlatSeriesWithSpecialFolder() { - var testcase = "Flat Series with Specials Folder - Manga.json"; + const string testcase = "Flat Series with Specials Folder Alt Naming - Manga.json"; var library = await _scannerHelper.GenerateScannerData(testcase); var scanner = _scannerHelper.CreateServices(); await scanner.ScanLibrary(library.Id); - var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + + Assert.NotNull(postLib); + Assert.Single(postLib.Series); + Assert.Equal(4, postLib.Series.First().Volumes.Count); + Assert.NotNull(postLib.Series.First().Volumes.FirstOrDefault(v => v.Chapters.FirstOrDefault(c => c.IsSpecial) != null)); + } + + [Fact] + public async Task ScanLibrary_FlatSeriesWithSpecialFolder_AlternativeNaming() + { + const string testcase = "Flat Series with Specials Folder Alt Naming - Manga.json"; + var library = await _scannerHelper.GenerateScannerData(testcase); + var scanner = _scannerHelper.CreateServices(); + await scanner.ScanLibrary(library.Id); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); Assert.NotNull(postLib); Assert.Single(postLib.Series); @@ -121,7 +141,7 @@ public class ScannerServiceTests : AbstractDbTest var library = await _scannerHelper.GenerateScannerData(testcase); var scanner = _scannerHelper.CreateServices(); await scanner.ScanLibrary(library.Id); - var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); Assert.NotNull(postLib); Assert.Single(postLib.Series); @@ -129,7 +149,6 @@ public class ScannerServiceTests : AbstractDbTest Assert.NotNull(postLib.Series.First().Volumes.FirstOrDefault(v => v.Chapters.FirstOrDefault(c => c.IsSpecial) != null)); } - [Fact] public async Task ScanLibrary_SeriesWithUnbalancedParenthesis() { @@ -138,7 +157,7 @@ public class ScannerServiceTests : AbstractDbTest var library = await _scannerHelper.GenerateScannerData(testcase); var scanner = _scannerHelper.CreateServices(); await scanner.ScanLibrary(library.Id); - var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); Assert.NotNull(postLib); Assert.Single(postLib.Series); @@ -169,7 +188,7 @@ public class ScannerServiceTests : AbstractDbTest var scanner = _scannerHelper.CreateServices(); await scanner.ScanLibrary(library.Id); - var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); Assert.NotNull(postLib); Assert.Single(postLib.Series); @@ -194,7 +213,7 @@ public class ScannerServiceTests : AbstractDbTest var scanner = _scannerHelper.CreateServices(); await scanner.ScanLibrary(library.Id); - var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); Assert.NotNull(postLib); Assert.Single(postLib.Series); @@ -225,7 +244,7 @@ public class ScannerServiceTests : AbstractDbTest var scanner = _scannerHelper.CreateServices(); await scanner.ScanLibrary(library.Id); - var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); Assert.NotNull(postLib); Assert.Single(postLib.Series); @@ -249,7 +268,7 @@ public class ScannerServiceTests : AbstractDbTest var scanner = _scannerHelper.CreateServices(); await scanner.ScanLibrary(library.Id); - var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); Assert.NotNull(postLib); Assert.Single(postLib.Series); @@ -269,7 +288,7 @@ public class ScannerServiceTests : AbstractDbTest var scanner = _scannerHelper.CreateServices(); await scanner.ScanLibrary(library.Id); - var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); Assert.NotNull(postLib); Assert.Single(postLib.Series); @@ -307,7 +326,7 @@ public class ScannerServiceTests : AbstractDbTest var scanner = _scannerHelper.CreateServices(); await scanner.ScanLibrary(library.Id); - var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); Assert.NotNull(postLib); Assert.Single(postLib.Series); @@ -331,7 +350,7 @@ public class ScannerServiceTests : AbstractDbTest var scanner = _scannerHelper.CreateServices(); await scanner.ScanLibrary(library.Id); - var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); Assert.NotNull(postLib); Assert.Single(postLib.Series); @@ -350,7 +369,7 @@ public class ScannerServiceTests : AbstractDbTest var scanner = _scannerHelper.CreateServices(); await scanner.ScanLibrary(library.Id); - var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); Assert.NotNull(postLib); Assert.Single(postLib.Series); @@ -380,7 +399,7 @@ public class ScannerServiceTests : AbstractDbTest var scanner = _scannerHelper.CreateServices(); await scanner.ScanLibrary(library.Id); - var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); Assert.NotNull(postLib); Assert.Single(postLib.Series); @@ -398,4 +417,582 @@ public class ScannerServiceTests : AbstractDbTest Assert.Equal(3, series.Volumes.Count); Assert.Equal(2, series.Volumes.First(v => v.MinNumber.Is(Parser.LooseLeafVolumeNumber)).Chapters.Count); } + + [Fact] + public async Task ScanLibrary_LocalizedSeries_MatchesFilename() + { + const string testcase = "Localized Name matches Filename - Manga.json"; + + // Get the first file and generate a ComicInfo + var infos = new Dictionary(); + infos.Add("Futoku no Guild v01.cbz", new ComicInfo() + { + Series = "Immoral Guild", + LocalizedSeries = "Futoku no Guild" + }); + + var library = await _scannerHelper.GenerateScannerData(testcase, infos); + + + var scanner = _scannerHelper.CreateServices(); + await scanner.ScanLibrary(library.Id); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + + Assert.NotNull(postLib); + Assert.Single(postLib.Series); + var s = postLib.Series.First(); + Assert.Equal("Immoral Guild", s.Name); + Assert.Equal("Futoku no Guild", s.LocalizedName); + Assert.Single(s.Volumes); + } + + [Fact] + public async Task ScanLibrary_LocalizedSeries_MatchesFilename_SameNames() + { + const string testcase = "Localized Name matches Filename - Manga.json"; + + // Get the first file and generate a ComicInfo + var infos = new Dictionary(); + infos.Add("Futoku no Guild v01.cbz", new ComicInfo() + { + Series = "Futoku no Guild", + LocalizedSeries = "Futoku no Guild" + }); + + var library = await _scannerHelper.GenerateScannerData(testcase, infos); + + + var scanner = _scannerHelper.CreateServices(); + await scanner.ScanLibrary(library.Id); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + + Assert.NotNull(postLib); + Assert.Single(postLib.Series); + var s = postLib.Series.First(); + Assert.Equal("Futoku no Guild", s.Name); + Assert.Equal("Futoku no Guild", s.LocalizedName); + Assert.Single(s.Volumes); + } + + [Fact] + public async Task ScanLibrary_ExcludePattern_Works() + { + const string testcase = "Exclude Pattern 1 - Manga.json"; + + // Get the first file and generate a ComicInfo + var infos = new Dictionary(); + var library = await _scannerHelper.GenerateScannerData(testcase, infos); + + library.LibraryExcludePatterns = [new LibraryExcludePattern() { Pattern = "**/Extra/*" }]; + UnitOfWork.LibraryRepository.Update(library); + await UnitOfWork.CommitAsync(); + + + var scanner = _scannerHelper.CreateServices(); + await scanner.ScanLibrary(library.Id); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + + Assert.NotNull(postLib); + Assert.Single(postLib.Series); + var s = postLib.Series.First(); + Assert.Equal(2, s.Volumes.Count); + } + + [Fact] + public async Task ScanLibrary_ExcludePattern_FlippedSlashes_Works() + { + const string testcase = "Exclude Pattern 1 - Manga.json"; + + // Get the first file and generate a ComicInfo + var infos = new Dictionary(); + var library = await _scannerHelper.GenerateScannerData(testcase, infos); + + library.LibraryExcludePatterns = [new LibraryExcludePattern() { Pattern = "**\\Extra\\*" }]; + UnitOfWork.LibraryRepository.Update(library); + await UnitOfWork.CommitAsync(); + + + var scanner = _scannerHelper.CreateServices(); + await scanner.ScanLibrary(library.Id); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + + Assert.NotNull(postLib); + Assert.Single(postLib.Series); + var s = postLib.Series.First(); + Assert.Equal(2, s.Volumes.Count); + } + + [Fact] + public async Task ScanLibrary_MultipleRoots_MultipleScans_DataPersists_Forced() + { + const string testcase = "Multiple Roots - Manga.json"; + + // Get the first file and generate a ComicInfo + var infos = new Dictionary(); + var library = await _scannerHelper.GenerateScannerData(testcase, infos); + + var testDirectoryPath = + Path.Join( + Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/ScannerService/ScanTests"), + testcase.Replace(".json", string.Empty)); + library.Folders = + [ + new FolderPath() {Path = Path.Join(testDirectoryPath, "Root 1")}, + new FolderPath() {Path = Path.Join(testDirectoryPath, "Root 2")} + ]; + + UnitOfWork.LibraryRepository.Update(library); + await UnitOfWork.CommitAsync(); + + + var scanner = _scannerHelper.CreateServices(); + await scanner.ScanLibrary(library.Id); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + + Assert.NotNull(postLib); + Assert.Equal(2, postLib.Series.Count); + var s = postLib.Series.First(s => s.Name == "Plush"); + Assert.Equal(2, s.Volumes.Count); + var s2 = postLib.Series.First(s => s.Name == "Accel"); + Assert.Single(s2.Volumes); + + // Make a change (copy a file into only 1 root) + var root1PlushFolder = Path.Join(testDirectoryPath, "Root 1/Antarctic Press/Plush"); + File.Copy(Path.Join(root1PlushFolder, "Plush v02.cbz"), Path.Join(root1PlushFolder, "Plush v03.cbz")); + + // Rescan to ensure nothing changes yet again + await scanner.ScanLibrary(library.Id, true); + + postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + Assert.Equal(2, postLib.Series.Count); + s = postLib.Series.First(s => s.Name == "Plush"); + Assert.Equal(3, s.Volumes.Count); + s2 = postLib.Series.First(s => s.Name == "Accel"); + Assert.Single(s2.Volumes); + } + + /// + /// Regression bug appeared where multi-root and one root gets a new file, on next scan of library, + /// the series in the other root are deleted. (This is actually failing because the file in Root 1 isn't being detected) + /// + [Fact] + public async Task ScanLibrary_MultipleRoots_MultipleScans_DataPersists_NonForced() + { + const string testcase = "Multiple Roots - Manga.json"; + + // Get the first file and generate a ComicInfo + var infos = new Dictionary(); + var library = await _scannerHelper.GenerateScannerData(testcase, infos); + + var testDirectoryPath = + Path.Join( + Path.Join(Directory.GetCurrentDirectory(), "../../../Services/Test Data/ScannerService/ScanTests"), + testcase.Replace(".json", string.Empty)); + library.Folders = + [ + new FolderPath() {Path = Path.Join(testDirectoryPath, "Root 1")}, + new FolderPath() {Path = Path.Join(testDirectoryPath, "Root 2")} + ]; + + UnitOfWork.LibraryRepository.Update(library); + await UnitOfWork.CommitAsync(); + + + var scanner = _scannerHelper.CreateServices(); + await scanner.ScanLibrary(library.Id); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + + Assert.NotNull(postLib); + Assert.Equal(2, postLib.Series.Count); + var s = postLib.Series.First(s => s.Name == "Plush"); + Assert.Equal(2, s.Volumes.Count); + var s2 = postLib.Series.First(s => s.Name == "Accel"); + Assert.Single(s2.Volumes); + + // Make a change (copy a file into only 1 root) + var root1PlushFolder = Path.Join(testDirectoryPath, "Root 1/Antarctic Press/Plush"); + File.Copy(Path.Join(root1PlushFolder, "Plush v02.cbz"), Path.Join(root1PlushFolder, "Plush v03.cbz")); + + // Emulate time passage by updating lastFolderScan to be a min in the past + await SetLastScannedInThePast(s); + + // Rescan to ensure nothing changes yet again + await scanner.ScanLibrary(library.Id, false); + + postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + Assert.Equal(2, postLib.Series.Count); + s = postLib.Series.First(s => s.Name == "Plush"); + Assert.Equal(3, s.Volumes.Count); + s2 = postLib.Series.First(s => s.Name == "Accel"); + Assert.Single(s2.Volumes); + } + + [Fact] + public async Task ScanLibrary_AlternatingRemoval_IssueReplication() + { + // https://github.com/Kareadita/Kavita/issues/3476#issuecomment-2661635558 + const string testcase = "Alternating Removal - Manga.json"; + + // Setup: Generate test library + var infos = new Dictionary(); + var library = await _scannerHelper.GenerateScannerData(testcase, infos); + + var testDirectoryPath = Path.Combine(Directory.GetCurrentDirectory(), + "../../../Services/Test Data/ScannerService/ScanTests", + testcase.Replace(".json", string.Empty)); + + library.Folders = + [ + new FolderPath() { Path = Path.Combine(testDirectoryPath, "Root 1") }, + new FolderPath() { Path = Path.Combine(testDirectoryPath, "Root 2") } + ]; + + UnitOfWork.LibraryRepository.Update(library); + await UnitOfWork.CommitAsync(); + + var scanner = _scannerHelper.CreateServices(); + + // First Scan: Everything should be added + await scanner.ScanLibrary(library.Id); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + + Assert.NotNull(postLib); + Assert.Contains(postLib.Series, s => s.Name == "Accel"); + Assert.Contains(postLib.Series, s => s.Name == "Plush"); + + // Second Scan: Remove Root 2, expect Accel to be removed + library.Folders = [new FolderPath() { Path = Path.Combine(testDirectoryPath, "Root 1") }]; + UnitOfWork.LibraryRepository.Update(library); + await UnitOfWork.CommitAsync(); + + // Emulate time passage by updating lastFolderScan to be a min in the past + foreach (var s in postLib.Series) + { + s.LastFolderScanned = DateTime.Now.Subtract(TimeSpan.FromMinutes(1)); + Context.Series.Update(s); + } + await Context.SaveChangesAsync(); + + await scanner.ScanLibrary(library.Id); + postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + + Assert.DoesNotContain(postLib.Series, s => s.Name == "Accel"); // Ensure Accel is gone + Assert.Contains(postLib.Series, s => s.Name == "Plush"); + + // Third Scan: Re-add Root 2, Accel should come back + library.Folders = + [ + new FolderPath() { Path = Path.Combine(testDirectoryPath, "Root 1") }, + new FolderPath() { Path = Path.Combine(testDirectoryPath, "Root 2") } + ]; + UnitOfWork.LibraryRepository.Update(library); + await UnitOfWork.CommitAsync(); + + // Emulate time passage by updating lastFolderScan to be a min in the past + foreach (var s in postLib.Series) + { + s.LastFolderScanned = DateTime.Now.Subtract(TimeSpan.FromMinutes(1)); + Context.Series.Update(s); + } + await Context.SaveChangesAsync(); + + await scanner.ScanLibrary(library.Id); + postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + + Assert.Contains(postLib.Series, s => s.Name == "Accel"); // Accel should be back + Assert.Contains(postLib.Series, s => s.Name == "Plush"); + + // Emulate time passage by updating lastFolderScan to be a min in the past + await SetAllSeriesLastScannedInThePast(postLib); + + // Fourth Scan: Run again to check stability (should not remove Accel) + await scanner.ScanLibrary(library.Id); + postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + + Assert.Contains(postLib.Series, s => s.Name == "Accel"); + Assert.Contains(postLib.Series, s => s.Name == "Plush"); + } + + [Fact] + public async Task ScanLibrary_DeleteSeriesInUI_ComeBack() + { + const string testcase = "Delete Series In UI - Manga.json"; + + // Setup: Generate test library + var infos = new Dictionary(); + var library = await _scannerHelper.GenerateScannerData(testcase, infos); + + var testDirectoryPath = Path.Combine(Directory.GetCurrentDirectory(), + "../../../Services/Test Data/ScannerService/ScanTests", + testcase.Replace(".json", string.Empty)); + + library.Folders = + [ + new FolderPath() { Path = Path.Combine(testDirectoryPath, "Root 1") }, + new FolderPath() { Path = Path.Combine(testDirectoryPath, "Root 2") } + ]; + + UnitOfWork.LibraryRepository.Update(library); + await UnitOfWork.CommitAsync(); + + var scanner = _scannerHelper.CreateServices(); + + // First Scan: Everything should be added + await scanner.ScanLibrary(library.Id); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + + Assert.NotNull(postLib); + Assert.Contains(postLib.Series, s => s.Name == "Accel"); + Assert.Contains(postLib.Series, s => s.Name == "Plush"); + + // Second Scan: Delete the Series + library.Series = []; + await UnitOfWork.CommitAsync(); + + postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + Assert.NotNull(postLib); + Assert.Empty(postLib.Series); + + await scanner.ScanLibrary(library.Id); + postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + + Assert.Contains(postLib.Series, s => s.Name == "Accel"); // Ensure Accel is gone + Assert.Contains(postLib.Series, s => s.Name == "Plush"); + } + + [Fact] + public async Task SubFolders_NoRemovals_ChangesFound() + { + const string testcase = "Subfolders always scanning all series changes - Manga.json"; + var infos = new Dictionary(); + var library = await _scannerHelper.GenerateScannerData(testcase, infos); + var testDirectoryPath = library.Folders.First().Path; + + UnitOfWork.LibraryRepository.Update(library); + await UnitOfWork.CommitAsync(); + + var scanner = _scannerHelper.CreateServices(); + await scanner.ScanLibrary(library.Id); + + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + Assert.NotNull(postLib); + Assert.Equal(4, postLib.Series.Count); + + var spiceAndWolf = postLib.Series.First(x => x.Name == "Spice and Wolf"); + Assert.Equal(2, spiceAndWolf.Volumes.Count); + Assert.Equal(3, spiceAndWolf.Volumes.Sum(v => v.Chapters.Count)); + + var frieren = postLib.Series.First(x => x.Name == "Frieren - Beyond Journey's End"); + Assert.Single(frieren.Volumes); + Assert.Equal(2, frieren.Volumes.Sum(v => v.Chapters.Count)); + + var executionerAndHerWayOfLife = postLib.Series.First(x => x.Name == "The Executioner and Her Way of Life"); + Assert.Equal(2, executionerAndHerWayOfLife.Volumes.Count); + Assert.Equal(2, executionerAndHerWayOfLife.Volumes.Sum(v => v.Chapters.Count)); + + await SetAllSeriesLastScannedInThePast(postLib); + + // Add a new chapter to a volume of the series, and scan. Validate that no chapters were lost, and the new + // chapter was added + var executionerCopyDir = Path.Join(Path.Join(testDirectoryPath, "The Executioner and Her Way of Life"), + "The Executioner and Her Way of Life Vol. 1"); + File.Copy(Path.Join(executionerCopyDir, "The Executioner and Her Way of Life Vol. 1 Ch. 0001.cbz"), + Path.Join(executionerCopyDir, "The Executioner and Her Way of Life Vol. 1 Ch. 0002.cbz")); + + await scanner.ScanLibrary(library.Id); + await UnitOfWork.CommitAsync(); + + postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + Assert.NotNull(postLib); + Assert.Equal(4, postLib.Series.Count); + + spiceAndWolf = postLib.Series.First(x => x.Name == "Spice and Wolf"); + Assert.Equal(2, spiceAndWolf.Volumes.Count); + Assert.Equal(3, spiceAndWolf.Volumes.Sum(v => v.Chapters.Count)); + + frieren = postLib.Series.First(x => x.Name == "Frieren - Beyond Journey's End"); + Assert.Single(frieren.Volumes); + Assert.Equal(2, frieren.Volumes.Sum(v => v.Chapters.Count)); + + executionerAndHerWayOfLife = postLib.Series.First(x => x.Name == "The Executioner and Her Way of Life"); + Assert.Equal(2, executionerAndHerWayOfLife.Volumes.Count); + Assert.Equal(3, executionerAndHerWayOfLife.Volumes.Sum(v => v.Chapters.Count)); // Incremented by 1 + } + + [Fact] + public async Task RemovalPickedUp_NoOtherChanges() + { + const string testcase = "Series removed when no other changes are made - Manga.json"; + var infos = new Dictionary(); + var library = await _scannerHelper.GenerateScannerData(testcase, infos); + var testDirectoryPath = library.Folders.First().Path; + + UnitOfWork.LibraryRepository.Update(library); + await UnitOfWork.CommitAsync(); + + var scanner = _scannerHelper.CreateServices(); + await scanner.ScanLibrary(library.Id); + + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + Assert.NotNull(postLib); + Assert.Equal(2, postLib.Series.Count); + + var executionerCopyDir = Path.Join(testDirectoryPath, "The Executioner and Her Way of Life"); + Directory.Delete(executionerCopyDir, true); + + await scanner.ScanLibrary(library.Id); + await UnitOfWork.CommitAsync(); + + postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + Assert.NotNull(postLib); + Assert.Single(postLib.Series); + Assert.Single(postLib.Series, s => s.Name == "Spice and Wolf"); + Assert.Equal(2, postLib.Series.First().Volumes.Count); + } + + [Fact] + public async Task SubFoldersNoSubFolders_CorrectPickupAfterAdd() + { + // This test case is used in multiple tests and can result in conflict if not separated + const string testcase = "Subfolders and files at root (2) - Manga.json"; + var infos = new Dictionary(); + var library = await _scannerHelper.GenerateScannerData(testcase, infos); + var testDirectoryPath = library.Folders.First().Path; + + UnitOfWork.LibraryRepository.Update(library); + await UnitOfWork.CommitAsync(); + + var scanner = _scannerHelper.CreateServices(); + await scanner.ScanLibrary(library.Id); + + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + Assert.NotNull(postLib); + Assert.Single(postLib.Series); + + var spiceAndWolf = postLib.Series.First(x => x.Name == "Spice and Wolf"); + Assert.Equal(3, spiceAndWolf.Volumes.Count); + Assert.Equal(4, spiceAndWolf.Volumes.Sum(v => v.Chapters.Count)); + + await SetLastScannedInThePast(spiceAndWolf); + + // Add volume to Spice and Wolf series directory + var spiceAndWolfDir = Path.Join(testDirectoryPath, "Spice and Wolf"); + File.Copy(Path.Join(spiceAndWolfDir, "Spice and Wolf Vol. 1.cbz"), + Path.Join(spiceAndWolfDir, "Spice and Wolf Vol. 4.cbz")); + + await scanner.ScanLibrary(library.Id); + + postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + Assert.NotNull(postLib); + Assert.Single(postLib.Series); + + spiceAndWolf = postLib.Series.First(x => x.Name == "Spice and Wolf"); + Assert.Equal(4, spiceAndWolf.Volumes.Count); + Assert.Equal(5, spiceAndWolf.Volumes.Sum(v => v.Chapters.Count)); + + await SetLastScannedInThePast(spiceAndWolf); + + // Add file in subfolder + spiceAndWolfDir = Path.Join(spiceAndWolfDir, "Spice and Wolf Vol. 3"); + File.Copy(Path.Join(spiceAndWolfDir, "Spice and Wolf Vol. 3 Ch. 0012.cbz"), + Path.Join(spiceAndWolfDir, "Spice and Wolf Vol. 3 Ch. 0013.cbz")); + + await scanner.ScanLibrary(library.Id); + + postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + Assert.NotNull(postLib); + Assert.Single(postLib.Series); + + spiceAndWolf = postLib.Series.First(x => x.Name == "Spice and Wolf"); + Assert.Equal(4, spiceAndWolf.Volumes.Count); + Assert.Equal(6, spiceAndWolf.Volumes.Sum(v => v.Chapters.Count)); + + } + + + /// + /// Ensure when Kavita scans, the sort order of chapters is correct + /// + [Fact] + public async Task ScanLibrary_SortOrderWorks() + { + const string testcase = "Sort Order - Manga.json"; + + var library = await _scannerHelper.GenerateScannerData(testcase); + + + var scanner = _scannerHelper.CreateServices(); + await scanner.ScanLibrary(library.Id); + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + Assert.NotNull(postLib); + + // Get the loose leaf volume and confirm each chapter aligns with expectation of Sort Order + var series = postLib.Series.First(); + Assert.NotNull(series); + + var volume = series.Volumes.FirstOrDefault(); + Assert.NotNull(volume); + + var sortedChapters = volume.Chapters.OrderBy(c => c.SortOrder).ToList(); + Assert.True(sortedChapters[0].SortOrder.Is(1f)); + Assert.True(sortedChapters[1].SortOrder.Is(4f)); + Assert.True(sortedChapters[2].SortOrder.Is(5f)); + } + + + [Fact] + public async Task ScanLibrary_MetadataDisabled_NoOverrides() + { + const string testcase = "Series with Localized No Metadata - Manga.json"; + + // Get the first file and generate a ComicInfo + var infos = new Dictionary(); + infos.Add("Immoral Guild v01.cbz", new ComicInfo() + { + Series = "Immoral Guild", + LocalizedSeries = "Futoku no Guild" // Filename has a capital N and localizedSeries has lowercase + }); + + var library = await _scannerHelper.GenerateScannerData(testcase, infos); + + // Disable metadata + library.EnableMetadata = false; + UnitOfWork.LibraryRepository.Update(library); + await UnitOfWork.CommitAsync(); + + var scanner = _scannerHelper.CreateServices(); + await scanner.ScanLibrary(library.Id); + + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + + // Validate that there are 2 series + Assert.NotNull(postLib); + Assert.Equal(2, postLib.Series.Count); + + Assert.Contains(postLib.Series, x => x.Name == "Immoral Guild"); + Assert.Contains(postLib.Series, x => x.Name == "Futoku No Guild"); + } + + [Fact] + public async Task ScanLibrary_SortName_NoPrefix() + { + const string testcase = "Series with Prefix - Book.json"; + + var library = await _scannerHelper.GenerateScannerData(testcase); + + library.RemovePrefixForSortName = true; + UnitOfWork.LibraryRepository.Update(library); + await UnitOfWork.CommitAsync(); + + var scanner = _scannerHelper.CreateServices(); + await scanner.ScanLibrary(library.Id); + + var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series); + + Assert.NotNull(postLib); + Assert.Equal(1, postLib.Series.Count); + + Assert.Equal("The Avengers", postLib.Series.First().Name); + Assert.Equal("Avengers", postLib.Series.First().SortName); + } } diff --git a/API.Tests/Services/ScrobblingServiceTests.cs b/API.Tests/Services/ScrobblingServiceTests.cs index d460ee4e5..9245c8ecd 100644 --- a/API.Tests/Services/ScrobblingServiceTests.cs +++ b/API.Tests/Services/ScrobblingServiceTests.cs @@ -1,11 +1,619 @@ -using API.Services.Plus; +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using API.Data.Repositories; +using API.DTOs.Scrobbling; +using API.Entities; +using API.Entities.Enums; +using API.Entities.Scrobble; +using API.Helpers.Builders; +using API.Services; +using API.Services.Plus; +using API.SignalR; +using Kavita.Common; +using Microsoft.Extensions.Logging; +using NSubstitute; using Xunit; namespace API.Tests.Services; #nullable enable -public class ScrobblingServiceTests +public class ScrobblingServiceTests : AbstractDbTest { + private const int ChapterPages = 100; + + /// + /// { + /// "Issuer": "Issuer", + /// "Issued At": "2025-06-15T21:01:57.615Z", + /// "Expiration": "2200-06-15T21:01:57.615Z" + /// } + /// + /// Our UnitTests will fail in 2200 :( + private const string ValidJwtToken = + "eyJhbGciOiJIUzI1NiJ9.eyJJc3N1ZXIiOiJJc3N1ZXIiLCJleHAiOjcyNzI0NTAxMTcsImlhdCI6MTc1MDAyMTMxN30.zADmcGq_BfxbcV8vy4xw5Cbzn4COkmVINxgqpuL17Ng"; + + private readonly ScrobblingService _service; + private readonly ILicenseService _licenseService; + private readonly ILocalizationService _localizationService; + private readonly ILogger _logger; + private readonly IEmailService _emailService; + private readonly IKavitaPlusApiService _kavitaPlusApiService; + /// + /// IReaderService, without the ScrobblingService injected + /// + private readonly IReaderService _readerService; + /// + /// IReaderService, with the _service injected + /// + private readonly IReaderService _hookedUpReaderService; + + public ScrobblingServiceTests() + { + _licenseService = Substitute.For(); + _localizationService = Substitute.For(); + _logger = Substitute.For>(); + _emailService = Substitute.For(); + _kavitaPlusApiService = Substitute.For(); + + _service = new ScrobblingService(UnitOfWork, Substitute.For(), _logger, _licenseService, + _localizationService, _emailService, _kavitaPlusApiService); + + _readerService = new ReaderService(UnitOfWork, + Substitute.For>(), + Substitute.For(), + Substitute.For(), + Substitute.For(), + Substitute.For()); // Do not use the actual one + + _hookedUpReaderService = new ReaderService(UnitOfWork, + Substitute.For>(), + Substitute.For(), + Substitute.For(), + Substitute.For(), + _service); + } + + protected override async Task ResetDb() + { + Context.ScrobbleEvent.RemoveRange(Context.ScrobbleEvent.ToList()); + Context.Series.RemoveRange(Context.Series.ToList()); + Context.Library.RemoveRange(Context.Library.ToList()); + Context.AppUser.RemoveRange(Context.AppUser.ToList()); + + await UnitOfWork.CommitAsync(); + } + + private async Task SeedData() + { + var series = new SeriesBuilder("Test Series") + .WithFormat(MangaFormat.Archive) + .WithMetadata(new SeriesMetadataBuilder().Build()) + .WithVolume(new VolumeBuilder("Volume 1") + .WithChapters([ + new ChapterBuilder("1") + .WithPages(ChapterPages) + .Build(), + new ChapterBuilder("2") + .WithPages(ChapterPages) + .Build(), + new ChapterBuilder("3") + .WithPages(ChapterPages) + .Build()]) + .Build()) + .WithVolume(new VolumeBuilder("Volume 2") + .WithChapters([ + new ChapterBuilder("4") + .WithPages(ChapterPages) + .Build(), + new ChapterBuilder("5") + .WithPages(ChapterPages) + .Build(), + new ChapterBuilder("6") + .WithPages(ChapterPages) + .Build()]) + .Build()) + .Build(); + + var library = new LibraryBuilder("Test Library", LibraryType.Manga) + .WithAllowScrobbling(true) + .WithSeries(series) + .Build(); + + + Context.Library.Add(library); + + var user = new AppUserBuilder("testuser", "testuser") + //.WithPreferences(new UserPreferencesBuilder().WithAniListScrobblingEnabled(true).Build()) + .Build(); + + user.UserPreferences.AniListScrobblingEnabled = true; + + UnitOfWork.UserRepository.Add(user); + + await UnitOfWork.CommitAsync(); + } + + private async Task CreateScrobbleEvent(int? seriesId = null) + { + var evt = new ScrobbleEvent + { + ScrobbleEventType = ScrobbleEventType.ChapterRead, + Format = PlusMediaFormat.Manga, + SeriesId = seriesId ?? 0, + LibraryId = 0, + AppUserId = 0, + }; + + if (seriesId != null) + { + var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId.Value); + if (series != null) evt.Series = series; + } + + return evt; + } + + + #region K+ API Request Tests + + [Fact] + public async Task PostScrobbleUpdate_AuthErrors() + { + _kavitaPlusApiService.PostScrobbleUpdate(null!, "") + .ReturnsForAnyArgs(new ScrobbleResponseDto() + { + ErrorMessage = "Unauthorized" + }); + + var evt = await CreateScrobbleEvent(); + await Assert.ThrowsAsync(async () => + { + await _service.PostScrobbleUpdate(new ScrobbleDto(), "", evt); + }); + Assert.True(evt.IsErrored); + Assert.Equal("Kavita+ subscription no longer active", evt.ErrorDetails); + } + + [Fact] + public async Task PostScrobbleUpdate_UnknownSeriesLoggedAsError() + { + _kavitaPlusApiService.PostScrobbleUpdate(null!, "") + .ReturnsForAnyArgs(new ScrobbleResponseDto() + { + ErrorMessage = "Unknown Series" + }); + + await SeedData(); + var evt = await CreateScrobbleEvent(1); + + await _service.PostScrobbleUpdate(new ScrobbleDto(), "", evt); + await UnitOfWork.CommitAsync(); + Assert.True(evt.IsErrored); + + var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1); + Assert.NotNull(series); + Assert.True(series.IsBlacklisted); + + var errors = await UnitOfWork.ScrobbleRepository.GetAllScrobbleErrorsForSeries(1); + Assert.Single(errors); + Assert.Equal("Series cannot be matched for Scrobbling", errors.First().Comment); + Assert.Equal(series.Id, errors.First().SeriesId); + } + + [Fact] + public async Task PostScrobbleUpdate_InvalidAccessToken() + { + _kavitaPlusApiService.PostScrobbleUpdate(null!, "") + .ReturnsForAnyArgs(new ScrobbleResponseDto() + { + ErrorMessage = "Access token is invalid" + }); + + var evt = await CreateScrobbleEvent(); + + await Assert.ThrowsAsync(async () => + { + await _service.PostScrobbleUpdate(new ScrobbleDto(), "", evt); + }); + + Assert.True(evt.IsErrored); + Assert.Equal("Access Token needs to be rotated to continue scrobbling", evt.ErrorDetails); + } + + #endregion + + #region K+ API Request data tests + + [Fact] + public async Task ProcessReadEvents_CreatesNoEventsWhenNoProgress() + { + await ResetDb(); + await SeedData(); + + // Set Returns + _licenseService.HasActiveLicense().Returns(Task.FromResult(true)); + _kavitaPlusApiService.GetRateLimit(Arg.Any(), Arg.Any()) + .Returns(100); + + var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1); + Assert.NotNull(user); + + // Ensure CanProcessScrobbleEvent returns true + user.AniListAccessToken = ValidJwtToken; + UnitOfWork.UserRepository.Update(user); + await UnitOfWork.CommitAsync(); + + var chapter = await UnitOfWork.ChapterRepository.GetChapterAsync(4); + Assert.NotNull(chapter); + + var volume = await UnitOfWork.VolumeRepository.GetVolumeAsync(1, VolumeIncludes.Chapters); + Assert.NotNull(volume); + + // Call Scrobble without having any progress + await _service.ScrobbleReadingUpdate(1, 1); + var events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(1); + Assert.Empty(events); + } + + [Fact] + public async Task ProcessReadEvents_UpdateVolumeAndChapterData() + { + await ResetDb(); + await SeedData(); + + // Set Returns + _licenseService.HasActiveLicense().Returns(Task.FromResult(true)); + _kavitaPlusApiService.GetRateLimit(Arg.Any(), Arg.Any()) + .Returns(100); + + var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1); + Assert.NotNull(user); + + // Ensure CanProcessScrobbleEvent returns true + user.AniListAccessToken = ValidJwtToken; + UnitOfWork.UserRepository.Update(user); + await UnitOfWork.CommitAsync(); + + var chapter = await UnitOfWork.ChapterRepository.GetChapterAsync(4); + Assert.NotNull(chapter); + + var volume = await UnitOfWork.VolumeRepository.GetVolumeAsync(1, VolumeIncludes.Chapters); + Assert.NotNull(volume); + + // Mark something as read to trigger event creation + await _readerService.MarkChaptersAsRead(user, 1, new List() {volume.Chapters[0]}); + await UnitOfWork.CommitAsync(); + + // Call Scrobble while having some progress + await _service.ScrobbleReadingUpdate(user.Id, 1); + var events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(1); + Assert.Single(events); + + // Give it some (more) read progress + await _readerService.MarkChaptersAsRead(user, 1, volume.Chapters); + await _readerService.MarkChaptersAsRead(user, 1, [chapter]); + await UnitOfWork.CommitAsync(); + + await _service.ProcessUpdatesSinceLastSync(); + + await _kavitaPlusApiService.Received(1).PostScrobbleUpdate( + Arg.Is(data => + data.ChapterNumber == (int)chapter.MaxNumber && + data.VolumeNumber == (int)volume.MaxNumber + ), + Arg.Any()); + } + + #endregion + + #region Scrobble Reading Update Tests + + [Fact] + public async Task ScrobbleReadingUpdate_IgnoreNoLicense() + { + await ResetDb(); + await SeedData(); + + _licenseService.HasActiveLicense().Returns(false); + + await _service.ScrobbleReadingUpdate(1, 1); + var events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(1); + Assert.Empty(events); + } + + [Fact] + public async Task ScrobbleReadingUpdate_RemoveWhenNoProgress() + { + await ResetDb(); + await SeedData(); + + _licenseService.HasActiveLicense().Returns(true); + + var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1); + Assert.NotNull(user); + + var volume = await UnitOfWork.VolumeRepository.GetVolumeAsync(1, VolumeIncludes.Chapters); + Assert.NotNull(volume); + + await _readerService.MarkChaptersAsRead(user, 1, new List() {volume.Chapters[0]}); + await UnitOfWork.CommitAsync(); + + await _service.ScrobbleReadingUpdate(1, 1); + var events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(1); + Assert.Single(events); + + var readEvent = events.First(); + Assert.False(readEvent.IsProcessed); + + await _hookedUpReaderService.MarkSeriesAsUnread(user, 1); + await UnitOfWork.CommitAsync(); + + // Existing event is deleted + await _service.ScrobbleReadingUpdate(1, 1); + events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(1); + Assert.Empty(events); + + await _hookedUpReaderService.MarkSeriesAsUnread(user, 1); + await UnitOfWork.CommitAsync(); + + // No new events are added + events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(1); + Assert.Empty(events); + } + + [Fact] + public async Task ScrobbleReadingUpdate_UpdateExistingNotIsProcessed() + { + await ResetDb(); + await SeedData(); + + var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1); + Assert.NotNull(user); + + var chapter1 = await UnitOfWork.ChapterRepository.GetChapterAsync(1); + var chapter2 = await UnitOfWork.ChapterRepository.GetChapterAsync(2); + var chapter3 = await UnitOfWork.ChapterRepository.GetChapterAsync(3); + Assert.NotNull(chapter1); + Assert.NotNull(chapter2); + Assert.NotNull(chapter3); + + _licenseService.HasActiveLicense().Returns(true); + + var events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(1); + Assert.Empty(events); + + + await _readerService.MarkChaptersAsRead(user, 1, [chapter1]); + await UnitOfWork.CommitAsync(); + + // Scrobble update + await _service.ScrobbleReadingUpdate(1, 1); + events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(1); + Assert.Single(events); + + var readEvent = events[0]; + Assert.False(readEvent.IsProcessed); + Assert.Equal(1, readEvent.ChapterNumber); + + // Mark as processed + readEvent.IsProcessed = true; + await UnitOfWork.CommitAsync(); + + await _readerService.MarkChaptersAsRead(user, 1, [chapter2]); + await UnitOfWork.CommitAsync(); + + // Scrobble update + await _service.ScrobbleReadingUpdate(1, 1); + events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(1); + Assert.Equal(2, events.Count); + Assert.Single(events.Where(e => e.IsProcessed).ToList()); + Assert.Single(events.Where(e => !e.IsProcessed).ToList()); + + // Should update the existing non processed event + await _readerService.MarkChaptersAsRead(user, 1, [chapter3]); + await UnitOfWork.CommitAsync(); + + // Scrobble update + await _service.ScrobbleReadingUpdate(1, 1); + events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(1); + Assert.Equal(2, events.Count); + Assert.Single(events.Where(e => e.IsProcessed).ToList()); + Assert.Single(events.Where(e => !e.IsProcessed).ToList()); + } + + #endregion + + #region ScrobbleWantToReadUpdate Tests + + [Fact] + public async Task ScrobbleWantToReadUpdate_NoExistingEvents_WantToRead_ShouldCreateNewEvent() + { + // Arrange + await SeedData(); + _licenseService.HasActiveLicense().Returns(Task.FromResult(true)); + + const int userId = 1; + const int seriesId = 1; + + // Act + await _service.ScrobbleWantToReadUpdate(userId, seriesId, true); + + // Assert + var events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(seriesId); + Assert.Single(events); + Assert.Equal(ScrobbleEventType.AddWantToRead, events[0].ScrobbleEventType); + Assert.Equal(userId, events[0].AppUserId); + } + + [Fact] + public async Task ScrobbleWantToReadUpdate_NoExistingEvents_RemoveWantToRead_ShouldCreateNewEvent() + { + // Arrange + await SeedData(); + _licenseService.HasActiveLicense().Returns(Task.FromResult(true)); + + const int userId = 1; + const int seriesId = 1; + + // Act + await _service.ScrobbleWantToReadUpdate(userId, seriesId, false); + + // Assert + var events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(seriesId); + Assert.Single(events); + Assert.Equal(ScrobbleEventType.RemoveWantToRead, events[0].ScrobbleEventType); + Assert.Equal(userId, events[0].AppUserId); + } + + [Fact] + public async Task ScrobbleWantToReadUpdate_ExistingWantToReadEvent_WantToRead_ShouldNotCreateNewEvent() + { + // Arrange + await SeedData(); + _licenseService.HasActiveLicense().Returns(Task.FromResult(true)); + + const int userId = 1; + const int seriesId = 1; + + // First, let's create an event through the service + await _service.ScrobbleWantToReadUpdate(userId, seriesId, true); + + // Act - Try to create the same event again + await _service.ScrobbleWantToReadUpdate(userId, seriesId, true); + + // Assert + var events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(seriesId); + + Assert.Single(events); + Assert.All(events, e => Assert.Equal(ScrobbleEventType.AddWantToRead, e.ScrobbleEventType)); + } + + [Fact] + public async Task ScrobbleWantToReadUpdate_ExistingWantToReadEvent_RemoveWantToRead_ShouldAddRemoveEvent() + { + // Arrange + await SeedData(); + _licenseService.HasActiveLicense().Returns(Task.FromResult(true)); + + const int userId = 1; + const int seriesId = 1; + + // First, let's create a want-to-read event through the service + await _service.ScrobbleWantToReadUpdate(userId, seriesId, true); + + // Act - Now remove from want-to-read + await _service.ScrobbleWantToReadUpdate(userId, seriesId, false); + + // Assert + var events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(seriesId); + + Assert.Single(events); + Assert.Contains(events, e => e.ScrobbleEventType == ScrobbleEventType.RemoveWantToRead); + } + + [Fact] + public async Task ScrobbleWantToReadUpdate_ExistingRemoveWantToReadEvent_RemoveWantToRead_ShouldNotCreateNewEvent() + { + // Arrange + await SeedData(); + _licenseService.HasActiveLicense().Returns(Task.FromResult(true)); + + const int userId = 1; + const int seriesId = 1; + + // First, let's create a remove-from-want-to-read event through the service + await _service.ScrobbleWantToReadUpdate(userId, seriesId, false); + + // Act - Try to create the same event again + await _service.ScrobbleWantToReadUpdate(userId, seriesId, false); + + // Assert + var events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(seriesId); + + Assert.Single(events); + Assert.All(events, e => Assert.Equal(ScrobbleEventType.RemoveWantToRead, e.ScrobbleEventType)); + } + + [Fact] + public async Task ScrobbleWantToReadUpdate_ExistingRemoveWantToReadEvent_WantToRead_ShouldAddWantToReadEvent() + { + // Arrange + await SeedData(); + _licenseService.HasActiveLicense().Returns(Task.FromResult(true)); + + const int userId = 1; + const int seriesId = 1; + + // First, let's create a remove-from-want-to-read event through the service + await _service.ScrobbleWantToReadUpdate(userId, seriesId, false); + + // Act - Now add to want-to-read + await _service.ScrobbleWantToReadUpdate(userId, seriesId, true); + + // Assert + var events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(seriesId); + + Assert.Single(events); + Assert.Contains(events, e => e.ScrobbleEventType == ScrobbleEventType.AddWantToRead); + } + + #endregion + + #region Scrobble Rating Update Test + + [Fact] + public async Task ScrobbleRatingUpdate_IgnoreNoLicense() + { + await ResetDb(); + await SeedData(); + + _licenseService.HasActiveLicense().Returns(false); + + await _service.ScrobbleRatingUpdate(1, 1, 1); + var events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(1); + Assert.Empty(events); + } + + [Fact] + public async Task ScrobbleRatingUpdate_UpdateExistingNotIsProcessed() + { + await ResetDb(); + await SeedData(); + + _licenseService.HasActiveLicense().Returns(true); + + var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1); + Assert.NotNull(user); + + var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1); + Assert.NotNull(series); + + await _service.ScrobbleRatingUpdate(user.Id, series.Id, 1); + var events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(1); + Assert.Single(events); + Assert.Equal(1, events.First().Rating); + + // Mark as processed + events.First().IsProcessed = true; + await UnitOfWork.CommitAsync(); + + await _service.ScrobbleRatingUpdate(user.Id, series.Id, 5); + events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(1); + Assert.Equal(2, events.Count); + Assert.Single(events, evt => evt.IsProcessed); + Assert.Single(events, evt => !evt.IsProcessed); + + await _service.ScrobbleRatingUpdate(user.Id, series.Id, 5); + events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(1); + Assert.Single(events, evt => !evt.IsProcessed); + Assert.Equal(5, events.First(evt => !evt.IsProcessed).Rating); + + } + + #endregion + [Theory] [InlineData("https://anilist.co/manga/35851/Byeontaega-Doeja/", 35851)] [InlineData("https://anilist.co/manga/30105", 30105)] diff --git a/API.Tests/Services/SeriesServiceTests.cs b/API.Tests/Services/SeriesServiceTests.cs index 385b63f51..55babf815 100644 --- a/API.Tests/Services/SeriesServiceTests.cs +++ b/API.Tests/Services/SeriesServiceTests.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.IO.Abstractions; using System.Linq; using System.Threading.Tasks; @@ -7,10 +8,12 @@ using API.Data; using API.Data.Repositories; using API.DTOs; using API.DTOs.Metadata; +using API.DTOs.Person; using API.DTOs.SeriesDetail; using API.Entities; using API.Entities.Enums; using API.Entities.Metadata; +using API.Entities.Person; using API.Extensions; using API.Helpers.Builders; using API.Services; @@ -54,22 +57,23 @@ public class SeriesServiceTests : AbstractDbTest var locService = new LocalizationService(ds, new MockHostingEnvironment(), Substitute.For(), Substitute.For()); - _seriesService = new SeriesService(_unitOfWork, Substitute.For(), + _seriesService = new SeriesService(UnitOfWork, Substitute.For(), Substitute.For(), Substitute.For>(), - Substitute.For(), locService); + Substitute.For(), locService, Substitute.For()); } + #region Setup protected override 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()); - _context.Library.RemoveRange(_context.Library.ToList()); + 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()); + Context.Library.RemoveRange(Context.Library.ToList()); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); } private static UpdateRelatedSeriesDto CreateRelationsDto(Series series) @@ -102,7 +106,7 @@ public class SeriesServiceTests : AbstractDbTest { await ResetDb(); - _context.Library.Add(new LibraryBuilder("Test LIb") + Context.Library.Add(new LibraryBuilder("Test LIb") .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) .WithSeries(new SeriesBuilder("Test") @@ -123,7 +127,7 @@ public class SeriesServiceTests : AbstractDbTest .Build()); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var expectedRanges = new[] {"Omake", "Something SP02"}; @@ -138,7 +142,7 @@ public class SeriesServiceTests : AbstractDbTest { await ResetDb(); - _context.Library.Add(new LibraryBuilder("Test LIb") + Context.Library.Add(new LibraryBuilder("Test LIb") .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) .WithSeries(new SeriesBuilder("Test") @@ -159,7 +163,7 @@ public class SeriesServiceTests : AbstractDbTest .Build() ); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var detail = await _seriesService.GetSeriesDetail(1, 1); Assert.NotEmpty(detail.Chapters); @@ -175,7 +179,7 @@ public class SeriesServiceTests : AbstractDbTest { await ResetDb(); - _context.Library.Add(new LibraryBuilder("Test LIb") + Context.Library.Add(new LibraryBuilder("Test LIb") .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) .WithSeries(new SeriesBuilder("Test") @@ -193,7 +197,7 @@ public class SeriesServiceTests : AbstractDbTest .Build()) .Build()); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var detail = await _seriesService.GetSeriesDetail(1, 1); Assert.NotEmpty(detail.Chapters); @@ -209,7 +213,7 @@ public class SeriesServiceTests : AbstractDbTest { await ResetDb(); - _context.Library.Add(new LibraryBuilder("Test LIb") + Context.Library.Add(new LibraryBuilder("Test LIb") .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) .WithSeries(new SeriesBuilder("Test") .WithVolume(new VolumeBuilder(Parser.LooseLeafVolume) @@ -226,7 +230,7 @@ public class SeriesServiceTests : AbstractDbTest .Build()) .Build()); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var detail = await _seriesService.GetSeriesDetail(1, 1); Assert.NotEmpty(detail.Chapters); @@ -245,7 +249,7 @@ public class SeriesServiceTests : AbstractDbTest { await ResetDb(); - _context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book) + Context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book) .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) .WithSeries(new SeriesBuilder("Test") @@ -260,7 +264,7 @@ public class SeriesServiceTests : AbstractDbTest .Build()); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var detail = await _seriesService.GetSeriesDetail(1, 1); Assert.NotEmpty(detail.Volumes); @@ -274,7 +278,7 @@ public class SeriesServiceTests : AbstractDbTest { await ResetDb(); - _context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book) + Context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book) .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) .WithSeries(new SeriesBuilder("Test") @@ -291,7 +295,7 @@ public class SeriesServiceTests : AbstractDbTest - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var detail = await _seriesService.GetSeriesDetail(1, 1); Assert.NotEmpty(detail.Volumes); @@ -311,7 +315,7 @@ public class SeriesServiceTests : AbstractDbTest { await ResetDb(); - _context.Library.Add(new LibraryBuilder("Test LIb") + Context.Library.Add(new LibraryBuilder("Test LIb") .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) .WithSeries(new SeriesBuilder("Test") @@ -329,7 +333,7 @@ public class SeriesServiceTests : AbstractDbTest .Build()); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var detail = await _seriesService.GetSeriesDetail(1, 1); Assert.Equal("Volume 1", detail.Volumes.ElementAt(0).Name); @@ -346,7 +350,7 @@ public class SeriesServiceTests : AbstractDbTest { await ResetDb(); - _context.Library.Add(new LibraryBuilder("Test LIb") + Context.Library.Add(new LibraryBuilder("Test LIb") .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) .WithSeries(new SeriesBuilder("Test") @@ -370,7 +374,7 @@ public class SeriesServiceTests : AbstractDbTest .Build()) .Build()) .Build()); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var detail = await _seriesService.GetSeriesDetail(1, 1); @@ -397,7 +401,7 @@ public class SeriesServiceTests : AbstractDbTest { await ResetDb(); - _context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Comic) + Context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Comic) .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) .WithSeries(new SeriesBuilder("Test") @@ -421,7 +425,7 @@ public class SeriesServiceTests : AbstractDbTest .Build()) .Build()) .Build()); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var detail = await _seriesService.GetSeriesDetail(1, 1); @@ -447,7 +451,7 @@ public class SeriesServiceTests : AbstractDbTest { await ResetDb(); - _context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.ComicVine) + Context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.ComicVine) .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) .WithSeries(new SeriesBuilder("Test") @@ -471,7 +475,7 @@ public class SeriesServiceTests : AbstractDbTest .Build()) .Build()) .Build()); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var detail = await _seriesService.GetSeriesDetail(1, 1); @@ -497,7 +501,7 @@ public class SeriesServiceTests : AbstractDbTest { await ResetDb(); - _context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book) + Context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book) .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) .WithSeries(new SeriesBuilder("Test") @@ -519,7 +523,7 @@ public class SeriesServiceTests : AbstractDbTest .Build()) .Build()) .Build()); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var detail = await _seriesService.GetSeriesDetail(1, 1); @@ -545,7 +549,7 @@ public class SeriesServiceTests : AbstractDbTest { await ResetDb(); - _context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.LightNovel) + Context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.LightNovel) .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) .WithSeries(new SeriesBuilder("Test") @@ -567,7 +571,7 @@ public class SeriesServiceTests : AbstractDbTest .Build()) .Build()) .Build()); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var detail = await _seriesService.GetSeriesDetail(1, 1); @@ -587,164 +591,6 @@ public class SeriesServiceTests : AbstractDbTest - #endregion - - - #region UpdateRating - - [Fact] - public async Task UpdateRating_ShouldSetRating() - { - await ResetDb(); - - _context.Library.Add(new LibraryBuilder("Test LIb") - .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) - .WithSeries(new SeriesBuilder("Test") - - .WithVolume(new VolumeBuilder("1") - .WithChapter(new ChapterBuilder("1").WithPages(1).Build()) - .Build()) - .Build()) - .Build()); - - - await _context.SaveChangesAsync(); - - - var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings); - - JobStorage.Current = new InMemoryStorage(); - var result = await _seriesService.UpdateRating(user, new UpdateSeriesRatingDto - { - SeriesId = 1, - UserRating = 3, - }); - - Assert.True(result); - - var ratings = (await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings))! - .Ratings; - Assert.NotEmpty(ratings); - Assert.Equal(3, ratings.First().Rating); - } - - [Fact] - public async Task UpdateRating_ShouldUpdateExistingRating() - { - await ResetDb(); - - _context.Library.Add(new LibraryBuilder("Test LIb") - .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) - .WithSeries(new SeriesBuilder("Test") - - .WithVolume(new VolumeBuilder("1") - .WithChapter(new ChapterBuilder("1").WithPages(1).Build()) - .Build()) - .Build()) - .Build()); - - - await _context.SaveChangesAsync(); - - var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings); - - var result = await _seriesService.UpdateRating(user, new UpdateSeriesRatingDto - { - SeriesId = 1, - UserRating = 3, - }); - - Assert.True(result); - - JobStorage.Current = new InMemoryStorage(); - var ratings = (await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings)) - .Ratings; - Assert.NotEmpty(ratings); - Assert.Equal(3, ratings.First().Rating); - - // Update the DB again - - var result2 = await _seriesService.UpdateRating(user, new UpdateSeriesRatingDto - { - SeriesId = 1, - UserRating = 5, - }); - - Assert.True(result2); - - var ratings2 = (await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings)) - .Ratings; - Assert.NotEmpty(ratings2); - Assert.True(ratings2.Count == 1); - Assert.Equal(5, ratings2.First().Rating); - } - - [Fact] - public async Task UpdateRating_ShouldClampRatingAt5() - { - await ResetDb(); - - _context.Library.Add(new LibraryBuilder("Test LIb") - .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) - .WithSeries(new SeriesBuilder("Test") - - .WithVolume(new VolumeBuilder("1") - .WithChapter(new ChapterBuilder("1").WithPages(1).Build()) - .Build()) - .Build()) - .Build()); - - await _context.SaveChangesAsync(); - - var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings); - - var result = await _seriesService.UpdateRating(user, new UpdateSeriesRatingDto - { - SeriesId = 1, - UserRating = 10, - }); - - Assert.True(result); - - JobStorage.Current = new InMemoryStorage(); - var ratings = (await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", - AppUserIncludes.Ratings)!) - .Ratings; - Assert.NotEmpty(ratings); - Assert.Equal(5, ratings.First().Rating); - } - - [Fact] - public async Task UpdateRating_ShouldReturnFalseWhenSeriesDoesntExist() - { - await ResetDb(); - - _context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book) - .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) - .WithSeries(new SeriesBuilder("Test") - - .WithVolume(new VolumeBuilder("1") - .WithChapter(new ChapterBuilder("1").WithPages(1).Build()) - .Build()) - .Build()) - .Build()); - - await _context.SaveChangesAsync(); - - var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings); - - var result = await _seriesService.UpdateRating(user, new UpdateSeriesRatingDto - { - SeriesId = 2, - UserRating = 5, - }); - - Assert.False(result); - - var ratings = user.Ratings; - Assert.Empty(ratings); - } - #endregion #region UpdateSeriesMetadata @@ -757,8 +603,8 @@ public class SeriesServiceTests : AbstractDbTest .Build(); s.Library = new LibraryBuilder("Test LIb", LibraryType.Book).Build(); - _context.Series.Add(s); - await _context.SaveChangesAsync(); + Context.Series.Add(s); + await Context.SaveChangesAsync(); var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto { @@ -772,7 +618,7 @@ public class SeriesServiceTests : AbstractDbTest Assert.True(success); - var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1); + var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1); Assert.NotNull(series); Assert.NotNull(series.Metadata); Assert.Contains("New Genre".SentenceCase(), series.Metadata.Genres.Select(g => g.Title)); @@ -789,10 +635,10 @@ public class SeriesServiceTests : AbstractDbTest var g = new GenreBuilder("Existing Genre").Build(); s.Metadata.Genres = new List {g}; - _context.Series.Add(s); + Context.Series.Add(s); - _context.Genre.Add(g); - await _context.SaveChangesAsync(); + Context.Genre.Add(g); + await Context.SaveChangesAsync(); var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto { @@ -806,7 +652,8 @@ public class SeriesServiceTests : AbstractDbTest Assert.True(success); - var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1); + var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1); + Assert.NotNull(series); Assert.NotNull(series.Metadata); Assert.True(series.Metadata.Genres.Select(g1 => g1.Title).All(g2 => g2 == "New Genre".SentenceCase())); Assert.False(series.Metadata.GenresLocked); // GenreLocked is false unless the UI Explicitly says it should be locked @@ -817,7 +664,7 @@ public class SeriesServiceTests : AbstractDbTest { await ResetDb(); var g = new PersonBuilder("Existing Person").Build(); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var s = new SeriesBuilder("Test") .WithMetadata(new SeriesMetadataBuilder() @@ -827,10 +674,10 @@ public class SeriesServiceTests : AbstractDbTest s.Library = new LibraryBuilder("Test LIb", LibraryType.Book).Build(); - _context.Series.Add(s); + Context.Series.Add(s); - _context.Person.Add(g); - await _context.SaveChangesAsync(); + Context.Person.Add(g); + await Context.SaveChangesAsync(); var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto { @@ -844,7 +691,8 @@ public class SeriesServiceTests : AbstractDbTest Assert.True(success); - var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1); + var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1); + Assert.NotNull(series); Assert.NotNull(series.Metadata); Assert.True(series.Metadata.People.Select(g => g.Person.Name).All(personName => personName == "Existing Person")); Assert.False(series.Metadata.PublisherLocked); // PublisherLocked is false unless the UI Explicitly says it should be locked @@ -866,10 +714,10 @@ public class SeriesServiceTests : AbstractDbTest new SeriesMetadataPeople() {Person = new PersonBuilder("Existing Publisher 2").Build(), Role = PersonRole.Publisher} }; - _context.Series.Add(s); + Context.Series.Add(s); - _context.Person.Add(g); - await _context.SaveChangesAsync(); + Context.Person.Add(g); + await Context.SaveChangesAsync(); var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto { @@ -884,7 +732,8 @@ public class SeriesServiceTests : AbstractDbTest Assert.True(success); - var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1); + var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1); + Assert.NotNull(series); Assert.NotNull(series.Metadata); Assert.True(series.Metadata.People.Select(g => g.Person.Name).All(personName => personName == "Existing Person")); Assert.True(series.Metadata.PublisherLocked); @@ -915,9 +764,9 @@ public class SeriesServiceTests : AbstractDbTest new SeriesMetadataPeople { Person = new PersonBuilder("Existing Publisher 2").Build(), Role = PersonRole.Publisher } }; - _context.Series.Add(series); - _context.Person.Add(existingPerson); - await _context.SaveChangesAsync(); + Context.Series.Add(series); + Context.Person.Add(existingPerson); + await Context.SaveChangesAsync(); // Act: Update series metadata, attempting to update the writer to "Existing Writer" var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto @@ -934,7 +783,7 @@ public class SeriesServiceTests : AbstractDbTest Assert.True(success); // Reload the series from the database - var updatedSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(series.Id); + var updatedSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(series.Id); Assert.NotNull(updatedSeries.Metadata); // Assert that the people list still contains the updated person with the new name @@ -956,10 +805,10 @@ public class SeriesServiceTests : AbstractDbTest .Build(); s.Library = new LibraryBuilder("Test LIb", LibraryType.Book).Build(); var g = new PersonBuilder("Existing Person").Build(); - _context.Series.Add(s); + Context.Series.Add(s); - _context.Person.Add(g); - await _context.SaveChangesAsync(); + Context.Person.Add(g); + await Context.SaveChangesAsync(); var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto { @@ -973,11 +822,65 @@ public class SeriesServiceTests : AbstractDbTest Assert.True(success); - var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1); + var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1); + Assert.NotNull(series); Assert.NotNull(series.Metadata); Assert.False(series.Metadata.People.Any()); } + /// + /// This emulates the UI operations wrt to locking + /// + [Fact] + public async Task UpdateSeriesMetadata_ShouldRemoveExistingPerson_AfterAdding() + { + await ResetDb(); + var s = new SeriesBuilder("Test") + .WithMetadata(new SeriesMetadataBuilder().Build()) + .Build(); + s.Library = new LibraryBuilder("Test LIb", LibraryType.Book).Build(); + var g = new PersonBuilder("Existing Person").Build(); + Context.Series.Add(s); + + Context.Person.Add(g); + await Context.SaveChangesAsync(); + + var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto + { + SeriesMetadata = new SeriesMetadataDto + { + SeriesId = 1, + Publishers = new List() {new PersonDto() {Name = "Test"}}, + PublisherLocked = true + }, + + }); + + Assert.True(success); + + var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1); + Assert.NotNull(series); + Assert.NotNull(series.Metadata); + Assert.True(series.Metadata.People.Count != 0); + Assert.True(series.Metadata.PublisherLocked); + + + success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto + { + SeriesMetadata = new SeriesMetadataDto + { + SeriesId = 1, + Publishers = new List(), + PublisherLocked = false + }, + + }); + + Assert.True(success); + Assert.Empty(series.Metadata.People); + Assert.False(series.Metadata.PublisherLocked); + } + [Fact] public async Task UpdateSeriesMetadata_ShouldLockIfTold() { @@ -989,10 +892,10 @@ public class SeriesServiceTests : AbstractDbTest var g = new GenreBuilder("Existing Genre").Build(); s.Metadata.Genres = new List {g}; s.Metadata.GenresLocked = true; - _context.Series.Add(s); + Context.Series.Add(s); - _context.Genre.Add(g); - await _context.SaveChangesAsync(); + Context.Genre.Add(g); + await Context.SaveChangesAsync(); var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto { @@ -1007,7 +910,8 @@ public class SeriesServiceTests : AbstractDbTest Assert.True(success); - var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1); + var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1); + Assert.NotNull(series); Assert.NotNull(series.Metadata); Assert.True(series.Metadata.Genres.Select(g => g.Title).All(g => g == "Existing Genre".SentenceCase())); Assert.True(series.Metadata.GenresLocked); @@ -1021,8 +925,8 @@ public class SeriesServiceTests : AbstractDbTest .WithMetadata(new SeriesMetadataBuilder().Build()) .Build(); s.Library = new LibraryBuilder("Test LIb", LibraryType.Book).Build(); - _context.Series.Add(s); - await _context.SaveChangesAsync(); + Context.Series.Add(s); + await Context.SaveChangesAsync(); var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto { @@ -1036,7 +940,8 @@ public class SeriesServiceTests : AbstractDbTest Assert.True(success); - var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1); + var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1); + Assert.NotNull(series); Assert.NotNull(series.Metadata); Assert.Equal(0, series.Metadata.ReleaseYear); Assert.False(series.Metadata.ReleaseYearLocked); @@ -1054,8 +959,8 @@ public class SeriesServiceTests : AbstractDbTest .Build(); s.Library = new LibraryBuilder("Test Lib", LibraryType.Book).Build(); - _context.Series.Add(s); - await _context.SaveChangesAsync(); + Context.Series.Add(s); + await Context.SaveChangesAsync(); var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto { @@ -1068,7 +973,8 @@ public class SeriesServiceTests : AbstractDbTest Assert.True(success); - var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id); + var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id); + Assert.NotNull(series); Assert.NotNull(series.Metadata); Assert.Contains("New Genre".SentenceCase(), series.Metadata.Genres.Select(g => g.Title)); Assert.False(series.Metadata.GenresLocked); // Ensure the lock is not activated unless specified. @@ -1086,9 +992,9 @@ public class SeriesServiceTests : AbstractDbTest var g = new GenreBuilder("Existing Genre").Build(); s.Metadata.Genres = new List { g }; - _context.Series.Add(s); - _context.Genre.Add(g); - await _context.SaveChangesAsync(); + Context.Series.Add(s); + Context.Genre.Add(g); + await Context.SaveChangesAsync(); var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto { @@ -1101,7 +1007,8 @@ public class SeriesServiceTests : AbstractDbTest Assert.True(success); - var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id); + var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id); + Assert.NotNull(series); Assert.NotNull(series.Metadata); Assert.DoesNotContain("Existing Genre".SentenceCase(), series.Metadata.Genres.Select(g => g.Title)); Assert.Contains("New Genre".SentenceCase(), series.Metadata.Genres.Select(g => g.Title)); @@ -1119,9 +1026,9 @@ public class SeriesServiceTests : AbstractDbTest var g = new GenreBuilder("Existing Genre").Build(); s.Metadata.Genres = new List { g }; - _context.Series.Add(s); - _context.Genre.Add(g); - await _context.SaveChangesAsync(); + Context.Series.Add(s); + Context.Genre.Add(g); + await Context.SaveChangesAsync(); var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto { @@ -1134,7 +1041,8 @@ public class SeriesServiceTests : AbstractDbTest Assert.True(success); - var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id); + var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id); + Assert.NotNull(series); Assert.NotNull(series.Metadata); Assert.Empty(series.Metadata.Genres); } @@ -1151,8 +1059,8 @@ public class SeriesServiceTests : AbstractDbTest .Build(); s.Library = new LibraryBuilder("Test Lib", LibraryType.Book).Build(); - _context.Series.Add(s); - await _context.SaveChangesAsync(); + Context.Series.Add(s); + await Context.SaveChangesAsync(); var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto { @@ -1165,7 +1073,8 @@ public class SeriesServiceTests : AbstractDbTest Assert.True(success); - var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id); + var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id); + Assert.NotNull(series); Assert.NotNull(series.Metadata); Assert.Contains("New Tag".SentenceCase(), series.Metadata.Tags.Select(t => t.Title)); } @@ -1182,9 +1091,9 @@ public class SeriesServiceTests : AbstractDbTest var t = new TagBuilder("Existing Tag").Build(); s.Metadata.Tags = new List { t }; - _context.Series.Add(s); - _context.Tag.Add(t); - await _context.SaveChangesAsync(); + Context.Series.Add(s); + Context.Tag.Add(t); + await Context.SaveChangesAsync(); var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto { @@ -1197,7 +1106,8 @@ public class SeriesServiceTests : AbstractDbTest Assert.True(success); - var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id); + var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id); + Assert.NotNull(series); Assert.NotNull(series.Metadata); Assert.DoesNotContain("Existing Tag".SentenceCase(), series.Metadata.Tags.Select(t => t.Title)); Assert.Contains("New Tag".SentenceCase(), series.Metadata.Tags.Select(t => t.Title)); @@ -1215,9 +1125,9 @@ public class SeriesServiceTests : AbstractDbTest var t = new TagBuilder("Existing Tag").Build(); s.Metadata.Tags = new List { t }; - _context.Series.Add(s); - _context.Tag.Add(t); - await _context.SaveChangesAsync(); + Context.Series.Add(s); + Context.Tag.Add(t); + await Context.SaveChangesAsync(); var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto { @@ -1230,7 +1140,8 @@ public class SeriesServiceTests : AbstractDbTest Assert.True(success); - var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id); + var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id); + Assert.NotNull(series); Assert.NotNull(series.Metadata); Assert.Empty(series.Metadata.Tags); } @@ -1361,12 +1272,12 @@ public class SeriesServiceTests : AbstractDbTest #endregion - #region SeriesRelation + #region Series Relation [Fact] public async Task UpdateRelatedSeries_ShouldAddAllRelations() { await ResetDb(); - _context.Library.Add(new Library + Context.Library.Add(new Library { AppUsers = new List { @@ -1385,9 +1296,9 @@ public class SeriesServiceTests : AbstractDbTest } }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var series1 = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related); + var series1 = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related); // Add relations var addRelationDto = CreateRelationsDto(series1); addRelationDto.Adaptations.Add(2); @@ -1402,7 +1313,7 @@ public class SeriesServiceTests : AbstractDbTest public async Task UpdateRelatedSeries_ShouldAddPrequelWhenAddingSequel() { await ResetDb(); - _context.Library.Add(new Library + Context.Library.Add(new Library { AppUsers = new List { @@ -1420,15 +1331,16 @@ public class SeriesServiceTests : AbstractDbTest } }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var series1 = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related); - var series2 = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(2, SeriesIncludes.Related); + var series1 = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related); + var series2 = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(2, SeriesIncludes.Related); // Add relations var addRelationDto = CreateRelationsDto(series1); addRelationDto.Sequels.Add(2); await _seriesService.UpdateRelatedSeries(addRelationDto); Assert.NotNull(series1); + Assert.NotNull(series2); Assert.Equal(2, series1.Relations.Single(s => s.TargetSeriesId == 2).TargetSeriesId); Assert.Equal(1, series2.Relations.Single(s => s.TargetSeriesId == 1).TargetSeriesId); } @@ -1437,7 +1349,7 @@ public class SeriesServiceTests : AbstractDbTest public async Task UpdateRelatedSeries_DeleteAllRelations() { await ResetDb(); - _context.Library.Add(new Library + Context.Library.Add(new Library { AppUsers = new List { @@ -1456,9 +1368,9 @@ public class SeriesServiceTests : AbstractDbTest } }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var series1 = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related); + var series1 = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related); // Add relations var addRelationDto = CreateRelationsDto(series1); addRelationDto.Adaptations.Add(2); @@ -1471,8 +1383,9 @@ public class SeriesServiceTests : AbstractDbTest // Remove relations var removeRelationDto = CreateRelationsDto(series1); await _seriesService.UpdateRelatedSeries(removeRelationDto); - Assert.Empty(series1.Relations.Where(s => s.TargetSeriesId == 1)); - Assert.Empty(series1.Relations.Where(s => s.TargetSeriesId == 2)); + Assert.NotNull(series1); + Assert.DoesNotContain(series1.Relations, s => s.TargetSeriesId == 1); + Assert.DoesNotContain(series1.Relations, s => s.TargetSeriesId == 2); } @@ -1480,7 +1393,7 @@ public class SeriesServiceTests : AbstractDbTest public async Task UpdateRelatedSeries_DeleteTargetSeries_ShouldSucceed() { await ResetDb(); - _context.Library.Add(new Library + Context.Library.Add(new Library { AppUsers = new List { @@ -1498,19 +1411,21 @@ public class SeriesServiceTests : AbstractDbTest } }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var series1 = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related); + var series1 = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related); // Add relations var addRelationDto = CreateRelationsDto(series1); addRelationDto.Adaptations.Add(2); await _seriesService.UpdateRelatedSeries(addRelationDto); + + Assert.NotNull(series1); Assert.Equal(2, series1.Relations.Single(s => s.TargetSeriesId == 2).TargetSeriesId); - _context.Series.Remove(await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(2)); + Context.Series.Remove(await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(2)); try { - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); } catch (Exception) { @@ -1518,14 +1433,14 @@ public class SeriesServiceTests : AbstractDbTest } // Remove relations - Assert.Empty((await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related)).Relations); + Assert.Empty((await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related)).Relations); } [Fact] public async Task UpdateRelatedSeries_DeleteSourceSeries_ShouldSucceed() { await ResetDb(); - _context.Library.Add(new Library + Context.Library.Add(new Library { AppUsers = new List { @@ -1543,9 +1458,9 @@ public class SeriesServiceTests : AbstractDbTest } }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var series1 = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related); + var series1 = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related); // Add relations var addRelationDto = CreateRelationsDto(series1); addRelationDto.Adaptations.Add(2); @@ -1553,12 +1468,12 @@ public class SeriesServiceTests : AbstractDbTest Assert.NotNull(series1); Assert.Equal(2, series1.Relations.Single(s => s.TargetSeriesId == 2).TargetSeriesId); - var seriesToRemove = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1); + var seriesToRemove = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1); Assert.NotNull(seriesToRemove); - _context.Series.Remove(seriesToRemove); + Context.Series.Remove(seriesToRemove); try { - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); } catch (Exception) { @@ -1566,14 +1481,14 @@ public class SeriesServiceTests : AbstractDbTest } // Remove relations - Assert.Empty((await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(2, SeriesIncludes.Related)).Relations); + Assert.Empty((await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(2, SeriesIncludes.Related)).Relations); } [Fact] public async Task UpdateRelatedSeries_ShouldNotAllowDuplicates() { await ResetDb(); - _context.Library.Add(new Library + Context.Library.Add(new Library { AppUsers = new List { @@ -1591,9 +1506,9 @@ public class SeriesServiceTests : AbstractDbTest } }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var series1 = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related); + var series1 = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related); var relation = new SeriesRelation { Series = series1, @@ -1618,7 +1533,7 @@ public class SeriesServiceTests : AbstractDbTest public async Task GetRelatedSeries_EditionPrequelSequel_ShouldNotHaveParent() { await ResetDb(); - _context.Library.Add(new Library + Context.Library.Add(new Library { AppUsers = new List { @@ -1638,8 +1553,8 @@ public class SeriesServiceTests : AbstractDbTest new SeriesBuilder("Test Series Adaption").Build(), } }); - await _context.SaveChangesAsync(); - var series1 = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related); + await Context.SaveChangesAsync(); + var series1 = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related); // Add relations var addRelationDto = CreateRelationsDto(series1); addRelationDto.Editions.Add(2); @@ -1665,30 +1580,30 @@ public class SeriesServiceTests : AbstractDbTest .WithSeries(new SeriesBuilder("Test Series Sequels").Build()) .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) .Build(); - _context.Library.Add(lib); + Context.Library.Add(lib); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var series1 = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related); + var series1 = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related); // Add relations var addRelationDto = CreateRelationsDto(series1); addRelationDto.Adaptations.Add(2); addRelationDto.Sequels.Add(3); await _seriesService.UpdateRelatedSeries(addRelationDto); - var library = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(lib.Id); - _unitOfWork.LibraryRepository.Delete(library); + var library = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(lib.Id); + UnitOfWork.LibraryRepository.Delete(library); try { - await _unitOfWork.CommitAsync(); + await UnitOfWork.CommitAsync(); } catch (Exception) { Assert.False(true); } - Assert.Null(await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(1)); + Assert.Null(await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(1)); } [Fact] @@ -1709,7 +1624,7 @@ public class SeriesServiceTests : AbstractDbTest .WithSeries(new SeriesBuilder("Test Series Sequels").Build()) .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) .Build(); - _context.Library.Add(lib1); + Context.Library.Add(lib1); var lib2 = new LibraryBuilder("Test LIb 2", LibraryType.Book) .WithSeries(new SeriesBuilder("Test Series 2").Build()) @@ -1717,29 +1632,29 @@ public class SeriesServiceTests : AbstractDbTest .WithSeries(new SeriesBuilder("Test Series Prequels 3").Build())// TODO: Is this a bug .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) .Build(); - _context.Library.Add(lib2); + Context.Library.Add(lib2); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var series1 = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related); + var series1 = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related); // Add relations var addRelationDto = CreateRelationsDto(series1); addRelationDto.Adaptations.Add(4); // cross library link await _seriesService.UpdateRelatedSeries(addRelationDto); - var library = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(lib1.Id, LibraryIncludes.Series); - _unitOfWork.LibraryRepository.Delete(library); + var library = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(lib1.Id, LibraryIncludes.Series); + UnitOfWork.LibraryRepository.Delete(library); try { - await _unitOfWork.CommitAsync(); + await UnitOfWork.CommitAsync(); } catch (Exception) { Assert.False(true); } - Assert.Null(await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(1)); + Assert.Null(await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(1)); } #endregion @@ -1761,13 +1676,13 @@ public class SeriesServiceTests : AbstractDbTest { await ResetDb(); - _context.Library.Add(new LibraryBuilder("Test LIb") + Context.Library.Add(new LibraryBuilder("Test LIb") .WithAppUser(new AppUserBuilder("majora2007", string.Empty) .WithLocale("en") .Build()) .Build()); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); Assert.Equal(expected, await _seriesService.FormatChapterName(1, libraryType, withHash)); } @@ -1932,18 +1847,18 @@ public class SeriesServiceTests : AbstractDbTest .WithSeries(new SeriesBuilder("Test Series Sequels").Build()) .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) .Build(); - _context.Library.Add(lib1); + Context.Library.Add(lib1); var lib2 = new LibraryBuilder("Test LIb 2", LibraryType.Book) .WithSeries(new SeriesBuilder("Test Series 2").Build()) .WithSeries(new SeriesBuilder("Test Series Prequels 2").Build()) .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) .Build(); - _context.Library.Add(lib2); + Context.Library.Add(lib2); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var series1 = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, + var series1 = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related | SeriesIncludes.ExternalRatings); // Add relations var addRelationDto = CreateRelationsDto(series1); @@ -1989,12 +1904,12 @@ public class SeriesServiceTests : AbstractDbTest } }; - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); // Ensure we can delete the series Assert.True(await _seriesService.DeleteMultipleSeries(new[] {1, 2})); - Assert.Null(await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1)); - Assert.Null(await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(2)); + Assert.Null(await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1)); + Assert.Null(await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(2)); } #endregion @@ -2006,7 +1921,7 @@ public class SeriesServiceTests : AbstractDbTest { await ResetDb(); - _context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book) + Context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book) .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) .WithSeries(new SeriesBuilder("Test") @@ -2019,7 +1934,7 @@ public class SeriesServiceTests : AbstractDbTest .Build()); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _seriesService.GetEstimatedChapterCreationDate(1, 1); Assert.Equal(Parser.LooseLeafVolumeNumber, nextChapter.VolumeNumber); @@ -2031,7 +1946,7 @@ public class SeriesServiceTests : AbstractDbTest { await ResetDb(); - _context.Library.Add(new LibraryBuilder("Test LIb") + Context.Library.Add(new LibraryBuilder("Test LIb") .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) .WithSeries(new SeriesBuilder("Test") .WithPublicationStatus(PublicationStatus.Completed) @@ -2044,7 +1959,7 @@ public class SeriesServiceTests : AbstractDbTest .Build()); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _seriesService.GetEstimatedChapterCreationDate(1, 1); Assert.Equal(Parser.LooseLeafVolumeNumber, nextChapter.VolumeNumber); @@ -2056,7 +1971,7 @@ public class SeriesServiceTests : AbstractDbTest { await ResetDb(); - _context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book) + Context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book) .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) .WithSeries(new SeriesBuilder("Test") @@ -2068,7 +1983,7 @@ public class SeriesServiceTests : AbstractDbTest .Build()); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _seriesService.GetEstimatedChapterCreationDate(1, 1); Assert.NotNull(nextChapter); @@ -2080,9 +1995,9 @@ public class SeriesServiceTests : AbstractDbTest public async Task GetEstimatedChapterCreationDate_NextChapter_ChaptersMonthApart() { await ResetDb(); - var now = DateTime.Parse("2021-01-01"); // 10/31/2024 can trigger an edge case bug + var now = DateTime.Parse("2021-01-01", CultureInfo.InvariantCulture); // 10/31/2024 can trigger an edge case bug - _context.Library.Add(new LibraryBuilder("Test LIb") + Context.Library.Add(new LibraryBuilder("Test LIb") .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build()) .WithSeries(new SeriesBuilder("Test") .WithPublicationStatus(PublicationStatus.OnGoing) @@ -2096,7 +2011,7 @@ public class SeriesServiceTests : AbstractDbTest .Build()); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var nextChapter = await _seriesService.GetEstimatedChapterCreationDate(1, 1); Assert.NotNull(nextChapter); diff --git a/API.Tests/Services/SettingsServiceTests.cs b/API.Tests/Services/SettingsServiceTests.cs new file mode 100644 index 000000000..a3c6b67b8 --- /dev/null +++ b/API.Tests/Services/SettingsServiceTests.cs @@ -0,0 +1,292 @@ +using System.Collections.Generic; +using System.IO.Abstractions; +using System.Threading.Tasks; +using API.Data; +using API.Data.Repositories; +using API.DTOs.KavitaPlus.Metadata; +using API.Entities; +using API.Entities.Enums; +using API.Entities.MetadataMatching; +using API.Services; +using API.Services.Tasks.Scanner; +using Microsoft.Extensions.Logging; +using NSubstitute; +using Xunit; + +namespace API.Tests.Services; + +public class SettingsServiceTests +{ + private readonly ISettingsService _settingsService; + private readonly IUnitOfWork _mockUnitOfWork; + + public SettingsServiceTests() + { + var ds = new DirectoryService(Substitute.For>(), new FileSystem()); + + _mockUnitOfWork = Substitute.For(); + _settingsService = new SettingsService(_mockUnitOfWork, ds, + Substitute.For(), Substitute.For(), + Substitute.For>()); + } + + #region UpdateMetadataSettings + + [Fact] + public async Task UpdateMetadataSettings_ShouldUpdateExistingSettings() + { + // Arrange + var existingSettings = new MetadataSettings + { + Id = 1, + Enabled = false, + EnableSummary = false, + EnableLocalizedName = false, + EnablePublicationStatus = false, + EnableRelationships = false, + EnablePeople = false, + EnableStartDate = false, + EnableGenres = false, + EnableTags = false, + FirstLastPeopleNaming = false, + EnableCoverImage = false, + AgeRatingMappings = new Dictionary(), + Blacklist = [], + Whitelist = [], + Overrides = [], + PersonRoles = [], + FieldMappings = [] + }; + + var settingsRepo = Substitute.For(); + settingsRepo.GetMetadataSettings().Returns(Task.FromResult(existingSettings)); + settingsRepo.GetMetadataSettingDto().Returns(Task.FromResult(new MetadataSettingsDto())); + _mockUnitOfWork.SettingsRepository.Returns(settingsRepo); + + var updateDto = new MetadataSettingsDto + { + Enabled = true, + EnableSummary = true, + EnableLocalizedName = true, + EnablePublicationStatus = true, + EnableRelationships = true, + EnablePeople = true, + EnableStartDate = true, + EnableGenres = true, + EnableTags = true, + FirstLastPeopleNaming = true, + EnableCoverImage = true, + AgeRatingMappings = new Dictionary { { "Adult", AgeRating.R18Plus } }, + Blacklist = ["blacklisted-tag"], + Whitelist = ["whitelisted-tag"], + Overrides = [MetadataSettingField.Summary], + PersonRoles = [PersonRole.Writer], + FieldMappings = + [ + new MetadataFieldMappingDto + { + SourceType = MetadataFieldType.Genre, + DestinationType = MetadataFieldType.Tag, + SourceValue = "Action", + DestinationValue = "Fight", + ExcludeFromSource = true + } + ] + }; + + // Act + await _settingsService.UpdateMetadataSettings(updateDto); + + // Assert + await _mockUnitOfWork.Received(1).CommitAsync(); + + // Verify properties were updated + Assert.True(existingSettings.Enabled); + Assert.True(existingSettings.EnableSummary); + Assert.True(existingSettings.EnableLocalizedName); + Assert.True(existingSettings.EnablePublicationStatus); + Assert.True(existingSettings.EnableRelationships); + Assert.True(existingSettings.EnablePeople); + Assert.True(existingSettings.EnableStartDate); + Assert.True(existingSettings.EnableGenres); + Assert.True(existingSettings.EnableTags); + Assert.True(existingSettings.FirstLastPeopleNaming); + Assert.True(existingSettings.EnableCoverImage); + + // Verify collections were updated + Assert.Single(existingSettings.AgeRatingMappings); + Assert.Equal(AgeRating.R18Plus, existingSettings.AgeRatingMappings["Adult"]); + + Assert.Single(existingSettings.Blacklist); + Assert.Equal("blacklisted-tag", existingSettings.Blacklist[0]); + + Assert.Single(existingSettings.Whitelist); + Assert.Equal("whitelisted-tag", existingSettings.Whitelist[0]); + + Assert.Single(existingSettings.Overrides); + Assert.Equal(MetadataSettingField.Summary, existingSettings.Overrides[0]); + + Assert.Single(existingSettings.PersonRoles); + Assert.Equal(PersonRole.Writer, existingSettings.PersonRoles[0]); + + Assert.Single(existingSettings.FieldMappings); + Assert.Equal(MetadataFieldType.Genre, existingSettings.FieldMappings[0].SourceType); + Assert.Equal(MetadataFieldType.Tag, existingSettings.FieldMappings[0].DestinationType); + Assert.Equal("Action", existingSettings.FieldMappings[0].SourceValue); + Assert.Equal("Fight", existingSettings.FieldMappings[0].DestinationValue); + Assert.True(existingSettings.FieldMappings[0].ExcludeFromSource); + } + + [Fact] + public async Task UpdateMetadataSettings_WithNullCollections_ShouldUseEmptyCollections() + { + // Arrange + var existingSettings = new MetadataSettings + { + Id = 1, + FieldMappings = [new MetadataFieldMapping {Id = 1, SourceValue = "OldValue"}] + }; + + var settingsRepo = Substitute.For(); + settingsRepo.GetMetadataSettings().Returns(Task.FromResult(existingSettings)); + settingsRepo.GetMetadataSettingDto().Returns(Task.FromResult(new MetadataSettingsDto())); + _mockUnitOfWork.SettingsRepository.Returns(settingsRepo); + + var updateDto = new MetadataSettingsDto + { + AgeRatingMappings = null, + Blacklist = null, + Whitelist = null, + Overrides = null, + PersonRoles = null, + FieldMappings = null + }; + + // Act + await _settingsService.UpdateMetadataSettings(updateDto); + + // Assert + await _mockUnitOfWork.Received(1).CommitAsync(); + + Assert.Empty(existingSettings.AgeRatingMappings); + Assert.Empty(existingSettings.Blacklist); + Assert.Empty(existingSettings.Whitelist); + Assert.Empty(existingSettings.Overrides); + Assert.Empty(existingSettings.PersonRoles); + + // Verify existing field mappings were cleared + settingsRepo.Received(1).RemoveRange(Arg.Any>()); + Assert.Empty(existingSettings.FieldMappings); + } + + [Fact] + public async Task UpdateMetadataSettings_WithFieldMappings_ShouldReplaceExistingMappings() + { + // Arrange + var existingSettings = new MetadataSettings + { + Id = 1, + FieldMappings = + [ + new MetadataFieldMapping + { + Id = 1, + SourceType = MetadataFieldType.Genre, + DestinationType = MetadataFieldType.Genre, + SourceValue = "OldValue", + DestinationValue = "OldDestination", + ExcludeFromSource = false + } + ] + }; + + var settingsRepo = Substitute.For(); + settingsRepo.GetMetadataSettings().Returns(Task.FromResult(existingSettings)); + settingsRepo.GetMetadataSettingDto().Returns(Task.FromResult(new MetadataSettingsDto())); + _mockUnitOfWork.SettingsRepository.Returns(settingsRepo); + + var updateDto = new MetadataSettingsDto + { + FieldMappings = + [ + new MetadataFieldMappingDto + { + SourceType = MetadataFieldType.Tag, + DestinationType = MetadataFieldType.Genre, + SourceValue = "NewValue", + DestinationValue = "NewDestination", + ExcludeFromSource = true + }, + + new MetadataFieldMappingDto + { + SourceType = MetadataFieldType.Tag, + DestinationType = MetadataFieldType.Tag, + SourceValue = "AnotherValue", + DestinationValue = "AnotherDestination", + ExcludeFromSource = false + } + ] + }; + + // Act + await _settingsService.UpdateMetadataSettings(updateDto); + + // Assert + await _mockUnitOfWork.Received(1).CommitAsync(); + + // Verify existing field mappings were cleared and new ones added + settingsRepo.Received(1).RemoveRange(Arg.Any>()); + Assert.Equal(2, existingSettings.FieldMappings.Count); + + // Verify first mapping + Assert.Equal(MetadataFieldType.Tag, existingSettings.FieldMappings[0].SourceType); + Assert.Equal(MetadataFieldType.Genre, existingSettings.FieldMappings[0].DestinationType); + Assert.Equal("NewValue", existingSettings.FieldMappings[0].SourceValue); + Assert.Equal("NewDestination", existingSettings.FieldMappings[0].DestinationValue); + Assert.True(existingSettings.FieldMappings[0].ExcludeFromSource); + + // Verify second mapping + Assert.Equal(MetadataFieldType.Tag, existingSettings.FieldMappings[1].SourceType); + Assert.Equal(MetadataFieldType.Tag, existingSettings.FieldMappings[1].DestinationType); + Assert.Equal("AnotherValue", existingSettings.FieldMappings[1].SourceValue); + Assert.Equal("AnotherDestination", existingSettings.FieldMappings[1].DestinationValue); + Assert.False(existingSettings.FieldMappings[1].ExcludeFromSource); + } + + [Fact] + public async Task UpdateMetadataSettings_WithBlacklistWhitelist_ShouldNormalizeAndDeduplicateEntries() + { + // Arrange + var existingSettings = new MetadataSettings + { + Id = 1, + Blacklist = [], + Whitelist = [] + }; + + // We need to mock the repository and provide a custom implementation for ToNormalized + var settingsRepo = Substitute.For(); + settingsRepo.GetMetadataSettings().Returns(Task.FromResult(existingSettings)); + settingsRepo.GetMetadataSettingDto().Returns(Task.FromResult(new MetadataSettingsDto())); + _mockUnitOfWork.SettingsRepository.Returns(settingsRepo); + + var updateDto = new MetadataSettingsDto + { + // Include duplicates with different casing and whitespace + Blacklist = ["tag1", "Tag1", " tag2 ", "", " ", "tag3"], + Whitelist = ["allowed1", "Allowed1", " allowed2 ", "", "allowed3"] + }; + + // Act + await _settingsService.UpdateMetadataSettings(updateDto); + + // Assert + await _mockUnitOfWork.Received(1).CommitAsync(); + + Assert.Equal(3, existingSettings.Blacklist.Count); + Assert.Equal(3, existingSettings.Whitelist.Count); + } + + #endregion +} diff --git a/API.Tests/Services/SiteThemeServiceTests.cs b/API.Tests/Services/SiteThemeServiceTests.cs index 463d49df4..3893af1fb 100644 --- a/API.Tests/Services/SiteThemeServiceTests.cs +++ b/API.Tests/Services/SiteThemeServiceTests.cs @@ -31,24 +31,24 @@ public abstract class SiteThemeServiceTest : AbstractDbTest protected override async Task ResetDb() { - _context.SiteTheme.RemoveRange(_context.SiteTheme); - await _context.SaveChangesAsync(); + Context.SiteTheme.RemoveRange(Context.SiteTheme); + await Context.SaveChangesAsync(); // Recreate defaults - await Seed.SeedThemes(_context); + await Seed.SeedThemes(Context); } [Fact] public async Task UpdateDefault_ShouldThrowOnInvalidId() { await ResetDb(); - _testOutputHelper.WriteLine($"[UpdateDefault_ShouldThrowOnInvalidId] All Themes: {(await _unitOfWork.SiteThemeRepository.GetThemes()).Count(t => t.IsDefault)}"); + _testOutputHelper.WriteLine($"[UpdateDefault_ShouldThrowOnInvalidId] All Themes: {(await UnitOfWork.SiteThemeRepository.GetThemes()).Count(t => t.IsDefault)}"); var filesystem = CreateFileSystem(); filesystem.AddFile($"{SiteThemeDirectory}custom.css", new MockFileData("123")); var ds = new DirectoryService(Substitute.For>(), filesystem); - var siteThemeService = new ThemeService(ds, _unitOfWork, _messageHub, Substitute.For(), + var siteThemeService = new ThemeService(ds, UnitOfWork, _messageHub, Substitute.For(), Substitute.For>(), Substitute.For()); - _context.SiteTheme.Add(new SiteTheme() + Context.SiteTheme.Add(new SiteTheme() { Name = "Custom", NormalizedName = "Custom".ToNormalized(), @@ -56,7 +56,7 @@ public abstract class SiteThemeServiceTest : AbstractDbTest FileName = "custom.css", IsDefault = false }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var ex = await Assert.ThrowsAsync(() => siteThemeService.UpdateDefault(10)); Assert.Equal("Theme file missing or invalid", ex.Message); @@ -68,14 +68,14 @@ public abstract class SiteThemeServiceTest : AbstractDbTest public async Task GetContent_ShouldReturnContent() { await ResetDb(); - _testOutputHelper.WriteLine($"[GetContent_ShouldReturnContent] All Themes: {(await _unitOfWork.SiteThemeRepository.GetThemes()).Count(t => t.IsDefault)}"); + _testOutputHelper.WriteLine($"[GetContent_ShouldReturnContent] All Themes: {(await UnitOfWork.SiteThemeRepository.GetThemes()).Count(t => t.IsDefault)}"); var filesystem = CreateFileSystem(); filesystem.AddFile($"{SiteThemeDirectory}custom.css", new MockFileData("123")); var ds = new DirectoryService(Substitute.For>(), filesystem); - var siteThemeService = new ThemeService(ds, _unitOfWork, _messageHub, Substitute.For(), + var siteThemeService = new ThemeService(ds, UnitOfWork, _messageHub, Substitute.For(), Substitute.For>(), Substitute.For()); - _context.SiteTheme.Add(new SiteTheme() + Context.SiteTheme.Add(new SiteTheme() { Name = "Custom", NormalizedName = "Custom".ToNormalized(), @@ -83,9 +83,9 @@ public abstract class SiteThemeServiceTest : AbstractDbTest FileName = "custom.css", IsDefault = false }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var content = await siteThemeService.GetContent((await _unitOfWork.SiteThemeRepository.GetThemeDtoByName("Custom")).Id); + var content = await siteThemeService.GetContent((await UnitOfWork.SiteThemeRepository.GetThemeDtoByName("Custom")).Id); Assert.NotNull(content); Assert.NotEmpty(content); Assert.Equal("123", content); @@ -95,14 +95,14 @@ public abstract class SiteThemeServiceTest : AbstractDbTest public async Task UpdateDefault_ShouldHaveOneDefault() { await ResetDb(); - _testOutputHelper.WriteLine($"[UpdateDefault_ShouldHaveOneDefault] All Themes: {(await _unitOfWork.SiteThemeRepository.GetThemes()).Count(t => t.IsDefault)}"); + _testOutputHelper.WriteLine($"[UpdateDefault_ShouldHaveOneDefault] All Themes: {(await UnitOfWork.SiteThemeRepository.GetThemes()).Count(t => t.IsDefault)}"); var filesystem = CreateFileSystem(); filesystem.AddFile($"{SiteThemeDirectory}custom.css", new MockFileData("123")); var ds = new DirectoryService(Substitute.For>(), filesystem); - var siteThemeService = new ThemeService(ds, _unitOfWork, _messageHub, Substitute.For(), + var siteThemeService = new ThemeService(ds, UnitOfWork, _messageHub, Substitute.For(), Substitute.For>(), Substitute.For()); - _context.SiteTheme.Add(new SiteTheme() + Context.SiteTheme.Add(new SiteTheme() { Name = "Custom", NormalizedName = "Custom".ToNormalized(), @@ -110,16 +110,16 @@ public abstract class SiteThemeServiceTest : AbstractDbTest FileName = "custom.css", IsDefault = false }); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); - var customTheme = (await _unitOfWork.SiteThemeRepository.GetThemeDtoByName("Custom")); + var customTheme = (await UnitOfWork.SiteThemeRepository.GetThemeDtoByName("Custom")); Assert.NotNull(customTheme); await siteThemeService.UpdateDefault(customTheme.Id); - Assert.Equal(customTheme.Id, (await _unitOfWork.SiteThemeRepository.GetDefaultTheme()).Id); + Assert.Equal(customTheme.Id, (await UnitOfWork.SiteThemeRepository.GetDefaultTheme()).Id); } } diff --git a/API.Tests/Services/TachiyomiServiceTests.cs b/API.Tests/Services/TachiyomiServiceTests.cs index 1e5127865..17e26139c 100644 --- a/API.Tests/Services/TachiyomiServiceTests.cs +++ b/API.Tests/Services/TachiyomiServiceTests.cs @@ -1,7 +1,5 @@ -using API.Extensions; -using API.Helpers.Builders; +using API.Helpers.Builders; using API.Services.Plus; -using API.Services.Tasks; namespace API.Tests.Services; using System.Collections.Generic; @@ -16,7 +14,6 @@ using API.Entities.Enums; using API.Helpers; using API.Services; using SignalR; -using Helpers; using AutoMapper; using Microsoft.Data.Sqlite; using Microsoft.EntityFrameworkCore; diff --git a/API.Tests/Services/Test Data/BookService/Bizet-Variations_Chromatiques_de_concert_Theme_A4.pdf b/API.Tests/Services/Test Data/BookService/Bizet-Variations_Chromatiques_de_concert_Theme_A4.pdf new file mode 100644 index 000000000..9fe4811a7 Binary files /dev/null and b/API.Tests/Services/Test Data/BookService/Bizet-Variations_Chromatiques_de_concert_Theme_A4.pdf differ diff --git a/API.Tests/Services/Test Data/BookService/Rollo at Work SP01.pdf b/API.Tests/Services/Test Data/BookService/Rollo at Work SP01.pdf new file mode 100644 index 000000000..0e0ffa8c7 Binary files /dev/null and b/API.Tests/Services/Test Data/BookService/Rollo at Work SP01.pdf differ diff --git a/API.Tests/Services/Test Data/BookService/encrypted.pdf b/API.Tests/Services/Test Data/BookService/encrypted.pdf new file mode 100644 index 000000000..64249b728 Binary files /dev/null and b/API.Tests/Services/Test Data/BookService/encrypted.pdf differ diff --git a/API.Tests/Services/Test Data/BookService/indirect.pdf b/API.Tests/Services/Test Data/BookService/indirect.pdf new file mode 100644 index 000000000..11ecdcb76 Binary files /dev/null and b/API.Tests/Services/Test Data/BookService/indirect.pdf differ diff --git a/API.Tests/Services/Test Data/CoverDbService/Existing/01.webp b/API.Tests/Services/Test Data/CoverDbService/Existing/01.webp new file mode 100644 index 000000000..0b46b66d2 Binary files /dev/null and b/API.Tests/Services/Test Data/CoverDbService/Existing/01.webp differ diff --git a/API.Tests/Services/Test Data/CoverDbService/Favicons/anilist.co.webp b/API.Tests/Services/Test Data/CoverDbService/Favicons/anilist.co.webp new file mode 100644 index 000000000..475824863 Binary files /dev/null and b/API.Tests/Services/Test Data/CoverDbService/Favicons/anilist.co.webp differ diff --git a/API.Tests/Services/Test Data/ScannerService/TestCases/Alternating Removal - Manga.json b/API.Tests/Services/Test Data/ScannerService/TestCases/Alternating Removal - Manga.json new file mode 100644 index 000000000..791dcdc44 --- /dev/null +++ b/API.Tests/Services/Test Data/ScannerService/TestCases/Alternating Removal - Manga.json @@ -0,0 +1,5 @@ +[ + "Root 1/Antarctic Press/Plush/Plush v01.cbz", + "Root 1/Antarctic Press/Plush/Plush v02.cbz", + "Root 2/Accel/Accel v01.cbz" +] diff --git a/API.Tests/Services/Test Data/ScannerService/TestCases/Delete Series In UI - Manga.json b/API.Tests/Services/Test Data/ScannerService/TestCases/Delete Series In UI - Manga.json new file mode 100644 index 000000000..791dcdc44 --- /dev/null +++ b/API.Tests/Services/Test Data/ScannerService/TestCases/Delete Series In UI - Manga.json @@ -0,0 +1,5 @@ +[ + "Root 1/Antarctic Press/Plush/Plush v01.cbz", + "Root 1/Antarctic Press/Plush/Plush v02.cbz", + "Root 2/Accel/Accel v01.cbz" +] diff --git a/API.Tests/Services/Test Data/ScannerService/TestCases/Exclude Pattern 1 - Manga.json b/API.Tests/Services/Test Data/ScannerService/TestCases/Exclude Pattern 1 - Manga.json new file mode 100644 index 000000000..fe931174e --- /dev/null +++ b/API.Tests/Services/Test Data/ScannerService/TestCases/Exclude Pattern 1 - Manga.json @@ -0,0 +1,5 @@ +[ + "Antarctic Press/Plush/Plush v01.cbz", + "Antarctic Press/Plush/Plush v02.cbz", + "Antarctic Press/Plush/Extra/Plush v03.cbz" +] \ No newline at end of file diff --git a/API.Tests/Services/Test Data/ScannerService/TestCases/Flat Series with Specials Folder Alt Naming - Manga.json b/API.Tests/Services/Test Data/ScannerService/TestCases/Flat Series with Specials Folder Alt Naming - Manga.json new file mode 100644 index 000000000..06ed0f1f9 --- /dev/null +++ b/API.Tests/Services/Test Data/ScannerService/TestCases/Flat Series with Specials Folder Alt Naming - Manga.json @@ -0,0 +1,6 @@ +[ + "My Dress-Up Darling/My Dress-Up Darling v01.cbz", + "My Dress-Up Darling/My Dress-Up Darling v02.cbz", + "My Dress-Up Darling/My Dress-Up Darling ch 10.cbz", + "My Dress-Up Darling/Specials/My Dress-Up Darling - Omakes SP01.cbz" +] \ No newline at end of file diff --git a/API.Tests/Services/Test Data/ScannerService/TestCases/Flat Special - Manga.json b/API.Tests/Services/Test Data/ScannerService/TestCases/Flat Special - Manga.json index d864da284..3fa9eebf7 100644 --- a/API.Tests/Services/Test Data/ScannerService/TestCases/Flat Special - Manga.json +++ b/API.Tests/Services/Test Data/ScannerService/TestCases/Flat Special - Manga.json @@ -1,5 +1,5 @@ [ - "Uzaki-chan Wants to Hang Out!\\Uzaki-chan Wants to Hang Out! - 2022 New Years Special SP01.cbz", - "Uzaki-chan Wants to Hang Out!\\Uzaki-chan Wants to Hang Out! - Ch. 103 - Kouhai and Control.cbz", - "Uzaki-chan Wants to Hang Out!\\Uzaki-chan Wants to Hang Out! v01 (2019) (Digital) (danke-Empire).cbz" -] \ No newline at end of file + "Uzaki-chan Wants to Hang Out!/Uzaki-chan Wants to Hang Out! - 2022 New Years Special SP01.cbz", + "Uzaki-chan Wants to Hang Out!/Uzaki-chan Wants to Hang Out! - Ch. 103 - Kouhai and Control.cbz", + "Uzaki-chan Wants to Hang Out!/Uzaki-chan Wants to Hang Out! v01 (2019) (Digital) (danke-Empire).cbz" +] diff --git a/API.Tests/Services/Test Data/ScannerService/TestCases/Localized Name matches Filename - Manga.json b/API.Tests/Services/Test Data/ScannerService/TestCases/Localized Name matches Filename - Manga.json new file mode 100644 index 000000000..feb1fd99f --- /dev/null +++ b/API.Tests/Services/Test Data/ScannerService/TestCases/Localized Name matches Filename - Manga.json @@ -0,0 +1,3 @@ +[ + "Immoral Guild/Futoku no Guild v01.cbz" +] \ No newline at end of file diff --git a/API.Tests/Services/Test Data/ScannerService/TestCases/Multiple Roots - Manga.json b/API.Tests/Services/Test Data/ScannerService/TestCases/Multiple Roots - Manga.json new file mode 100644 index 000000000..c9d4b14b6 --- /dev/null +++ b/API.Tests/Services/Test Data/ScannerService/TestCases/Multiple Roots - Manga.json @@ -0,0 +1,5 @@ +[ + "Root 1/Antarctic Press/Plush/Plush v01.cbz", + "Root 1/Antarctic Press/Plush/Plush v02.cbz", + "Root 2/Accel/Accel v01.cbz" +] \ No newline at end of file diff --git a/API.Tests/Services/Test Data/ScannerService/TestCases/Series removed when no other changes are made - Manga.json b/API.Tests/Services/Test Data/ScannerService/TestCases/Series removed when no other changes are made - Manga.json new file mode 100644 index 000000000..c6ea3bc88 --- /dev/null +++ b/API.Tests/Services/Test Data/ScannerService/TestCases/Series removed when no other changes are made - Manga.json @@ -0,0 +1,6 @@ +[ + "Spice and Wolf/Spice and Wolf Vol. 1.cbz", + "Spice and Wolf/Spice and Wolf Vol. 2.cbz", + "The Executioner and Her Way of Life/The Executioner and Her Way of Life Vol. 1.cbz", + "The Executioner and Her Way of Life/The Executioner and Her Way of Life Vol. 2.cbz" +] diff --git a/API.Tests/Services/Test Data/ScannerService/TestCases/Series with Localized No Metadata - Manga.json b/API.Tests/Services/Test Data/ScannerService/TestCases/Series with Localized No Metadata - Manga.json new file mode 100644 index 000000000..d6e91183b --- /dev/null +++ b/API.Tests/Services/Test Data/ScannerService/TestCases/Series with Localized No Metadata - Manga.json @@ -0,0 +1,5 @@ +[ + "Immoral Guild/Immoral Guild v01.cbz", + "Immoral Guild/Immoral Guild v02.cbz", + "Immoral Guild/Futoku No Guild - Vol. 12 Ch. 67 - Take Responsibility.cbz" +] diff --git a/API.Tests/Services/Test Data/ScannerService/TestCases/Series with Prefix - Book.json b/API.Tests/Services/Test Data/ScannerService/TestCases/Series with Prefix - Book.json new file mode 100644 index 000000000..fc2bee18c --- /dev/null +++ b/API.Tests/Services/Test Data/ScannerService/TestCases/Series with Prefix - Book.json @@ -0,0 +1,3 @@ +[ + "The Avengers/The Avengers vol 1.pdf" +] \ No newline at end of file diff --git a/API.Tests/Services/Test Data/ScannerService/TestCases/Sort Order - Manga.json b/API.Tests/Services/Test Data/ScannerService/TestCases/Sort Order - Manga.json new file mode 100644 index 000000000..0b2dd765d --- /dev/null +++ b/API.Tests/Services/Test Data/ScannerService/TestCases/Sort Order - Manga.json @@ -0,0 +1,5 @@ +[ + "Uzaki-chan Wants to Hang Out!/Uzaki-chan Wants to Hang Out! Ch 1-3.cbz", + "Uzaki-chan Wants to Hang Out!/Uzaki-chan Wants to Hang Out! Ch 4.cbz", + "Uzaki-chan Wants to Hang Out!/Uzaki-chan Wants to Hang Out! Ch 5.cbz" +] diff --git a/API.Tests/Services/Test Data/ScannerService/TestCases/Subfolder always scanning fix publisher layout - Comic.json b/API.Tests/Services/Test Data/ScannerService/TestCases/Subfolder always scanning fix publisher layout - Comic.json new file mode 100644 index 000000000..4574ddb4e --- /dev/null +++ b/API.Tests/Services/Test Data/ScannerService/TestCases/Subfolder always scanning fix publisher layout - Comic.json @@ -0,0 +1,8 @@ +[ + "VizMedia/Frieren - Beyond Journey's End/Frieren - Beyond Journey's End Vol. 1.cbz", + "VizMedia/Frieren - Beyond Journey's End/Frieren - Beyond Journey's End Vol. 2.cbz", + "VizMedia/Seraph of the End/Seraph of the End Vol. 1.cbz", + "YenPress/Spice and Wolf/Spice and Wolf Vol. 1.cbz", + "YenPress/Spice and Wolf/Spice and Wolf Vol. 2.cbz", + "YenPress/The Executioner and Her Way of Life/The Executioner and Her Way of Life Vol. 1.cbz" +] diff --git a/API.Tests/Services/Test Data/ScannerService/TestCases/Subfolders always scanning all series changes - Manga.json b/API.Tests/Services/Test Data/ScannerService/TestCases/Subfolders always scanning all series changes - Manga.json new file mode 100644 index 000000000..3d7c74d5c --- /dev/null +++ b/API.Tests/Services/Test Data/ScannerService/TestCases/Subfolders always scanning all series changes - Manga.json @@ -0,0 +1,11 @@ +[ + "Frieren - Beyond Journey's End/Frieren - Beyond Journey's End Vol. 1/Frieren - Beyond Journey's End Ch. 0001.cbz", + "Frieren - Beyond Journey's End/Frieren - Beyond Journey's End Vol. 1/Frieren - Beyond Journey's End Ch. 0002.cbz", + "Seraph of the End/Seraph of the End Vol. 1/Seraph of the End Ch. 0001.cbz", + "Spice and Wolf/Spice and Wolf Vol. 1/Spice and Wolf Vol. 1 Ch. 0001.cbz", + "Spice and Wolf/Spice and Wolf Vol. 1/Spice and Wolf Vol. 1 Ch. 0002.cbz", + "Spice and Wolf/Spice and Wolf Vol. 2/Spice and Wolf Vol. 2 Ch. 0003.cbz", + "The Executioner and Her Way of Life/The Executioner and Her Way of Life Vol. 1/The Executioner and Her Way of Life Vol. 1 Ch. 0001.cbz", + "The Executioner and Her Way of Life/The Executioner and Her Way of Life Vol. 2/The Executioner and Her Way of Life Vol. 2 Ch. 0003.cbz" +] + diff --git a/API.Tests/Services/Test Data/ScannerService/TestCases/Subfolders and files at root (2) - Manga.json b/API.Tests/Services/Test Data/ScannerService/TestCases/Subfolders and files at root (2) - Manga.json new file mode 100644 index 000000000..103ea421a --- /dev/null +++ b/API.Tests/Services/Test Data/ScannerService/TestCases/Subfolders and files at root (2) - Manga.json @@ -0,0 +1,6 @@ +[ + "Spice and Wolf/Spice and Wolf Vol. 1.cbz", + "Spice and Wolf/Spice and Wolf Vol. 2.cbz", + "Spice and Wolf/Spice and Wolf Vol. 3/Spice and Wolf Vol. 3 Ch. 0011.cbz", + "Spice and Wolf/Spice and Wolf Vol. 3/Spice and Wolf Vol. 3 Ch. 0012.cbz" +] diff --git a/API.Tests/Services/Test Data/ScannerService/TestCases/Subfolders and files at root - Manga.json b/API.Tests/Services/Test Data/ScannerService/TestCases/Subfolders and files at root - Manga.json new file mode 100644 index 000000000..103ea421a --- /dev/null +++ b/API.Tests/Services/Test Data/ScannerService/TestCases/Subfolders and files at root - Manga.json @@ -0,0 +1,6 @@ +[ + "Spice and Wolf/Spice and Wolf Vol. 1.cbz", + "Spice and Wolf/Spice and Wolf Vol. 2.cbz", + "Spice and Wolf/Spice and Wolf Vol. 3/Spice and Wolf Vol. 3 Ch. 0011.cbz", + "Spice and Wolf/Spice and Wolf Vol. 3/Spice and Wolf Vol. 3 Ch. 0012.cbz" +] diff --git a/API.Tests/Services/VersionUpdaterServiceTests.cs b/API.Tests/Services/VersionUpdaterServiceTests.cs new file mode 100644 index 000000000..8be8f4aee --- /dev/null +++ b/API.Tests/Services/VersionUpdaterServiceTests.cs @@ -0,0 +1,446 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Threading.Tasks; +using API.DTOs.Update; +using API.Services; +using API.Services.Tasks; +using API.SignalR; +using Flurl.Http.Testing; +using Kavita.Common.EnvironmentInfo; +using Microsoft.Extensions.Logging; +using NSubstitute; +using Xunit; + +namespace API.Tests.Services; + +public class VersionUpdaterServiceTests : IDisposable +{ + private readonly ILogger _logger = Substitute.For>(); + private readonly IEventHub _eventHub = Substitute.For(); + private readonly IDirectoryService _directoryService = Substitute.For(); + private readonly VersionUpdaterService _service; + private readonly string _tempPath; + private readonly HttpTest _httpTest; + + public VersionUpdaterServiceTests() + { + // Create temp directory for cache + _tempPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString()); + Directory.CreateDirectory(_tempPath); + _directoryService.LongTermCacheDirectory.Returns(_tempPath); + + _service = new VersionUpdaterService(_logger, _eventHub, _directoryService); + + // Setup HTTP testing + _httpTest = new HttpTest(); + + // Mock BuildInfo.Version for consistent testing + typeof(BuildInfo).GetProperty(nameof(BuildInfo.Version))?.SetValue(null, new Version("0.5.0.0")); + } + + public void Dispose() + { + _httpTest.Dispose(); + + // Cleanup temp directory + if (Directory.Exists(_tempPath)) + { + Directory.Delete(_tempPath, true); + } + + // Reset BuildInfo.Version + typeof(BuildInfo).GetProperty(nameof(BuildInfo.Version))?.SetValue(null, null); + GC.SuppressFinalize(this); + } + + [Fact] + public async Task CheckForUpdate_ShouldReturnNull_WhenGithubApiReturnsNull() + { + + _httpTest.RespondWith("null"); + + + var result = await _service.CheckForUpdate(); + + + Assert.Null(result); + } + + // Depends on BuildInfo.CurrentVersion + //[Fact] + public async Task CheckForUpdate_ShouldReturnUpdateNotification_WhenNewVersionIsAvailable() + { + + var githubResponse = new + { + tag_name = "v0.6.0", + name = "Release 0.6.0", + body = "# Added\n- Feature 1\n- Feature 2\n# Fixed\n- Bug 1\n- Bug 2", + html_url = "https://github.com/Kareadita/Kavita/releases/tag/v0.6.0", + published_at = DateTime.UtcNow.ToString("o") + }; + + _httpTest.RespondWithJson(githubResponse); + + + var result = await _service.CheckForUpdate(); + + + Assert.NotNull(result); + Assert.Equal("0.6.0", result.UpdateVersion); + Assert.Equal("0.5.0.0", result.CurrentVersion); + Assert.True(result.IsReleaseNewer); + Assert.Equal(2, result.Added.Count); + Assert.Equal(2, result.Fixed.Count); + } + + //[Fact] + public async Task CheckForUpdate_ShouldDetectEqualVersion() + { + // I can't figure this out + typeof(BuildInfo).GetProperty(nameof(BuildInfo.Version))?.SetValue(null, new Version("0.5.0.0")); + + + var githubResponse = new + { + tag_name = "v0.5.0", + name = "Release 0.5.0", + body = "# Added\n- Feature 1", + html_url = "https://github.com/Kareadita/Kavita/releases/tag/v0.5.0", + published_at = DateTime.UtcNow.ToString("o") + }; + + _httpTest.RespondWithJson(githubResponse); + + + var result = await _service.CheckForUpdate(); + + + Assert.NotNull(result); + Assert.True(result.IsReleaseEqual); + Assert.False(result.IsReleaseNewer); + } + + + //[Fact] + public async Task PushUpdate_ShouldSendUpdateEvent_WhenNewerVersionAvailable() + { + + var update = new UpdateNotificationDto + { + UpdateVersion = "0.6.0", + CurrentVersion = "0.5.0.0", + UpdateBody = "", + UpdateTitle = null, + UpdateUrl = null, + PublishDate = null + }; + + + await _service.PushUpdate(update); + + + await _eventHub.Received(1).SendMessageAsync( + Arg.Is(MessageFactory.UpdateAvailable), + Arg.Any(), + Arg.Is(true) + ); + } + + [Fact] + public async Task PushUpdate_ShouldNotSendUpdateEvent_WhenVersionIsEqual() + { + + var update = new UpdateNotificationDto + { + UpdateVersion = "0.5.0.0", + CurrentVersion = "0.5.0.0", + UpdateBody = "", + UpdateTitle = null, + UpdateUrl = null, + PublishDate = null + }; + + + await _service.PushUpdate(update); + + + await _eventHub.DidNotReceive().SendMessageAsync( + Arg.Any(), + Arg.Any(), + Arg.Any() + ); + } + + [Fact] + public async Task GetAllReleases_ShouldReturnReleases_LimitedByCount() + { + + var releases = new List + { + new + { + tag_name = "v0.7.0", + name = "Release 0.7.0", + body = "# Added\n- Feature A", + html_url = "https://github.com/Kareadita/Kavita/releases/tag/v0.7.0", + published_at = DateTime.UtcNow.AddDays(-1).ToString("o") + }, + new + { + tag_name = "v0.6.0", + name = "Release 0.6.0", + body = "# Added\n- Feature B", + html_url = "https://github.com/Kareadita/Kavita/releases/tag/v0.6.0", + published_at = DateTime.UtcNow.AddDays(-10).ToString("o") + }, + new + { + tag_name = "v0.5.0", + name = "Release 0.5.0", + body = "# Added\n- Feature C", + html_url = "https://github.com/Kareadita/Kavita/releases/tag/v0.5.0", + published_at = DateTime.UtcNow.AddDays(-20).ToString("o") + } + }; + + _httpTest.RespondWithJson(releases); + + + var result = await _service.GetAllReleases(2); + + + Assert.Equal(2, result.Count); + Assert.Equal("0.7.0.0", result[0].UpdateVersion); + Assert.Equal("0.6.0", result[1].UpdateVersion); + } + + [Fact] + public async Task GetAllReleases_ShouldUseCachedData_WhenCacheIsValid() + { + + var releases = new List + { + new() + { + UpdateVersion = "0.6.0", + CurrentVersion = "0.5.0.0", + PublishDate = DateTime.UtcNow.AddDays(-10) + .ToString("o"), + UpdateBody = "", + UpdateTitle = null, + UpdateUrl = null + } + }; + releases.Add(new() + { + UpdateVersion = "0.7.0", + CurrentVersion = "0.5.0.0", + PublishDate = DateTime.UtcNow.AddDays(-1) + .ToString("o"), + UpdateBody = "", + UpdateTitle = null, + UpdateUrl = null + }); + + // Create cache file + var cacheFilePath = Path.Combine(_tempPath, "github_releases_cache.json"); + await File.WriteAllTextAsync(cacheFilePath, System.Text.Json.JsonSerializer.Serialize(releases)); + File.SetLastWriteTimeUtc(cacheFilePath, DateTime.UtcNow); // Ensure it's fresh + + + var result = await _service.GetAllReleases(); + + + Assert.Equal(2, result.Count); + Assert.Empty(_httpTest.CallLog); // No HTTP calls made + } + + [Fact] + public async Task GetAllReleases_ShouldFetchNewData_WhenCacheIsExpired() + { + + var releases = new List + { + new() + { + UpdateVersion = "0.6.0", + CurrentVersion = "0.5.0.0", + PublishDate = DateTime.UtcNow.AddDays(-10) + .ToString("o"), + UpdateBody = null, + UpdateTitle = null, + UpdateUrl = null + } + }; + + // Create expired cache file + var cacheFilePath = Path.Combine(_tempPath, "github_releases_cache.json"); + await File.WriteAllTextAsync(cacheFilePath, System.Text.Json.JsonSerializer.Serialize(releases)); + File.SetLastWriteTimeUtc(cacheFilePath, DateTime.UtcNow.AddHours(-2)); // Expired (older than 1 hour) + + // Setup HTTP response for new fetch + var newReleases = new List + { + new + { + tag_name = "v0.7.0", + name = "Release 0.7.0", + body = "# Added\n- Feature A", + html_url = "https://github.com/Kareadita/Kavita/releases/tag/v0.7.0", + published_at = DateTime.UtcNow.ToString("o") + } + }; + + _httpTest.RespondWithJson(newReleases); + + + var result = await _service.GetAllReleases(); + + + Assert.Single(result); + Assert.Equal("0.7.0.0", result[0].UpdateVersion); + Assert.NotEmpty(_httpTest.CallLog); // HTTP call was made + } + + public async Task GetNumberOfReleasesBehind_ShouldReturnCorrectCount() + { + + var releases = new List + { + new + { + tag_name = "v0.7.0", + name = "Release 0.7.0", + body = "# Added\n- Feature A", + html_url = "https://github.com/Kareadita/Kavita/releases/tag/v0.7.0", + published_at = DateTime.UtcNow.AddDays(-1).ToString("o") + }, + new + { + tag_name = "v0.6.0", + name = "Release 0.6.0", + body = "# Added\n- Feature B", + html_url = "https://github.com/Kareadita/Kavita/releases/tag/v0.6.0", + published_at = DateTime.UtcNow.AddDays(-10).ToString("o") + }, + new + { + tag_name = "v0.5.0", + name = "Release 0.5.0", + body = "# Added\n- Feature C", + html_url = "https://github.com/Kareadita/Kavita/releases/tag/v0.5.0", + published_at = DateTime.UtcNow.AddDays(-20).ToString("o") + } + }; + + _httpTest.RespondWithJson(releases); + + + var result = await _service.GetNumberOfReleasesBehind(); + + + Assert.Equal(2 + 1, result); // Behind 0.7.0 and 0.6.0 - We have to add 1 because the current release is > 0.7.0 + } + + public async Task GetNumberOfReleasesBehind_ShouldReturnCorrectCount_WithNightlies() + { + + var releases = new List + { + new + { + tag_name = "v0.7.1", + name = "Release 0.7.1", + body = "# Added\n- Feature A", + html_url = "https://github.com/Kareadita/Kavita/releases/tag/v0.7.1", + published_at = DateTime.UtcNow.AddDays(-1).ToString("o") + }, + new + { + tag_name = "v0.7.0", + name = "Release 0.7.0", + body = "# Added\n- Feature A", + html_url = "https://github.com/Kareadita/Kavita/releases/tag/v0.7.0", + published_at = DateTime.UtcNow.AddDays(-10).ToString("o") + }, + }; + + _httpTest.RespondWithJson(releases); + + + var result = await _service.GetNumberOfReleasesBehind(); + + + Assert.Equal(2, result); // We have to add 1 because the current release is > 0.7.0 + } + + [Fact] + public async Task ParseReleaseBody_ShouldExtractSections() + { + + var githubResponse = new + { + tag_name = "v0.6.0", + name = "Release 0.6.0", + body = "This is a great release with many improvements!\n\n# Added\n- Feature 1\n- Feature 2\n# Fixed\n- Bug 1\n- Bug 2\n# Changed\n- Change 1\n# Developer\n- Dev note 1", + html_url = "https://github.com/Kareadita/Kavita/releases/tag/v0.6.0", + published_at = DateTime.UtcNow.ToString("o") + }; + + _httpTest.RespondWithJson(githubResponse); + + + var result = await _service.CheckForUpdate(); + + + Assert.NotNull(result); + Assert.Equal(2, result.Added.Count); + Assert.Equal(2, result.Fixed.Count); + Assert.Equal(1, result.Changed.Count); + Assert.Equal(1, result.Developer.Count); + Assert.Contains("This is a great release", result.BlogPart); + } + + [Fact] + public async Task GetAllReleases_ShouldHandleNightlyBuilds() + { + + // Set BuildInfo.Version to a nightly build version + typeof(BuildInfo).GetProperty(nameof(BuildInfo.Version))?.SetValue(null, new Version("0.7.1.0")); + + // Mock regular releases + var releases = new List + { + new + { + tag_name = "v0.7.0", + name = "Release 0.7.0", + body = "# Added\n- Feature A", + html_url = "https://github.com/Kareadita/Kavita/releases/tag/v0.7.0", + published_at = DateTime.UtcNow.AddDays(-1).ToString("o") + }, + new + { + tag_name = "v0.6.0", + name = "Release 0.6.0", + body = "# Added\n- Feature B", + html_url = "https://github.com/Kareadita/Kavita/releases/tag/v0.6.0", + published_at = DateTime.UtcNow.AddDays(-10).ToString("o") + } + }; + + _httpTest.RespondWithJson(releases); + + // Mock commit info for develop branch + _httpTest.RespondWithJson(new List()); + + + var result = await _service.GetAllReleases(); + + + Assert.NotNull(result); + Assert.True(result[0].IsOnNightlyInRelease); + } +} diff --git a/API.Tests/Services/WordCountAnalysisTests.cs b/API.Tests/Services/WordCountAnalysisTests.cs index ae17172b2..57c6ec7f6 100644 --- a/API.Tests/Services/WordCountAnalysisTests.cs +++ b/API.Tests/Services/WordCountAnalysisTests.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.IO; -using System.IO.Abstractions; using System.IO.Abstractions.TestingHelpers; using System.Linq; using System.Threading.Tasks; @@ -11,10 +10,8 @@ using API.Helpers; using API.Helpers.Builders; using API.Services; using API.Services.Plus; -using API.Services.Tasks; using API.Services.Tasks.Metadata; using API.SignalR; -using API.Tests.Helpers; using Microsoft.Extensions.Logging; using NSubstitute; using Xunit; @@ -29,9 +26,10 @@ public class WordCountAnalysisTests : AbstractDbTest private const long MinHoursToRead = 1; private const float AvgHoursToRead = 1.66954792f; private const long MaxHoursToRead = 3; - public WordCountAnalysisTests() : base() + + public WordCountAnalysisTests() { - _readerService = new ReaderService(_unitOfWork, Substitute.For>(), + _readerService = new ReaderService(UnitOfWork, Substitute.For>(), Substitute.For(), Substitute.For(), new DirectoryService(Substitute.For>(), new MockFileSystem()), Substitute.For()); @@ -39,9 +37,9 @@ public class WordCountAnalysisTests : AbstractDbTest protected override async Task ResetDb() { - _context.Series.RemoveRange(_context.Series.ToList()); + Context.Series.RemoveRange(Context.Series.ToList()); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); } [Fact] @@ -59,7 +57,7 @@ public class WordCountAnalysisTests : AbstractDbTest MangaFormat.Epub).Build()) .Build(); - _context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book) + Context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book) .WithSeries(series) .Build()); @@ -70,11 +68,11 @@ public class WordCountAnalysisTests : AbstractDbTest .Build(), }; - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var cacheService = new CacheHelper(new FileService()); - var service = new WordCountAnalyzerService(Substitute.For>(), _unitOfWork, + var service = new WordCountAnalyzerService(Substitute.For>(), UnitOfWork, Substitute.For(), cacheService, _readerService, Substitute.For()); @@ -86,7 +84,7 @@ public class WordCountAnalysisTests : AbstractDbTest Assert.Equal(MaxHoursToRead, series.MaxHoursToRead); // Validate the Chapter gets updated correctly - var volume = series.Volumes.First(); + var volume = series.Volumes[0]; Assert.Equal(WordCount, volume.WordCount); Assert.Equal(MinHoursToRead, volume.MinHoursToRead); Assert.Equal(AvgHoursToRead, volume.AvgHoursToRead); @@ -117,16 +115,16 @@ public class WordCountAnalysisTests : AbstractDbTest .Build()) .Build(); - _context.Library.Add(new LibraryBuilder("Test", LibraryType.Book) + Context.Library.Add(new LibraryBuilder("Test", LibraryType.Book) .WithSeries(series) .Build()); - await _context.SaveChangesAsync(); + await Context.SaveChangesAsync(); var cacheService = new CacheHelper(new FileService()); - var service = new WordCountAnalyzerService(Substitute.For>(), _unitOfWork, + var service = new WordCountAnalyzerService(Substitute.For>(), UnitOfWork, Substitute.For(), cacheService, _readerService, Substitute.For()); await service.ScanSeries(1, 1); @@ -142,21 +140,21 @@ public class WordCountAnalysisTests : AbstractDbTest .WithChapter(chapter2) .Build()); - series.Volumes.First().Chapters.Add(chapter2); - await _unitOfWork.CommitAsync(); + series.Volumes[0].Chapters.Add(chapter2); + await UnitOfWork.CommitAsync(); await service.ScanSeries(1, 1); Assert.Equal(WordCount * 2L, series.WordCount); Assert.Equal(MinHoursToRead * 2, series.MinHoursToRead); - var firstVolume = series.Volumes.ElementAt(0); + var firstVolume = series.Volumes[0]; Assert.Equal(WordCount, firstVolume.WordCount); Assert.Equal(MinHoursToRead, firstVolume.MinHoursToRead); Assert.True(series.AvgHoursToRead.Is(AvgHoursToRead * 2)); Assert.Equal(MaxHoursToRead, firstVolume.MaxHoursToRead); - var secondVolume = series.Volumes.ElementAt(1); + var secondVolume = series.Volumes[1]; Assert.Equal(WordCount, secondVolume.WordCount); Assert.Equal(MinHoursToRead, secondVolume.MinHoursToRead); Assert.Equal(AvgHoursToRead, secondVolume.AvgHoursToRead); diff --git a/API/API.csproj b/API/API.csproj index 0c9aae840..a7d1177dc 100644 --- a/API/API.csproj +++ b/API/API.csproj @@ -2,7 +2,7 @@ Default - net8.0 + net9.0 true Linux true @@ -12,10 +12,6 @@ latestmajor - - - - false @@ -54,9 +50,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -64,49 +60,48 @@ - - - + + + - + - - - - - - - + + + + + + + - - - - - + + + + - - + + - + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - + + + + + + + @@ -116,16 +111,16 @@ - - - - + + + + @@ -143,6 +138,7 @@ + @@ -196,6 +192,10 @@ Always + + Always + + diff --git a/API/Assets/anilist-no-image-placeholder.jpg b/API/Assets/anilist-no-image-placeholder.jpg new file mode 100644 index 000000000..54c1066b6 Binary files /dev/null and b/API/Assets/anilist-no-image-placeholder.jpg differ diff --git a/API/Constants/CacheProfiles.cs b/API/Constants/CacheProfiles.cs index ee2cd204e..afc82f19c 100644 --- a/API/Constants/CacheProfiles.cs +++ b/API/Constants/CacheProfiles.cs @@ -8,10 +8,18 @@ public static class EasyCacheProfiles public const string RevokedJwt = "revokedJWT"; public const string Favicon = "favicon"; /// + /// Images for Publishers + /// + public const string Publisher = "publisherImages"; + /// /// If a user's license is valid /// public const string License = "license"; /// + /// License Information + /// + public const string LicenseInfo = "licenseInfo"; + /// /// Cache the libraries on the server /// public const string Library = "library"; @@ -19,4 +27,12 @@ public static class EasyCacheProfiles /// External Series metadata for Kavita+ recommendation /// public const string KavitaPlusExternalSeries = "kavita+externalSeries"; + /// + /// Match Series metadata for Kavita+ metadata download + /// + public const string KavitaPlusMatchSeries = "kavita+matchSeries"; + /// + /// All Locales on the Server + /// + public const string LocaleOptions = "locales"; } diff --git a/API/Controllers/AccountController.cs b/API/Controllers/AccountController.cs index 0b47aa526..d8b9164af 100644 --- a/API/Controllers/AccountController.cs +++ b/API/Controllers/AccountController.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Reflection; using System.Threading.Tasks; @@ -15,6 +16,7 @@ using API.Errors; using API.Extensions; using API.Helpers.Builders; using API.Services; +using API.Services.Plus; using API.SignalR; using AutoMapper; using Hangfire; @@ -136,6 +138,12 @@ public class AccountController : BaseApiController return BadRequest(usernameValidation); } + // If Email is empty, default to the username + if (string.IsNullOrEmpty(registerDto.Email)) + { + registerDto.Email = registerDto.Username; + } + var user = new AppUserBuilder(registerDto.Username, registerDto.Email, await _unitOfWork.SiteThemeRepository.GetDefaultTheme()).Build(); @@ -145,6 +153,9 @@ public class AccountController : BaseApiController // Assign default streams AddDefaultStreamsToUser(user); + // Assign default reading profile + await AddDefaultReadingProfileToUser(user); + var token = await _userManager.GenerateEmailConfirmationTokenAsync(user); if (string.IsNullOrEmpty(token)) return BadRequest(await _localizationService.Get("en", "confirm-token-gen")); if (!await ConfirmEmailToken(token, user)) return BadRequest(await _localizationService.Get("en", "validate-email", token)); @@ -350,10 +361,11 @@ public class AccountController : BaseApiController /// /// Returns just if the email was sent or server isn't reachable [HttpPost("update/email")] - public async Task UpdateEmail(UpdateEmailDto? dto) + public async Task> UpdateEmail(UpdateEmailDto? dto) { var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername()); - if (user == null || User.IsInRole(PolicyConstants.ReadOnlyRole)) return Unauthorized(await _localizationService.Translate(User.GetUserId(), "permission-denied")); + if (user == null || User.IsInRole(PolicyConstants.ReadOnlyRole)) + return Unauthorized(await _localizationService.Translate(User.GetUserId(), "permission-denied")); if (dto == null || string.IsNullOrEmpty(dto.Email) || string.IsNullOrEmpty(dto.Password)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "invalid-payload")); @@ -362,12 +374,13 @@ public class AccountController : BaseApiController // Validate this user's password if (! await _userManager.CheckPasswordAsync(user, dto.Password)) { - _logger.LogCritical("A user tried to change {UserName}'s email, but password didn't validate", user.UserName); + _logger.LogWarning("A user tried to change {UserName}'s email, but password didn't validate", user.UserName); return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); } // Validate no other users exist with this email - if (user.Email!.Equals(dto.Email)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "nothing-to-do")); + if (user.Email!.Equals(dto.Email)) + return BadRequest(await _localizationService.Translate(User.GetUserId(), "nothing-to-do")); // Check if email is used by another user var existingUserEmail = await _unitOfWork.UserRepository.GetUserByEmailAsync(dto.Email); @@ -384,8 +397,10 @@ public class AccountController : BaseApiController return BadRequest(await _localizationService.Translate(User.GetUserId(), "generate-token")); } + var isValidEmailAddress = _emailService.IsValidEmail(user.Email); var serverSettings = await _unitOfWork.SettingsRepository.GetSettingsDtoAsync(); - var shouldEmailUser = serverSettings.IsEmailSetup() || !_emailService.IsValidEmail(user.Email); + var shouldEmailUser = serverSettings.IsEmailSetup() || !isValidEmailAddress; + user.EmailConfirmed = !shouldEmailUser; user.ConfirmationToken = token; await _userManager.UpdateAsync(user); @@ -399,7 +414,8 @@ public class AccountController : BaseApiController return Ok(new InviteUserResponse { EmailLink = string.Empty, - EmailSent = false + EmailSent = false, + InvalidEmail = !isValidEmailAddress }); } @@ -407,7 +423,7 @@ public class AccountController : BaseApiController // Send a confirmation email try { - if (!_emailService.IsValidEmail(user.Email)) + if (!isValidEmailAddress) { _logger.LogCritical("[Update Email]: User is trying to update their email, but their existing email ({Email}) isn't valid. No email will be send", user.Email); return Ok(new InviteUserResponse @@ -439,7 +455,8 @@ public class AccountController : BaseApiController return Ok(new InviteUserResponse { EmailLink = string.Empty, - EmailSent = true + EmailSent = true, + InvalidEmail = !isValidEmailAddress }); } catch (Exception ex) @@ -457,6 +474,7 @@ public class AccountController : BaseApiController { var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername()); if (user == null) return Unauthorized(await _localizationService.Translate(User.GetUserId(), "permission-denied")); + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); var isAdmin = await _unitOfWork.UserRepository.IsUserAdminAsync(user); if (!await _accountService.CanChangeAgeRestriction(user)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); @@ -494,6 +512,7 @@ public class AccountController : BaseApiController var adminUser = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername()); if (adminUser == null) return Unauthorized(); if (!await _unitOfWork.UserRepository.IsUserAdminAsync(adminUser)) return Unauthorized(await _localizationService.Translate(User.GetUserId(), "permission-denied")); + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); var user = await _unitOfWork.UserRepository.GetUserByIdAsync(dto.UserId, AppUserIncludes.SideNavStreams); if (user == null) return BadRequest(await _localizationService.Translate(User.GetUserId(), "no-user")); @@ -593,7 +612,7 @@ public class AccountController : BaseApiController } /// - /// Requests the Invite Url for the UserId. Will return error if user is already validated. + /// Requests the Invite Url for the AppUserId. Will return error if user is already validated. /// /// /// Include the "https://ip:port/" in the generated link @@ -653,6 +672,9 @@ public class AccountController : BaseApiController // Assign default streams AddDefaultStreamsToUser(user); + // Assign default reading profile + await AddDefaultReadingProfileToUser(user); + // Assign Roles var roles = dto.Roles; var hasAdminRole = dto.Roles.Contains(PolicyConstants.AdminRole); @@ -763,6 +785,16 @@ public class AccountController : BaseApiController } } + private async Task AddDefaultReadingProfileToUser(AppUser user) + { + var profile = new AppUserReadingProfileBuilder(user.Id) + .WithName("Default Profile") + .WithKind(ReadingProfileKind.Default) + .Build(); + _unitOfWork.AppUserReadingProfileRepository.Add(profile); + await _unitOfWork.CommitAsync(); + } + /// /// Last step in authentication flow, confirms the email token for email /// @@ -911,7 +943,6 @@ public class AccountController : BaseApiController [EnableRateLimiting("Authentication")] public async Task> ForgotPassword([FromQuery] string email) { - var settings = await _unitOfWork.SettingsRepository.GetSettingsDtoAsync(); var user = await _unitOfWork.UserRepository.GetUserByEmailAsync(email); if (user == null) @@ -1012,6 +1043,8 @@ public class AccountController : BaseApiController await _localizationService.Translate(user.Id, "user-migration-needed")); if (user.EmailConfirmed) return BadRequest(await _localizationService.Translate(user.Id, "user-already-confirmed")); + // TODO: If the target user is read only, we might want to just forgo this + var token = await _userManager.GenerateEmailConfirmationTokenAsync(user); user.ConfirmationToken = token; _unitOfWork.UserRepository.Update(user); diff --git a/API/Controllers/AdminController.cs b/API/Controllers/AdminController.cs index 3b9f8cdda..4f8edd511 100644 --- a/API/Controllers/AdminController.cs +++ b/API/Controllers/AdminController.cs @@ -1,5 +1,9 @@ -using System.Threading.Tasks; +using System.Collections.Generic; +using System.Threading.Tasks; +using API.Constants; +using API.Data; using API.Data.ManualMigrations; +using API.DTOs; using API.DTOs.Progress; using API.Entities; using Microsoft.AspNetCore.Authorization; @@ -27,18 +31,7 @@ public class AdminController : BaseApiController [HttpGet("exists")] public async Task> AdminExists() { - var users = await _userManager.GetUsersInRoleAsync("Admin"); + var users = await _userManager.GetUsersInRoleAsync(PolicyConstants.AdminRole); return users.Count > 0; } - - /// - /// Set the progress information for a particular user - /// - /// - [Authorize("RequireAdminRole")] - [HttpPost("update-chapter-progress")] - public async Task> UpdateChapterProgress(UpdateUserProgressDto dto) - { - return Ok(await Task.FromResult(false)); - } } diff --git a/API/Controllers/BookController.cs b/API/Controllers/BookController.cs index 962500ec7..e1d7da9e8 100644 --- a/API/Controllers/BookController.cs +++ b/API/Controllers/BookController.cs @@ -50,7 +50,7 @@ public class BookController : BaseApiController case MangaFormat.Epub: { var mangaFile = (await _unitOfWork.ChapterRepository.GetFilesForChapterAsync(chapterId))[0]; - using var book = await EpubReader.OpenBookAsync(mangaFile.FilePath, BookService.BookReaderOptions); + using var book = await EpubReader.OpenBookAsync(mangaFile.FilePath, BookService.LenientBookReaderOptions); bookTitle = book.Title; break; } @@ -102,7 +102,7 @@ public class BookController : BaseApiController var chapter = await _unitOfWork.ChapterRepository.GetChapterAsync(chapterId); if (chapter == null) return BadRequest(await _localizationService.Get("en", "chapter-doesnt-exist")); - using var book = await EpubReader.OpenBookAsync(chapter.Files.ElementAt(0).FilePath, BookService.BookReaderOptions); + using var book = await EpubReader.OpenBookAsync(chapter.Files.ElementAt(0).FilePath, BookService.LenientBookReaderOptions); var key = BookService.CoalesceKeyForAnyFile(book, file); if (!book.Content.AllFiles.ContainsLocalFileRefWithKey(key)) return BadRequest(await _localizationService.Get("en", "file-missing")); diff --git a/API/Controllers/CBLController.cs b/API/Controllers/CBLController.cs index fe274dacb..150628ced 100644 --- a/API/Controllers/CBLController.cs +++ b/API/Controllers/CBLController.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Threading.Tasks; +using API.Constants; using API.DTOs.ReadingLists.CBL; using API.Extensions; using API.Services; @@ -20,11 +21,13 @@ public class CblController : BaseApiController { private readonly IReadingListService _readingListService; private readonly IDirectoryService _directoryService; + private readonly ILocalizationService _localizationService; - public CblController(IReadingListService readingListService, IDirectoryService directoryService) + public CblController(IReadingListService readingListService, IDirectoryService directoryService, ILocalizationService localizationService) { _readingListService = readingListService; _directoryService = directoryService; + _localizationService = localizationService; } /// @@ -91,6 +94,8 @@ public class CblController : BaseApiController [SwaggerIgnore] public async Task> ImportCbl(IFormFile cbl, [FromQuery] bool dryRun = false, [FromQuery] bool useComicVineMatching = false) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); + try { var userId = User.GetUserId(); diff --git a/API/Controllers/ChapterController.cs b/API/Controllers/ChapterController.cs index 5bd239086..94535d499 100644 --- a/API/Controllers/ChapterController.cs +++ b/API/Controllers/ChapterController.cs @@ -2,18 +2,24 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using API.Constants; using API.Data; using API.Data.Repositories; using API.DTOs; +using API.DTOs.SeriesDetail; using API.Entities; using API.Entities.Enums; +using API.Entities.MetadataMatching; +using API.Entities.Person; using API.Extensions; using API.Helpers; using API.Services; using API.Services.Tasks.Scanner.Parser; using API.SignalR; +using AutoMapper; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using Nager.ArticleNumber; @@ -25,13 +31,16 @@ public class ChapterController : BaseApiController private readonly ILocalizationService _localizationService; private readonly IEventHub _eventHub; private readonly ILogger _logger; + private readonly IMapper _mapper; - public ChapterController(IUnitOfWork unitOfWork, ILocalizationService localizationService, IEventHub eventHub, ILogger logger) + public ChapterController(IUnitOfWork unitOfWork, ILocalizationService localizationService, IEventHub eventHub, ILogger logger, + IMapper mapper) { _unitOfWork = unitOfWork; _localizationService = localizationService; _eventHub = eventHub; _logger = logger; + _mapper = mapper; } /// @@ -58,7 +67,10 @@ public class ChapterController : BaseApiController [HttpDelete] public async Task> DeleteChapter(int chapterId) { - var chapter = await _unitOfWork.ChapterRepository.GetChapterAsync(chapterId); + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); + + var chapter = await _unitOfWork.ChapterRepository.GetChapterAsync(chapterId, + ChapterIncludes.Files | ChapterIncludes.ExternalReviews | ChapterIncludes.ExternalRatings); if (chapter == null) return BadRequest(_localizationService.Translate(User.GetUserId(), "chapter-doesnt-exist")); @@ -76,6 +88,15 @@ public class ChapterController : BaseApiController _unitOfWork.ChapterRepository.Remove(chapter); } + // If we removed the volume, do an additional check if we need to delete the actual series as well or not + var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(vol.SeriesId, SeriesIncludes.ExternalData | SeriesIncludes.Volumes); + var needToRemoveSeries = needToRemoveVolume && series != null && series.Volumes.Count <= 1; + if (needToRemoveSeries) + { + _unitOfWork.SeriesRepository.Remove(series!); + } + + if (!await _unitOfWork.CommitAsync()) return Ok(false); @@ -85,6 +106,12 @@ public class ChapterController : BaseApiController await _eventHub.SendMessageAsync(MessageFactory.VolumeRemoved, MessageFactory.VolumeRemovedEvent(chapter.VolumeId, vol.SeriesId), false); } + if (needToRemoveSeries) + { + await _eventHub.SendMessageAsync(MessageFactory.SeriesRemoved, + MessageFactory.SeriesRemovedEvent(series!.Id, series.Name, series.LibraryId), false); + } + return Ok(true); } @@ -182,6 +209,7 @@ public class ChapterController : BaseApiController if (chapter.AgeRating != dto.AgeRating) { chapter.AgeRating = dto.AgeRating; + chapter.KPlusOverrides.Remove(MetadataSettingField.AgeRating); } dto.Summary ??= string.Empty; @@ -189,6 +217,7 @@ public class ChapterController : BaseApiController if (chapter.Summary != dto.Summary.Trim()) { chapter.Summary = dto.Summary.Trim(); + chapter.KPlusOverrides.Remove(MetadataSettingField.ChapterSummary); } if (chapter.Language != dto.Language) @@ -204,11 +233,13 @@ public class ChapterController : BaseApiController if (chapter.TitleName != dto.TitleName) { chapter.TitleName = dto.TitleName; + chapter.KPlusOverrides.Remove(MetadataSettingField.ChapterTitle); } if (chapter.ReleaseDate != dto.ReleaseDate) { chapter.ReleaseDate = dto.ReleaseDate; + chapter.KPlusOverrides.Remove(MetadataSettingField.ChapterReleaseDate); } if (!string.IsNullOrEmpty(dto.ISBN) && ArticleNumberHelper.IsValidIsbn10(dto.ISBN) || @@ -231,131 +262,123 @@ public class ChapterController : BaseApiController #region Genres - if (dto.Genres is {Count: > 0}) - { - chapter.Genres ??= new List(); - await GenreHelper.UpdateChapterGenres(chapter, dto.Genres.Select(t => t.Title), _unitOfWork); - } + chapter.Genres ??= []; + await GenreHelper.UpdateChapterGenres(chapter, dto.Genres.Select(t => t.Title), _unitOfWork); #endregion #region Tags - if (dto.Tags is {Count: > 0}) - { - chapter.Tags ??= new List(); - await TagHelper.UpdateChapterTags(chapter, dto.Tags.Select(t => t.Title), _unitOfWork); - } + chapter.Tags ??= []; + await TagHelper.UpdateChapterTags(chapter, dto.Tags.Select(t => t.Title), _unitOfWork); #endregion #region People - if (PersonHelper.HasAnyPeople(dto)) - { - chapter.People ??= new List(); + chapter.People ??= []; + // Update writers + await PersonHelper.UpdateChapterPeopleAsync( + chapter, + dto.Writers.Select(p => p.Name).ToList(), + PersonRole.Writer, + _unitOfWork + ); - // Update writers - await PersonHelper.UpdateChapterPeopleAsync( - chapter, - dto.Writers.Select(p => p.Name).ToList(), - PersonRole.Writer, - _unitOfWork - ); + // Update characters + await PersonHelper.UpdateChapterPeopleAsync( + chapter, + dto.Characters.Select(p => p.Name).ToList(), + PersonRole.Character, + _unitOfWork + ); - // Update characters - await PersonHelper.UpdateChapterPeopleAsync( - chapter, - dto.Characters.Select(p => p.Name).ToList(), - PersonRole.Character, - _unitOfWork - ); + // Update pencillers + await PersonHelper.UpdateChapterPeopleAsync( + chapter, + dto.Pencillers.Select(p => p.Name).ToList(), + PersonRole.Penciller, + _unitOfWork + ); - // Update pencillers - await PersonHelper.UpdateChapterPeopleAsync( - chapter, - dto.Pencillers.Select(p => p.Name).ToList(), - PersonRole.Penciller, - _unitOfWork - ); + // Update inkers + await PersonHelper.UpdateChapterPeopleAsync( + chapter, + dto.Inkers.Select(p => p.Name).ToList(), + PersonRole.Inker, + _unitOfWork + ); - // Update inkers - await PersonHelper.UpdateChapterPeopleAsync( - chapter, - dto.Inkers.Select(p => p.Name).ToList(), - PersonRole.Inker, - _unitOfWork - ); + // Update colorists + await PersonHelper.UpdateChapterPeopleAsync( + chapter, + dto.Colorists.Select(p => p.Name).ToList(), + PersonRole.Colorist, + _unitOfWork + ); - // Update colorists - await PersonHelper.UpdateChapterPeopleAsync( - chapter, - dto.Colorists.Select(p => p.Name).ToList(), - PersonRole.Colorist, - _unitOfWork - ); + // Update letterers + await PersonHelper.UpdateChapterPeopleAsync( + chapter, + dto.Letterers.Select(p => p.Name).ToList(), + PersonRole.Letterer, + _unitOfWork + ); - // Update letterers - await PersonHelper.UpdateChapterPeopleAsync( - chapter, - dto.Letterers.Select(p => p.Name).ToList(), - PersonRole.Letterer, - _unitOfWork - ); + // Update cover artists + await PersonHelper.UpdateChapterPeopleAsync( + chapter, + dto.CoverArtists.Select(p => p.Name).ToList(), + PersonRole.CoverArtist, + _unitOfWork + ); - // Update cover artists - await PersonHelper.UpdateChapterPeopleAsync( - chapter, - dto.CoverArtists.Select(p => p.Name).ToList(), - PersonRole.CoverArtist, - _unitOfWork - ); + // Update editors + await PersonHelper.UpdateChapterPeopleAsync( + chapter, + dto.Editors.Select(p => p.Name).ToList(), + PersonRole.Editor, + _unitOfWork + ); - // Update editors - await PersonHelper.UpdateChapterPeopleAsync( - chapter, - dto.Editors.Select(p => p.Name).ToList(), - PersonRole.Editor, - _unitOfWork - ); + // TODO: Only remove field if changes were made + chapter.KPlusOverrides.Remove(MetadataSettingField.ChapterPublisher); + // Update publishers + await PersonHelper.UpdateChapterPeopleAsync( + chapter, + dto.Publishers.Select(p => p.Name).ToList(), + PersonRole.Publisher, + _unitOfWork + ); - // Update publishers - await PersonHelper.UpdateChapterPeopleAsync( - chapter, - dto.Publishers.Select(p => p.Name).ToList(), - PersonRole.Publisher, - _unitOfWork - ); + // Update translators + await PersonHelper.UpdateChapterPeopleAsync( + chapter, + dto.Translators.Select(p => p.Name).ToList(), + PersonRole.Translator, + _unitOfWork + ); - // Update translators - await PersonHelper.UpdateChapterPeopleAsync( - chapter, - dto.Translators.Select(p => p.Name).ToList(), - PersonRole.Translator, - _unitOfWork - ); + // Update imprints + await PersonHelper.UpdateChapterPeopleAsync( + chapter, + dto.Imprints.Select(p => p.Name).ToList(), + PersonRole.Imprint, + _unitOfWork + ); - // Update imprints - await PersonHelper.UpdateChapterPeopleAsync( - chapter, - dto.Imprints.Select(p => p.Name).ToList(), - PersonRole.Imprint, - _unitOfWork - ); + // Update teams + await PersonHelper.UpdateChapterPeopleAsync( + chapter, + dto.Teams.Select(p => p.Name).ToList(), + PersonRole.Team, + _unitOfWork + ); - // Update teams - await PersonHelper.UpdateChapterPeopleAsync( - chapter, - dto.Teams.Select(p => p.Name).ToList(), - PersonRole.Team, - _unitOfWork - ); - - // Update locations - await PersonHelper.UpdateChapterPeopleAsync( - chapter, - dto.Locations.Select(p => p.Name).ToList(), - PersonRole.Location, - _unitOfWork - ); - } + // Update locations + await PersonHelper.UpdateChapterPeopleAsync( + chapter, + dto.Locations.Select(p => p.Name).ToList(), + PersonRole.Location, + _unitOfWork + ); #endregion #region Locks @@ -397,6 +420,39 @@ public class ChapterController : BaseApiController return Ok(); } + /// + /// Returns Ratings and Reviews for an individual Chapter + /// + /// + /// + [HttpGet("chapter-detail-plus")] + public async Task> ChapterDetailPlus([FromQuery] int chapterId) + { + var ret = new ChapterDetailPlusDto(); + var userReviews = (await _unitOfWork.UserRepository.GetUserRatingDtosForChapterAsync(chapterId, User.GetUserId())) + .Where(r => !string.IsNullOrEmpty(r.Body)) + .OrderByDescending(review => review.Username.Equals(User.GetUsername()) ? 1 : 0) + .ToList(); + + var ownRating = await _unitOfWork.UserRepository.GetUserChapterRatingAsync(User.GetUserId(), chapterId); + if (ownRating != null) + { + ret.Rating = ownRating.Rating; + ret.HasBeenRated = ownRating.HasBeenRated; + } + + var externalReviews = await _unitOfWork.ChapterRepository.GetExternalChapterReviewDtos(chapterId); + if (externalReviews.Count > 0) + { + userReviews.AddRange(ReviewHelper.SelectSpectrumOfReviews(externalReviews)); + } + + ret.Reviews = userReviews; + + ret.Ratings = await _unitOfWork.ChapterRepository.GetExternalChapterRatingDtos(chapterId); + + return Ok(ret); + } } diff --git a/API/Controllers/CollectionController.cs b/API/Controllers/CollectionController.cs index b49d6aa40..2c0abc609 100644 --- a/API/Controllers/CollectionController.cs +++ b/API/Controllers/CollectionController.cs @@ -105,6 +105,8 @@ public class CollectionController : BaseApiController [HttpPost("update")] public async Task UpdateTag(AppUserCollectionDto updatedTag) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); + try { if (await _collectionService.UpdateTag(updatedTag, User.GetUserId())) @@ -130,6 +132,8 @@ public class CollectionController : BaseApiController [HttpPost("promote-multiple")] public async Task PromoteMultipleCollections(PromoteCollectionsDto dto) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); + // This needs to take into account owner as I can select other users cards var collections = await _unitOfWork.CollectionTagRepository.GetCollectionsByIds(dto.CollectionIds); var userId = User.GetUserId(); @@ -161,6 +165,8 @@ public class CollectionController : BaseApiController [HttpPost("delete-multiple")] public async Task DeleteMultipleCollections(DeleteCollectionsDto dto) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); + // This needs to take into account owner as I can select other users cards var user = await _unitOfWork.UserRepository.GetUserByIdAsync(User.GetUserId(), AppUserIncludes.Collections); if (user == null) return Unauthorized(); @@ -182,6 +188,8 @@ public class CollectionController : BaseApiController [HttpPost("update-for-series")] public async Task AddToMultipleSeries(CollectionTagBulkAddDto dto) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); + // Create a new tag and save var user = await _unitOfWork.UserRepository.GetUserByIdAsync(User.GetUserId(), AppUserIncludes.Collections); if (user == null) return Unauthorized(); @@ -223,6 +231,8 @@ public class CollectionController : BaseApiController [HttpPost("update-series")] public async Task RemoveTagFromMultipleSeries(UpdateSeriesForTagDto updateSeriesForTagDto) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); + try { var tag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(updateSeriesForTagDto.Tag.Id, CollectionIncludes.Series); @@ -247,6 +257,8 @@ public class CollectionController : BaseApiController [HttpDelete] public async Task DeleteTag(int tagId) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); + try { var user = await _unitOfWork.UserRepository.GetUserByIdAsync(User.GetUserId(), AppUserIncludes.Collections); @@ -276,6 +288,8 @@ public class CollectionController : BaseApiController [HttpGet("mal-stacks")] public async Task>> GetMalStacksForUser() { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); + return Ok(await _externalMetadataService.GetStacksForUser(User.GetUserId())); } @@ -289,6 +303,8 @@ public class CollectionController : BaseApiController { var user = await _unitOfWork.UserRepository.GetUserByIdAsync(User.GetUserId(), AppUserIncludes.Collections); if (user == null) return Unauthorized(); + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); + // Validation check to ensure stack doesn't exist already if (await _unitOfWork.CollectionTagRepository.CollectionExists(dto.Title, user.Id)) diff --git a/API/Controllers/DownloadController.cs b/API/Controllers/DownloadController.cs index ba65aec70..5a249c9a8 100644 --- a/API/Controllers/DownloadController.cs +++ b/API/Controllers/DownloadController.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using API.Data; using API.DTOs.Downloads; using API.Entities; +using API.Entities.Enums; using API.Extensions; using API.Services; using API.SignalR; @@ -157,7 +158,8 @@ public class DownloadController : BaseApiController await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress, MessageFactory.DownloadProgressEvent(username, filename, $"Downloading {filename}", 0F, "started")); - if (files.Count == 1) + + if (files.Count == 1 && files.First().Format != MangaFormat.Image) { await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress, MessageFactory.DownloadProgressEvent(username, @@ -166,15 +168,17 @@ public class DownloadController : BaseApiController } var filePath = _archiveService.CreateZipFromFoldersForDownload(files.Select(c => c.FilePath).ToList(), tempFolder, ProgressCallback); + await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress, MessageFactory.DownloadProgressEvent(username, filename, "Download Complete", 1F, "ended")); + return PhysicalFile(filePath, DefaultContentType, Uri.EscapeDataString(downloadName), true); async Task ProgressCallback(Tuple progressInfo) { await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress, - MessageFactory.DownloadProgressEvent(username, filename, $"Extracting {Path.GetFileNameWithoutExtension(progressInfo.Item1)}", + MessageFactory.DownloadProgressEvent(username, filename, $"Processing {Path.GetFileNameWithoutExtension(progressInfo.Item1)}", Math.Clamp(progressInfo.Item2, 0F, 1F))); } } @@ -192,8 +196,10 @@ public class DownloadController : BaseApiController public async Task DownloadSeries(int seriesId) { if (!await HasDownloadPermission()) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); + var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId); if (series == null) return BadRequest("Invalid Series"); + var files = await _unitOfWork.SeriesRepository.GetFilesForSeries(seriesId); try { diff --git a/API/Controllers/EmailController.cs b/API/Controllers/EmailController.cs new file mode 100644 index 000000000..c1e3ad413 --- /dev/null +++ b/API/Controllers/EmailController.cs @@ -0,0 +1,26 @@ +using System.Collections.Generic; +using System.Threading.Tasks; +using API.Data; +using API.DTOs.Email; +using API.Helpers; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; + +namespace API.Controllers; + +[Authorize(Policy = "RequireAdminRole")] +public class EmailController : BaseApiController +{ + private readonly IUnitOfWork _unitOfWork; + + public EmailController(IUnitOfWork unitOfWork) + { + _unitOfWork = unitOfWork; + } + + [HttpGet("all")] + public async Task>> GetEmails() + { + return Ok(await _unitOfWork.EmailHistoryRepository.GetEmailDtos(UserParams.Default)); + } +} diff --git a/API/Controllers/FilterController.cs b/API/Controllers/FilterController.cs index e8cb71117..7fcffb7da 100644 --- a/API/Controllers/FilterController.cs +++ b/API/Controllers/FilterController.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using API.Constants; using API.Data; using API.Data.Repositories; using API.DTOs.Dashboard; @@ -9,7 +10,9 @@ using API.DTOs.Filtering.v2; using API.Entities; using API.Extensions; using API.Helpers; +using API.Services; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; namespace API.Controllers; @@ -21,10 +24,17 @@ namespace API.Controllers; public class FilterController : BaseApiController { private readonly IUnitOfWork _unitOfWork; + private readonly ILocalizationService _localizationService; + private readonly IStreamService _streamService; + private readonly ILogger _logger; - public FilterController(IUnitOfWork unitOfWork) + public FilterController(IUnitOfWork unitOfWork, ILocalizationService localizationService, IStreamService streamService, + ILogger logger) { _unitOfWork = unitOfWork; + _localizationService = localizationService; + _streamService = streamService; + _logger = logger; } /// @@ -37,6 +47,7 @@ public class FilterController : BaseApiController { var user = await _unitOfWork.UserRepository.GetUserByIdAsync(User.GetUserId(), AppUserIncludes.SmartFilters); if (user == null) return Unauthorized(); + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); if (string.IsNullOrWhiteSpace(dto.Name)) return BadRequest("Name must be set"); if (Seed.DefaultStreams.Any(s => s.Name.Equals(dto.Name, StringComparison.InvariantCultureIgnoreCase))) @@ -78,6 +89,8 @@ public class FilterController : BaseApiController [HttpDelete] public async Task DeleteFilter(int filterId) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); + var filter = await _unitOfWork.AppUserSmartFilterRepository.GetById(filterId); if (filter == null) return Ok(); // This needs to delete any dashboard filters that have it too @@ -113,4 +126,57 @@ public class FilterController : BaseApiController { return Ok(SmartFilterHelper.Decode(dto.EncodedFilter)); } + + /// + /// Rename a Smart Filter given the filterId and new name + /// + /// + /// + /// + [HttpPost("rename")] + public async Task RenameFilter([FromQuery] int filterId, [FromQuery] string name) + { + try + { + var user = await _unitOfWork.UserRepository.GetUserByIdAsync(User.GetUserId(), + AppUserIncludes.SmartFilters); + if (user == null) return Unauthorized(); + + name = name.Trim(); + + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) + { + return BadRequest(await _localizationService.Translate(user.Id, "permission-denied")); + } + + if (string.IsNullOrWhiteSpace(name)) + { + return BadRequest(await _localizationService.Translate(user.Id, "smart-filter-name-required")); + } + + if (Seed.DefaultStreams.Any(s => s.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase))) + { + return BadRequest(await _localizationService.Translate(user.Id, "smart-filter-system-name")); + } + + var filter = user.SmartFilters.FirstOrDefault(f => f.Id == filterId); + if (filter == null) + { + return BadRequest(await _localizationService.Translate(user.Id, "filter-not-found")); + } + + filter.Name = name; + _unitOfWork.AppUserSmartFilterRepository.Update(filter); + await _unitOfWork.CommitAsync(); + + await _streamService.RenameSmartFilterStreams(filter); + return Ok(); + } + catch (Exception ex) + { + _logger.LogError(ex, "There was an exception when renaming smart filter: {FilterId}", filterId); + return BadRequest(await _localizationService.Translate(User.GetUserId(), "generic-error")); + } + + } } diff --git a/API/Controllers/KoreaderController.cs b/API/Controllers/KoreaderController.cs new file mode 100644 index 000000000..8c4c41585 --- /dev/null +++ b/API/Controllers/KoreaderController.cs @@ -0,0 +1,119 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using System; +using System.Threading.Tasks; +using API.Data; +using API.Data.Repositories; +using API.DTOs.Koreader; +using API.Entities; +using API.Extensions; +using API.Services; +using Kavita.Common; +using Microsoft.AspNetCore.Identity; +using Microsoft.Extensions.Logging; +using static System.Net.WebRequestMethods; + +namespace API.Controllers; +#nullable enable + +/// +/// The endpoint to interface with Koreader's Progress Sync plugin. +/// +/// +/// Koreader uses a different form of authentication. It stores the username and password in headers. +/// https://github.com/koreader/koreader/blob/master/plugins/kosync.koplugin/KOSyncClient.lua +/// +[AllowAnonymous] +public class KoreaderController : BaseApiController +{ + + private readonly IUnitOfWork _unitOfWork; + private readonly ILocalizationService _localizationService; + private readonly IKoreaderService _koreaderService; + private readonly ILogger _logger; + + public KoreaderController(IUnitOfWork unitOfWork, ILocalizationService localizationService, + IKoreaderService koreaderService, ILogger logger) + { + _unitOfWork = unitOfWork; + _localizationService = localizationService; + _koreaderService = koreaderService; + _logger = logger; + } + + // We won't allow users to be created from Koreader. Rather, they + // must already have an account. + /* + [HttpPost("/users/create")] + public IActionResult CreateUser(CreateUserRequest request) + { + } + */ + + [HttpGet("{apiKey}/users/auth")] + public async Task Authenticate(string apiKey) + { + var userId = await GetUserId(apiKey); + var user = await _unitOfWork.UserRepository.GetUserByIdAsync(userId); + if (user == null) return Unauthorized(); + + return Ok(new { username = user.UserName }); + } + + /// + /// Syncs book progress with Kavita. Will attempt to save the underlying reader position if possible. + /// + /// + /// + /// + [HttpPut("{apiKey}/syncs/progress")] + public async Task> UpdateProgress(string apiKey, KoreaderBookDto request) + { + try + { + var userId = await GetUserId(apiKey); + await _koreaderService.SaveProgress(request, userId); + + return Ok(new KoreaderProgressUpdateDto{ Document = request.Document, Timestamp = DateTime.UtcNow }); + } + catch (KavitaException ex) + { + return BadRequest(ex.Message); + } + } + + /// + /// Gets book progress from Kavita, if not found will return a 400 + /// + /// + /// + /// + [HttpGet("{apiKey}/syncs/progress/{ebookHash}")] + public async Task> GetProgress(string apiKey, string ebookHash) + { + try + { + var userId = await GetUserId(apiKey); + var response = await _koreaderService.GetProgress(ebookHash, userId); + _logger.LogDebug("Koreader response progress for User ({UserId}): {Progress}", userId, response.Progress.Sanitize()); + + return Ok(response); + } + catch (KavitaException ex) + { + return BadRequest(ex.Message); + } + } + + private async Task GetUserId(string apiKey) + { + try + { + return await _unitOfWork.UserRepository.GetUserIdByApiKeyAsync(apiKey); + } + catch + { + throw new KavitaException(await _localizationService.Get("en", "user-doesnt-exist")); + } + } +} diff --git a/API/Controllers/LibraryController.cs b/API/Controllers/LibraryController.cs index 34b81c20b..8f9b18317 100644 --- a/API/Controllers/LibraryController.cs +++ b/API/Controllers/LibraryController.cs @@ -81,7 +81,8 @@ public class LibraryController : BaseApiController .WithIncludeInDashboard(dto.IncludeInDashboard) .WithManageCollections(dto.ManageCollections) .WithManageReadingLists(dto.ManageReadingLists) - .WIthAllowScrobbling(dto.AllowScrobbling) + .WithAllowScrobbling(dto.AllowScrobbling) + .WithAllowMetadataMatching(dto.AllowMetadataMatching) .Build(); library.LibraryFileTypes = dto.FileGroupTypes @@ -192,7 +193,6 @@ public class LibraryController : BaseApiController var ret = _unitOfWork.LibraryRepository.GetLibraryDtosForUsernameAsync(username).ToList(); await _libraryCacheProvider.SetAsync(CacheKey, ret, TimeSpan.FromHours(24)); - _logger.LogDebug("Caching libraries for {Key}", cacheKey); return Ok(ret.Find(l => l.Id == libraryId)); } @@ -213,7 +213,6 @@ public class LibraryController : BaseApiController var ret = _unitOfWork.LibraryRepository.GetLibraryDtosForUsernameAsync(username); await _libraryCacheProvider.SetAsync(CacheKey, ret, TimeSpan.FromHours(24)); - _logger.LogDebug("Caching libraries for {Key}", cacheKey); return Ok(ret); } @@ -351,27 +350,6 @@ public class LibraryController : BaseApiController return Ok(); } - [Authorize(Policy = "RequireAdminRole")] - [HttpPost("analyze")] - public ActionResult Analyze(int libraryId) - { - _taskScheduler.AnalyzeFilesForLibrary(libraryId, true); - return Ok(); - } - - [Authorize(Policy = "RequireAdminRole")] - [HttpPost("analyze-multiple")] - public ActionResult AnalyzeMultiple(BulkActionDto dto) - { - foreach (var libraryId in dto.Ids) - { - _taskScheduler.AnalyzeFilesForLibrary(libraryId, dto.Force ?? false); - } - - return Ok(); - } - - /// /// Copy the library settings (adv tab + optional type) to a set of other libraries. /// @@ -440,8 +418,7 @@ public class LibraryController : BaseApiController .Distinct() .Select(Services.Tasks.Scanner.Parser.Parser.NormalizePath); - var seriesFolder = _directoryService.FindHighestDirectoriesFromFiles(libraryFolder, - new List() {dto.FolderPath}); + var seriesFolder = _directoryService.FindHighestDirectoriesFromFiles(libraryFolder, [dto.FolderPath]); _taskScheduler.ScanFolder(seriesFolder.Keys.Count == 1 ? seriesFolder.Keys.First() : dto.FolderPath); @@ -645,6 +622,10 @@ public class LibraryController : BaseApiController library.ManageCollections = dto.ManageCollections; library.ManageReadingLists = dto.ManageReadingLists; library.AllowScrobbling = dto.AllowScrobbling; + library.AllowMetadataMatching = dto.AllowMetadataMatching; + library.EnableMetadata = dto.EnableMetadata; + library.RemovePrefixForSortName = dto.RemovePrefixForSortName; + library.LibraryFileTypes = dto.FileGroupTypes .Select(t => new LibraryFileTypeGroup() {FileTypeGroup = t, LibraryId = library.Id}) .Distinct() diff --git a/API/Controllers/LicenseController.cs b/API/Controllers/LicenseController.cs index d831f10b2..30ed68771 100644 --- a/API/Controllers/LicenseController.cs +++ b/API/Controllers/LicenseController.cs @@ -2,14 +2,17 @@ using System.Threading.Tasks; using API.Constants; using API.Data; -using API.DTOs.License; +using API.DTOs.KavitaPlus.License; using API.Entities.Enums; using API.Extensions; using API.Services; using API.Services.Plus; +using EasyCaching.Core; +using Hangfire; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; +using TaskScheduler = API.Services.TaskScheduler; namespace API.Controllers; @@ -20,7 +23,8 @@ public class LicenseController( ILogger logger, ILicenseService licenseService, ILocalizationService localizationService, - ITaskScheduler taskScheduler) + ITaskScheduler taskScheduler, + IEasyCachingProviderFactory cachingProviderFactory) : BaseApiController { /// @@ -31,8 +35,13 @@ public class LicenseController( [ResponseCache(CacheProfileName = ResponseCacheProfiles.LicenseCache)] public async Task> HasValidLicense(bool forceCheck = false) { + var result = await licenseService.HasActiveLicense(forceCheck); - if (result) + + var licenseInfoProvider = cachingProviderFactory.GetCachingProvider(EasyCacheProfiles.License); + var cacheValue = await licenseInfoProvider.GetAsync(LicenseService.CacheKey); + + if (result && !cacheValue.IsNull && !cacheValue.Value) { await taskScheduler.ScheduleKavitaPlusTasks(); } @@ -41,7 +50,7 @@ public class LicenseController( } /// - /// Has any license + /// Has any license registered with the instance. Does not check Kavita+ API /// /// [Authorize("RequireAdminRole")] @@ -53,6 +62,30 @@ public class LicenseController( (await unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey)).Value)); } + /// + /// Asks Kavita+ for the latest license info + /// + /// Force checking the API and skip the 8 hour cache + /// + [Authorize("RequireAdminRole")] + [HttpGet("info")] + [ResponseCache(CacheProfileName = ResponseCacheProfiles.LicenseCache)] + public async Task> GetLicenseInfo(bool forceCheck = false) + { + try + { + return Ok(await licenseService.GetLicenseInfo(forceCheck)); + } + catch (Exception) + { + return Ok(null); + } + } + + /// + /// Remove the Kavita+ License on the Server + /// + /// [Authorize("RequireAdminRole")] [HttpDelete] [ResponseCache(CacheProfileName = ResponseCacheProfiles.LicenseCache)] @@ -63,10 +96,13 @@ public class LicenseController( setting.Value = null; unitOfWork.SettingsRepository.Update(setting); await unitOfWork.CommitAsync(); - await taskScheduler.ScheduleKavitaPlusTasks(); + + TaskScheduler.RemoveKavitaPlusTasks(); + return Ok(); } + [Authorize("RequireAdminRole")] [HttpPost("reset")] public async Task ResetLicense(UpdateLicenseDto dto) diff --git a/API/Controllers/LocaleController.cs b/API/Controllers/LocaleController.cs index 9190c72cb..6e3a2ec78 100644 --- a/API/Controllers/LocaleController.cs +++ b/API/Controllers/LocaleController.cs @@ -2,9 +2,16 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; +using System.Threading.Tasks; +using API.Constants; +using API.DTOs; using API.DTOs.Filtering; using API.Services; +using EasyCaching.Core; +using Kavita.Common.EnvironmentInfo; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Hosting; namespace API.Controllers; @@ -13,43 +20,34 @@ namespace API.Controllers; public class LocaleController : BaseApiController { private readonly ILocalizationService _localizationService; + private readonly IEasyCachingProvider _localeCacheProvider; - public LocaleController(ILocalizationService localizationService) + private static readonly string CacheKey = "locales_" + BuildInfo.Version; + + public LocaleController(ILocalizationService localizationService, IEasyCachingProviderFactory cachingProviderFactory) { _localizationService = localizationService; + _localeCacheProvider = cachingProviderFactory.GetCachingProvider(EasyCacheProfiles.LocaleOptions); } + /// + /// Returns all applicable locales on the server + /// + /// This can be cached as it will not change per version. + /// + [AllowAnonymous] [HttpGet] - public ActionResult> GetAllLocales() + public async Task>> GetAllLocales() { - // Check if temp/locale_map.json exists + var result = await _localeCacheProvider.GetAsync>(CacheKey); + if (result.HasValue) + { + return Ok(result.Value); + } - // If not, scan the 2 locale files and calculate empty keys or empty values + var ret = _localizationService.GetLocales().Where(l => l.TranslationCompletion > 0f); + await _localeCacheProvider.SetAsync(CacheKey, ret, TimeSpan.FromDays(1)); - // Formulate the Locale object with Percentage - var languages = _localizationService.GetLocales().Select(c => - { - try - { - var cult = new CultureInfo(c); - return new LanguageDto() - { - Title = cult.DisplayName, - IsoCode = cult.IetfLanguageTag - }; - } - catch (Exception ex) - { - // Some OS' don't have all culture codes supported like PT_BR, thus we need to default - return new LanguageDto() - { - Title = c, - IsoCode = c - }; - } - }) - .Where(l => !string.IsNullOrEmpty(l.IsoCode)) - .OrderBy(d => d.Title); - return Ok(languages); + return Ok(ret); } } diff --git a/API/Controllers/ManageController.cs b/API/Controllers/ManageController.cs new file mode 100644 index 000000000..3641ddd74 --- /dev/null +++ b/API/Controllers/ManageController.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using API.Data; +using API.DTOs; +using API.DTOs.KavitaPlus.Manage; +using API.Services.Plus; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; + +namespace API.Controllers; + +/// +/// All things centered around Managing the Kavita instance, that isn't aligned with an entity +/// +[Authorize("RequireAdminRole")] +public class ManageController : BaseApiController +{ + private readonly IUnitOfWork _unitOfWork; + private readonly ILicenseService _licenseService; + + public ManageController(IUnitOfWork unitOfWork, ILicenseService licenseService) + { + _unitOfWork = unitOfWork; + _licenseService = licenseService; + } + + /// + /// Returns a list of all Series that is Kavita+ applicable to metadata match and the status of it + /// + /// + [Authorize("RequireAdminRole")] + [HttpPost("series-metadata")] + public async Task>> SeriesMetadata(ManageMatchFilterDto filter) + { + if (!await _licenseService.HasActiveLicense()) return Ok(Array.Empty()); + + return Ok(await _unitOfWork.ExternalSeriesMetadataRepository.GetAllSeries(filter)); + } +} diff --git a/API/Controllers/MetadataController.cs b/API/Controllers/MetadataController.cs index 51c8c4a01..cab33692a 100644 --- a/API/Controllers/MetadataController.cs +++ b/API/Controllers/MetadataController.cs @@ -9,10 +9,13 @@ using API.Data.Repositories; using API.DTOs; using API.DTOs.Filtering; using API.DTOs.Metadata; +using API.DTOs.Metadata.Browse; +using API.DTOs.Person; using API.DTOs.Recommendation; using API.DTOs.SeriesDetail; using API.Entities.Enums; using API.Extensions; +using API.Helpers; using API.Services; using API.Services.Plus; using Kavita.Common.Extensions; @@ -32,16 +35,35 @@ public class MetadataController(IUnitOfWork unitOfWork, ILocalizationService loc /// Fetches genres from the instance /// /// String separated libraryIds or null for all genres + /// Context from which this API was invoked /// [HttpGet("genres")] [ResponseCache(CacheProfileName = ResponseCacheProfiles.Instant, VaryByQueryKeys = ["libraryIds", "context"])] public async Task>> GetAllGenres(string? libraryIds, QueryContext context = QueryContext.None) { - var ids = libraryIds?.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries).Select(int.Parse).ToList(); + var ids = libraryIds?.Split(',', StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries) + .Select(int.Parse) + .ToList(); return Ok(await unitOfWork.GenreRepository.GetAllGenreDtosForLibrariesAsync(User.GetUserId(), ids, context)); } + /// + /// Returns a list of Genres with counts for counts when Genre is on Series/Chapter + /// + /// + [HttpPost("genres-with-counts")] + [ResponseCache(CacheProfileName = ResponseCacheProfiles.FiveMinute)] + public async Task>> GetBrowseGenres(UserParams? userParams = null) + { + userParams ??= UserParams.Default; + + var list = await unitOfWork.GenreRepository.GetBrowseableGenre(User.GetUserId(), userParams); + Response.AddPaginationHeader(list.CurrentPage, list.PageSize, list.TotalCount, list.TotalPages); + + return Ok(list); + } + /// /// Fetches people from the instance by role /// @@ -70,6 +92,7 @@ public class MetadataController(IUnitOfWork unitOfWork, ILocalizationService loc { return Ok(await unitOfWork.PersonRepository.GetAllPeopleDtosForLibrariesAsync(User.GetUserId(), ids)); } + return Ok(await unitOfWork.PersonRepository.GetAllPeopleDtosForLibrariesAsync(User.GetUserId())); } @@ -90,6 +113,22 @@ public class MetadataController(IUnitOfWork unitOfWork, ILocalizationService loc return Ok(await unitOfWork.TagRepository.GetAllTagDtosForLibrariesAsync(User.GetUserId())); } + /// + /// Returns a list of Tags with counts for counts when Tag is on Series/Chapter + /// + /// + [HttpPost("tags-with-counts")] + [ResponseCache(CacheProfileName = ResponseCacheProfiles.FiveMinute)] + public async Task>> GetBrowseTags(UserParams? userParams = null) + { + userParams ??= UserParams.Default; + + var list = await unitOfWork.TagRepository.GetBrowseableTag(User.GetUserId(), userParams); + Response.AddPaginationHeader(list.CurrentPage, list.PageSize, list.TotalCount, list.TotalPages); + + return Ok(list); + } + /// /// Fetches all age ratings from the instance /// @@ -189,12 +228,12 @@ public class MetadataController(IUnitOfWork unitOfWork, ILocalizationService loc /// /// /// - [HttpPost("force-refresh")] - public async Task ForceRefresh(int seriesId) - { - await metadataService.ForceKavitaPlusRefresh(seriesId); - return Ok(); - } + // [HttpPost("force-refresh")] + // public async Task ForceRefresh(int seriesId) + // { + // await metadataService.ForceKavitaPlusRefresh(seriesId); + // return Ok(); + // } /// /// Fetches the details needed from Kavita+ for Series Detail page @@ -217,12 +256,12 @@ public class MetadataController(IUnitOfWork unitOfWork, ILocalizationService loc return Ok(ret); } - private async Task PrepareSeriesDetail(List userReviews, SeriesDetailPlusDto ret) + private async Task PrepareSeriesDetail(List userReviews, SeriesDetailPlusDto? ret) { var isAdmin = User.IsInRole(PolicyConstants.AdminRole); var user = await unitOfWork.UserRepository.GetUserByIdAsync(User.GetUserId())!; - userReviews.AddRange(ReviewService.SelectSpectrumOfReviews(ret.Reviews.ToList())); + userReviews.AddRange(ReviewHelper.SelectSpectrumOfReviews(ret.Reviews.ToList())); ret.Reviews = userReviews; if (!isAdmin && ret.Recommendations != null && user != null) @@ -231,12 +270,12 @@ public class MetadataController(IUnitOfWork unitOfWork, ILocalizationService loc ret.Recommendations.OwnedSeries = await unitOfWork.SeriesRepository.GetSeriesDtoByIdsAsync( ret.Recommendations.OwnedSeries.Select(s => s.Id), user); - ret.Recommendations.ExternalSeries = new List(); + ret.Recommendations.ExternalSeries = []; } if (ret.Recommendations != null && user != null) { - ret.Recommendations.OwnedSeries ??= new List(); + ret.Recommendations.OwnedSeries ??= []; await unitOfWork.SeriesRepository.AddSeriesModifiers(user.Id, ret.Recommendations.OwnedSeries); } } diff --git a/API/Controllers/OPDSController.cs b/API/Controllers/OPDSController.cs index e122ae9f9..6e96c3063 100644 --- a/API/Controllers/OPDSController.cs +++ b/API/Controllers/OPDSController.cs @@ -4,6 +4,7 @@ using System.Globalization; using System.IO; using System.Linq; using System.Threading.Tasks; +using System.Xml; using System.Xml.Serialization; using API.Comparators; using API.Data; @@ -14,6 +15,7 @@ using API.DTOs.CollectionTags; using API.DTOs.Filtering; using API.DTOs.Filtering.v2; using API.DTOs.OPDS; +using API.DTOs.Person; using API.DTOs.Progress; using API.DTOs.Search; using API.Entities; @@ -26,6 +28,7 @@ using AutoMapper; using Kavita.Common; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; using MimeTypes; namespace API.Controllers; @@ -35,6 +38,7 @@ namespace API.Controllers; [AllowAnonymous] public class OpdsController : BaseApiController { + private readonly ILogger _logger; private readonly IUnitOfWork _unitOfWork; private readonly IDownloadService _downloadService; private readonly IDirectoryService _directoryService; @@ -81,7 +85,7 @@ public class OpdsController : BaseApiController IDirectoryService directoryService, ICacheService cacheService, IReaderService readerService, ISeriesService seriesService, IAccountService accountService, ILocalizationService localizationService, - IMapper mapper) + IMapper mapper, ILogger logger) { _unitOfWork = unitOfWork; _downloadService = downloadService; @@ -92,6 +96,7 @@ public class OpdsController : BaseApiController _accountService = accountService; _localizationService = localizationService; _mapper = mapper; + _logger = logger; _xmlSerializer = new XmlSerializer(typeof(Feed)); _xmlOpenSearchSerializer = new XmlSerializer(typeof(OpenSearchDescription)); @@ -579,19 +584,25 @@ public class OpdsController : BaseApiController public async Task GetReadingListItems(int readingListId, string apiKey, [FromQuery] int pageNumber = 0) { var userId = await GetUser(apiKey); - if (!(await _unitOfWork.SettingsRepository.GetSettingsDtoAsync()).EnableOpds) - return BadRequest(await _localizationService.Translate(userId, "opds-disabled")); - var (baseUrl, prefix) = await GetPrefix(); - var user = await _unitOfWork.UserRepository.GetUserByIdAsync(userId); - var userWithLists = await _unitOfWork.UserRepository.GetUserByUsernameAsync(user!.UserName!, AppUserIncludes.ReadingListsWithItems); - if (userWithLists == null) return Unauthorized(); - var readingList = userWithLists.ReadingLists.SingleOrDefault(t => t.Id == readingListId); + if (!(await _unitOfWork.SettingsRepository.GetSettingsDtoAsync()).EnableOpds) + { + return BadRequest(await _localizationService.Translate(userId, "opds-disabled")); + } + + var user = await _unitOfWork.UserRepository.GetUserByIdAsync(userId); + if (user == null) + { + return Unauthorized(); + } + + var readingList = await _unitOfWork.ReadingListRepository.GetReadingListDtoByIdAsync(readingListId, user.Id); if (readingList == null) { return BadRequest(await _localizationService.Translate(userId, "reading-list-restricted")); } + var (baseUrl, prefix) = await GetPrefix(); var feed = CreateFeed(readingList.Title + " " + await _localizationService.Translate(userId, "reading-list"), $"{apiKey}/reading-list/{readingListId}", apiKey, prefix); SetFeedId(feed, $"reading-list-{readingListId}"); @@ -764,6 +775,12 @@ public class OpdsController : BaseApiController return CreateXmlResult(SerializeXml(feed)); } + /// + /// OPDS Search endpoint + /// + /// + /// + /// [HttpGet("{apiKey}/series")] [Produces("application/xml")] public async Task SearchSeries(string apiKey, [FromQuery] string query) @@ -781,20 +798,21 @@ public class OpdsController : BaseApiController query = query.Replace(@"%", string.Empty); // Get libraries user has access to var libraries = (await _unitOfWork.LibraryRepository.GetLibrariesForUserIdAsync(userId)).ToList(); - if (!libraries.Any()) return BadRequest(await _localizationService.Translate(userId, "libraries-restricted")); + if (libraries.Count == 0) return BadRequest(await _localizationService.Translate(userId, "libraries-restricted")); var isAdmin = await _unitOfWork.UserRepository.IsUserAdminAsync(user); - var series = await _unitOfWork.SeriesRepository.SearchSeries(userId, isAdmin, libraries.Select(l => l.Id).ToArray(), query); + var searchResults = await _unitOfWork.SeriesRepository.SearchSeries(userId, isAdmin, + libraries.Select(l => l.Id).ToArray(), query, includeChapterAndFiles: false); var feed = CreateFeed(query, $"{apiKey}/series?query=" + query, apiKey, prefix); SetFeedId(feed, "search-series"); - foreach (var seriesDto in series.Series) + foreach (var seriesDto in searchResults.Series) { feed.Entries.Add(CreateSeries(seriesDto, apiKey, prefix, baseUrl)); } - foreach (var collection in series.Collections) + foreach (var collection in searchResults.Collections) { feed.Entries.Add(new FeedEntry() { @@ -813,7 +831,7 @@ public class OpdsController : BaseApiController }); } - foreach (var readingListDto in series.ReadingLists) + foreach (var readingListDto in searchResults.ReadingLists) { feed.Entries.Add(new FeedEntry() { @@ -827,6 +845,7 @@ public class OpdsController : BaseApiController }); } + // TODO: Search should allow Chapters/Files and more return CreateXmlResult(SerializeXml(feed)); } @@ -1355,9 +1374,48 @@ public class OpdsController : BaseApiController { if (feed == null) return string.Empty; + // Remove invalid XML characters from the feed object + SanitizeFeed(feed); + using var sm = new StringWriter(); _xmlSerializer.Serialize(sm, feed); - return sm.ToString().Replace("utf-16", "utf-8"); // Chunky cannot accept UTF-16 feeds + var ret = sm.ToString().Replace("utf-16", "utf-8"); // Chunky cannot accept UTF-16 feeds + + return ret; + } + + // Recursively sanitize all string properties in the object + private static void SanitizeFeed(object? obj) + { + if (obj == null) return; + + var properties = obj.GetType().GetProperties(); + foreach (var property in properties) + { + // Skip properties that require an index (e.g., indexed collections) + if (property.GetIndexParameters().Length > 0) + continue; + + if (property.PropertyType == typeof(string) && property.CanWrite) + { + var value = (string?)property.GetValue(obj); + if (!string.IsNullOrEmpty(value)) + { + property.SetValue(obj, RemoveInvalidXmlChars(value)); + } + } + else if (property.PropertyType.IsClass) // Handle nested objects + { + var nestedObject = property.GetValue(obj); + if (nestedObject != null) + SanitizeFeed(nestedObject); + } + } + } + + private static string RemoveInvalidXmlChars(string input) + { + return new string(input.Where(XmlConvert.IsXmlChar).ToArray()); } } diff --git a/API/Controllers/PersonController.cs b/API/Controllers/PersonController.cs index 22a52c04a..7328ff954 100644 --- a/API/Controllers/PersonController.cs +++ b/API/Controllers/PersonController.cs @@ -1,7 +1,13 @@ using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using API.Data; +using API.Data.Repositories; using API.DTOs; +using API.DTOs.Filtering.v2; +using API.DTOs.Metadata.Browse; +using API.DTOs.Metadata.Browse.Requests; +using API.DTOs.Person; using API.Entities.Enums; using API.Extensions; using API.Helpers; @@ -9,6 +15,7 @@ using API.Services; using API.Services.Tasks.Metadata; using API.SignalR; using AutoMapper; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Nager.ArticleNumber; @@ -23,9 +30,10 @@ public class PersonController : BaseApiController private readonly ICoverDbService _coverDbService; private readonly IImageService _imageService; private readonly IEventHub _eventHub; + private readonly IPersonService _personService; public PersonController(IUnitOfWork unitOfWork, ILocalizationService localizationService, IMapper mapper, - ICoverDbService coverDbService, IImageService imageService, IEventHub eventHub) + ICoverDbService coverDbService, IImageService imageService, IEventHub eventHub, IPersonService personService) { _unitOfWork = unitOfWork; _localizationService = localizationService; @@ -33,6 +41,7 @@ public class PersonController : BaseApiController _coverDbService = coverDbService; _imageService = imageService; _eventHub = eventHub; + _personService = personService; } @@ -42,6 +51,17 @@ public class PersonController : BaseApiController return Ok(await _unitOfWork.PersonRepository.GetPersonDtoByName(name, User.GetUserId())); } + /// + /// Find a person by name or alias against a query string + /// + /// + /// + [HttpGet("search")] + public async Task>> SearchPeople([FromQuery] string queryString) + { + return Ok(await _unitOfWork.PersonRepository.SearchPeople(queryString)); + } + /// /// Returns all roles for a Person /// @@ -53,17 +73,20 @@ public class PersonController : BaseApiController return Ok(await _unitOfWork.PersonRepository.GetRolesForPersonByName(personId, User.GetUserId())); } + /// - /// Returns a list of authors & artists for browsing + /// Returns a list of authors and artists for browsing /// /// /// [HttpPost("all")] - public async Task>> GetAuthorsForBrowse([FromQuery] UserParams? userParams) + public async Task>> GetPeopleForBrowse(BrowsePersonFilterDto filter, [FromQuery] UserParams? userParams) { userParams ??= UserParams.Default; - var list = await _unitOfWork.PersonRepository.GetAllWritersAndSeriesCount(User.GetUserId(), userParams); + + var list = await _unitOfWork.PersonRepository.GetBrowsePersonDtos(User.GetUserId(), filter, userParams); Response.AddPaginationHeader(list.CurrentPage, list.PageSize, list.TotalCount, list.TotalPages); + return Ok(list); } @@ -72,11 +95,12 @@ public class PersonController : BaseApiController /// /// /// + [Authorize("RequireAdminRole")] [HttpPost("update")] public async Task> UpdatePerson(UpdatePersonDto dto) { // This needs to get all people and update them equally - var person = await _unitOfWork.PersonRepository.GetPersonById(dto.Id); + var person = await _unitOfWork.PersonRepository.GetPersonById(dto.Id, PersonIncludes.Aliases); if (person == null) return BadRequest(_localizationService.Translate(User.GetUserId(), "person-doesnt-exist")); if (string.IsNullOrEmpty(dto.Name)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "person-name-required")); @@ -88,7 +112,12 @@ public class PersonController : BaseApiController return BadRequest(await _localizationService.Translate(User.GetUserId(), "person-name-unique")); } + var success = await _personService.UpdatePersonAliasesAsync(person, dto.Aliases); + if (!success) return BadRequest(await _localizationService.Translate(User.GetUserId(), "aliases-have-overlap")); + + person.Name = dto.Name?.Trim(); + person.NormalizedName = person.Name.ToNormalized(); person.Description = dto.Description ?? string.Empty; person.CoverImageLocked = dto.CoverImageLocked; @@ -133,7 +162,11 @@ public class PersonController : BaseApiController var personImage = await _coverDbService.DownloadPersonImageAsync(person, settings.EncodeMediaAs); - if (string.IsNullOrEmpty(personImage)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "person-image-doesnt-exist")); + if (string.IsNullOrEmpty(personImage)) + { + + return BadRequest(await _localizationService.Translate(User.GetUserId(), "person-image-doesnt-exist")); + } person.CoverImage = personImage; _imageService.UpdateColorScape(person); @@ -152,7 +185,7 @@ public class PersonController : BaseApiController [HttpGet("series-known-for")] public async Task>> GetKnownSeries(int personId) { - return Ok(await _unitOfWork.PersonRepository.GetSeriesKnownFor(personId)); + return Ok(await _unitOfWork.PersonRepository.GetSeriesKnownFor(personId, User.GetUserId())); } /// @@ -167,5 +200,42 @@ public class PersonController : BaseApiController return Ok(await _unitOfWork.PersonRepository.GetChaptersForPersonByRole(personId, User.GetUserId(), role)); } + /// + /// Merges Persons into one, this action is irreversible + /// + /// + /// + [HttpPost("merge")] + [Authorize("RequireAdminRole")] + public async Task> MergePeople(PersonMergeDto dto) + { + var dst = await _unitOfWork.PersonRepository.GetPersonById(dto.DestId, PersonIncludes.All); + if (dst == null) return BadRequest(); + + var src = await _unitOfWork.PersonRepository.GetPersonById(dto.SrcId, PersonIncludes.All); + if (src == null) return BadRequest(); + + await _personService.MergePeopleAsync(src, dst); + await _eventHub.SendMessageAsync(MessageFactory.PersonMerged, MessageFactory.PersonMergedMessage(dst, src)); + + return Ok(_mapper.Map(dst)); + } + + /// + /// Ensure the alias is valid to be added. For example, the alias cannot be on another person or be the same as the current person name/alias. + /// + /// + /// + /// + [HttpGet("valid-alias")] + public async Task> IsValidAlias(int personId, string alias) + { + var person = await _unitOfWork.PersonRepository.GetPersonById(personId, PersonIncludes.Aliases); + if (person == null) return NotFound(); + + var existingAlias = await _unitOfWork.PersonRepository.AnyAliasExist(alias); + return Ok(!existingAlias && person.NormalizedName != alias.ToNormalized()); + } + } diff --git a/API/Controllers/PluginController.cs b/API/Controllers/PluginController.cs index 87cfaf2c2..f39462bbf 100644 --- a/API/Controllers/PluginController.cs +++ b/API/Controllers/PluginController.cs @@ -30,7 +30,7 @@ public class PluginController(IUnitOfWork unitOfWork, ITokenService tokenService public async Task> Authenticate([Required] string apiKey, [Required] string pluginName) { // NOTE: In order to log information about plugins, we need some Plugin Description information for each request - // Should log into access table so we can tell the user + // Should log into the access table so we can tell the user var ipAddress = HttpContext.Connection.RemoteIpAddress?.ToString(); var userAgent = HttpContext.Request.Headers.UserAgent; var userId = await unitOfWork.UserRepository.GetUserIdByApiKeyAsync(apiKey); @@ -45,7 +45,7 @@ public class PluginController(IUnitOfWork unitOfWork, ITokenService tokenService throw new KavitaUnauthenticatedUserException(); } var user = await unitOfWork.UserRepository.GetUserByIdAsync(userId); - logger.LogInformation("Plugin {PluginName} has authenticated with {UserName} ({UserId})'s API Key", pluginName.Replace(Environment.NewLine, string.Empty), user!.UserName, userId); + logger.LogInformation("Plugin {PluginName} has authenticated with {UserName} ({AppUserId})'s API Key", pluginName.Replace(Environment.NewLine, string.Empty), user!.UserName, userId); return new UserDto { diff --git a/API/Controllers/RatingController.cs b/API/Controllers/RatingController.cs index a40b6680b..9283ef6d3 100644 --- a/API/Controllers/RatingController.cs +++ b/API/Controllers/RatingController.cs @@ -1,15 +1,12 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Threading.Tasks; -using API.Constants; using API.Data; +using API.Data.Repositories; using API.DTOs; using API.Extensions; +using API.Services; using API.Services.Plus; -using EasyCaching.Core; using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Logging; namespace API.Controllers; @@ -21,21 +18,85 @@ namespace API.Controllers; public class RatingController : BaseApiController { private readonly IUnitOfWork _unitOfWork; + private readonly IRatingService _ratingService; + private readonly ILocalizationService _localizationService; - public RatingController(IUnitOfWork unitOfWork) + public RatingController(IUnitOfWork unitOfWork, IRatingService ratingService, ILocalizationService localizationService) { _unitOfWork = unitOfWork; - + _ratingService = ratingService; + _localizationService = localizationService; } - [HttpGet("overall")] - public async Task> GetOverallRating(int seriesId) + /// + /// Update the users' rating of the given series + /// + /// + /// + /// + [HttpPost("series")] + public async Task UpdateSeriesRating(UpdateRatingDto updateRating) + { + var user = await _unitOfWork.UserRepository.GetUserByIdAsync(User.GetUserId(), AppUserIncludes.Ratings | AppUserIncludes.ChapterRatings); + if (user == null) throw new UnauthorizedAccessException(); + + if (await _ratingService.UpdateSeriesRating(user, updateRating)) + { + return Ok(); + } + + return BadRequest(await _localizationService.Translate(User.GetUserId(), "generic-error")); + } + + /// + /// Update the users' rating of the given chapter + /// + /// chapterId must be set + /// + /// + [HttpPost("chapter")] + public async Task UpdateChapterRating(UpdateRatingDto updateRating) + { + var user = await _unitOfWork.UserRepository.GetUserByIdAsync(User.GetUserId(), AppUserIncludes.Ratings | AppUserIncludes.ChapterRatings); + if (user == null) throw new UnauthorizedAccessException(); + + if (await _ratingService.UpdateChapterRating(user, updateRating)) + { + return Ok(); + } + + return BadRequest(await _localizationService.Translate(User.GetUserId(), "generic-error")); + } + + /// + /// Overall rating from all Kavita users for a given Series + /// + /// + /// + [HttpGet("overall-series")] + public async Task> GetOverallSeriesRating(int seriesId) { return Ok(new RatingDto() { Provider = ScrobbleProvider.Kavita, AverageScore = await _unitOfWork.SeriesRepository.GetAverageUserRating(seriesId, User.GetUserId()), - FavoriteCount = 0 + FavoriteCount = 0, + }); + } + + /// + /// Overall rating from all Kavita users for a given Chapter + /// + /// + /// + [HttpGet("overall-chapter")] + public async Task> GetOverallChapterRating(int chapterId) + { + return Ok(new RatingDto() + { + Provider = ScrobbleProvider.Kavita, + AverageScore = await _unitOfWork.ChapterRepository.GetAverageUserRating(chapterId, User.GetUserId()), + FavoriteCount = 0, }); } } diff --git a/API/Controllers/ReaderController.cs b/API/Controllers/ReaderController.cs index d4bc8a1fe..38a5ad482 100644 --- a/API/Controllers/ReaderController.cs +++ b/API/Controllers/ReaderController.cs @@ -803,7 +803,7 @@ public class ReaderController : BaseApiController /// /// [HttpGet("time-left")] - [ResponseCache(CacheProfileName = "Hour", VaryByQueryKeys = ["seriesId"])] + [ResponseCache(CacheProfileName = ResponseCacheProfiles.Hour, VaryByQueryKeys = ["seriesId"])] public async Task> GetEstimateToCompletion(int seriesId) { var userId = User.GetUserId(); diff --git a/API/Controllers/ReadingListController.cs b/API/Controllers/ReadingListController.cs index 5e84e9f64..1187992bc 100644 --- a/API/Controllers/ReadingListController.cs +++ b/API/Controllers/ReadingListController.cs @@ -4,12 +4,12 @@ using System.Threading.Tasks; using API.Constants; using API.Data; using API.Data.Repositories; -using API.DTOs; +using API.DTOs.Person; using API.DTOs.ReadingLists; +using API.Entities.Enums; using API.Extensions; using API.Helpers; using API.Services; -using API.SignalR; using Kavita.Common; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; @@ -24,13 +24,15 @@ public class ReadingListController : BaseApiController private readonly IUnitOfWork _unitOfWork; private readonly IReadingListService _readingListService; private readonly ILocalizationService _localizationService; + private readonly IReaderService _readerService; public ReadingListController(IUnitOfWork unitOfWork, IReadingListService readingListService, - ILocalizationService localizationService) + ILocalizationService localizationService, IReaderService readerService) { _unitOfWork = unitOfWork; _readingListService = readingListService; _localizationService = localizationService; + _readerService = readerService; } /// @@ -39,9 +41,15 @@ public class ReadingListController : BaseApiController /// /// [HttpGet] - public async Task>> GetList(int readingListId) + public async Task> GetList(int readingListId) { - return Ok(await _unitOfWork.ReadingListRepository.GetReadingListDtoByIdAsync(readingListId, User.GetUserId())); + var readingList = await _unitOfWork.ReadingListRepository.GetReadingListDtoByIdAsync(readingListId, User.GetUserId()); + if (readingList == null) + { + return BadRequest(await _localizationService.Translate(User.GetUserId(), "reading-list-restricted")); + } + + return Ok(readingList); } /// @@ -108,6 +116,7 @@ public class ReadingListController : BaseApiController [HttpPost("update-position")] public async Task UpdateListItemPosition(UpdateReadingListPosition dto) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); // Make sure UI buffers events var user = await _readingListService.UserHasReadingListAccess(dto.ReadingListId, User.GetUsername()); if (user == null) @@ -122,13 +131,14 @@ public class ReadingListController : BaseApiController } /// - /// Deletes a list item from the list. Will reorder all item positions afterwards + /// Deletes a list item from the list. Item orders will update as a result. /// /// /// [HttpPost("delete-item")] public async Task DeleteListItem(UpdateReadingListPosition dto) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); var user = await _readingListService.UserHasReadingListAccess(dto.ReadingListId, User.GetUsername()); if (user == null) { @@ -151,6 +161,8 @@ public class ReadingListController : BaseApiController [HttpPost("remove-read")] public async Task DeleteReadFromList([FromQuery] int readingListId) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); + var user = await _readingListService.UserHasReadingListAccess(readingListId, User.GetUsername()); if (user == null) { @@ -173,6 +185,7 @@ public class ReadingListController : BaseApiController [HttpDelete] public async Task DeleteList([FromQuery] int readingListId) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); var user = await _readingListService.UserHasReadingListAccess(readingListId, User.GetUsername()); if (user == null) { @@ -193,6 +206,7 @@ public class ReadingListController : BaseApiController [HttpPost("create")] public async Task> CreateList(CreateReadingListDto dto) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername(), AppUserIncludes.ReadingLists); if (user == null) return Unauthorized(); @@ -216,6 +230,7 @@ public class ReadingListController : BaseApiController [HttpPost("update")] public async Task UpdateList(UpdateReadingListDto dto) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); var readingList = await _unitOfWork.ReadingListRepository.GetReadingListByIdAsync(dto.ReadingListId); if (readingList == null) return BadRequest(await _localizationService.Translate(User.GetUserId(), "reading-list-doesnt-exist")); @@ -245,6 +260,7 @@ public class ReadingListController : BaseApiController [HttpPost("update-by-series")] public async Task UpdateListBySeries(UpdateReadingListBySeriesDto dto) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); var user = await _readingListService.UserHasReadingListAccess(dto.ReadingListId, User.GetUsername()); if (user == null) { @@ -254,7 +270,7 @@ public class ReadingListController : BaseApiController var readingList = user.ReadingLists.SingleOrDefault(l => l.Id == dto.ReadingListId); if (readingList == null) return BadRequest(await _localizationService.Translate(User.GetUserId(), "reading-list-doesnt-exist")); var chapterIdsForSeries = - await _unitOfWork.SeriesRepository.GetChapterIdsForSeriesAsync(new [] {dto.SeriesId}); + await _unitOfWork.SeriesRepository.GetChapterIdsForSeriesAsync([dto.SeriesId]); // If there are adds, tell tracking this has been modified if (await _readingListService.AddChaptersToReadingList(dto.SeriesId, chapterIdsForSeries, readingList)) @@ -287,6 +303,7 @@ public class ReadingListController : BaseApiController [HttpPost("update-by-multiple")] public async Task UpdateListByMultiple(UpdateReadingListByMultipleDto dto) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); var user = await _readingListService.UserHasReadingListAccess(dto.ReadingListId, User.GetUsername()); if (user == null) { @@ -331,6 +348,7 @@ public class ReadingListController : BaseApiController [HttpPost("update-by-multiple-series")] public async Task UpdateListByMultipleSeries(UpdateReadingListByMultipleSeriesDto dto) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); var user = await _readingListService.UserHasReadingListAccess(dto.ReadingListId, User.GetUsername()); if (user == null) { @@ -369,6 +387,7 @@ public class ReadingListController : BaseApiController [HttpPost("update-by-volume")] public async Task UpdateListByVolume(UpdateReadingListByVolumeDto dto) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); var user = await _readingListService.UserHasReadingListAccess(dto.ReadingListId, User.GetUsername()); if (user == null) { @@ -405,6 +424,7 @@ public class ReadingListController : BaseApiController [HttpPost("update-by-chapter")] public async Task UpdateListByChapter(UpdateReadingListByChapterDto dto) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); var user = await _readingListService.UserHasReadingListAccess(dto.ReadingListId, User.GetUsername()); if (user == null) { @@ -435,26 +455,38 @@ public class ReadingListController : BaseApiController return Ok(await _localizationService.Translate(User.GetUserId(), "nothing-to-do")); } + /// - /// Returns a list of characters associated with the reading list + /// Returns a list of a given role associated with the reading list + /// + /// + /// PersonRole + /// + [HttpGet("people")] + [ResponseCache(CacheProfileName = ResponseCacheProfiles.TenMinute, VaryByQueryKeys = ["readingListId", "role"])] + public ActionResult> GetPeopleByRoleForList(int readingListId, PersonRole role) + { + return Ok(_unitOfWork.ReadingListRepository.GetReadingListPeopleAsync(readingListId, role)); + } + + /// + /// Returns all people in given roles for a reading list /// /// /// - [HttpGet("characters")] - [ResponseCache(CacheProfileName = ResponseCacheProfiles.TenMinute)] - public ActionResult> GetCharactersForList(int readingListId) + [HttpGet("all-people")] + [ResponseCache(CacheProfileName = ResponseCacheProfiles.TenMinute, VaryByQueryKeys = ["readingListId"])] + public async Task>> GetAllPeopleForList(int readingListId) { - return Ok(_unitOfWork.ReadingListRepository.GetReadingListCharactersAsync(readingListId)); + return Ok(await _unitOfWork.ReadingListRepository.GetReadingListAllPeopleAsync(readingListId)); } - - /// /// Returns the next chapter within the reading list /// /// /// - /// Chapter Id for next item, -1 if nothing exists + /// Chapter ID for next item, -1 if nothing exists [HttpGet("next-chapter")] public async Task> GetNextChapter(int currentChapterId, int readingListId) { @@ -514,6 +546,8 @@ public class ReadingListController : BaseApiController [HttpPost("promote-multiple")] public async Task PromoteMultipleReadingLists(PromoteReadingListsDto dto) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); + // This needs to take into account owner as I can select other users cards var userId = User.GetUserId(); if (!User.IsInRole(PolicyConstants.PromoteRole) && !User.IsInRole(PolicyConstants.AdminRole)) @@ -558,4 +592,26 @@ public class ReadingListController : BaseApiController return Ok(); } + + /// + /// Returns random information about a Reading List + /// + /// + /// + [HttpGet("info")] + [ResponseCache(CacheProfileName = ResponseCacheProfiles.Hour, VaryByQueryKeys = ["readingListId"])] + public async Task> GetReadingListInfo(int readingListId) + { + var result = await _unitOfWork.ReadingListRepository.GetReadingListInfoAsync(readingListId); + + if (result == null) return Ok(null); + + var timeEstimate = _readerService.GetTimeEstimate(result.WordCount, result.Pages, result.IsAllEpub); + + result.MinHoursToRead = timeEstimate.MinHours; + result.AvgHoursToRead = timeEstimate.AvgHours; + result.MaxHoursToRead = timeEstimate.MaxHours; + + return Ok(result); + } } diff --git a/API/Controllers/ReadingProfileController.cs b/API/Controllers/ReadingProfileController.cs new file mode 100644 index 000000000..bc1b4fa52 --- /dev/null +++ b/API/Controllers/ReadingProfileController.cs @@ -0,0 +1,198 @@ +#nullable enable +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using API.Data; +using API.Data.Repositories; +using API.DTOs; +using API.Extensions; +using API.Services; +using AutoMapper; +using Kavita.Common; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; + +namespace API.Controllers; + +[Route("api/reading-profile")] +public class ReadingProfileController(ILogger logger, IUnitOfWork unitOfWork, + IReadingProfileService readingProfileService): BaseApiController +{ + + /// + /// Gets all non-implicit reading profiles for a user + /// + /// + [HttpGet("all")] + public async Task>> GetAllReadingProfiles() + { + return Ok(await unitOfWork.AppUserReadingProfileRepository.GetProfilesDtoForUser(User.GetUserId(), true)); + } + + /// + /// Returns the ReadingProfile that should be applied to the given series, walks up the tree. + /// Series -> Library -> Default + /// + /// + /// + /// + [HttpGet("{seriesId:int}")] + public async Task> GetProfileForSeries(int seriesId, [FromQuery] bool skipImplicit) + { + return Ok(await readingProfileService.GetReadingProfileDtoForSeries(User.GetUserId(), seriesId, skipImplicit)); + } + + /// + /// Returns the (potential) Reading Profile bound to the library + /// + /// + /// + [HttpGet("library")] + public async Task> GetProfileForLibrary(int libraryId) + { + return Ok(await readingProfileService.GetReadingProfileDtoForLibrary(User.GetUserId(), libraryId)); + } + + /// + /// Creates a new reading profile for the current user + /// + /// + /// + [HttpPost("create")] + public async Task> CreateReadingProfile([FromBody] UserReadingProfileDto dto) + { + return Ok(await readingProfileService.CreateReadingProfile(User.GetUserId(), dto)); + } + + /// + /// Promotes the implicit profile to a user profile. Removes the series from other profiles + /// + /// + /// + [HttpPost("promote")] + public async Task> PromoteImplicitReadingProfile([FromQuery] int profileId) + { + return Ok(await readingProfileService.PromoteImplicitProfile(User.GetUserId(), profileId)); + } + + /// + /// Update the implicit reading profile for a series, creates one if none exists + /// + /// Any modification to the reader settings during reading will create an implicit profile. Use "update-parent" to save to the bound series profile. + /// + /// + /// + [HttpPost("series")] + public async Task> UpdateReadingProfileForSeries([FromBody] UserReadingProfileDto dto, [FromQuery] int seriesId) + { + var updatedProfile = await readingProfileService.UpdateImplicitReadingProfile(User.GetUserId(), seriesId, dto); + return Ok(updatedProfile); + } + + /// + /// Updates the non-implicit reading profile for the given series, and removes implicit profiles + /// + /// + /// + /// + [HttpPost("update-parent")] + public async Task> UpdateParentProfileForSeries([FromBody] UserReadingProfileDto dto, [FromQuery] int seriesId) + { + var newParentProfile = await readingProfileService.UpdateParent(User.GetUserId(), seriesId, dto); + return Ok(newParentProfile); + } + + /// + /// Updates the given reading profile, must belong to the current user + /// + /// + /// The updated reading profile + /// + /// This does not update connected series and libraries. + /// + [HttpPost] + public async Task> UpdateReadingProfile(UserReadingProfileDto dto) + { + return Ok(await readingProfileService.UpdateReadingProfile(User.GetUserId(), dto)); + } + + /// + /// Deletes the given profile, requires the profile to belong to the logged-in user + /// + /// + /// + /// + /// + [HttpDelete] + public async Task DeleteReadingProfile([FromQuery] int profileId) + { + await readingProfileService.DeleteReadingProfile(User.GetUserId(), profileId); + return Ok(); + } + + /// + /// Sets the reading profile for a given series, removes the old one + /// + /// + /// + /// + [HttpPost("series/{seriesId:int}")] + public async Task AddProfileToSeries(int seriesId, [FromQuery] int profileId) + { + await readingProfileService.AddProfileToSeries(User.GetUserId(), profileId, seriesId); + return Ok(); + } + + /// + /// Clears the reading profile for the given series for the currently logged-in user + /// + /// + /// + [HttpDelete("series/{seriesId:int}")] + public async Task ClearSeriesProfile(int seriesId) + { + await readingProfileService.ClearSeriesProfile(User.GetUserId(), seriesId); + return Ok(); + } + + /// + /// Sets the reading profile for a given library, removes the old one + /// + /// + /// + /// + [HttpPost("library/{libraryId:int}")] + public async Task AddProfileToLibrary(int libraryId, [FromQuery] int profileId) + { + await readingProfileService.AddProfileToLibrary(User.GetUserId(), profileId, libraryId); + return Ok(); + } + + /// + /// Clears the reading profile for the given library for the currently logged-in user + /// + /// + /// + /// + [HttpDelete("library/{libraryId:int}")] + public async Task ClearLibraryProfile(int libraryId) + { + await readingProfileService.ClearLibraryProfile(User.GetUserId(), libraryId); + return Ok(); + } + + /// + /// Assigns the reading profile to all passes series, and deletes their implicit profiles + /// + /// + /// + /// + [HttpPost("bulk")] + public async Task BulkAddReadingProfile([FromQuery] int profileId, [FromBody] IList seriesIds) + { + await readingProfileService.BulkAddProfileToSeries(User.GetUserId(), profileId, seriesIds); + return Ok(); + } + +} diff --git a/API/Controllers/ReviewController.cs b/API/Controllers/ReviewController.cs index ae8ce02ee..d4de3db16 100644 --- a/API/Controllers/ReviewController.cs +++ b/API/Controllers/ReviewController.cs @@ -1,8 +1,11 @@ -using System.Linq; +using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using API.Data; using API.Data.Repositories; using API.DTOs.SeriesDetail; +using API.Entities; +using API.Entities.Enums; using API.Extensions; using API.Helpers.Builders; using API.Services.Plus; @@ -30,17 +33,17 @@ public class ReviewController : BaseApiController /// - /// Updates the review for a given series + /// Updates the user's review for a given series /// /// /// - [HttpPost] - public async Task> UpdateReview(UpdateUserReviewDto dto) + [HttpPost("series")] + public async Task> UpdateSeriesReview(UpdateUserReviewDto dto) { var user = await _unitOfWork.UserRepository.GetUserByIdAsync(User.GetUserId(), AppUserIncludes.Ratings); if (user == null) return Unauthorized(); - var ratingBuilder = new RatingBuilder(user.Ratings.FirstOrDefault(r => r.SeriesId == dto.SeriesId)); + var ratingBuilder = new RatingBuilder(await _unitOfWork.UserRepository.GetUserRatingAsync(dto.SeriesId, user.Id)); var rating = ratingBuilder .WithBody(dto.Body) @@ -52,22 +55,58 @@ public class ReviewController : BaseApiController { user.Ratings.Add(rating); } + _unitOfWork.UserRepository.Update(user); await _unitOfWork.CommitAsync(); - BackgroundJob.Enqueue(() => _scrobblingService.ScrobbleReviewUpdate(user.Id, dto.SeriesId, string.Empty, dto.Body)); return Ok(_mapper.Map(rating)); } + /// + /// Update the user's review for a given chapter + /// + /// chapterId must be set + /// + [HttpPost("chapter")] + public async Task> UpdateChapterReview(UpdateUserReviewDto dto) + { + var user = await _unitOfWork.UserRepository.GetUserByIdAsync(User.GetUserId(), AppUserIncludes.ChapterRatings); + if (user == null) return Unauthorized(); + + if (dto.ChapterId == null) return BadRequest(); + + int chapterId = dto.ChapterId.Value; + + var ratingBuilder = new ChapterRatingBuilder(await _unitOfWork.UserRepository.GetUserChapterRatingAsync(user.Id, chapterId)); + + var rating = ratingBuilder + .WithBody(dto.Body) + .WithSeriesId(dto.SeriesId) + .WithChapterId(chapterId) + .Build(); + + if (rating.Id == 0) + { + user.ChapterRatings.Add(rating); + } + + _unitOfWork.UserRepository.Update(user); + + await _unitOfWork.CommitAsync(); + + return Ok(_mapper.Map(rating)); + } + + /// /// Deletes the user's review for the given series /// /// - [HttpDelete] - public async Task DeleteReview(int seriesId) + [HttpDelete("series")] + public async Task DeleteSeriesReview([FromQuery] int seriesId) { var user = await _unitOfWork.UserRepository.GetUserByIdAsync(User.GetUserId(), AppUserIncludes.Ratings); if (user == null) return Unauthorized(); @@ -80,4 +119,23 @@ public class ReviewController : BaseApiController return Ok(); } + + /// + /// Deletes the user's review for the given chapter + /// + /// + [HttpDelete("chapter")] + public async Task DeleteChapterReview([FromQuery] int chapterId) + { + var user = await _unitOfWork.UserRepository.GetUserByIdAsync(User.GetUserId(), AppUserIncludes.ChapterRatings); + if (user == null) return Unauthorized(); + + user.ChapterRatings = user.ChapterRatings.Where(r => r.ChapterId != chapterId).ToList(); + + _unitOfWork.UserRepository.Update(user); + + await _unitOfWork.CommitAsync(); + + return Ok(); + } } diff --git a/API/Controllers/ScrobblingController.cs b/API/Controllers/ScrobblingController.cs index 685f3e2a1..986f4f8e7 100644 --- a/API/Controllers/ScrobblingController.cs +++ b/API/Controllers/ScrobblingController.cs @@ -5,6 +5,7 @@ using System.Threading.Tasks; using API.Data; using API.Data.Repositories; using API.DTOs.Account; +using API.DTOs.KavitaPlus.Account; using API.DTOs.Scrobbling; using API.Entities.Scrobble; using API.Extensions; @@ -53,7 +54,7 @@ public class ScrobblingController : BaseApiController } /// - /// Get the current user's MAL token & username + /// Get the current user's MAL token and username /// /// [HttpGet("mal-token")] @@ -73,9 +74,9 @@ public class ScrobblingController : BaseApiController /// Update the current user's AniList token /// /// - /// + /// True if the token was new or not [HttpPost("update-anilist-token")] - public async Task UpdateAniListToken(AniListUpdateDto dto) + public async Task> UpdateAniListToken(AniListUpdateDto dto) { var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername()); if (user == null) return Unauthorized(); @@ -85,31 +86,39 @@ public class ScrobblingController : BaseApiController _unitOfWork.UserRepository.Update(user); await _unitOfWork.CommitAsync(); - if (isNewToken) - { - BackgroundJob.Enqueue(() => _scrobblingService.CreateEventsFromExistingHistory(user.Id)); - } - - return Ok(); + return Ok(isNewToken); } /// /// Update the current user's MAL token (Client ID) and Username /// /// - /// + /// True if the token was new or not [HttpPost("update-mal-token")] - public async Task UpdateMalToken(MalUserInfoDto dto) + public async Task> UpdateMalToken(MalUserInfoDto dto) { var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername()); if (user == null) return Unauthorized(); + var isNewToken = string.IsNullOrEmpty(user.MalAccessToken); user.MalAccessToken = dto.AccessToken; user.MalUserName = dto.Username; _unitOfWork.UserRepository.Update(user); await _unitOfWork.CommitAsync(); + return Ok(isNewToken); + } + + /// + /// When a user request to generate scrobble events from history. Should only be ran once per user. + /// + /// + [HttpPost("generate-scrobble-events")] + public ActionResult GenerateScrobbleEvents() + { + BackgroundJob.Enqueue(() => _scrobblingService.CreateEventsFromExistingHistory(User.GetUserId())); + return Ok(); } @@ -245,7 +254,7 @@ public class ScrobblingController : BaseApiController } /// - /// Adds a hold against the Series for user's scrobbling + /// Remove a hold against the Series for user's scrobbling /// /// /// @@ -261,4 +270,29 @@ public class ScrobblingController : BaseApiController await _unitOfWork.CommitAsync(); return Ok(); } + + /// + /// Has the logged in user ran scrobble generation + /// + /// + [HttpGet("has-ran-scrobble-gen")] + public async Task> HasRanScrobbleGen() + { + var user = await _unitOfWork.UserRepository.GetUserByIdAsync(User.GetUserId()); + return Ok(user is {HasRunScrobbleEventGeneration: true}); + } + + /// + /// Delete the given scrobble events if they belong to that user + /// + /// + /// + [HttpPost("bulk-remove-events")] + public async Task BulkRemoveScrobbleEvents(IList eventIds) + { + var events = await _unitOfWork.ScrobbleRepository.GetUserEvents(User.GetUserId(), eventIds); + _unitOfWork.ScrobbleRepository.Remove(events); + await _unitOfWork.CommitAsync(); + return Ok(); + } } diff --git a/API/Controllers/SearchController.cs b/API/Controllers/SearchController.cs index 5aa54d1db..cc89a124e 100644 --- a/API/Controllers/SearchController.cs +++ b/API/Controllers/SearchController.cs @@ -63,6 +63,7 @@ public class SearchController : BaseApiController var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername()); if (user == null) return Unauthorized(); + var libraries = _unitOfWork.LibraryRepository.GetLibraryIdsForUserIdAsync(user.Id, QueryContext.Search).ToList(); if (libraries.Count == 0) return BadRequest(await _localizationService.Translate(User.GetUserId(), "libraries-restricted")); diff --git a/API/Controllers/SeriesController.cs b/API/Controllers/SeriesController.cs index 2cf97d9b6..389ff33a7 100644 --- a/API/Controllers/SeriesController.cs +++ b/API/Controllers/SeriesController.cs @@ -9,20 +9,24 @@ using API.DTOs.Dashboard; using API.DTOs.Filtering; using API.DTOs.Filtering.v2; using API.DTOs.Metadata; +using API.DTOs.Metadata.Matching; using API.DTOs.Recommendation; using API.DTOs.SeriesDetail; using API.Entities; using API.Entities.Enums; +using API.Entities.MetadataMatching; using API.Extensions; using API.Helpers; using API.Services; using API.Services.Plus; using EasyCaching.Core; +using Hangfire; using Kavita.Common; using Kavita.Common.Extensions; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http.HttpResults; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; namespace API.Controllers; @@ -38,14 +42,17 @@ public class SeriesController : BaseApiController private readonly ILicenseService _licenseService; private readonly ILocalizationService _localizationService; private readonly IExternalMetadataService _externalMetadataService; + private readonly IHostEnvironment _environment; private readonly IEasyCachingProvider _externalSeriesCacheProvider; + private readonly IEasyCachingProvider _matchSeriesCacheProvider; private const string CacheKey = "externalSeriesData_"; + private const string MatchSeriesCacheKey = "matchSeries_"; public SeriesController(ILogger logger, ITaskScheduler taskScheduler, IUnitOfWork unitOfWork, ISeriesService seriesService, ILicenseService licenseService, IEasyCachingProviderFactory cachingProviderFactory, ILocalizationService localizationService, - IExternalMetadataService externalMetadataService) + IExternalMetadataService externalMetadataService, IHostEnvironment environment) { _logger = logger; _taskScheduler = taskScheduler; @@ -54,8 +61,10 @@ public class SeriesController : BaseApiController _licenseService = licenseService; _localizationService = localizationService; _externalMetadataService = externalMetadataService; + _environment = environment; _externalSeriesCacheProvider = cachingProviderFactory.GetCachingProvider(EasyCacheProfiles.KavitaPlusExternalSeries); + _matchSeriesCacheProvider = cachingProviderFactory.GetCachingProvider(EasyCacheProfiles.KavitaPlusMatchSeries); } /// @@ -91,7 +100,7 @@ public class SeriesController : BaseApiController /// /// [HttpPost("v2")] - public async Task>> GetSeriesForLibraryV2([FromQuery] UserParams userParams, [FromBody] FilterV2Dto filterDto) + public async Task>> GetSeriesForLibraryV2([FromQuery] UserParams userParams, [FromBody] FilterV2Dto filterDto) { var userId = User.GetUserId(); var series = @@ -183,21 +192,6 @@ public class SeriesController : BaseApiController return Ok(await _unitOfWork.ChapterRepository.GetChapterMetadataDtoAsync(chapterId)); } - - /// - /// Update the user rating for the given series - /// - /// - /// - [HttpPost("update-rating")] - public async Task UpdateSeriesRating(UpdateSeriesRatingDto updateSeriesRatingDto) - { - var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername(), AppUserIncludes.Ratings); - if (!await _seriesService.UpdateRating(user!, updateSeriesRatingDto)) - return BadRequest(await _localizationService.Translate(User.GetUserId(), "generic-error")); - return Ok(); - } - /// /// Updates the Series /// @@ -230,7 +224,9 @@ public class SeriesController : BaseApiController // Trigger a refresh when we are moving from a locked image to a non-locked needsRefreshMetadata = true; series.CoverImage = null; - series.CoverImageLocked = updateSeries.CoverImageLocked; + series.CoverImageLocked = false; + series.Metadata.KPlusOverrides.Remove(MetadataSettingField.Covers); + _logger.LogDebug("[SeriesCoverImageBug] Setting Series Cover Image to null: {SeriesId}", series.Id); series.ResetColorScape(); } @@ -316,7 +312,7 @@ public class SeriesController : BaseApiController /// /// /// - /// + /// This is not in use /// [HttpPost("all-v2")] public async Task>> GetAllSeriesV2(FilterV2Dto filterDto, [FromQuery] UserParams userParams, @@ -327,8 +323,6 @@ public class SeriesController : BaseApiController await _unitOfWork.SeriesRepository.GetSeriesDtoForLibraryIdV2Async(userId, userParams, filterDto, context); // Apply progress/rating information (I can't work out how to do this in initial query) - if (series == null) return BadRequest(await _localizationService.Translate(User.GetUserId(), "no-series")); - await _unitOfWork.SeriesRepository.AddSeriesModifiers(userId, series); Response.AddPaginationHeader(series.CurrentPage, series.PageSize, series.TotalCount, series.TotalPages); @@ -500,7 +494,7 @@ public class SeriesController : BaseApiController /// /// /// This is cached for an hour - [ResponseCache(CacheProfileName = "Month", VaryByQueryKeys = new [] {"ageRating"})] + [ResponseCache(CacheProfileName = "Month", VaryByQueryKeys = ["ageRating"])] [HttpGet("age-rating")] public async Task> GetAgeRating(int ageRating) { @@ -616,4 +610,52 @@ public class SeriesController : BaseApiController return Ok(await _seriesService.GetEstimatedChapterCreationDate(seriesId, userId)); } + /// + /// Sends a request to Kavita+ API for all potential matches, sorted by relevance + /// + /// + /// + [HttpPost("match")] + public async Task>> MatchSeries(MatchSeriesDto dto) + { + var cacheKey = $"{MatchSeriesCacheKey}-{dto.SeriesId}-{dto.Query}"; + var results = await _matchSeriesCacheProvider.GetAsync>(cacheKey); + if (results.HasValue && !_environment.IsDevelopment()) + { + return Ok(results.Value); + } + + var ret = await _externalMetadataService.MatchSeries(dto); + await _matchSeriesCacheProvider.SetAsync(cacheKey, ret, TimeSpan.FromMinutes(1)); + + return Ok(ret); + } + + /// + /// This will perform the fix match + /// + /// + /// + /// + [HttpPost("update-match")] + public ActionResult UpdateSeriesMatch([FromQuery] int seriesId, [FromQuery] int? aniListId, [FromQuery] long? malId, [FromQuery] int? cbrId) + { + BackgroundJob.Enqueue(() => _externalMetadataService.FixSeriesMatch(seriesId, aniListId, malId, cbrId)); + + return Ok(); + } + + /// + /// When true, will not perform a match and will prevent Kavita from attempting to match/scrobble against this series + /// + /// + /// + /// + [HttpPost("dont-match")] + public async Task UpdateDontMatch([FromQuery] int seriesId, [FromQuery] bool dontMatch) + { + await _externalMetadataService.UpdateSeriesDontMatch(seriesId, dontMatch); + return Ok(); + } + } diff --git a/API/Controllers/ServerController.cs b/API/Controllers/ServerController.cs index 8d95d4c23..79f6391e8 100644 --- a/API/Controllers/ServerController.cs +++ b/API/Controllers/ServerController.cs @@ -203,25 +203,27 @@ public class ServerController : BaseApiController /// /// Returns how many versions out of date this install is /// + /// Only count Stable releases [HttpGet("check-out-of-date")] - public async Task> CheckHowOutOfDate() + public async Task> CheckHowOutOfDate(bool stableOnly = true) { - return Ok(await _versionUpdaterService.GetNumberOfReleasesBehind()); + return Ok(await _versionUpdaterService.GetNumberOfReleasesBehind(stableOnly)); } /// /// Pull the Changelog for Kavita from Github and display /// + /// How many releases from the latest to return /// [AllowAnonymous] [HttpGet("changelog")] - public async Task>> GetChangelog() + public async Task>> GetChangelog(int count = 0) { // Strange bug where [Authorize] doesn't work if (User.GetUserId() == 0) return Unauthorized(); - return Ok(await _versionUpdaterService.GetAllReleases()); + return Ok(await _versionUpdaterService.GetAllReleases(count)); } /// diff --git a/API/Controllers/SettingsController.cs b/API/Controllers/SettingsController.cs index e88432c1e..0610c8705 100644 --- a/API/Controllers/SettingsController.cs +++ b/API/Controllers/SettingsController.cs @@ -5,6 +5,7 @@ using System.Net; using System.Threading.Tasks; using API.Data; using API.DTOs.Email; +using API.DTOs.KavitaPlus.Metadata; using API.DTOs.Settings; using API.Entities; using API.Entities.Enums; @@ -33,27 +34,26 @@ public class SettingsController : BaseApiController { private readonly ILogger _logger; private readonly IUnitOfWork _unitOfWork; - private readonly ITaskScheduler _taskScheduler; - private readonly IDirectoryService _directoryService; private readonly IMapper _mapper; private readonly IEmailService _emailService; - private readonly ILibraryWatcher _libraryWatcher; private readonly ILocalizationService _localizationService; + private readonly ISettingsService _settingsService; - public SettingsController(ILogger logger, IUnitOfWork unitOfWork, ITaskScheduler taskScheduler, - IDirectoryService directoryService, IMapper mapper, IEmailService emailService, ILibraryWatcher libraryWatcher, - ILocalizationService localizationService) + public SettingsController(ILogger logger, IUnitOfWork unitOfWork, IMapper mapper, + IEmailService emailService, ILocalizationService localizationService, ISettingsService settingsService) { _logger = logger; _unitOfWork = unitOfWork; - _taskScheduler = taskScheduler; - _directoryService = directoryService; _mapper = mapper; _emailService = emailService; - _libraryWatcher = libraryWatcher; _localizationService = localizationService; + _settingsService = settingsService; } + /// + /// Returns the base url for this instance (if set) + /// + /// [HttpGet("base-url")] public async Task> GetBaseUrl() { @@ -138,347 +138,33 @@ public class SettingsController : BaseApiController } - + /// + /// Update Server settings + /// + /// + /// [Authorize(Policy = "RequireAdminRole")] [HttpPost] public async Task> UpdateSettings(ServerSettingDto updateSettingsDto) { _logger.LogInformation("{UserName} is updating Server Settings", User.GetUsername()); - // We do not allow CacheDirectory changes, so we will ignore. - var currentSettings = await _unitOfWork.SettingsRepository.GetSettingsAsync(); - var updateBookmarks = false; - var originalBookmarkDirectory = _directoryService.BookmarkDirectory; - - var bookmarkDirectory = updateSettingsDto.BookmarksDirectory; - if (!updateSettingsDto.BookmarksDirectory.EndsWith("bookmarks") && - !updateSettingsDto.BookmarksDirectory.EndsWith("bookmarks/")) - { - bookmarkDirectory = - _directoryService.FileSystem.Path.Join(updateSettingsDto.BookmarksDirectory, "bookmarks"); - } - - if (string.IsNullOrEmpty(updateSettingsDto.BookmarksDirectory)) - { - bookmarkDirectory = _directoryService.BookmarkDirectory; - } - - var updateTask = false; - foreach (var setting in currentSettings) - { - if (setting.Key == ServerSettingKey.OnDeckProgressDays && - updateSettingsDto.OnDeckProgressDays + string.Empty != setting.Value) - { - setting.Value = updateSettingsDto.OnDeckProgressDays + string.Empty; - _unitOfWork.SettingsRepository.Update(setting); - } - - if (setting.Key == ServerSettingKey.OnDeckUpdateDays && - updateSettingsDto.OnDeckUpdateDays + string.Empty != setting.Value) - { - setting.Value = updateSettingsDto.OnDeckUpdateDays + string.Empty; - _unitOfWork.SettingsRepository.Update(setting); - } - - if (setting.Key == ServerSettingKey.Port && updateSettingsDto.Port + string.Empty != setting.Value) - { - if (OsInfo.IsDocker) continue; - setting.Value = updateSettingsDto.Port + string.Empty; - // Port is managed in appSetting.json - Configuration.Port = updateSettingsDto.Port; - _unitOfWork.SettingsRepository.Update(setting); - } - - if (setting.Key == ServerSettingKey.CacheSize && - updateSettingsDto.CacheSize + string.Empty != setting.Value) - { - setting.Value = updateSettingsDto.CacheSize + string.Empty; - // CacheSize is managed in appSetting.json - Configuration.CacheSize = updateSettingsDto.CacheSize; - _unitOfWork.SettingsRepository.Update(setting); - } - - updateTask = updateTask || UpdateSchedulingSettings(setting, updateSettingsDto); - - UpdateEmailSettings(setting, updateSettingsDto); - - - - if (setting.Key == ServerSettingKey.IpAddresses && updateSettingsDto.IpAddresses != setting.Value) - { - if (OsInfo.IsDocker) continue; - // Validate IP addresses - foreach (var ipAddress in updateSettingsDto.IpAddresses.Split(',', - StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)) - { - if (!IPAddress.TryParse(ipAddress.Trim(), out _)) - { - return BadRequest(await _localizationService.Translate(User.GetUserId(), "ip-address-invalid", - ipAddress)); - } - } - - setting.Value = updateSettingsDto.IpAddresses; - // IpAddresses is managed in appSetting.json - Configuration.IpAddresses = updateSettingsDto.IpAddresses; - _unitOfWork.SettingsRepository.Update(setting); - } - - if (setting.Key == ServerSettingKey.BaseUrl && updateSettingsDto.BaseUrl + string.Empty != setting.Value) - { - var path = !updateSettingsDto.BaseUrl.StartsWith('/') - ? $"/{updateSettingsDto.BaseUrl}" - : updateSettingsDto.BaseUrl; - path = !path.EndsWith('/') - ? $"{path}/" - : path; - setting.Value = path; - Configuration.BaseUrl = updateSettingsDto.BaseUrl; - _unitOfWork.SettingsRepository.Update(setting); - } - - if (setting.Key == ServerSettingKey.LoggingLevel && - updateSettingsDto.LoggingLevel + string.Empty != setting.Value) - { - setting.Value = updateSettingsDto.LoggingLevel + string.Empty; - LogLevelOptions.SwitchLogLevel(updateSettingsDto.LoggingLevel); - _unitOfWork.SettingsRepository.Update(setting); - } - - if (setting.Key == ServerSettingKey.EnableOpds && - updateSettingsDto.EnableOpds + string.Empty != setting.Value) - { - setting.Value = updateSettingsDto.EnableOpds + string.Empty; - _unitOfWork.SettingsRepository.Update(setting); - } - - if (setting.Key == ServerSettingKey.EncodeMediaAs && - ((int)updateSettingsDto.EncodeMediaAs).ToString() != setting.Value) - { - setting.Value = ((int)updateSettingsDto.EncodeMediaAs).ToString(); - _unitOfWork.SettingsRepository.Update(setting); - } - - if (setting.Key == ServerSettingKey.CoverImageSize && - ((int)updateSettingsDto.CoverImageSize).ToString() != setting.Value) - { - setting.Value = ((int)updateSettingsDto.CoverImageSize).ToString(); - _unitOfWork.SettingsRepository.Update(setting); - } - - if (setting.Key == ServerSettingKey.HostName && updateSettingsDto.HostName + string.Empty != setting.Value) - { - setting.Value = (updateSettingsDto.HostName + string.Empty).Trim(); - setting.Value = UrlHelper.RemoveEndingSlash(setting.Value); - _unitOfWork.SettingsRepository.Update(setting); - } - - if (setting.Key == ServerSettingKey.BookmarkDirectory && bookmarkDirectory != setting.Value) - { - // Validate new directory can be used - if (!await _directoryService.CheckWriteAccess(bookmarkDirectory)) - { - return BadRequest( - await _localizationService.Translate(User.GetUserId(), "bookmark-dir-permissions")); - } - - originalBookmarkDirectory = setting.Value; - // Normalize the path deliminators. Just to look nice in DB, no functionality - setting.Value = _directoryService.FileSystem.Path.GetFullPath(bookmarkDirectory); - _unitOfWork.SettingsRepository.Update(setting); - updateBookmarks = true; - - } - - if (setting.Key == ServerSettingKey.AllowStatCollection && - updateSettingsDto.AllowStatCollection + string.Empty != setting.Value) - { - setting.Value = updateSettingsDto.AllowStatCollection + string.Empty; - _unitOfWork.SettingsRepository.Update(setting); - } - - if (setting.Key == ServerSettingKey.TotalBackups && - updateSettingsDto.TotalBackups + string.Empty != setting.Value) - { - if (updateSettingsDto.TotalBackups > 30 || updateSettingsDto.TotalBackups < 1) - { - return BadRequest(await _localizationService.Translate(User.GetUserId(), "total-backups")); - } - - setting.Value = updateSettingsDto.TotalBackups + string.Empty; - _unitOfWork.SettingsRepository.Update(setting); - } - - if (setting.Key == ServerSettingKey.TotalLogs && - updateSettingsDto.TotalLogs + string.Empty != setting.Value) - { - if (updateSettingsDto.TotalLogs > 30 || updateSettingsDto.TotalLogs < 1) - { - return BadRequest(await _localizationService.Translate(User.GetUserId(), "total-logs")); - } - - setting.Value = updateSettingsDto.TotalLogs + string.Empty; - _unitOfWork.SettingsRepository.Update(setting); - } - - if (setting.Key == ServerSettingKey.EnableFolderWatching && - updateSettingsDto.EnableFolderWatching + string.Empty != setting.Value) - { - setting.Value = updateSettingsDto.EnableFolderWatching + string.Empty; - _unitOfWork.SettingsRepository.Update(setting); - } - } - - if (!_unitOfWork.HasChanges()) return Ok(updateSettingsDto); - try { - await _unitOfWork.CommitAsync(); - - if (!updateSettingsDto.AllowStatCollection) - { - _taskScheduler.CancelStatsTasks(); - } - else - { - await _taskScheduler.ScheduleStatsTasks(); - } - - if (updateBookmarks) - { - UpdateBookmarkDirectory(originalBookmarkDirectory, bookmarkDirectory); - } - - if (updateTask) - { - BackgroundJob.Enqueue(() => _taskScheduler.ScheduleTasks()); - } - - if (updateSettingsDto.EnableFolderWatching) - { - BackgroundJob.Enqueue(() => _libraryWatcher.StartWatching()); - } - else - { - BackgroundJob.Enqueue(() => _libraryWatcher.StopWatching()); - } + var d = await _settingsService.UpdateSettings(updateSettingsDto); + return Ok(d); + } + catch (KavitaException ex) + { + return BadRequest(await _localizationService.Translate(User.GetUserId(), ex.Message)); } catch (Exception ex) { _logger.LogError(ex, "There was an exception when updating server settings"); - await _unitOfWork.RollbackAsync(); return BadRequest(await _localizationService.Translate(User.GetUserId(), "generic-error")); } - - - _logger.LogInformation("Server Settings updated"); - BackgroundJob.Enqueue(() => _taskScheduler.ScheduleTasks()); - - return Ok(updateSettingsDto); } - - private void UpdateBookmarkDirectory(string originalBookmarkDirectory, string bookmarkDirectory) - { - _directoryService.ExistOrCreate(bookmarkDirectory); - _directoryService.CopyDirectoryToDirectory(originalBookmarkDirectory, bookmarkDirectory); - _directoryService.ClearAndDeleteDirectory(originalBookmarkDirectory); - } - - private bool UpdateSchedulingSettings(ServerSetting setting, ServerSettingDto updateSettingsDto) - { - if (setting.Key == ServerSettingKey.TaskBackup && updateSettingsDto.TaskBackup != setting.Value) - { - //if (updateSettingsDto.TotalBackup) - setting.Value = updateSettingsDto.TaskBackup; - _unitOfWork.SettingsRepository.Update(setting); - - return true; - } - - if (setting.Key == ServerSettingKey.TaskScan && updateSettingsDto.TaskScan != setting.Value) - { - setting.Value = updateSettingsDto.TaskScan; - _unitOfWork.SettingsRepository.Update(setting); - return true; - } - - if (setting.Key == ServerSettingKey.TaskCleanup && updateSettingsDto.TaskCleanup != setting.Value) - { - setting.Value = updateSettingsDto.TaskCleanup; - _unitOfWork.SettingsRepository.Update(setting); - return true; - } - return false; - } - - private void UpdateEmailSettings(ServerSetting setting, ServerSettingDto updateSettingsDto) - { - if (setting.Key == ServerSettingKey.EmailHost && - updateSettingsDto.SmtpConfig.Host + string.Empty != setting.Value) - { - setting.Value = updateSettingsDto.SmtpConfig.Host + string.Empty; - _unitOfWork.SettingsRepository.Update(setting); - } - - if (setting.Key == ServerSettingKey.EmailPort && - updateSettingsDto.SmtpConfig.Port + string.Empty != setting.Value) - { - setting.Value = updateSettingsDto.SmtpConfig.Port + string.Empty; - _unitOfWork.SettingsRepository.Update(setting); - } - - if (setting.Key == ServerSettingKey.EmailAuthPassword && - updateSettingsDto.SmtpConfig.Password + string.Empty != setting.Value) - { - setting.Value = updateSettingsDto.SmtpConfig.Password + string.Empty; - _unitOfWork.SettingsRepository.Update(setting); - } - - if (setting.Key == ServerSettingKey.EmailAuthUserName && - updateSettingsDto.SmtpConfig.UserName + string.Empty != setting.Value) - { - setting.Value = updateSettingsDto.SmtpConfig.UserName + string.Empty; - _unitOfWork.SettingsRepository.Update(setting); - } - - if (setting.Key == ServerSettingKey.EmailSenderAddress && - updateSettingsDto.SmtpConfig.SenderAddress + string.Empty != setting.Value) - { - setting.Value = updateSettingsDto.SmtpConfig.SenderAddress + string.Empty; - _unitOfWork.SettingsRepository.Update(setting); - } - - if (setting.Key == ServerSettingKey.EmailSenderDisplayName && - updateSettingsDto.SmtpConfig.SenderDisplayName + string.Empty != setting.Value) - { - setting.Value = updateSettingsDto.SmtpConfig.SenderDisplayName + string.Empty; - _unitOfWork.SettingsRepository.Update(setting); - } - - if (setting.Key == ServerSettingKey.EmailSizeLimit && - updateSettingsDto.SmtpConfig.SizeLimit + string.Empty != setting.Value) - { - setting.Value = updateSettingsDto.SmtpConfig.SizeLimit + string.Empty; - _unitOfWork.SettingsRepository.Update(setting); - } - - if (setting.Key == ServerSettingKey.EmailEnableSsl && - updateSettingsDto.SmtpConfig.EnableSsl + string.Empty != setting.Value) - { - setting.Value = updateSettingsDto.SmtpConfig.EnableSsl + string.Empty; - _unitOfWork.SettingsRepository.Update(setting); - } - - if (setting.Key == ServerSettingKey.EmailCustomizedTemplates && - updateSettingsDto.SmtpConfig.CustomizedTemplates + string.Empty != setting.Value) - { - setting.Value = updateSettingsDto.SmtpConfig.CustomizedTemplates + string.Empty; - _unitOfWork.SettingsRepository.Update(setting); - } - } - - /// /// All values allowed for Task Scheduling APIs. A custom cron job is not included. Disabled is not applicable for Cleanup. /// @@ -535,4 +221,36 @@ public class SettingsController : BaseApiController if (string.IsNullOrEmpty(user?.Email)) return BadRequest("Your account has no email on record. Cannot email."); return Ok(await _emailService.SendTestEmail(user!.Email)); } + + /// + /// Get the metadata settings for Kavita+ users. + /// + /// + [Authorize(Policy = "RequireAdminRole")] + [HttpGet("metadata-settings")] + public async Task> GetMetadataSettings() + { + return Ok(await _unitOfWork.SettingsRepository.GetMetadataSettingDto()); + + } + + /// + /// Update the metadata settings for Kavita+ Metadata feature + /// + /// + /// + [Authorize(Policy = "RequireAdminRole")] + [HttpPost("metadata-settings")] + public async Task> UpdateMetadataSettings(MetadataSettingsDto dto) + { + try + { + return Ok(await _settingsService.UpdateMetadataSettings(dto)); + } + catch (Exception ex) + { + _logger.LogError(ex, "There was an issue when updating metadata settings"); + return BadRequest(ex.Message); + } + } } diff --git a/API/Controllers/StatsController.cs b/API/Controllers/StatsController.cs index 87080312a..383905edd 100644 --- a/API/Controllers/StatsController.cs +++ b/API/Controllers/StatsController.cs @@ -222,18 +222,4 @@ public class StatsController : BaseApiController return Ok(_statService.GetWordsReadCountByYear(userId)); } - /// - /// Returns for Kavita+ the number of Series that have been processed, errored, and not processed - /// - /// - [Authorize("RequireAdminRole")] - [HttpGet("kavitaplus-metadata-breakdown")] - [ResponseCache(CacheProfileName = "Statistics")] - public async Task>>> GetKavitaPlusMetadataBreakdown() - { - if (!await _licenseService.HasActiveLicense()) - return BadRequest("This data is not available for non-Kavita+ servers"); - return Ok(await _statService.GetKavitaPlusMetadataBreakdown()); - } - } diff --git a/API/Controllers/StreamController.cs b/API/Controllers/StreamController.cs index a694d5b34..049885e78 100644 --- a/API/Controllers/StreamController.cs +++ b/API/Controllers/StreamController.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Threading.Tasks; +using API.Constants; using API.Data; using API.DTOs.Dashboard; using API.DTOs.SideNav; @@ -19,11 +20,13 @@ public class StreamController : BaseApiController { private readonly IStreamService _streamService; private readonly IUnitOfWork _unitOfWork; + private readonly ILocalizationService _localizationService; - public StreamController(IStreamService streamService, IUnitOfWork unitOfWork) + public StreamController(IStreamService streamService, IUnitOfWork unitOfWork, ILocalizationService localizationService) { _streamService = streamService; _unitOfWork = unitOfWork; + _localizationService = localizationService; } /// @@ -74,6 +77,7 @@ public class StreamController : BaseApiController [HttpPost("update-external-source")] public async Task> UpdateExternalSource(ExternalSourceDto dto) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); // Check if a host and api key exists for the current user return Ok(await _streamService.UpdateExternalSource(User.GetUserId(), dto)); } @@ -86,7 +90,8 @@ public class StreamController : BaseApiController [HttpGet("external-source-exists")] public async Task> ExternalSourceExists(string host, string name, string apiKey) { - return Ok(await _unitOfWork.AppUserExternalSourceRepository.ExternalSourceExists(User.GetUserId(), host, name, apiKey)); + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); + return Ok(await _unitOfWork.AppUserExternalSourceRepository.ExternalSourceExists(User.GetUserId(), name, host, apiKey)); } /// @@ -97,6 +102,7 @@ public class StreamController : BaseApiController [HttpDelete("delete-external-source")] public async Task ExternalSourceExists(int externalSourceId) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); await _streamService.DeleteExternalSource(User.GetUserId(), externalSourceId); return Ok(); } @@ -110,6 +116,7 @@ public class StreamController : BaseApiController [HttpPost("add-dashboard-stream")] public async Task> AddDashboard([FromQuery] int smartFilterId) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); return Ok(await _streamService.CreateDashboardStreamFromSmartFilter(User.GetUserId(), smartFilterId)); } @@ -121,6 +128,7 @@ public class StreamController : BaseApiController [HttpPost("update-dashboard-stream")] public async Task UpdateDashboardStream(DashboardStreamDto dto) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); await _streamService.UpdateDashboardStream(User.GetUserId(), dto); return Ok(); } @@ -133,6 +141,7 @@ public class StreamController : BaseApiController [HttpPost("update-dashboard-position")] public async Task UpdateDashboardStreamPosition(UpdateStreamPositionDto dto) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); await _streamService.UpdateDashboardStreamPosition(User.GetUserId(), dto); return Ok(); } @@ -146,6 +155,7 @@ public class StreamController : BaseApiController [HttpPost("add-sidenav-stream")] public async Task> AddSideNav([FromQuery] int smartFilterId) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); return Ok(await _streamService.CreateSideNavStreamFromSmartFilter(User.GetUserId(), smartFilterId)); } @@ -157,6 +167,7 @@ public class StreamController : BaseApiController [HttpPost("add-sidenav-stream-from-external-source")] public async Task> AddSideNavFromExternalSource([FromQuery] int externalSourceId) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); return Ok(await _streamService.CreateSideNavStreamFromExternalSource(User.GetUserId(), externalSourceId)); } @@ -168,6 +179,7 @@ public class StreamController : BaseApiController [HttpPost("update-sidenav-stream")] public async Task UpdateSideNavStream(SideNavStreamDto dto) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); await _streamService.UpdateSideNavStream(User.GetUserId(), dto); return Ok(); } @@ -180,6 +192,7 @@ public class StreamController : BaseApiController [HttpPost("update-sidenav-position")] public async Task UpdateSideNavStreamPosition(UpdateStreamPositionDto dto) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); await _streamService.UpdateSideNavStreamPosition(User.GetUserId(), dto); return Ok(); } @@ -187,7 +200,34 @@ public class StreamController : BaseApiController [HttpPost("bulk-sidenav-stream-visibility")] public async Task BulkUpdateSideNavStream(BulkUpdateSideNavStreamVisibilityDto dto) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); await _streamService.UpdateSideNavStreamBulk(User.GetUserId(), dto); return Ok(); } + + /// + /// Removes a Smart Filter from a user's SideNav Streams + /// + /// + /// + [HttpDelete("smart-filter-side-nav-stream")] + public async Task DeleteSmartFilterSideNavStream([FromQuery] int sideNavStreamId) + { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); + await _streamService.DeleteSideNavSmartFilterStream(User.GetUserId(), sideNavStreamId); + return Ok(); + } + + /// + /// Removes a Smart Filter from a user's Dashboard Streams + /// + /// + /// + [HttpDelete("smart-filter-dashboard-stream")] + public async Task DeleteSmartFilterDashboardStream([FromQuery] int dashboardStreamId) + { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); + await _streamService.DeleteDashboardSmartFilterStream(User.GetUserId(), dashboardStreamId); + return Ok(); + } } diff --git a/API/Controllers/ThemeController.cs b/API/Controllers/ThemeController.cs index fb9371919..9e4cee20c 100644 --- a/API/Controllers/ThemeController.cs +++ b/API/Controllers/ThemeController.cs @@ -103,7 +103,7 @@ public class ThemeController : BaseApiController [HttpDelete] public async Task>> DeleteTheme(int themeId) { - + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); await _themeService.DeleteTheme(themeId); return Ok(); @@ -128,6 +128,8 @@ public class ThemeController : BaseApiController [HttpPost("upload-theme")] public async Task> DownloadTheme(IFormFile formFile) { + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); + if (!formFile.FileName.EndsWith(".css")) return BadRequest("Invalid file"); if (formFile.FileName.Contains("..")) return BadRequest("Invalid file"); var tempFile = await UploadToTemp(formFile); diff --git a/API/Controllers/UploadController.cs b/API/Controllers/UploadController.cs index 6fee371bb..9652ba494 100644 --- a/API/Controllers/UploadController.cs +++ b/API/Controllers/UploadController.cs @@ -6,8 +6,10 @@ using API.Data; using API.Data.Repositories; using API.DTOs.Uploads; using API.Entities.Enums; +using API.Entities.MetadataMatching; using API.Extensions; using API.Services; +using API.Services.Tasks.Metadata; using API.SignalR; using Flurl.Http; using Microsoft.AspNetCore.Authorization; @@ -31,11 +33,12 @@ public class UploadController : BaseApiController private readonly IEventHub _eventHub; private readonly IReadingListService _readingListService; private readonly ILocalizationService _localizationService; + private readonly ICoverDbService _coverDbService; /// public UploadController(IUnitOfWork unitOfWork, IImageService imageService, ILogger logger, ITaskScheduler taskScheduler, IDirectoryService directoryService, IEventHub eventHub, IReadingListService readingListService, - ILocalizationService localizationService) + ILocalizationService localizationService, ICoverDbService coverDbService) { _unitOfWork = unitOfWork; _imageService = imageService; @@ -45,6 +48,7 @@ public class UploadController : BaseApiController _eventHub = eventHub; _readingListService = readingListService; _localizationService = localizationService; + _coverDbService = coverDbService; } /// @@ -107,13 +111,12 @@ public class UploadController : BaseApiController lockState = uploadFileDto.LockCover; } - if (!string.IsNullOrEmpty(filePath)) - { - series.CoverImage = filePath; - series.CoverImageLocked = lockState; - _imageService.UpdateColorScape(series); - _unitOfWork.SeriesRepository.Update(series); - } + series.CoverImage = filePath; + series.CoverImageLocked = lockState; + series.Metadata.KPlusOverrides.Remove(MetadataSettingField.Covers); + _imageService.UpdateColorScape(series); + _unitOfWork.SeriesRepository.Update(series); + _unitOfWork.SeriesRepository.Update(series.Metadata); if (_unitOfWork.HasChanges()) { @@ -277,6 +280,7 @@ public class UploadController : BaseApiController chapter.CoverImage = filePath; chapter.CoverImageLocked = lockState; + chapter.KPlusOverrides.Remove(MetadataSettingField.ChapterCovers); _unitOfWork.ChapterRepository.Update(chapter); var volume = await _unitOfWork.VolumeRepository.GetVolumeAsync(chapter.VolumeId); if (volume != null) @@ -495,34 +499,8 @@ public class UploadController : BaseApiController var person = await _unitOfWork.PersonRepository.GetPersonById(uploadFileDto.Id); if (person == null) return BadRequest(await _localizationService.Translate(User.GetUserId(), "person-doesnt-exist")); - if (!string.IsNullOrEmpty(uploadFileDto.Url)) - { - var filePath = await CreateThumbnail(uploadFileDto, $"{ImageService.GetPersonFormat(uploadFileDto.Id)}"); - - if (!string.IsNullOrEmpty(filePath)) - { - person.CoverImage = filePath; - person.CoverImageLocked = true; - _imageService.UpdateColorScape(person); - _unitOfWork.PersonRepository.Update(person); - } - } - else - { - person.CoverImage = string.Empty; - person.CoverImageLocked = false; - _imageService.UpdateColorScape(person); - _unitOfWork.PersonRepository.Update(person); - } - - if (_unitOfWork.HasChanges()) - { - await _unitOfWork.CommitAsync(); - await _eventHub.SendMessageAsync(MessageFactory.CoverUpdate, - MessageFactory.CoverUpdateEvent(person.Id, MessageFactoryEntityTypes.Person), false); - return Ok(); - } - + await _coverDbService.SetPersonCoverByUrl(person, uploadFileDto.Url, true); + return Ok(); } catch (Exception e) { diff --git a/API/Controllers/UsersController.cs b/API/Controllers/UsersController.cs index 26039d700..17ebc758e 100644 --- a/API/Controllers/UsersController.cs +++ b/API/Controllers/UsersController.cs @@ -1,11 +1,14 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using API.Constants; using API.Data; using API.Data.Repositories; using API.DTOs; +using API.DTOs.KavitaPlus.Account; using API.Extensions; using API.Services; +using API.Services.Plus; using API.SignalR; using AutoMapper; using Microsoft.AspNetCore.Authorization; @@ -22,14 +25,16 @@ public class UsersController : BaseApiController private readonly IMapper _mapper; private readonly IEventHub _eventHub; private readonly ILocalizationService _localizationService; + private readonly ILicenseService _licenseService; public UsersController(IUnitOfWork unitOfWork, IMapper mapper, IEventHub eventHub, - ILocalizationService localizationService) + ILocalizationService localizationService, ILicenseService licenseService) { _unitOfWork = unitOfWork; _mapper = mapper; _eventHub = eventHub; _localizationService = localizationService; + _licenseService = licenseService; } [Authorize(Policy = "RequireAdminRole")] @@ -82,45 +87,36 @@ public class UsersController : BaseApiController return Ok(libs.Any(x => x.Id == libraryId)); } + /// + /// Update the user preferences + /// + /// If the user has ReadOnly role, they will not be able to perform this action + /// + /// [HttpPost("update-preferences")] public async Task> UpdatePreferences(UserPreferencesDto preferencesDto) { var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername(), AppUserIncludes.UserPreferences); if (user == null) return Unauthorized(); + if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied")); + var existingPreferences = user!.UserPreferences; - existingPreferences.ReadingDirection = preferencesDto.ReadingDirection; - existingPreferences.ScalingOption = preferencesDto.ScalingOption; - existingPreferences.PageSplitOption = preferencesDto.PageSplitOption; - existingPreferences.AutoCloseMenu = preferencesDto.AutoCloseMenu; - existingPreferences.ShowScreenHints = preferencesDto.ShowScreenHints; - existingPreferences.EmulateBook = preferencesDto.EmulateBook; - existingPreferences.ReaderMode = preferencesDto.ReaderMode; - existingPreferences.LayoutMode = preferencesDto.LayoutMode; - existingPreferences.BackgroundColor = string.IsNullOrEmpty(preferencesDto.BackgroundColor) ? "#000000" : preferencesDto.BackgroundColor; - existingPreferences.BookReaderMargin = preferencesDto.BookReaderMargin; - existingPreferences.BookReaderLineSpacing = preferencesDto.BookReaderLineSpacing; - existingPreferences.BookReaderFontFamily = preferencesDto.BookReaderFontFamily; - existingPreferences.BookReaderFontSize = preferencesDto.BookReaderFontSize; - existingPreferences.BookReaderTapToPaginate = preferencesDto.BookReaderTapToPaginate; - existingPreferences.BookReaderReadingDirection = preferencesDto.BookReaderReadingDirection; - existingPreferences.BookReaderWritingStyle = preferencesDto.BookReaderWritingStyle; - existingPreferences.BookThemeName = preferencesDto.BookReaderThemeName; - existingPreferences.BookReaderLayoutMode = preferencesDto.BookReaderLayoutMode; - existingPreferences.BookReaderImmersiveMode = preferencesDto.BookReaderImmersiveMode; existingPreferences.GlobalPageLayoutMode = preferencesDto.GlobalPageLayoutMode; existingPreferences.BlurUnreadSummaries = preferencesDto.BlurUnreadSummaries; - existingPreferences.LayoutMode = preferencesDto.LayoutMode; existingPreferences.PromptForDownloadSize = preferencesDto.PromptForDownloadSize; existingPreferences.NoTransitions = preferencesDto.NoTransitions; - existingPreferences.SwipeToPaginate = preferencesDto.SwipeToPaginate; existingPreferences.CollapseSeriesRelationships = preferencesDto.CollapseSeriesRelationships; existingPreferences.ShareReviews = preferencesDto.ShareReviews; - existingPreferences.PdfTheme = preferencesDto.PdfTheme; - existingPreferences.PdfScrollMode = preferencesDto.PdfScrollMode; - existingPreferences.PdfSpreadMode = preferencesDto.PdfSpreadMode; + if (await _licenseService.HasActiveLicense()) + { + existingPreferences.AniListScrobblingEnabled = preferencesDto.AniListScrobblingEnabled; + existingPreferences.WantToReadSync = preferencesDto.WantToReadSync; + } + + if (preferencesDto.Theme != null && existingPreferences.Theme.Id != preferencesDto.Theme?.Id) { @@ -129,11 +125,12 @@ public class UsersController : BaseApiController } - if (_localizationService.GetLocales().Contains(preferencesDto.Locale)) + if (_localizationService.GetLocales().Select(l => l.FileName).Contains(preferencesDto.Locale)) { existingPreferences.Locale = preferencesDto.Locale; } + _unitOfWork.UserRepository.Update(existingPreferences); if (!await _unitOfWork.CommitAsync()) return BadRequest(await _localizationService.Translate(User.GetUserId(), "generic-user-pref")); @@ -164,4 +161,18 @@ public class UsersController : BaseApiController { return Ok((await _unitOfWork.UserRepository.GetAllUsersAsync()).Select(u => u.UserName)); } + + /// + /// Returns all users with tokens registered and their token information. Does not send the tokens. + /// + /// Kavita+ only + /// + [Authorize(Policy = "RequireAdminRole")] + [HttpGet("tokens")] + public async Task>> GetUserTokens() + { + if (!await _licenseService.HasActiveLicense()) return BadRequest(_localizationService.Translate(User.GetUserId(), "kavitaplus-restricted")); + + return Ok((await _unitOfWork.UserRepository.GetUserTokenInfo())); + } } diff --git a/API/Controllers/VolumeController.cs b/API/Controllers/VolumeController.cs index 5d23336b4..db1381d9d 100644 --- a/API/Controllers/VolumeController.cs +++ b/API/Controllers/VolumeController.cs @@ -1,4 +1,6 @@ -using System.Threading.Tasks; +using System.Linq; +using System.Threading.Tasks; +using API.Constants; using API.Data; using API.Data.Repositories; using API.DTOs; @@ -9,6 +11,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; namespace API.Controllers; +#nullable enable public class VolumeController : BaseApiController { @@ -23,13 +26,15 @@ public class VolumeController : BaseApiController _eventHub = eventHub; } + /// + /// Returns the appropriate Volume + /// + /// + /// [HttpGet] - public async Task> GetVolume(int volumeId) + public async Task> GetVolume(int volumeId) { - var volume = - await _unitOfWork.VolumeRepository.GetVolumeDtoAsync(volumeId, User.GetUserId()); - - return Ok(volume); + return Ok(await _unitOfWork.VolumeRepository.GetVolumeDtoAsync(volumeId, User.GetUserId())); } [Authorize(Policy = "RequireAdminRole")] @@ -39,7 +44,7 @@ public class VolumeController : BaseApiController var volume = await _unitOfWork.VolumeRepository.GetVolumeAsync(volumeId, VolumeIncludes.Chapters | VolumeIncludes.People | VolumeIncludes.Tags); if (volume == null) - return BadRequest(_localizationService.Translate(User.GetUserId(), "chapter-doesnt-exist")); + return BadRequest(_localizationService.Translate(User.GetUserId(), "volume-doesnt-exist")); _unitOfWork.VolumeRepository.Remove(volume); @@ -51,4 +56,29 @@ public class VolumeController : BaseApiController return Ok(false); } + + [Authorize(Policy = "RequireAdminRole")] + [HttpPost("multiple")] + public async Task> DeleteMultipleVolumes(int[] volumesIds) + { + var volumes = await _unitOfWork.VolumeRepository.GetVolumesById(volumesIds); + if (volumes.Count != volumesIds.Length) + { + return BadRequest(_localizationService.Translate(User.GetUserId(), "volume-doesnt-exist")); + } + + _unitOfWork.VolumeRepository.Remove(volumes); + + if (!await _unitOfWork.CommitAsync()) + { + return Ok(false); + } + + foreach (var volume in volumes) + { + await _eventHub.SendMessageAsync(MessageFactory.VolumeRemoved, MessageFactory.VolumeRemovedEvent(volume.Id, volume.SeriesId), false); + } + + return Ok(true); + } } diff --git a/API/DTOs/Account/AgeRestrictionDto.cs b/API/DTOs/Account/AgeRestrictionDto.cs index 0aaec9b97..6505bdbff 100644 --- a/API/DTOs/Account/AgeRestrictionDto.cs +++ b/API/DTOs/Account/AgeRestrictionDto.cs @@ -2,15 +2,15 @@ namespace API.DTOs.Account; -public class AgeRestrictionDto +public sealed record AgeRestrictionDto { /// /// The maximum age rating a user has access to. -1 if not applicable /// - public required AgeRating AgeRating { get; set; } = AgeRating.NotApplicable; + public required AgeRating AgeRating { get; init; } = AgeRating.NotApplicable; /// /// Are Unknowns explicitly allowed against age rating /// /// Unknown is always lowest and default age rating. Setting this to false will ensure Teen age rating applies and unknowns are still filtered - public required bool IncludeUnknowns { get; set; } = false; + public required bool IncludeUnknowns { get; init; } = false; } diff --git a/API/DTOs/Account/AniListUpdateDto.cs b/API/DTOs/Account/AniListUpdateDto.cs deleted file mode 100644 index d51a1dc0d..000000000 --- a/API/DTOs/Account/AniListUpdateDto.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace API.DTOs.Account; - -public class AniListUpdateDto -{ - public string Token { get; set; } -} diff --git a/API/DTOs/Account/ConfirmEmailDto.cs b/API/DTOs/Account/ConfirmEmailDto.cs index 2f5849e74..413f9f34a 100644 --- a/API/DTOs/Account/ConfirmEmailDto.cs +++ b/API/DTOs/Account/ConfirmEmailDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.Account; -public class ConfirmEmailDto +public sealed record ConfirmEmailDto { [Required] public string Email { get; set; } = default!; diff --git a/API/DTOs/Account/ConfirmEmailUpdateDto.cs b/API/DTOs/Account/ConfirmEmailUpdateDto.cs index 42abb1295..2a0738e35 100644 --- a/API/DTOs/Account/ConfirmEmailUpdateDto.cs +++ b/API/DTOs/Account/ConfirmEmailUpdateDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.Account; -public class ConfirmEmailUpdateDto +public sealed record ConfirmEmailUpdateDto { [Required] public string Email { get; set; } = default!; diff --git a/API/DTOs/Account/ConfirmMigrationEmailDto.cs b/API/DTOs/Account/ConfirmMigrationEmailDto.cs index efb42b8fd..cdfc1505c 100644 --- a/API/DTOs/Account/ConfirmMigrationEmailDto.cs +++ b/API/DTOs/Account/ConfirmMigrationEmailDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Account; -public class ConfirmMigrationEmailDto +public sealed record ConfirmMigrationEmailDto { public string Email { get; set; } = default!; public string Token { get; set; } = default!; diff --git a/API/DTOs/Account/ConfirmPasswordResetDto.cs b/API/DTOs/Account/ConfirmPasswordResetDto.cs index 16dd86f9a..00aff301b 100644 --- a/API/DTOs/Account/ConfirmPasswordResetDto.cs +++ b/API/DTOs/Account/ConfirmPasswordResetDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.Account; -public class ConfirmPasswordResetDto +public sealed record ConfirmPasswordResetDto { [Required] public string Email { get; set; } = default!; diff --git a/API/DTOs/Account/InviteUserDto.cs b/API/DTOs/Account/InviteUserDto.cs index 112013053..c12bebc2b 100644 --- a/API/DTOs/Account/InviteUserDto.cs +++ b/API/DTOs/Account/InviteUserDto.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations; namespace API.DTOs.Account; -public class InviteUserDto +public sealed record InviteUserDto { [Required] public string Email { get; set; } = default!; diff --git a/API/DTOs/Account/InviteUserResponse.cs b/API/DTOs/Account/InviteUserResponse.cs index a7e0d86ea..ed16bd05e 100644 --- a/API/DTOs/Account/InviteUserResponse.cs +++ b/API/DTOs/Account/InviteUserResponse.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Account; -public class InviteUserResponse +public sealed record InviteUserResponse { /// /// Email link used to setup the user account diff --git a/API/DTOs/Account/LoginDto.cs b/API/DTOs/Account/LoginDto.cs index fe8fce088..97338640b 100644 --- a/API/DTOs/Account/LoginDto.cs +++ b/API/DTOs/Account/LoginDto.cs @@ -1,7 +1,7 @@ namespace API.DTOs.Account; #nullable enable -public class LoginDto +public sealed record LoginDto { public string Username { get; init; } = default!; public string Password { get; set; } = default!; diff --git a/API/DTOs/Account/MigrateUserEmailDto.cs b/API/DTOs/Account/MigrateUserEmailDto.cs index 60d042165..4630c510f 100644 --- a/API/DTOs/Account/MigrateUserEmailDto.cs +++ b/API/DTOs/Account/MigrateUserEmailDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Account; -public class MigrateUserEmailDto +public sealed record MigrateUserEmailDto { public string Email { get; set; } = default!; public string Username { get; set; } = default!; diff --git a/API/DTOs/Account/ResetPasswordDto.cs b/API/DTOs/Account/ResetPasswordDto.cs index 51a195131..545ca5ba6 100644 --- a/API/DTOs/Account/ResetPasswordDto.cs +++ b/API/DTOs/Account/ResetPasswordDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.Account; -public class ResetPasswordDto +public sealed record ResetPasswordDto { /// /// The Username of the User diff --git a/API/DTOs/Account/TokenRequestDto.cs b/API/DTOs/Account/TokenRequestDto.cs index 85ab9f87a..5c798721c 100644 --- a/API/DTOs/Account/TokenRequestDto.cs +++ b/API/DTOs/Account/TokenRequestDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Account; -public class TokenRequestDto +public sealed record TokenRequestDto { public string Token { get; init; } = default!; public string RefreshToken { get; init; } = default!; diff --git a/API/DTOs/Account/UpdateAgeRestrictionDto.cs b/API/DTOs/Account/UpdateAgeRestrictionDto.cs index ef6be1bba..2fa9c89d2 100644 --- a/API/DTOs/Account/UpdateAgeRestrictionDto.cs +++ b/API/DTOs/Account/UpdateAgeRestrictionDto.cs @@ -3,7 +3,7 @@ using API.Entities.Enums; namespace API.DTOs.Account; -public class UpdateAgeRestrictionDto +public sealed record UpdateAgeRestrictionDto { [Required] public AgeRating AgeRating { get; set; } diff --git a/API/DTOs/Account/UpdateEmailDto.cs b/API/DTOs/Account/UpdateEmailDto.cs index eac06be53..873862ba1 100644 --- a/API/DTOs/Account/UpdateEmailDto.cs +++ b/API/DTOs/Account/UpdateEmailDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Account; -public class UpdateEmailDto +public sealed record UpdateEmailDto { public string Email { get; set; } = default!; public string Password { get; set; } = default!; diff --git a/API/DTOs/Account/UpdateUserDto.cs b/API/DTOs/Account/UpdateUserDto.cs index ef19973f5..0cb0eaf66 100644 --- a/API/DTOs/Account/UpdateUserDto.cs +++ b/API/DTOs/Account/UpdateUserDto.cs @@ -2,13 +2,18 @@ using System.ComponentModel.DataAnnotations; namespace API.DTOs.Account; +#nullable enable -public record UpdateUserDto +public sealed record UpdateUserDto { + /// public int UserId { get; set; } + /// public string Username { get; set; } = default!; + /// /// List of Roles to assign to user. If admin not present, Pleb will be applied. /// If admin present, all libraries will be granted access and will ignore those from DTO. + /// public IList Roles { get; init; } = default!; /// /// A list of libraries to grant access to @@ -18,8 +23,6 @@ public record UpdateUserDto /// An Age Rating which will limit the account to seeing everything equal to or below said rating. /// public AgeRestrictionDto AgeRestriction { get; init; } = default!; - /// - /// Email of the user - /// + /// public string? Email { get; set; } = default!; } diff --git a/API/DTOs/BulkActionDto.cs b/API/DTOs/BulkActionDto.cs index d3ce75293..c26a73e9c 100644 --- a/API/DTOs/BulkActionDto.cs +++ b/API/DTOs/BulkActionDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs; -public class BulkActionDto +public sealed record BulkActionDto { public List Ids { get; set; } /** diff --git a/API/DTOs/ChapterDetailPlusDto.cs b/API/DTOs/ChapterDetailPlusDto.cs new file mode 100644 index 000000000..d99482e55 --- /dev/null +++ b/API/DTOs/ChapterDetailPlusDto.cs @@ -0,0 +1,14 @@ +#nullable enable +using System.Collections.Generic; +using API.DTOs.SeriesDetail; + +namespace API.DTOs; + +public sealed record ChapterDetailPlusDto +{ + public float Rating { get; set; } + public bool HasBeenRated { get; set; } + + public IList Reviews { get; set; } = []; + public IList Ratings { get; set; } = []; +} diff --git a/API/DTOs/ChapterDto.cs b/API/DTOs/ChapterDto.cs index 634ced4e9..85624b51c 100644 --- a/API/DTOs/ChapterDto.cs +++ b/API/DTOs/ChapterDto.cs @@ -1,10 +1,12 @@ using System; using System.Collections.Generic; using API.DTOs.Metadata; +using API.DTOs.Person; using API.Entities.Enums; using API.Entities.Interfaces; namespace API.DTOs; +#nullable enable /// /// A Chapter is the lowest grouping of a reading medium. A Chapter contains a set of MangaFiles which represents the underlying @@ -12,37 +14,24 @@ namespace API.DTOs; /// public class ChapterDto : IHasReadTimeEstimate, IHasCoverImage { + /// public int Id { get; init; } - /// - /// Range of chapters. Chapter 2-4 -> "2-4". Chapter 2 -> "2". If special, will be special name. - /// - /// This can be something like 19.HU or Alpha as some comics are like this + /// public string Range { get; init; } = default!; - /// - /// Smallest number of the Range. - /// + /// [Obsolete("Use MinNumber and MaxNumber instead")] public string Number { get; init; } = default!; - /// - /// This may be 0 under the circumstance that the Issue is "Alpha" or other non-standard numbers. - /// + /// public float MinNumber { get; init; } + /// public float MaxNumber { get; init; } - /// - /// The sorting order of the Chapter. Inherits from MinNumber, but can be overridden. - /// + /// public float SortOrder { get; set; } - /// - /// Total number of pages in all MangaFiles - /// + /// public int Pages { get; init; } - /// - /// If this Chapter contains files that could only be identified as Series or has Special Identifier from filename - /// + /// public bool IsSpecial { get; init; } - /// - /// Used for books/specials to display custom title. For non-specials/books, will be set to - /// + /// public string Title { get; set; } = default!; /// /// The files that represent this Chapter @@ -60,46 +49,25 @@ public class ChapterDto : IHasReadTimeEstimate, IHasCoverImage /// The last time a chapter was read by current authenticated user /// public DateTime LastReadingProgress { get; set; } - /// - /// If the Cover Image is locked for this entity - /// + /// public bool CoverImageLocked { get; set; } - /// - /// Volume Id this Chapter belongs to - /// + /// public int VolumeId { get; init; } - /// - /// When chapter was created - /// + /// public DateTime CreatedUtc { get; set; } + /// public DateTime LastModifiedUtc { get; set; } - /// - /// When chapter was created in local server time - /// - /// This is required for Tachiyomi Extension + /// public DateTime Created { get; set; } - /// - /// When the chapter was released. - /// - /// Metadata field + /// public DateTime ReleaseDate { get; init; } - /// - /// Title of the Chapter/Issue - /// - /// Metadata field + /// public string TitleName { get; set; } = default!; - /// - /// Summary of the Chapter - /// - /// This is not set normally, only for Series Detail + /// public string Summary { get; init; } = default!; - /// - /// Age Rating for the issue/chapter - /// + /// public AgeRating AgeRating { get; init; } - /// - /// Total words in a Chapter (books only) - /// + /// public long WordCount { get; set; } = 0L; /// /// Formatted Volume title ie) Volume 2. @@ -112,14 +80,9 @@ public class ChapterDto : IHasReadTimeEstimate, IHasCoverImage public int MaxHoursToRead { get; set; } /// public float AvgHoursToRead { get; set; } - /// - /// Comma-separated link of urls to external services that have some relation to the Chapter - /// + /// public string WebLinks { get; set; } - /// - /// ISBN-13 (usually) of the Chapter - /// - /// This is guaranteed to be Valid + /// public string ISBN { get; set; } #region Metadata @@ -145,51 +108,60 @@ public class ChapterDto : IHasReadTimeEstimate, IHasCoverImage /// public ICollection Tags { get; set; } = new List(); public PublicationStatus PublicationStatus { get; set; } - /// - /// Language for the Chapter/Issue - /// + /// public string? Language { get; set; } - /// - /// Number in the TotalCount of issues - /// + /// public int Count { get; set; } - /// - /// Total number of issues for the series - /// + /// public int TotalCount { get; set; } + /// public bool LanguageLocked { get; set; } + /// public bool SummaryLocked { get; set; } - /// - /// Locked by user so metadata updates from scan loop will not override AgeRating - /// + /// public bool AgeRatingLocked { get; set; } - /// - /// Locked by user so metadata updates from scan loop will not override PublicationStatus - /// public bool PublicationStatusLocked { get; set; } + /// public bool GenresLocked { get; set; } + /// public bool TagsLocked { get; set; } + /// public bool WriterLocked { get; set; } + /// public bool CharacterLocked { get; set; } + /// public bool ColoristLocked { get; set; } + /// public bool EditorLocked { get; set; } + /// public bool InkerLocked { get; set; } + /// public bool ImprintLocked { get; set; } + /// public bool LettererLocked { get; set; } + /// public bool PencillerLocked { get; set; } + /// public bool PublisherLocked { get; set; } + /// public bool TranslatorLocked { get; set; } + /// public bool TeamLocked { get; set; } + /// public bool LocationLocked { get; set; } + /// public bool CoverArtistLocked { get; set; } public bool ReleaseYearLocked { get; set; } #endregion - public string CoverImage { get; set; } - public string PrimaryColor { get; set; } - public string SecondaryColor { get; set; } + /// + public string? CoverImage { get; set; } + /// + public string? PrimaryColor { get; set; } = string.Empty; + /// + public string? SecondaryColor { get; set; } = string.Empty; public void ResetColorScape() { diff --git a/API/DTOs/Collection/AppUserCollectionDto.cs b/API/DTOs/Collection/AppUserCollectionDto.cs index cde0c1c14..0634b5d83 100644 --- a/API/DTOs/Collection/AppUserCollectionDto.cs +++ b/API/DTOs/Collection/AppUserCollectionDto.cs @@ -6,52 +6,52 @@ using API.Services.Plus; namespace API.DTOs.Collection; #nullable enable -public class AppUserCollectionDto : IHasCoverImage +public sealed record AppUserCollectionDto : IHasCoverImage { public int Id { get; init; } - public string Title { get; set; } = default!; - public string Summary { get; set; } = default!; - public bool Promoted { get; set; } - public AgeRating AgeRating { get; set; } + public string Title { get; init; } = default!; + public string? Summary { get; init; } = default!; + public bool Promoted { get; init; } + public AgeRating AgeRating { get; init; } /// /// This is used to tell the UI if it should request a Cover Image or not. If null or empty, it has not been set. /// public string? CoverImage { get; set; } = string.Empty; - public string PrimaryColor { get; set; } = string.Empty; - public string SecondaryColor { get; set; } = string.Empty; - public bool CoverImageLocked { get; set; } + public string? PrimaryColor { get; set; } = string.Empty; + public string? SecondaryColor { get; set; } = string.Empty; + public bool CoverImageLocked { get; init; } /// /// Number of Series in the Collection /// - public int ItemCount { get; set; } + public int ItemCount { get; init; } /// /// Owner of the Collection /// - public string? Owner { get; set; } + public string? Owner { get; init; } /// /// Last time Kavita Synced the Collection with an upstream source (for non Kavita sourced collections) /// - public DateTime LastSyncUtc { get; set; } + public DateTime LastSyncUtc { get; init; } /// /// Who created/manages the list. Non-Kavita lists are not editable by the user, except to promote /// - public ScrobbleProvider Source { get; set; } = ScrobbleProvider.Kavita; + public ScrobbleProvider Source { get; init; } = ScrobbleProvider.Kavita; /// /// For Non-Kavita sourced collections, the url to sync from /// - public string? SourceUrl { get; set; } + public string? SourceUrl { get; init; } /// /// Total number of items as of the last sync. Not applicable for Kavita managed collections. /// - public int TotalSourceCount { get; set; } + public int TotalSourceCount { get; init; } /// /// A
separated string of all missing series /// - public string? MissingSeriesFromSource { get; set; } + public string? MissingSeriesFromSource { get; init; } public void ResetColorScape() { diff --git a/API/DTOs/Collection/MalStackDto.cs b/API/DTOs/Collection/MalStackDto.cs index 3144f6c72..d9d902e88 100644 --- a/API/DTOs/Collection/MalStackDto.cs +++ b/API/DTOs/Collection/MalStackDto.cs @@ -1,4 +1,5 @@ namespace API.DTOs.Collection; +#nullable enable /// /// Represents an Interest Stack from MAL diff --git a/API/DTOs/CollectionTags/CollectionTagBulkAddDto.cs b/API/DTOs/CollectionTags/CollectionTagBulkAddDto.cs index 1d078959d..0a2270fbf 100644 --- a/API/DTOs/CollectionTags/CollectionTagBulkAddDto.cs +++ b/API/DTOs/CollectionTags/CollectionTagBulkAddDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.CollectionTags; -public class CollectionTagBulkAddDto +public sealed record CollectionTagBulkAddDto { /// /// Collection Tag Id diff --git a/API/DTOs/CollectionTags/CollectionTagDto.cs b/API/DTOs/CollectionTags/CollectionTagDto.cs index ec9939ebd..911622051 100644 --- a/API/DTOs/CollectionTags/CollectionTagDto.cs +++ b/API/DTOs/CollectionTags/CollectionTagDto.cs @@ -3,15 +3,21 @@ namespace API.DTOs.CollectionTags; [Obsolete("Use AppUserCollectionDto")] -public class CollectionTagDto +public sealed record CollectionTagDto { + /// public int Id { get; set; } + /// public string Title { get; set; } = default!; + /// public string Summary { get; set; } = default!; + /// public bool Promoted { get; set; } /// /// The cover image string. This is used on Frontend to show or hide the Cover Image /// + /// public string CoverImage { get; set; } = default!; + /// public bool CoverImageLocked { get; set; } } diff --git a/API/DTOs/CollectionTags/UpdateSeriesForTagDto.cs b/API/DTOs/CollectionTags/UpdateSeriesForTagDto.cs index 19e9a11e2..139834a60 100644 --- a/API/DTOs/CollectionTags/UpdateSeriesForTagDto.cs +++ b/API/DTOs/CollectionTags/UpdateSeriesForTagDto.cs @@ -4,7 +4,7 @@ using API.DTOs.Collection; namespace API.DTOs.CollectionTags; -public class UpdateSeriesForTagDto +public sealed record UpdateSeriesForTagDto { public AppUserCollectionDto Tag { get; init; } = default!; public IEnumerable SeriesIdsToRemove { get; init; } = default!; diff --git a/API/DTOs/ColorScape.cs b/API/DTOs/ColorScape.cs index 39d1446dd..5351f2351 100644 --- a/API/DTOs/ColorScape.cs +++ b/API/DTOs/ColorScape.cs @@ -1,9 +1,10 @@ namespace API.DTOs; +#nullable enable /// /// A primary and secondary color /// -public class ColorScape +public sealed record ColorScape { public required string? Primary { get; set; } public required string? Secondary { get; set; } diff --git a/API/DTOs/CopySettingsFromLibraryDto.cs b/API/DTOs/CopySettingsFromLibraryDto.cs index ee75f7422..5ca5ead51 100644 --- a/API/DTOs/CopySettingsFromLibraryDto.cs +++ b/API/DTOs/CopySettingsFromLibraryDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs; -public class CopySettingsFromLibraryDto +public sealed record CopySettingsFromLibraryDto { public int SourceLibraryId { get; set; } public List TargetLibraryIds { get; set; } diff --git a/API/DTOs/CoverDb/CoverDbAuthor.cs b/API/DTOs/CoverDb/CoverDbAuthor.cs index 2f023398a..ca924801f 100644 --- a/API/DTOs/CoverDb/CoverDbAuthor.cs +++ b/API/DTOs/CoverDb/CoverDbAuthor.cs @@ -3,7 +3,7 @@ using YamlDotNet.Serialization; namespace API.DTOs.CoverDb; -public class CoverDbAuthor +public sealed record CoverDbAuthor { [YamlMember(Alias = "name", ApplyNamingConventions = false)] public string Name { get; set; } diff --git a/API/DTOs/CoverDb/CoverDbPeople.cs b/API/DTOs/CoverDb/CoverDbPeople.cs index c0f5e327e..2e825eac7 100644 --- a/API/DTOs/CoverDb/CoverDbPeople.cs +++ b/API/DTOs/CoverDb/CoverDbPeople.cs @@ -3,7 +3,7 @@ using YamlDotNet.Serialization; namespace API.DTOs.CoverDb; -public class CoverDbPeople +public sealed record CoverDbPeople { [YamlMember(Alias = "people", ApplyNamingConventions = false)] public List People { get; set; } = new List(); diff --git a/API/DTOs/CoverDb/CoverDbPersonIds.cs b/API/DTOs/CoverDb/CoverDbPersonIds.cs index 9c59415e6..5816bb479 100644 --- a/API/DTOs/CoverDb/CoverDbPersonIds.cs +++ b/API/DTOs/CoverDb/CoverDbPersonIds.cs @@ -3,7 +3,7 @@ namespace API.DTOs.CoverDb; #nullable enable -public class CoverDbPersonIds +public sealed record CoverDbPersonIds { [YamlMember(Alias = "hardcover_id", ApplyNamingConventions = false)] public string? HardcoverId { get; set; } = null; diff --git a/API/DTOs/Dashboard/DashboardStreamDto.cs b/API/DTOs/Dashboard/DashboardStreamDto.cs index 59e5f4f7d..297a706b1 100644 --- a/API/DTOs/Dashboard/DashboardStreamDto.cs +++ b/API/DTOs/Dashboard/DashboardStreamDto.cs @@ -4,7 +4,7 @@ using API.Entities.Enums; namespace API.DTOs.Dashboard; -public class DashboardStreamDto +public sealed record DashboardStreamDto { public int Id { get; set; } public required string Name { get; set; } diff --git a/API/DTOs/Dashboard/GroupedSeriesDto.cs b/API/DTOs/Dashboard/GroupedSeriesDto.cs index 3b283de34..940e42c40 100644 --- a/API/DTOs/Dashboard/GroupedSeriesDto.cs +++ b/API/DTOs/Dashboard/GroupedSeriesDto.cs @@ -5,7 +5,7 @@ namespace API.DTOs.Dashboard; /// /// This is a representation of a Series with some amount of underlying files within it. This is used for Recently Updated Series section /// -public class GroupedSeriesDto +public sealed record GroupedSeriesDto { public string SeriesName { get; set; } = default!; public int SeriesId { get; set; } diff --git a/API/DTOs/Dashboard/RecentlyAddedItemDto.cs b/API/DTOs/Dashboard/RecentlyAddedItemDto.cs index 2e5658e2e..bb0360b30 100644 --- a/API/DTOs/Dashboard/RecentlyAddedItemDto.cs +++ b/API/DTOs/Dashboard/RecentlyAddedItemDto.cs @@ -6,7 +6,7 @@ namespace API.DTOs.Dashboard; /// /// A mesh of data for Recently added volume/chapters /// -public class RecentlyAddedItemDto +public sealed record RecentlyAddedItemDto { public string SeriesName { get; set; } = default!; public int SeriesId { get; set; } diff --git a/API/DTOs/Dashboard/SmartFilterDto.cs b/API/DTOs/Dashboard/SmartFilterDto.cs index b23a74c69..c1bc4d7e1 100644 --- a/API/DTOs/Dashboard/SmartFilterDto.cs +++ b/API/DTOs/Dashboard/SmartFilterDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.Dashboard; -public class SmartFilterDto +public sealed record SmartFilterDto { public int Id { get; set; } public required string Name { get; set; } diff --git a/API/DTOs/Dashboard/UpdateDashboardStreamPositionDto.cs b/API/DTOs/Dashboard/UpdateDashboardStreamPositionDto.cs index c2320f1a9..476a0732e 100644 --- a/API/DTOs/Dashboard/UpdateDashboardStreamPositionDto.cs +++ b/API/DTOs/Dashboard/UpdateDashboardStreamPositionDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Dashboard; -public class UpdateDashboardStreamPositionDto +public sealed record UpdateDashboardStreamPositionDto { public int FromPosition { get; set; } public int ToPosition { get; set; } diff --git a/API/DTOs/Dashboard/UpdateStreamPositionDto.cs b/API/DTOs/Dashboard/UpdateStreamPositionDto.cs index f9005a585..8de0ffa6f 100644 --- a/API/DTOs/Dashboard/UpdateStreamPositionDto.cs +++ b/API/DTOs/Dashboard/UpdateStreamPositionDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Dashboard; -public class UpdateStreamPositionDto +public sealed record UpdateStreamPositionDto { public int FromPosition { get; set; } public int ToPosition { get; set; } diff --git a/API/DTOs/DeleteChaptersDto.cs b/API/DTOs/DeleteChaptersDto.cs index cbd21df36..9fad2f1fb 100644 --- a/API/DTOs/DeleteChaptersDto.cs +++ b/API/DTOs/DeleteChaptersDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs; -public class DeleteChaptersDto +public sealed record DeleteChaptersDto { public IList ChapterIds { get; set; } = default!; } diff --git a/API/DTOs/DeleteSeriesDto.cs b/API/DTOs/DeleteSeriesDto.cs index 12687fc25..ec9ba0c68 100644 --- a/API/DTOs/DeleteSeriesDto.cs +++ b/API/DTOs/DeleteSeriesDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs; -public class DeleteSeriesDto +public sealed record DeleteSeriesDto { public IList SeriesIds { get; set; } = default!; } diff --git a/API/DTOs/Device/CreateDeviceDto.cs b/API/DTOs/Device/CreateDeviceDto.cs index 7e59483fa..a8fdb6bc9 100644 --- a/API/DTOs/Device/CreateDeviceDto.cs +++ b/API/DTOs/Device/CreateDeviceDto.cs @@ -3,7 +3,7 @@ using API.Entities.Enums.Device; namespace API.DTOs.Device; -public class CreateDeviceDto +public sealed record CreateDeviceDto { [Required] public string Name { get; set; } = default!; diff --git a/API/DTOs/Device/DeviceDto.cs b/API/DTOs/Device/DeviceDto.cs index b2e83e6fc..42140dcc1 100644 --- a/API/DTOs/Device/DeviceDto.cs +++ b/API/DTOs/Device/DeviceDto.cs @@ -6,7 +6,7 @@ namespace API.DTOs.Device; /// /// A Device is an entity that can receive data from Kavita (kindle) /// -public class DeviceDto +public sealed record DeviceDto { /// /// The device Id diff --git a/API/DTOs/Device/SendSeriesToDeviceDto.cs b/API/DTOs/Device/SendSeriesToDeviceDto.cs index a0a907464..58ce2293b 100644 --- a/API/DTOs/Device/SendSeriesToDeviceDto.cs +++ b/API/DTOs/Device/SendSeriesToDeviceDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Device; -public class SendSeriesToDeviceDto +public sealed record SendSeriesToDeviceDto { public int DeviceId { get; set; } public int SeriesId { get; set; } diff --git a/API/DTOs/Device/SendToDeviceDto.cs b/API/DTOs/Device/SendToDeviceDto.cs index fd88eaf59..a7a4dc0ff 100644 --- a/API/DTOs/Device/SendToDeviceDto.cs +++ b/API/DTOs/Device/SendToDeviceDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.Device; -public class SendToDeviceDto +public sealed record SendToDeviceDto { public int DeviceId { get; set; } public IReadOnlyList ChapterIds { get; set; } = default!; diff --git a/API/DTOs/Device/UpdateDeviceDto.cs b/API/DTOs/Device/UpdateDeviceDto.cs index d28d372c3..2c3e72ea1 100644 --- a/API/DTOs/Device/UpdateDeviceDto.cs +++ b/API/DTOs/Device/UpdateDeviceDto.cs @@ -3,7 +3,7 @@ using API.Entities.Enums.Device; namespace API.DTOs.Device; -public class UpdateDeviceDto +public sealed record UpdateDeviceDto { [Required] public int Id { get; set; } diff --git a/API/DTOs/Downloads/DownloadBookmarkDto.cs b/API/DTOs/Downloads/DownloadBookmarkDto.cs index 5b7240b68..00f763dac 100644 --- a/API/DTOs/Downloads/DownloadBookmarkDto.cs +++ b/API/DTOs/Downloads/DownloadBookmarkDto.cs @@ -4,7 +4,7 @@ using API.DTOs.Reader; namespace API.DTOs.Downloads; -public class DownloadBookmarkDto +public sealed record DownloadBookmarkDto { [Required] public IEnumerable Bookmarks { get; set; } = default!; diff --git a/API/DTOs/Email/ConfirmationEmailDto.cs b/API/DTOs/Email/ConfirmationEmailDto.cs index 1a48c9974..197395794 100644 --- a/API/DTOs/Email/ConfirmationEmailDto.cs +++ b/API/DTOs/Email/ConfirmationEmailDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Email; -public class ConfirmationEmailDto +public sealed record ConfirmationEmailDto { public string InvitingUser { get; init; } = default!; public string EmailAddress { get; init; } = default!; diff --git a/API/DTOs/Email/EmailHistoryDto.cs b/API/DTOs/Email/EmailHistoryDto.cs new file mode 100644 index 000000000..c2968d091 --- /dev/null +++ b/API/DTOs/Email/EmailHistoryDto.cs @@ -0,0 +1,14 @@ +using System; + +namespace API.DTOs.Email; + +public sealed record EmailHistoryDto +{ + public long Id { get; set; } + public bool Sent { get; set; } + public DateTime SendDate { get; set; } = DateTime.UtcNow; + public string EmailTemplate { get; set; } + public string ErrorMessage { get; set; } + public string ToUserName { get; set; } + +} diff --git a/API/DTOs/Email/EmailMigrationDto.cs b/API/DTOs/Email/EmailMigrationDto.cs index f051e7337..5354afdaa 100644 --- a/API/DTOs/Email/EmailMigrationDto.cs +++ b/API/DTOs/Email/EmailMigrationDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Email; -public class EmailMigrationDto +public sealed record EmailMigrationDto { public string EmailAddress { get; init; } = default!; public string Username { get; init; } = default!; diff --git a/API/DTOs/Email/EmailTestResultDto.cs b/API/DTOs/Email/EmailTestResultDto.cs index 263e725c4..9be868eab 100644 --- a/API/DTOs/Email/EmailTestResultDto.cs +++ b/API/DTOs/Email/EmailTestResultDto.cs @@ -3,7 +3,7 @@ /// /// Represents if Test Email Service URL was successful or not and if any error occured /// -public class EmailTestResultDto +public sealed record EmailTestResultDto { public bool Successful { get; set; } public string ErrorMessage { get; set; } = default!; diff --git a/API/DTOs/Email/PasswordResetEmailDto.cs b/API/DTOs/Email/PasswordResetEmailDto.cs index 06abba171..9fda066a9 100644 --- a/API/DTOs/Email/PasswordResetEmailDto.cs +++ b/API/DTOs/Email/PasswordResetEmailDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Email; -public class PasswordResetEmailDto +public sealed record PasswordResetEmailDto { public string EmailAddress { get; init; } = default!; public string ServerConfirmationLink { get; init; } = default!; diff --git a/API/DTOs/Email/SendToDto.cs b/API/DTOs/Email/SendToDto.cs index 1261d110c..eacd29449 100644 --- a/API/DTOs/Email/SendToDto.cs +++ b/API/DTOs/Email/SendToDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.Email; -public class SendToDto +public sealed record SendToDto { public string DestinationEmail { get; set; } = default!; public IEnumerable FilePaths { get; set; } = default!; diff --git a/API/DTOs/Email/TestEmailDto.cs b/API/DTOs/Email/TestEmailDto.cs index 37c12ed30..44c11bd6c 100644 --- a/API/DTOs/Email/TestEmailDto.cs +++ b/API/DTOs/Email/TestEmailDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Email; -public class TestEmailDto +public sealed record TestEmailDto { public string Url { get; set; } = default!; } diff --git a/API/DTOs/Filtering/FilterDto.cs b/API/DTOs/Filtering/FilterDto.cs index 9205a7bba..cb3374838 100644 --- a/API/DTOs/Filtering/FilterDto.cs +++ b/API/DTOs/Filtering/FilterDto.cs @@ -5,7 +5,7 @@ using API.Entities.Enums; namespace API.DTOs.Filtering; #nullable enable -public class FilterDto +public sealed record FilterDto { /// /// The type of Formats you want to be returned. An empty list will return all formats back diff --git a/API/DTOs/Filtering/LanguageDto.cs b/API/DTOs/Filtering/LanguageDto.cs index bc7ebb5cc..dde85f07e 100644 --- a/API/DTOs/Filtering/LanguageDto.cs +++ b/API/DTOs/Filtering/LanguageDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Filtering; -public class LanguageDto +public sealed record LanguageDto { public required string IsoCode { get; set; } public required string Title { get; set; } diff --git a/API/DTOs/Filtering/PersonSortField.cs b/API/DTOs/Filtering/PersonSortField.cs new file mode 100644 index 000000000..5268a1bf9 --- /dev/null +++ b/API/DTOs/Filtering/PersonSortField.cs @@ -0,0 +1,8 @@ +namespace API.DTOs.Filtering; + +public enum PersonSortField +{ + Name = 1, + SeriesCount = 2, + ChapterCount = 3 +} diff --git a/API/DTOs/Filtering/Range.cs b/API/DTOs/Filtering/Range.cs index a75164fa3..e697f26e1 100644 --- a/API/DTOs/Filtering/Range.cs +++ b/API/DTOs/Filtering/Range.cs @@ -4,7 +4,7 @@ /// /// Represents a range between two int/float/double /// -public class Range +public sealed record Range { public T? Min { get; init; } public T? Max { get; init; } diff --git a/API/DTOs/Filtering/ReadStatus.cs b/API/DTOs/Filtering/ReadStatus.cs index eeb786714..81498ecb5 100644 --- a/API/DTOs/Filtering/ReadStatus.cs +++ b/API/DTOs/Filtering/ReadStatus.cs @@ -3,7 +3,7 @@ /// /// Represents the Reading Status. This is a flag and allows multiple statues /// -public class ReadStatus +public sealed record ReadStatus { public bool NotRead { get; set; } = true; public bool InProgress { get; set; } = true; diff --git a/API/DTOs/Filtering/SortOptions.cs b/API/DTOs/Filtering/SortOptions.cs index 00bf91675..18f2b17ea 100644 --- a/API/DTOs/Filtering/SortOptions.cs +++ b/API/DTOs/Filtering/SortOptions.cs @@ -3,8 +3,17 @@ /// /// Sorting Options for a query /// -public class SortOptions +public sealed record SortOptions { public SortField SortField { get; set; } public bool IsAscending { get; set; } = true; } + +/// +/// All Sorting Options for a query related to Person Entity +/// +public sealed record PersonSortOptions +{ + public PersonSortField SortField { get; set; } + public bool IsAscending { get; set; } = true; +} diff --git a/API/DTOs/Filtering/v2/DecodeFilterDto.cs b/API/DTOs/Filtering/v2/DecodeFilterDto.cs index 18dc166e7..db4c7ecce 100644 --- a/API/DTOs/Filtering/v2/DecodeFilterDto.cs +++ b/API/DTOs/Filtering/v2/DecodeFilterDto.cs @@ -3,7 +3,7 @@ /// /// For requesting an encoded filter to be decoded /// -public class DecodeFilterDto +public sealed record DecodeFilterDto { public string EncodedFilter { get; set; } } diff --git a/API/DTOs/Filtering/v2/FilterField.cs b/API/DTOs/Filtering/v2/FilterField.cs index 5323f2b48..246a92a90 100644 --- a/API/DTOs/Filtering/v2/FilterField.cs +++ b/API/DTOs/Filtering/v2/FilterField.cs @@ -56,5 +56,12 @@ public enum FilterField /// Last time User Read /// ReadLast = 32, - +} + +public enum PersonFilterField +{ + Role = 1, + Name = 2, + SeriesCount = 3, + ChapterCount = 4, } diff --git a/API/DTOs/Filtering/v2/FilterStatementDto.cs b/API/DTOs/Filtering/v2/FilterStatementDto.cs index a6192093e..8c99bd24c 100644 --- a/API/DTOs/Filtering/v2/FilterStatementDto.cs +++ b/API/DTOs/Filtering/v2/FilterStatementDto.cs @@ -1,8 +1,17 @@ -namespace API.DTOs.Filtering.v2; +using API.DTOs.Metadata.Browse.Requests; -public class FilterStatementDto +namespace API.DTOs.Filtering.v2; + +public sealed record FilterStatementDto { public FilterComparison Comparison { get; set; } public FilterField Field { get; set; } public string Value { get; set; } } + +public sealed record PersonFilterStatementDto +{ + public FilterComparison Comparison { get; set; } + public PersonFilterField Field { get; set; } + public string Value { get; set; } +} diff --git a/API/DTOs/Filtering/v2/FilterV2Dto.cs b/API/DTOs/Filtering/v2/FilterV2Dto.cs index 5bc50ff2f..a247a17a6 100644 --- a/API/DTOs/Filtering/v2/FilterV2Dto.cs +++ b/API/DTOs/Filtering/v2/FilterV2Dto.cs @@ -6,7 +6,7 @@ namespace API.DTOs.Filtering.v2; /// /// Metadata filtering for v2 API only /// -public class FilterV2Dto +public sealed record FilterV2Dto { /// /// Not used in the UI. @@ -16,7 +16,7 @@ public class FilterV2Dto /// The name of the filter /// public string? Name { get; set; } - public ICollection Statements { get; set; } = new List(); + public ICollection Statements { get; set; } = []; public FilterCombination Combination { get; set; } = FilterCombination.And; public SortOptions? SortOptions { get; set; } diff --git a/API/DTOs/Jobs/JobDto.cs b/API/DTOs/Jobs/JobDto.cs index 648765a34..55419811f 100644 --- a/API/DTOs/Jobs/JobDto.cs +++ b/API/DTOs/Jobs/JobDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.Jobs; -public class JobDto +public sealed record JobDto { /// /// Job Id diff --git a/API/DTOs/JumpBar/JumpKeyDto.cs b/API/DTOs/JumpBar/JumpKeyDto.cs index 5a98a85ca..8dc5b4a8e 100644 --- a/API/DTOs/JumpBar/JumpKeyDto.cs +++ b/API/DTOs/JumpBar/JumpKeyDto.cs @@ -3,7 +3,7 @@ /// /// Represents an individual button in a Jump Bar /// -public class JumpKeyDto +public sealed record JumpKeyDto { /// /// Number of items in this Key diff --git a/API/DTOs/KavitaLocale.cs b/API/DTOs/KavitaLocale.cs new file mode 100644 index 000000000..51868605f --- /dev/null +++ b/API/DTOs/KavitaLocale.cs @@ -0,0 +1,10 @@ +namespace API.DTOs; + +public sealed record KavitaLocale +{ + public string FileName { get; set; } // Key + public string RenderName { get; set; } + public float TranslationCompletion { get; set; } + public bool IsRtL { get; set; } + public string Hash { get; set; } // ETAG hash so I can run my own localization busting implementation +} diff --git a/API/DTOs/KavitaPlus/Account/AniListUpdateDto.cs b/API/DTOs/KavitaPlus/Account/AniListUpdateDto.cs new file mode 100644 index 000000000..c053bd34e --- /dev/null +++ b/API/DTOs/KavitaPlus/Account/AniListUpdateDto.cs @@ -0,0 +1,6 @@ +namespace API.DTOs.KavitaPlus.Account; + +public sealed record AniListUpdateDto +{ + public string Token { get; set; } +} diff --git a/API/DTOs/KavitaPlus/Account/UserTokenInfo.cs b/API/DTOs/KavitaPlus/Account/UserTokenInfo.cs new file mode 100644 index 000000000..340ad0f4c --- /dev/null +++ b/API/DTOs/KavitaPlus/Account/UserTokenInfo.cs @@ -0,0 +1,16 @@ +using System; + +namespace API.DTOs.KavitaPlus.Account; + +/// +/// Represents information around a user's tokens and their status +/// +public sealed record UserTokenInfo +{ + public int UserId { get; set; } + public string Username { get; set; } + public bool IsAniListTokenSet { get; set; } + public bool IsAniListTokenValid { get; set; } + public DateTime AniListValidUntilUtc { get; set; } + public bool IsMalTokenSet { get; set; } +} diff --git a/API/DTOs/KavitaPlus/ExternalMetadata/ExternalMetadataIdsDto.cs b/API/DTOs/KavitaPlus/ExternalMetadata/ExternalMetadataIdsDto.cs new file mode 100644 index 000000000..c05ff0567 --- /dev/null +++ b/API/DTOs/KavitaPlus/ExternalMetadata/ExternalMetadataIdsDto.cs @@ -0,0 +1,17 @@ +using API.DTOs.Scrobbling; + +namespace API.DTOs.KavitaPlus.ExternalMetadata; +#nullable enable + +/// +/// Used for matching and fetching metadata on a series +/// +public sealed record ExternalMetadataIdsDto +{ + public long? MalId { get; set; } + public int? AniListId { get; set; } + + public string? SeriesName { get; set; } + public string? LocalizedSeriesName { get; set; } + public PlusMediaFormat? PlusMediaFormat { get; set; } = DTOs.Scrobbling.PlusMediaFormat.Unknown; +} diff --git a/API/DTOs/KavitaPlus/ExternalMetadata/MatchSeriesRequestDto.cs b/API/DTOs/KavitaPlus/ExternalMetadata/MatchSeriesRequestDto.cs new file mode 100644 index 000000000..a7359d69b --- /dev/null +++ b/API/DTOs/KavitaPlus/ExternalMetadata/MatchSeriesRequestDto.cs @@ -0,0 +1,21 @@ +using System.Collections.Generic; +using API.DTOs.Scrobbling; + +namespace API.DTOs.KavitaPlus.ExternalMetadata; +#nullable enable + +/// +/// Represents a request to match some series from Kavita to an external id which K+ uses. +/// +public sealed record MatchSeriesRequestDto +{ + public required string SeriesName { get; set; } + public ICollection AlternativeNames { get; set; } = []; + public int Year { get; set; } = 0; + public string? Query { get; set; } + public int? AniListId { get; set; } + public long? MalId { get; set; } + public string? HardcoverId { get; set; } + public int? CbrId { get; set; } + public PlusMediaFormat Format { get; set; } +} diff --git a/API/DTOs/KavitaPlus/ExternalMetadata/SeriesDetailPlusApiDto.cs b/API/DTOs/KavitaPlus/ExternalMetadata/SeriesDetailPlusApiDto.cs new file mode 100644 index 000000000..84e9bbf3e --- /dev/null +++ b/API/DTOs/KavitaPlus/ExternalMetadata/SeriesDetailPlusApiDto.cs @@ -0,0 +1,18 @@ +using System.Collections.Generic; +using API.DTOs.KavitaPlus.Metadata; +using API.DTOs.Recommendation; +using API.DTOs.Scrobbling; +using API.DTOs.SeriesDetail; + +namespace API.DTOs.KavitaPlus.ExternalMetadata; + +public sealed record SeriesDetailPlusApiDto +{ + public IEnumerable Recommendations { get; set; } + public IEnumerable Reviews { get; set; } + public IEnumerable Ratings { get; set; } + public ExternalSeriesDetailDto? Series { get; set; } + public int? AniListId { get; set; } + public long? MalId { get; set; } + public int? CbrId { get; set; } +} diff --git a/API/DTOs/License/EncryptLicenseDto.cs b/API/DTOs/KavitaPlus/License/EncryptLicenseDto.cs similarity index 66% rename from API/DTOs/License/EncryptLicenseDto.cs rename to API/DTOs/KavitaPlus/License/EncryptLicenseDto.cs index 97015c470..dd85dd063 100644 --- a/API/DTOs/License/EncryptLicenseDto.cs +++ b/API/DTOs/KavitaPlus/License/EncryptLicenseDto.cs @@ -1,6 +1,7 @@ -namespace API.DTOs.License; +namespace API.DTOs.KavitaPlus.License; +#nullable enable -public class EncryptLicenseDto +public sealed record EncryptLicenseDto { public required string License { get; set; } public required string InstallId { get; set; } diff --git a/API/DTOs/KavitaPlus/License/LicenseInfoDto.cs b/API/DTOs/KavitaPlus/License/LicenseInfoDto.cs new file mode 100644 index 000000000..2cd9b5896 --- /dev/null +++ b/API/DTOs/KavitaPlus/License/LicenseInfoDto.cs @@ -0,0 +1,35 @@ +using System; + +namespace API.DTOs.KavitaPlus.License; + +public sealed record LicenseInfoDto +{ + /// + /// If cancelled, will represent cancellation date. If not, will represent repayment date + /// + public DateTime ExpirationDate { get; set; } + /// + /// If cancelled or not + /// + public bool IsActive { get; set; } + /// + /// If will be or is cancelled + /// + public bool IsCancelled { get; set; } + /// + /// Is the installed version valid for Kavita+ (aka within 3 releases) + /// + public bool IsValidVersion { get; set; } + /// + /// The email on file + /// + public string RegisteredEmail { get; set; } + /// + /// Number of months user has been subscribed + /// + public int TotalMonthsSubbed { get; set; } + /// + /// A license is stored within Kavita + /// + public bool HasLicense { get; set; } +} diff --git a/API/DTOs/Account/LicenseValidDto.cs b/API/DTOs/KavitaPlus/License/LicenseValidDto.cs similarity index 57% rename from API/DTOs/Account/LicenseValidDto.cs rename to API/DTOs/KavitaPlus/License/LicenseValidDto.cs index f49420779..a7bd476ce 100644 --- a/API/DTOs/Account/LicenseValidDto.cs +++ b/API/DTOs/KavitaPlus/License/LicenseValidDto.cs @@ -1,6 +1,6 @@ -namespace API.DTOs.Account; +namespace API.DTOs.KavitaPlus.License; -public class LicenseValidDto +public sealed record LicenseValidDto { public required string License { get; set; } public required string InstallId { get; set; } diff --git a/API/DTOs/License/ResetLicenseDto.cs b/API/DTOs/KavitaPlus/License/ResetLicenseDto.cs similarity index 66% rename from API/DTOs/License/ResetLicenseDto.cs rename to API/DTOs/KavitaPlus/License/ResetLicenseDto.cs index f62d78870..d0fd9b666 100644 --- a/API/DTOs/License/ResetLicenseDto.cs +++ b/API/DTOs/KavitaPlus/License/ResetLicenseDto.cs @@ -1,6 +1,6 @@ -namespace API.DTOs.License; +namespace API.DTOs.KavitaPlus.License; -public class ResetLicenseDto +public sealed record ResetLicenseDto { public required string License { get; set; } public required string InstallId { get; set; } diff --git a/API/DTOs/License/UpdateLicenseDto.cs b/API/DTOs/KavitaPlus/License/UpdateLicenseDto.cs similarity index 78% rename from API/DTOs/License/UpdateLicenseDto.cs rename to API/DTOs/KavitaPlus/License/UpdateLicenseDto.cs index b2803952c..28b47efbe 100644 --- a/API/DTOs/License/UpdateLicenseDto.cs +++ b/API/DTOs/KavitaPlus/License/UpdateLicenseDto.cs @@ -1,6 +1,7 @@ -namespace API.DTOs.License; +namespace API.DTOs.KavitaPlus.License; +#nullable enable -public class UpdateLicenseDto +public sealed record UpdateLicenseDto { /// /// License Key received from Kavita+ diff --git a/API/DTOs/KavitaPlus/Manage/ManageMatchFilterDto.cs b/API/DTOs/KavitaPlus/Manage/ManageMatchFilterDto.cs new file mode 100644 index 000000000..c394cf8d4 --- /dev/null +++ b/API/DTOs/KavitaPlus/Manage/ManageMatchFilterDto.cs @@ -0,0 +1,23 @@ +namespace API.DTOs.KavitaPlus.Manage; + +/// +/// Represents an option in the UI layer for Filtering +/// +public enum MatchStateOption +{ + All = 0, + Matched = 1, + NotMatched = 2, + Error = 3, + DontMatch = 4 +} + +public sealed record ManageMatchFilterDto +{ + public MatchStateOption MatchStateOption { get; set; } = MatchStateOption.All; + /// + /// Library Type in int form. -1 indicates to ignore the field. + /// + public int LibraryType { get; set; } = -1; + public string SearchTerm { get; set; } = string.Empty; +} diff --git a/API/DTOs/KavitaPlus/Manage/ManageMatchSeriesDto.cs b/API/DTOs/KavitaPlus/Manage/ManageMatchSeriesDto.cs new file mode 100644 index 000000000..a51e63ee9 --- /dev/null +++ b/API/DTOs/KavitaPlus/Manage/ManageMatchSeriesDto.cs @@ -0,0 +1,10 @@ +using System; + +namespace API.DTOs.KavitaPlus.Manage; + +public sealed record ManageMatchSeriesDto +{ + public SeriesDto Series { get; set; } + public bool IsMatched { get; set; } + public DateTime ValidUntilUtc { get; set; } +} diff --git a/API/DTOs/KavitaPlus/Metadata/ExternalChapterDto.cs b/API/DTOs/KavitaPlus/Metadata/ExternalChapterDto.cs new file mode 100644 index 000000000..add9ca723 --- /dev/null +++ b/API/DTOs/KavitaPlus/Metadata/ExternalChapterDto.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using API.DTOs.SeriesDetail; + +namespace API.DTOs.KavitaPlus.Metadata; +#nullable enable + +/// +/// Information about an individual issue/chapter/book from Kavita+ +/// +public sealed record ExternalChapterDto +{ + public string Title { get; set; } + + public string IssueNumber { get; set; } + + public decimal? CriticRating { get; set; } + + public decimal? UserRating { get; set; } + + public string? Summary { get; set; } + + public IList? Writers { get; set; } + + public IList? Artists { get; set; } + + public DateTime? ReleaseDate { get; set; } + + public string? Publisher { get; set; } + + public string? CoverImageUrl { get; set; } + + public string? IssueUrl { get; set; } + + public IList CriticReviews { get; set; } + public IList UserReviews { get; set; } +} diff --git a/API/DTOs/KavitaPlus/Metadata/ExternalSeriesDetailDto.cs b/API/DTOs/KavitaPlus/Metadata/ExternalSeriesDetailDto.cs new file mode 100644 index 000000000..6704bf697 --- /dev/null +++ b/API/DTOs/KavitaPlus/Metadata/ExternalSeriesDetailDto.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using API.DTOs.Recommendation; +using API.DTOs.Scrobbling; +using API.Services.Plus; + +namespace API.DTOs.KavitaPlus.Metadata; +#nullable enable + +/// +/// This is AniListSeries +/// +public sealed record ExternalSeriesDetailDto +{ + public string Name { get; set; } + public int? AniListId { get; set; } + public long? MALId { get; set; } + public int? CbrId { get; set; } + public IList Synonyms { get; set; } = []; + public PlusMediaFormat PlusMediaFormat { get; set; } + public string? SiteUrl { get; set; } + public string? CoverUrl { get; set; } + public IList Genres { get; set; } + public IList Staff { get; set; } + public IList Tags { get; set; } + public string? Summary { get; set; } + public ScrobbleProvider Provider { get; set; } = ScrobbleProvider.AniList; + + public DateTime? StartDate { get; set; } + public DateTime? EndDate { get; set; } + public int AverageScore { get; set; } + /// AniList returns the total count of unique chapters, includes 1.1 for example + public int Chapters { get; set; } + /// AniList returns the total count of unique volumes, includes 1.1 for example + public int Volumes { get; set; } + public IList? Relations { get; set; } = []; + public IList? Characters { get; set; } = []; + + #region Comic Only + public string? Publisher { get; set; } + /// + /// Only from CBR for . Full metadata about issues + /// + public IList? ChapterDtos { get; set; } + #endregion + + +} diff --git a/API/DTOs/KavitaPlus/Metadata/MetadataFieldMappingDto.cs b/API/DTOs/KavitaPlus/Metadata/MetadataFieldMappingDto.cs new file mode 100644 index 000000000..a9debabd1 --- /dev/null +++ b/API/DTOs/KavitaPlus/Metadata/MetadataFieldMappingDto.cs @@ -0,0 +1,22 @@ +using API.Entities.Enums; + +namespace API.DTOs.KavitaPlus.Metadata; + +public sealed record MetadataFieldMappingDto +{ + public int Id { get; set; } + public MetadataFieldType SourceType { get; set; } + public MetadataFieldType DestinationType { get; set; } + /// + /// The string in the source + /// + public string SourceValue { get; set; } + /// + /// Write the string as this in the Destination (can also just be the Source) + /// + public string DestinationValue { get; set; } + /// + /// If true, the tag will be Moved over vs Copied over + /// + public bool ExcludeFromSource { get; set; } +} diff --git a/API/DTOs/KavitaPlus/Metadata/MetadataSettingsDto.cs b/API/DTOs/KavitaPlus/Metadata/MetadataSettingsDto.cs new file mode 100644 index 000000000..e9f6614bc --- /dev/null +++ b/API/DTOs/KavitaPlus/Metadata/MetadataSettingsDto.cs @@ -0,0 +1,125 @@ +using System.Collections.Generic; +using API.Entities; +using API.Entities.Enums; +using API.Entities.MetadataMatching; +using NotImplementedException = System.NotImplementedException; + +namespace API.DTOs.KavitaPlus.Metadata; + + +public sealed record MetadataSettingsDto +{ + /// + /// If writing any sort of metadata from upstream (AniList, Hardcover) source is allowed + /// + public bool Enabled { get; set; } + + /// + /// Allow the Summary to be written + /// + public bool EnableSummary { get; set; } + /// + /// Allow Publication status to be derived and updated + /// + public bool EnablePublicationStatus { get; set; } + /// + /// Allow Relationships between series to be set + /// + public bool EnableRelationships { get; set; } + /// + /// Allow People to be created (including downloading images) + /// + public bool EnablePeople { get; set; } + /// + /// Allow Start date to be set within the Series + /// + public bool EnableStartDate { get; set; } + /// + /// Allow setting the Localized name + /// + public bool EnableLocalizedName { get; set; } + /// + /// Allow setting the cover image + /// + public bool EnableCoverImage { get; set; } + + #region Chapter Metadata + /// + /// Allow Summary to be set within Chapter/Issue + /// + public bool EnableChapterSummary { get; set; } + /// + /// Allow Release Date to be set within Chapter/Issue + /// + public bool EnableChapterReleaseDate { get; set; } + /// + /// Allow Title to be set within Chapter/Issue + /// + public bool EnableChapterTitle { get; set; } + /// + /// Allow Publisher to be set within Chapter/Issue + /// + public bool EnableChapterPublisher { get; set; } + /// + /// Allow setting the cover image for the Chapter/Issue + /// + public bool EnableChapterCoverImage { get; set; } + #endregion + + // Need to handle the Genre/tags stuff + public bool EnableGenres { get; set; } = true; + public bool EnableTags { get; set; } = true; + + /// + /// For Authors and Writers, how should names be stored (Exclusively applied for AniList). This does not affect Character names. + /// + public bool FirstLastPeopleNaming { get; set; } + + /// + /// Any Genres or Tags that if present, will trigger an Age Rating Override. Highest rating will be prioritized for matching. + /// + public Dictionary AgeRatingMappings { get; set; } + + /// + /// A list of rules that allow mapping a genre/tag to another genre/tag + /// + public List FieldMappings { get; set; } + /// + /// A list of overrides that will enable writing to locked fields + /// + public List Overrides { get; set; } + + /// + /// Do not allow any Genre/Tag in this list to be written to Kavita + /// + public List Blacklist { get; set; } + /// + /// Only allow these Tags to be written to Kavita + /// + public List Whitelist { get; set; } + /// + /// Which Roles to allow metadata downloading for + /// + public List PersonRoles { get; set; } + + + /// + /// Override list contains this field + /// + /// + /// + public bool HasOverride(MetadataSettingField field) + { + return Overrides.Contains(field); + } + + /// + /// If this Person role is allowed to be written + /// + /// + /// + public bool IsPersonAllowed(PersonRole character) + { + return PersonRoles.Contains(character); + } +} diff --git a/API/DTOs/KavitaPlus/Metadata/SeriesCharacter.cs b/API/DTOs/KavitaPlus/Metadata/SeriesCharacter.cs new file mode 100644 index 000000000..2b57548cd --- /dev/null +++ b/API/DTOs/KavitaPlus/Metadata/SeriesCharacter.cs @@ -0,0 +1,19 @@ +namespace API.DTOs.KavitaPlus.Metadata; +#nullable enable + +public enum CharacterRole +{ + Main = 0, + Supporting = 1, + Background = 2 +} + + +public sealed record SeriesCharacter +{ + public string Name { get; set; } + public required string Description { get; set; } + public required string Url { get; set; } + public string? ImageUrl { get; set; } + public CharacterRole Role { get; set; } +} diff --git a/API/DTOs/KavitaPlus/Metadata/SeriesRelationship.cs b/API/DTOs/KavitaPlus/Metadata/SeriesRelationship.cs new file mode 100644 index 000000000..0b1f619a2 --- /dev/null +++ b/API/DTOs/KavitaPlus/Metadata/SeriesRelationship.cs @@ -0,0 +1,24 @@ +using API.DTOs.Scrobbling; +using API.Entities.Enums; +using API.Entities.Metadata; +using API.Services.Plus; + +namespace API.DTOs.KavitaPlus.Metadata; + +public sealed record ALMediaTitle +{ + public string? EnglishTitle { get; set; } + public string RomajiTitle { get; set; } + public string NativeTitle { get; set; } + public string PreferredTitle { get; set; } +} + +public sealed record SeriesRelationship +{ + public int AniListId { get; set; } + public int? MalId { get; set; } + public ALMediaTitle SeriesName { get; set; } + public RelationKind Relation { get; set; } + public ScrobbleProvider Provider { get; set; } + public PlusMediaFormat PlusMediaFormat { get; set; } = PlusMediaFormat.Manga; +} diff --git a/API/DTOs/Koreader/KoreaderBookDto.cs b/API/DTOs/Koreader/KoreaderBookDto.cs new file mode 100644 index 000000000..b66b7da3a --- /dev/null +++ b/API/DTOs/Koreader/KoreaderBookDto.cs @@ -0,0 +1,33 @@ +using API.DTOs.Progress; + +namespace API.DTOs.Koreader; + +/// +/// This is the interface for receiving and sending updates to Koreader. The only fields +/// that are actually used are the Document and Progress fields. +/// +public class KoreaderBookDto +{ + /// + /// This is the Koreader hash of the book. It is used to identify the book. + /// + public string Document { get; set; } + /// + /// A randomly generated id from the koreader device. Only used to maintain the Koreader interface. + /// + public string Device_id { get; set; } + /// + /// The Koreader device name. Only used to maintain the Koreader interface. + /// + public string Device { get; set; } + /// + /// Percent progress of the book. Only used to maintain the Koreader interface. + /// + public float Percentage { get; set; } + /// + /// An XPath string read by Koreader to determine the location within the epub. + /// Essentially, it is Koreader's equivalent to ProgressDto.BookScrollId. + /// + /// + public string Progress { get; set; } +} diff --git a/API/DTOs/Koreader/KoreaderProgressUpdateDto.cs b/API/DTOs/Koreader/KoreaderProgressUpdateDto.cs new file mode 100644 index 000000000..52a1d6cbd --- /dev/null +++ b/API/DTOs/Koreader/KoreaderProgressUpdateDto.cs @@ -0,0 +1,15 @@ +using System; + +namespace API.DTOs.Koreader; + +public class KoreaderProgressUpdateDto +{ + /// + /// This is the Koreader hash of the book. It is used to identify the book. + /// + public string Document { get; set; } + /// + /// UTC Timestamp to return to KOReader + /// + public DateTime Timestamp { get; set; } +} diff --git a/API/DTOs/LibraryDto.cs b/API/DTOs/LibraryDto.cs index c8c85063e..bd72ad2f0 100644 --- a/API/DTOs/LibraryDto.cs +++ b/API/DTOs/LibraryDto.cs @@ -1,12 +1,11 @@ using System; -using System.Collections; using System.Collections.Generic; using API.Entities.Enums; namespace API.DTOs; #nullable enable -public class LibraryDto +public sealed record LibraryDto { public int Id { get; init; } public string? Name { get; init; } @@ -61,4 +60,18 @@ public class LibraryDto /// A set of globs that will exclude matching content from being scanned /// public ICollection ExcludePatterns { get; set; } + /// + /// Allow any series within this Library to download metadata. + /// + /// This does not exclude the library from being linked to wrt Series Relationships + /// Requires a valid LicenseKey + public bool AllowMetadataMatching { get; set; } = true; + /// + /// Allow Kavita to read metadata (ComicInfo.xml, Epub, PDF) + /// + public bool EnableMetadata { get; set; } = true; + /// + /// Should Kavita remove sort articles "The" for the sort name + /// + public bool RemovePrefixForSortName { get; set; } = false; } diff --git a/API/DTOs/MangaFileDto.cs b/API/DTOs/MangaFileDto.cs index 3f0983067..23bb37467 100644 --- a/API/DTOs/MangaFileDto.cs +++ b/API/DTOs/MangaFileDto.cs @@ -2,8 +2,9 @@ using API.Entities.Enums; namespace API.DTOs; +#nullable enable -public class MangaFileDto +public sealed record MangaFileDto { public int Id { get; init; } /// diff --git a/API/DTOs/MediaErrors/MediaErrorDto.cs b/API/DTOs/MediaErrors/MediaErrorDto.cs index bfaf57124..b77ee88be 100644 --- a/API/DTOs/MediaErrors/MediaErrorDto.cs +++ b/API/DTOs/MediaErrors/MediaErrorDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.MediaErrors; -public class MediaErrorDto +public sealed record MediaErrorDto { /// /// Format Type (RAR, ZIP, 7Zip, Epub, PDF) diff --git a/API/DTOs/MemberDto.cs b/API/DTOs/MemberDto.cs index 7b750b32f..f5f24b284 100644 --- a/API/DTOs/MemberDto.cs +++ b/API/DTOs/MemberDto.cs @@ -8,7 +8,7 @@ namespace API.DTOs; /// /// Represents a member of a Kavita server. /// -public class MemberDto +public sealed record MemberDto { public int Id { get; init; } public string? Username { get; init; } diff --git a/API/DTOs/Metadata/AgeRatingDto.cs b/API/DTOs/Metadata/AgeRatingDto.cs index 07523c3fe..bfa835ef5 100644 --- a/API/DTOs/Metadata/AgeRatingDto.cs +++ b/API/DTOs/Metadata/AgeRatingDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.Metadata; -public class AgeRatingDto +public sealed record AgeRatingDto { public AgeRating Value { get; set; } public required string Title { get; set; } diff --git a/API/DTOs/Metadata/Browse/BrowseGenreDto.cs b/API/DTOs/Metadata/Browse/BrowseGenreDto.cs new file mode 100644 index 000000000..8044c7914 --- /dev/null +++ b/API/DTOs/Metadata/Browse/BrowseGenreDto.cs @@ -0,0 +1,13 @@ +namespace API.DTOs.Metadata.Browse; + +public sealed record BrowseGenreDto : GenreTagDto +{ + /// + /// Number of Series this Entity is on + /// + public int SeriesCount { get; set; } + /// + /// Number of Chapters this Entity is on + /// + public int ChapterCount { get; set; } +} diff --git a/API/DTOs/Person/BrowsePersonDto.cs b/API/DTOs/Metadata/Browse/BrowsePersonDto.cs similarity index 65% rename from API/DTOs/Person/BrowsePersonDto.cs rename to API/DTOs/Metadata/Browse/BrowsePersonDto.cs index 8d6999973..20f84b783 100644 --- a/API/DTOs/Person/BrowsePersonDto.cs +++ b/API/DTOs/Metadata/Browse/BrowsePersonDto.cs @@ -1,4 +1,6 @@ -namespace API.DTOs; +using API.DTOs.Person; + +namespace API.DTOs.Metadata.Browse; /// /// Used to browse writers and click in to see their series @@ -10,7 +12,7 @@ public class BrowsePersonDto : PersonDto /// public int SeriesCount { get; set; } /// - /// Number or Issues this Person is the Writer for + /// Number of Issues this Person is the Writer for /// - public int IssueCount { get; set; } + public int ChapterCount { get; set; } } diff --git a/API/DTOs/Metadata/Browse/BrowseTagDto.cs b/API/DTOs/Metadata/Browse/BrowseTagDto.cs new file mode 100644 index 000000000..9a71876e3 --- /dev/null +++ b/API/DTOs/Metadata/Browse/BrowseTagDto.cs @@ -0,0 +1,13 @@ +namespace API.DTOs.Metadata.Browse; + +public sealed record BrowseTagDto : TagDto +{ + /// + /// Number of Series this Entity is on + /// + public int SeriesCount { get; set; } + /// + /// Number of Chapters this Entity is on + /// + public int ChapterCount { get; set; } +} diff --git a/API/DTOs/Metadata/Browse/Requests/BrowsePersonFilterDto.cs b/API/DTOs/Metadata/Browse/Requests/BrowsePersonFilterDto.cs new file mode 100644 index 000000000..d41cf37f3 --- /dev/null +++ b/API/DTOs/Metadata/Browse/Requests/BrowsePersonFilterDto.cs @@ -0,0 +1,27 @@ +using System.Collections.Generic; +using API.DTOs.Filtering; +using API.DTOs.Filtering.v2; +using API.Entities.Enums; + +namespace API.DTOs.Metadata.Browse.Requests; +#nullable enable + +public sealed record BrowsePersonFilterDto +{ + /// + /// Not used - For parity with Series Filter + /// + public int Id { get; set; } + /// + /// Not used - For parity with Series Filter + /// + public string? Name { get; set; } + public ICollection Statements { get; set; } = []; + public FilterCombination Combination { get; set; } = FilterCombination.And; + public PersonSortOptions? SortOptions { get; set; } + + /// + /// Limit the number of rows returned. Defaults to not applying a limit (aka 0) + /// + public int LimitTo { get; set; } = 0; +} diff --git a/API/DTOs/Metadata/ChapterMetadataDto.cs b/API/DTOs/Metadata/ChapterMetadataDto.cs index bbd93d618..c79436e24 100644 --- a/API/DTOs/Metadata/ChapterMetadataDto.cs +++ b/API/DTOs/Metadata/ChapterMetadataDto.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using API.DTOs.Person; using API.Entities.Enums; namespace API.DTOs.Metadata; @@ -9,7 +10,7 @@ namespace API.DTOs.Metadata; /// Exclusively metadata about a given chapter /// [Obsolete("Will not be maintained as of v0.8.1")] -public class ChapterMetadataDto +public sealed record ChapterMetadataDto { public int Id { get; set; } public int ChapterId { get; set; } diff --git a/API/DTOs/Metadata/GenreTagDto.cs b/API/DTOs/Metadata/GenreTagDto.cs index cf05ebbff..13a339d38 100644 --- a/API/DTOs/Metadata/GenreTagDto.cs +++ b/API/DTOs/Metadata/GenreTagDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Metadata; -public class GenreTagDto +public record GenreTagDto { public int Id { get; set; } public required string Title { get; set; } diff --git a/API/DTOs/Metadata/Matching/ExternalSeriesMatchDto.cs b/API/DTOs/Metadata/Matching/ExternalSeriesMatchDto.cs new file mode 100644 index 000000000..774581b37 --- /dev/null +++ b/API/DTOs/Metadata/Matching/ExternalSeriesMatchDto.cs @@ -0,0 +1,10 @@ +using API.DTOs.KavitaPlus.Metadata; +using API.DTOs.Recommendation; + +namespace API.DTOs.Metadata.Matching; + +public sealed record ExternalSeriesMatchDto +{ + public ExternalSeriesDetailDto Series { get; set; } + public float MatchRating { get; set; } +} diff --git a/API/DTOs/Metadata/Matching/MatchSeriesDto.cs b/API/DTOs/Metadata/Matching/MatchSeriesDto.cs new file mode 100644 index 000000000..bb497b9ab --- /dev/null +++ b/API/DTOs/Metadata/Matching/MatchSeriesDto.cs @@ -0,0 +1,20 @@ +namespace API.DTOs.Metadata.Matching; + +/// +/// Used for matching a series with Kavita+ for metadata and scrobbling +/// +public sealed record MatchSeriesDto +{ + /// + /// When set, Kavita will stop attempting to match this series and will not perform any scrobbling + /// + public bool DontMatch { get; set; } + /// + /// Series Id to pull internal metadata from to improve matching + /// + public int SeriesId { get; set; } + /// + /// Free form text to query for. Can be a url and ids will be parsed from it + /// + public string Query { get; set; } +} diff --git a/API/DTOs/Metadata/PublicationStatusDto.cs b/API/DTOs/Metadata/PublicationStatusDto.cs index b8166a6e5..b4f12500a 100644 --- a/API/DTOs/Metadata/PublicationStatusDto.cs +++ b/API/DTOs/Metadata/PublicationStatusDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.Metadata; -public class PublicationStatusDto +public sealed record PublicationStatusDto { public PublicationStatus Value { get; set; } public required string Title { get; set; } diff --git a/API/DTOs/Metadata/TagDto.cs b/API/DTOs/Metadata/TagDto.cs index 59e03a279..f5c925e1f 100644 --- a/API/DTOs/Metadata/TagDto.cs +++ b/API/DTOs/Metadata/TagDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Metadata; -public class TagDto +public record TagDto { public int Id { get; set; } public required string Title { get; set; } diff --git a/API/DTOs/OPDS/Feed.cs b/API/DTOs/OPDS/Feed.cs index 76a740b89..5f4c4b115 100644 --- a/API/DTOs/OPDS/Feed.cs +++ b/API/DTOs/OPDS/Feed.cs @@ -4,11 +4,13 @@ using System.Xml.Serialization; namespace API.DTOs.OPDS; +// TODO: OPDS Dtos are internal state, shouldn't be in DTO directory + /// /// /// [XmlRoot("feed", Namespace = "http://www.w3.org/2005/Atom")] -public class Feed +public sealed record Feed { [XmlElement("updated")] public string Updated { get; init; } = DateTime.UtcNow.ToString("s"); diff --git a/API/DTOs/OPDS/FeedAuthor.cs b/API/DTOs/OPDS/FeedAuthor.cs index 1fd3e6cd2..4196997dd 100644 --- a/API/DTOs/OPDS/FeedAuthor.cs +++ b/API/DTOs/OPDS/FeedAuthor.cs @@ -2,7 +2,7 @@ namespace API.DTOs.OPDS; -public class FeedAuthor +public sealed record FeedAuthor { [XmlElement("name")] public string Name { get; set; } diff --git a/API/DTOs/OPDS/FeedCategory.cs b/API/DTOs/OPDS/FeedCategory.cs index 3129fab60..2352b4af2 100644 --- a/API/DTOs/OPDS/FeedCategory.cs +++ b/API/DTOs/OPDS/FeedCategory.cs @@ -2,7 +2,7 @@ namespace API.DTOs.OPDS; -public class FeedCategory +public sealed record FeedCategory { [XmlAttribute("scheme")] public string Scheme { get; } = "http://www.bisg.org/standards/bisac_subject/index.html"; diff --git a/API/DTOs/OPDS/FeedEntry.cs b/API/DTOs/OPDS/FeedEntry.cs index da8b53b74..838ebd124 100644 --- a/API/DTOs/OPDS/FeedEntry.cs +++ b/API/DTOs/OPDS/FeedEntry.cs @@ -5,7 +5,7 @@ using System.Xml.Serialization; namespace API.DTOs.OPDS; #nullable enable -public class FeedEntry +public sealed record FeedEntry { [XmlElement("updated")] public string Updated { get; init; } = DateTime.UtcNow.ToString("s"); diff --git a/API/DTOs/OPDS/FeedEntryContent.cs b/API/DTOs/OPDS/FeedEntryContent.cs index 3e95ce643..4de9b73bd 100644 --- a/API/DTOs/OPDS/FeedEntryContent.cs +++ b/API/DTOs/OPDS/FeedEntryContent.cs @@ -2,7 +2,7 @@ namespace API.DTOs.OPDS; -public class FeedEntryContent +public sealed record FeedEntryContent { [XmlAttribute("type")] public string Type = "text"; diff --git a/API/DTOs/OPDS/FeedLink.cs b/API/DTOs/OPDS/FeedLink.cs index cff3b6736..28c55bbe8 100644 --- a/API/DTOs/OPDS/FeedLink.cs +++ b/API/DTOs/OPDS/FeedLink.cs @@ -3,7 +3,7 @@ using System.Xml.Serialization; namespace API.DTOs.OPDS; -public class FeedLink +public sealed record FeedLink { [XmlIgnore] public bool IsPageStream { get; set; } diff --git a/API/DTOs/OPDS/OpenSearchDescription.cs b/API/DTOs/OPDS/OpenSearchDescription.cs index cc8392a88..eba26572f 100644 --- a/API/DTOs/OPDS/OpenSearchDescription.cs +++ b/API/DTOs/OPDS/OpenSearchDescription.cs @@ -3,7 +3,7 @@ namespace API.DTOs.OPDS; [XmlRoot("OpenSearchDescription", Namespace = "http://a9.com/-/spec/opensearch/1.1/")] -public class OpenSearchDescription +public sealed record OpenSearchDescription { /// /// Contains a brief human-readable title that identifies this search engine. diff --git a/API/DTOs/OPDS/SearchLink.cs b/API/DTOs/OPDS/SearchLink.cs index dba67f3bd..b4698c221 100644 --- a/API/DTOs/OPDS/SearchLink.cs +++ b/API/DTOs/OPDS/SearchLink.cs @@ -2,7 +2,7 @@ namespace API.DTOs.OPDS; -public class SearchLink +public sealed record SearchLink { [XmlAttribute("type")] public string Type { get; set; } = default!; diff --git a/API/DTOs/Person/PersonDto.cs b/API/DTOs/Person/PersonDto.cs index aa0f0680c..db152e3b1 100644 --- a/API/DTOs/Person/PersonDto.cs +++ b/API/DTOs/Person/PersonDto.cs @@ -1,4 +1,7 @@ -namespace API.DTOs; +using System.Collections.Generic; + +namespace API.DTOs.Person; +#nullable enable public class PersonDto { @@ -6,12 +9,13 @@ public class PersonDto public required string Name { get; set; } public bool CoverImageLocked { get; set; } - public string PrimaryColor { get; set; } - public string SecondaryColor { get; set; } + public string? PrimaryColor { get; set; } + public string? SecondaryColor { get; set; } public string? CoverImage { get; set; } + public List Aliases { get; set; } = []; - public string Description { get; set; } + public string? Description { get; set; } /// /// ASIN for person /// diff --git a/API/DTOs/Person/PersonMergeDto.cs b/API/DTOs/Person/PersonMergeDto.cs new file mode 100644 index 000000000..b5dc23375 --- /dev/null +++ b/API/DTOs/Person/PersonMergeDto.cs @@ -0,0 +1,17 @@ +using System.ComponentModel.DataAnnotations; + +namespace API.DTOs; + +public sealed record PersonMergeDto +{ + /// + /// The id of the person being merged into + /// + [Required] + public int DestId { get; init; } + /// + /// The id of the person being merged. This person will be removed, and become an alias of + /// + [Required] + public int SrcId { get; init; } +} diff --git a/API/DTOs/Person/UpdatePersonDto.cs b/API/DTOs/Person/UpdatePersonDto.cs index 78eb54aaf..b43a45e88 100644 --- a/API/DTOs/Person/UpdatePersonDto.cs +++ b/API/DTOs/Person/UpdatePersonDto.cs @@ -1,8 +1,10 @@ -using System.ComponentModel.DataAnnotations; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; namespace API.DTOs; +#nullable enable -public class UpdatePersonDto +public sealed record UpdatePersonDto { [Required] public int Id { get; init; } @@ -10,6 +12,7 @@ public class UpdatePersonDto public bool CoverImageLocked { get; set; } [Required] public string Name {get; set;} + public IList Aliases { get; set; } = []; public string? Description { get; set; } public int? AniListId { get; set; } diff --git a/API/DTOs/Progress/FullProgressDto.cs b/API/DTOs/Progress/FullProgressDto.cs index 7d0b47f60..4f97ab44a 100644 --- a/API/DTOs/Progress/FullProgressDto.cs +++ b/API/DTOs/Progress/FullProgressDto.cs @@ -5,7 +5,7 @@ namespace API.DTOs.Progress; /// /// A full progress Record from the DB (not all data, only what's needed for API) /// -public class FullProgressDto +public sealed record FullProgressDto { public int Id { get; set; } public int ChapterId { get; set; } diff --git a/API/DTOs/Progress/ProgressDto.cs b/API/DTOs/Progress/ProgressDto.cs index 9fc9010aa..0add848c5 100644 --- a/API/DTOs/Progress/ProgressDto.cs +++ b/API/DTOs/Progress/ProgressDto.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations; namespace API.DTOs.Progress; #nullable enable -public class ProgressDto +public sealed record ProgressDto { [Required] public int VolumeId { get; set; } diff --git a/API/DTOs/Progress/UpdateUserProgressDto.cs b/API/DTOs/Progress/UpdateUserProgressDto.cs deleted file mode 100644 index 2aa77b04e..000000000 --- a/API/DTOs/Progress/UpdateUserProgressDto.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; - -namespace API.DTOs.Progress; -#nullable enable - -public class UpdateUserProgressDto -{ - public int PageNum { get; set; } - public DateTime LastModifiedUtc { get; set; } - public DateTime CreatedUtc { get; set; } -} diff --git a/API/DTOs/RatingDto.cs b/API/DTOs/RatingDto.cs index e2cd9d342..101aa7ac5 100644 --- a/API/DTOs/RatingDto.cs +++ b/API/DTOs/RatingDto.cs @@ -1,12 +1,18 @@ -using API.Services.Plus; +using API.Entities; +using API.Entities.Enums; +using API.Entities.Metadata; +using API.Services.Plus; namespace API.DTOs; #nullable enable -public class RatingDto +public sealed record RatingDto { + public int AverageScore { get; set; } public int FavoriteCount { get; set; } public ScrobbleProvider Provider { get; set; } + /// + public RatingAuthority Authority { get; set; } = RatingAuthority.User; public string? ProviderUrl { get; set; } } diff --git a/API/DTOs/Reader/BookChapterItem.cs b/API/DTOs/Reader/BookChapterItem.cs index dcfb7b904..892e82e27 100644 --- a/API/DTOs/Reader/BookChapterItem.cs +++ b/API/DTOs/Reader/BookChapterItem.cs @@ -2,7 +2,7 @@ namespace API.DTOs.Reader; -public class BookChapterItem +public sealed record BookChapterItem { /// /// Name of the Chapter diff --git a/API/DTOs/Reader/BookInfoDto.cs b/API/DTOs/Reader/BookInfoDto.cs index c379f71f8..2473cd5dc 100644 --- a/API/DTOs/Reader/BookInfoDto.cs +++ b/API/DTOs/Reader/BookInfoDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.Reader; -public class BookInfoDto : IChapterInfoDto +public sealed record BookInfoDto : IChapterInfoDto { public string BookTitle { get; set; } = default! ; public int SeriesId { get; set; } diff --git a/API/DTOs/Reader/BookmarkDto.cs b/API/DTOs/Reader/BookmarkDto.cs index ef4cf3d6d..da18fc28e 100644 --- a/API/DTOs/Reader/BookmarkDto.cs +++ b/API/DTOs/Reader/BookmarkDto.cs @@ -3,7 +3,7 @@ namespace API.DTOs.Reader; #nullable enable -public class BookmarkDto +public sealed record BookmarkDto { public int Id { get; set; } [Required] diff --git a/API/DTOs/Reader/BulkRemoveBookmarkForSeriesDto.cs b/API/DTOs/Reader/BulkRemoveBookmarkForSeriesDto.cs index 7490f837c..51ccf5cc3 100644 --- a/API/DTOs/Reader/BulkRemoveBookmarkForSeriesDto.cs +++ b/API/DTOs/Reader/BulkRemoveBookmarkForSeriesDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.Reader; -public class BulkRemoveBookmarkForSeriesDto +public sealed record BulkRemoveBookmarkForSeriesDto { public ICollection SeriesIds { get; init; } = default!; } diff --git a/API/DTOs/Reader/ChapterInfoDto.cs b/API/DTOs/Reader/ChapterInfoDto.cs index 4584a5830..4da08a31d 100644 --- a/API/DTOs/Reader/ChapterInfoDto.cs +++ b/API/DTOs/Reader/ChapterInfoDto.cs @@ -7,7 +7,7 @@ namespace API.DTOs.Reader; /// /// Information about the Chapter for the Reader to render /// -public class ChapterInfoDto : IChapterInfoDto +public sealed record ChapterInfoDto : IChapterInfoDto { /// /// The Chapter Number diff --git a/API/DTOs/Reader/CreatePersonalToCDto.cs b/API/DTOs/Reader/CreatePersonalToCDto.cs index 25526b490..95272ca58 100644 --- a/API/DTOs/Reader/CreatePersonalToCDto.cs +++ b/API/DTOs/Reader/CreatePersonalToCDto.cs @@ -1,6 +1,7 @@ namespace API.DTOs.Reader; +#nullable enable -public class CreatePersonalToCDto +public sealed record CreatePersonalToCDto { public required int ChapterId { get; set; } public required int VolumeId { get; set; } diff --git a/API/DTOs/Reader/FileDimensionDto.cs b/API/DTOs/Reader/FileDimensionDto.cs index baee20dd0..7a7d2978f 100644 --- a/API/DTOs/Reader/FileDimensionDto.cs +++ b/API/DTOs/Reader/FileDimensionDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Reader; -public class FileDimensionDto +public sealed record FileDimensionDto { public int Width { get; set; } public int Height { get; set; } diff --git a/API/DTOs/Reader/HourEstimateRangeDto.cs b/API/DTOs/Reader/HourEstimateRangeDto.cs index 8c8bd11a9..3facf8e56 100644 --- a/API/DTOs/Reader/HourEstimateRangeDto.cs +++ b/API/DTOs/Reader/HourEstimateRangeDto.cs @@ -3,7 +3,7 @@ /// /// A range of time to read a selection (series, chapter, etc) /// -public record HourEstimateRangeDto +public sealed record HourEstimateRangeDto { /// /// Min hours to read the selection diff --git a/API/DTOs/Reader/MarkMultipleSeriesAsReadDto.cs b/API/DTOs/Reader/MarkMultipleSeriesAsReadDto.cs index 50187ec81..4c39f7d76 100644 --- a/API/DTOs/Reader/MarkMultipleSeriesAsReadDto.cs +++ b/API/DTOs/Reader/MarkMultipleSeriesAsReadDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.Reader; -public class MarkMultipleSeriesAsReadDto +public sealed record MarkMultipleSeriesAsReadDto { public IReadOnlyList SeriesIds { get; init; } = default!; } diff --git a/API/DTOs/Reader/MarkReadDto.cs b/API/DTOs/Reader/MarkReadDto.cs index 9bf46a6d5..c6f7367c0 100644 --- a/API/DTOs/Reader/MarkReadDto.cs +++ b/API/DTOs/Reader/MarkReadDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Reader; -public class MarkReadDto +public sealed record MarkReadDto { public int SeriesId { get; init; } } diff --git a/API/DTOs/Reader/MarkVolumeReadDto.cs b/API/DTOs/Reader/MarkVolumeReadDto.cs index 47ffd2649..be95d2e98 100644 --- a/API/DTOs/Reader/MarkVolumeReadDto.cs +++ b/API/DTOs/Reader/MarkVolumeReadDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Reader; -public class MarkVolumeReadDto +public sealed record MarkVolumeReadDto { public int SeriesId { get; init; } public int VolumeId { get; init; } diff --git a/API/DTOs/Reader/MarkVolumesReadDto.cs b/API/DTOs/Reader/MarkVolumesReadDto.cs index ebe1cd76c..b07bfbc67 100644 --- a/API/DTOs/Reader/MarkVolumesReadDto.cs +++ b/API/DTOs/Reader/MarkVolumesReadDto.cs @@ -5,7 +5,7 @@ namespace API.DTOs.Reader; /// /// This is used for bulk updating a set of volume and or chapters in one go /// -public class MarkVolumesReadDto +public sealed record MarkVolumesReadDto { public int SeriesId { get; set; } /// diff --git a/API/DTOs/Reader/PersonalToCDto.cs b/API/DTOs/Reader/PersonalToCDto.cs index 144ed561f..c979d9d78 100644 --- a/API/DTOs/Reader/PersonalToCDto.cs +++ b/API/DTOs/Reader/PersonalToCDto.cs @@ -2,7 +2,7 @@ #nullable enable -public class PersonalToCDto +public sealed record PersonalToCDto { public required int ChapterId { get; set; } public required int PageNumber { get; set; } diff --git a/API/DTOs/Reader/RemoveBookmarkForSeriesDto.cs b/API/DTOs/Reader/RemoveBookmarkForSeriesDto.cs index ed6368a4f..ecbb744c8 100644 --- a/API/DTOs/Reader/RemoveBookmarkForSeriesDto.cs +++ b/API/DTOs/Reader/RemoveBookmarkForSeriesDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Reader; -public class RemoveBookmarkForSeriesDto +public sealed record RemoveBookmarkForSeriesDto { public int SeriesId { get; init; } } diff --git a/API/DTOs/ReadingLists/CBL/CblBook.cs b/API/DTOs/ReadingLists/CBL/CblBook.cs index 08930e208..d51795b8d 100644 --- a/API/DTOs/ReadingLists/CBL/CblBook.cs +++ b/API/DTOs/ReadingLists/CBL/CblBook.cs @@ -5,7 +5,7 @@ namespace API.DTOs.ReadingLists.CBL; [XmlRoot(ElementName="Book")] -public class CblBook +public sealed record CblBook { [XmlAttribute("Series")] public string Series { get; set; } diff --git a/API/DTOs/ReadingLists/CBL/CblConflictsDto.cs b/API/DTOs/ReadingLists/CBL/CblConflictsDto.cs index 70a002884..35234923f 100644 --- a/API/DTOs/ReadingLists/CBL/CblConflictsDto.cs +++ b/API/DTOs/ReadingLists/CBL/CblConflictsDto.cs @@ -3,7 +3,7 @@ namespace API.DTOs.ReadingLists.CBL; -public class CblConflictQuestion +public sealed record CblConflictQuestion { public string SeriesName { get; set; } public IList LibrariesIds { get; set; } diff --git a/API/DTOs/ReadingLists/CBL/CblImportSummary.cs b/API/DTOs/ReadingLists/CBL/CblImportSummary.cs index 136a31aa8..b9716421e 100644 --- a/API/DTOs/ReadingLists/CBL/CblImportSummary.cs +++ b/API/DTOs/ReadingLists/CBL/CblImportSummary.cs @@ -75,7 +75,7 @@ public enum CblImportReason InvalidFile = 9, } -public class CblBookResult +public sealed record CblBookResult { /// /// Order in the CBL @@ -114,7 +114,7 @@ public class CblBookResult /// /// Represents the summary from the Import of a given CBL /// -public class CblImportSummaryDto +public sealed record CblImportSummaryDto { public string CblName { get; set; } /// diff --git a/API/DTOs/ReadingLists/CBL/CblReadingList.cs b/API/DTOs/ReadingLists/CBL/CblReadingList.cs index 001e6434b..15b349f42 100644 --- a/API/DTOs/ReadingLists/CBL/CblReadingList.cs +++ b/API/DTOs/ReadingLists/CBL/CblReadingList.cs @@ -5,7 +5,7 @@ namespace API.DTOs.ReadingLists.CBL; [XmlRoot(ElementName="Books")] -public class CblBooks +public sealed record CblBooks { [XmlElement(ElementName="Book")] public List Book { get; set; } @@ -13,7 +13,7 @@ public class CblBooks [XmlRoot(ElementName="ReadingList")] -public class CblReadingList +public sealed record CblReadingList { /// /// Name of the Reading List diff --git a/API/DTOs/ReadingLists/CreateReadingListDto.cs b/API/DTOs/ReadingLists/CreateReadingListDto.cs index 783253007..543215722 100644 --- a/API/DTOs/ReadingLists/CreateReadingListDto.cs +++ b/API/DTOs/ReadingLists/CreateReadingListDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.ReadingLists; -public class CreateReadingListDto +public sealed record CreateReadingListDto { public string Title { get; init; } = default!; } diff --git a/API/DTOs/ReadingLists/DeleteReadingListsDto.cs b/API/DTOs/ReadingLists/DeleteReadingListsDto.cs index 8417f8132..8ce92f939 100644 --- a/API/DTOs/ReadingLists/DeleteReadingListsDto.cs +++ b/API/DTOs/ReadingLists/DeleteReadingListsDto.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations; namespace API.DTOs.ReadingLists; -public class DeleteReadingListsDto +public sealed record DeleteReadingListsDto { [Required] public IList ReadingListIds { get; set; } diff --git a/API/DTOs/ReadingLists/PromoteReadingListsDto.cs b/API/DTOs/ReadingLists/PromoteReadingListsDto.cs index f64bbb5ca..8915274de 100644 --- a/API/DTOs/ReadingLists/PromoteReadingListsDto.cs +++ b/API/DTOs/ReadingLists/PromoteReadingListsDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.ReadingLists; -public class PromoteReadingListsDto +public sealed record PromoteReadingListsDto { public IList ReadingListIds { get; init; } public bool Promoted { get; init; } diff --git a/API/DTOs/ReadingLists/ReadingListCast.cs b/API/DTOs/ReadingLists/ReadingListCast.cs new file mode 100644 index 000000000..855bb12b7 --- /dev/null +++ b/API/DTOs/ReadingLists/ReadingListCast.cs @@ -0,0 +1,21 @@ +using System.Collections.Generic; +using API.DTOs.Person; + +namespace API.DTOs.ReadingLists; + +public sealed record ReadingListCast +{ + public ICollection Writers { get; set; } = []; + public ICollection CoverArtists { get; set; } = []; + public ICollection Publishers { get; set; } = []; + public ICollection Characters { get; set; } = []; + public ICollection Pencillers { get; set; } = []; + public ICollection Inkers { get; set; } = []; + public ICollection Imprints { get; set; } = []; + public ICollection Colorists { get; set; } = []; + public ICollection Letterers { get; set; } = []; + public ICollection Editors { get; set; } = []; + public ICollection Translators { get; set; } = []; + public ICollection Teams { get; set; } = []; + public ICollection Locations { get; set; } = []; +} diff --git a/API/DTOs/ReadingLists/ReadingListDto.cs b/API/DTOs/ReadingLists/ReadingListDto.cs index 139039bf5..47a526411 100644 --- a/API/DTOs/ReadingLists/ReadingListDto.cs +++ b/API/DTOs/ReadingLists/ReadingListDto.cs @@ -1,10 +1,11 @@ using System; +using API.Entities.Enums; using API.Entities.Interfaces; namespace API.DTOs.ReadingLists; #nullable enable -public class ReadingListDto : IHasCoverImage +public sealed record ReadingListDto : IHasCoverImage { public int Id { get; init; } public string Title { get; set; } = default!; @@ -19,8 +20,8 @@ public class ReadingListDto : IHasCoverImage /// public string? CoverImage { get; set; } = string.Empty; - public string PrimaryColor { get; set; } = string.Empty; - public string SecondaryColor { get; set; } = string.Empty; + public string? PrimaryColor { get; set; } = string.Empty; + public string? SecondaryColor { get; set; } = string.Empty; /// /// Number of Items in the Reading List @@ -43,6 +44,15 @@ public class ReadingListDto : IHasCoverImage /// Maximum Month the Reading List starts /// public int EndingMonth { get; set; } + /// + /// The highest age rating from all Series within the reading list + /// + public required AgeRating AgeRating { get; set; } = AgeRating.Unknown; + + /// + /// Username of the User that owns (in the case of a promoted list) + /// + public string OwnerUserName { get; set; } public void ResetColorScape() { diff --git a/API/DTOs/ReadingLists/ReadingListInfoDto.cs b/API/DTOs/ReadingLists/ReadingListInfoDto.cs new file mode 100644 index 000000000..64a305f43 --- /dev/null +++ b/API/DTOs/ReadingLists/ReadingListInfoDto.cs @@ -0,0 +1,26 @@ +using API.DTOs.Reader; +using API.Entities.Interfaces; + +namespace API.DTOs.ReadingLists; + +public sealed record ReadingListInfoDto : IHasReadTimeEstimate +{ + /// + /// Total Pages across all Reading List Items + /// + public int Pages { get; set; } + /// + /// Total Word count across all Reading List Items + /// + public long WordCount { get; set; } + /// + /// Are ALL Reading List Items epub + /// + public bool IsAllEpub { get; set; } + /// + public int MinHoursToRead { get; set; } + /// + public int MaxHoursToRead { get; set; } + /// + public float AvgHoursToRead { get; set; } +} diff --git a/API/DTOs/ReadingLists/ReadingListItemDto.cs b/API/DTOs/ReadingLists/ReadingListItemDto.cs index f1238d333..8edec14f1 100644 --- a/API/DTOs/ReadingLists/ReadingListItemDto.cs +++ b/API/DTOs/ReadingLists/ReadingListItemDto.cs @@ -4,7 +4,7 @@ using API.Entities.Enums; namespace API.DTOs.ReadingLists; #nullable enable -public class ReadingListItemDto +public sealed record ReadingListItemDto { public int Id { get; init; } public int Order { get; init; } @@ -25,7 +25,7 @@ public class ReadingListItemDto /// /// Release Date from Chapter /// - public DateTime ReleaseDate { get; set; } + public DateTime? ReleaseDate { get; set; } /// /// Used internally only /// @@ -33,7 +33,7 @@ public class ReadingListItemDto /// /// The last time a reading list item (underlying chapter) was read by current authenticated user /// - public DateTime LastReadingProgressUtc { get; set; } + public DateTime? LastReadingProgressUtc { get; set; } /// /// File size of underlying item /// diff --git a/API/DTOs/ReadingLists/UpdateReadingListByChapterDto.cs b/API/DTOs/ReadingLists/UpdateReadingListByChapterDto.cs index 985f86ac0..6624c8a5c 100644 --- a/API/DTOs/ReadingLists/UpdateReadingListByChapterDto.cs +++ b/API/DTOs/ReadingLists/UpdateReadingListByChapterDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.ReadingLists; -public class UpdateReadingListByChapterDto +public sealed record UpdateReadingListByChapterDto { public int ChapterId { get; init; } public int SeriesId { get; init; } diff --git a/API/DTOs/ReadingLists/UpdateReadingListByMultipleDto.cs b/API/DTOs/ReadingLists/UpdateReadingListByMultipleDto.cs index 408963529..ba7625088 100644 --- a/API/DTOs/ReadingLists/UpdateReadingListByMultipleDto.cs +++ b/API/DTOs/ReadingLists/UpdateReadingListByMultipleDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.ReadingLists; -public class UpdateReadingListByMultipleDto +public sealed record UpdateReadingListByMultipleDto { public int SeriesId { get; init; } public int ReadingListId { get; init; } diff --git a/API/DTOs/ReadingLists/UpdateReadingListByMultipleSeriesDto.cs b/API/DTOs/ReadingLists/UpdateReadingListByMultipleSeriesDto.cs index f910e9c06..910a5744d 100644 --- a/API/DTOs/ReadingLists/UpdateReadingListByMultipleSeriesDto.cs +++ b/API/DTOs/ReadingLists/UpdateReadingListByMultipleSeriesDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.ReadingLists; -public class UpdateReadingListByMultipleSeriesDto +public sealed record UpdateReadingListByMultipleSeriesDto { public int ReadingListId { get; init; } public IReadOnlyList SeriesIds { get; init; } = default!; diff --git a/API/DTOs/ReadingLists/UpdateReadingListBySeriesDto.cs b/API/DTOs/ReadingLists/UpdateReadingListBySeriesDto.cs index 0590882bd..4bb4aa7bb 100644 --- a/API/DTOs/ReadingLists/UpdateReadingListBySeriesDto.cs +++ b/API/DTOs/ReadingLists/UpdateReadingListBySeriesDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.ReadingLists; -public class UpdateReadingListBySeriesDto +public sealed record UpdateReadingListBySeriesDto { public int SeriesId { get; init; } public int ReadingListId { get; init; } diff --git a/API/DTOs/ReadingLists/UpdateReadingListByVolumeDto.cs b/API/DTOs/ReadingLists/UpdateReadingListByVolumeDto.cs index f77c7d63a..422d1cc34 100644 --- a/API/DTOs/ReadingLists/UpdateReadingListByVolumeDto.cs +++ b/API/DTOs/ReadingLists/UpdateReadingListByVolumeDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.ReadingLists; -public class UpdateReadingListByVolumeDto +public sealed record UpdateReadingListByVolumeDto { public int VolumeId { get; init; } public int SeriesId { get; init; } diff --git a/API/DTOs/ReadingLists/UpdateReadingListDto.cs b/API/DTOs/ReadingLists/UpdateReadingListDto.cs index 6b590707a..de273d825 100644 --- a/API/DTOs/ReadingLists/UpdateReadingListDto.cs +++ b/API/DTOs/ReadingLists/UpdateReadingListDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.ReadingLists; -public class UpdateReadingListDto +public sealed record UpdateReadingListDto { [Required] public int ReadingListId { get; set; } diff --git a/API/DTOs/ReadingLists/UpdateReadingListPosition.cs b/API/DTOs/ReadingLists/UpdateReadingListPosition.cs index 3d0487144..04f2501a8 100644 --- a/API/DTOs/ReadingLists/UpdateReadingListPosition.cs +++ b/API/DTOs/ReadingLists/UpdateReadingListPosition.cs @@ -5,7 +5,7 @@ namespace API.DTOs.ReadingLists; /// /// DTO for moving a reading list item to another position within the same list /// -public class UpdateReadingListPosition +public sealed record UpdateReadingListPosition { [Required] public int ReadingListId { get; set; } [Required] public int ReadingListItemId { get; set; } diff --git a/API/DTOs/Recommendation/ExternalSeriesDetailDto.cs b/API/DTOs/Recommendation/ExternalSeriesDetailDto.cs deleted file mode 100644 index 9aa852fd7..000000000 --- a/API/DTOs/Recommendation/ExternalSeriesDetailDto.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Collections.Generic; -using API.DTOs.Scrobbling; -using API.Services.Plus; - -namespace API.DTOs.Recommendation; -#nullable enable - -public class ExternalSeriesDetailDto -{ - public string Name { get; set; } - public int? AniListId { get; set; } - public long? MALId { get; set; } - public IList Synonyms { get; set; } - public MediaFormat PlusMediaFormat { get; set; } - public string? SiteUrl { get; set; } - public string? CoverUrl { get; set; } - public IList Genres { get; set; } - public IList Staff { get; set; } - public IList Tags { get; set; } - public string? Summary { get; set; } - public int? VolumeCount { get; set; } - public int? ChapterCount { get; set; } - public ScrobbleProvider Provider { get; set; } = ScrobbleProvider.AniList; -} diff --git a/API/DTOs/Recommendation/ExternalSeriesDto.cs b/API/DTOs/Recommendation/ExternalSeriesDto.cs index 55d2d320c..752001a39 100644 --- a/API/DTOs/Recommendation/ExternalSeriesDto.cs +++ b/API/DTOs/Recommendation/ExternalSeriesDto.cs @@ -3,7 +3,7 @@ namespace API.DTOs.Recommendation; #nullable enable -public class ExternalSeriesDto +public sealed record ExternalSeriesDto { public required string Name { get; set; } public required string CoverUrl { get; set; } @@ -12,4 +12,6 @@ public class ExternalSeriesDto public int? AniListId { get; set; } public long? MalId { get; set; } public ScrobbleProvider Provider { get; set; } = ScrobbleProvider.AniList; + + } diff --git a/API/DTOs/Recommendation/MetadataTagDto.cs b/API/DTOs/Recommendation/MetadataTagDto.cs index b219dedc1..a7eb76284 100644 --- a/API/DTOs/Recommendation/MetadataTagDto.cs +++ b/API/DTOs/Recommendation/MetadataTagDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Recommendation; -public class MetadataTagDto +public sealed record MetadataTagDto { public string Name { get; set; } public string Description { get; private set; } diff --git a/API/DTOs/Recommendation/RecommendationDto.cs b/API/DTOs/Recommendation/RecommendationDto.cs index 679245a87..387661324 100644 --- a/API/DTOs/Recommendation/RecommendationDto.cs +++ b/API/DTOs/Recommendation/RecommendationDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.Recommendation; -public class RecommendationDto +public sealed record RecommendationDto { public IList OwnedSeries { get; set; } = new List(); public IList ExternalSeries { get; set; } = new List(); diff --git a/API/DTOs/Recommendation/SeriesStaffDto.cs b/API/DTOs/Recommendation/SeriesStaffDto.cs index 0c1e9759d..e074e8625 100644 --- a/API/DTOs/Recommendation/SeriesStaffDto.cs +++ b/API/DTOs/Recommendation/SeriesStaffDto.cs @@ -1,9 +1,11 @@ namespace API.DTOs.Recommendation; #nullable enable -public class SeriesStaffDto +public sealed record SeriesStaffDto { public required string Name { get; set; } + public string? FirstName { get; set; } + public string? LastName { get; set; } public required string Url { get; set; } public required string Role { get; set; } public string? ImageUrl { get; set; } diff --git a/API/DTOs/RefreshSeriesDto.cs b/API/DTOs/RefreshSeriesDto.cs index 0e94fc44b..ad26afba2 100644 --- a/API/DTOs/RefreshSeriesDto.cs +++ b/API/DTOs/RefreshSeriesDto.cs @@ -3,7 +3,7 @@ /// /// Used for running some task against a Series. /// -public class RefreshSeriesDto +public sealed record RefreshSeriesDto { /// /// Library Id series belongs to diff --git a/API/DTOs/RegisterDto.cs b/API/DTOs/RegisterDto.cs index d0118e385..e117af872 100644 --- a/API/DTOs/RegisterDto.cs +++ b/API/DTOs/RegisterDto.cs @@ -1,15 +1,16 @@ using System.ComponentModel.DataAnnotations; namespace API.DTOs; +#nullable enable -public class RegisterDto +public sealed record RegisterDto { [Required] public string Username { get; init; } = default!; /// /// An email to register with. Optional. Provides Forgot Password functionality /// - public string Email { get; init; } = default!; + public string? Email { get; set; } = default!; [Required] [StringLength(256, MinimumLength = 6)] public string Password { get; set; } = default!; diff --git a/API/DTOs/ScanFolderDto.cs b/API/DTOs/ScanFolderDto.cs index 684de909e..141f7f0b5 100644 --- a/API/DTOs/ScanFolderDto.cs +++ b/API/DTOs/ScanFolderDto.cs @@ -3,7 +3,7 @@ /// /// DTO for requesting a folder to be scanned /// -public class ScanFolderDto +public sealed record ScanFolderDto { /// /// Api key for a user with Admin permissions diff --git a/API/DTOs/Scrobbling/MalUserInfoDto.cs b/API/DTOs/Scrobbling/MalUserInfoDto.cs index 407639e2a..b6fefc053 100644 --- a/API/DTOs/Scrobbling/MalUserInfoDto.cs +++ b/API/DTOs/Scrobbling/MalUserInfoDto.cs @@ -3,7 +3,7 @@ /// /// Information about a User's MAL connection /// -public class MalUserInfoDto +public sealed record MalUserInfoDto { public required string Username { get; set; } /// diff --git a/API/DTOs/Scrobbling/MediaRecommendationDto.cs b/API/DTOs/Scrobbling/MediaRecommendationDto.cs index c83694b2b..476d77279 100644 --- a/API/DTOs/Scrobbling/MediaRecommendationDto.cs +++ b/API/DTOs/Scrobbling/MediaRecommendationDto.cs @@ -2,8 +2,9 @@ using API.Services.Plus; namespace API.DTOs.Scrobbling; +#nullable enable -public record MediaRecommendationDto +public sealed record MediaRecommendationDto { public int Rating { get; set; } public IEnumerable RecommendationNames { get; set; } = null!; diff --git a/API/DTOs/Scrobbling/PlusSeriesDto.cs b/API/DTOs/Scrobbling/PlusSeriesDto.cs index 552a86575..4d0ef4ea1 100644 --- a/API/DTOs/Scrobbling/PlusSeriesDto.cs +++ b/API/DTOs/Scrobbling/PlusSeriesDto.cs @@ -1,14 +1,22 @@ namespace API.DTOs.Scrobbling; +#nullable enable -public record PlusSeriesDto +/// +/// Represents information about a potential Series for Kavita+ +/// +public sealed record PlusSeriesRequestDto { public int? AniListId { get; set; } public long? MalId { get; set; } public string? GoogleBooksId { get; set; } public string? MangaDexId { get; set; } + /// + /// ComicBookRoundup Id + /// + public int? CbrId { get; set; } public string SeriesName { get; set; } public string? AltSeriesName { get; set; } - public MediaFormat MediaFormat { get; set; } + public PlusMediaFormat MediaFormat { get; set; } /// /// Optional but can help with matching /// diff --git a/API/DTOs/Scrobbling/ScrobbleDto.cs b/API/DTOs/Scrobbling/ScrobbleDto.cs index ca2c2e528..b90441059 100644 --- a/API/DTOs/Scrobbling/ScrobbleDto.cs +++ b/API/DTOs/Scrobbling/ScrobbleDto.cs @@ -22,7 +22,7 @@ public enum ScrobbleEventType /// /// Represents PlusMediaFormat /// -public enum MediaFormat +public enum PlusMediaFormat { [Description("Manga")] Manga = 1, @@ -36,7 +36,7 @@ public enum MediaFormat } -public class ScrobbleDto +public sealed record ScrobbleDto { /// /// User's access token to allow us to talk on their behalf @@ -44,7 +44,7 @@ public class ScrobbleDto public string AniListToken { get; set; } public string SeriesName { get; set; } public string LocalizedSeriesName { get; set; } - public MediaFormat Format { get; set; } + public PlusMediaFormat Format { get; set; } public int? Year { get; set; } /// /// Optional AniListId if present on Kavita's WebLinks diff --git a/API/DTOs/Scrobbling/ScrobbleErrorDto.cs b/API/DTOs/Scrobbling/ScrobbleErrorDto.cs index da85f28f1..7caaad1ca 100644 --- a/API/DTOs/Scrobbling/ScrobbleErrorDto.cs +++ b/API/DTOs/Scrobbling/ScrobbleErrorDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.Scrobbling; -public class ScrobbleErrorDto +public sealed record ScrobbleErrorDto { /// /// Developer defined string diff --git a/API/DTOs/Scrobbling/ScrobbleEventDto.cs b/API/DTOs/Scrobbling/ScrobbleEventDto.cs index 298e32180..562d923ff 100644 --- a/API/DTOs/Scrobbling/ScrobbleEventDto.cs +++ b/API/DTOs/Scrobbling/ScrobbleEventDto.cs @@ -1,9 +1,11 @@ using System; namespace API.DTOs.Scrobbling; +#nullable enable -public class ScrobbleEventDto +public sealed record ScrobbleEventDto { + public long Id { get; init; } public string SeriesName { get; set; } public int SeriesId { get; set; } public int LibraryId { get; set; } diff --git a/API/DTOs/Scrobbling/ScrobbleHoldDto.cs b/API/DTOs/Scrobbling/ScrobbleHoldDto.cs index dcfe7726f..3e09e4799 100644 --- a/API/DTOs/Scrobbling/ScrobbleHoldDto.cs +++ b/API/DTOs/Scrobbling/ScrobbleHoldDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.Scrobbling; -public class ScrobbleHoldDto +public sealed record ScrobbleHoldDto { public string SeriesName { get; set; } public int SeriesId { get; set; } diff --git a/API/DTOs/Scrobbling/ScrobbleResponseDto.cs b/API/DTOs/Scrobbling/ScrobbleResponseDto.cs index a63e955d7..ad66729d0 100644 --- a/API/DTOs/Scrobbling/ScrobbleResponseDto.cs +++ b/API/DTOs/Scrobbling/ScrobbleResponseDto.cs @@ -4,9 +4,10 @@ /// /// Response from Kavita+ Scrobble API /// -public class ScrobbleResponseDto +public sealed record ScrobbleResponseDto { public bool Successful { get; set; } public string? ErrorMessage { get; set; } + public string? ExtraInformation {get; set;} public int RateLeft { get; set; } } diff --git a/API/DTOs/Search/BookmarkSearchResultDto.cs b/API/DTOs/Search/BookmarkSearchResultDto.cs index 5d53add1f..c11d2a2b8 100644 --- a/API/DTOs/Search/BookmarkSearchResultDto.cs +++ b/API/DTOs/Search/BookmarkSearchResultDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Search; -public class BookmarkSearchResultDto +public sealed record BookmarkSearchResultDto { public int LibraryId { get; set; } public int VolumeId { get; set; } diff --git a/API/DTOs/Search/SearchResultDto.cs b/API/DTOs/Search/SearchResultDto.cs index 6fcae3b5d..c497b55dd 100644 --- a/API/DTOs/Search/SearchResultDto.cs +++ b/API/DTOs/Search/SearchResultDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.Search; -public class SearchResultDto +public sealed record SearchResultDto { public int SeriesId { get; init; } public string Name { get; init; } = default!; diff --git a/API/DTOs/Search/SearchResultGroupDto.cs b/API/DTOs/Search/SearchResultGroupDto.cs index f7a622664..11c4bdc08 100644 --- a/API/DTOs/Search/SearchResultGroupDto.cs +++ b/API/DTOs/Search/SearchResultGroupDto.cs @@ -2,6 +2,7 @@ using API.DTOs.Collection; using API.DTOs.CollectionTags; using API.DTOs.Metadata; +using API.DTOs.Person; using API.DTOs.Reader; using API.DTOs.ReadingLists; @@ -10,7 +11,7 @@ namespace API.DTOs.Search; /// /// Represents all Search results for a query /// -public class SearchResultGroupDto +public sealed record SearchResultGroupDto { public IEnumerable Libraries { get; set; } = default!; public IEnumerable Series { get; set; } = default!; diff --git a/API/DTOs/SeriesByIdsDto.cs b/API/DTOs/SeriesByIdsDto.cs index 12e13d96f..cb4c52b1e 100644 --- a/API/DTOs/SeriesByIdsDto.cs +++ b/API/DTOs/SeriesByIdsDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs; -public class SeriesByIdsDto +public sealed record SeriesByIdsDto { public int[] SeriesIds { get; init; } = default!; } diff --git a/API/DTOs/SeriesDetail/NextExpectedChapterDto.cs b/API/DTOs/SeriesDetail/NextExpectedChapterDto.cs index 0f1a8eb4b..1bea81c84 100644 --- a/API/DTOs/SeriesDetail/NextExpectedChapterDto.cs +++ b/API/DTOs/SeriesDetail/NextExpectedChapterDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.SeriesDetail; -public class NextExpectedChapterDto +public sealed record NextExpectedChapterDto { public float ChapterNumber { get; set; } public float VolumeNumber { get; set; } diff --git a/API/DTOs/SeriesDetail/RelatedSeriesDto.cs b/API/DTOs/SeriesDetail/RelatedSeriesDto.cs index 29b9eb263..a186dc295 100644 --- a/API/DTOs/SeriesDetail/RelatedSeriesDto.cs +++ b/API/DTOs/SeriesDetail/RelatedSeriesDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.SeriesDetail; -public class RelatedSeriesDto +public sealed record RelatedSeriesDto { /// /// The parent relationship Series diff --git a/API/DTOs/SeriesDetail/SeriesDetailDto.cs b/API/DTOs/SeriesDetail/SeriesDetailDto.cs index 65d657c67..c4f15552d 100644 --- a/API/DTOs/SeriesDetail/SeriesDetailDto.cs +++ b/API/DTOs/SeriesDetail/SeriesDetailDto.cs @@ -7,7 +7,7 @@ namespace API.DTOs.SeriesDetail; /// This is a special DTO for a UI page in Kavita. This performs sorting and grouping and returns exactly what UI requires for layout. /// This is subject to change, do not rely on this Data model. /// -public class SeriesDetailDto +public sealed record SeriesDetailDto { /// /// Specials for the Series. These will have their title and range cleaned to remove the special marker and prepare diff --git a/API/DTOs/SeriesDetail/SeriesDetailPlusDto.cs b/API/DTOs/SeriesDetail/SeriesDetailPlusDto.cs index 59ce47bf6..95f5f39bd 100644 --- a/API/DTOs/SeriesDetail/SeriesDetailPlusDto.cs +++ b/API/DTOs/SeriesDetail/SeriesDetailPlusDto.cs @@ -1,15 +1,18 @@ using System.Collections.Generic; +using API.DTOs.KavitaPlus.Metadata; using API.DTOs.Recommendation; namespace API.DTOs.SeriesDetail; +#nullable enable /// /// All the data from Kavita+ for Series Detail /// /// This is what the UI sees, not what the API sends back -public class SeriesDetailPlusDto +public sealed record SeriesDetailPlusDto { public RecommendationDto? Recommendations { get; set; } public IEnumerable Reviews { get; set; } public IEnumerable? Ratings { get; set; } + public ExternalSeriesDetailDto? Series { get; set; } } diff --git a/API/DTOs/SeriesDetail/UpdateRelatedSeriesDto.cs b/API/DTOs/SeriesDetail/UpdateRelatedSeriesDto.cs index f19ad9ca8..a1bb2057e 100644 --- a/API/DTOs/SeriesDetail/UpdateRelatedSeriesDto.cs +++ b/API/DTOs/SeriesDetail/UpdateRelatedSeriesDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.SeriesDetail; -public class UpdateRelatedSeriesDto +public sealed record UpdateRelatedSeriesDto { public int SeriesId { get; set; } public IList Adaptations { get; set; } = default!; diff --git a/API/DTOs/SeriesDetail/UpdateUserReviewDto.cs b/API/DTOs/SeriesDetail/UpdateUserReviewDto.cs index b25b01672..7af9441c1 100644 --- a/API/DTOs/SeriesDetail/UpdateUserReviewDto.cs +++ b/API/DTOs/SeriesDetail/UpdateUserReviewDto.cs @@ -1,10 +1,10 @@ -using System.ComponentModel.DataAnnotations; - + namespace API.DTOs.SeriesDetail; #nullable enable -public class UpdateUserReviewDto +public sealed record UpdateUserReviewDto { public int SeriesId { get; set; } + public int? ChapterId { get; set; } public string Body { get; set; } } diff --git a/API/DTOs/SeriesDetail/UserReviewDto.cs b/API/DTOs/SeriesDetail/UserReviewDto.cs index 0e080d43f..9e05bbd65 100644 --- a/API/DTOs/SeriesDetail/UserReviewDto.cs +++ b/API/DTOs/SeriesDetail/UserReviewDto.cs @@ -1,4 +1,6 @@ -using API.Services.Plus; +using API.Entities; +using API.Entities.Enums; +using API.Services.Plus; namespace API.DTOs.SeriesDetail; #nullable enable @@ -7,7 +9,7 @@ namespace API.DTOs.SeriesDetail; /// Represents a User Review for a given Series /// /// The user does not need to be a Kavita user -public class UserReviewDto +public sealed record UserReviewDto { /// /// A tagline for the review @@ -26,6 +28,7 @@ public class UserReviewDto /// The series this is for /// public int SeriesId { get; set; } + public int? ChapterId { get; set; } /// /// The library this series belongs in /// @@ -54,4 +57,8 @@ public class UserReviewDto /// If this review is External, which Provider did it come from /// public ScrobbleProvider Provider { get; set; } = ScrobbleProvider.Kavita; + /// + /// Source of the Rating + /// + public RatingAuthority Authority { get; set; } = RatingAuthority.User; } diff --git a/API/DTOs/SeriesDto.cs b/API/DTOs/SeriesDto.cs index 445044eef..8a49d4c05 100644 --- a/API/DTOs/SeriesDto.cs +++ b/API/DTOs/SeriesDto.cs @@ -5,14 +5,21 @@ using API.Entities.Interfaces; namespace API.DTOs; #nullable enable -public class SeriesDto : IHasReadTimeEstimate, IHasCoverImage +public sealed record SeriesDto : IHasReadTimeEstimate, IHasCoverImage { + /// public int Id { get; init; } + /// public string? Name { get; init; } + /// public string? OriginalName { get; init; } + /// public string? LocalizedName { get; init; } + /// public string? SortName { get; init; } + /// public int Pages { get; init; } + /// public bool CoverImageLocked { get; set; } /// /// Sum of pages read from linked Volumes. Calculated at API-time. @@ -22,9 +29,7 @@ public class SeriesDto : IHasReadTimeEstimate, IHasCoverImage /// DateTime representing last time the series was Read. Calculated at API-time. /// public DateTime LatestReadDate { get; set; } - /// - /// DateTime representing last time a chapter was added to the Series - /// + /// public DateTime LastChapterAdded { get; set; } /// /// Rating from logged in user. Calculated at API-time. @@ -35,17 +40,19 @@ public class SeriesDto : IHasReadTimeEstimate, IHasCoverImage /// public bool HasUserRated { get; set; } + /// public MangaFormat Format { get; set; } + /// public DateTime Created { get; set; } - public bool NameLocked { get; set; } + /// public bool SortNameLocked { get; set; } + /// public bool LocalizedNameLocked { get; set; } - /// - /// Total number of words for the series. Only applies to epubs. - /// + /// public long WordCount { get; set; } + /// public int LibraryId { get; set; } public string LibraryName { get; set; } = default!; /// @@ -54,23 +61,25 @@ public class SeriesDto : IHasReadTimeEstimate, IHasCoverImage public int MaxHoursToRead { get; set; } /// public float AvgHoursToRead { get; set; } - /// - /// The highest level folder for this Series - /// + /// public string FolderPath { get; set; } = default!; - /// - /// Lowest path (that is under library root) that contains all files for the series. - /// - /// must be used before setting + /// public string? LowestFolderPath { get; set; } - /// - /// The last time the folder for this series was scanned - /// + /// public DateTime LastFolderScanned { get; set; } + #region KavitaPlus + /// + public bool DontMatch { get; set; } + /// + public bool IsBlacklisted { get; set; } + #endregion + /// public string? CoverImage { get; set; } - public string PrimaryColor { get; set; } - public string SecondaryColor { get; set; } + /// + public string? PrimaryColor { get; set; } = string.Empty; + /// + public string? SecondaryColor { get; set; } = string.Empty; public void ResetColorScape() { diff --git a/API/DTOs/SeriesMetadataDto.cs b/API/DTOs/SeriesMetadataDto.cs index 3f344dff5..fa745148e 100644 --- a/API/DTOs/SeriesMetadataDto.cs +++ b/API/DTOs/SeriesMetadataDto.cs @@ -1,10 +1,11 @@ using System.Collections.Generic; using API.DTOs.Metadata; +using API.DTOs.Person; using API.Entities.Enums; namespace API.DTOs; -public class SeriesMetadataDto +public sealed record SeriesMetadataDto { public int Id { get; set; } public string Summary { get; set; } = string.Empty; diff --git a/API/DTOs/Settings/SMTPConfigDto.cs b/API/DTOs/Settings/SMTPConfigDto.cs index 07cc58cb8..c14140062 100644 --- a/API/DTOs/Settings/SMTPConfigDto.cs +++ b/API/DTOs/Settings/SMTPConfigDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Settings; -public class SmtpConfigDto +public sealed record SmtpConfigDto { public string SenderAddress { get; set; } = string.Empty; public string SenderDisplayName { get; set; } = string.Empty; diff --git a/API/DTOs/Settings/ServerSettingDTO.cs b/API/DTOs/Settings/ServerSettingDTO.cs index 45abcc528..372042250 100644 --- a/API/DTOs/Settings/ServerSettingDTO.cs +++ b/API/DTOs/Settings/ServerSettingDTO.cs @@ -1,10 +1,12 @@ using System; +using System.Text.Json.Serialization; using API.Entities.Enums; using API.Services; namespace API.DTOs.Settings; +#nullable enable -public class ServerSettingDto +public sealed record ServerSettingDto { public string CacheDirectory { get; set; } = default!; @@ -44,6 +46,7 @@ public class ServerSettingDto /// /// Represents a unique Id to this Kavita installation. Only used in Stats to identify unique installs. /// + public string InstallId { get; set; } = default!; /// /// The format that should be used when saving media for Kavita diff --git a/API/DTOs/SideNav/BulkUpdateSideNavStreamVisibilityDto.cs b/API/DTOs/SideNav/BulkUpdateSideNavStreamVisibilityDto.cs index 1b081913d..ae1d927a9 100644 --- a/API/DTOs/SideNav/BulkUpdateSideNavStreamVisibilityDto.cs +++ b/API/DTOs/SideNav/BulkUpdateSideNavStreamVisibilityDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.SideNav; -public class BulkUpdateSideNavStreamVisibilityDto +public sealed record BulkUpdateSideNavStreamVisibilityDto { public required IList Ids { get; set; } public required bool Visibility { get; set; } diff --git a/API/DTOs/SideNav/ExternalSourceDto.cs b/API/DTOs/SideNav/ExternalSourceDto.cs index e9ae03066..382124e8a 100644 --- a/API/DTOs/SideNav/ExternalSourceDto.cs +++ b/API/DTOs/SideNav/ExternalSourceDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.SideNav; -public class ExternalSourceDto +public sealed record ExternalSourceDto { public required int Id { get; set; } = 0; public required string Name { get; set; } diff --git a/API/DTOs/SideNav/SideNavStreamDto.cs b/API/DTOs/SideNav/SideNavStreamDto.cs index 1f3453611..f4c196244 100644 --- a/API/DTOs/SideNav/SideNavStreamDto.cs +++ b/API/DTOs/SideNav/SideNavStreamDto.cs @@ -2,8 +2,9 @@ using API.Entities.Enums; namespace API.DTOs.SideNav; +#nullable enable -public class SideNavStreamDto +public sealed record SideNavStreamDto { public int Id { get; set; } public required string Name { get; set; } diff --git a/API/DTOs/StandaloneChapterDto.cs b/API/DTOs/StandaloneChapterDto.cs index 6d8b5423d..2f4cd2ee1 100644 --- a/API/DTOs/StandaloneChapterDto.cs +++ b/API/DTOs/StandaloneChapterDto.cs @@ -1,6 +1,7 @@ using API.Entities.Enums; namespace API.DTOs; +#nullable enable /// /// Used on Person Profile page diff --git a/API/DTOs/Statistics/Count.cs b/API/DTOs/Statistics/Count.cs index 411b44897..1577e682c 100644 --- a/API/DTOs/Statistics/Count.cs +++ b/API/DTOs/Statistics/Count.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Statistics; -public class StatCount : ICount +public sealed record StatCount : ICount { public T Value { get; set; } = default!; public long Count { get; set; } diff --git a/API/DTOs/Statistics/FileExtensionBreakdownDto.cs b/API/DTOs/Statistics/FileExtensionBreakdownDto.cs index 1f122d992..7a248caef 100644 --- a/API/DTOs/Statistics/FileExtensionBreakdownDto.cs +++ b/API/DTOs/Statistics/FileExtensionBreakdownDto.cs @@ -4,7 +4,7 @@ using API.Entities.Enums; namespace API.DTOs.Statistics; #nullable enable -public class FileExtensionDto +public sealed record FileExtensionDto { public string? Extension { get; set; } public MangaFormat Format { get; set; } @@ -12,7 +12,7 @@ public class FileExtensionDto public long TotalFiles { get; set; } } -public class FileExtensionBreakdownDto +public sealed record FileExtensionBreakdownDto { /// /// Total bytes for all files diff --git a/API/DTOs/Statistics/KavitaPlusMetadataBreakdownDto.cs b/API/DTOs/Statistics/KavitaPlusMetadataBreakdownDto.cs deleted file mode 100644 index 9ce44b6fa..000000000 --- a/API/DTOs/Statistics/KavitaPlusMetadataBreakdownDto.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace API.DTOs.Statistics; - -public class KavitaPlusMetadataBreakdownDto -{ - /// - /// Total amount of Series - /// - public int TotalSeries { get; set; } - /// - /// Series on the Blacklist (errored or bad match) - /// - public int ErroredSeries { get; set; } - /// - /// Completed so far - /// - public int SeriesCompleted { get; set; } -} diff --git a/API/DTOs/Statistics/PagesReadOnADayCount.cs b/API/DTOs/Statistics/PagesReadOnADayCount.cs index b1a6bb1ea..fc56d9cc0 100644 --- a/API/DTOs/Statistics/PagesReadOnADayCount.cs +++ b/API/DTOs/Statistics/PagesReadOnADayCount.cs @@ -2,7 +2,7 @@ namespace API.DTOs.Statistics; -public class PagesReadOnADayCount : ICount +public sealed record PagesReadOnADayCount : ICount { /// /// The day of the readings diff --git a/API/DTOs/Statistics/ReadHistoryEvent.cs b/API/DTOs/Statistics/ReadHistoryEvent.cs index adb4040ed..5d8262aef 100644 --- a/API/DTOs/Statistics/ReadHistoryEvent.cs +++ b/API/DTOs/Statistics/ReadHistoryEvent.cs @@ -1,11 +1,12 @@ using System; namespace API.DTOs.Statistics; +#nullable enable /// /// Represents a single User's reading event /// -public class ReadHistoryEvent +public sealed record ReadHistoryEvent { public int UserId { get; set; } public required string? UserName { get; set; } = default!; @@ -13,6 +14,7 @@ public class ReadHistoryEvent public int SeriesId { get; set; } public required string SeriesName { get; set; } = default!; public DateTime ReadDate { get; set; } + public DateTime ReadDateUtc { get; set; } public int ChapterId { get; set; } public required float ChapterNumber { get; set; } = default!; } diff --git a/API/DTOs/Statistics/ServerStatisticsDto.cs b/API/DTOs/Statistics/ServerStatisticsDto.cs index 57fd5abce..3d22d9a56 100644 --- a/API/DTOs/Statistics/ServerStatisticsDto.cs +++ b/API/DTOs/Statistics/ServerStatisticsDto.cs @@ -3,7 +3,7 @@ namespace API.DTOs.Statistics; #nullable enable -public class ServerStatisticsDto +public sealed record ServerStatisticsDto { public long ChapterCount { get; set; } public long VolumeCount { get; set; } diff --git a/API/DTOs/Statistics/TopReadsDto.cs b/API/DTOs/Statistics/TopReadsDto.cs index 806360533..d11594dca 100644 --- a/API/DTOs/Statistics/TopReadsDto.cs +++ b/API/DTOs/Statistics/TopReadsDto.cs @@ -1,7 +1,7 @@ namespace API.DTOs.Statistics; #nullable enable -public class TopReadDto +public sealed record TopReadDto { public int UserId { get; set; } public string? Username { get; set; } = default!; diff --git a/API/DTOs/Statistics/UserReadStatistics.cs b/API/DTOs/Statistics/UserReadStatistics.cs index 5e3f5aa5d..5c6935c6e 100644 --- a/API/DTOs/Statistics/UserReadStatistics.cs +++ b/API/DTOs/Statistics/UserReadStatistics.cs @@ -2,8 +2,9 @@ using System.Collections.Generic; namespace API.DTOs.Statistics; +#nullable enable -public class UserReadStatistics +public sealed record UserReadStatistics { /// /// Total number of pages read diff --git a/API/DTOs/Stats/FileExtensionExportDto.cs b/API/DTOs/Stats/FileExtensionExportDto.cs index 6ed554d75..e881960a5 100644 --- a/API/DTOs/Stats/FileExtensionExportDto.cs +++ b/API/DTOs/Stats/FileExtensionExportDto.cs @@ -5,7 +5,7 @@ namespace API.DTOs.Stats; /// /// Excel export for File Extension Report /// -public class FileExtensionExportDto +public sealed record FileExtensionExportDto { [Name("Path")] public string FilePath { get; set; } diff --git a/API/DTOs/Stats/ServerInfoSlimDto.cs b/API/DTOs/Stats/ServerInfoSlimDto.cs index ef44bb408..f1abb2e1d 100644 --- a/API/DTOs/Stats/ServerInfoSlimDto.cs +++ b/API/DTOs/Stats/ServerInfoSlimDto.cs @@ -1,11 +1,12 @@ using System; namespace API.DTOs.Stats; +#nullable enable /// /// This is just for the Server tab on UI /// -public class ServerInfoSlimDto +public sealed record ServerInfoSlimDto { /// /// Unique Id that represents a unique install diff --git a/API/DTOs/Stats/V3/LibraryStatV3.cs b/API/DTOs/Stats/V3/LibraryStatV3.cs index 51af34b58..33ac86d2b 100644 --- a/API/DTOs/Stats/V3/LibraryStatV3.cs +++ b/API/DTOs/Stats/V3/LibraryStatV3.cs @@ -4,7 +4,7 @@ using API.Entities.Enums; namespace API.DTOs.Stats.V3; -public class LibraryStatV3 +public sealed record LibraryStatV3 { public bool IncludeInDashboard { get; set; } public bool IncludeInSearch { get; set; } diff --git a/API/DTOs/Stats/V3/RelationshipStatV3.cs b/API/DTOs/Stats/V3/RelationshipStatV3.cs index e8e1e7440..37b63cb9a 100644 --- a/API/DTOs/Stats/V3/RelationshipStatV3.cs +++ b/API/DTOs/Stats/V3/RelationshipStatV3.cs @@ -5,7 +5,7 @@ namespace API.DTOs.Stats.V3; /// /// KavitaStats - Information about Series Relationships /// -public class RelationshipStatV3 +public sealed record RelationshipStatV3 { public int Count { get; set; } public RelationKind Relationship { get; set; } diff --git a/API/DTOs/Stats/V3/ServerInfoV3Dto.cs b/API/DTOs/Stats/V3/ServerInfoV3Dto.cs index edc2ad2b4..8ed3079f5 100644 --- a/API/DTOs/Stats/V3/ServerInfoV3Dto.cs +++ b/API/DTOs/Stats/V3/ServerInfoV3Dto.cs @@ -7,7 +7,7 @@ namespace API.DTOs.Stats.V3; /// /// Represents information about a Kavita Installation for Kavita Stats v3 API /// -public class ServerInfoV3Dto +public sealed record ServerInfoV3Dto { /// /// Unique Id that represents a unique install @@ -55,6 +55,11 @@ public class ServerInfoV3Dto /// /// This pings a health check and does not capture any IP Information public long TimeToPingKavitaStatsApi { get; set; } + /// + /// If using the downloading metadata feature + /// + /// Kavita+ Only + public bool MatchedMetadataEnabled { get; set; } diff --git a/API/DTOs/Stats/V3/UserStatV3.cs b/API/DTOs/Stats/V3/UserStatV3.cs index 7f4e080ba..450a2e409 100644 --- a/API/DTOs/Stats/V3/UserStatV3.cs +++ b/API/DTOs/Stats/V3/UserStatV3.cs @@ -5,7 +5,7 @@ using API.Entities.Enums.Device; namespace API.DTOs.Stats.V3; -public class UserStatV3 +public sealed record UserStatV3 { public AgeRestriction AgeRestriction { get; set; } /// diff --git a/API/DTOs/System/DirectoryDto.cs b/API/DTOs/System/DirectoryDto.cs index e6e94f4e4..3b1408f7f 100644 --- a/API/DTOs/System/DirectoryDto.cs +++ b/API/DTOs/System/DirectoryDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.System; -public class DirectoryDto +public sealed record DirectoryDto { /// /// Name of the directory diff --git a/API/DTOs/TachiyomiChapterDto.cs b/API/DTOs/TachiyomiChapterDto.cs index 03e242dfa..ecdd5115c 100644 --- a/API/DTOs/TachiyomiChapterDto.cs +++ b/API/DTOs/TachiyomiChapterDto.cs @@ -1,4 +1,5 @@ namespace API.DTOs; +#nullable enable /// /// This is explicitly for Tachiyomi. Number field was removed in v0.8.0, but Tachiyomi needs it for the hacks. diff --git a/API/DTOs/Theme/ColorScapeDto.cs b/API/DTOs/Theme/ColorScapeDto.cs index 066e87d84..2ebd96e2b 100644 --- a/API/DTOs/Theme/ColorScapeDto.cs +++ b/API/DTOs/Theme/ColorScapeDto.cs @@ -4,7 +4,7 @@ /// /// A set of colors for the color scape system in the UI /// -public class ColorScapeDto +public sealed record ColorScapeDto { public string? Primary { get; set; } public string? Secondary { get; set; } diff --git a/API/DTOs/Theme/DownloadableSiteThemeDto.cs b/API/DTOs/Theme/DownloadableSiteThemeDto.cs index dbcedfe61..b27263d92 100644 --- a/API/DTOs/Theme/DownloadableSiteThemeDto.cs +++ b/API/DTOs/Theme/DownloadableSiteThemeDto.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; namespace API.DTOs.Theme; -public class DownloadableSiteThemeDto +public sealed record DownloadableSiteThemeDto { /// /// Theme Name diff --git a/API/DTOs/Theme/SiteThemeDto.cs b/API/DTOs/Theme/SiteThemeDto.cs index eb2a14904..7ae8369e9 100644 --- a/API/DTOs/Theme/SiteThemeDto.cs +++ b/API/DTOs/Theme/SiteThemeDto.cs @@ -7,7 +7,7 @@ namespace API.DTOs.Theme; /// /// Represents a set of css overrides the user can upload to Kavita and will load into webui /// -public class SiteThemeDto +public sealed record SiteThemeDto { public int Id { get; set; } /// diff --git a/API/DTOs/Theme/UpdateDefaultThemeDto.cs b/API/DTOs/Theme/UpdateDefaultThemeDto.cs index 0f2b129f3..aac0858c3 100644 --- a/API/DTOs/Theme/UpdateDefaultThemeDto.cs +++ b/API/DTOs/Theme/UpdateDefaultThemeDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Theme; -public class UpdateDefaultThemeDto +public sealed record UpdateDefaultThemeDto { public int ThemeId { get; set; } } diff --git a/API/DTOs/Update/UpdateNotificationDto.cs b/API/DTOs/Update/UpdateNotificationDto.cs index a83aa072b..b535684f0 100644 --- a/API/DTOs/Update/UpdateNotificationDto.cs +++ b/API/DTOs/Update/UpdateNotificationDto.cs @@ -1,9 +1,12 @@ -namespace API.DTOs.Update; +using System.Collections.Generic; +using System.Runtime.InteropServices.JavaScript; + +namespace API.DTOs.Update; /// /// Update Notification denoting a new release available for user to update to /// -public class UpdateNotificationDto +public sealed record UpdateNotificationDto { /// /// Current installed Version @@ -21,11 +24,11 @@ public class UpdateNotificationDto /// /// Title of the release /// - public required string UpdateTitle { get; init; } + public required string UpdateTitle { get; set; } /// /// Github Url /// - public required string UpdateUrl { get; init; } + public required string UpdateUrl { get; set; } /// /// If this install is within Docker /// @@ -37,7 +40,7 @@ public class UpdateNotificationDto /// /// Date of the publish /// - public required string PublishDate { get; init; } + public required string PublishDate { get; set; } /// /// Is the server on a nightly within this release /// @@ -50,4 +53,18 @@ public class UpdateNotificationDto /// Is the server on this version /// public bool IsReleaseEqual { get; set; } + + public IList Added { get; set; } + public IList Removed { get; set; } + public IList Changed { get; set; } + public IList Fixed { get; set; } + public IList Theme { get; set; } + public IList Developer { get; set; } + public IList Api { get; set; } + public IList FeatureRequests { get; set; } + public IList KnownIssues { get; set; } + /// + /// The part above the changelog part + /// + public string BlogPart { get; set; } } diff --git a/API/DTOs/UpdateChapterDto.cs b/API/DTOs/UpdateChapterDto.cs index 2ca0a12a9..9ead8adc8 100644 --- a/API/DTOs/UpdateChapterDto.cs +++ b/API/DTOs/UpdateChapterDto.cs @@ -1,11 +1,12 @@ using System; using System.Collections.Generic; using API.DTOs.Metadata; +using API.DTOs.Person; using API.Entities.Enums; namespace API.DTOs; -public class UpdateChapterDto +public sealed record UpdateChapterDto { public int Id { get; init; } public string Summary { get; set; } = string.Empty; diff --git a/API/DTOs/UpdateLibraryDto.cs b/API/DTOs/UpdateLibraryDto.cs index 465782bd1..d7f314208 100644 --- a/API/DTOs/UpdateLibraryDto.cs +++ b/API/DTOs/UpdateLibraryDto.cs @@ -4,7 +4,7 @@ using API.Entities.Enums; namespace API.DTOs; -public class UpdateLibraryDto +public sealed record UpdateLibraryDto { [Required] public int Id { get; init; } @@ -26,6 +26,12 @@ public class UpdateLibraryDto public bool ManageReadingLists { get; init; } [Required] public bool AllowScrobbling { get; init; } + [Required] + public bool AllowMetadataMatching { get; init; } + [Required] + public bool EnableMetadata { get; init; } + [Required] + public bool RemovePrefixForSortName { get; init; } /// /// What types of files to allow the scanner to pickup /// diff --git a/API/DTOs/UpdateLibraryForUserDto.cs b/API/DTOs/UpdateLibraryForUserDto.cs index c90b697e2..4ce8d0df8 100644 --- a/API/DTOs/UpdateLibraryForUserDto.cs +++ b/API/DTOs/UpdateLibraryForUserDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs; -public class UpdateLibraryForUserDto +public sealed record UpdateLibraryForUserDto { public required string Username { get; init; } public required IEnumerable SelectedLibraries { get; init; } = new List(); diff --git a/API/DTOs/UpdateRBSDto.cs b/API/DTOs/UpdateRBSDto.cs index a7e0c3fc9..fa8bb78f9 100644 --- a/API/DTOs/UpdateRBSDto.cs +++ b/API/DTOs/UpdateRBSDto.cs @@ -3,7 +3,7 @@ namespace API.DTOs; #nullable enable -public class UpdateRbsDto +public sealed record UpdateRbsDto { public required string Username { get; init; } public IList? Roles { get; init; } diff --git a/API/DTOs/UpdateSeriesRatingDto.cs b/API/DTOs/UpdateRatingDto.cs similarity index 58% rename from API/DTOs/UpdateSeriesRatingDto.cs rename to API/DTOs/UpdateRatingDto.cs index 5dafa35af..472a94fe9 100644 --- a/API/DTOs/UpdateSeriesRatingDto.cs +++ b/API/DTOs/UpdateRatingDto.cs @@ -1,7 +1,8 @@ namespace API.DTOs; -public class UpdateSeriesRatingDto +public sealed record UpdateRatingDto { public int SeriesId { get; init; } + public int? ChapterId { get; init; } public float UserRating { get; init; } } diff --git a/API/DTOs/UpdateSeriesDto.cs b/API/DTOs/UpdateSeriesDto.cs index 52826f9d1..a4a9baf8c 100644 --- a/API/DTOs/UpdateSeriesDto.cs +++ b/API/DTOs/UpdateSeriesDto.cs @@ -1,6 +1,7 @@ namespace API.DTOs; +#nullable enable -public class UpdateSeriesDto +public sealed record UpdateSeriesDto { public int Id { get; init; } public string? LocalizedName { get; init; } diff --git a/API/DTOs/UpdateSeriesMetadataDto.cs b/API/DTOs/UpdateSeriesMetadataDto.cs index 719a9459a..5225f5486 100644 --- a/API/DTOs/UpdateSeriesMetadataDto.cs +++ b/API/DTOs/UpdateSeriesMetadataDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs; -public class UpdateSeriesMetadataDto +public sealed record UpdateSeriesMetadataDto { - public SeriesMetadataDto SeriesMetadata { get; set; } = default!; + public SeriesMetadataDto SeriesMetadata { get; set; } = null!; } diff --git a/API/DTOs/Uploads/UploadFileDto.cs b/API/DTOs/Uploads/UploadFileDto.cs index 72fe7da9b..8d5cdf4cb 100644 --- a/API/DTOs/Uploads/UploadFileDto.cs +++ b/API/DTOs/Uploads/UploadFileDto.cs @@ -1,6 +1,6 @@ namespace API.DTOs.Uploads; -public class UploadFileDto +public sealed record UploadFileDto { /// /// Id of the Entity diff --git a/API/DTOs/Uploads/UploadUrlDto.cs b/API/DTOs/Uploads/UploadUrlDto.cs index f2699befd..3f4e625c3 100644 --- a/API/DTOs/Uploads/UploadUrlDto.cs +++ b/API/DTOs/Uploads/UploadUrlDto.cs @@ -2,7 +2,7 @@ namespace API.DTOs.Uploads; -public class UploadUrlDto +public sealed record UploadUrlDto { /// /// External url diff --git a/API/DTOs/UserDto.cs b/API/DTOs/UserDto.cs index 7d54102da..88dc97a5d 100644 --- a/API/DTOs/UserDto.cs +++ b/API/DTOs/UserDto.cs @@ -1,10 +1,11 @@  +using System; using API.DTOs.Account; namespace API.DTOs; #nullable enable -public class UserDto +public sealed record UserDto { public string Username { get; init; } = null!; public string Email { get; init; } = null!; diff --git a/API/DTOs/UserPreferencesDto.cs b/API/DTOs/UserPreferencesDto.cs index d1cddf280..46f42306e 100644 --- a/API/DTOs/UserPreferencesDto.cs +++ b/API/DTOs/UserPreferencesDto.cs @@ -5,100 +5,10 @@ using API.Entities.Enums; using API.Entities.Enums.UserPreferences; namespace API.DTOs; +#nullable enable -public class UserPreferencesDto +public sealed record UserPreferencesDto { - /// - /// Manga Reader Option: What direction should the next/prev page buttons go - /// - [Required] - public ReadingDirection ReadingDirection { get; set; } - /// - /// Manga Reader Option: How should the image be scaled to screen - /// - [Required] - public ScalingOption ScalingOption { get; set; } - /// - /// Manga Reader Option: Which side of a split image should we show first - /// - [Required] - public PageSplitOption PageSplitOption { get; set; } - /// - /// Manga Reader Option: How the manga reader should perform paging or reading of the file - /// - /// Webtoon uses scrolling to page, LeftRight uses paging by clicking left/right side of reader, UpDown uses paging - /// by clicking top/bottom sides of reader. - /// - /// - [Required] - public ReaderMode ReaderMode { get; set; } - /// - /// Manga Reader Option: How many pages to display in the reader at once - /// - [Required] - public LayoutMode LayoutMode { get; set; } - /// - /// Manga Reader Option: Emulate a book by applying a shadow effect on the pages - /// - [Required] - public bool EmulateBook { get; set; } - /// - /// Manga Reader Option: Background color of the reader - /// - [Required] - public string BackgroundColor { get; set; } = "#000000"; - /// - /// Manga Reader Option: Should swiping trigger pagination - /// - [Required] - public bool SwipeToPaginate { get; set; } - /// - /// Manga Reader Option: Allow the menu to close after 6 seconds without interaction - /// - [Required] - public bool AutoCloseMenu { get; set; } - /// - /// Manga Reader Option: Show screen hints to the user on some actions, ie) pagination direction change - /// - [Required] - public bool ShowScreenHints { get; set; } = true; - /// - /// Book Reader Option: Override extra Margin - /// - [Required] - public int BookReaderMargin { get; set; } - /// - /// Book Reader Option: Override line-height - /// - [Required] - public int BookReaderLineSpacing { get; set; } - /// - /// Book Reader Option: Override font size - /// - [Required] - public int BookReaderFontSize { get; set; } - /// - /// Book Reader Option: Maps to the default Kavita font-family (inherit) or an override - /// - [Required] - public string BookReaderFontFamily { get; set; } = null!; - - /// - /// Book Reader Option: Allows tapping on side of screens to paginate - /// - [Required] - public bool BookReaderTapToPaginate { get; set; } - /// - /// Book Reader Option: What direction should the next/prev page buttons go - /// - [Required] - public ReadingDirection BookReaderReadingDirection { get; set; } - - /// - /// Book Reader Option: What writing style should be used, horizontal or vertical. - /// - [Required] - public WritingStyle BookReaderWritingStyle { get; set; } /// /// UI Site Global Setting: The UI theme the user should use. @@ -107,73 +17,28 @@ public class UserPreferencesDto [Required] public SiteThemeDto? Theme { get; set; } - [Required] public string BookReaderThemeName { get; set; } = null!; - [Required] - public BookPageLayoutMode BookReaderLayoutMode { get; set; } - /// - /// Book Reader Option: A flag that hides the menu-ing system behind a click on the screen. This should be used with tap to paginate, but the app doesn't enforce this. - /// - /// Defaults to false - [Required] - public bool BookReaderImmersiveMode { get; set; } = false; - /// - /// Global Site Option: If the UI should layout items as Cards or List items - /// - /// Defaults to Cards - [Required] public PageLayoutMode GlobalPageLayoutMode { get; set; } = PageLayoutMode.Cards; - /// - /// UI Site Global Setting: If unread summaries should be blurred until expanded or unless user has read it already - /// - /// Defaults to false + /// [Required] public bool BlurUnreadSummaries { get; set; } = false; - /// - /// UI Site Global Setting: Should Kavita prompt user to confirm downloads that are greater than 100 MB. - /// + /// [Required] public bool PromptForDownloadSize { get; set; } = true; - /// - /// UI Site Global Setting: Should Kavita disable CSS transitions - /// + /// [Required] public bool NoTransitions { get; set; } = false; - /// - /// When showing series, only parent series or series with no relationships will be returned - /// + /// [Required] public bool CollapseSeriesRelationships { get; set; } = false; - /// - /// UI Site Global Setting: Should series reviews be shared with all users in the server - /// + /// [Required] public bool ShareReviews { get; set; } = false; - /// - /// UI Site Global Setting: The language locale that should be used for the user - /// + /// [Required] public string Locale { get; set; } - /// - /// PDF Reader: Theme of the Reader - /// - [Required] - public PdfTheme PdfTheme { get; set; } = PdfTheme.Dark; - /// - /// PDF Reader: Scroll mode of the reader - /// - [Required] - public PdfScrollMode PdfScrollMode { get; set; } = PdfScrollMode.Vertical; - /// - /// PDF Reader: Layout Mode of the reader - /// - [Required] - public PdfLayoutMode PdfLayoutMode { get; set; } = PdfLayoutMode.Multiple; - /// - /// PDF Reader: Spread Mode of the reader - /// - [Required] - public PdfSpreadMode PdfSpreadMode { get; set; } = PdfSpreadMode.None; - - + /// + public bool AniListScrobblingEnabled { get; set; } + /// + public bool WantToReadSync { get; set; } } diff --git a/API/DTOs/UserReadingProfileDto.cs b/API/DTOs/UserReadingProfileDto.cs new file mode 100644 index 000000000..24dbf1c34 --- /dev/null +++ b/API/DTOs/UserReadingProfileDto.cs @@ -0,0 +1,132 @@ +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using API.Entities; +using API.Entities.Enums; +using API.Entities.Enums.UserPreferences; + +namespace API.DTOs; + +public sealed record UserReadingProfileDto +{ + + public int Id { get; set; } + public int UserId { get; init; } + + public string Name { get; init; } + public ReadingProfileKind Kind { get; init; } + + #region MangaReader + + /// + [Required] + public ReadingDirection ReadingDirection { get; set; } + + /// + [Required] + public ScalingOption ScalingOption { get; set; } + + /// + [Required] + public PageSplitOption PageSplitOption { get; set; } + + /// + [Required] + public ReaderMode ReaderMode { get; set; } + + /// + [Required] + public bool AutoCloseMenu { get; set; } + + /// + [Required] + public bool ShowScreenHints { get; set; } = true; + + /// + [Required] + public bool EmulateBook { get; set; } + + /// + [Required] + public LayoutMode LayoutMode { get; set; } + + /// + [Required] + public string BackgroundColor { get; set; } = "#000000"; + + /// + [Required] + public bool SwipeToPaginate { get; set; } + + /// + [Required] + public bool AllowAutomaticWebtoonReaderDetection { get; set; } + + /// + public int? WidthOverride { get; set; } + + /// + public BreakPoint DisableWidthOverride { get; set; } = BreakPoint.Never; + + #endregion + + #region EpubReader + + /// + [Required] + public int BookReaderMargin { get; set; } + + /// + [Required] + public int BookReaderLineSpacing { get; set; } + + /// + [Required] + public int BookReaderFontSize { get; set; } + + /// + [Required] + public string BookReaderFontFamily { get; set; } = null!; + + /// + [Required] + public bool BookReaderTapToPaginate { get; set; } + + /// + [Required] + public ReadingDirection BookReaderReadingDirection { get; set; } + + /// + [Required] + public WritingStyle BookReaderWritingStyle { get; set; } + + /// + [Required] + public string BookReaderThemeName { get; set; } = null!; + + /// + [Required] + public BookPageLayoutMode BookReaderLayoutMode { get; set; } + + /// + [Required] + public bool BookReaderImmersiveMode { get; set; } = false; + + #endregion + + #region PdfReader + + /// + [Required] + public PdfTheme PdfTheme { get; set; } = PdfTheme.Dark; + + /// + [Required] + public PdfScrollMode PdfScrollMode { get; set; } = PdfScrollMode.Vertical; + + /// + [Required] + public PdfSpreadMode PdfSpreadMode { get; set; } = PdfSpreadMode.None; + + #endregion + +} diff --git a/API/DTOs/VolumeDto.cs b/API/DTOs/VolumeDto.cs index f6413ff6f..fffccea59 100644 --- a/API/DTOs/VolumeDto.cs +++ b/API/DTOs/VolumeDto.cs @@ -1,5 +1,4 @@ - -using System; +using System; using System.Collections.Generic; using API.Entities; using API.Entities.Interfaces; @@ -8,14 +7,15 @@ using API.Services.Tasks.Scanner.Parser; namespace API.DTOs; -public class VolumeDto : IHasReadTimeEstimate, IHasCoverImage +public sealed record VolumeDto : IHasReadTimeEstimate, IHasCoverImage { + /// public int Id { get; set; } - /// + /// public float MinNumber { get; set; } - /// + /// public float MaxNumber { get; set; } - /// + /// public string Name { get; set; } = default!; /// /// This will map to MinNumber. Number was removed in v0.7.13.8/v0.7.14 @@ -24,17 +24,21 @@ public class VolumeDto : IHasReadTimeEstimate, IHasCoverImage public int Number { get; set; } public int Pages { get; set; } public int PagesRead { get; set; } + /// public DateTime LastModifiedUtc { get; set; } + /// public DateTime CreatedUtc { get; set; } /// /// When chapter was created in local server time /// /// This is required for Tachiyomi Extension + /// public DateTime Created { get; set; } /// /// When chapter was last modified in local server time /// /// This is required for Tachiyomi Extension + /// public DateTime LastModified { get; set; } public int SeriesId { get; set; } public ICollection Chapters { get; set; } = new List(); @@ -64,10 +68,14 @@ public class VolumeDto : IHasReadTimeEstimate, IHasCoverImage return MinNumber.Is(Parser.SpecialVolumeNumber); } + /// public string CoverImage { get; set; } + /// private bool CoverImageLocked { get; set; } - public string PrimaryColor { get; set; } - public string SecondaryColor { get; set; } + /// + public string? PrimaryColor { get; set; } = string.Empty; + /// + public string? SecondaryColor { get; set; } = string.Empty; public void ResetColorScape() { diff --git a/API/DTOs/WantToRead/UpdateWantToReadDto.cs b/API/DTOs/WantToRead/UpdateWantToReadDto.cs index f1b38cea2..a5be26857 100644 --- a/API/DTOs/WantToRead/UpdateWantToReadDto.cs +++ b/API/DTOs/WantToRead/UpdateWantToReadDto.cs @@ -6,7 +6,7 @@ namespace API.DTOs.WantToRead; /// /// A list of Series to pass when working with Want To Read APIs /// -public class UpdateWantToReadDto +public sealed record UpdateWantToReadDto { /// /// List of Series Ids that will be Added/Removed diff --git a/API/Data/DataContext.cs b/API/Data/DataContext.cs index 21b7c26c8..7d529b1da 100644 --- a/API/Data/DataContext.cs +++ b/API/Data/DataContext.cs @@ -1,12 +1,17 @@ using System; +using System.Collections.Generic; using System.Linq; +using System.Text.Json; using System.Threading; using System.Threading.Tasks; using API.Entities; using API.Entities.Enums; using API.Entities.Enums.UserPreferences; +using API.Entities.History; using API.Entities.Interfaces; using API.Entities.Metadata; +using API.Entities.MetadataMatching; +using API.Entities.Person; using API.Entities.Scrobble; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; @@ -36,12 +41,13 @@ public sealed class DataContext : IdentityDbContext ServerSetting { get; set; } = null!; public DbSet AppUserPreferences { get; set; } = null!; public DbSet SeriesMetadata { get; set; } = null!; - [Obsolete] + [Obsolete("Use AppUserCollection")] public DbSet CollectionTag { get; set; } = null!; public DbSet AppUserBookmark { get; set; } = null!; public DbSet ReadingList { get; set; } = null!; public DbSet ReadingListItem { get; set; } = null!; public DbSet Person { get; set; } = null!; + public DbSet PersonAlias { get; set; } = null!; public DbSet Genre { get; set; } = null!; public DbSet Tag { get; set; } = null!; public DbSet SiteTheme { get; set; } = null!; @@ -64,11 +70,16 @@ public sealed class DataContext : IdentityDbContext ExternalSeriesMetadata { get; set; } = null!; public DbSet ExternalRecommendation { get; set; } = null!; public DbSet ManualMigrationHistory { get; set; } = null!; + [Obsolete("Use IsBlacklisted field on Series")] public DbSet SeriesBlacklist { get; set; } = null!; public DbSet AppUserCollection { get; set; } = null!; public DbSet ChapterPeople { get; set; } = null!; public DbSet SeriesMetadataPeople { get; set; } = null!; - + public DbSet EmailHistory { get; set; } = null!; + public DbSet MetadataSettings { get; set; } = null!; + public DbSet MetadataFieldMapping { get; set; } = null!; + public DbSet AppUserChapterRating { get; set; } = null!; + public DbSet AppUserReadingProfiles { get; set; } = null!; protected override void OnModelCreating(ModelBuilder builder) { @@ -118,10 +129,25 @@ public sealed class DataContext : IdentityDbContext b.Locale) .IsRequired(true) .HasDefaultValue("en"); + builder.Entity() + .Property(b => b.AniListScrobblingEnabled) + .HasDefaultValue(true); + builder.Entity() + .Property(b => b.WantToReadSync) + .HasDefaultValue(true); + builder.Entity() + .Property(b => b.AllowAutomaticWebtoonReaderDetection) + .HasDefaultValue(true); builder.Entity() .Property(b => b.AllowScrobbling) .HasDefaultValue(true); + builder.Entity() + .Property(b => b.AllowMetadataMatching) + .HasDefaultValue(true); + builder.Entity() + .Property(b => b.EnableMetadata) + .HasDefaultValue(true); builder.Entity() .Property(b => b.WebLinks) @@ -187,6 +213,93 @@ public sealed class DataContext : IdentityDbContext p.SeriesMetadataPeople) .HasForeignKey(smp => smp.PersonId) .OnDelete(DeleteBehavior.Cascade); + + builder.Entity() + .Property(b => b.OrderWeight) + .HasDefaultValue(0); + + builder.Entity() + .Property(x => x.AgeRatingMappings) + .HasConversion( + v => JsonSerializer.Serialize(v, JsonSerializerOptions.Default), + v => JsonSerializer.Deserialize>(v, JsonSerializerOptions.Default) ?? new Dictionary() + ); + + // Ensure blacklist is stored as a JSON array + builder.Entity() + .Property(x => x.Blacklist) + .HasConversion( + v => JsonSerializer.Serialize(v, JsonSerializerOptions.Default), + v => JsonSerializer.Deserialize>(v, JsonSerializerOptions.Default) ?? new List() + ); + builder.Entity() + .Property(x => x.Whitelist) + .HasConversion( + v => JsonSerializer.Serialize(v, JsonSerializerOptions.Default), + v => JsonSerializer.Deserialize>(v, JsonSerializerOptions.Default) ?? new List() + ); + builder.Entity() + .Property(x => x.Overrides) + .HasConversion( + v => JsonSerializer.Serialize(v, JsonSerializerOptions.Default), + v => JsonSerializer.Deserialize>(v, JsonSerializerOptions.Default) ?? new List() + ); + + // Configure one-to-many relationship + builder.Entity() + .HasMany(x => x.FieldMappings) + .WithOne(x => x.MetadataSettings) + .HasForeignKey(x => x.MetadataSettingsId) + .OnDelete(DeleteBehavior.Cascade); + + builder.Entity() + .Property(b => b.Enabled) + .HasDefaultValue(true); + builder.Entity() + .Property(b => b.EnableCoverImage) + .HasDefaultValue(true); + + builder.Entity() + .Property(b => b.BookThemeName) + .HasDefaultValue("Dark"); + builder.Entity() + .Property(b => b.BackgroundColor) + .HasDefaultValue("#000000"); + builder.Entity() + .Property(b => b.BookReaderWritingStyle) + .HasDefaultValue(WritingStyle.Horizontal); + builder.Entity() + .Property(b => b.AllowAutomaticWebtoonReaderDetection) + .HasDefaultValue(true); + + builder.Entity() + .Property(rp => rp.LibraryIds) + .HasConversion( + v => JsonSerializer.Serialize(v, JsonSerializerOptions.Default), + v => JsonSerializer.Deserialize>(v, JsonSerializerOptions.Default) ?? new List()) + .HasColumnType("TEXT"); + builder.Entity() + .Property(rp => rp.SeriesIds) + .HasConversion( + v => JsonSerializer.Serialize(v, JsonSerializerOptions.Default), + v => JsonSerializer.Deserialize>(v, JsonSerializerOptions.Default) ?? new List()) + .HasColumnType("TEXT"); + + builder.Entity() + .Property(sm => sm.KPlusOverrides) + .HasConversion( + v => JsonSerializer.Serialize(v, JsonSerializerOptions.Default), + v => JsonSerializer.Deserialize>(v, JsonSerializerOptions.Default) ?? + new List()) + .HasColumnType("TEXT") + .HasDefaultValue(new List()); + builder.Entity() + .Property(sm => sm.KPlusOverrides) + .HasConversion( + v => JsonSerializer.Serialize(v, JsonSerializerOptions.Default), + v => JsonSerializer.Deserialize>(v, JsonSerializerOptions.Default) ?? new List()) + .HasColumnType("TEXT") + .HasDefaultValue(new List()); } #nullable enable diff --git a/API/Data/ManualMigrations/MigrateLibrariesToHaveAllFileTypes.cs b/API/Data/ManualMigrations/v0.7.11/MigrateLibrariesToHaveAllFileTypes.cs similarity index 100% rename from API/Data/ManualMigrations/MigrateLibrariesToHaveAllFileTypes.cs rename to API/Data/ManualMigrations/v0.7.11/MigrateLibrariesToHaveAllFileTypes.cs diff --git a/API/Data/ManualMigrations/MigrateSmartFilterEncoding.cs b/API/Data/ManualMigrations/v0.7.11/MigrateSmartFilterEncoding.cs similarity index 99% rename from API/Data/ManualMigrations/MigrateSmartFilterEncoding.cs rename to API/Data/ManualMigrations/v0.7.11/MigrateSmartFilterEncoding.cs index e684ef6a0..d36859e69 100644 --- a/API/Data/ManualMigrations/MigrateSmartFilterEncoding.cs +++ b/API/Data/ManualMigrations/v0.7.11/MigrateSmartFilterEncoding.cs @@ -4,6 +4,7 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using API.DTOs.Filtering.v2; using API.Entities; +using API.Entities.History; using API.Helpers; using Kavita.Common.EnvironmentInfo; using Microsoft.EntityFrameworkCore; diff --git a/API/Data/ManualMigrations/MigrateClearNightlyExternalSeriesRecords.cs b/API/Data/ManualMigrations/v0.7.14/MigrateClearNightlyExternalSeriesRecords.cs similarity index 98% rename from API/Data/ManualMigrations/MigrateClearNightlyExternalSeriesRecords.cs rename to API/Data/ManualMigrations/v0.7.14/MigrateClearNightlyExternalSeriesRecords.cs index 9eff55bc1..89485fd71 100644 --- a/API/Data/ManualMigrations/MigrateClearNightlyExternalSeriesRecords.cs +++ b/API/Data/ManualMigrations/v0.7.14/MigrateClearNightlyExternalSeriesRecords.cs @@ -1,6 +1,7 @@ using System; using System.Threading.Tasks; using API.Entities; +using API.Entities.History; using Kavita.Common.EnvironmentInfo; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; diff --git a/API/Data/ManualMigrations/MigrateEmailTemplates.cs b/API/Data/ManualMigrations/v0.7.14/MigrateEmailTemplates.cs similarity index 100% rename from API/Data/ManualMigrations/MigrateEmailTemplates.cs rename to API/Data/ManualMigrations/v0.7.14/MigrateEmailTemplates.cs diff --git a/API/Data/ManualMigrations/MigrateManualHistory.cs b/API/Data/ManualMigrations/v0.7.14/MigrateManualHistory.cs similarity index 98% rename from API/Data/ManualMigrations/MigrateManualHistory.cs rename to API/Data/ManualMigrations/v0.7.14/MigrateManualHistory.cs index b9ba1263c..eaf63c41c 100644 --- a/API/Data/ManualMigrations/MigrateManualHistory.cs +++ b/API/Data/ManualMigrations/v0.7.14/MigrateManualHistory.cs @@ -1,6 +1,7 @@ using System; using System.Threading.Tasks; using API.Entities; +using API.Entities.History; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; diff --git a/API/Data/ManualMigrations/MigrateVolumeLookupName.cs b/API/Data/ManualMigrations/v0.7.14/MigrateVolumeLookupName.cs similarity index 97% rename from API/Data/ManualMigrations/MigrateVolumeLookupName.cs rename to API/Data/ManualMigrations/v0.7.14/MigrateVolumeLookupName.cs index 9a2a4dbeb..38b7cfbba 100644 --- a/API/Data/ManualMigrations/MigrateVolumeLookupName.cs +++ b/API/Data/ManualMigrations/v0.7.14/MigrateVolumeLookupName.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Threading.Tasks; using API.Entities; +using API.Entities.History; using Kavita.Common.EnvironmentInfo; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; diff --git a/API/Data/ManualMigrations/MigrateVolumeNumber.cs b/API/Data/ManualMigrations/v0.7.14/MigrateVolumeNumber.cs similarity index 100% rename from API/Data/ManualMigrations/MigrateVolumeNumber.cs rename to API/Data/ManualMigrations/v0.7.14/MigrateVolumeNumber.cs diff --git a/API/Data/ManualMigrations/MigrateWantToReadExport.cs b/API/Data/ManualMigrations/v0.7.14/MigrateWantToReadExport.cs similarity index 100% rename from API/Data/ManualMigrations/MigrateWantToReadExport.cs rename to API/Data/ManualMigrations/v0.7.14/MigrateWantToReadExport.cs diff --git a/API/Data/ManualMigrations/MigrateWantToReadImport.cs b/API/Data/ManualMigrations/v0.7.14/MigrateWantToReadImport.cs similarity index 100% rename from API/Data/ManualMigrations/MigrateWantToReadImport.cs rename to API/Data/ManualMigrations/v0.7.14/MigrateWantToReadImport.cs diff --git a/API/Data/ManualMigrations/MigrateUserLibrarySideNavStream.cs b/API/Data/ManualMigrations/v0.7.9/MigrateUserLibrarySideNavStream.cs similarity index 100% rename from API/Data/ManualMigrations/MigrateUserLibrarySideNavStream.cs rename to API/Data/ManualMigrations/v0.7.9/MigrateUserLibrarySideNavStream.cs diff --git a/API/Data/ManualMigrations/ManualMigrateLooseLeafChapters.cs b/API/Data/ManualMigrations/v0.8.0/ManualMigrateLooseLeafChapters.cs similarity index 99% rename from API/Data/ManualMigrations/ManualMigrateLooseLeafChapters.cs rename to API/Data/ManualMigrations/v0.8.0/ManualMigrateLooseLeafChapters.cs index 93fc569e8..fac184dc9 100644 --- a/API/Data/ManualMigrations/ManualMigrateLooseLeafChapters.cs +++ b/API/Data/ManualMigrations/v0.8.0/ManualMigrateLooseLeafChapters.cs @@ -3,6 +3,7 @@ using System.IO; using System.Linq; using System.Threading.Tasks; using API.Entities; +using API.Entities.History; using API.Extensions; using API.Helpers.Builders; using API.Services; diff --git a/API/Data/ManualMigrations/ManualMigrateMixedSpecials.cs b/API/Data/ManualMigrations/v0.8.0/ManualMigrateMixedSpecials.cs similarity index 99% rename from API/Data/ManualMigrations/ManualMigrateMixedSpecials.cs rename to API/Data/ManualMigrations/v0.8.0/ManualMigrateMixedSpecials.cs index 4e22abfb8..cda83f05b 100644 --- a/API/Data/ManualMigrations/ManualMigrateMixedSpecials.cs +++ b/API/Data/ManualMigrations/v0.8.0/ManualMigrateMixedSpecials.cs @@ -3,6 +3,7 @@ using System.IO; using System.Linq; using System.Threading.Tasks; using API.Entities; +using API.Entities.History; using API.Extensions; using API.Helpers.Builders; using API.Services; diff --git a/API/Data/ManualMigrations/MigrateChapterFields.cs b/API/Data/ManualMigrations/v0.8.0/MigrateChapterFields.cs similarity index 99% rename from API/Data/ManualMigrations/MigrateChapterFields.cs rename to API/Data/ManualMigrations/v0.8.0/MigrateChapterFields.cs index f157850fa..7d1f2dd12 100644 --- a/API/Data/ManualMigrations/MigrateChapterFields.cs +++ b/API/Data/ManualMigrations/v0.8.0/MigrateChapterFields.cs @@ -3,6 +3,7 @@ using System.IO; using System.Linq; using System.Threading.Tasks; using API.Entities; +using API.Entities.History; using API.Services.Tasks.Scanner.Parser; using Kavita.Common.EnvironmentInfo; using Microsoft.EntityFrameworkCore; diff --git a/API/Data/ManualMigrations/MigrateChapterNumber.cs b/API/Data/ManualMigrations/v0.8.0/MigrateChapterNumber.cs similarity index 98% rename from API/Data/ManualMigrations/MigrateChapterNumber.cs rename to API/Data/ManualMigrations/v0.8.0/MigrateChapterNumber.cs index 23f256874..e31fa4b92 100644 --- a/API/Data/ManualMigrations/MigrateChapterNumber.cs +++ b/API/Data/ManualMigrations/v0.8.0/MigrateChapterNumber.cs @@ -1,6 +1,7 @@ using System; using System.Threading.Tasks; using API.Entities; +using API.Entities.History; using API.Services.Tasks.Scanner.Parser; using Kavita.Common.EnvironmentInfo; using Microsoft.EntityFrameworkCore; diff --git a/API/Data/ManualMigrations/MigrateChapterRange.cs b/API/Data/ManualMigrations/v0.8.0/MigrateChapterRange.cs similarity index 98% rename from API/Data/ManualMigrations/MigrateChapterRange.cs rename to API/Data/ManualMigrations/v0.8.0/MigrateChapterRange.cs index f50cd2e2e..70a4b30f6 100644 --- a/API/Data/ManualMigrations/MigrateChapterRange.cs +++ b/API/Data/ManualMigrations/v0.8.0/MigrateChapterRange.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Threading.Tasks; using API.Entities; +using API.Entities.History; using API.Extensions; using API.Helpers.Builders; using API.Services.Tasks.Scanner.Parser; diff --git a/API/Data/ManualMigrations/MigrateCollectionTagToUserCollections.cs b/API/Data/ManualMigrations/v0.8.0/MigrateCollectionTagToUserCollections.cs similarity index 99% rename from API/Data/ManualMigrations/MigrateCollectionTagToUserCollections.cs rename to API/Data/ManualMigrations/v0.8.0/MigrateCollectionTagToUserCollections.cs index 038809aab..e29e706d0 100644 --- a/API/Data/ManualMigrations/MigrateCollectionTagToUserCollections.cs +++ b/API/Data/ManualMigrations/v0.8.0/MigrateCollectionTagToUserCollections.cs @@ -4,6 +4,7 @@ using System.Threading.Tasks; using API.Data.Repositories; using API.Entities; using API.Entities.Enums; +using API.Entities.History; using API.Extensions.QueryExtensions; using Kavita.Common.EnvironmentInfo; using Microsoft.EntityFrameworkCore; diff --git a/API/Data/ManualMigrations/MigrateDuplicateDarkTheme.cs b/API/Data/ManualMigrations/v0.8.0/MigrateDuplicateDarkTheme.cs similarity index 98% rename from API/Data/ManualMigrations/MigrateDuplicateDarkTheme.cs rename to API/Data/ManualMigrations/v0.8.0/MigrateDuplicateDarkTheme.cs index 2e31c3392..e414cd8cc 100644 --- a/API/Data/ManualMigrations/MigrateDuplicateDarkTheme.cs +++ b/API/Data/ManualMigrations/v0.8.0/MigrateDuplicateDarkTheme.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Threading.Tasks; using API.Entities; +using API.Entities.History; using API.Services.Tasks.Scanner.Parser; using Kavita.Common.EnvironmentInfo; using Microsoft.EntityFrameworkCore; diff --git a/API/Data/ManualMigrations/MigrateMangaFilePath.cs b/API/Data/ManualMigrations/v0.8.0/MigrateMangaFilePath.cs similarity index 98% rename from API/Data/ManualMigrations/MigrateMangaFilePath.cs rename to API/Data/ManualMigrations/v0.8.0/MigrateMangaFilePath.cs index ccf9aa773..1dbc7f325 100644 --- a/API/Data/ManualMigrations/MigrateMangaFilePath.cs +++ b/API/Data/ManualMigrations/v0.8.0/MigrateMangaFilePath.cs @@ -1,6 +1,7 @@ using System; using System.Threading.Tasks; using API.Entities; +using API.Entities.History; using API.Services.Tasks.Scanner.Parser; using Kavita.Common.EnvironmentInfo; using Microsoft.EntityFrameworkCore; diff --git a/API/Data/ManualMigrations/MigrateProgressExport.cs b/API/Data/ManualMigrations/v0.8.0/MigrateProgressExport.cs similarity index 99% rename from API/Data/ManualMigrations/MigrateProgressExport.cs rename to API/Data/ManualMigrations/v0.8.0/MigrateProgressExport.cs index 2482939c0..631daeea8 100644 --- a/API/Data/ManualMigrations/MigrateProgressExport.cs +++ b/API/Data/ManualMigrations/v0.8.0/MigrateProgressExport.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq; using System.Threading.Tasks; using API.Entities; +using API.Entities.History; using API.Services; using CsvHelper; using CsvHelper.Configuration.Attributes; diff --git a/API/Data/ManualMigrations/MigrateLowestSeriesFolderPath.cs b/API/Data/ManualMigrations/v0.8.1/MigrateLowestSeriesFolderPath.cs similarity index 98% rename from API/Data/ManualMigrations/MigrateLowestSeriesFolderPath.cs rename to API/Data/ManualMigrations/v0.8.1/MigrateLowestSeriesFolderPath.cs index 48978d630..2a68ca3d6 100644 --- a/API/Data/ManualMigrations/MigrateLowestSeriesFolderPath.cs +++ b/API/Data/ManualMigrations/v0.8.1/MigrateLowestSeriesFolderPath.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Threading.Tasks; using API.Entities; +using API.Entities.History; using API.Services.Tasks.Scanner.Parser; using Kavita.Common.EnvironmentInfo; using Microsoft.EntityFrameworkCore; diff --git a/API/Data/ManualMigrations/ManualMigrateSwitchToWal.cs b/API/Data/ManualMigrations/v0.8.2/ManualMigrateSwitchToWal.cs similarity index 98% rename from API/Data/ManualMigrations/ManualMigrateSwitchToWal.cs rename to API/Data/ManualMigrations/v0.8.2/ManualMigrateSwitchToWal.cs index 8e648b025..21abfdf10 100644 --- a/API/Data/ManualMigrations/ManualMigrateSwitchToWal.cs +++ b/API/Data/ManualMigrations/v0.8.2/ManualMigrateSwitchToWal.cs @@ -1,6 +1,7 @@ using System; using System.Threading.Tasks; using API.Entities; +using API.Entities.History; using Kavita.Common.EnvironmentInfo; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; diff --git a/API/Data/ManualMigrations/ManualMigrateThemeDescription.cs b/API/Data/ManualMigrations/v0.8.2/ManualMigrateThemeDescription.cs similarity index 98% rename from API/Data/ManualMigrations/ManualMigrateThemeDescription.cs rename to API/Data/ManualMigrations/v0.8.2/ManualMigrateThemeDescription.cs index 8ac000f0d..e137afe7b 100644 --- a/API/Data/ManualMigrations/ManualMigrateThemeDescription.cs +++ b/API/Data/ManualMigrations/v0.8.2/ManualMigrateThemeDescription.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Threading.Tasks; using API.Entities; +using API.Entities.History; using Kavita.Common.EnvironmentInfo; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; diff --git a/API/Data/ManualMigrations/MigrateInitialInstallData.cs b/API/Data/ManualMigrations/v0.8.2/MigrateInitialInstallData.cs similarity index 92% rename from API/Data/ManualMigrations/MigrateInitialInstallData.cs rename to API/Data/ManualMigrations/v0.8.2/MigrateInitialInstallData.cs index f572034d1..851f4ac42 100644 --- a/API/Data/ManualMigrations/MigrateInitialInstallData.cs +++ b/API/Data/ManualMigrations/v0.8.2/MigrateInitialInstallData.cs @@ -1,9 +1,11 @@ using System; +using System.Globalization; using System.IO; using System.Linq; using System.Threading.Tasks; using API.Entities; using API.Entities.Enums; +using API.Entities.History; using API.Services; using Kavita.Common.EnvironmentInfo; using Microsoft.EntityFrameworkCore; @@ -34,7 +36,7 @@ public static class MigrateInitialInstallData { var fi = directoryService.FileSystem.FileInfo.New(dbFile); var setting = settings.First(s => s.Key == ServerSettingKey.FirstInstallDate); - setting.Value = fi.CreationTimeUtc.ToString(); + setting.Value = fi.CreationTimeUtc.ToString(CultureInfo.InvariantCulture); await dataContext.SaveChangesAsync(); } diff --git a/API/Data/ManualMigrations/MigrateSeriesLowestFolderPath.cs b/API/Data/ManualMigrations/v0.8.2/MigrateSeriesLowestFolderPath.cs similarity index 98% rename from API/Data/ManualMigrations/MigrateSeriesLowestFolderPath.cs rename to API/Data/ManualMigrations/v0.8.2/MigrateSeriesLowestFolderPath.cs index ca68392cd..8e0db3c10 100644 --- a/API/Data/ManualMigrations/MigrateSeriesLowestFolderPath.cs +++ b/API/Data/ManualMigrations/v0.8.2/MigrateSeriesLowestFolderPath.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Threading.Tasks; using API.Entities; +using API.Entities.History; using API.Services; using API.Services.Tasks.Scanner.Parser; using Kavita.Common.EnvironmentInfo; diff --git a/API/Data/ManualMigrations/ManualMigrateEncodeSettings.cs b/API/Data/ManualMigrations/v0.8.4/ManualMigrateEncodeSettings.cs similarity index 98% rename from API/Data/ManualMigrations/ManualMigrateEncodeSettings.cs rename to API/Data/ManualMigrations/v0.8.4/ManualMigrateEncodeSettings.cs index e71f583ba..fc8b2e586 100644 --- a/API/Data/ManualMigrations/ManualMigrateEncodeSettings.cs +++ b/API/Data/ManualMigrations/v0.8.4/ManualMigrateEncodeSettings.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Threading.Tasks; using API.Entities; using API.Entities.Enums; +using API.Entities.History; using Flurl.Util; using Kavita.Common.EnvironmentInfo; using Microsoft.EntityFrameworkCore; diff --git a/API/Data/ManualMigrations/ManualMigrateRemovePeople.cs b/API/Data/ManualMigrations/v0.8.4/ManualMigrateRemovePeople.cs similarity index 98% rename from API/Data/ManualMigrations/ManualMigrateRemovePeople.cs rename to API/Data/ManualMigrations/v0.8.4/ManualMigrateRemovePeople.cs index 6966c0264..01d9ad45d 100644 --- a/API/Data/ManualMigrations/ManualMigrateRemovePeople.cs +++ b/API/Data/ManualMigrations/v0.8.4/ManualMigrateRemovePeople.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Threading.Tasks; using API.Entities; +using API.Entities.History; using Kavita.Common.EnvironmentInfo; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; diff --git a/API/Data/ManualMigrations/ManualMigrateUnscrobbleBookLibraries.cs b/API/Data/ManualMigrations/v0.8.4/ManualMigrateUnscrobbleBookLibraries.cs similarity index 98% rename from API/Data/ManualMigrations/ManualMigrateUnscrobbleBookLibraries.cs rename to API/Data/ManualMigrations/v0.8.4/ManualMigrateUnscrobbleBookLibraries.cs index 02c4886cb..4f0ed3f96 100644 --- a/API/Data/ManualMigrations/ManualMigrateUnscrobbleBookLibraries.cs +++ b/API/Data/ManualMigrations/v0.8.4/ManualMigrateUnscrobbleBookLibraries.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Threading.Tasks; using API.Entities; using API.Entities.Enums; +using API.Entities.History; using Kavita.Common.EnvironmentInfo; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; diff --git a/API/Data/ManualMigrations/MigrateLowestSeriesFolderPath2.cs b/API/Data/ManualMigrations/v0.8.4/MigrateLowestSeriesFolderPath2.cs similarity index 98% rename from API/Data/ManualMigrations/MigrateLowestSeriesFolderPath2.cs rename to API/Data/ManualMigrations/v0.8.4/MigrateLowestSeriesFolderPath2.cs index bb79c3359..00233852a 100644 --- a/API/Data/ManualMigrations/MigrateLowestSeriesFolderPath2.cs +++ b/API/Data/ManualMigrations/v0.8.4/MigrateLowestSeriesFolderPath2.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Threading.Tasks; using API.Entities; +using API.Entities.History; using API.Services.Tasks.Scanner.Parser; using Kavita.Common.EnvironmentInfo; using Microsoft.EntityFrameworkCore; diff --git a/API/Data/ManualMigrations/v0.8.5/ManualMigrateBlacklistTableToSeries.cs b/API/Data/ManualMigrations/v0.8.5/ManualMigrateBlacklistTableToSeries.cs new file mode 100644 index 000000000..60fd170fd --- /dev/null +++ b/API/Data/ManualMigrations/v0.8.5/ManualMigrateBlacklistTableToSeries.cs @@ -0,0 +1,64 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using API.Entities; +using API.Entities.History; +using API.Entities.Metadata; +using Kavita.Common.EnvironmentInfo; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; + +namespace API.Data.ManualMigrations; + +/// +/// v0.8.5 - Migrating Kavita+ BlacklistedSeries table to Series entity to streamline implementation and generate a "Needs Manual Match" entry for the Series +/// +public static class ManualMigrateBlacklistTableToSeries +{ + public static async Task Migrate(DataContext context, ILogger logger) + { + if (await context.ManualMigrationHistory.AnyAsync(m => m.Name == "ManualMigrateBlacklistTableToSeries")) + { + return; + } + + logger.LogCritical("Running ManualMigrateBlacklistTableToSeries migration - Please be patient, this may take some time. This is not an error"); + + // Get all series in the Blacklist table and set their IsBlacklist = true + var blacklistedSeries = await context.SeriesBlacklist + .Include(s => s.Series.ExternalSeriesMetadata) + .Select(s => s.Series) + .ToListAsync(); + + foreach (var series in blacklistedSeries) + { + series.IsBlacklisted = true; + series.ExternalSeriesMetadata ??= new ExternalSeriesMetadata() { SeriesId = series.Id }; + + if (series.ExternalSeriesMetadata.AniListId > 0) + { + series.IsBlacklisted = false; + logger.LogInformation("{SeriesName} was in Blacklist table, but has valid AniList Id, not blacklisting", series.Name); + } + + context.Series.Entry(series).State = EntityState.Modified; + } + // Remove everything in SeriesBlacklist (it will be removed in another migration) + context.SeriesBlacklist.RemoveRange(context.SeriesBlacklist); + + if (context.ChangeTracker.HasChanges()) + { + await context.SaveChangesAsync(); + } + + await context.ManualMigrationHistory.AddAsync(new ManualMigrationHistory() + { + Name = "ManualMigrateBlacklistTableToSeries", + ProductVersion = BuildInfo.Version.ToString(), + RanAt = DateTime.UtcNow + }); + await context.SaveChangesAsync(); + + logger.LogCritical("Running ManualMigrateBlacklistTableToSeries migration - Completed. This is not an error"); + } +} diff --git a/API/Data/ManualMigrations/v0.8.5/ManualMigrateInvalidBlacklistSeries.cs b/API/Data/ManualMigrations/v0.8.5/ManualMigrateInvalidBlacklistSeries.cs new file mode 100644 index 000000000..14bc57cb1 --- /dev/null +++ b/API/Data/ManualMigrations/v0.8.5/ManualMigrateInvalidBlacklistSeries.cs @@ -0,0 +1,53 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using API.Entities.History; +using API.Entities.Metadata; +using Kavita.Common.EnvironmentInfo; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; + +namespace API.Data.ManualMigrations; + +/// +/// v0.8.5 - Migrating Kavita+ Series that are Blacklisted but have valid ExternalSeries row +/// +public static class ManualMigrateInvalidBlacklistSeries +{ + public static async Task Migrate(DataContext context, ILogger logger) + { + if (await context.ManualMigrationHistory.AnyAsync(m => m.Name == "ManualMigrateInvalidBlacklistSeries")) + { + return; + } + + logger.LogCritical("Running ManualMigrateInvalidBlacklistSeries migration - Please be patient, this may take some time. This is not an error"); + + // Get all series in the Blacklist table and set their IsBlacklist = true + var blacklistedSeries = await context.Series + .Include(s => s.ExternalSeriesMetadata) + .Where(s => s.IsBlacklisted && s.ExternalSeriesMetadata.ValidUntilUtc > DateTime.MinValue) + .ToListAsync(); + + foreach (var series in blacklistedSeries) + { + series.IsBlacklisted = false; + context.Series.Entry(series).State = EntityState.Modified; + } + + if (context.ChangeTracker.HasChanges()) + { + await context.SaveChangesAsync(); + } + + await context.ManualMigrationHistory.AddAsync(new ManualMigrationHistory() + { + Name = "ManualMigrateInvalidBlacklistSeries", + ProductVersion = BuildInfo.Version.ToString(), + RanAt = DateTime.UtcNow + }); + await context.SaveChangesAsync(); + + logger.LogCritical("Running ManualMigrateInvalidBlacklistSeries migration - Completed. This is not an error"); + } +} diff --git a/API/Data/ManualMigrations/v0.8.5/ManualMigrateNeedsManualMatch.cs b/API/Data/ManualMigrations/v0.8.5/ManualMigrateNeedsManualMatch.cs new file mode 100644 index 000000000..30e4a6d8e --- /dev/null +++ b/API/Data/ManualMigrations/v0.8.5/ManualMigrateNeedsManualMatch.cs @@ -0,0 +1,55 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using API.DTOs.KavitaPlus.Manage; +using API.Entities.History; +using API.Entities.Metadata; +using API.Extensions.QueryExtensions; +using Kavita.Common.EnvironmentInfo; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; + +namespace API.Data.ManualMigrations; + +/// +/// v0.8.5 - After user testing, the needs manual match has some edge cases from migrations and for best user experience, +/// should be reset to allow the upgraded system to process better. +/// +public static class ManualMigrateNeedsManualMatch +{ + public static async Task Migrate(DataContext context, ILogger logger) + { + if (await context.ManualMigrationHistory.AnyAsync(m => m.Name == "ManualMigrateNeedsManualMatch")) + { + return; + } + + logger.LogCritical("Running ManualMigrateNeedsManualMatch migration - Please be patient, this may take some time. This is not an error"); + + // Get all series in the Blacklist table and set their IsBlacklist = true + var series = await context.Series + .FilterMatchState(MatchStateOption.Error) + .ToListAsync(); + + foreach (var seriesEntry in series) + { + seriesEntry.IsBlacklisted = false; + context.Series.Update(seriesEntry); + } + + if (context.ChangeTracker.HasChanges()) + { + await context.SaveChangesAsync(); + } + + await context.ManualMigrationHistory.AddAsync(new ManualMigrationHistory() + { + Name = "ManualMigrateNeedsManualMatch", + ProductVersion = BuildInfo.Version.ToString(), + RanAt = DateTime.UtcNow + }); + await context.SaveChangesAsync(); + + logger.LogCritical("Running ManualMigrateNeedsManualMatch migration - Completed. This is not an error"); + } +} diff --git a/API/Data/ManualMigrations/v0.8.5/ManualMigrateScrobbleErrors.cs b/API/Data/ManualMigrations/v0.8.5/ManualMigrateScrobbleErrors.cs new file mode 100644 index 000000000..b0d483de6 --- /dev/null +++ b/API/Data/ManualMigrations/v0.8.5/ManualMigrateScrobbleErrors.cs @@ -0,0 +1,49 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using API.Entities.History; +using Kavita.Common.EnvironmentInfo; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; + +namespace API.Data.ManualMigrations; + +/// +/// v0.8.5 - There seems to be some scrobble events that are pre-scrobble error table that can be processed over and over. +/// This will take the given year and minus 1 from it and clear everything from that and anything that is errored. +/// +public static class ManualMigrateScrobbleErrors +{ + public static async Task Migrate(DataContext context, ILogger logger) + { + if (await context.ManualMigrationHistory.AnyAsync(m => m.Name == "ManualMigrateScrobbleErrors")) + { + return; + } + + logger.LogCritical("Running ManualMigrateScrobbleErrors migration - Please be patient, this may take some time. This is not an error"); + + // Get all series in the Blacklist table and set their IsBlacklist = true + var events = await context.ScrobbleEvent + .Where(se => se.LastModifiedUtc <= DateTime.UtcNow.AddYears(-1) || se.IsErrored) + .ToListAsync(); + + context.ScrobbleEvent.RemoveRange(events); + + if (context.ChangeTracker.HasChanges()) + { + await context.SaveChangesAsync(); + logger.LogInformation("Removed {Count} old scrobble events", events.Count); + } + + await context.ManualMigrationHistory.AddAsync(new ManualMigrationHistory() + { + Name = "ManualMigrateScrobbleErrors", + ProductVersion = BuildInfo.Version.ToString(), + RanAt = DateTime.UtcNow + }); + await context.SaveChangesAsync(); + + logger.LogCritical("Running ManualMigrateScrobbleErrors migration - Completed. This is not an error"); + } +} diff --git a/API/Data/ManualMigrations/v0.8.5/MigrateProgressExport.cs b/API/Data/ManualMigrations/v0.8.5/MigrateProgressExport.cs new file mode 100644 index 000000000..67488d337 --- /dev/null +++ b/API/Data/ManualMigrations/v0.8.5/MigrateProgressExport.cs @@ -0,0 +1,80 @@ +using System; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Threading.Tasks; +using API.Entities; +using API.Entities.History; +using API.Services; +using CsvHelper; +using CsvHelper.Configuration.Attributes; +using Kavita.Common.EnvironmentInfo; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; + +namespace API.Data.ManualMigrations; + + +/// +/// v0.8.5 - Progress is extracted and saved in a csv since PDF parser has massive changes +/// +public static class MigrateProgressExportForV085 +{ + public static async Task Migrate(DataContext dataContext, IDirectoryService directoryService, ILogger logger) + { + try + { + if (await dataContext.ManualMigrationHistory.AnyAsync(m => m.Name == "MigrateProgressExportForV085")) + { + return; + } + + logger.LogCritical( + "Running MigrateProgressExportForV085 migration - Please be patient, this may take some time. This is not an error"); + + var data = await dataContext.AppUserProgresses + .Join(dataContext.Series, progress => progress.SeriesId, series => series.Id, (progress, series) => new { progress, series }) + .Join(dataContext.Volume, ps => ps.progress.VolumeId, volume => volume.Id, (ps, volume) => new { ps.progress, ps.series, volume }) + .Join(dataContext.Chapter, psv => psv.progress.ChapterId, chapter => chapter.Id, (psv, chapter) => new { psv.progress, psv.series, psv.volume, chapter }) + .Join(dataContext.MangaFile, psvc => psvc.chapter.Id, mangaFile => mangaFile.ChapterId, (psvc, mangaFile) => new { psvc.progress, psvc.series, psvc.volume, psvc.chapter, mangaFile }) + .Join(dataContext.AppUser, psvcm => psvcm.progress.AppUserId, appUser => appUser.Id, (psvcm, appUser) => new + { + LibraryId = psvcm.series.LibraryId, + LibraryName = psvcm.series.Library.Name, + SeriesName = psvcm.series.Name, + VolumeRange = psvcm.volume.MinNumber + "-" + psvcm.volume.MaxNumber, + VolumeLookupName = psvcm.volume.Name, + ChapterRange = psvcm.chapter.Range, + MangaFileName = psvcm.mangaFile.FileName, + MangaFilePath = psvcm.mangaFile.FilePath, + AppUserName = appUser.UserName, + AppUserId = appUser.Id, + PagesRead = psvcm.progress.PagesRead, + BookScrollId = psvcm.progress.BookScrollId, + ProgressCreated = psvcm.progress.Created, + ProgressLastModified = psvcm.progress.LastModified + }).ToListAsync(); + + + // Write the mapped data to a CSV file + await using var writer = new StreamWriter(Path.Join(directoryService.ConfigDirectory, "progress_export-v0.8.5.csv")); + await using var csv = new CsvWriter(writer, CultureInfo.InvariantCulture); + await csv.WriteRecordsAsync(data); + + logger.LogCritical( + "Running MigrateProgressExportForV085 migration - Completed. This is not an error"); + } + catch (Exception ex) + { + // On new installs, the db isn't setup yet, so this has nothing to do + } + + dataContext.ManualMigrationHistory.Add(new ManualMigrationHistory() + { + Name = "MigrateProgressExportForV085", + ProductVersion = BuildInfo.Version.ToString(), + RanAt = DateTime.UtcNow + }); + await dataContext.SaveChangesAsync(); + } +} diff --git a/API/Data/ManualMigrations/v0.8.6/ManualMigrateScrobbleEventGen.cs b/API/Data/ManualMigrations/v0.8.6/ManualMigrateScrobbleEventGen.cs new file mode 100644 index 000000000..eb51d0fe6 --- /dev/null +++ b/API/Data/ManualMigrations/v0.8.6/ManualMigrateScrobbleEventGen.cs @@ -0,0 +1,55 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using API.Entities.History; +using API.Services.Tasks.Scanner.Parser; +using Kavita.Common.EnvironmentInfo; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; + +namespace API.Data.ManualMigrations; + +/// +/// v0.8.6 - Manually check when a user triggers scrobble event generation +/// +public static class ManualMigrateScrobbleEventGen +{ + public static async Task Migrate(DataContext context, ILogger logger) + { + if (await context.ManualMigrationHistory.AnyAsync(m => m.Name == "ManualMigrateScrobbleEventGen")) + { + return; + } + + logger.LogCritical("Running ManualMigrateScrobbleEventGen migration - Please be patient, this may take some time. This is not an error"); + + var users = await context.Users + .Where(u => u.AniListAccessToken != null) + .ToListAsync(); + + foreach (var user in users) + { + if (await context.ScrobbleEvent.AnyAsync(se => se.AppUserId == user.Id)) + { + user.HasRunScrobbleEventGeneration = true; + user.ScrobbleEventGenerationRan = DateTime.UtcNow; + context.AppUser.Update(user); + } + } + + if (context.ChangeTracker.HasChanges()) + { + await context.SaveChangesAsync(); + } + + await context.ManualMigrationHistory.AddAsync(new ManualMigrationHistory() + { + Name = "ManualMigrateScrobbleEventGen", + ProductVersion = BuildInfo.Version.ToString(), + RanAt = DateTime.UtcNow + }); + await context.SaveChangesAsync(); + + logger.LogCritical("Running ManualMigrateScrobbleEventGen migration - Completed. This is not an error"); + } +} diff --git a/API/Data/ManualMigrations/v0.8.6/ManualMigrateScrobbleSpecials.cs b/API/Data/ManualMigrations/v0.8.6/ManualMigrateScrobbleSpecials.cs new file mode 100644 index 000000000..4749ff2ec --- /dev/null +++ b/API/Data/ManualMigrations/v0.8.6/ManualMigrateScrobbleSpecials.cs @@ -0,0 +1,49 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using API.Entities.History; +using API.Services.Tasks.Scanner.Parser; +using Kavita.Common.EnvironmentInfo; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; + +namespace API.Data.ManualMigrations; + +/// +/// v0.8.6 - Change to not scrobble specials as they will never process, this migration removes all existing scrobble events +/// +public static class ManualMigrateScrobbleSpecials +{ + public static async Task Migrate(DataContext context, ILogger logger) + { + if (await context.ManualMigrationHistory.AnyAsync(m => m.Name == "ManualMigrateScrobbleSpecials")) + { + return; + } + + logger.LogCritical("Running ManualMigrateScrobbleSpecials migration - Please be patient, this may take some time. This is not an error"); + + // Get all series in the Blacklist table and set their IsBlacklist = true + var events = await context.ScrobbleEvent + .Where(se => se.VolumeNumber == Parser.SpecialVolumeNumber) + .ToListAsync(); + + context.ScrobbleEvent.RemoveRange(events); + + if (context.ChangeTracker.HasChanges()) + { + await context.SaveChangesAsync(); + logger.LogInformation("Removed {Count} scrobble events that were specials", events.Count); + } + + await context.ManualMigrationHistory.AddAsync(new ManualMigrationHistory() + { + Name = "ManualMigrateScrobbleSpecials", + ProductVersion = BuildInfo.Version.ToString(), + RanAt = DateTime.UtcNow + }); + await context.SaveChangesAsync(); + + logger.LogCritical("Running ManualMigrateScrobbleSpecials migration - Completed. This is not an error"); + } +} diff --git a/API/Data/ManualMigrations/v0.8.7/ManualMigrateReadingProfiles.cs b/API/Data/ManualMigrations/v0.8.7/ManualMigrateReadingProfiles.cs new file mode 100644 index 000000000..b2afde98a --- /dev/null +++ b/API/Data/ManualMigrations/v0.8.7/ManualMigrateReadingProfiles.cs @@ -0,0 +1,84 @@ +using System; +using System.Threading.Tasks; +using API.Entities; +using API.Entities.Enums; +using API.Entities.History; +using API.Extensions; +using API.Helpers.Builders; +using Kavita.Common.EnvironmentInfo; +using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Logging; + +namespace API.Data.ManualMigrations; + +public static class ManualMigrateReadingProfiles +{ + public static async Task Migrate(DataContext context, ILogger logger) + { + if (await context.ManualMigrationHistory.AnyAsync(m => m.Name == "ManualMigrateReadingProfiles")) + { + return; + } + + logger.LogCritical("Running ManualMigrateReadingProfiles migration - Please be patient, this may take some time. This is not an error"); + + var users = await context.AppUser + .Include(u => u.UserPreferences) + .Include(u => u.ReadingProfiles) + .ToListAsync(); + + foreach (var user in users) + { + var readingProfile = new AppUserReadingProfile + { + Name = "Default", + NormalizedName = "Default".ToNormalized(), + Kind = ReadingProfileKind.Default, + LibraryIds = [], + SeriesIds = [], + BackgroundColor = user.UserPreferences.BackgroundColor, + EmulateBook = user.UserPreferences.EmulateBook, + AppUser = user, + PdfTheme = user.UserPreferences.PdfTheme, + ReaderMode = user.UserPreferences.ReaderMode, + ReadingDirection = user.UserPreferences.ReadingDirection, + ScalingOption = user.UserPreferences.ScalingOption, + LayoutMode = user.UserPreferences.LayoutMode, + WidthOverride = null, + AppUserId = user.Id, + AutoCloseMenu = user.UserPreferences.AutoCloseMenu, + BookReaderMargin = user.UserPreferences.BookReaderMargin, + PageSplitOption = user.UserPreferences.PageSplitOption, + BookThemeName = user.UserPreferences.BookThemeName, + PdfSpreadMode = user.UserPreferences.PdfSpreadMode, + PdfScrollMode = user.UserPreferences.PdfScrollMode, + SwipeToPaginate = user.UserPreferences.SwipeToPaginate, + BookReaderFontFamily = user.UserPreferences.BookReaderFontFamily, + BookReaderFontSize = user.UserPreferences.BookReaderFontSize, + BookReaderImmersiveMode = user.UserPreferences.BookReaderImmersiveMode, + BookReaderLayoutMode = user.UserPreferences.BookReaderLayoutMode, + BookReaderLineSpacing = user.UserPreferences.BookReaderLineSpacing, + BookReaderReadingDirection = user.UserPreferences.BookReaderReadingDirection, + BookReaderWritingStyle = user.UserPreferences.BookReaderWritingStyle, + AllowAutomaticWebtoonReaderDetection = user.UserPreferences.AllowAutomaticWebtoonReaderDetection, + BookReaderTapToPaginate = user.UserPreferences.BookReaderTapToPaginate, + ShowScreenHints = user.UserPreferences.ShowScreenHints, + }; + user.ReadingProfiles.Add(readingProfile); + } + + await context.SaveChangesAsync(); + + context.ManualMigrationHistory.Add(new ManualMigrationHistory + { + Name = "ManualMigrateReadingProfiles", + ProductVersion = BuildInfo.Version.ToString(), + RanAt = DateTime.UtcNow, + }); + await context.SaveChangesAsync(); + + + logger.LogCritical("Running ManualMigrateReadingProfiles migration - Completed. This is not an error"); + + } +} diff --git a/API/Data/Migrations/20250105180131_SeriesDontMatchAndBlacklist.Designer.cs b/API/Data/Migrations/20250105180131_SeriesDontMatchAndBlacklist.Designer.cs new file mode 100644 index 000000000..a5158ebc1 --- /dev/null +++ b/API/Data/Migrations/20250105180131_SeriesDontMatchAndBlacklist.Designer.cs @@ -0,0 +1,3203 @@ +// +using System; +using API.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace API.Data.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20250105180131_SeriesDontMatchAndBlacklist")] + partial class SeriesDontMatchAndBlacklist + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "9.0.0"); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AccessFailedCount") + .HasColumnType("INTEGER"); + + b.Property("AgeRestriction") + .HasColumnType("INTEGER"); + + b.Property("AgeRestrictionIncludeUnknowns") + .HasColumnType("INTEGER"); + + b.Property("AniListAccessToken") + .HasColumnType("TEXT"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("ConfirmationToken") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("EmailConfirmed") + .HasColumnType("INTEGER"); + + b.Property("LastActive") + .HasColumnType("TEXT"); + + b.Property("LastActiveUtc") + .HasColumnType("TEXT"); + + b.Property("LockoutEnabled") + .HasColumnType("INTEGER"); + + b.Property("LockoutEnd") + .HasColumnType("TEXT"); + + b.Property("MalAccessToken") + .HasColumnType("TEXT"); + + b.Property("MalUserName") + .HasColumnType("TEXT"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("PasswordHash") + .HasColumnType("TEXT"); + + b.Property("PhoneNumber") + .HasColumnType("TEXT"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("SecurityStamp") + .HasColumnType("TEXT"); + + b.Property("TwoFactorEnabled") + .HasColumnType("INTEGER"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Page") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserBookmark"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastSyncUtc") + .HasColumnType("TEXT"); + + b.Property("MissingSeriesFromSource") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.Property("SourceUrl") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TotalSourceCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserCollection"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(4); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserDashboardStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Host") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserExternalSource"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserOnDeckRemoval"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BlurUnreadSummaries") + .HasColumnType("INTEGER"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("CollapseSeriesRelationships") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("GlobalPageLayoutMode") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("Locale") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("en"); + + b.Property("NoTransitions") + .HasColumnType("INTEGER"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("PromptForDownloadSize") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("ShareReviews") + .HasColumnType("INTEGER"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("ThemeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId") + .IsUnique(); + + b.HasIndex("ThemeId"); + + b.ToTable("AppUserPreferences"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PagesRead") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserProgresses"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSourceId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(5); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserSideNavStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Filter") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserSmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PageNumber") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserTableOfContent"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserWantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("AlternateCount") + .HasColumnType("INTEGER"); + + b.Property("AlternateNumber") + .HasColumnType("TEXT"); + + b.Property("AlternateSeries") + .HasColumnType("TEXT"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("Count") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ISBN") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("ISBNLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("IsSpecial") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Number") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("Range") + .HasColumnType("TEXT"); + + b.Property("ReleaseDate") + .HasColumnType("TEXT"); + + b.Property("ReleaseDateLocked") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesGroup") + .HasColumnType("TEXT"); + + b.Property("SortOrder") + .HasColumnType("REAL"); + + b.Property("SortOrderLocked") + .HasColumnType("INTEGER"); + + b.Property("StoryArc") + .HasColumnType("TEXT"); + + b.Property("StoryArcNumber") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TitleName") + .HasColumnType("TEXT"); + + b.Property("TitleNameLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("VolumeId"); + + b.ToTable("Chapter"); + }); + + modelBuilder.Entity("API.Entities.ChapterPeople", b => + { + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.HasKey("ChapterId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("ChapterPeople"); + }); + + modelBuilder.Entity("API.Entities.CollectionTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Id", "Promoted") + .IsUnique(); + + b.ToTable("CollectionTag"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EmailAddress") + .HasColumnType("TEXT"); + + b.Property("IpAddress") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastUsed") + .HasColumnType("TEXT"); + + b.Property("LastUsedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Platform") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("Device"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Path") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("FolderPath"); + }); + + modelBuilder.Entity("API.Entities.Genre", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Genre"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowScrobbling") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FolderWatching") + .HasColumnType("INTEGER"); + + b.Property("IncludeInDashboard") + .HasColumnType("INTEGER"); + + b.Property("IncludeInRecommended") + .HasColumnType("INTEGER"); + + b.Property("IncludeInSearch") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("ManageCollections") + .HasColumnType("INTEGER"); + + b.Property("ManageReadingLists") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Pattern") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryExcludePattern"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("FileTypeGroup") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryFileTypeGroup"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Bytes") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("LastFileAnalysis") + .HasColumnType("TEXT"); + + b.Property("LastFileAnalysisUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("MangaFile"); + }); + + modelBuilder.Entity("API.Entities.ManualMigrationHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("ProductVersion") + .HasColumnType("TEXT"); + + b.Property("RanAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ManualMigrationHistory"); + }); + + modelBuilder.Entity("API.Entities.MediaError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MediaError"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AverageScore") + .HasColumnType("INTEGER"); + + b.Property("FavoriteCount") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ProviderUrl") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ExternalRating"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRecommendation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("CoverUrl") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Url") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("ExternalRecommendation"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("BodyJustText") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("INTEGER"); + + b.Property("RawBody") + .HasColumnType("TEXT"); + + b.Property("Score") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("SiteUrl") + .HasColumnType("TEXT"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.Property("TotalVotes") + .HasColumnType("INTEGER"); + + b.Property("Username") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ExternalReview"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AverageExternalRating") + .HasColumnType("INTEGER"); + + b.Property("GoogleBooksId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("ValidUntilUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.ToTable("ExternalSeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastChecked") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("SeriesBlacklist"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxCount") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatusLocked") + .HasColumnType("INTEGER"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYear") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYearLocked") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.HasIndex("Id", "SeriesId") + .IsUnique(); + + b.ToTable("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("RelationKind") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("TargetSeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.HasIndex("TargetSeriesId"); + + b.ToTable("SeriesRelation"); + }); + + modelBuilder.Entity("API.Entities.Person", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("Asin") + .HasColumnType("TEXT"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("HardcoverId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Person"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EndingMonth") + .HasColumnType("INTEGER"); + + b.Property("EndingYear") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("StartingMonth") + .HasColumnType("INTEGER"); + + b.Property("StartingYear") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("ReadingList"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("ReadingListId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.HasIndex("ReadingListId"); + + b.HasIndex("SeriesId"); + + b.HasIndex("VolumeId"); + + b.ToTable("ReadingListItem"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId1") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ScrobbleEventId1"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleError"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterNumber") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("ErrorDetails") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsErrored") + .HasColumnType("INTEGER"); + + b.Property("IsProcessed") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("ProcessDateUtc") + .HasColumnType("TEXT"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("ReviewBody") + .HasColumnType("TEXT"); + + b.Property("ReviewTitle") + .HasColumnType("TEXT"); + + b.Property("ScrobbleEventType") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeNumber") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("LibraryId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleEvent"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleHold"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DontMatch") + .HasColumnType("INTEGER"); + + b.Property("FolderPath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsBlacklisted") + .HasColumnType("INTEGER"); + + b.Property("LastChapterAdded") + .HasColumnType("TEXT"); + + b.Property("LastChapterAddedUtc") + .HasColumnType("TEXT"); + + b.Property("LastFolderScanned") + .HasColumnType("TEXT"); + + b.Property("LastFolderScannedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("LocalizedName") + .HasColumnType("TEXT"); + + b.Property("LocalizedNameLocked") + .HasColumnType("INTEGER"); + + b.Property("LowestFolderPath") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedLocalizedName") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("OriginalName") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SortName") + .HasColumnType("TEXT"); + + b.Property("SortNameLocked") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("Series"); + }); + + modelBuilder.Entity("API.Entities.SeriesMetadataPeople", b => + { + b.Property("SeriesMetadataId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.HasKey("SeriesMetadataId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ServerSetting", b => + { + b.Property("Key") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.ToTable("ServerSetting"); + }); + + modelBuilder.Entity("API.Entities.ServerStatistics", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterCount") + .HasColumnType("INTEGER"); + + b.Property("FileCount") + .HasColumnType("INTEGER"); + + b.Property("GenreCount") + .HasColumnType("INTEGER"); + + b.Property("PersonCount") + .HasColumnType("INTEGER"); + + b.Property("SeriesCount") + .HasColumnType("INTEGER"); + + b.Property("TagCount") + .HasColumnType("INTEGER"); + + b.Property("UserCount") + .HasColumnType("INTEGER"); + + b.Property("VolumeCount") + .HasColumnType("INTEGER"); + + b.Property("Year") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ServerStatistics"); + }); + + modelBuilder.Entity("API.Entities.SiteTheme", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Author") + .HasColumnType("TEXT"); + + b.Property("CompatibleVersion") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("GitHubPath") + .HasColumnType("TEXT"); + + b.Property("IsDefault") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PreviewUrls") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ShaHash") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("SiteTheme"); + }); + + modelBuilder.Entity("API.Entities.Tag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Tag"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LookupName") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Number") + .HasColumnType("INTEGER"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("Volume"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.Property("CollectionsId") + .HasColumnType("INTEGER"); + + b.Property("ItemsId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionsId", "ItemsId"); + + b.HasIndex("ItemsId"); + + b.ToTable("AppUserCollectionSeries"); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.Property("AppUsersId") + .HasColumnType("INTEGER"); + + b.Property("LibrariesId") + .HasColumnType("INTEGER"); + + b.HasKey("AppUsersId", "LibrariesId"); + + b.HasIndex("LibrariesId"); + + b.ToTable("AppUserLibrary"); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "GenresId"); + + b.HasIndex("GenresId"); + + b.ToTable("ChapterGenre"); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("ChapterTag"); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.Property("CollectionTagsId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionTagsId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("CollectionTagSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.Property("ExternalRatingsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRatingsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRatingExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.Property("ExternalRecommendationsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRecommendationsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRecommendationExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.Property("ExternalReviewsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalReviewsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalReviewExternalSeriesMetadata"); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("GenresId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("GenreSeriesMetadata"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("ProviderKey") + .HasColumnType("TEXT"); + + b.Property("ProviderDisplayName") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("SeriesMetadatasId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("SeriesMetadataTag"); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Bookmarks") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Collections") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("DashboardStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ExternalSources") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithOne("UserPreferences") + .HasForeignKey("API.Entities.AppUserPreferences", "AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.SiteTheme", "Theme") + .WithMany() + .HasForeignKey("ThemeId"); + + b.Navigation("AppUser"); + + b.Navigation("Theme"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Progresses") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", null) + .WithMany("UserProgress") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany("Progress") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Ratings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany("Ratings") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.HasOne("API.Entities.AppRole", "Role") + .WithMany("UserRoles") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUser", "User") + .WithMany("UserRoles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SideNavStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SmartFilters") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("TableOfContents") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("WantToRead") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.HasOne("API.Entities.Volume", "Volume") + .WithMany("Chapters") + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.ChapterPeople", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("People") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Person", "Person") + .WithMany("ChapterPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Devices") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Folders") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryExcludePatterns") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryFileTypes") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Files") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("ExternalSeriesMetadata") + .HasForeignKey("API.Entities.Metadata.ExternalSeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("Metadata") + .HasForeignKey("API.Entities.Metadata.SeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Relations") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "TargetSeries") + .WithMany("RelationOf") + .HasForeignKey("TargetSeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + + b.Navigation("TargetSeries"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingLists") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.ReadingList", "ReadingList") + .WithMany("Items") + .HasForeignKey("ReadingListId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Volume", "Volume") + .WithMany() + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("ReadingList"); + + b.Navigation("Series"); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.HasOne("API.Entities.Scrobble.ScrobbleEvent", "ScrobbleEvent") + .WithMany() + .HasForeignKey("ScrobbleEventId1"); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ScrobbleEvent"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", "Library") + .WithMany() + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Library"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ScrobbleHolds") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Series") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.SeriesMetadataPeople", b => + { + b.HasOne("API.Entities.Person", "Person") + .WithMany("SeriesMetadataPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", "SeriesMetadata") + .WithMany("People") + .HasForeignKey("SeriesMetadataId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + + b.Navigation("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Volumes") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.HasOne("API.Entities.AppUserCollection", null) + .WithMany() + .HasForeignKey("CollectionsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany() + .HasForeignKey("ItemsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("AppUsersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", null) + .WithMany() + .HasForeignKey("LibrariesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.HasOne("API.Entities.CollectionTag", null) + .WithMany() + .HasForeignKey("CollectionTagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRating", null) + .WithMany() + .HasForeignKey("ExternalRatingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRecommendation", null) + .WithMany() + .HasForeignKey("ExternalRecommendationsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalReview", null) + .WithMany() + .HasForeignKey("ExternalReviewsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("API.Entities.AppRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Navigation("UserRoles"); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Navigation("Bookmarks"); + + b.Navigation("Collections"); + + b.Navigation("DashboardStreams"); + + b.Navigation("Devices"); + + b.Navigation("ExternalSources"); + + b.Navigation("Progresses"); + + b.Navigation("Ratings"); + + b.Navigation("ReadingLists"); + + b.Navigation("ScrobbleHolds"); + + b.Navigation("SideNavStreams"); + + b.Navigation("SmartFilters"); + + b.Navigation("TableOfContents"); + + b.Navigation("UserPreferences"); + + b.Navigation("UserRoles"); + + b.Navigation("WantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Navigation("Files"); + + b.Navigation("People"); + + b.Navigation("UserProgress"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Navigation("Folders"); + + b.Navigation("LibraryExcludePatterns"); + + b.Navigation("LibraryFileTypes"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Navigation("People"); + }); + + modelBuilder.Entity("API.Entities.Person", b => + { + b.Navigation("ChapterPeople"); + + b.Navigation("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Navigation("ExternalSeriesMetadata"); + + b.Navigation("Metadata"); + + b.Navigation("Progress"); + + b.Navigation("Ratings"); + + b.Navigation("RelationOf"); + + b.Navigation("Relations"); + + b.Navigation("Volumes"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Navigation("Chapters"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/API/Data/Migrations/20250105180131_SeriesDontMatchAndBlacklist.cs b/API/Data/Migrations/20250105180131_SeriesDontMatchAndBlacklist.cs new file mode 100644 index 000000000..ab80f0621 --- /dev/null +++ b/API/Data/Migrations/20250105180131_SeriesDontMatchAndBlacklist.cs @@ -0,0 +1,40 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace API.Data.Migrations +{ + /// + public partial class SeriesDontMatchAndBlacklist : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "DontMatch", + table: "Series", + type: "INTEGER", + nullable: false, + defaultValue: false); + + migrationBuilder.AddColumn( + name: "IsBlacklisted", + table: "Series", + type: "INTEGER", + nullable: false, + defaultValue: false); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "DontMatch", + table: "Series"); + + migrationBuilder.DropColumn( + name: "IsBlacklisted", + table: "Series"); + } + } +} diff --git a/API/Data/Migrations/20250109173537_EmailHistory.Designer.cs b/API/Data/Migrations/20250109173537_EmailHistory.Designer.cs new file mode 100644 index 000000000..ff3212562 --- /dev/null +++ b/API/Data/Migrations/20250109173537_EmailHistory.Designer.cs @@ -0,0 +1,3265 @@ +// +using System; +using API.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace API.Data.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20250109173537_EmailHistory")] + partial class EmailHistory + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "9.0.0"); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AccessFailedCount") + .HasColumnType("INTEGER"); + + b.Property("AgeRestriction") + .HasColumnType("INTEGER"); + + b.Property("AgeRestrictionIncludeUnknowns") + .HasColumnType("INTEGER"); + + b.Property("AniListAccessToken") + .HasColumnType("TEXT"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("ConfirmationToken") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("EmailConfirmed") + .HasColumnType("INTEGER"); + + b.Property("LastActive") + .HasColumnType("TEXT"); + + b.Property("LastActiveUtc") + .HasColumnType("TEXT"); + + b.Property("LockoutEnabled") + .HasColumnType("INTEGER"); + + b.Property("LockoutEnd") + .HasColumnType("TEXT"); + + b.Property("MalAccessToken") + .HasColumnType("TEXT"); + + b.Property("MalUserName") + .HasColumnType("TEXT"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("PasswordHash") + .HasColumnType("TEXT"); + + b.Property("PhoneNumber") + .HasColumnType("TEXT"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("SecurityStamp") + .HasColumnType("TEXT"); + + b.Property("TwoFactorEnabled") + .HasColumnType("INTEGER"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Page") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserBookmark"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastSyncUtc") + .HasColumnType("TEXT"); + + b.Property("MissingSeriesFromSource") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.Property("SourceUrl") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TotalSourceCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserCollection"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(4); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserDashboardStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Host") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserExternalSource"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserOnDeckRemoval"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BlurUnreadSummaries") + .HasColumnType("INTEGER"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("CollapseSeriesRelationships") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("GlobalPageLayoutMode") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("Locale") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("en"); + + b.Property("NoTransitions") + .HasColumnType("INTEGER"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("PromptForDownloadSize") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("ShareReviews") + .HasColumnType("INTEGER"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("ThemeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId") + .IsUnique(); + + b.HasIndex("ThemeId"); + + b.ToTable("AppUserPreferences"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PagesRead") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserProgresses"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSourceId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(5); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserSideNavStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Filter") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserSmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PageNumber") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserTableOfContent"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserWantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("AlternateCount") + .HasColumnType("INTEGER"); + + b.Property("AlternateNumber") + .HasColumnType("TEXT"); + + b.Property("AlternateSeries") + .HasColumnType("TEXT"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("Count") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ISBN") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("ISBNLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("IsSpecial") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Number") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("Range") + .HasColumnType("TEXT"); + + b.Property("ReleaseDate") + .HasColumnType("TEXT"); + + b.Property("ReleaseDateLocked") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesGroup") + .HasColumnType("TEXT"); + + b.Property("SortOrder") + .HasColumnType("REAL"); + + b.Property("SortOrderLocked") + .HasColumnType("INTEGER"); + + b.Property("StoryArc") + .HasColumnType("TEXT"); + + b.Property("StoryArcNumber") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TitleName") + .HasColumnType("TEXT"); + + b.Property("TitleNameLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("VolumeId"); + + b.ToTable("Chapter"); + }); + + modelBuilder.Entity("API.Entities.ChapterPeople", b => + { + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.HasKey("ChapterId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("ChapterPeople"); + }); + + modelBuilder.Entity("API.Entities.CollectionTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Id", "Promoted") + .IsUnique(); + + b.ToTable("CollectionTag"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EmailAddress") + .HasColumnType("TEXT"); + + b.Property("IpAddress") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastUsed") + .HasColumnType("TEXT"); + + b.Property("LastUsedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Platform") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("Device"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DeliveryStatus") + .HasColumnType("TEXT"); + + b.Property("EmailTemplate") + .HasColumnType("TEXT"); + + b.Property("ErrorMessage") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SendDate") + .HasColumnType("TEXT"); + + b.Property("Sent") + .HasColumnType("INTEGER"); + + b.Property("Subject") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("Sent", "AppUserId", "EmailTemplate", "SendDate"); + + b.ToTable("EmailHistory"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Path") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("FolderPath"); + }); + + modelBuilder.Entity("API.Entities.Genre", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Genre"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowScrobbling") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FolderWatching") + .HasColumnType("INTEGER"); + + b.Property("IncludeInDashboard") + .HasColumnType("INTEGER"); + + b.Property("IncludeInRecommended") + .HasColumnType("INTEGER"); + + b.Property("IncludeInSearch") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("ManageCollections") + .HasColumnType("INTEGER"); + + b.Property("ManageReadingLists") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Pattern") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryExcludePattern"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("FileTypeGroup") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryFileTypeGroup"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Bytes") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("LastFileAnalysis") + .HasColumnType("TEXT"); + + b.Property("LastFileAnalysisUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("MangaFile"); + }); + + modelBuilder.Entity("API.Entities.ManualMigrationHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("ProductVersion") + .HasColumnType("TEXT"); + + b.Property("RanAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ManualMigrationHistory"); + }); + + modelBuilder.Entity("API.Entities.MediaError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MediaError"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AverageScore") + .HasColumnType("INTEGER"); + + b.Property("FavoriteCount") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ProviderUrl") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ExternalRating"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRecommendation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("CoverUrl") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Url") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("ExternalRecommendation"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("BodyJustText") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("INTEGER"); + + b.Property("RawBody") + .HasColumnType("TEXT"); + + b.Property("Score") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("SiteUrl") + .HasColumnType("TEXT"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.Property("TotalVotes") + .HasColumnType("INTEGER"); + + b.Property("Username") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ExternalReview"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AverageExternalRating") + .HasColumnType("INTEGER"); + + b.Property("GoogleBooksId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("ValidUntilUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.ToTable("ExternalSeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastChecked") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("SeriesBlacklist"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxCount") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatusLocked") + .HasColumnType("INTEGER"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYear") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYearLocked") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.HasIndex("Id", "SeriesId") + .IsUnique(); + + b.ToTable("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("RelationKind") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("TargetSeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.HasIndex("TargetSeriesId"); + + b.ToTable("SeriesRelation"); + }); + + modelBuilder.Entity("API.Entities.Person", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("Asin") + .HasColumnType("TEXT"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("HardcoverId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Person"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EndingMonth") + .HasColumnType("INTEGER"); + + b.Property("EndingYear") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("StartingMonth") + .HasColumnType("INTEGER"); + + b.Property("StartingYear") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("ReadingList"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("ReadingListId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.HasIndex("ReadingListId"); + + b.HasIndex("SeriesId"); + + b.HasIndex("VolumeId"); + + b.ToTable("ReadingListItem"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId1") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ScrobbleEventId1"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleError"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterNumber") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("ErrorDetails") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsErrored") + .HasColumnType("INTEGER"); + + b.Property("IsProcessed") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("ProcessDateUtc") + .HasColumnType("TEXT"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("ReviewBody") + .HasColumnType("TEXT"); + + b.Property("ReviewTitle") + .HasColumnType("TEXT"); + + b.Property("ScrobbleEventType") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeNumber") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("LibraryId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleEvent"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleHold"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DontMatch") + .HasColumnType("INTEGER"); + + b.Property("FolderPath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsBlacklisted") + .HasColumnType("INTEGER"); + + b.Property("LastChapterAdded") + .HasColumnType("TEXT"); + + b.Property("LastChapterAddedUtc") + .HasColumnType("TEXT"); + + b.Property("LastFolderScanned") + .HasColumnType("TEXT"); + + b.Property("LastFolderScannedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("LocalizedName") + .HasColumnType("TEXT"); + + b.Property("LocalizedNameLocked") + .HasColumnType("INTEGER"); + + b.Property("LowestFolderPath") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedLocalizedName") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("OriginalName") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SortName") + .HasColumnType("TEXT"); + + b.Property("SortNameLocked") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("Series"); + }); + + modelBuilder.Entity("API.Entities.SeriesMetadataPeople", b => + { + b.Property("SeriesMetadataId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.HasKey("SeriesMetadataId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ServerSetting", b => + { + b.Property("Key") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.ToTable("ServerSetting"); + }); + + modelBuilder.Entity("API.Entities.ServerStatistics", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterCount") + .HasColumnType("INTEGER"); + + b.Property("FileCount") + .HasColumnType("INTEGER"); + + b.Property("GenreCount") + .HasColumnType("INTEGER"); + + b.Property("PersonCount") + .HasColumnType("INTEGER"); + + b.Property("SeriesCount") + .HasColumnType("INTEGER"); + + b.Property("TagCount") + .HasColumnType("INTEGER"); + + b.Property("UserCount") + .HasColumnType("INTEGER"); + + b.Property("VolumeCount") + .HasColumnType("INTEGER"); + + b.Property("Year") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ServerStatistics"); + }); + + modelBuilder.Entity("API.Entities.SiteTheme", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Author") + .HasColumnType("TEXT"); + + b.Property("CompatibleVersion") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("GitHubPath") + .HasColumnType("TEXT"); + + b.Property("IsDefault") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PreviewUrls") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ShaHash") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("SiteTheme"); + }); + + modelBuilder.Entity("API.Entities.Tag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Tag"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LookupName") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Number") + .HasColumnType("INTEGER"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("Volume"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.Property("CollectionsId") + .HasColumnType("INTEGER"); + + b.Property("ItemsId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionsId", "ItemsId"); + + b.HasIndex("ItemsId"); + + b.ToTable("AppUserCollectionSeries"); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.Property("AppUsersId") + .HasColumnType("INTEGER"); + + b.Property("LibrariesId") + .HasColumnType("INTEGER"); + + b.HasKey("AppUsersId", "LibrariesId"); + + b.HasIndex("LibrariesId"); + + b.ToTable("AppUserLibrary"); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "GenresId"); + + b.HasIndex("GenresId"); + + b.ToTable("ChapterGenre"); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("ChapterTag"); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.Property("CollectionTagsId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionTagsId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("CollectionTagSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.Property("ExternalRatingsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRatingsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRatingExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.Property("ExternalRecommendationsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRecommendationsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRecommendationExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.Property("ExternalReviewsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalReviewsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalReviewExternalSeriesMetadata"); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("GenresId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("GenreSeriesMetadata"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("ProviderKey") + .HasColumnType("TEXT"); + + b.Property("ProviderDisplayName") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("SeriesMetadatasId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("SeriesMetadataTag"); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Bookmarks") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Collections") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("DashboardStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ExternalSources") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithOne("UserPreferences") + .HasForeignKey("API.Entities.AppUserPreferences", "AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.SiteTheme", "Theme") + .WithMany() + .HasForeignKey("ThemeId"); + + b.Navigation("AppUser"); + + b.Navigation("Theme"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Progresses") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", null) + .WithMany("UserProgress") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany("Progress") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Ratings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany("Ratings") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.HasOne("API.Entities.AppRole", "Role") + .WithMany("UserRoles") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUser", "User") + .WithMany("UserRoles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SideNavStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SmartFilters") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("TableOfContents") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("WantToRead") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.HasOne("API.Entities.Volume", "Volume") + .WithMany("Chapters") + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.ChapterPeople", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("People") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Person", "Person") + .WithMany("ChapterPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Devices") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Folders") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryExcludePatterns") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryFileTypes") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Files") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("ExternalSeriesMetadata") + .HasForeignKey("API.Entities.Metadata.ExternalSeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("Metadata") + .HasForeignKey("API.Entities.Metadata.SeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Relations") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "TargetSeries") + .WithMany("RelationOf") + .HasForeignKey("TargetSeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + + b.Navigation("TargetSeries"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingLists") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.ReadingList", "ReadingList") + .WithMany("Items") + .HasForeignKey("ReadingListId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Volume", "Volume") + .WithMany() + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("ReadingList"); + + b.Navigation("Series"); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.HasOne("API.Entities.Scrobble.ScrobbleEvent", "ScrobbleEvent") + .WithMany() + .HasForeignKey("ScrobbleEventId1"); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ScrobbleEvent"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", "Library") + .WithMany() + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Library"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ScrobbleHolds") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Series") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.SeriesMetadataPeople", b => + { + b.HasOne("API.Entities.Person", "Person") + .WithMany("SeriesMetadataPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", "SeriesMetadata") + .WithMany("People") + .HasForeignKey("SeriesMetadataId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + + b.Navigation("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Volumes") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.HasOne("API.Entities.AppUserCollection", null) + .WithMany() + .HasForeignKey("CollectionsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany() + .HasForeignKey("ItemsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("AppUsersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", null) + .WithMany() + .HasForeignKey("LibrariesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.HasOne("API.Entities.CollectionTag", null) + .WithMany() + .HasForeignKey("CollectionTagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRating", null) + .WithMany() + .HasForeignKey("ExternalRatingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRecommendation", null) + .WithMany() + .HasForeignKey("ExternalRecommendationsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalReview", null) + .WithMany() + .HasForeignKey("ExternalReviewsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("API.Entities.AppRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Navigation("UserRoles"); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Navigation("Bookmarks"); + + b.Navigation("Collections"); + + b.Navigation("DashboardStreams"); + + b.Navigation("Devices"); + + b.Navigation("ExternalSources"); + + b.Navigation("Progresses"); + + b.Navigation("Ratings"); + + b.Navigation("ReadingLists"); + + b.Navigation("ScrobbleHolds"); + + b.Navigation("SideNavStreams"); + + b.Navigation("SmartFilters"); + + b.Navigation("TableOfContents"); + + b.Navigation("UserPreferences"); + + b.Navigation("UserRoles"); + + b.Navigation("WantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Navigation("Files"); + + b.Navigation("People"); + + b.Navigation("UserProgress"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Navigation("Folders"); + + b.Navigation("LibraryExcludePatterns"); + + b.Navigation("LibraryFileTypes"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Navigation("People"); + }); + + modelBuilder.Entity("API.Entities.Person", b => + { + b.Navigation("ChapterPeople"); + + b.Navigation("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Navigation("ExternalSeriesMetadata"); + + b.Navigation("Metadata"); + + b.Navigation("Progress"); + + b.Navigation("Ratings"); + + b.Navigation("RelationOf"); + + b.Navigation("Relations"); + + b.Navigation("Volumes"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Navigation("Chapters"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/API/Data/Migrations/20250109173537_EmailHistory.cs b/API/Data/Migrations/20250109173537_EmailHistory.cs new file mode 100644 index 000000000..b31bf20c3 --- /dev/null +++ b/API/Data/Migrations/20250109173537_EmailHistory.cs @@ -0,0 +1,62 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace API.Data.Migrations +{ + /// + public partial class EmailHistory : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "EmailHistory", + columns: table => new + { + Id = table.Column(type: "INTEGER", nullable: false) + .Annotation("Sqlite:Autoincrement", true), + Sent = table.Column(type: "INTEGER", nullable: false), + SendDate = table.Column(type: "TEXT", nullable: false), + EmailTemplate = table.Column(type: "TEXT", nullable: true), + Subject = table.Column(type: "TEXT", nullable: true), + Body = table.Column(type: "TEXT", nullable: true), + DeliveryStatus = table.Column(type: "TEXT", nullable: true), + ErrorMessage = table.Column(type: "TEXT", nullable: true), + AppUserId = table.Column(type: "INTEGER", nullable: false), + Created = table.Column(type: "TEXT", nullable: false), + CreatedUtc = table.Column(type: "TEXT", nullable: false), + LastModified = table.Column(type: "TEXT", nullable: false), + LastModifiedUtc = table.Column(type: "TEXT", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_EmailHistory", x => x.Id); + table.ForeignKey( + name: "FK_EmailHistory_AspNetUsers_AppUserId", + column: x => x.AppUserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_EmailHistory_AppUserId", + table: "EmailHistory", + column: "AppUserId"); + + migrationBuilder.CreateIndex( + name: "IX_EmailHistory_Sent_AppUserId_EmailTemplate_SendDate", + table: "EmailHistory", + columns: new[] { "Sent", "AppUserId", "EmailTemplate", "SendDate" }); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "EmailHistory"); + } + } +} diff --git a/API/Data/Migrations/20250202163454_KavitaPlusUserAndMetadataSettings.Designer.cs b/API/Data/Migrations/20250202163454_KavitaPlusUserAndMetadataSettings.Designer.cs new file mode 100644 index 000000000..835510a1e --- /dev/null +++ b/API/Data/Migrations/20250202163454_KavitaPlusUserAndMetadataSettings.Designer.cs @@ -0,0 +1,3382 @@ +// +using System; +using API.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace API.Data.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20250202163454_KavitaPlusUserAndMetadataSettings")] + partial class KavitaPlusUserAndMetadataSettings + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "9.0.1"); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AccessFailedCount") + .HasColumnType("INTEGER"); + + b.Property("AgeRestriction") + .HasColumnType("INTEGER"); + + b.Property("AgeRestrictionIncludeUnknowns") + .HasColumnType("INTEGER"); + + b.Property("AniListAccessToken") + .HasColumnType("TEXT"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("ConfirmationToken") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("EmailConfirmed") + .HasColumnType("INTEGER"); + + b.Property("LastActive") + .HasColumnType("TEXT"); + + b.Property("LastActiveUtc") + .HasColumnType("TEXT"); + + b.Property("LockoutEnabled") + .HasColumnType("INTEGER"); + + b.Property("LockoutEnd") + .HasColumnType("TEXT"); + + b.Property("MalAccessToken") + .HasColumnType("TEXT"); + + b.Property("MalUserName") + .HasColumnType("TEXT"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("PasswordHash") + .HasColumnType("TEXT"); + + b.Property("PhoneNumber") + .HasColumnType("TEXT"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("SecurityStamp") + .HasColumnType("TEXT"); + + b.Property("TwoFactorEnabled") + .HasColumnType("INTEGER"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Page") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserBookmark"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastSyncUtc") + .HasColumnType("TEXT"); + + b.Property("MissingSeriesFromSource") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.Property("SourceUrl") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TotalSourceCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserCollection"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(4); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserDashboardStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Host") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserExternalSource"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserOnDeckRemoval"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListScrobblingEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BlurUnreadSummaries") + .HasColumnType("INTEGER"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("CollapseSeriesRelationships") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("GlobalPageLayoutMode") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("Locale") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("en"); + + b.Property("NoTransitions") + .HasColumnType("INTEGER"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("PromptForDownloadSize") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("ShareReviews") + .HasColumnType("INTEGER"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("ThemeId") + .HasColumnType("INTEGER"); + + b.Property("WantToReadSync") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.HasKey("Id"); + + b.HasIndex("AppUserId") + .IsUnique(); + + b.HasIndex("ThemeId"); + + b.ToTable("AppUserPreferences"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PagesRead") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserProgresses"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSourceId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(5); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserSideNavStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Filter") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserSmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PageNumber") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserTableOfContent"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserWantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("AlternateCount") + .HasColumnType("INTEGER"); + + b.Property("AlternateNumber") + .HasColumnType("TEXT"); + + b.Property("AlternateSeries") + .HasColumnType("TEXT"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("Count") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ISBN") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("ISBNLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("IsSpecial") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Number") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("Range") + .HasColumnType("TEXT"); + + b.Property("ReleaseDate") + .HasColumnType("TEXT"); + + b.Property("ReleaseDateLocked") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesGroup") + .HasColumnType("TEXT"); + + b.Property("SortOrder") + .HasColumnType("REAL"); + + b.Property("SortOrderLocked") + .HasColumnType("INTEGER"); + + b.Property("StoryArc") + .HasColumnType("TEXT"); + + b.Property("StoryArcNumber") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TitleName") + .HasColumnType("TEXT"); + + b.Property("TitleNameLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("VolumeId"); + + b.ToTable("Chapter"); + }); + + modelBuilder.Entity("API.Entities.ChapterPeople", b => + { + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.HasKey("ChapterId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("ChapterPeople"); + }); + + modelBuilder.Entity("API.Entities.CollectionTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Id", "Promoted") + .IsUnique(); + + b.ToTable("CollectionTag"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EmailAddress") + .HasColumnType("TEXT"); + + b.Property("IpAddress") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastUsed") + .HasColumnType("TEXT"); + + b.Property("LastUsedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Platform") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("Device"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DeliveryStatus") + .HasColumnType("TEXT"); + + b.Property("EmailTemplate") + .HasColumnType("TEXT"); + + b.Property("ErrorMessage") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SendDate") + .HasColumnType("TEXT"); + + b.Property("Sent") + .HasColumnType("INTEGER"); + + b.Property("Subject") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("Sent", "AppUserId", "EmailTemplate", "SendDate"); + + b.ToTable("EmailHistory"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Path") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("FolderPath"); + }); + + modelBuilder.Entity("API.Entities.Genre", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Genre"); + }); + + modelBuilder.Entity("API.Entities.History.ManualMigrationHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("ProductVersion") + .HasColumnType("TEXT"); + + b.Property("RanAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ManualMigrationHistory"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowMetadataMatching") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AllowScrobbling") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FolderWatching") + .HasColumnType("INTEGER"); + + b.Property("IncludeInDashboard") + .HasColumnType("INTEGER"); + + b.Property("IncludeInRecommended") + .HasColumnType("INTEGER"); + + b.Property("IncludeInSearch") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("ManageCollections") + .HasColumnType("INTEGER"); + + b.Property("ManageReadingLists") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Pattern") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryExcludePattern"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("FileTypeGroup") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryFileTypeGroup"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Bytes") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("LastFileAnalysis") + .HasColumnType("TEXT"); + + b.Property("LastFileAnalysisUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("MangaFile"); + }); + + modelBuilder.Entity("API.Entities.MediaError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MediaError"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AverageScore") + .HasColumnType("INTEGER"); + + b.Property("FavoriteCount") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ProviderUrl") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ExternalRating"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRecommendation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("CoverUrl") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Url") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("ExternalRecommendation"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("BodyJustText") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("INTEGER"); + + b.Property("RawBody") + .HasColumnType("TEXT"); + + b.Property("Score") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("SiteUrl") + .HasColumnType("TEXT"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.Property("TotalVotes") + .HasColumnType("INTEGER"); + + b.Property("Username") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ExternalReview"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AverageExternalRating") + .HasColumnType("INTEGER"); + + b.Property("GoogleBooksId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("ValidUntilUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.ToTable("ExternalSeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastChecked") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("SeriesBlacklist"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxCount") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatusLocked") + .HasColumnType("INTEGER"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYear") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYearLocked") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.HasIndex("Id", "SeriesId") + .IsUnique(); + + b.ToTable("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("RelationKind") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("TargetSeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.HasIndex("TargetSeriesId"); + + b.ToTable("SeriesRelation"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("DestinationType") + .HasColumnType("INTEGER"); + + b.Property("DestinationValue") + .HasColumnType("TEXT"); + + b.Property("ExcludeFromSource") + .HasColumnType("INTEGER"); + + b.Property("MetadataSettingsId") + .HasColumnType("INTEGER"); + + b.Property("SourceType") + .HasColumnType("INTEGER"); + + b.Property("SourceValue") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("MetadataSettingsId"); + + b.ToTable("MetadataFieldMapping"); + }); + + modelBuilder.Entity("API.Entities.MetadataSettings", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRatingMappings") + .HasColumnType("TEXT"); + + b.Property("Blacklist") + .HasColumnType("TEXT"); + + b.Property("EnableGenres") + .HasColumnType("INTEGER"); + + b.Property("EnableLocalizedName") + .HasColumnType("INTEGER"); + + b.Property("EnablePeople") + .HasColumnType("INTEGER"); + + b.Property("EnablePublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("EnableRelationships") + .HasColumnType("INTEGER"); + + b.Property("EnableStartDate") + .HasColumnType("INTEGER"); + + b.Property("EnableSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableTags") + .HasColumnType("INTEGER"); + + b.Property("Enabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("FirstLastPeopleNaming") + .HasColumnType("INTEGER"); + + b.PrimitiveCollection("PersonRoles") + .HasColumnType("TEXT"); + + b.PrimitiveCollection("Whitelist") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("Asin") + .HasColumnType("TEXT"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("HardcoverId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Person"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EndingMonth") + .HasColumnType("INTEGER"); + + b.Property("EndingYear") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("StartingMonth") + .HasColumnType("INTEGER"); + + b.Property("StartingYear") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("ReadingList"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("ReadingListId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.HasIndex("ReadingListId"); + + b.HasIndex("SeriesId"); + + b.HasIndex("VolumeId"); + + b.ToTable("ReadingListItem"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId1") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ScrobbleEventId1"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleError"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterNumber") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("ErrorDetails") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsErrored") + .HasColumnType("INTEGER"); + + b.Property("IsProcessed") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("ProcessDateUtc") + .HasColumnType("TEXT"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("ReviewBody") + .HasColumnType("TEXT"); + + b.Property("ReviewTitle") + .HasColumnType("TEXT"); + + b.Property("ScrobbleEventType") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeNumber") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("LibraryId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleEvent"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleHold"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DontMatch") + .HasColumnType("INTEGER"); + + b.Property("FolderPath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsBlacklisted") + .HasColumnType("INTEGER"); + + b.Property("LastChapterAdded") + .HasColumnType("TEXT"); + + b.Property("LastChapterAddedUtc") + .HasColumnType("TEXT"); + + b.Property("LastFolderScanned") + .HasColumnType("TEXT"); + + b.Property("LastFolderScannedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("LocalizedName") + .HasColumnType("TEXT"); + + b.Property("LocalizedNameLocked") + .HasColumnType("INTEGER"); + + b.Property("LowestFolderPath") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedLocalizedName") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("OriginalName") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SortName") + .HasColumnType("TEXT"); + + b.Property("SortNameLocked") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("Series"); + }); + + modelBuilder.Entity("API.Entities.SeriesMetadataPeople", b => + { + b.Property("SeriesMetadataId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.HasKey("SeriesMetadataId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ServerSetting", b => + { + b.Property("Key") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.ToTable("ServerSetting"); + }); + + modelBuilder.Entity("API.Entities.ServerStatistics", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterCount") + .HasColumnType("INTEGER"); + + b.Property("FileCount") + .HasColumnType("INTEGER"); + + b.Property("GenreCount") + .HasColumnType("INTEGER"); + + b.Property("PersonCount") + .HasColumnType("INTEGER"); + + b.Property("SeriesCount") + .HasColumnType("INTEGER"); + + b.Property("TagCount") + .HasColumnType("INTEGER"); + + b.Property("UserCount") + .HasColumnType("INTEGER"); + + b.Property("VolumeCount") + .HasColumnType("INTEGER"); + + b.Property("Year") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ServerStatistics"); + }); + + modelBuilder.Entity("API.Entities.SiteTheme", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Author") + .HasColumnType("TEXT"); + + b.Property("CompatibleVersion") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("GitHubPath") + .HasColumnType("TEXT"); + + b.Property("IsDefault") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PreviewUrls") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ShaHash") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("SiteTheme"); + }); + + modelBuilder.Entity("API.Entities.Tag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Tag"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LookupName") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Number") + .HasColumnType("INTEGER"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("Volume"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.Property("CollectionsId") + .HasColumnType("INTEGER"); + + b.Property("ItemsId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionsId", "ItemsId"); + + b.HasIndex("ItemsId"); + + b.ToTable("AppUserCollectionSeries"); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.Property("AppUsersId") + .HasColumnType("INTEGER"); + + b.Property("LibrariesId") + .HasColumnType("INTEGER"); + + b.HasKey("AppUsersId", "LibrariesId"); + + b.HasIndex("LibrariesId"); + + b.ToTable("AppUserLibrary"); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "GenresId"); + + b.HasIndex("GenresId"); + + b.ToTable("ChapterGenre"); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("ChapterTag"); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.Property("CollectionTagsId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionTagsId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("CollectionTagSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.Property("ExternalRatingsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRatingsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRatingExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.Property("ExternalRecommendationsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRecommendationsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRecommendationExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.Property("ExternalReviewsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalReviewsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalReviewExternalSeriesMetadata"); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("GenresId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("GenreSeriesMetadata"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("ProviderKey") + .HasColumnType("TEXT"); + + b.Property("ProviderDisplayName") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("SeriesMetadatasId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("SeriesMetadataTag"); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Bookmarks") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Collections") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("DashboardStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ExternalSources") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithOne("UserPreferences") + .HasForeignKey("API.Entities.AppUserPreferences", "AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.SiteTheme", "Theme") + .WithMany() + .HasForeignKey("ThemeId"); + + b.Navigation("AppUser"); + + b.Navigation("Theme"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Progresses") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", null) + .WithMany("UserProgress") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany("Progress") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Ratings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany("Ratings") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.HasOne("API.Entities.AppRole", "Role") + .WithMany("UserRoles") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUser", "User") + .WithMany("UserRoles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SideNavStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SmartFilters") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("TableOfContents") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("WantToRead") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.HasOne("API.Entities.Volume", "Volume") + .WithMany("Chapters") + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.ChapterPeople", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("People") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Person", "Person") + .WithMany("ChapterPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Devices") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Folders") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryExcludePatterns") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryFileTypes") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Files") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("ExternalSeriesMetadata") + .HasForeignKey("API.Entities.Metadata.ExternalSeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("Metadata") + .HasForeignKey("API.Entities.Metadata.SeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Relations") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "TargetSeries") + .WithMany("RelationOf") + .HasForeignKey("TargetSeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + + b.Navigation("TargetSeries"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.HasOne("API.Entities.MetadataSettings", "MetadataSettings") + .WithMany("FieldMappings") + .HasForeignKey("MetadataSettingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingLists") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.ReadingList", "ReadingList") + .WithMany("Items") + .HasForeignKey("ReadingListId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Volume", "Volume") + .WithMany() + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("ReadingList"); + + b.Navigation("Series"); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.HasOne("API.Entities.Scrobble.ScrobbleEvent", "ScrobbleEvent") + .WithMany() + .HasForeignKey("ScrobbleEventId1"); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ScrobbleEvent"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", "Library") + .WithMany() + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Library"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ScrobbleHolds") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Series") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.SeriesMetadataPeople", b => + { + b.HasOne("API.Entities.Person", "Person") + .WithMany("SeriesMetadataPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", "SeriesMetadata") + .WithMany("People") + .HasForeignKey("SeriesMetadataId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + + b.Navigation("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Volumes") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.HasOne("API.Entities.AppUserCollection", null) + .WithMany() + .HasForeignKey("CollectionsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany() + .HasForeignKey("ItemsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("AppUsersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", null) + .WithMany() + .HasForeignKey("LibrariesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.HasOne("API.Entities.CollectionTag", null) + .WithMany() + .HasForeignKey("CollectionTagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRating", null) + .WithMany() + .HasForeignKey("ExternalRatingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRecommendation", null) + .WithMany() + .HasForeignKey("ExternalRecommendationsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalReview", null) + .WithMany() + .HasForeignKey("ExternalReviewsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("API.Entities.AppRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Navigation("UserRoles"); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Navigation("Bookmarks"); + + b.Navigation("Collections"); + + b.Navigation("DashboardStreams"); + + b.Navigation("Devices"); + + b.Navigation("ExternalSources"); + + b.Navigation("Progresses"); + + b.Navigation("Ratings"); + + b.Navigation("ReadingLists"); + + b.Navigation("ScrobbleHolds"); + + b.Navigation("SideNavStreams"); + + b.Navigation("SmartFilters"); + + b.Navigation("TableOfContents"); + + b.Navigation("UserPreferences"); + + b.Navigation("UserRoles"); + + b.Navigation("WantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Navigation("Files"); + + b.Navigation("People"); + + b.Navigation("UserProgress"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Navigation("Folders"); + + b.Navigation("LibraryExcludePatterns"); + + b.Navigation("LibraryFileTypes"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Navigation("People"); + }); + + modelBuilder.Entity("API.Entities.MetadataSettings", b => + { + b.Navigation("FieldMappings"); + }); + + modelBuilder.Entity("API.Entities.Person", b => + { + b.Navigation("ChapterPeople"); + + b.Navigation("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Navigation("ExternalSeriesMetadata"); + + b.Navigation("Metadata"); + + b.Navigation("Progress"); + + b.Navigation("Ratings"); + + b.Navigation("RelationOf"); + + b.Navigation("Relations"); + + b.Navigation("Volumes"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Navigation("Chapters"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/API/Data/Migrations/20250202163454_KavitaPlusUserAndMetadataSettings.cs b/API/Data/Migrations/20250202163454_KavitaPlusUserAndMetadataSettings.cs new file mode 100644 index 000000000..b23d7896b --- /dev/null +++ b/API/Data/Migrations/20250202163454_KavitaPlusUserAndMetadataSettings.cs @@ -0,0 +1,112 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace API.Data.Migrations +{ + /// + public partial class KavitaPlusUserAndMetadataSettings : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "AllowMetadataMatching", + table: "Library", + type: "INTEGER", + nullable: false, + defaultValue: true); + + migrationBuilder.AddColumn( + name: "AniListScrobblingEnabled", + table: "AppUserPreferences", + type: "INTEGER", + nullable: false, + defaultValue: true); + + migrationBuilder.AddColumn( + name: "WantToReadSync", + table: "AppUserPreferences", + type: "INTEGER", + nullable: false, + defaultValue: true); + + migrationBuilder.CreateTable( + name: "MetadataSettings", + columns: table => new + { + Id = table.Column(type: "INTEGER", nullable: false) + .Annotation("Sqlite:Autoincrement", true), + Enabled = table.Column(type: "INTEGER", nullable: false, defaultValue: true), + EnableSummary = table.Column(type: "INTEGER", nullable: false), + EnablePublicationStatus = table.Column(type: "INTEGER", nullable: false), + EnableRelationships = table.Column(type: "INTEGER", nullable: false), + EnablePeople = table.Column(type: "INTEGER", nullable: false), + EnableStartDate = table.Column(type: "INTEGER", nullable: false), + EnableLocalizedName = table.Column(type: "INTEGER", nullable: false), + EnableGenres = table.Column(type: "INTEGER", nullable: false), + EnableTags = table.Column(type: "INTEGER", nullable: false), + FirstLastPeopleNaming = table.Column(type: "INTEGER", nullable: false), + AgeRatingMappings = table.Column(type: "TEXT", nullable: true), + Blacklist = table.Column(type: "TEXT", nullable: true), + Whitelist = table.Column(type: "TEXT", nullable: true), + PersonRoles = table.Column(type: "TEXT", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_MetadataSettings", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "MetadataFieldMapping", + columns: table => new + { + Id = table.Column(type: "INTEGER", nullable: false) + .Annotation("Sqlite:Autoincrement", true), + SourceType = table.Column(type: "INTEGER", nullable: false), + DestinationType = table.Column(type: "INTEGER", nullable: false), + SourceValue = table.Column(type: "TEXT", nullable: true), + DestinationValue = table.Column(type: "TEXT", nullable: true), + ExcludeFromSource = table.Column(type: "INTEGER", nullable: false), + MetadataSettingsId = table.Column(type: "INTEGER", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_MetadataFieldMapping", x => x.Id); + table.ForeignKey( + name: "FK_MetadataFieldMapping_MetadataSettings_MetadataSettingsId", + column: x => x.MetadataSettingsId, + principalTable: "MetadataSettings", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_MetadataFieldMapping_MetadataSettingsId", + table: "MetadataFieldMapping", + column: "MetadataSettingsId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "MetadataFieldMapping"); + + migrationBuilder.DropTable( + name: "MetadataSettings"); + + migrationBuilder.DropColumn( + name: "AllowMetadataMatching", + table: "Library"); + + migrationBuilder.DropColumn( + name: "AniListScrobblingEnabled", + table: "AppUserPreferences"); + + migrationBuilder.DropColumn( + name: "WantToReadSync", + table: "AppUserPreferences"); + } + } +} diff --git a/API/Data/Migrations/20250208200843_MoreMetadtaSettings.Designer.cs b/API/Data/Migrations/20250208200843_MoreMetadtaSettings.Designer.cs new file mode 100644 index 000000000..9aaa63101 --- /dev/null +++ b/API/Data/Migrations/20250208200843_MoreMetadtaSettings.Designer.cs @@ -0,0 +1,3398 @@ +// +using System; +using API.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace API.Data.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20250208200843_MoreMetadtaSettings")] + partial class MoreMetadtaSettings + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "9.0.1"); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AccessFailedCount") + .HasColumnType("INTEGER"); + + b.Property("AgeRestriction") + .HasColumnType("INTEGER"); + + b.Property("AgeRestrictionIncludeUnknowns") + .HasColumnType("INTEGER"); + + b.Property("AniListAccessToken") + .HasColumnType("TEXT"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("ConfirmationToken") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("EmailConfirmed") + .HasColumnType("INTEGER"); + + b.Property("LastActive") + .HasColumnType("TEXT"); + + b.Property("LastActiveUtc") + .HasColumnType("TEXT"); + + b.Property("LockoutEnabled") + .HasColumnType("INTEGER"); + + b.Property("LockoutEnd") + .HasColumnType("TEXT"); + + b.Property("MalAccessToken") + .HasColumnType("TEXT"); + + b.Property("MalUserName") + .HasColumnType("TEXT"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("PasswordHash") + .HasColumnType("TEXT"); + + b.Property("PhoneNumber") + .HasColumnType("TEXT"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("SecurityStamp") + .HasColumnType("TEXT"); + + b.Property("TwoFactorEnabled") + .HasColumnType("INTEGER"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Page") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserBookmark"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastSyncUtc") + .HasColumnType("TEXT"); + + b.Property("MissingSeriesFromSource") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.Property("SourceUrl") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TotalSourceCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserCollection"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(4); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserDashboardStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Host") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserExternalSource"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserOnDeckRemoval"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListScrobblingEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BlurUnreadSummaries") + .HasColumnType("INTEGER"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("CollapseSeriesRelationships") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("GlobalPageLayoutMode") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("Locale") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("en"); + + b.Property("NoTransitions") + .HasColumnType("INTEGER"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("PromptForDownloadSize") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("ShareReviews") + .HasColumnType("INTEGER"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("ThemeId") + .HasColumnType("INTEGER"); + + b.Property("WantToReadSync") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.HasKey("Id"); + + b.HasIndex("AppUserId") + .IsUnique(); + + b.HasIndex("ThemeId"); + + b.ToTable("AppUserPreferences"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PagesRead") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserProgresses"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSourceId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(5); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserSideNavStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Filter") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserSmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PageNumber") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserTableOfContent"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserWantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("AlternateCount") + .HasColumnType("INTEGER"); + + b.Property("AlternateNumber") + .HasColumnType("TEXT"); + + b.Property("AlternateSeries") + .HasColumnType("TEXT"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("Count") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ISBN") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("ISBNLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("IsSpecial") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Number") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("Range") + .HasColumnType("TEXT"); + + b.Property("ReleaseDate") + .HasColumnType("TEXT"); + + b.Property("ReleaseDateLocked") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesGroup") + .HasColumnType("TEXT"); + + b.Property("SortOrder") + .HasColumnType("REAL"); + + b.Property("SortOrderLocked") + .HasColumnType("INTEGER"); + + b.Property("StoryArc") + .HasColumnType("TEXT"); + + b.Property("StoryArcNumber") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TitleName") + .HasColumnType("TEXT"); + + b.Property("TitleNameLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("VolumeId"); + + b.ToTable("Chapter"); + }); + + modelBuilder.Entity("API.Entities.ChapterPeople", b => + { + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.HasKey("ChapterId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("ChapterPeople"); + }); + + modelBuilder.Entity("API.Entities.CollectionTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Id", "Promoted") + .IsUnique(); + + b.ToTable("CollectionTag"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EmailAddress") + .HasColumnType("TEXT"); + + b.Property("IpAddress") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastUsed") + .HasColumnType("TEXT"); + + b.Property("LastUsedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Platform") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("Device"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DeliveryStatus") + .HasColumnType("TEXT"); + + b.Property("EmailTemplate") + .HasColumnType("TEXT"); + + b.Property("ErrorMessage") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SendDate") + .HasColumnType("TEXT"); + + b.Property("Sent") + .HasColumnType("INTEGER"); + + b.Property("Subject") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("Sent", "AppUserId", "EmailTemplate", "SendDate"); + + b.ToTable("EmailHistory"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Path") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("FolderPath"); + }); + + modelBuilder.Entity("API.Entities.Genre", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Genre"); + }); + + modelBuilder.Entity("API.Entities.History.ManualMigrationHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("ProductVersion") + .HasColumnType("TEXT"); + + b.Property("RanAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ManualMigrationHistory"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowMetadataMatching") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AllowScrobbling") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FolderWatching") + .HasColumnType("INTEGER"); + + b.Property("IncludeInDashboard") + .HasColumnType("INTEGER"); + + b.Property("IncludeInRecommended") + .HasColumnType("INTEGER"); + + b.Property("IncludeInSearch") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("ManageCollections") + .HasColumnType("INTEGER"); + + b.Property("ManageReadingLists") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Pattern") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryExcludePattern"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("FileTypeGroup") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryFileTypeGroup"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Bytes") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("LastFileAnalysis") + .HasColumnType("TEXT"); + + b.Property("LastFileAnalysisUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("MangaFile"); + }); + + modelBuilder.Entity("API.Entities.MediaError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MediaError"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AverageScore") + .HasColumnType("INTEGER"); + + b.Property("FavoriteCount") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ProviderUrl") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ExternalRating"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRecommendation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("CoverUrl") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Url") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("ExternalRecommendation"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("BodyJustText") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("INTEGER"); + + b.Property("RawBody") + .HasColumnType("TEXT"); + + b.Property("Score") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("SiteUrl") + .HasColumnType("TEXT"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.Property("TotalVotes") + .HasColumnType("INTEGER"); + + b.Property("Username") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ExternalReview"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AverageExternalRating") + .HasColumnType("INTEGER"); + + b.Property("GoogleBooksId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("ValidUntilUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.ToTable("ExternalSeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastChecked") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("SeriesBlacklist"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxCount") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatusLocked") + .HasColumnType("INTEGER"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYear") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYearLocked") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.HasIndex("Id", "SeriesId") + .IsUnique(); + + b.ToTable("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("RelationKind") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("TargetSeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.HasIndex("TargetSeriesId"); + + b.ToTable("SeriesRelation"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("DestinationType") + .HasColumnType("INTEGER"); + + b.Property("DestinationValue") + .HasColumnType("TEXT"); + + b.Property("ExcludeFromSource") + .HasColumnType("INTEGER"); + + b.Property("MetadataSettingsId") + .HasColumnType("INTEGER"); + + b.Property("SourceType") + .HasColumnType("INTEGER"); + + b.Property("SourceValue") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("MetadataSettingsId"); + + b.ToTable("MetadataFieldMapping"); + }); + + modelBuilder.Entity("API.Entities.MetadataSettings", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRatingMappings") + .HasColumnType("TEXT"); + + b.Property("Blacklist") + .HasColumnType("TEXT"); + + b.Property("EnableCoverImage") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("EnableGenres") + .HasColumnType("INTEGER"); + + b.Property("EnableLocalizedName") + .HasColumnType("INTEGER"); + + b.Property("EnablePeople") + .HasColumnType("INTEGER"); + + b.Property("EnablePublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("EnableRelationships") + .HasColumnType("INTEGER"); + + b.Property("EnableStartDate") + .HasColumnType("INTEGER"); + + b.Property("EnableSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableTags") + .HasColumnType("INTEGER"); + + b.Property("Enabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("FirstLastPeopleNaming") + .HasColumnType("INTEGER"); + + b.Property("Overrides") + .HasColumnType("TEXT"); + + b.PrimitiveCollection("PersonRoles") + .HasColumnType("TEXT"); + + b.Property("Whitelist") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("Asin") + .HasColumnType("TEXT"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("HardcoverId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Person"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EndingMonth") + .HasColumnType("INTEGER"); + + b.Property("EndingYear") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("StartingMonth") + .HasColumnType("INTEGER"); + + b.Property("StartingYear") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("ReadingList"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("ReadingListId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.HasIndex("ReadingListId"); + + b.HasIndex("SeriesId"); + + b.HasIndex("VolumeId"); + + b.ToTable("ReadingListItem"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId1") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ScrobbleEventId1"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleError"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterNumber") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("ErrorDetails") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsErrored") + .HasColumnType("INTEGER"); + + b.Property("IsProcessed") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("ProcessDateUtc") + .HasColumnType("TEXT"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("ReviewBody") + .HasColumnType("TEXT"); + + b.Property("ReviewTitle") + .HasColumnType("TEXT"); + + b.Property("ScrobbleEventType") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeNumber") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("LibraryId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleEvent"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleHold"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DontMatch") + .HasColumnType("INTEGER"); + + b.Property("FolderPath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsBlacklisted") + .HasColumnType("INTEGER"); + + b.Property("LastChapterAdded") + .HasColumnType("TEXT"); + + b.Property("LastChapterAddedUtc") + .HasColumnType("TEXT"); + + b.Property("LastFolderScanned") + .HasColumnType("TEXT"); + + b.Property("LastFolderScannedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("LocalizedName") + .HasColumnType("TEXT"); + + b.Property("LocalizedNameLocked") + .HasColumnType("INTEGER"); + + b.Property("LowestFolderPath") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedLocalizedName") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("OriginalName") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SortName") + .HasColumnType("TEXT"); + + b.Property("SortNameLocked") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("Series"); + }); + + modelBuilder.Entity("API.Entities.SeriesMetadataPeople", b => + { + b.Property("SeriesMetadataId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.HasKey("SeriesMetadataId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ServerSetting", b => + { + b.Property("Key") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.ToTable("ServerSetting"); + }); + + modelBuilder.Entity("API.Entities.ServerStatistics", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterCount") + .HasColumnType("INTEGER"); + + b.Property("FileCount") + .HasColumnType("INTEGER"); + + b.Property("GenreCount") + .HasColumnType("INTEGER"); + + b.Property("PersonCount") + .HasColumnType("INTEGER"); + + b.Property("SeriesCount") + .HasColumnType("INTEGER"); + + b.Property("TagCount") + .HasColumnType("INTEGER"); + + b.Property("UserCount") + .HasColumnType("INTEGER"); + + b.Property("VolumeCount") + .HasColumnType("INTEGER"); + + b.Property("Year") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ServerStatistics"); + }); + + modelBuilder.Entity("API.Entities.SiteTheme", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Author") + .HasColumnType("TEXT"); + + b.Property("CompatibleVersion") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("GitHubPath") + .HasColumnType("TEXT"); + + b.Property("IsDefault") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PreviewUrls") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ShaHash") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("SiteTheme"); + }); + + modelBuilder.Entity("API.Entities.Tag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Tag"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LookupName") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Number") + .HasColumnType("INTEGER"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("Volume"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.Property("CollectionsId") + .HasColumnType("INTEGER"); + + b.Property("ItemsId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionsId", "ItemsId"); + + b.HasIndex("ItemsId"); + + b.ToTable("AppUserCollectionSeries"); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.Property("AppUsersId") + .HasColumnType("INTEGER"); + + b.Property("LibrariesId") + .HasColumnType("INTEGER"); + + b.HasKey("AppUsersId", "LibrariesId"); + + b.HasIndex("LibrariesId"); + + b.ToTable("AppUserLibrary"); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "GenresId"); + + b.HasIndex("GenresId"); + + b.ToTable("ChapterGenre"); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("ChapterTag"); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.Property("CollectionTagsId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionTagsId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("CollectionTagSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.Property("ExternalRatingsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRatingsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRatingExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.Property("ExternalRecommendationsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRecommendationsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRecommendationExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.Property("ExternalReviewsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalReviewsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalReviewExternalSeriesMetadata"); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("GenresId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("GenreSeriesMetadata"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("ProviderKey") + .HasColumnType("TEXT"); + + b.Property("ProviderDisplayName") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("SeriesMetadatasId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("SeriesMetadataTag"); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Bookmarks") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Collections") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("DashboardStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ExternalSources") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithOne("UserPreferences") + .HasForeignKey("API.Entities.AppUserPreferences", "AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.SiteTheme", "Theme") + .WithMany() + .HasForeignKey("ThemeId"); + + b.Navigation("AppUser"); + + b.Navigation("Theme"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Progresses") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", null) + .WithMany("UserProgress") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany("Progress") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Ratings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany("Ratings") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.HasOne("API.Entities.AppRole", "Role") + .WithMany("UserRoles") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUser", "User") + .WithMany("UserRoles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SideNavStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SmartFilters") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("TableOfContents") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("WantToRead") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.HasOne("API.Entities.Volume", "Volume") + .WithMany("Chapters") + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.ChapterPeople", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("People") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Person", "Person") + .WithMany("ChapterPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Devices") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Folders") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryExcludePatterns") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryFileTypes") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Files") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("ExternalSeriesMetadata") + .HasForeignKey("API.Entities.Metadata.ExternalSeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("Metadata") + .HasForeignKey("API.Entities.Metadata.SeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Relations") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "TargetSeries") + .WithMany("RelationOf") + .HasForeignKey("TargetSeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + + b.Navigation("TargetSeries"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.HasOne("API.Entities.MetadataSettings", "MetadataSettings") + .WithMany("FieldMappings") + .HasForeignKey("MetadataSettingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingLists") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.ReadingList", "ReadingList") + .WithMany("Items") + .HasForeignKey("ReadingListId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Volume", "Volume") + .WithMany() + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("ReadingList"); + + b.Navigation("Series"); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.HasOne("API.Entities.Scrobble.ScrobbleEvent", "ScrobbleEvent") + .WithMany() + .HasForeignKey("ScrobbleEventId1"); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ScrobbleEvent"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", "Library") + .WithMany() + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Library"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ScrobbleHolds") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Series") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.SeriesMetadataPeople", b => + { + b.HasOne("API.Entities.Person", "Person") + .WithMany("SeriesMetadataPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", "SeriesMetadata") + .WithMany("People") + .HasForeignKey("SeriesMetadataId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + + b.Navigation("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Volumes") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.HasOne("API.Entities.AppUserCollection", null) + .WithMany() + .HasForeignKey("CollectionsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany() + .HasForeignKey("ItemsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("AppUsersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", null) + .WithMany() + .HasForeignKey("LibrariesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.HasOne("API.Entities.CollectionTag", null) + .WithMany() + .HasForeignKey("CollectionTagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRating", null) + .WithMany() + .HasForeignKey("ExternalRatingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRecommendation", null) + .WithMany() + .HasForeignKey("ExternalRecommendationsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalReview", null) + .WithMany() + .HasForeignKey("ExternalReviewsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("API.Entities.AppRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Navigation("UserRoles"); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Navigation("Bookmarks"); + + b.Navigation("Collections"); + + b.Navigation("DashboardStreams"); + + b.Navigation("Devices"); + + b.Navigation("ExternalSources"); + + b.Navigation("Progresses"); + + b.Navigation("Ratings"); + + b.Navigation("ReadingLists"); + + b.Navigation("ScrobbleHolds"); + + b.Navigation("SideNavStreams"); + + b.Navigation("SmartFilters"); + + b.Navigation("TableOfContents"); + + b.Navigation("UserPreferences"); + + b.Navigation("UserRoles"); + + b.Navigation("WantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Navigation("Files"); + + b.Navigation("People"); + + b.Navigation("UserProgress"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Navigation("Folders"); + + b.Navigation("LibraryExcludePatterns"); + + b.Navigation("LibraryFileTypes"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Navigation("People"); + }); + + modelBuilder.Entity("API.Entities.MetadataSettings", b => + { + b.Navigation("FieldMappings"); + }); + + modelBuilder.Entity("API.Entities.Person", b => + { + b.Navigation("ChapterPeople"); + + b.Navigation("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Navigation("ExternalSeriesMetadata"); + + b.Navigation("Metadata"); + + b.Navigation("Progress"); + + b.Navigation("Ratings"); + + b.Navigation("RelationOf"); + + b.Navigation("Relations"); + + b.Navigation("Volumes"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Navigation("Chapters"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/API/Data/Migrations/20250208200843_MoreMetadtaSettings.cs b/API/Data/Migrations/20250208200843_MoreMetadtaSettings.cs new file mode 100644 index 000000000..70e42cd11 --- /dev/null +++ b/API/Data/Migrations/20250208200843_MoreMetadtaSettings.cs @@ -0,0 +1,61 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace API.Data.Migrations +{ + /// + public partial class MoreMetadtaSettings : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "KavitaPlusConnection", + table: "SeriesMetadataPeople", + type: "INTEGER", + nullable: false, + defaultValue: false); + + migrationBuilder.AddColumn( + name: "OrderWeight", + table: "SeriesMetadataPeople", + type: "INTEGER", + nullable: false, + defaultValue: 0); + + migrationBuilder.AddColumn( + name: "EnableCoverImage", + table: "MetadataSettings", + type: "INTEGER", + nullable: false, + defaultValue: true); + + migrationBuilder.AddColumn( + name: "Overrides", + table: "MetadataSettings", + type: "TEXT", + nullable: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "KavitaPlusConnection", + table: "SeriesMetadataPeople"); + + migrationBuilder.DropColumn( + name: "OrderWeight", + table: "SeriesMetadataPeople"); + + migrationBuilder.DropColumn( + name: "EnableCoverImage", + table: "MetadataSettings"); + + migrationBuilder.DropColumn( + name: "Overrides", + table: "MetadataSettings"); + } + } +} diff --git a/API/Data/Migrations/20250328125012_AutomaticWebtoonReaderMode.Designer.cs b/API/Data/Migrations/20250328125012_AutomaticWebtoonReaderMode.Designer.cs new file mode 100644 index 000000000..be3d5e3f9 --- /dev/null +++ b/API/Data/Migrations/20250328125012_AutomaticWebtoonReaderMode.Designer.cs @@ -0,0 +1,3403 @@ +// +using System; +using API.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace API.Data.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20250328125012_AutomaticWebtoonReaderMode")] + partial class AutomaticWebtoonReaderMode + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "9.0.3"); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AccessFailedCount") + .HasColumnType("INTEGER"); + + b.Property("AgeRestriction") + .HasColumnType("INTEGER"); + + b.Property("AgeRestrictionIncludeUnknowns") + .HasColumnType("INTEGER"); + + b.Property("AniListAccessToken") + .HasColumnType("TEXT"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("ConfirmationToken") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("EmailConfirmed") + .HasColumnType("INTEGER"); + + b.Property("LastActive") + .HasColumnType("TEXT"); + + b.Property("LastActiveUtc") + .HasColumnType("TEXT"); + + b.Property("LockoutEnabled") + .HasColumnType("INTEGER"); + + b.Property("LockoutEnd") + .HasColumnType("TEXT"); + + b.Property("MalAccessToken") + .HasColumnType("TEXT"); + + b.Property("MalUserName") + .HasColumnType("TEXT"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("PasswordHash") + .HasColumnType("TEXT"); + + b.Property("PhoneNumber") + .HasColumnType("TEXT"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("SecurityStamp") + .HasColumnType("TEXT"); + + b.Property("TwoFactorEnabled") + .HasColumnType("INTEGER"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Page") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserBookmark"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastSyncUtc") + .HasColumnType("TEXT"); + + b.Property("MissingSeriesFromSource") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.Property("SourceUrl") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TotalSourceCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserCollection"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(4); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserDashboardStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Host") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserExternalSource"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserOnDeckRemoval"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowAutomaticWebtoonReaderDetection") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AniListScrobblingEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BlurUnreadSummaries") + .HasColumnType("INTEGER"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("CollapseSeriesRelationships") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("GlobalPageLayoutMode") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("Locale") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("en"); + + b.Property("NoTransitions") + .HasColumnType("INTEGER"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("PromptForDownloadSize") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("ShareReviews") + .HasColumnType("INTEGER"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("ThemeId") + .HasColumnType("INTEGER"); + + b.Property("WantToReadSync") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.HasKey("Id"); + + b.HasIndex("AppUserId") + .IsUnique(); + + b.HasIndex("ThemeId"); + + b.ToTable("AppUserPreferences"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PagesRead") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserProgresses"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSourceId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(5); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserSideNavStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Filter") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserSmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PageNumber") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserTableOfContent"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserWantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("AlternateCount") + .HasColumnType("INTEGER"); + + b.Property("AlternateNumber") + .HasColumnType("TEXT"); + + b.Property("AlternateSeries") + .HasColumnType("TEXT"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("Count") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ISBN") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("ISBNLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("IsSpecial") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Number") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("Range") + .HasColumnType("TEXT"); + + b.Property("ReleaseDate") + .HasColumnType("TEXT"); + + b.Property("ReleaseDateLocked") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesGroup") + .HasColumnType("TEXT"); + + b.Property("SortOrder") + .HasColumnType("REAL"); + + b.Property("SortOrderLocked") + .HasColumnType("INTEGER"); + + b.Property("StoryArc") + .HasColumnType("TEXT"); + + b.Property("StoryArcNumber") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TitleName") + .HasColumnType("TEXT"); + + b.Property("TitleNameLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("VolumeId"); + + b.ToTable("Chapter"); + }); + + modelBuilder.Entity("API.Entities.CollectionTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Id", "Promoted") + .IsUnique(); + + b.ToTable("CollectionTag"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EmailAddress") + .HasColumnType("TEXT"); + + b.Property("IpAddress") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastUsed") + .HasColumnType("TEXT"); + + b.Property("LastUsedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Platform") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("Device"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DeliveryStatus") + .HasColumnType("TEXT"); + + b.Property("EmailTemplate") + .HasColumnType("TEXT"); + + b.Property("ErrorMessage") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SendDate") + .HasColumnType("TEXT"); + + b.Property("Sent") + .HasColumnType("INTEGER"); + + b.Property("Subject") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("Sent", "AppUserId", "EmailTemplate", "SendDate"); + + b.ToTable("EmailHistory"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Path") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("FolderPath"); + }); + + modelBuilder.Entity("API.Entities.Genre", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Genre"); + }); + + modelBuilder.Entity("API.Entities.History.ManualMigrationHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("ProductVersion") + .HasColumnType("TEXT"); + + b.Property("RanAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ManualMigrationHistory"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowMetadataMatching") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AllowScrobbling") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FolderWatching") + .HasColumnType("INTEGER"); + + b.Property("IncludeInDashboard") + .HasColumnType("INTEGER"); + + b.Property("IncludeInRecommended") + .HasColumnType("INTEGER"); + + b.Property("IncludeInSearch") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("ManageCollections") + .HasColumnType("INTEGER"); + + b.Property("ManageReadingLists") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Pattern") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryExcludePattern"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("FileTypeGroup") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryFileTypeGroup"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Bytes") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("LastFileAnalysis") + .HasColumnType("TEXT"); + + b.Property("LastFileAnalysisUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("MangaFile"); + }); + + modelBuilder.Entity("API.Entities.MediaError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MediaError"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AverageScore") + .HasColumnType("INTEGER"); + + b.Property("FavoriteCount") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ProviderUrl") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ExternalRating"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRecommendation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("CoverUrl") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Url") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("ExternalRecommendation"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("BodyJustText") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("INTEGER"); + + b.Property("RawBody") + .HasColumnType("TEXT"); + + b.Property("Score") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("SiteUrl") + .HasColumnType("TEXT"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.Property("TotalVotes") + .HasColumnType("INTEGER"); + + b.Property("Username") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ExternalReview"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AverageExternalRating") + .HasColumnType("INTEGER"); + + b.Property("GoogleBooksId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("ValidUntilUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.ToTable("ExternalSeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastChecked") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("SeriesBlacklist"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxCount") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatusLocked") + .HasColumnType("INTEGER"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYear") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYearLocked") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.HasIndex("Id", "SeriesId") + .IsUnique(); + + b.ToTable("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("RelationKind") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("TargetSeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.HasIndex("TargetSeriesId"); + + b.ToTable("SeriesRelation"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("DestinationType") + .HasColumnType("INTEGER"); + + b.Property("DestinationValue") + .HasColumnType("TEXT"); + + b.Property("ExcludeFromSource") + .HasColumnType("INTEGER"); + + b.Property("MetadataSettingsId") + .HasColumnType("INTEGER"); + + b.Property("SourceType") + .HasColumnType("INTEGER"); + + b.Property("SourceValue") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("MetadataSettingsId"); + + b.ToTable("MetadataFieldMapping"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRatingMappings") + .HasColumnType("TEXT"); + + b.Property("Blacklist") + .HasColumnType("TEXT"); + + b.Property("EnableCoverImage") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("EnableGenres") + .HasColumnType("INTEGER"); + + b.Property("EnableLocalizedName") + .HasColumnType("INTEGER"); + + b.Property("EnablePeople") + .HasColumnType("INTEGER"); + + b.Property("EnablePublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("EnableRelationships") + .HasColumnType("INTEGER"); + + b.Property("EnableStartDate") + .HasColumnType("INTEGER"); + + b.Property("EnableSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableTags") + .HasColumnType("INTEGER"); + + b.Property("Enabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("FirstLastPeopleNaming") + .HasColumnType("INTEGER"); + + b.Property("Overrides") + .HasColumnType("TEXT"); + + b.PrimitiveCollection("PersonRoles") + .HasColumnType("TEXT"); + + b.Property("Whitelist") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.HasKey("ChapterId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("ChapterPeople"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("Asin") + .HasColumnType("TEXT"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("HardcoverId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.Property("SeriesMetadataId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.HasKey("SeriesMetadataId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EndingMonth") + .HasColumnType("INTEGER"); + + b.Property("EndingYear") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("StartingMonth") + .HasColumnType("INTEGER"); + + b.Property("StartingYear") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("ReadingList"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("ReadingListId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.HasIndex("ReadingListId"); + + b.HasIndex("SeriesId"); + + b.HasIndex("VolumeId"); + + b.ToTable("ReadingListItem"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId1") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ScrobbleEventId1"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleError"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterNumber") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("ErrorDetails") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsErrored") + .HasColumnType("INTEGER"); + + b.Property("IsProcessed") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("ProcessDateUtc") + .HasColumnType("TEXT"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("ReviewBody") + .HasColumnType("TEXT"); + + b.Property("ReviewTitle") + .HasColumnType("TEXT"); + + b.Property("ScrobbleEventType") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeNumber") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("LibraryId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleEvent"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleHold"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DontMatch") + .HasColumnType("INTEGER"); + + b.Property("FolderPath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsBlacklisted") + .HasColumnType("INTEGER"); + + b.Property("LastChapterAdded") + .HasColumnType("TEXT"); + + b.Property("LastChapterAddedUtc") + .HasColumnType("TEXT"); + + b.Property("LastFolderScanned") + .HasColumnType("TEXT"); + + b.Property("LastFolderScannedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("LocalizedName") + .HasColumnType("TEXT"); + + b.Property("LocalizedNameLocked") + .HasColumnType("INTEGER"); + + b.Property("LowestFolderPath") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedLocalizedName") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("OriginalName") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SortName") + .HasColumnType("TEXT"); + + b.Property("SortNameLocked") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("Series"); + }); + + modelBuilder.Entity("API.Entities.ServerSetting", b => + { + b.Property("Key") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.ToTable("ServerSetting"); + }); + + modelBuilder.Entity("API.Entities.ServerStatistics", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterCount") + .HasColumnType("INTEGER"); + + b.Property("FileCount") + .HasColumnType("INTEGER"); + + b.Property("GenreCount") + .HasColumnType("INTEGER"); + + b.Property("PersonCount") + .HasColumnType("INTEGER"); + + b.Property("SeriesCount") + .HasColumnType("INTEGER"); + + b.Property("TagCount") + .HasColumnType("INTEGER"); + + b.Property("UserCount") + .HasColumnType("INTEGER"); + + b.Property("VolumeCount") + .HasColumnType("INTEGER"); + + b.Property("Year") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ServerStatistics"); + }); + + modelBuilder.Entity("API.Entities.SiteTheme", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Author") + .HasColumnType("TEXT"); + + b.Property("CompatibleVersion") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("GitHubPath") + .HasColumnType("TEXT"); + + b.Property("IsDefault") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PreviewUrls") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ShaHash") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("SiteTheme"); + }); + + modelBuilder.Entity("API.Entities.Tag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Tag"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LookupName") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Number") + .HasColumnType("INTEGER"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("Volume"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.Property("CollectionsId") + .HasColumnType("INTEGER"); + + b.Property("ItemsId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionsId", "ItemsId"); + + b.HasIndex("ItemsId"); + + b.ToTable("AppUserCollectionSeries"); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.Property("AppUsersId") + .HasColumnType("INTEGER"); + + b.Property("LibrariesId") + .HasColumnType("INTEGER"); + + b.HasKey("AppUsersId", "LibrariesId"); + + b.HasIndex("LibrariesId"); + + b.ToTable("AppUserLibrary"); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "GenresId"); + + b.HasIndex("GenresId"); + + b.ToTable("ChapterGenre"); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("ChapterTag"); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.Property("CollectionTagsId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionTagsId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("CollectionTagSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.Property("ExternalRatingsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRatingsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRatingExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.Property("ExternalRecommendationsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRecommendationsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRecommendationExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.Property("ExternalReviewsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalReviewsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalReviewExternalSeriesMetadata"); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("GenresId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("GenreSeriesMetadata"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("ProviderKey") + .HasColumnType("TEXT"); + + b.Property("ProviderDisplayName") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("SeriesMetadatasId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("SeriesMetadataTag"); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Bookmarks") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Collections") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("DashboardStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ExternalSources") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithOne("UserPreferences") + .HasForeignKey("API.Entities.AppUserPreferences", "AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.SiteTheme", "Theme") + .WithMany() + .HasForeignKey("ThemeId"); + + b.Navigation("AppUser"); + + b.Navigation("Theme"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Progresses") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", null) + .WithMany("UserProgress") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany("Progress") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Ratings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany("Ratings") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.HasOne("API.Entities.AppRole", "Role") + .WithMany("UserRoles") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUser", "User") + .WithMany("UserRoles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SideNavStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SmartFilters") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("TableOfContents") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("WantToRead") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.HasOne("API.Entities.Volume", "Volume") + .WithMany("Chapters") + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Devices") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Folders") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryExcludePatterns") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryFileTypes") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Files") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("ExternalSeriesMetadata") + .HasForeignKey("API.Entities.Metadata.ExternalSeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("Metadata") + .HasForeignKey("API.Entities.Metadata.SeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Relations") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "TargetSeries") + .WithMany("RelationOf") + .HasForeignKey("TargetSeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + + b.Navigation("TargetSeries"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.HasOne("API.Entities.MetadataMatching.MetadataSettings", "MetadataSettings") + .WithMany("FieldMappings") + .HasForeignKey("MetadataSettingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("People") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("ChapterPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("SeriesMetadataPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", "SeriesMetadata") + .WithMany("People") + .HasForeignKey("SeriesMetadataId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + + b.Navigation("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingLists") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.ReadingList", "ReadingList") + .WithMany("Items") + .HasForeignKey("ReadingListId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Volume", "Volume") + .WithMany() + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("ReadingList"); + + b.Navigation("Series"); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.HasOne("API.Entities.Scrobble.ScrobbleEvent", "ScrobbleEvent") + .WithMany() + .HasForeignKey("ScrobbleEventId1"); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ScrobbleEvent"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", "Library") + .WithMany() + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Library"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ScrobbleHolds") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Series") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Volumes") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.HasOne("API.Entities.AppUserCollection", null) + .WithMany() + .HasForeignKey("CollectionsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany() + .HasForeignKey("ItemsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("AppUsersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", null) + .WithMany() + .HasForeignKey("LibrariesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.HasOne("API.Entities.CollectionTag", null) + .WithMany() + .HasForeignKey("CollectionTagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRating", null) + .WithMany() + .HasForeignKey("ExternalRatingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRecommendation", null) + .WithMany() + .HasForeignKey("ExternalRecommendationsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalReview", null) + .WithMany() + .HasForeignKey("ExternalReviewsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("API.Entities.AppRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Navigation("UserRoles"); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Navigation("Bookmarks"); + + b.Navigation("Collections"); + + b.Navigation("DashboardStreams"); + + b.Navigation("Devices"); + + b.Navigation("ExternalSources"); + + b.Navigation("Progresses"); + + b.Navigation("Ratings"); + + b.Navigation("ReadingLists"); + + b.Navigation("ScrobbleHolds"); + + b.Navigation("SideNavStreams"); + + b.Navigation("SmartFilters"); + + b.Navigation("TableOfContents"); + + b.Navigation("UserPreferences"); + + b.Navigation("UserRoles"); + + b.Navigation("WantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Navigation("Files"); + + b.Navigation("People"); + + b.Navigation("UserProgress"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Navigation("Folders"); + + b.Navigation("LibraryExcludePatterns"); + + b.Navigation("LibraryFileTypes"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Navigation("People"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Navigation("FieldMappings"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Navigation("ChapterPeople"); + + b.Navigation("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Navigation("ExternalSeriesMetadata"); + + b.Navigation("Metadata"); + + b.Navigation("Progress"); + + b.Navigation("Ratings"); + + b.Navigation("RelationOf"); + + b.Navigation("Relations"); + + b.Navigation("Volumes"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Navigation("Chapters"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/API/Data/Migrations/20250328125012_AutomaticWebtoonReaderMode.cs b/API/Data/Migrations/20250328125012_AutomaticWebtoonReaderMode.cs new file mode 100644 index 000000000..38b772811 --- /dev/null +++ b/API/Data/Migrations/20250328125012_AutomaticWebtoonReaderMode.cs @@ -0,0 +1,29 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace API.Data.Migrations +{ + /// + public partial class AutomaticWebtoonReaderMode : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "AllowAutomaticWebtoonReaderDetection", + table: "AppUserPreferences", + type: "INTEGER", + nullable: false, + defaultValue: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "AllowAutomaticWebtoonReaderDetection", + table: "AppUserPreferences"); + } + } +} diff --git a/API/Data/Migrations/20250408222330_ScrobbleGenerationDbCapture.Designer.cs b/API/Data/Migrations/20250408222330_ScrobbleGenerationDbCapture.Designer.cs new file mode 100644 index 000000000..53e450b3b --- /dev/null +++ b/API/Data/Migrations/20250408222330_ScrobbleGenerationDbCapture.Designer.cs @@ -0,0 +1,3409 @@ +// +using System; +using API.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace API.Data.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20250408222330_ScrobbleGenerationDbCapture")] + partial class ScrobbleGenerationDbCapture + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "9.0.3"); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AccessFailedCount") + .HasColumnType("INTEGER"); + + b.Property("AgeRestriction") + .HasColumnType("INTEGER"); + + b.Property("AgeRestrictionIncludeUnknowns") + .HasColumnType("INTEGER"); + + b.Property("AniListAccessToken") + .HasColumnType("TEXT"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("ConfirmationToken") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("EmailConfirmed") + .HasColumnType("INTEGER"); + + b.Property("HasRunScrobbleEventGeneration") + .HasColumnType("INTEGER"); + + b.Property("LastActive") + .HasColumnType("TEXT"); + + b.Property("LastActiveUtc") + .HasColumnType("TEXT"); + + b.Property("LockoutEnabled") + .HasColumnType("INTEGER"); + + b.Property("LockoutEnd") + .HasColumnType("TEXT"); + + b.Property("MalAccessToken") + .HasColumnType("TEXT"); + + b.Property("MalUserName") + .HasColumnType("TEXT"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("PasswordHash") + .HasColumnType("TEXT"); + + b.Property("PhoneNumber") + .HasColumnType("TEXT"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventGenerationRan") + .HasColumnType("TEXT"); + + b.Property("SecurityStamp") + .HasColumnType("TEXT"); + + b.Property("TwoFactorEnabled") + .HasColumnType("INTEGER"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Page") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserBookmark"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastSyncUtc") + .HasColumnType("TEXT"); + + b.Property("MissingSeriesFromSource") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.Property("SourceUrl") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TotalSourceCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserCollection"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(4); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserDashboardStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Host") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserExternalSource"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserOnDeckRemoval"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowAutomaticWebtoonReaderDetection") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AniListScrobblingEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BlurUnreadSummaries") + .HasColumnType("INTEGER"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("CollapseSeriesRelationships") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("GlobalPageLayoutMode") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("Locale") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("en"); + + b.Property("NoTransitions") + .HasColumnType("INTEGER"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("PromptForDownloadSize") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("ShareReviews") + .HasColumnType("INTEGER"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("ThemeId") + .HasColumnType("INTEGER"); + + b.Property("WantToReadSync") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.HasKey("Id"); + + b.HasIndex("AppUserId") + .IsUnique(); + + b.HasIndex("ThemeId"); + + b.ToTable("AppUserPreferences"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PagesRead") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserProgresses"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSourceId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(5); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserSideNavStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Filter") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserSmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PageNumber") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserTableOfContent"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserWantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("AlternateCount") + .HasColumnType("INTEGER"); + + b.Property("AlternateNumber") + .HasColumnType("TEXT"); + + b.Property("AlternateSeries") + .HasColumnType("TEXT"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("Count") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ISBN") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("ISBNLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("IsSpecial") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Number") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("Range") + .HasColumnType("TEXT"); + + b.Property("ReleaseDate") + .HasColumnType("TEXT"); + + b.Property("ReleaseDateLocked") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesGroup") + .HasColumnType("TEXT"); + + b.Property("SortOrder") + .HasColumnType("REAL"); + + b.Property("SortOrderLocked") + .HasColumnType("INTEGER"); + + b.Property("StoryArc") + .HasColumnType("TEXT"); + + b.Property("StoryArcNumber") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TitleName") + .HasColumnType("TEXT"); + + b.Property("TitleNameLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("VolumeId"); + + b.ToTable("Chapter"); + }); + + modelBuilder.Entity("API.Entities.CollectionTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Id", "Promoted") + .IsUnique(); + + b.ToTable("CollectionTag"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EmailAddress") + .HasColumnType("TEXT"); + + b.Property("IpAddress") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastUsed") + .HasColumnType("TEXT"); + + b.Property("LastUsedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Platform") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("Device"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DeliveryStatus") + .HasColumnType("TEXT"); + + b.Property("EmailTemplate") + .HasColumnType("TEXT"); + + b.Property("ErrorMessage") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SendDate") + .HasColumnType("TEXT"); + + b.Property("Sent") + .HasColumnType("INTEGER"); + + b.Property("Subject") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("Sent", "AppUserId", "EmailTemplate", "SendDate"); + + b.ToTable("EmailHistory"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Path") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("FolderPath"); + }); + + modelBuilder.Entity("API.Entities.Genre", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Genre"); + }); + + modelBuilder.Entity("API.Entities.History.ManualMigrationHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("ProductVersion") + .HasColumnType("TEXT"); + + b.Property("RanAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ManualMigrationHistory"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowMetadataMatching") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AllowScrobbling") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FolderWatching") + .HasColumnType("INTEGER"); + + b.Property("IncludeInDashboard") + .HasColumnType("INTEGER"); + + b.Property("IncludeInRecommended") + .HasColumnType("INTEGER"); + + b.Property("IncludeInSearch") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("ManageCollections") + .HasColumnType("INTEGER"); + + b.Property("ManageReadingLists") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Pattern") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryExcludePattern"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("FileTypeGroup") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryFileTypeGroup"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Bytes") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("LastFileAnalysis") + .HasColumnType("TEXT"); + + b.Property("LastFileAnalysisUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("MangaFile"); + }); + + modelBuilder.Entity("API.Entities.MediaError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MediaError"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AverageScore") + .HasColumnType("INTEGER"); + + b.Property("FavoriteCount") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ProviderUrl") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ExternalRating"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRecommendation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("CoverUrl") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Url") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("ExternalRecommendation"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("BodyJustText") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("INTEGER"); + + b.Property("RawBody") + .HasColumnType("TEXT"); + + b.Property("Score") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("SiteUrl") + .HasColumnType("TEXT"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.Property("TotalVotes") + .HasColumnType("INTEGER"); + + b.Property("Username") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ExternalReview"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AverageExternalRating") + .HasColumnType("INTEGER"); + + b.Property("GoogleBooksId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("ValidUntilUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.ToTable("ExternalSeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastChecked") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("SeriesBlacklist"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxCount") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatusLocked") + .HasColumnType("INTEGER"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYear") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYearLocked") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.HasIndex("Id", "SeriesId") + .IsUnique(); + + b.ToTable("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("RelationKind") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("TargetSeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.HasIndex("TargetSeriesId"); + + b.ToTable("SeriesRelation"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("DestinationType") + .HasColumnType("INTEGER"); + + b.Property("DestinationValue") + .HasColumnType("TEXT"); + + b.Property("ExcludeFromSource") + .HasColumnType("INTEGER"); + + b.Property("MetadataSettingsId") + .HasColumnType("INTEGER"); + + b.Property("SourceType") + .HasColumnType("INTEGER"); + + b.Property("SourceValue") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("MetadataSettingsId"); + + b.ToTable("MetadataFieldMapping"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRatingMappings") + .HasColumnType("TEXT"); + + b.Property("Blacklist") + .HasColumnType("TEXT"); + + b.Property("EnableCoverImage") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("EnableGenres") + .HasColumnType("INTEGER"); + + b.Property("EnableLocalizedName") + .HasColumnType("INTEGER"); + + b.Property("EnablePeople") + .HasColumnType("INTEGER"); + + b.Property("EnablePublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("EnableRelationships") + .HasColumnType("INTEGER"); + + b.Property("EnableStartDate") + .HasColumnType("INTEGER"); + + b.Property("EnableSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableTags") + .HasColumnType("INTEGER"); + + b.Property("Enabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("FirstLastPeopleNaming") + .HasColumnType("INTEGER"); + + b.Property("Overrides") + .HasColumnType("TEXT"); + + b.PrimitiveCollection("PersonRoles") + .HasColumnType("TEXT"); + + b.Property("Whitelist") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.HasKey("ChapterId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("ChapterPeople"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("Asin") + .HasColumnType("TEXT"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("HardcoverId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.Property("SeriesMetadataId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.HasKey("SeriesMetadataId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EndingMonth") + .HasColumnType("INTEGER"); + + b.Property("EndingYear") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("StartingMonth") + .HasColumnType("INTEGER"); + + b.Property("StartingYear") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("ReadingList"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("ReadingListId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.HasIndex("ReadingListId"); + + b.HasIndex("SeriesId"); + + b.HasIndex("VolumeId"); + + b.ToTable("ReadingListItem"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId1") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ScrobbleEventId1"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleError"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterNumber") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("ErrorDetails") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsErrored") + .HasColumnType("INTEGER"); + + b.Property("IsProcessed") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("ProcessDateUtc") + .HasColumnType("TEXT"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("ReviewBody") + .HasColumnType("TEXT"); + + b.Property("ReviewTitle") + .HasColumnType("TEXT"); + + b.Property("ScrobbleEventType") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeNumber") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("LibraryId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleEvent"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleHold"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DontMatch") + .HasColumnType("INTEGER"); + + b.Property("FolderPath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsBlacklisted") + .HasColumnType("INTEGER"); + + b.Property("LastChapterAdded") + .HasColumnType("TEXT"); + + b.Property("LastChapterAddedUtc") + .HasColumnType("TEXT"); + + b.Property("LastFolderScanned") + .HasColumnType("TEXT"); + + b.Property("LastFolderScannedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("LocalizedName") + .HasColumnType("TEXT"); + + b.Property("LocalizedNameLocked") + .HasColumnType("INTEGER"); + + b.Property("LowestFolderPath") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedLocalizedName") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("OriginalName") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SortName") + .HasColumnType("TEXT"); + + b.Property("SortNameLocked") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("Series"); + }); + + modelBuilder.Entity("API.Entities.ServerSetting", b => + { + b.Property("Key") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.ToTable("ServerSetting"); + }); + + modelBuilder.Entity("API.Entities.ServerStatistics", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterCount") + .HasColumnType("INTEGER"); + + b.Property("FileCount") + .HasColumnType("INTEGER"); + + b.Property("GenreCount") + .HasColumnType("INTEGER"); + + b.Property("PersonCount") + .HasColumnType("INTEGER"); + + b.Property("SeriesCount") + .HasColumnType("INTEGER"); + + b.Property("TagCount") + .HasColumnType("INTEGER"); + + b.Property("UserCount") + .HasColumnType("INTEGER"); + + b.Property("VolumeCount") + .HasColumnType("INTEGER"); + + b.Property("Year") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ServerStatistics"); + }); + + modelBuilder.Entity("API.Entities.SiteTheme", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Author") + .HasColumnType("TEXT"); + + b.Property("CompatibleVersion") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("GitHubPath") + .HasColumnType("TEXT"); + + b.Property("IsDefault") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PreviewUrls") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ShaHash") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("SiteTheme"); + }); + + modelBuilder.Entity("API.Entities.Tag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Tag"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LookupName") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Number") + .HasColumnType("INTEGER"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("Volume"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.Property("CollectionsId") + .HasColumnType("INTEGER"); + + b.Property("ItemsId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionsId", "ItemsId"); + + b.HasIndex("ItemsId"); + + b.ToTable("AppUserCollectionSeries"); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.Property("AppUsersId") + .HasColumnType("INTEGER"); + + b.Property("LibrariesId") + .HasColumnType("INTEGER"); + + b.HasKey("AppUsersId", "LibrariesId"); + + b.HasIndex("LibrariesId"); + + b.ToTable("AppUserLibrary"); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "GenresId"); + + b.HasIndex("GenresId"); + + b.ToTable("ChapterGenre"); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("ChapterTag"); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.Property("CollectionTagsId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionTagsId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("CollectionTagSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.Property("ExternalRatingsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRatingsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRatingExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.Property("ExternalRecommendationsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRecommendationsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRecommendationExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.Property("ExternalReviewsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalReviewsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalReviewExternalSeriesMetadata"); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("GenresId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("GenreSeriesMetadata"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("ProviderKey") + .HasColumnType("TEXT"); + + b.Property("ProviderDisplayName") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("SeriesMetadatasId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("SeriesMetadataTag"); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Bookmarks") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Collections") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("DashboardStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ExternalSources") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithOne("UserPreferences") + .HasForeignKey("API.Entities.AppUserPreferences", "AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.SiteTheme", "Theme") + .WithMany() + .HasForeignKey("ThemeId"); + + b.Navigation("AppUser"); + + b.Navigation("Theme"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Progresses") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", null) + .WithMany("UserProgress") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany("Progress") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Ratings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany("Ratings") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.HasOne("API.Entities.AppRole", "Role") + .WithMany("UserRoles") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUser", "User") + .WithMany("UserRoles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SideNavStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SmartFilters") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("TableOfContents") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("WantToRead") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.HasOne("API.Entities.Volume", "Volume") + .WithMany("Chapters") + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Devices") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Folders") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryExcludePatterns") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryFileTypes") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Files") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("ExternalSeriesMetadata") + .HasForeignKey("API.Entities.Metadata.ExternalSeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("Metadata") + .HasForeignKey("API.Entities.Metadata.SeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Relations") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "TargetSeries") + .WithMany("RelationOf") + .HasForeignKey("TargetSeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + + b.Navigation("TargetSeries"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.HasOne("API.Entities.MetadataMatching.MetadataSettings", "MetadataSettings") + .WithMany("FieldMappings") + .HasForeignKey("MetadataSettingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("People") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("ChapterPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("SeriesMetadataPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", "SeriesMetadata") + .WithMany("People") + .HasForeignKey("SeriesMetadataId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + + b.Navigation("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingLists") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.ReadingList", "ReadingList") + .WithMany("Items") + .HasForeignKey("ReadingListId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Volume", "Volume") + .WithMany() + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("ReadingList"); + + b.Navigation("Series"); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.HasOne("API.Entities.Scrobble.ScrobbleEvent", "ScrobbleEvent") + .WithMany() + .HasForeignKey("ScrobbleEventId1"); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ScrobbleEvent"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", "Library") + .WithMany() + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Library"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ScrobbleHolds") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Series") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Volumes") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.HasOne("API.Entities.AppUserCollection", null) + .WithMany() + .HasForeignKey("CollectionsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany() + .HasForeignKey("ItemsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("AppUsersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", null) + .WithMany() + .HasForeignKey("LibrariesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.HasOne("API.Entities.CollectionTag", null) + .WithMany() + .HasForeignKey("CollectionTagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRating", null) + .WithMany() + .HasForeignKey("ExternalRatingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRecommendation", null) + .WithMany() + .HasForeignKey("ExternalRecommendationsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalReview", null) + .WithMany() + .HasForeignKey("ExternalReviewsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("API.Entities.AppRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Navigation("UserRoles"); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Navigation("Bookmarks"); + + b.Navigation("Collections"); + + b.Navigation("DashboardStreams"); + + b.Navigation("Devices"); + + b.Navigation("ExternalSources"); + + b.Navigation("Progresses"); + + b.Navigation("Ratings"); + + b.Navigation("ReadingLists"); + + b.Navigation("ScrobbleHolds"); + + b.Navigation("SideNavStreams"); + + b.Navigation("SmartFilters"); + + b.Navigation("TableOfContents"); + + b.Navigation("UserPreferences"); + + b.Navigation("UserRoles"); + + b.Navigation("WantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Navigation("Files"); + + b.Navigation("People"); + + b.Navigation("UserProgress"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Navigation("Folders"); + + b.Navigation("LibraryExcludePatterns"); + + b.Navigation("LibraryFileTypes"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Navigation("People"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Navigation("FieldMappings"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Navigation("ChapterPeople"); + + b.Navigation("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Navigation("ExternalSeriesMetadata"); + + b.Navigation("Metadata"); + + b.Navigation("Progress"); + + b.Navigation("Ratings"); + + b.Navigation("RelationOf"); + + b.Navigation("Relations"); + + b.Navigation("Volumes"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Navigation("Chapters"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/API/Data/Migrations/20250408222330_ScrobbleGenerationDbCapture.cs b/API/Data/Migrations/20250408222330_ScrobbleGenerationDbCapture.cs new file mode 100644 index 000000000..7431a7338 --- /dev/null +++ b/API/Data/Migrations/20250408222330_ScrobbleGenerationDbCapture.cs @@ -0,0 +1,41 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace API.Data.Migrations +{ + /// + public partial class ScrobbleGenerationDbCapture : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "HasRunScrobbleEventGeneration", + table: "AspNetUsers", + type: "INTEGER", + nullable: false, + defaultValue: false); + + migrationBuilder.AddColumn( + name: "ScrobbleEventGenerationRan", + table: "AspNetUsers", + type: "TEXT", + nullable: false, + defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified)); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "HasRunScrobbleEventGeneration", + table: "AspNetUsers"); + + migrationBuilder.DropColumn( + name: "ScrobbleEventGenerationRan", + table: "AspNetUsers"); + } + } +} diff --git a/API/Data/Migrations/20250415194829_KavitaPlusCBR.Designer.cs b/API/Data/Migrations/20250415194829_KavitaPlusCBR.Designer.cs new file mode 100644 index 000000000..fd287c085 --- /dev/null +++ b/API/Data/Migrations/20250415194829_KavitaPlusCBR.Designer.cs @@ -0,0 +1,3433 @@ +// +using System; +using API.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace API.Data.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20250415194829_KavitaPlusCBR")] + partial class KavitaPlusCBR + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "9.0.4"); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AccessFailedCount") + .HasColumnType("INTEGER"); + + b.Property("AgeRestriction") + .HasColumnType("INTEGER"); + + b.Property("AgeRestrictionIncludeUnknowns") + .HasColumnType("INTEGER"); + + b.Property("AniListAccessToken") + .HasColumnType("TEXT"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("ConfirmationToken") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("EmailConfirmed") + .HasColumnType("INTEGER"); + + b.Property("HasRunScrobbleEventGeneration") + .HasColumnType("INTEGER"); + + b.Property("LastActive") + .HasColumnType("TEXT"); + + b.Property("LastActiveUtc") + .HasColumnType("TEXT"); + + b.Property("LockoutEnabled") + .HasColumnType("INTEGER"); + + b.Property("LockoutEnd") + .HasColumnType("TEXT"); + + b.Property("MalAccessToken") + .HasColumnType("TEXT"); + + b.Property("MalUserName") + .HasColumnType("TEXT"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("PasswordHash") + .HasColumnType("TEXT"); + + b.Property("PhoneNumber") + .HasColumnType("TEXT"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventGenerationRan") + .HasColumnType("TEXT"); + + b.Property("SecurityStamp") + .HasColumnType("TEXT"); + + b.Property("TwoFactorEnabled") + .HasColumnType("INTEGER"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Page") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserBookmark"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastSyncUtc") + .HasColumnType("TEXT"); + + b.Property("MissingSeriesFromSource") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.Property("SourceUrl") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TotalSourceCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserCollection"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(4); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserDashboardStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Host") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserExternalSource"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserOnDeckRemoval"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowAutomaticWebtoonReaderDetection") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AniListScrobblingEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BlurUnreadSummaries") + .HasColumnType("INTEGER"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("CollapseSeriesRelationships") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("GlobalPageLayoutMode") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("Locale") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("en"); + + b.Property("NoTransitions") + .HasColumnType("INTEGER"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("PromptForDownloadSize") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("ShareReviews") + .HasColumnType("INTEGER"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("ThemeId") + .HasColumnType("INTEGER"); + + b.Property("WantToReadSync") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.HasKey("Id"); + + b.HasIndex("AppUserId") + .IsUnique(); + + b.HasIndex("ThemeId"); + + b.ToTable("AppUserPreferences"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PagesRead") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserProgresses"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSourceId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(5); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserSideNavStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Filter") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserSmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PageNumber") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserTableOfContent"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserWantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("AlternateCount") + .HasColumnType("INTEGER"); + + b.Property("AlternateNumber") + .HasColumnType("TEXT"); + + b.Property("AlternateSeries") + .HasColumnType("TEXT"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("Count") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ISBN") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("ISBNLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("IsSpecial") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Number") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("Range") + .HasColumnType("TEXT"); + + b.Property("ReleaseDate") + .HasColumnType("TEXT"); + + b.Property("ReleaseDateLocked") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesGroup") + .HasColumnType("TEXT"); + + b.Property("SortOrder") + .HasColumnType("REAL"); + + b.Property("SortOrderLocked") + .HasColumnType("INTEGER"); + + b.Property("StoryArc") + .HasColumnType("TEXT"); + + b.Property("StoryArcNumber") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TitleName") + .HasColumnType("TEXT"); + + b.Property("TitleNameLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("VolumeId"); + + b.ToTable("Chapter"); + }); + + modelBuilder.Entity("API.Entities.CollectionTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Id", "Promoted") + .IsUnique(); + + b.ToTable("CollectionTag"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EmailAddress") + .HasColumnType("TEXT"); + + b.Property("IpAddress") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastUsed") + .HasColumnType("TEXT"); + + b.Property("LastUsedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Platform") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("Device"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DeliveryStatus") + .HasColumnType("TEXT"); + + b.Property("EmailTemplate") + .HasColumnType("TEXT"); + + b.Property("ErrorMessage") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SendDate") + .HasColumnType("TEXT"); + + b.Property("Sent") + .HasColumnType("INTEGER"); + + b.Property("Subject") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("Sent", "AppUserId", "EmailTemplate", "SendDate"); + + b.ToTable("EmailHistory"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Path") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("FolderPath"); + }); + + modelBuilder.Entity("API.Entities.Genre", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Genre"); + }); + + modelBuilder.Entity("API.Entities.History.ManualMigrationHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("ProductVersion") + .HasColumnType("TEXT"); + + b.Property("RanAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ManualMigrationHistory"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowMetadataMatching") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AllowScrobbling") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FolderWatching") + .HasColumnType("INTEGER"); + + b.Property("IncludeInDashboard") + .HasColumnType("INTEGER"); + + b.Property("IncludeInRecommended") + .HasColumnType("INTEGER"); + + b.Property("IncludeInSearch") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("ManageCollections") + .HasColumnType("INTEGER"); + + b.Property("ManageReadingLists") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Pattern") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryExcludePattern"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("FileTypeGroup") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryFileTypeGroup"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Bytes") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("LastFileAnalysis") + .HasColumnType("TEXT"); + + b.Property("LastFileAnalysisUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("MangaFile"); + }); + + modelBuilder.Entity("API.Entities.MediaError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MediaError"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AverageScore") + .HasColumnType("INTEGER"); + + b.Property("FavoriteCount") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ProviderUrl") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ExternalRating"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRecommendation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("CoverUrl") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Url") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("ExternalRecommendation"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("BodyJustText") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("INTEGER"); + + b.Property("RawBody") + .HasColumnType("TEXT"); + + b.Property("Score") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("SiteUrl") + .HasColumnType("TEXT"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.Property("TotalVotes") + .HasColumnType("INTEGER"); + + b.Property("Username") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ExternalReview"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AverageExternalRating") + .HasColumnType("INTEGER"); + + b.Property("CbrId") + .HasColumnType("INTEGER"); + + b.Property("GoogleBooksId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("ValidUntilUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.ToTable("ExternalSeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastChecked") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("SeriesBlacklist"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxCount") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatusLocked") + .HasColumnType("INTEGER"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYear") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYearLocked") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.HasIndex("Id", "SeriesId") + .IsUnique(); + + b.ToTable("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("RelationKind") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("TargetSeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.HasIndex("TargetSeriesId"); + + b.ToTable("SeriesRelation"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("DestinationType") + .HasColumnType("INTEGER"); + + b.Property("DestinationValue") + .HasColumnType("TEXT"); + + b.Property("ExcludeFromSource") + .HasColumnType("INTEGER"); + + b.Property("MetadataSettingsId") + .HasColumnType("INTEGER"); + + b.Property("SourceType") + .HasColumnType("INTEGER"); + + b.Property("SourceValue") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("MetadataSettingsId"); + + b.ToTable("MetadataFieldMapping"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRatingMappings") + .HasColumnType("TEXT"); + + b.Property("Blacklist") + .HasColumnType("TEXT"); + + b.Property("EnableChapterCoverImage") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterPublisher") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterReleaseDate") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterTitle") + .HasColumnType("INTEGER"); + + b.Property("EnableCoverImage") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("EnableGenres") + .HasColumnType("INTEGER"); + + b.Property("EnableLocalizedName") + .HasColumnType("INTEGER"); + + b.Property("EnablePeople") + .HasColumnType("INTEGER"); + + b.Property("EnablePublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("EnableRelationships") + .HasColumnType("INTEGER"); + + b.Property("EnableStartDate") + .HasColumnType("INTEGER"); + + b.Property("EnableSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableTags") + .HasColumnType("INTEGER"); + + b.Property("Enabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("FirstLastPeopleNaming") + .HasColumnType("INTEGER"); + + b.Property("Overrides") + .HasColumnType("TEXT"); + + b.PrimitiveCollection("PersonRoles") + .HasColumnType("TEXT"); + + b.Property("Whitelist") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .HasColumnType("INTEGER"); + + b.HasKey("ChapterId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("ChapterPeople"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("Asin") + .HasColumnType("TEXT"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("HardcoverId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.Property("SeriesMetadataId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.HasKey("SeriesMetadataId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EndingMonth") + .HasColumnType("INTEGER"); + + b.Property("EndingYear") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("StartingMonth") + .HasColumnType("INTEGER"); + + b.Property("StartingYear") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("ReadingList"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("ReadingListId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.HasIndex("ReadingListId"); + + b.HasIndex("SeriesId"); + + b.HasIndex("VolumeId"); + + b.ToTable("ReadingListItem"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId1") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ScrobbleEventId1"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleError"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterNumber") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("ErrorDetails") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsErrored") + .HasColumnType("INTEGER"); + + b.Property("IsProcessed") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("ProcessDateUtc") + .HasColumnType("TEXT"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("ReviewBody") + .HasColumnType("TEXT"); + + b.Property("ReviewTitle") + .HasColumnType("TEXT"); + + b.Property("ScrobbleEventType") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeNumber") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("LibraryId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleEvent"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleHold"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DontMatch") + .HasColumnType("INTEGER"); + + b.Property("FolderPath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsBlacklisted") + .HasColumnType("INTEGER"); + + b.Property("LastChapterAdded") + .HasColumnType("TEXT"); + + b.Property("LastChapterAddedUtc") + .HasColumnType("TEXT"); + + b.Property("LastFolderScanned") + .HasColumnType("TEXT"); + + b.Property("LastFolderScannedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("LocalizedName") + .HasColumnType("TEXT"); + + b.Property("LocalizedNameLocked") + .HasColumnType("INTEGER"); + + b.Property("LowestFolderPath") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedLocalizedName") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("OriginalName") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SortName") + .HasColumnType("TEXT"); + + b.Property("SortNameLocked") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("Series"); + }); + + modelBuilder.Entity("API.Entities.ServerSetting", b => + { + b.Property("Key") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.ToTable("ServerSetting"); + }); + + modelBuilder.Entity("API.Entities.ServerStatistics", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterCount") + .HasColumnType("INTEGER"); + + b.Property("FileCount") + .HasColumnType("INTEGER"); + + b.Property("GenreCount") + .HasColumnType("INTEGER"); + + b.Property("PersonCount") + .HasColumnType("INTEGER"); + + b.Property("SeriesCount") + .HasColumnType("INTEGER"); + + b.Property("TagCount") + .HasColumnType("INTEGER"); + + b.Property("UserCount") + .HasColumnType("INTEGER"); + + b.Property("VolumeCount") + .HasColumnType("INTEGER"); + + b.Property("Year") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ServerStatistics"); + }); + + modelBuilder.Entity("API.Entities.SiteTheme", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Author") + .HasColumnType("TEXT"); + + b.Property("CompatibleVersion") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("GitHubPath") + .HasColumnType("TEXT"); + + b.Property("IsDefault") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PreviewUrls") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ShaHash") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("SiteTheme"); + }); + + modelBuilder.Entity("API.Entities.Tag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Tag"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LookupName") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Number") + .HasColumnType("INTEGER"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("Volume"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.Property("CollectionsId") + .HasColumnType("INTEGER"); + + b.Property("ItemsId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionsId", "ItemsId"); + + b.HasIndex("ItemsId"); + + b.ToTable("AppUserCollectionSeries"); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.Property("AppUsersId") + .HasColumnType("INTEGER"); + + b.Property("LibrariesId") + .HasColumnType("INTEGER"); + + b.HasKey("AppUsersId", "LibrariesId"); + + b.HasIndex("LibrariesId"); + + b.ToTable("AppUserLibrary"); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "GenresId"); + + b.HasIndex("GenresId"); + + b.ToTable("ChapterGenre"); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("ChapterTag"); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.Property("CollectionTagsId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionTagsId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("CollectionTagSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.Property("ExternalRatingsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRatingsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRatingExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.Property("ExternalRecommendationsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRecommendationsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRecommendationExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.Property("ExternalReviewsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalReviewsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalReviewExternalSeriesMetadata"); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("GenresId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("GenreSeriesMetadata"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("ProviderKey") + .HasColumnType("TEXT"); + + b.Property("ProviderDisplayName") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("SeriesMetadatasId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("SeriesMetadataTag"); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Bookmarks") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Collections") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("DashboardStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ExternalSources") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithOne("UserPreferences") + .HasForeignKey("API.Entities.AppUserPreferences", "AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.SiteTheme", "Theme") + .WithMany() + .HasForeignKey("ThemeId"); + + b.Navigation("AppUser"); + + b.Navigation("Theme"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Progresses") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", null) + .WithMany("UserProgress") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany("Progress") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Ratings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany("Ratings") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.HasOne("API.Entities.AppRole", "Role") + .WithMany("UserRoles") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUser", "User") + .WithMany("UserRoles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SideNavStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SmartFilters") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("TableOfContents") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("WantToRead") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.HasOne("API.Entities.Volume", "Volume") + .WithMany("Chapters") + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Devices") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Folders") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryExcludePatterns") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryFileTypes") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Files") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("ExternalSeriesMetadata") + .HasForeignKey("API.Entities.Metadata.ExternalSeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("Metadata") + .HasForeignKey("API.Entities.Metadata.SeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Relations") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "TargetSeries") + .WithMany("RelationOf") + .HasForeignKey("TargetSeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + + b.Navigation("TargetSeries"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.HasOne("API.Entities.MetadataMatching.MetadataSettings", "MetadataSettings") + .WithMany("FieldMappings") + .HasForeignKey("MetadataSettingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("People") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("ChapterPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("SeriesMetadataPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", "SeriesMetadata") + .WithMany("People") + .HasForeignKey("SeriesMetadataId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + + b.Navigation("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingLists") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.ReadingList", "ReadingList") + .WithMany("Items") + .HasForeignKey("ReadingListId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Volume", "Volume") + .WithMany() + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("ReadingList"); + + b.Navigation("Series"); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.HasOne("API.Entities.Scrobble.ScrobbleEvent", "ScrobbleEvent") + .WithMany() + .HasForeignKey("ScrobbleEventId1"); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ScrobbleEvent"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", "Library") + .WithMany() + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Library"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ScrobbleHolds") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Series") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Volumes") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.HasOne("API.Entities.AppUserCollection", null) + .WithMany() + .HasForeignKey("CollectionsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany() + .HasForeignKey("ItemsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("AppUsersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", null) + .WithMany() + .HasForeignKey("LibrariesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.HasOne("API.Entities.CollectionTag", null) + .WithMany() + .HasForeignKey("CollectionTagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRating", null) + .WithMany() + .HasForeignKey("ExternalRatingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRecommendation", null) + .WithMany() + .HasForeignKey("ExternalRecommendationsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalReview", null) + .WithMany() + .HasForeignKey("ExternalReviewsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("API.Entities.AppRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Navigation("UserRoles"); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Navigation("Bookmarks"); + + b.Navigation("Collections"); + + b.Navigation("DashboardStreams"); + + b.Navigation("Devices"); + + b.Navigation("ExternalSources"); + + b.Navigation("Progresses"); + + b.Navigation("Ratings"); + + b.Navigation("ReadingLists"); + + b.Navigation("ScrobbleHolds"); + + b.Navigation("SideNavStreams"); + + b.Navigation("SmartFilters"); + + b.Navigation("TableOfContents"); + + b.Navigation("UserPreferences"); + + b.Navigation("UserRoles"); + + b.Navigation("WantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Navigation("Files"); + + b.Navigation("People"); + + b.Navigation("UserProgress"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Navigation("Folders"); + + b.Navigation("LibraryExcludePatterns"); + + b.Navigation("LibraryFileTypes"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Navigation("People"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Navigation("FieldMappings"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Navigation("ChapterPeople"); + + b.Navigation("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Navigation("ExternalSeriesMetadata"); + + b.Navigation("Metadata"); + + b.Navigation("Progress"); + + b.Navigation("Ratings"); + + b.Navigation("RelationOf"); + + b.Navigation("Relations"); + + b.Navigation("Volumes"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Navigation("Chapters"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/API/Data/Migrations/20250415194829_KavitaPlusCBR.cs b/API/Data/Migrations/20250415194829_KavitaPlusCBR.cs new file mode 100644 index 000000000..188969476 --- /dev/null +++ b/API/Data/Migrations/20250415194829_KavitaPlusCBR.cs @@ -0,0 +1,106 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace API.Data.Migrations +{ + /// + public partial class KavitaPlusCBR : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "EnableChapterCoverImage", + table: "MetadataSettings", + type: "INTEGER", + nullable: false, + defaultValue: false); + + migrationBuilder.AddColumn( + name: "EnableChapterPublisher", + table: "MetadataSettings", + type: "INTEGER", + nullable: false, + defaultValue: false); + + migrationBuilder.AddColumn( + name: "EnableChapterReleaseDate", + table: "MetadataSettings", + type: "INTEGER", + nullable: false, + defaultValue: false); + + migrationBuilder.AddColumn( + name: "EnableChapterSummary", + table: "MetadataSettings", + type: "INTEGER", + nullable: false, + defaultValue: false); + + migrationBuilder.AddColumn( + name: "EnableChapterTitle", + table: "MetadataSettings", + type: "INTEGER", + nullable: false, + defaultValue: false); + + migrationBuilder.AddColumn( + name: "CbrId", + table: "ExternalSeriesMetadata", + type: "INTEGER", + nullable: false, + defaultValue: 0); + + migrationBuilder.AddColumn( + name: "KavitaPlusConnection", + table: "ChapterPeople", + type: "INTEGER", + nullable: false, + defaultValue: false); + + migrationBuilder.AddColumn( + name: "OrderWeight", + table: "ChapterPeople", + type: "INTEGER", + nullable: false, + defaultValue: 0); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "EnableChapterCoverImage", + table: "MetadataSettings"); + + migrationBuilder.DropColumn( + name: "EnableChapterPublisher", + table: "MetadataSettings"); + + migrationBuilder.DropColumn( + name: "EnableChapterReleaseDate", + table: "MetadataSettings"); + + migrationBuilder.DropColumn( + name: "EnableChapterSummary", + table: "MetadataSettings"); + + migrationBuilder.DropColumn( + name: "EnableChapterTitle", + table: "MetadataSettings"); + + migrationBuilder.DropColumn( + name: "CbrId", + table: "ExternalSeriesMetadata"); + + migrationBuilder.DropColumn( + name: "KavitaPlusConnection", + table: "ChapterPeople"); + + migrationBuilder.DropColumn( + name: "OrderWeight", + table: "ChapterPeople"); + } + } +} diff --git a/API/Data/Migrations/20250429150140_ChapterRatingAndReviews.Designer.cs b/API/Data/Migrations/20250429150140_ChapterRatingAndReviews.Designer.cs new file mode 100644 index 000000000..52e2c4a86 --- /dev/null +++ b/API/Data/Migrations/20250429150140_ChapterRatingAndReviews.Designer.cs @@ -0,0 +1,3536 @@ +// +using System; +using API.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace API.Data.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20250429150140_ChapterRatingAndReviews")] + partial class ChapterRatingAndReviews + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "9.0.4"); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AccessFailedCount") + .HasColumnType("INTEGER"); + + b.Property("AgeRestriction") + .HasColumnType("INTEGER"); + + b.Property("AgeRestrictionIncludeUnknowns") + .HasColumnType("INTEGER"); + + b.Property("AniListAccessToken") + .HasColumnType("TEXT"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("ConfirmationToken") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("EmailConfirmed") + .HasColumnType("INTEGER"); + + b.Property("HasRunScrobbleEventGeneration") + .HasColumnType("INTEGER"); + + b.Property("LastActive") + .HasColumnType("TEXT"); + + b.Property("LastActiveUtc") + .HasColumnType("TEXT"); + + b.Property("LockoutEnabled") + .HasColumnType("INTEGER"); + + b.Property("LockoutEnd") + .HasColumnType("TEXT"); + + b.Property("MalAccessToken") + .HasColumnType("TEXT"); + + b.Property("MalUserName") + .HasColumnType("TEXT"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("PasswordHash") + .HasColumnType("TEXT"); + + b.Property("PhoneNumber") + .HasColumnType("TEXT"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventGenerationRan") + .HasColumnType("TEXT"); + + b.Property("SecurityStamp") + .HasColumnType("TEXT"); + + b.Property("TwoFactorEnabled") + .HasColumnType("INTEGER"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Page") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserBookmark"); + }); + + modelBuilder.Entity("API.Entities.AppUserChapterRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserChapterRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastSyncUtc") + .HasColumnType("TEXT"); + + b.Property("MissingSeriesFromSource") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.Property("SourceUrl") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TotalSourceCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserCollection"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(4); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserDashboardStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Host") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserExternalSource"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserOnDeckRemoval"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowAutomaticWebtoonReaderDetection") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AniListScrobblingEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BlurUnreadSummaries") + .HasColumnType("INTEGER"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("CollapseSeriesRelationships") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("GlobalPageLayoutMode") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("Locale") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("en"); + + b.Property("NoTransitions") + .HasColumnType("INTEGER"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("PromptForDownloadSize") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("ShareReviews") + .HasColumnType("INTEGER"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("ThemeId") + .HasColumnType("INTEGER"); + + b.Property("WantToReadSync") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.HasKey("Id"); + + b.HasIndex("AppUserId") + .IsUnique(); + + b.HasIndex("ThemeId"); + + b.ToTable("AppUserPreferences"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PagesRead") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserProgresses"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSourceId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(5); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserSideNavStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Filter") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserSmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PageNumber") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserTableOfContent"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserWantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("AlternateCount") + .HasColumnType("INTEGER"); + + b.Property("AlternateNumber") + .HasColumnType("TEXT"); + + b.Property("AlternateSeries") + .HasColumnType("TEXT"); + + b.Property("AverageExternalRating") + .HasColumnType("REAL"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("Count") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ISBN") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("ISBNLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("IsSpecial") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Number") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("Range") + .HasColumnType("TEXT"); + + b.Property("ReleaseDate") + .HasColumnType("TEXT"); + + b.Property("ReleaseDateLocked") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesGroup") + .HasColumnType("TEXT"); + + b.Property("SortOrder") + .HasColumnType("REAL"); + + b.Property("SortOrderLocked") + .HasColumnType("INTEGER"); + + b.Property("StoryArc") + .HasColumnType("TEXT"); + + b.Property("StoryArcNumber") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TitleName") + .HasColumnType("TEXT"); + + b.Property("TitleNameLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("VolumeId"); + + b.ToTable("Chapter"); + }); + + modelBuilder.Entity("API.Entities.CollectionTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Id", "Promoted") + .IsUnique(); + + b.ToTable("CollectionTag"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EmailAddress") + .HasColumnType("TEXT"); + + b.Property("IpAddress") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastUsed") + .HasColumnType("TEXT"); + + b.Property("LastUsedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Platform") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("Device"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DeliveryStatus") + .HasColumnType("TEXT"); + + b.Property("EmailTemplate") + .HasColumnType("TEXT"); + + b.Property("ErrorMessage") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SendDate") + .HasColumnType("TEXT"); + + b.Property("Sent") + .HasColumnType("INTEGER"); + + b.Property("Subject") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("Sent", "AppUserId", "EmailTemplate", "SendDate"); + + b.ToTable("EmailHistory"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Path") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("FolderPath"); + }); + + modelBuilder.Entity("API.Entities.Genre", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Genre"); + }); + + modelBuilder.Entity("API.Entities.History.ManualMigrationHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("ProductVersion") + .HasColumnType("TEXT"); + + b.Property("RanAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ManualMigrationHistory"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowMetadataMatching") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AllowScrobbling") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FolderWatching") + .HasColumnType("INTEGER"); + + b.Property("IncludeInDashboard") + .HasColumnType("INTEGER"); + + b.Property("IncludeInRecommended") + .HasColumnType("INTEGER"); + + b.Property("IncludeInSearch") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("ManageCollections") + .HasColumnType("INTEGER"); + + b.Property("ManageReadingLists") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Pattern") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryExcludePattern"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("FileTypeGroup") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryFileTypeGroup"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Bytes") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("LastFileAnalysis") + .HasColumnType("TEXT"); + + b.Property("LastFileAnalysisUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("MangaFile"); + }); + + modelBuilder.Entity("API.Entities.MediaError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MediaError"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Authority") + .HasColumnType("INTEGER"); + + b.Property("AverageScore") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("FavoriteCount") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ProviderUrl") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("ExternalRating"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRecommendation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("CoverUrl") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Url") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("ExternalRecommendation"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Authority") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("BodyJustText") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("INTEGER"); + + b.Property("RawBody") + .HasColumnType("TEXT"); + + b.Property("Score") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("SiteUrl") + .HasColumnType("TEXT"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.Property("TotalVotes") + .HasColumnType("INTEGER"); + + b.Property("Username") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("ExternalReview"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AverageExternalRating") + .HasColumnType("INTEGER"); + + b.Property("CbrId") + .HasColumnType("INTEGER"); + + b.Property("GoogleBooksId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("ValidUntilUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.ToTable("ExternalSeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastChecked") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("SeriesBlacklist"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxCount") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatusLocked") + .HasColumnType("INTEGER"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYear") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYearLocked") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.HasIndex("Id", "SeriesId") + .IsUnique(); + + b.ToTable("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("RelationKind") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("TargetSeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.HasIndex("TargetSeriesId"); + + b.ToTable("SeriesRelation"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("DestinationType") + .HasColumnType("INTEGER"); + + b.Property("DestinationValue") + .HasColumnType("TEXT"); + + b.Property("ExcludeFromSource") + .HasColumnType("INTEGER"); + + b.Property("MetadataSettingsId") + .HasColumnType("INTEGER"); + + b.Property("SourceType") + .HasColumnType("INTEGER"); + + b.Property("SourceValue") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("MetadataSettingsId"); + + b.ToTable("MetadataFieldMapping"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRatingMappings") + .HasColumnType("TEXT"); + + b.Property("Blacklist") + .HasColumnType("TEXT"); + + b.Property("EnableChapterCoverImage") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterPublisher") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterReleaseDate") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterTitle") + .HasColumnType("INTEGER"); + + b.Property("EnableCoverImage") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("EnableGenres") + .HasColumnType("INTEGER"); + + b.Property("EnableLocalizedName") + .HasColumnType("INTEGER"); + + b.Property("EnablePeople") + .HasColumnType("INTEGER"); + + b.Property("EnablePublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("EnableRelationships") + .HasColumnType("INTEGER"); + + b.Property("EnableStartDate") + .HasColumnType("INTEGER"); + + b.Property("EnableSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableTags") + .HasColumnType("INTEGER"); + + b.Property("Enabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("FirstLastPeopleNaming") + .HasColumnType("INTEGER"); + + b.Property("Overrides") + .HasColumnType("TEXT"); + + b.PrimitiveCollection("PersonRoles") + .HasColumnType("TEXT"); + + b.Property("Whitelist") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .HasColumnType("INTEGER"); + + b.HasKey("ChapterId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("ChapterPeople"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("Asin") + .HasColumnType("TEXT"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("HardcoverId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.Property("SeriesMetadataId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.HasKey("SeriesMetadataId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EndingMonth") + .HasColumnType("INTEGER"); + + b.Property("EndingYear") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("StartingMonth") + .HasColumnType("INTEGER"); + + b.Property("StartingYear") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("ReadingList"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("ReadingListId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.HasIndex("ReadingListId"); + + b.HasIndex("SeriesId"); + + b.HasIndex("VolumeId"); + + b.ToTable("ReadingListItem"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId1") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ScrobbleEventId1"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleError"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterNumber") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("ErrorDetails") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsErrored") + .HasColumnType("INTEGER"); + + b.Property("IsProcessed") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("ProcessDateUtc") + .HasColumnType("TEXT"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("ReviewBody") + .HasColumnType("TEXT"); + + b.Property("ReviewTitle") + .HasColumnType("TEXT"); + + b.Property("ScrobbleEventType") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeNumber") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("LibraryId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleEvent"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleHold"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DontMatch") + .HasColumnType("INTEGER"); + + b.Property("FolderPath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsBlacklisted") + .HasColumnType("INTEGER"); + + b.Property("LastChapterAdded") + .HasColumnType("TEXT"); + + b.Property("LastChapterAddedUtc") + .HasColumnType("TEXT"); + + b.Property("LastFolderScanned") + .HasColumnType("TEXT"); + + b.Property("LastFolderScannedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("LocalizedName") + .HasColumnType("TEXT"); + + b.Property("LocalizedNameLocked") + .HasColumnType("INTEGER"); + + b.Property("LowestFolderPath") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedLocalizedName") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("OriginalName") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SortName") + .HasColumnType("TEXT"); + + b.Property("SortNameLocked") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("Series"); + }); + + modelBuilder.Entity("API.Entities.ServerSetting", b => + { + b.Property("Key") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.ToTable("ServerSetting"); + }); + + modelBuilder.Entity("API.Entities.ServerStatistics", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterCount") + .HasColumnType("INTEGER"); + + b.Property("FileCount") + .HasColumnType("INTEGER"); + + b.Property("GenreCount") + .HasColumnType("INTEGER"); + + b.Property("PersonCount") + .HasColumnType("INTEGER"); + + b.Property("SeriesCount") + .HasColumnType("INTEGER"); + + b.Property("TagCount") + .HasColumnType("INTEGER"); + + b.Property("UserCount") + .HasColumnType("INTEGER"); + + b.Property("VolumeCount") + .HasColumnType("INTEGER"); + + b.Property("Year") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ServerStatistics"); + }); + + modelBuilder.Entity("API.Entities.SiteTheme", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Author") + .HasColumnType("TEXT"); + + b.Property("CompatibleVersion") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("GitHubPath") + .HasColumnType("TEXT"); + + b.Property("IsDefault") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PreviewUrls") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ShaHash") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("SiteTheme"); + }); + + modelBuilder.Entity("API.Entities.Tag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Tag"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LookupName") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Number") + .HasColumnType("INTEGER"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("Volume"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.Property("CollectionsId") + .HasColumnType("INTEGER"); + + b.Property("ItemsId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionsId", "ItemsId"); + + b.HasIndex("ItemsId"); + + b.ToTable("AppUserCollectionSeries"); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.Property("AppUsersId") + .HasColumnType("INTEGER"); + + b.Property("LibrariesId") + .HasColumnType("INTEGER"); + + b.HasKey("AppUsersId", "LibrariesId"); + + b.HasIndex("LibrariesId"); + + b.ToTable("AppUserLibrary"); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "GenresId"); + + b.HasIndex("GenresId"); + + b.ToTable("ChapterGenre"); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("ChapterTag"); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.Property("CollectionTagsId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionTagsId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("CollectionTagSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.Property("ExternalRatingsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRatingsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRatingExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.Property("ExternalRecommendationsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRecommendationsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRecommendationExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.Property("ExternalReviewsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalReviewsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalReviewExternalSeriesMetadata"); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("GenresId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("GenreSeriesMetadata"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("ProviderKey") + .HasColumnType("TEXT"); + + b.Property("ProviderDisplayName") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("SeriesMetadatasId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("SeriesMetadataTag"); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Bookmarks") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserChapterRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ChapterRatings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Ratings") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Collections") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("DashboardStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ExternalSources") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithOne("UserPreferences") + .HasForeignKey("API.Entities.AppUserPreferences", "AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.SiteTheme", "Theme") + .WithMany() + .HasForeignKey("ThemeId"); + + b.Navigation("AppUser"); + + b.Navigation("Theme"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Progresses") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", null) + .WithMany("UserProgress") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany("Progress") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Ratings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany("Ratings") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.HasOne("API.Entities.AppRole", "Role") + .WithMany("UserRoles") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUser", "User") + .WithMany("UserRoles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SideNavStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SmartFilters") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("TableOfContents") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("WantToRead") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.HasOne("API.Entities.Volume", "Volume") + .WithMany("Chapters") + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Devices") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Folders") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryExcludePatterns") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryFileTypes") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Files") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany("ExternalRatings") + .HasForeignKey("ChapterId"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany("ExternalReviews") + .HasForeignKey("ChapterId"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("ExternalSeriesMetadata") + .HasForeignKey("API.Entities.Metadata.ExternalSeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("Metadata") + .HasForeignKey("API.Entities.Metadata.SeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Relations") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "TargetSeries") + .WithMany("RelationOf") + .HasForeignKey("TargetSeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + + b.Navigation("TargetSeries"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.HasOne("API.Entities.MetadataMatching.MetadataSettings", "MetadataSettings") + .WithMany("FieldMappings") + .HasForeignKey("MetadataSettingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("People") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("ChapterPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("SeriesMetadataPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", "SeriesMetadata") + .WithMany("People") + .HasForeignKey("SeriesMetadataId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + + b.Navigation("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingLists") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.ReadingList", "ReadingList") + .WithMany("Items") + .HasForeignKey("ReadingListId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Volume", "Volume") + .WithMany() + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("ReadingList"); + + b.Navigation("Series"); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.HasOne("API.Entities.Scrobble.ScrobbleEvent", "ScrobbleEvent") + .WithMany() + .HasForeignKey("ScrobbleEventId1"); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ScrobbleEvent"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", "Library") + .WithMany() + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Library"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ScrobbleHolds") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Series") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Volumes") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.HasOne("API.Entities.AppUserCollection", null) + .WithMany() + .HasForeignKey("CollectionsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany() + .HasForeignKey("ItemsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("AppUsersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", null) + .WithMany() + .HasForeignKey("LibrariesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.HasOne("API.Entities.CollectionTag", null) + .WithMany() + .HasForeignKey("CollectionTagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRating", null) + .WithMany() + .HasForeignKey("ExternalRatingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRecommendation", null) + .WithMany() + .HasForeignKey("ExternalRecommendationsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalReview", null) + .WithMany() + .HasForeignKey("ExternalReviewsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("API.Entities.AppRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Navigation("UserRoles"); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Navigation("Bookmarks"); + + b.Navigation("ChapterRatings"); + + b.Navigation("Collections"); + + b.Navigation("DashboardStreams"); + + b.Navigation("Devices"); + + b.Navigation("ExternalSources"); + + b.Navigation("Progresses"); + + b.Navigation("Ratings"); + + b.Navigation("ReadingLists"); + + b.Navigation("ScrobbleHolds"); + + b.Navigation("SideNavStreams"); + + b.Navigation("SmartFilters"); + + b.Navigation("TableOfContents"); + + b.Navigation("UserPreferences"); + + b.Navigation("UserRoles"); + + b.Navigation("WantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Navigation("ExternalRatings"); + + b.Navigation("ExternalReviews"); + + b.Navigation("Files"); + + b.Navigation("People"); + + b.Navigation("Ratings"); + + b.Navigation("UserProgress"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Navigation("Folders"); + + b.Navigation("LibraryExcludePatterns"); + + b.Navigation("LibraryFileTypes"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Navigation("People"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Navigation("FieldMappings"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Navigation("ChapterPeople"); + + b.Navigation("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Navigation("ExternalSeriesMetadata"); + + b.Navigation("Metadata"); + + b.Navigation("Progress"); + + b.Navigation("Ratings"); + + b.Navigation("RelationOf"); + + b.Navigation("Relations"); + + b.Navigation("Volumes"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Navigation("Chapters"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/API/Data/Migrations/20250429150140_ChapterRatingAndReviews.cs b/API/Data/Migrations/20250429150140_ChapterRatingAndReviews.cs new file mode 100644 index 000000000..5ab51aaba --- /dev/null +++ b/API/Data/Migrations/20250429150140_ChapterRatingAndReviews.cs @@ -0,0 +1,165 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace API.Data.Migrations +{ + /// + public partial class ChapterRatingAndReviews : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "Authority", + table: "ExternalReview", + type: "INTEGER", + nullable: false, + defaultValue: 0); + + migrationBuilder.AddColumn( + name: "ChapterId", + table: "ExternalReview", + type: "INTEGER", + nullable: true); + + migrationBuilder.AddColumn( + name: "Authority", + table: "ExternalRating", + type: "INTEGER", + nullable: false, + defaultValue: 0); + + migrationBuilder.AddColumn( + name: "ChapterId", + table: "ExternalRating", + type: "INTEGER", + nullable: true); + + migrationBuilder.AddColumn( + name: "AverageExternalRating", + table: "Chapter", + type: "REAL", + nullable: false, + defaultValue: 0f); + + migrationBuilder.CreateTable( + name: "AppUserChapterRating", + columns: table => new + { + Id = table.Column(type: "INTEGER", nullable: false) + .Annotation("Sqlite:Autoincrement", true), + Rating = table.Column(type: "REAL", nullable: false), + HasBeenRated = table.Column(type: "INTEGER", nullable: false), + Review = table.Column(type: "TEXT", nullable: true), + SeriesId = table.Column(type: "INTEGER", nullable: false), + ChapterId = table.Column(type: "INTEGER", nullable: false), + AppUserId = table.Column(type: "INTEGER", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AppUserChapterRating", x => x.Id); + table.ForeignKey( + name: "FK_AppUserChapterRating_AspNetUsers_AppUserId", + column: x => x.AppUserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_AppUserChapterRating_Chapter_ChapterId", + column: x => x.ChapterId, + principalTable: "Chapter", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_AppUserChapterRating_Series_SeriesId", + column: x => x.SeriesId, + principalTable: "Series", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_ExternalReview_ChapterId", + table: "ExternalReview", + column: "ChapterId"); + + migrationBuilder.CreateIndex( + name: "IX_ExternalRating_ChapterId", + table: "ExternalRating", + column: "ChapterId"); + + migrationBuilder.CreateIndex( + name: "IX_AppUserChapterRating_AppUserId", + table: "AppUserChapterRating", + column: "AppUserId"); + + migrationBuilder.CreateIndex( + name: "IX_AppUserChapterRating_ChapterId", + table: "AppUserChapterRating", + column: "ChapterId"); + + migrationBuilder.CreateIndex( + name: "IX_AppUserChapterRating_SeriesId", + table: "AppUserChapterRating", + column: "SeriesId"); + + migrationBuilder.AddForeignKey( + name: "FK_ExternalRating_Chapter_ChapterId", + table: "ExternalRating", + column: "ChapterId", + principalTable: "Chapter", + principalColumn: "Id"); + + migrationBuilder.AddForeignKey( + name: "FK_ExternalReview_Chapter_ChapterId", + table: "ExternalReview", + column: "ChapterId", + principalTable: "Chapter", + principalColumn: "Id"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropForeignKey( + name: "FK_ExternalRating_Chapter_ChapterId", + table: "ExternalRating"); + + migrationBuilder.DropForeignKey( + name: "FK_ExternalReview_Chapter_ChapterId", + table: "ExternalReview"); + + migrationBuilder.DropTable( + name: "AppUserChapterRating"); + + migrationBuilder.DropIndex( + name: "IX_ExternalReview_ChapterId", + table: "ExternalReview"); + + migrationBuilder.DropIndex( + name: "IX_ExternalRating_ChapterId", + table: "ExternalRating"); + + migrationBuilder.DropColumn( + name: "Authority", + table: "ExternalReview"); + + migrationBuilder.DropColumn( + name: "ChapterId", + table: "ExternalReview"); + + migrationBuilder.DropColumn( + name: "Authority", + table: "ExternalRating"); + + migrationBuilder.DropColumn( + name: "ChapterId", + table: "ExternalRating"); + + migrationBuilder.DropColumn( + name: "AverageExternalRating", + table: "Chapter"); + } + } +} diff --git a/API/Data/Migrations/20250507221026_PersonAliases.Designer.cs b/API/Data/Migrations/20250507221026_PersonAliases.Designer.cs new file mode 100644 index 000000000..5d76571e1 --- /dev/null +++ b/API/Data/Migrations/20250507221026_PersonAliases.Designer.cs @@ -0,0 +1,3571 @@ +// +using System; +using API.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace API.Data.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20250507221026_PersonAliases")] + partial class PersonAliases + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "9.0.4"); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AccessFailedCount") + .HasColumnType("INTEGER"); + + b.Property("AgeRestriction") + .HasColumnType("INTEGER"); + + b.Property("AgeRestrictionIncludeUnknowns") + .HasColumnType("INTEGER"); + + b.Property("AniListAccessToken") + .HasColumnType("TEXT"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("ConfirmationToken") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("EmailConfirmed") + .HasColumnType("INTEGER"); + + b.Property("HasRunScrobbleEventGeneration") + .HasColumnType("INTEGER"); + + b.Property("LastActive") + .HasColumnType("TEXT"); + + b.Property("LastActiveUtc") + .HasColumnType("TEXT"); + + b.Property("LockoutEnabled") + .HasColumnType("INTEGER"); + + b.Property("LockoutEnd") + .HasColumnType("TEXT"); + + b.Property("MalAccessToken") + .HasColumnType("TEXT"); + + b.Property("MalUserName") + .HasColumnType("TEXT"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("PasswordHash") + .HasColumnType("TEXT"); + + b.Property("PhoneNumber") + .HasColumnType("TEXT"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventGenerationRan") + .HasColumnType("TEXT"); + + b.Property("SecurityStamp") + .HasColumnType("TEXT"); + + b.Property("TwoFactorEnabled") + .HasColumnType("INTEGER"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Page") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserBookmark"); + }); + + modelBuilder.Entity("API.Entities.AppUserChapterRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserChapterRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastSyncUtc") + .HasColumnType("TEXT"); + + b.Property("MissingSeriesFromSource") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.Property("SourceUrl") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TotalSourceCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserCollection"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(4); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserDashboardStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Host") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserExternalSource"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserOnDeckRemoval"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowAutomaticWebtoonReaderDetection") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AniListScrobblingEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BlurUnreadSummaries") + .HasColumnType("INTEGER"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("CollapseSeriesRelationships") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("GlobalPageLayoutMode") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("Locale") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("en"); + + b.Property("NoTransitions") + .HasColumnType("INTEGER"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("PromptForDownloadSize") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("ShareReviews") + .HasColumnType("INTEGER"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("ThemeId") + .HasColumnType("INTEGER"); + + b.Property("WantToReadSync") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.HasKey("Id"); + + b.HasIndex("AppUserId") + .IsUnique(); + + b.HasIndex("ThemeId"); + + b.ToTable("AppUserPreferences"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PagesRead") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserProgresses"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSourceId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(5); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserSideNavStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Filter") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserSmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PageNumber") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserTableOfContent"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserWantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("AlternateCount") + .HasColumnType("INTEGER"); + + b.Property("AlternateNumber") + .HasColumnType("TEXT"); + + b.Property("AlternateSeries") + .HasColumnType("TEXT"); + + b.Property("AverageExternalRating") + .HasColumnType("REAL"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("Count") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ISBN") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("ISBNLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("IsSpecial") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Number") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("Range") + .HasColumnType("TEXT"); + + b.Property("ReleaseDate") + .HasColumnType("TEXT"); + + b.Property("ReleaseDateLocked") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesGroup") + .HasColumnType("TEXT"); + + b.Property("SortOrder") + .HasColumnType("REAL"); + + b.Property("SortOrderLocked") + .HasColumnType("INTEGER"); + + b.Property("StoryArc") + .HasColumnType("TEXT"); + + b.Property("StoryArcNumber") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TitleName") + .HasColumnType("TEXT"); + + b.Property("TitleNameLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("VolumeId"); + + b.ToTable("Chapter"); + }); + + modelBuilder.Entity("API.Entities.CollectionTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Id", "Promoted") + .IsUnique(); + + b.ToTable("CollectionTag"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EmailAddress") + .HasColumnType("TEXT"); + + b.Property("IpAddress") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastUsed") + .HasColumnType("TEXT"); + + b.Property("LastUsedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Platform") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("Device"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DeliveryStatus") + .HasColumnType("TEXT"); + + b.Property("EmailTemplate") + .HasColumnType("TEXT"); + + b.Property("ErrorMessage") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SendDate") + .HasColumnType("TEXT"); + + b.Property("Sent") + .HasColumnType("INTEGER"); + + b.Property("Subject") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("Sent", "AppUserId", "EmailTemplate", "SendDate"); + + b.ToTable("EmailHistory"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Path") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("FolderPath"); + }); + + modelBuilder.Entity("API.Entities.Genre", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Genre"); + }); + + modelBuilder.Entity("API.Entities.History.ManualMigrationHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("ProductVersion") + .HasColumnType("TEXT"); + + b.Property("RanAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ManualMigrationHistory"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowMetadataMatching") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AllowScrobbling") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FolderWatching") + .HasColumnType("INTEGER"); + + b.Property("IncludeInDashboard") + .HasColumnType("INTEGER"); + + b.Property("IncludeInRecommended") + .HasColumnType("INTEGER"); + + b.Property("IncludeInSearch") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("ManageCollections") + .HasColumnType("INTEGER"); + + b.Property("ManageReadingLists") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Pattern") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryExcludePattern"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("FileTypeGroup") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryFileTypeGroup"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Bytes") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("LastFileAnalysis") + .HasColumnType("TEXT"); + + b.Property("LastFileAnalysisUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("MangaFile"); + }); + + modelBuilder.Entity("API.Entities.MediaError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MediaError"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Authority") + .HasColumnType("INTEGER"); + + b.Property("AverageScore") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("FavoriteCount") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ProviderUrl") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("ExternalRating"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRecommendation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("CoverUrl") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Url") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("ExternalRecommendation"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Authority") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("BodyJustText") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("INTEGER"); + + b.Property("RawBody") + .HasColumnType("TEXT"); + + b.Property("Score") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("SiteUrl") + .HasColumnType("TEXT"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.Property("TotalVotes") + .HasColumnType("INTEGER"); + + b.Property("Username") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("ExternalReview"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AverageExternalRating") + .HasColumnType("INTEGER"); + + b.Property("CbrId") + .HasColumnType("INTEGER"); + + b.Property("GoogleBooksId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("ValidUntilUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.ToTable("ExternalSeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastChecked") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("SeriesBlacklist"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxCount") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatusLocked") + .HasColumnType("INTEGER"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYear") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYearLocked") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.HasIndex("Id", "SeriesId") + .IsUnique(); + + b.ToTable("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("RelationKind") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("TargetSeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.HasIndex("TargetSeriesId"); + + b.ToTable("SeriesRelation"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("DestinationType") + .HasColumnType("INTEGER"); + + b.Property("DestinationValue") + .HasColumnType("TEXT"); + + b.Property("ExcludeFromSource") + .HasColumnType("INTEGER"); + + b.Property("MetadataSettingsId") + .HasColumnType("INTEGER"); + + b.Property("SourceType") + .HasColumnType("INTEGER"); + + b.Property("SourceValue") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("MetadataSettingsId"); + + b.ToTable("MetadataFieldMapping"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRatingMappings") + .HasColumnType("TEXT"); + + b.Property("Blacklist") + .HasColumnType("TEXT"); + + b.Property("EnableChapterCoverImage") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterPublisher") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterReleaseDate") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterTitle") + .HasColumnType("INTEGER"); + + b.Property("EnableCoverImage") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("EnableGenres") + .HasColumnType("INTEGER"); + + b.Property("EnableLocalizedName") + .HasColumnType("INTEGER"); + + b.Property("EnablePeople") + .HasColumnType("INTEGER"); + + b.Property("EnablePublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("EnableRelationships") + .HasColumnType("INTEGER"); + + b.Property("EnableStartDate") + .HasColumnType("INTEGER"); + + b.Property("EnableSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableTags") + .HasColumnType("INTEGER"); + + b.Property("Enabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("FirstLastPeopleNaming") + .HasColumnType("INTEGER"); + + b.Property("Overrides") + .HasColumnType("TEXT"); + + b.PrimitiveCollection("PersonRoles") + .HasColumnType("TEXT"); + + b.Property("Whitelist") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .HasColumnType("INTEGER"); + + b.HasKey("ChapterId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("ChapterPeople"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("Asin") + .HasColumnType("TEXT"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("HardcoverId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.PersonAlias", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Alias") + .HasColumnType("TEXT"); + + b.Property("NormalizedAlias") + .HasColumnType("TEXT"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("PersonId"); + + b.ToTable("PersonAlias"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.Property("SeriesMetadataId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.HasKey("SeriesMetadataId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EndingMonth") + .HasColumnType("INTEGER"); + + b.Property("EndingYear") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("StartingMonth") + .HasColumnType("INTEGER"); + + b.Property("StartingYear") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("ReadingList"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("ReadingListId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.HasIndex("ReadingListId"); + + b.HasIndex("SeriesId"); + + b.HasIndex("VolumeId"); + + b.ToTable("ReadingListItem"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId1") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ScrobbleEventId1"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleError"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterNumber") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("ErrorDetails") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsErrored") + .HasColumnType("INTEGER"); + + b.Property("IsProcessed") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("ProcessDateUtc") + .HasColumnType("TEXT"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("ReviewBody") + .HasColumnType("TEXT"); + + b.Property("ReviewTitle") + .HasColumnType("TEXT"); + + b.Property("ScrobbleEventType") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeNumber") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("LibraryId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleEvent"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleHold"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DontMatch") + .HasColumnType("INTEGER"); + + b.Property("FolderPath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsBlacklisted") + .HasColumnType("INTEGER"); + + b.Property("LastChapterAdded") + .HasColumnType("TEXT"); + + b.Property("LastChapterAddedUtc") + .HasColumnType("TEXT"); + + b.Property("LastFolderScanned") + .HasColumnType("TEXT"); + + b.Property("LastFolderScannedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("LocalizedName") + .HasColumnType("TEXT"); + + b.Property("LocalizedNameLocked") + .HasColumnType("INTEGER"); + + b.Property("LowestFolderPath") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedLocalizedName") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("OriginalName") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SortName") + .HasColumnType("TEXT"); + + b.Property("SortNameLocked") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("Series"); + }); + + modelBuilder.Entity("API.Entities.ServerSetting", b => + { + b.Property("Key") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.ToTable("ServerSetting"); + }); + + modelBuilder.Entity("API.Entities.ServerStatistics", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterCount") + .HasColumnType("INTEGER"); + + b.Property("FileCount") + .HasColumnType("INTEGER"); + + b.Property("GenreCount") + .HasColumnType("INTEGER"); + + b.Property("PersonCount") + .HasColumnType("INTEGER"); + + b.Property("SeriesCount") + .HasColumnType("INTEGER"); + + b.Property("TagCount") + .HasColumnType("INTEGER"); + + b.Property("UserCount") + .HasColumnType("INTEGER"); + + b.Property("VolumeCount") + .HasColumnType("INTEGER"); + + b.Property("Year") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ServerStatistics"); + }); + + modelBuilder.Entity("API.Entities.SiteTheme", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Author") + .HasColumnType("TEXT"); + + b.Property("CompatibleVersion") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("GitHubPath") + .HasColumnType("TEXT"); + + b.Property("IsDefault") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PreviewUrls") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ShaHash") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("SiteTheme"); + }); + + modelBuilder.Entity("API.Entities.Tag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Tag"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LookupName") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Number") + .HasColumnType("INTEGER"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("Volume"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.Property("CollectionsId") + .HasColumnType("INTEGER"); + + b.Property("ItemsId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionsId", "ItemsId"); + + b.HasIndex("ItemsId"); + + b.ToTable("AppUserCollectionSeries"); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.Property("AppUsersId") + .HasColumnType("INTEGER"); + + b.Property("LibrariesId") + .HasColumnType("INTEGER"); + + b.HasKey("AppUsersId", "LibrariesId"); + + b.HasIndex("LibrariesId"); + + b.ToTable("AppUserLibrary"); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "GenresId"); + + b.HasIndex("GenresId"); + + b.ToTable("ChapterGenre"); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("ChapterTag"); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.Property("CollectionTagsId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionTagsId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("CollectionTagSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.Property("ExternalRatingsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRatingsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRatingExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.Property("ExternalRecommendationsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRecommendationsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRecommendationExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.Property("ExternalReviewsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalReviewsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalReviewExternalSeriesMetadata"); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("GenresId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("GenreSeriesMetadata"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("ProviderKey") + .HasColumnType("TEXT"); + + b.Property("ProviderDisplayName") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("SeriesMetadatasId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("SeriesMetadataTag"); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Bookmarks") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserChapterRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ChapterRatings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Ratings") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Collections") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("DashboardStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ExternalSources") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithOne("UserPreferences") + .HasForeignKey("API.Entities.AppUserPreferences", "AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.SiteTheme", "Theme") + .WithMany() + .HasForeignKey("ThemeId"); + + b.Navigation("AppUser"); + + b.Navigation("Theme"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Progresses") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", null) + .WithMany("UserProgress") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany("Progress") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Ratings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany("Ratings") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.HasOne("API.Entities.AppRole", "Role") + .WithMany("UserRoles") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUser", "User") + .WithMany("UserRoles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SideNavStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SmartFilters") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("TableOfContents") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("WantToRead") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.HasOne("API.Entities.Volume", "Volume") + .WithMany("Chapters") + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Devices") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Folders") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryExcludePatterns") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryFileTypes") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Files") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany("ExternalRatings") + .HasForeignKey("ChapterId"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany("ExternalReviews") + .HasForeignKey("ChapterId"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("ExternalSeriesMetadata") + .HasForeignKey("API.Entities.Metadata.ExternalSeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("Metadata") + .HasForeignKey("API.Entities.Metadata.SeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Relations") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "TargetSeries") + .WithMany("RelationOf") + .HasForeignKey("TargetSeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + + b.Navigation("TargetSeries"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.HasOne("API.Entities.MetadataMatching.MetadataSettings", "MetadataSettings") + .WithMany("FieldMappings") + .HasForeignKey("MetadataSettingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("People") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("ChapterPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.PersonAlias", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("Aliases") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("SeriesMetadataPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", "SeriesMetadata") + .WithMany("People") + .HasForeignKey("SeriesMetadataId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + + b.Navigation("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingLists") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.ReadingList", "ReadingList") + .WithMany("Items") + .HasForeignKey("ReadingListId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Volume", "Volume") + .WithMany() + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("ReadingList"); + + b.Navigation("Series"); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.HasOne("API.Entities.Scrobble.ScrobbleEvent", "ScrobbleEvent") + .WithMany() + .HasForeignKey("ScrobbleEventId1"); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ScrobbleEvent"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", "Library") + .WithMany() + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Library"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ScrobbleHolds") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Series") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Volumes") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.HasOne("API.Entities.AppUserCollection", null) + .WithMany() + .HasForeignKey("CollectionsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany() + .HasForeignKey("ItemsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("AppUsersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", null) + .WithMany() + .HasForeignKey("LibrariesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.HasOne("API.Entities.CollectionTag", null) + .WithMany() + .HasForeignKey("CollectionTagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRating", null) + .WithMany() + .HasForeignKey("ExternalRatingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRecommendation", null) + .WithMany() + .HasForeignKey("ExternalRecommendationsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalReview", null) + .WithMany() + .HasForeignKey("ExternalReviewsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("API.Entities.AppRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Navigation("UserRoles"); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Navigation("Bookmarks"); + + b.Navigation("ChapterRatings"); + + b.Navigation("Collections"); + + b.Navigation("DashboardStreams"); + + b.Navigation("Devices"); + + b.Navigation("ExternalSources"); + + b.Navigation("Progresses"); + + b.Navigation("Ratings"); + + b.Navigation("ReadingLists"); + + b.Navigation("ScrobbleHolds"); + + b.Navigation("SideNavStreams"); + + b.Navigation("SmartFilters"); + + b.Navigation("TableOfContents"); + + b.Navigation("UserPreferences"); + + b.Navigation("UserRoles"); + + b.Navigation("WantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Navigation("ExternalRatings"); + + b.Navigation("ExternalReviews"); + + b.Navigation("Files"); + + b.Navigation("People"); + + b.Navigation("Ratings"); + + b.Navigation("UserProgress"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Navigation("Folders"); + + b.Navigation("LibraryExcludePatterns"); + + b.Navigation("LibraryFileTypes"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Navigation("People"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Navigation("FieldMappings"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Navigation("Aliases"); + + b.Navigation("ChapterPeople"); + + b.Navigation("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Navigation("ExternalSeriesMetadata"); + + b.Navigation("Metadata"); + + b.Navigation("Progress"); + + b.Navigation("Ratings"); + + b.Navigation("RelationOf"); + + b.Navigation("Relations"); + + b.Navigation("Volumes"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Navigation("Chapters"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/API/Data/Migrations/20250507221026_PersonAliases.cs b/API/Data/Migrations/20250507221026_PersonAliases.cs new file mode 100644 index 000000000..cb046a131 --- /dev/null +++ b/API/Data/Migrations/20250507221026_PersonAliases.cs @@ -0,0 +1,47 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace API.Data.Migrations +{ + /// + public partial class PersonAliases : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "PersonAlias", + columns: table => new + { + Id = table.Column(type: "INTEGER", nullable: false) + .Annotation("Sqlite:Autoincrement", true), + Alias = table.Column(type: "TEXT", nullable: true), + NormalizedAlias = table.Column(type: "TEXT", nullable: true), + PersonId = table.Column(type: "INTEGER", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_PersonAlias", x => x.Id); + table.ForeignKey( + name: "FK_PersonAlias_Person_PersonId", + column: x => x.PersonId, + principalTable: "Person", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_PersonAlias_PersonId", + table: "PersonAlias", + column: "PersonId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "PersonAlias"); + } + } +} diff --git a/API/Data/Migrations/20250519151126_KoreaderHash.Designer.cs b/API/Data/Migrations/20250519151126_KoreaderHash.Designer.cs new file mode 100644 index 000000000..79f6f9504 --- /dev/null +++ b/API/Data/Migrations/20250519151126_KoreaderHash.Designer.cs @@ -0,0 +1,3574 @@ +// +using System; +using API.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace API.Data.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20250519151126_KoreaderHash")] + partial class KoreaderHash + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "9.0.4"); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AccessFailedCount") + .HasColumnType("INTEGER"); + + b.Property("AgeRestriction") + .HasColumnType("INTEGER"); + + b.Property("AgeRestrictionIncludeUnknowns") + .HasColumnType("INTEGER"); + + b.Property("AniListAccessToken") + .HasColumnType("TEXT"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("ConfirmationToken") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("EmailConfirmed") + .HasColumnType("INTEGER"); + + b.Property("HasRunScrobbleEventGeneration") + .HasColumnType("INTEGER"); + + b.Property("LastActive") + .HasColumnType("TEXT"); + + b.Property("LastActiveUtc") + .HasColumnType("TEXT"); + + b.Property("LockoutEnabled") + .HasColumnType("INTEGER"); + + b.Property("LockoutEnd") + .HasColumnType("TEXT"); + + b.Property("MalAccessToken") + .HasColumnType("TEXT"); + + b.Property("MalUserName") + .HasColumnType("TEXT"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("PasswordHash") + .HasColumnType("TEXT"); + + b.Property("PhoneNumber") + .HasColumnType("TEXT"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventGenerationRan") + .HasColumnType("TEXT"); + + b.Property("SecurityStamp") + .HasColumnType("TEXT"); + + b.Property("TwoFactorEnabled") + .HasColumnType("INTEGER"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Page") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserBookmark"); + }); + + modelBuilder.Entity("API.Entities.AppUserChapterRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserChapterRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastSyncUtc") + .HasColumnType("TEXT"); + + b.Property("MissingSeriesFromSource") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.Property("SourceUrl") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TotalSourceCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserCollection"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(4); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserDashboardStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Host") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserExternalSource"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserOnDeckRemoval"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowAutomaticWebtoonReaderDetection") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AniListScrobblingEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BlurUnreadSummaries") + .HasColumnType("INTEGER"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("CollapseSeriesRelationships") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("GlobalPageLayoutMode") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("Locale") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("en"); + + b.Property("NoTransitions") + .HasColumnType("INTEGER"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("PromptForDownloadSize") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("ShareReviews") + .HasColumnType("INTEGER"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("ThemeId") + .HasColumnType("INTEGER"); + + b.Property("WantToReadSync") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.HasKey("Id"); + + b.HasIndex("AppUserId") + .IsUnique(); + + b.HasIndex("ThemeId"); + + b.ToTable("AppUserPreferences"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PagesRead") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserProgresses"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSourceId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(5); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserSideNavStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Filter") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserSmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PageNumber") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserTableOfContent"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserWantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("AlternateCount") + .HasColumnType("INTEGER"); + + b.Property("AlternateNumber") + .HasColumnType("TEXT"); + + b.Property("AlternateSeries") + .HasColumnType("TEXT"); + + b.Property("AverageExternalRating") + .HasColumnType("REAL"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("Count") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ISBN") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("ISBNLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("IsSpecial") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Number") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("Range") + .HasColumnType("TEXT"); + + b.Property("ReleaseDate") + .HasColumnType("TEXT"); + + b.Property("ReleaseDateLocked") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesGroup") + .HasColumnType("TEXT"); + + b.Property("SortOrder") + .HasColumnType("REAL"); + + b.Property("SortOrderLocked") + .HasColumnType("INTEGER"); + + b.Property("StoryArc") + .HasColumnType("TEXT"); + + b.Property("StoryArcNumber") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TitleName") + .HasColumnType("TEXT"); + + b.Property("TitleNameLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("VolumeId"); + + b.ToTable("Chapter"); + }); + + modelBuilder.Entity("API.Entities.CollectionTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Id", "Promoted") + .IsUnique(); + + b.ToTable("CollectionTag"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EmailAddress") + .HasColumnType("TEXT"); + + b.Property("IpAddress") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastUsed") + .HasColumnType("TEXT"); + + b.Property("LastUsedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Platform") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("Device"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DeliveryStatus") + .HasColumnType("TEXT"); + + b.Property("EmailTemplate") + .HasColumnType("TEXT"); + + b.Property("ErrorMessage") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SendDate") + .HasColumnType("TEXT"); + + b.Property("Sent") + .HasColumnType("INTEGER"); + + b.Property("Subject") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("Sent", "AppUserId", "EmailTemplate", "SendDate"); + + b.ToTable("EmailHistory"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Path") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("FolderPath"); + }); + + modelBuilder.Entity("API.Entities.Genre", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Genre"); + }); + + modelBuilder.Entity("API.Entities.History.ManualMigrationHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("ProductVersion") + .HasColumnType("TEXT"); + + b.Property("RanAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ManualMigrationHistory"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowMetadataMatching") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AllowScrobbling") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FolderWatching") + .HasColumnType("INTEGER"); + + b.Property("IncludeInDashboard") + .HasColumnType("INTEGER"); + + b.Property("IncludeInRecommended") + .HasColumnType("INTEGER"); + + b.Property("IncludeInSearch") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("ManageCollections") + .HasColumnType("INTEGER"); + + b.Property("ManageReadingLists") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Pattern") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryExcludePattern"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("FileTypeGroup") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryFileTypeGroup"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Bytes") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("KoreaderHash") + .HasColumnType("TEXT"); + + b.Property("LastFileAnalysis") + .HasColumnType("TEXT"); + + b.Property("LastFileAnalysisUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("MangaFile"); + }); + + modelBuilder.Entity("API.Entities.MediaError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MediaError"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Authority") + .HasColumnType("INTEGER"); + + b.Property("AverageScore") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("FavoriteCount") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ProviderUrl") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("ExternalRating"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRecommendation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("CoverUrl") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Url") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("ExternalRecommendation"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Authority") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("BodyJustText") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("INTEGER"); + + b.Property("RawBody") + .HasColumnType("TEXT"); + + b.Property("Score") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("SiteUrl") + .HasColumnType("TEXT"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.Property("TotalVotes") + .HasColumnType("INTEGER"); + + b.Property("Username") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("ExternalReview"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AverageExternalRating") + .HasColumnType("INTEGER"); + + b.Property("CbrId") + .HasColumnType("INTEGER"); + + b.Property("GoogleBooksId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("ValidUntilUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.ToTable("ExternalSeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastChecked") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("SeriesBlacklist"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxCount") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatusLocked") + .HasColumnType("INTEGER"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYear") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYearLocked") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.HasIndex("Id", "SeriesId") + .IsUnique(); + + b.ToTable("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("RelationKind") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("TargetSeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.HasIndex("TargetSeriesId"); + + b.ToTable("SeriesRelation"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("DestinationType") + .HasColumnType("INTEGER"); + + b.Property("DestinationValue") + .HasColumnType("TEXT"); + + b.Property("ExcludeFromSource") + .HasColumnType("INTEGER"); + + b.Property("MetadataSettingsId") + .HasColumnType("INTEGER"); + + b.Property("SourceType") + .HasColumnType("INTEGER"); + + b.Property("SourceValue") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("MetadataSettingsId"); + + b.ToTable("MetadataFieldMapping"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRatingMappings") + .HasColumnType("TEXT"); + + b.Property("Blacklist") + .HasColumnType("TEXT"); + + b.Property("EnableChapterCoverImage") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterPublisher") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterReleaseDate") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterTitle") + .HasColumnType("INTEGER"); + + b.Property("EnableCoverImage") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("EnableGenres") + .HasColumnType("INTEGER"); + + b.Property("EnableLocalizedName") + .HasColumnType("INTEGER"); + + b.Property("EnablePeople") + .HasColumnType("INTEGER"); + + b.Property("EnablePublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("EnableRelationships") + .HasColumnType("INTEGER"); + + b.Property("EnableStartDate") + .HasColumnType("INTEGER"); + + b.Property("EnableSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableTags") + .HasColumnType("INTEGER"); + + b.Property("Enabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("FirstLastPeopleNaming") + .HasColumnType("INTEGER"); + + b.Property("Overrides") + .HasColumnType("TEXT"); + + b.PrimitiveCollection("PersonRoles") + .HasColumnType("TEXT"); + + b.Property("Whitelist") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .HasColumnType("INTEGER"); + + b.HasKey("ChapterId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("ChapterPeople"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("Asin") + .HasColumnType("TEXT"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("HardcoverId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.PersonAlias", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Alias") + .HasColumnType("TEXT"); + + b.Property("NormalizedAlias") + .HasColumnType("TEXT"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("PersonId"); + + b.ToTable("PersonAlias"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.Property("SeriesMetadataId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.HasKey("SeriesMetadataId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EndingMonth") + .HasColumnType("INTEGER"); + + b.Property("EndingYear") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("StartingMonth") + .HasColumnType("INTEGER"); + + b.Property("StartingYear") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("ReadingList"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("ReadingListId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.HasIndex("ReadingListId"); + + b.HasIndex("SeriesId"); + + b.HasIndex("VolumeId"); + + b.ToTable("ReadingListItem"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId1") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ScrobbleEventId1"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleError"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterNumber") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("ErrorDetails") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsErrored") + .HasColumnType("INTEGER"); + + b.Property("IsProcessed") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("ProcessDateUtc") + .HasColumnType("TEXT"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("ReviewBody") + .HasColumnType("TEXT"); + + b.Property("ReviewTitle") + .HasColumnType("TEXT"); + + b.Property("ScrobbleEventType") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeNumber") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("LibraryId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleEvent"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleHold"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DontMatch") + .HasColumnType("INTEGER"); + + b.Property("FolderPath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsBlacklisted") + .HasColumnType("INTEGER"); + + b.Property("LastChapterAdded") + .HasColumnType("TEXT"); + + b.Property("LastChapterAddedUtc") + .HasColumnType("TEXT"); + + b.Property("LastFolderScanned") + .HasColumnType("TEXT"); + + b.Property("LastFolderScannedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("LocalizedName") + .HasColumnType("TEXT"); + + b.Property("LocalizedNameLocked") + .HasColumnType("INTEGER"); + + b.Property("LowestFolderPath") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedLocalizedName") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("OriginalName") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SortName") + .HasColumnType("TEXT"); + + b.Property("SortNameLocked") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("Series"); + }); + + modelBuilder.Entity("API.Entities.ServerSetting", b => + { + b.Property("Key") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.ToTable("ServerSetting"); + }); + + modelBuilder.Entity("API.Entities.ServerStatistics", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterCount") + .HasColumnType("INTEGER"); + + b.Property("FileCount") + .HasColumnType("INTEGER"); + + b.Property("GenreCount") + .HasColumnType("INTEGER"); + + b.Property("PersonCount") + .HasColumnType("INTEGER"); + + b.Property("SeriesCount") + .HasColumnType("INTEGER"); + + b.Property("TagCount") + .HasColumnType("INTEGER"); + + b.Property("UserCount") + .HasColumnType("INTEGER"); + + b.Property("VolumeCount") + .HasColumnType("INTEGER"); + + b.Property("Year") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ServerStatistics"); + }); + + modelBuilder.Entity("API.Entities.SiteTheme", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Author") + .HasColumnType("TEXT"); + + b.Property("CompatibleVersion") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("GitHubPath") + .HasColumnType("TEXT"); + + b.Property("IsDefault") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PreviewUrls") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ShaHash") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("SiteTheme"); + }); + + modelBuilder.Entity("API.Entities.Tag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Tag"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LookupName") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Number") + .HasColumnType("INTEGER"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("Volume"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.Property("CollectionsId") + .HasColumnType("INTEGER"); + + b.Property("ItemsId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionsId", "ItemsId"); + + b.HasIndex("ItemsId"); + + b.ToTable("AppUserCollectionSeries"); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.Property("AppUsersId") + .HasColumnType("INTEGER"); + + b.Property("LibrariesId") + .HasColumnType("INTEGER"); + + b.HasKey("AppUsersId", "LibrariesId"); + + b.HasIndex("LibrariesId"); + + b.ToTable("AppUserLibrary"); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "GenresId"); + + b.HasIndex("GenresId"); + + b.ToTable("ChapterGenre"); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("ChapterTag"); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.Property("CollectionTagsId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionTagsId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("CollectionTagSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.Property("ExternalRatingsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRatingsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRatingExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.Property("ExternalRecommendationsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRecommendationsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRecommendationExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.Property("ExternalReviewsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalReviewsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalReviewExternalSeriesMetadata"); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("GenresId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("GenreSeriesMetadata"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("ProviderKey") + .HasColumnType("TEXT"); + + b.Property("ProviderDisplayName") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("SeriesMetadatasId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("SeriesMetadataTag"); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Bookmarks") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserChapterRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ChapterRatings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Ratings") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Collections") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("DashboardStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ExternalSources") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithOne("UserPreferences") + .HasForeignKey("API.Entities.AppUserPreferences", "AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.SiteTheme", "Theme") + .WithMany() + .HasForeignKey("ThemeId"); + + b.Navigation("AppUser"); + + b.Navigation("Theme"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Progresses") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", null) + .WithMany("UserProgress") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany("Progress") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Ratings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany("Ratings") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.HasOne("API.Entities.AppRole", "Role") + .WithMany("UserRoles") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUser", "User") + .WithMany("UserRoles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SideNavStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SmartFilters") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("TableOfContents") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("WantToRead") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.HasOne("API.Entities.Volume", "Volume") + .WithMany("Chapters") + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Devices") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Folders") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryExcludePatterns") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryFileTypes") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Files") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany("ExternalRatings") + .HasForeignKey("ChapterId"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany("ExternalReviews") + .HasForeignKey("ChapterId"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("ExternalSeriesMetadata") + .HasForeignKey("API.Entities.Metadata.ExternalSeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("Metadata") + .HasForeignKey("API.Entities.Metadata.SeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Relations") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "TargetSeries") + .WithMany("RelationOf") + .HasForeignKey("TargetSeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + + b.Navigation("TargetSeries"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.HasOne("API.Entities.MetadataMatching.MetadataSettings", "MetadataSettings") + .WithMany("FieldMappings") + .HasForeignKey("MetadataSettingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("People") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("ChapterPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.PersonAlias", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("Aliases") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("SeriesMetadataPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", "SeriesMetadata") + .WithMany("People") + .HasForeignKey("SeriesMetadataId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + + b.Navigation("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingLists") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.ReadingList", "ReadingList") + .WithMany("Items") + .HasForeignKey("ReadingListId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Volume", "Volume") + .WithMany() + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("ReadingList"); + + b.Navigation("Series"); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.HasOne("API.Entities.Scrobble.ScrobbleEvent", "ScrobbleEvent") + .WithMany() + .HasForeignKey("ScrobbleEventId1"); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ScrobbleEvent"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", "Library") + .WithMany() + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Library"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ScrobbleHolds") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Series") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Volumes") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.HasOne("API.Entities.AppUserCollection", null) + .WithMany() + .HasForeignKey("CollectionsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany() + .HasForeignKey("ItemsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("AppUsersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", null) + .WithMany() + .HasForeignKey("LibrariesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.HasOne("API.Entities.CollectionTag", null) + .WithMany() + .HasForeignKey("CollectionTagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRating", null) + .WithMany() + .HasForeignKey("ExternalRatingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRecommendation", null) + .WithMany() + .HasForeignKey("ExternalRecommendationsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalReview", null) + .WithMany() + .HasForeignKey("ExternalReviewsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("API.Entities.AppRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Navigation("UserRoles"); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Navigation("Bookmarks"); + + b.Navigation("ChapterRatings"); + + b.Navigation("Collections"); + + b.Navigation("DashboardStreams"); + + b.Navigation("Devices"); + + b.Navigation("ExternalSources"); + + b.Navigation("Progresses"); + + b.Navigation("Ratings"); + + b.Navigation("ReadingLists"); + + b.Navigation("ScrobbleHolds"); + + b.Navigation("SideNavStreams"); + + b.Navigation("SmartFilters"); + + b.Navigation("TableOfContents"); + + b.Navigation("UserPreferences"); + + b.Navigation("UserRoles"); + + b.Navigation("WantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Navigation("ExternalRatings"); + + b.Navigation("ExternalReviews"); + + b.Navigation("Files"); + + b.Navigation("People"); + + b.Navigation("Ratings"); + + b.Navigation("UserProgress"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Navigation("Folders"); + + b.Navigation("LibraryExcludePatterns"); + + b.Navigation("LibraryFileTypes"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Navigation("People"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Navigation("FieldMappings"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Navigation("Aliases"); + + b.Navigation("ChapterPeople"); + + b.Navigation("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Navigation("ExternalSeriesMetadata"); + + b.Navigation("Metadata"); + + b.Navigation("Progress"); + + b.Navigation("Ratings"); + + b.Navigation("RelationOf"); + + b.Navigation("Relations"); + + b.Navigation("Volumes"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Navigation("Chapters"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/API/Data/Migrations/20250519151126_KoreaderHash.cs b/API/Data/Migrations/20250519151126_KoreaderHash.cs new file mode 100644 index 000000000..006070b72 --- /dev/null +++ b/API/Data/Migrations/20250519151126_KoreaderHash.cs @@ -0,0 +1,28 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace API.Data.Migrations +{ + /// + public partial class KoreaderHash : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "KoreaderHash", + table: "MangaFile", + type: "TEXT", + nullable: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "KoreaderHash", + table: "MangaFile"); + } + } +} diff --git a/API/Data/Migrations/20250601200056_ReadingProfiles.Designer.cs b/API/Data/Migrations/20250601200056_ReadingProfiles.Designer.cs new file mode 100644 index 000000000..762eae142 --- /dev/null +++ b/API/Data/Migrations/20250601200056_ReadingProfiles.Designer.cs @@ -0,0 +1,3698 @@ +// +using System; +using API.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace API.Data.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20250601200056_ReadingProfiles")] + partial class ReadingProfiles + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "9.0.4"); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AccessFailedCount") + .HasColumnType("INTEGER"); + + b.Property("AgeRestriction") + .HasColumnType("INTEGER"); + + b.Property("AgeRestrictionIncludeUnknowns") + .HasColumnType("INTEGER"); + + b.Property("AniListAccessToken") + .HasColumnType("TEXT"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("ConfirmationToken") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("EmailConfirmed") + .HasColumnType("INTEGER"); + + b.Property("HasRunScrobbleEventGeneration") + .HasColumnType("INTEGER"); + + b.Property("LastActive") + .HasColumnType("TEXT"); + + b.Property("LastActiveUtc") + .HasColumnType("TEXT"); + + b.Property("LockoutEnabled") + .HasColumnType("INTEGER"); + + b.Property("LockoutEnd") + .HasColumnType("TEXT"); + + b.Property("MalAccessToken") + .HasColumnType("TEXT"); + + b.Property("MalUserName") + .HasColumnType("TEXT"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("PasswordHash") + .HasColumnType("TEXT"); + + b.Property("PhoneNumber") + .HasColumnType("TEXT"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventGenerationRan") + .HasColumnType("TEXT"); + + b.Property("SecurityStamp") + .HasColumnType("TEXT"); + + b.Property("TwoFactorEnabled") + .HasColumnType("INTEGER"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Page") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserBookmark"); + }); + + modelBuilder.Entity("API.Entities.AppUserChapterRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserChapterRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastSyncUtc") + .HasColumnType("TEXT"); + + b.Property("MissingSeriesFromSource") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.Property("SourceUrl") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TotalSourceCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserCollection"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(4); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserDashboardStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Host") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserExternalSource"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserOnDeckRemoval"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowAutomaticWebtoonReaderDetection") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AniListScrobblingEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BlurUnreadSummaries") + .HasColumnType("INTEGER"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("CollapseSeriesRelationships") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("GlobalPageLayoutMode") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("Locale") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("en"); + + b.Property("NoTransitions") + .HasColumnType("INTEGER"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("PromptForDownloadSize") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("ShareReviews") + .HasColumnType("INTEGER"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("ThemeId") + .HasColumnType("INTEGER"); + + b.Property("WantToReadSync") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.HasKey("Id"); + + b.HasIndex("AppUserId") + .IsUnique(); + + b.HasIndex("ThemeId"); + + b.ToTable("AppUserPreferences"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PagesRead") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserProgresses"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserReadingProfile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowAutomaticWebtoonReaderDetection") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("Kind") + .HasColumnType("INTEGER"); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("LibraryIds") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.PrimitiveCollection("SeriesIds") + .HasColumnType("TEXT"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("WidthOverride") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserReadingProfiles"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSourceId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(5); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserSideNavStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Filter") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserSmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PageNumber") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserTableOfContent"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserWantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("AlternateCount") + .HasColumnType("INTEGER"); + + b.Property("AlternateNumber") + .HasColumnType("TEXT"); + + b.Property("AlternateSeries") + .HasColumnType("TEXT"); + + b.Property("AverageExternalRating") + .HasColumnType("REAL"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("Count") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ISBN") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("ISBNLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("IsSpecial") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Number") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("Range") + .HasColumnType("TEXT"); + + b.Property("ReleaseDate") + .HasColumnType("TEXT"); + + b.Property("ReleaseDateLocked") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesGroup") + .HasColumnType("TEXT"); + + b.Property("SortOrder") + .HasColumnType("REAL"); + + b.Property("SortOrderLocked") + .HasColumnType("INTEGER"); + + b.Property("StoryArc") + .HasColumnType("TEXT"); + + b.Property("StoryArcNumber") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TitleName") + .HasColumnType("TEXT"); + + b.Property("TitleNameLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("VolumeId"); + + b.ToTable("Chapter"); + }); + + modelBuilder.Entity("API.Entities.CollectionTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Id", "Promoted") + .IsUnique(); + + b.ToTable("CollectionTag"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EmailAddress") + .HasColumnType("TEXT"); + + b.Property("IpAddress") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastUsed") + .HasColumnType("TEXT"); + + b.Property("LastUsedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Platform") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("Device"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DeliveryStatus") + .HasColumnType("TEXT"); + + b.Property("EmailTemplate") + .HasColumnType("TEXT"); + + b.Property("ErrorMessage") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SendDate") + .HasColumnType("TEXT"); + + b.Property("Sent") + .HasColumnType("INTEGER"); + + b.Property("Subject") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("Sent", "AppUserId", "EmailTemplate", "SendDate"); + + b.ToTable("EmailHistory"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Path") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("FolderPath"); + }); + + modelBuilder.Entity("API.Entities.Genre", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Genre"); + }); + + modelBuilder.Entity("API.Entities.History.ManualMigrationHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("ProductVersion") + .HasColumnType("TEXT"); + + b.Property("RanAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ManualMigrationHistory"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowMetadataMatching") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AllowScrobbling") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FolderWatching") + .HasColumnType("INTEGER"); + + b.Property("IncludeInDashboard") + .HasColumnType("INTEGER"); + + b.Property("IncludeInRecommended") + .HasColumnType("INTEGER"); + + b.Property("IncludeInSearch") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("ManageCollections") + .HasColumnType("INTEGER"); + + b.Property("ManageReadingLists") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Pattern") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryExcludePattern"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("FileTypeGroup") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryFileTypeGroup"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Bytes") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("LastFileAnalysis") + .HasColumnType("TEXT"); + + b.Property("LastFileAnalysisUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("MangaFile"); + }); + + modelBuilder.Entity("API.Entities.MediaError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MediaError"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Authority") + .HasColumnType("INTEGER"); + + b.Property("AverageScore") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("FavoriteCount") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ProviderUrl") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("ExternalRating"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRecommendation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("CoverUrl") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Url") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("ExternalRecommendation"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Authority") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("BodyJustText") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("INTEGER"); + + b.Property("RawBody") + .HasColumnType("TEXT"); + + b.Property("Score") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("SiteUrl") + .HasColumnType("TEXT"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.Property("TotalVotes") + .HasColumnType("INTEGER"); + + b.Property("Username") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("ExternalReview"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AverageExternalRating") + .HasColumnType("INTEGER"); + + b.Property("CbrId") + .HasColumnType("INTEGER"); + + b.Property("GoogleBooksId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("ValidUntilUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.ToTable("ExternalSeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastChecked") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("SeriesBlacklist"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxCount") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatusLocked") + .HasColumnType("INTEGER"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYear") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYearLocked") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.HasIndex("Id", "SeriesId") + .IsUnique(); + + b.ToTable("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("RelationKind") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("TargetSeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.HasIndex("TargetSeriesId"); + + b.ToTable("SeriesRelation"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("DestinationType") + .HasColumnType("INTEGER"); + + b.Property("DestinationValue") + .HasColumnType("TEXT"); + + b.Property("ExcludeFromSource") + .HasColumnType("INTEGER"); + + b.Property("MetadataSettingsId") + .HasColumnType("INTEGER"); + + b.Property("SourceType") + .HasColumnType("INTEGER"); + + b.Property("SourceValue") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("MetadataSettingsId"); + + b.ToTable("MetadataFieldMapping"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRatingMappings") + .HasColumnType("TEXT"); + + b.Property("Blacklist") + .HasColumnType("TEXT"); + + b.Property("EnableChapterCoverImage") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterPublisher") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterReleaseDate") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterTitle") + .HasColumnType("INTEGER"); + + b.Property("EnableCoverImage") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("EnableGenres") + .HasColumnType("INTEGER"); + + b.Property("EnableLocalizedName") + .HasColumnType("INTEGER"); + + b.Property("EnablePeople") + .HasColumnType("INTEGER"); + + b.Property("EnablePublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("EnableRelationships") + .HasColumnType("INTEGER"); + + b.Property("EnableStartDate") + .HasColumnType("INTEGER"); + + b.Property("EnableSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableTags") + .HasColumnType("INTEGER"); + + b.Property("Enabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("FirstLastPeopleNaming") + .HasColumnType("INTEGER"); + + b.Property("Overrides") + .HasColumnType("TEXT"); + + b.PrimitiveCollection("PersonRoles") + .HasColumnType("TEXT"); + + b.Property("Whitelist") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .HasColumnType("INTEGER"); + + b.HasKey("ChapterId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("ChapterPeople"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("Asin") + .HasColumnType("TEXT"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("HardcoverId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.PersonAlias", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Alias") + .HasColumnType("TEXT"); + + b.Property("NormalizedAlias") + .HasColumnType("TEXT"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("PersonId"); + + b.ToTable("PersonAlias"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.Property("SeriesMetadataId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.HasKey("SeriesMetadataId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EndingMonth") + .HasColumnType("INTEGER"); + + b.Property("EndingYear") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("StartingMonth") + .HasColumnType("INTEGER"); + + b.Property("StartingYear") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("ReadingList"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("ReadingListId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.HasIndex("ReadingListId"); + + b.HasIndex("SeriesId"); + + b.HasIndex("VolumeId"); + + b.ToTable("ReadingListItem"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId1") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ScrobbleEventId1"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleError"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterNumber") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("ErrorDetails") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsErrored") + .HasColumnType("INTEGER"); + + b.Property("IsProcessed") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("ProcessDateUtc") + .HasColumnType("TEXT"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("ReviewBody") + .HasColumnType("TEXT"); + + b.Property("ReviewTitle") + .HasColumnType("TEXT"); + + b.Property("ScrobbleEventType") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeNumber") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("LibraryId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleEvent"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleHold"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DontMatch") + .HasColumnType("INTEGER"); + + b.Property("FolderPath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsBlacklisted") + .HasColumnType("INTEGER"); + + b.Property("LastChapterAdded") + .HasColumnType("TEXT"); + + b.Property("LastChapterAddedUtc") + .HasColumnType("TEXT"); + + b.Property("LastFolderScanned") + .HasColumnType("TEXT"); + + b.Property("LastFolderScannedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("LocalizedName") + .HasColumnType("TEXT"); + + b.Property("LocalizedNameLocked") + .HasColumnType("INTEGER"); + + b.Property("LowestFolderPath") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedLocalizedName") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("OriginalName") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SortName") + .HasColumnType("TEXT"); + + b.Property("SortNameLocked") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("Series"); + }); + + modelBuilder.Entity("API.Entities.ServerSetting", b => + { + b.Property("Key") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.ToTable("ServerSetting"); + }); + + modelBuilder.Entity("API.Entities.ServerStatistics", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterCount") + .HasColumnType("INTEGER"); + + b.Property("FileCount") + .HasColumnType("INTEGER"); + + b.Property("GenreCount") + .HasColumnType("INTEGER"); + + b.Property("PersonCount") + .HasColumnType("INTEGER"); + + b.Property("SeriesCount") + .HasColumnType("INTEGER"); + + b.Property("TagCount") + .HasColumnType("INTEGER"); + + b.Property("UserCount") + .HasColumnType("INTEGER"); + + b.Property("VolumeCount") + .HasColumnType("INTEGER"); + + b.Property("Year") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ServerStatistics"); + }); + + modelBuilder.Entity("API.Entities.SiteTheme", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Author") + .HasColumnType("TEXT"); + + b.Property("CompatibleVersion") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("GitHubPath") + .HasColumnType("TEXT"); + + b.Property("IsDefault") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PreviewUrls") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ShaHash") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("SiteTheme"); + }); + + modelBuilder.Entity("API.Entities.Tag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Tag"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LookupName") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Number") + .HasColumnType("INTEGER"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("Volume"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.Property("CollectionsId") + .HasColumnType("INTEGER"); + + b.Property("ItemsId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionsId", "ItemsId"); + + b.HasIndex("ItemsId"); + + b.ToTable("AppUserCollectionSeries"); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.Property("AppUsersId") + .HasColumnType("INTEGER"); + + b.Property("LibrariesId") + .HasColumnType("INTEGER"); + + b.HasKey("AppUsersId", "LibrariesId"); + + b.HasIndex("LibrariesId"); + + b.ToTable("AppUserLibrary"); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "GenresId"); + + b.HasIndex("GenresId"); + + b.ToTable("ChapterGenre"); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("ChapterTag"); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.Property("CollectionTagsId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionTagsId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("CollectionTagSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.Property("ExternalRatingsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRatingsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRatingExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.Property("ExternalRecommendationsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRecommendationsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRecommendationExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.Property("ExternalReviewsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalReviewsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalReviewExternalSeriesMetadata"); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("GenresId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("GenreSeriesMetadata"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("ProviderKey") + .HasColumnType("TEXT"); + + b.Property("ProviderDisplayName") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("SeriesMetadatasId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("SeriesMetadataTag"); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Bookmarks") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserChapterRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ChapterRatings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Ratings") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Collections") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("DashboardStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ExternalSources") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithOne("UserPreferences") + .HasForeignKey("API.Entities.AppUserPreferences", "AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.SiteTheme", "Theme") + .WithMany() + .HasForeignKey("ThemeId"); + + b.Navigation("AppUser"); + + b.Navigation("Theme"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Progresses") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", null) + .WithMany("UserProgress") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany("Progress") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Ratings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany("Ratings") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserReadingProfile", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingProfiles") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.HasOne("API.Entities.AppRole", "Role") + .WithMany("UserRoles") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUser", "User") + .WithMany("UserRoles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SideNavStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SmartFilters") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("TableOfContents") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("WantToRead") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.HasOne("API.Entities.Volume", "Volume") + .WithMany("Chapters") + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Devices") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Folders") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryExcludePatterns") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryFileTypes") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Files") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany("ExternalRatings") + .HasForeignKey("ChapterId"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany("ExternalReviews") + .HasForeignKey("ChapterId"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("ExternalSeriesMetadata") + .HasForeignKey("API.Entities.Metadata.ExternalSeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("Metadata") + .HasForeignKey("API.Entities.Metadata.SeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Relations") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "TargetSeries") + .WithMany("RelationOf") + .HasForeignKey("TargetSeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + + b.Navigation("TargetSeries"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.HasOne("API.Entities.MetadataMatching.MetadataSettings", "MetadataSettings") + .WithMany("FieldMappings") + .HasForeignKey("MetadataSettingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("People") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("ChapterPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.PersonAlias", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("Aliases") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("SeriesMetadataPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", "SeriesMetadata") + .WithMany("People") + .HasForeignKey("SeriesMetadataId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + + b.Navigation("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingLists") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.ReadingList", "ReadingList") + .WithMany("Items") + .HasForeignKey("ReadingListId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Volume", "Volume") + .WithMany() + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("ReadingList"); + + b.Navigation("Series"); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.HasOne("API.Entities.Scrobble.ScrobbleEvent", "ScrobbleEvent") + .WithMany() + .HasForeignKey("ScrobbleEventId1"); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ScrobbleEvent"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", "Library") + .WithMany() + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Library"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ScrobbleHolds") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Series") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Volumes") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.HasOne("API.Entities.AppUserCollection", null) + .WithMany() + .HasForeignKey("CollectionsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany() + .HasForeignKey("ItemsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("AppUsersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", null) + .WithMany() + .HasForeignKey("LibrariesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.HasOne("API.Entities.CollectionTag", null) + .WithMany() + .HasForeignKey("CollectionTagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRating", null) + .WithMany() + .HasForeignKey("ExternalRatingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRecommendation", null) + .WithMany() + .HasForeignKey("ExternalRecommendationsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalReview", null) + .WithMany() + .HasForeignKey("ExternalReviewsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("API.Entities.AppRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Navigation("UserRoles"); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Navigation("Bookmarks"); + + b.Navigation("ChapterRatings"); + + b.Navigation("Collections"); + + b.Navigation("DashboardStreams"); + + b.Navigation("Devices"); + + b.Navigation("ExternalSources"); + + b.Navigation("Progresses"); + + b.Navigation("Ratings"); + + b.Navigation("ReadingLists"); + + b.Navigation("ReadingProfiles"); + + b.Navigation("ScrobbleHolds"); + + b.Navigation("SideNavStreams"); + + b.Navigation("SmartFilters"); + + b.Navigation("TableOfContents"); + + b.Navigation("UserPreferences"); + + b.Navigation("UserRoles"); + + b.Navigation("WantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Navigation("ExternalRatings"); + + b.Navigation("ExternalReviews"); + + b.Navigation("Files"); + + b.Navigation("People"); + + b.Navigation("Ratings"); + + b.Navigation("UserProgress"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Navigation("Folders"); + + b.Navigation("LibraryExcludePatterns"); + + b.Navigation("LibraryFileTypes"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Navigation("People"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Navigation("FieldMappings"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Navigation("Aliases"); + + b.Navigation("ChapterPeople"); + + b.Navigation("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Navigation("ExternalSeriesMetadata"); + + b.Navigation("Metadata"); + + b.Navigation("Progress"); + + b.Navigation("Ratings"); + + b.Navigation("RelationOf"); + + b.Navigation("Relations"); + + b.Navigation("Volumes"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Navigation("Chapters"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/API/Data/Migrations/20250601200056_ReadingProfiles.cs b/API/Data/Migrations/20250601200056_ReadingProfiles.cs new file mode 100644 index 000000000..66b9e53e5 --- /dev/null +++ b/API/Data/Migrations/20250601200056_ReadingProfiles.cs @@ -0,0 +1,75 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace API.Data.Migrations +{ + /// + public partial class ReadingProfiles : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "AppUserReadingProfiles", + columns: table => new + { + Id = table.Column(type: "INTEGER", nullable: false) + .Annotation("Sqlite:Autoincrement", true), + Name = table.Column(type: "TEXT", nullable: true), + NormalizedName = table.Column(type: "TEXT", nullable: true), + AppUserId = table.Column(type: "INTEGER", nullable: false), + Kind = table.Column(type: "INTEGER", nullable: false), + LibraryIds = table.Column(type: "TEXT", nullable: true), + SeriesIds = table.Column(type: "TEXT", nullable: true), + ReadingDirection = table.Column(type: "INTEGER", nullable: false), + ScalingOption = table.Column(type: "INTEGER", nullable: false), + PageSplitOption = table.Column(type: "INTEGER", nullable: false), + ReaderMode = table.Column(type: "INTEGER", nullable: false), + AutoCloseMenu = table.Column(type: "INTEGER", nullable: false), + ShowScreenHints = table.Column(type: "INTEGER", nullable: false), + EmulateBook = table.Column(type: "INTEGER", nullable: false), + LayoutMode = table.Column(type: "INTEGER", nullable: false), + BackgroundColor = table.Column(type: "TEXT", nullable: true, defaultValue: "#000000"), + SwipeToPaginate = table.Column(type: "INTEGER", nullable: false), + AllowAutomaticWebtoonReaderDetection = table.Column(type: "INTEGER", nullable: false, defaultValue: true), + WidthOverride = table.Column(type: "INTEGER", nullable: true), + BookReaderMargin = table.Column(type: "INTEGER", nullable: false), + BookReaderLineSpacing = table.Column(type: "INTEGER", nullable: false), + BookReaderFontSize = table.Column(type: "INTEGER", nullable: false), + BookReaderFontFamily = table.Column(type: "TEXT", nullable: true), + BookReaderTapToPaginate = table.Column(type: "INTEGER", nullable: false), + BookReaderReadingDirection = table.Column(type: "INTEGER", nullable: false), + BookReaderWritingStyle = table.Column(type: "INTEGER", nullable: false, defaultValue: 0), + BookThemeName = table.Column(type: "TEXT", nullable: true, defaultValue: "Dark"), + BookReaderLayoutMode = table.Column(type: "INTEGER", nullable: false), + BookReaderImmersiveMode = table.Column(type: "INTEGER", nullable: false), + PdfTheme = table.Column(type: "INTEGER", nullable: false), + PdfScrollMode = table.Column(type: "INTEGER", nullable: false), + PdfSpreadMode = table.Column(type: "INTEGER", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_AppUserReadingProfiles", x => x.Id); + table.ForeignKey( + name: "FK_AppUserReadingProfiles_AspNetUsers_AppUserId", + column: x => x.AppUserId, + principalTable: "AspNetUsers", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_AppUserReadingProfiles_AppUserId", + table: "AppUserReadingProfiles", + column: "AppUserId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "AppUserReadingProfiles"); + } + } +} diff --git a/API/Data/Migrations/20250610210618_AppUserReadingProfileDisableWidthOverrideBreakPoint.Designer.cs b/API/Data/Migrations/20250610210618_AppUserReadingProfileDisableWidthOverrideBreakPoint.Designer.cs new file mode 100644 index 000000000..0e9f00b4e --- /dev/null +++ b/API/Data/Migrations/20250610210618_AppUserReadingProfileDisableWidthOverrideBreakPoint.Designer.cs @@ -0,0 +1,3701 @@ +// +using System; +using API.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace API.Data.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20250610210618_AppUserReadingProfileDisableWidthOverrideBreakPoint")] + partial class AppUserReadingProfileDisableWidthOverrideBreakPoint + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "9.0.4"); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AccessFailedCount") + .HasColumnType("INTEGER"); + + b.Property("AgeRestriction") + .HasColumnType("INTEGER"); + + b.Property("AgeRestrictionIncludeUnknowns") + .HasColumnType("INTEGER"); + + b.Property("AniListAccessToken") + .HasColumnType("TEXT"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("ConfirmationToken") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("EmailConfirmed") + .HasColumnType("INTEGER"); + + b.Property("HasRunScrobbleEventGeneration") + .HasColumnType("INTEGER"); + + b.Property("LastActive") + .HasColumnType("TEXT"); + + b.Property("LastActiveUtc") + .HasColumnType("TEXT"); + + b.Property("LockoutEnabled") + .HasColumnType("INTEGER"); + + b.Property("LockoutEnd") + .HasColumnType("TEXT"); + + b.Property("MalAccessToken") + .HasColumnType("TEXT"); + + b.Property("MalUserName") + .HasColumnType("TEXT"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("PasswordHash") + .HasColumnType("TEXT"); + + b.Property("PhoneNumber") + .HasColumnType("TEXT"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventGenerationRan") + .HasColumnType("TEXT"); + + b.Property("SecurityStamp") + .HasColumnType("TEXT"); + + b.Property("TwoFactorEnabled") + .HasColumnType("INTEGER"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Page") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserBookmark"); + }); + + modelBuilder.Entity("API.Entities.AppUserChapterRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserChapterRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastSyncUtc") + .HasColumnType("TEXT"); + + b.Property("MissingSeriesFromSource") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.Property("SourceUrl") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TotalSourceCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserCollection"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(4); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserDashboardStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Host") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserExternalSource"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserOnDeckRemoval"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowAutomaticWebtoonReaderDetection") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AniListScrobblingEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BlurUnreadSummaries") + .HasColumnType("INTEGER"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("CollapseSeriesRelationships") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("GlobalPageLayoutMode") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("Locale") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("en"); + + b.Property("NoTransitions") + .HasColumnType("INTEGER"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("PromptForDownloadSize") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("ShareReviews") + .HasColumnType("INTEGER"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("ThemeId") + .HasColumnType("INTEGER"); + + b.Property("WantToReadSync") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.HasKey("Id"); + + b.HasIndex("AppUserId") + .IsUnique(); + + b.HasIndex("ThemeId"); + + b.ToTable("AppUserPreferences"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PagesRead") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserProgresses"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserReadingProfile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowAutomaticWebtoonReaderDetection") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("DisableWidthOverride") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("Kind") + .HasColumnType("INTEGER"); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("LibraryIds") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("SeriesIds") + .HasColumnType("TEXT"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("WidthOverride") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserReadingProfiles"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSourceId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(5); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserSideNavStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Filter") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserSmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PageNumber") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserTableOfContent"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserWantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("AlternateCount") + .HasColumnType("INTEGER"); + + b.Property("AlternateNumber") + .HasColumnType("TEXT"); + + b.Property("AlternateSeries") + .HasColumnType("TEXT"); + + b.Property("AverageExternalRating") + .HasColumnType("REAL"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("Count") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ISBN") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("ISBNLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("IsSpecial") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Number") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("Range") + .HasColumnType("TEXT"); + + b.Property("ReleaseDate") + .HasColumnType("TEXT"); + + b.Property("ReleaseDateLocked") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesGroup") + .HasColumnType("TEXT"); + + b.Property("SortOrder") + .HasColumnType("REAL"); + + b.Property("SortOrderLocked") + .HasColumnType("INTEGER"); + + b.Property("StoryArc") + .HasColumnType("TEXT"); + + b.Property("StoryArcNumber") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TitleName") + .HasColumnType("TEXT"); + + b.Property("TitleNameLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("VolumeId"); + + b.ToTable("Chapter"); + }); + + modelBuilder.Entity("API.Entities.CollectionTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Id", "Promoted") + .IsUnique(); + + b.ToTable("CollectionTag"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EmailAddress") + .HasColumnType("TEXT"); + + b.Property("IpAddress") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastUsed") + .HasColumnType("TEXT"); + + b.Property("LastUsedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Platform") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("Device"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DeliveryStatus") + .HasColumnType("TEXT"); + + b.Property("EmailTemplate") + .HasColumnType("TEXT"); + + b.Property("ErrorMessage") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SendDate") + .HasColumnType("TEXT"); + + b.Property("Sent") + .HasColumnType("INTEGER"); + + b.Property("Subject") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("Sent", "AppUserId", "EmailTemplate", "SendDate"); + + b.ToTable("EmailHistory"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Path") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("FolderPath"); + }); + + modelBuilder.Entity("API.Entities.Genre", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Genre"); + }); + + modelBuilder.Entity("API.Entities.History.ManualMigrationHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("ProductVersion") + .HasColumnType("TEXT"); + + b.Property("RanAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ManualMigrationHistory"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowMetadataMatching") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AllowScrobbling") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FolderWatching") + .HasColumnType("INTEGER"); + + b.Property("IncludeInDashboard") + .HasColumnType("INTEGER"); + + b.Property("IncludeInRecommended") + .HasColumnType("INTEGER"); + + b.Property("IncludeInSearch") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("ManageCollections") + .HasColumnType("INTEGER"); + + b.Property("ManageReadingLists") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Pattern") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryExcludePattern"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("FileTypeGroup") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryFileTypeGroup"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Bytes") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("LastFileAnalysis") + .HasColumnType("TEXT"); + + b.Property("LastFileAnalysisUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("MangaFile"); + }); + + modelBuilder.Entity("API.Entities.MediaError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MediaError"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Authority") + .HasColumnType("INTEGER"); + + b.Property("AverageScore") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("FavoriteCount") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ProviderUrl") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("ExternalRating"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRecommendation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("CoverUrl") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Url") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("ExternalRecommendation"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Authority") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("BodyJustText") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("INTEGER"); + + b.Property("RawBody") + .HasColumnType("TEXT"); + + b.Property("Score") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("SiteUrl") + .HasColumnType("TEXT"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.Property("TotalVotes") + .HasColumnType("INTEGER"); + + b.Property("Username") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("ExternalReview"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AverageExternalRating") + .HasColumnType("INTEGER"); + + b.Property("CbrId") + .HasColumnType("INTEGER"); + + b.Property("GoogleBooksId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("ValidUntilUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.ToTable("ExternalSeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastChecked") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("SeriesBlacklist"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxCount") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatusLocked") + .HasColumnType("INTEGER"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYear") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYearLocked") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.HasIndex("Id", "SeriesId") + .IsUnique(); + + b.ToTable("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("RelationKind") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("TargetSeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.HasIndex("TargetSeriesId"); + + b.ToTable("SeriesRelation"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("DestinationType") + .HasColumnType("INTEGER"); + + b.Property("DestinationValue") + .HasColumnType("TEXT"); + + b.Property("ExcludeFromSource") + .HasColumnType("INTEGER"); + + b.Property("MetadataSettingsId") + .HasColumnType("INTEGER"); + + b.Property("SourceType") + .HasColumnType("INTEGER"); + + b.Property("SourceValue") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("MetadataSettingsId"); + + b.ToTable("MetadataFieldMapping"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRatingMappings") + .HasColumnType("TEXT"); + + b.Property("Blacklist") + .HasColumnType("TEXT"); + + b.Property("EnableChapterCoverImage") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterPublisher") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterReleaseDate") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterTitle") + .HasColumnType("INTEGER"); + + b.Property("EnableCoverImage") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("EnableGenres") + .HasColumnType("INTEGER"); + + b.Property("EnableLocalizedName") + .HasColumnType("INTEGER"); + + b.Property("EnablePeople") + .HasColumnType("INTEGER"); + + b.Property("EnablePublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("EnableRelationships") + .HasColumnType("INTEGER"); + + b.Property("EnableStartDate") + .HasColumnType("INTEGER"); + + b.Property("EnableSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableTags") + .HasColumnType("INTEGER"); + + b.Property("Enabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("FirstLastPeopleNaming") + .HasColumnType("INTEGER"); + + b.Property("Overrides") + .HasColumnType("TEXT"); + + b.PrimitiveCollection("PersonRoles") + .HasColumnType("TEXT"); + + b.Property("Whitelist") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .HasColumnType("INTEGER"); + + b.HasKey("ChapterId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("ChapterPeople"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("Asin") + .HasColumnType("TEXT"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("HardcoverId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.PersonAlias", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Alias") + .HasColumnType("TEXT"); + + b.Property("NormalizedAlias") + .HasColumnType("TEXT"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("PersonId"); + + b.ToTable("PersonAlias"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.Property("SeriesMetadataId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.HasKey("SeriesMetadataId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EndingMonth") + .HasColumnType("INTEGER"); + + b.Property("EndingYear") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("StartingMonth") + .HasColumnType("INTEGER"); + + b.Property("StartingYear") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("ReadingList"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("ReadingListId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.HasIndex("ReadingListId"); + + b.HasIndex("SeriesId"); + + b.HasIndex("VolumeId"); + + b.ToTable("ReadingListItem"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId1") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ScrobbleEventId1"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleError"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterNumber") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("ErrorDetails") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsErrored") + .HasColumnType("INTEGER"); + + b.Property("IsProcessed") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("ProcessDateUtc") + .HasColumnType("TEXT"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("ReviewBody") + .HasColumnType("TEXT"); + + b.Property("ReviewTitle") + .HasColumnType("TEXT"); + + b.Property("ScrobbleEventType") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeNumber") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("LibraryId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleEvent"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleHold"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DontMatch") + .HasColumnType("INTEGER"); + + b.Property("FolderPath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsBlacklisted") + .HasColumnType("INTEGER"); + + b.Property("LastChapterAdded") + .HasColumnType("TEXT"); + + b.Property("LastChapterAddedUtc") + .HasColumnType("TEXT"); + + b.Property("LastFolderScanned") + .HasColumnType("TEXT"); + + b.Property("LastFolderScannedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("LocalizedName") + .HasColumnType("TEXT"); + + b.Property("LocalizedNameLocked") + .HasColumnType("INTEGER"); + + b.Property("LowestFolderPath") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedLocalizedName") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("OriginalName") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SortName") + .HasColumnType("TEXT"); + + b.Property("SortNameLocked") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("Series"); + }); + + modelBuilder.Entity("API.Entities.ServerSetting", b => + { + b.Property("Key") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.ToTable("ServerSetting"); + }); + + modelBuilder.Entity("API.Entities.ServerStatistics", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterCount") + .HasColumnType("INTEGER"); + + b.Property("FileCount") + .HasColumnType("INTEGER"); + + b.Property("GenreCount") + .HasColumnType("INTEGER"); + + b.Property("PersonCount") + .HasColumnType("INTEGER"); + + b.Property("SeriesCount") + .HasColumnType("INTEGER"); + + b.Property("TagCount") + .HasColumnType("INTEGER"); + + b.Property("UserCount") + .HasColumnType("INTEGER"); + + b.Property("VolumeCount") + .HasColumnType("INTEGER"); + + b.Property("Year") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ServerStatistics"); + }); + + modelBuilder.Entity("API.Entities.SiteTheme", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Author") + .HasColumnType("TEXT"); + + b.Property("CompatibleVersion") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("GitHubPath") + .HasColumnType("TEXT"); + + b.Property("IsDefault") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PreviewUrls") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ShaHash") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("SiteTheme"); + }); + + modelBuilder.Entity("API.Entities.Tag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Tag"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LookupName") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Number") + .HasColumnType("INTEGER"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("Volume"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.Property("CollectionsId") + .HasColumnType("INTEGER"); + + b.Property("ItemsId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionsId", "ItemsId"); + + b.HasIndex("ItemsId"); + + b.ToTable("AppUserCollectionSeries"); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.Property("AppUsersId") + .HasColumnType("INTEGER"); + + b.Property("LibrariesId") + .HasColumnType("INTEGER"); + + b.HasKey("AppUsersId", "LibrariesId"); + + b.HasIndex("LibrariesId"); + + b.ToTable("AppUserLibrary"); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "GenresId"); + + b.HasIndex("GenresId"); + + b.ToTable("ChapterGenre"); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("ChapterTag"); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.Property("CollectionTagsId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionTagsId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("CollectionTagSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.Property("ExternalRatingsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRatingsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRatingExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.Property("ExternalRecommendationsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRecommendationsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRecommendationExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.Property("ExternalReviewsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalReviewsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalReviewExternalSeriesMetadata"); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("GenresId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("GenreSeriesMetadata"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("ProviderKey") + .HasColumnType("TEXT"); + + b.Property("ProviderDisplayName") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("SeriesMetadatasId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("SeriesMetadataTag"); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Bookmarks") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserChapterRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ChapterRatings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Ratings") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Collections") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("DashboardStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ExternalSources") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithOne("UserPreferences") + .HasForeignKey("API.Entities.AppUserPreferences", "AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.SiteTheme", "Theme") + .WithMany() + .HasForeignKey("ThemeId"); + + b.Navigation("AppUser"); + + b.Navigation("Theme"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Progresses") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", null) + .WithMany("UserProgress") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany("Progress") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Ratings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany("Ratings") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserReadingProfile", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingProfiles") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.HasOne("API.Entities.AppRole", "Role") + .WithMany("UserRoles") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUser", "User") + .WithMany("UserRoles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SideNavStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SmartFilters") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("TableOfContents") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("WantToRead") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.HasOne("API.Entities.Volume", "Volume") + .WithMany("Chapters") + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Devices") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Folders") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryExcludePatterns") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryFileTypes") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Files") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany("ExternalRatings") + .HasForeignKey("ChapterId"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany("ExternalReviews") + .HasForeignKey("ChapterId"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("ExternalSeriesMetadata") + .HasForeignKey("API.Entities.Metadata.ExternalSeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("Metadata") + .HasForeignKey("API.Entities.Metadata.SeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Relations") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "TargetSeries") + .WithMany("RelationOf") + .HasForeignKey("TargetSeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + + b.Navigation("TargetSeries"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.HasOne("API.Entities.MetadataMatching.MetadataSettings", "MetadataSettings") + .WithMany("FieldMappings") + .HasForeignKey("MetadataSettingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("People") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("ChapterPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.PersonAlias", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("Aliases") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("SeriesMetadataPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", "SeriesMetadata") + .WithMany("People") + .HasForeignKey("SeriesMetadataId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + + b.Navigation("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingLists") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.ReadingList", "ReadingList") + .WithMany("Items") + .HasForeignKey("ReadingListId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Volume", "Volume") + .WithMany() + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("ReadingList"); + + b.Navigation("Series"); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.HasOne("API.Entities.Scrobble.ScrobbleEvent", "ScrobbleEvent") + .WithMany() + .HasForeignKey("ScrobbleEventId1"); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ScrobbleEvent"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", "Library") + .WithMany() + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Library"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ScrobbleHolds") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Series") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Volumes") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.HasOne("API.Entities.AppUserCollection", null) + .WithMany() + .HasForeignKey("CollectionsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany() + .HasForeignKey("ItemsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("AppUsersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", null) + .WithMany() + .HasForeignKey("LibrariesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.HasOne("API.Entities.CollectionTag", null) + .WithMany() + .HasForeignKey("CollectionTagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRating", null) + .WithMany() + .HasForeignKey("ExternalRatingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRecommendation", null) + .WithMany() + .HasForeignKey("ExternalRecommendationsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalReview", null) + .WithMany() + .HasForeignKey("ExternalReviewsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("API.Entities.AppRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Navigation("UserRoles"); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Navigation("Bookmarks"); + + b.Navigation("ChapterRatings"); + + b.Navigation("Collections"); + + b.Navigation("DashboardStreams"); + + b.Navigation("Devices"); + + b.Navigation("ExternalSources"); + + b.Navigation("Progresses"); + + b.Navigation("Ratings"); + + b.Navigation("ReadingLists"); + + b.Navigation("ReadingProfiles"); + + b.Navigation("ScrobbleHolds"); + + b.Navigation("SideNavStreams"); + + b.Navigation("SmartFilters"); + + b.Navigation("TableOfContents"); + + b.Navigation("UserPreferences"); + + b.Navigation("UserRoles"); + + b.Navigation("WantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Navigation("ExternalRatings"); + + b.Navigation("ExternalReviews"); + + b.Navigation("Files"); + + b.Navigation("People"); + + b.Navigation("Ratings"); + + b.Navigation("UserProgress"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Navigation("Folders"); + + b.Navigation("LibraryExcludePatterns"); + + b.Navigation("LibraryFileTypes"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Navigation("People"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Navigation("FieldMappings"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Navigation("Aliases"); + + b.Navigation("ChapterPeople"); + + b.Navigation("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Navigation("ExternalSeriesMetadata"); + + b.Navigation("Metadata"); + + b.Navigation("Progress"); + + b.Navigation("Ratings"); + + b.Navigation("RelationOf"); + + b.Navigation("Relations"); + + b.Navigation("Volumes"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Navigation("Chapters"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/API/Data/Migrations/20250610210618_AppUserReadingProfileDisableWidthOverrideBreakPoint.cs b/API/Data/Migrations/20250610210618_AppUserReadingProfileDisableWidthOverrideBreakPoint.cs new file mode 100644 index 000000000..11a554bdf --- /dev/null +++ b/API/Data/Migrations/20250610210618_AppUserReadingProfileDisableWidthOverrideBreakPoint.cs @@ -0,0 +1,29 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace API.Data.Migrations +{ + /// + public partial class AppUserReadingProfileDisableWidthOverrideBreakPoint : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "DisableWidthOverride", + table: "AppUserReadingProfiles", + type: "INTEGER", + nullable: false, + defaultValue: 0); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "DisableWidthOverride", + table: "AppUserReadingProfiles"); + } + } +} diff --git a/API/Data/Migrations/20250620215058_EnableMetadataLibrary.Designer.cs b/API/Data/Migrations/20250620215058_EnableMetadataLibrary.Designer.cs new file mode 100644 index 000000000..c15f9f77b --- /dev/null +++ b/API/Data/Migrations/20250620215058_EnableMetadataLibrary.Designer.cs @@ -0,0 +1,3709 @@ +// +using System; +using API.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace API.Data.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20250620215058_EnableMetadataLibrary")] + partial class EnableMetadataLibrary + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "9.0.6"); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AccessFailedCount") + .HasColumnType("INTEGER"); + + b.Property("AgeRestriction") + .HasColumnType("INTEGER"); + + b.Property("AgeRestrictionIncludeUnknowns") + .HasColumnType("INTEGER"); + + b.Property("AniListAccessToken") + .HasColumnType("TEXT"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("ConfirmationToken") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("EmailConfirmed") + .HasColumnType("INTEGER"); + + b.Property("HasRunScrobbleEventGeneration") + .HasColumnType("INTEGER"); + + b.Property("LastActive") + .HasColumnType("TEXT"); + + b.Property("LastActiveUtc") + .HasColumnType("TEXT"); + + b.Property("LockoutEnabled") + .HasColumnType("INTEGER"); + + b.Property("LockoutEnd") + .HasColumnType("TEXT"); + + b.Property("MalAccessToken") + .HasColumnType("TEXT"); + + b.Property("MalUserName") + .HasColumnType("TEXT"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("PasswordHash") + .HasColumnType("TEXT"); + + b.Property("PhoneNumber") + .HasColumnType("TEXT"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventGenerationRan") + .HasColumnType("TEXT"); + + b.Property("SecurityStamp") + .HasColumnType("TEXT"); + + b.Property("TwoFactorEnabled") + .HasColumnType("INTEGER"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Page") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserBookmark"); + }); + + modelBuilder.Entity("API.Entities.AppUserChapterRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserChapterRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastSyncUtc") + .HasColumnType("TEXT"); + + b.Property("MissingSeriesFromSource") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.Property("SourceUrl") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TotalSourceCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserCollection"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(4); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserDashboardStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Host") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserExternalSource"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserOnDeckRemoval"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowAutomaticWebtoonReaderDetection") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AniListScrobblingEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BlurUnreadSummaries") + .HasColumnType("INTEGER"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("CollapseSeriesRelationships") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("GlobalPageLayoutMode") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("Locale") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("en"); + + b.Property("NoTransitions") + .HasColumnType("INTEGER"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("PromptForDownloadSize") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("ShareReviews") + .HasColumnType("INTEGER"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("ThemeId") + .HasColumnType("INTEGER"); + + b.Property("WantToReadSync") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.HasKey("Id"); + + b.HasIndex("AppUserId") + .IsUnique(); + + b.HasIndex("ThemeId"); + + b.ToTable("AppUserPreferences"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PagesRead") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserProgresses"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserReadingProfile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowAutomaticWebtoonReaderDetection") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("DisableWidthOverride") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("Kind") + .HasColumnType("INTEGER"); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("LibraryIds") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("SeriesIds") + .HasColumnType("TEXT"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("WidthOverride") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserReadingProfiles"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSourceId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(5); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserSideNavStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Filter") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserSmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PageNumber") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserTableOfContent"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserWantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("AlternateCount") + .HasColumnType("INTEGER"); + + b.Property("AlternateNumber") + .HasColumnType("TEXT"); + + b.Property("AlternateSeries") + .HasColumnType("TEXT"); + + b.Property("AverageExternalRating") + .HasColumnType("REAL"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("Count") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ISBN") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("ISBNLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("IsSpecial") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Number") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("Range") + .HasColumnType("TEXT"); + + b.Property("ReleaseDate") + .HasColumnType("TEXT"); + + b.Property("ReleaseDateLocked") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesGroup") + .HasColumnType("TEXT"); + + b.Property("SortOrder") + .HasColumnType("REAL"); + + b.Property("SortOrderLocked") + .HasColumnType("INTEGER"); + + b.Property("StoryArc") + .HasColumnType("TEXT"); + + b.Property("StoryArcNumber") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TitleName") + .HasColumnType("TEXT"); + + b.Property("TitleNameLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("VolumeId"); + + b.ToTable("Chapter"); + }); + + modelBuilder.Entity("API.Entities.CollectionTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Id", "Promoted") + .IsUnique(); + + b.ToTable("CollectionTag"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EmailAddress") + .HasColumnType("TEXT"); + + b.Property("IpAddress") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastUsed") + .HasColumnType("TEXT"); + + b.Property("LastUsedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Platform") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("Device"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DeliveryStatus") + .HasColumnType("TEXT"); + + b.Property("EmailTemplate") + .HasColumnType("TEXT"); + + b.Property("ErrorMessage") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SendDate") + .HasColumnType("TEXT"); + + b.Property("Sent") + .HasColumnType("INTEGER"); + + b.Property("Subject") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("Sent", "AppUserId", "EmailTemplate", "SendDate"); + + b.ToTable("EmailHistory"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Path") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("FolderPath"); + }); + + modelBuilder.Entity("API.Entities.Genre", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Genre"); + }); + + modelBuilder.Entity("API.Entities.History.ManualMigrationHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("ProductVersion") + .HasColumnType("TEXT"); + + b.Property("RanAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ManualMigrationHistory"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowMetadataMatching") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AllowScrobbling") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EnableMetadata") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("FolderWatching") + .HasColumnType("INTEGER"); + + b.Property("IncludeInDashboard") + .HasColumnType("INTEGER"); + + b.Property("IncludeInRecommended") + .HasColumnType("INTEGER"); + + b.Property("IncludeInSearch") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("ManageCollections") + .HasColumnType("INTEGER"); + + b.Property("ManageReadingLists") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Pattern") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryExcludePattern"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("FileTypeGroup") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryFileTypeGroup"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Bytes") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("KoreaderHash") + .HasColumnType("TEXT"); + + b.Property("LastFileAnalysis") + .HasColumnType("TEXT"); + + b.Property("LastFileAnalysisUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("MangaFile"); + }); + + modelBuilder.Entity("API.Entities.MediaError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MediaError"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Authority") + .HasColumnType("INTEGER"); + + b.Property("AverageScore") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("FavoriteCount") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ProviderUrl") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("ExternalRating"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRecommendation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("CoverUrl") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Url") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("ExternalRecommendation"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Authority") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("BodyJustText") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("INTEGER"); + + b.Property("RawBody") + .HasColumnType("TEXT"); + + b.Property("Score") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("SiteUrl") + .HasColumnType("TEXT"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.Property("TotalVotes") + .HasColumnType("INTEGER"); + + b.Property("Username") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("ExternalReview"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AverageExternalRating") + .HasColumnType("INTEGER"); + + b.Property("CbrId") + .HasColumnType("INTEGER"); + + b.Property("GoogleBooksId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("ValidUntilUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.ToTable("ExternalSeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastChecked") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("SeriesBlacklist"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxCount") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatusLocked") + .HasColumnType("INTEGER"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYear") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYearLocked") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.HasIndex("Id", "SeriesId") + .IsUnique(); + + b.ToTable("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("RelationKind") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("TargetSeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.HasIndex("TargetSeriesId"); + + b.ToTable("SeriesRelation"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("DestinationType") + .HasColumnType("INTEGER"); + + b.Property("DestinationValue") + .HasColumnType("TEXT"); + + b.Property("ExcludeFromSource") + .HasColumnType("INTEGER"); + + b.Property("MetadataSettingsId") + .HasColumnType("INTEGER"); + + b.Property("SourceType") + .HasColumnType("INTEGER"); + + b.Property("SourceValue") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("MetadataSettingsId"); + + b.ToTable("MetadataFieldMapping"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRatingMappings") + .HasColumnType("TEXT"); + + b.Property("Blacklist") + .HasColumnType("TEXT"); + + b.Property("EnableChapterCoverImage") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterPublisher") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterReleaseDate") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterTitle") + .HasColumnType("INTEGER"); + + b.Property("EnableCoverImage") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("EnableGenres") + .HasColumnType("INTEGER"); + + b.Property("EnableLocalizedName") + .HasColumnType("INTEGER"); + + b.Property("EnablePeople") + .HasColumnType("INTEGER"); + + b.Property("EnablePublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("EnableRelationships") + .HasColumnType("INTEGER"); + + b.Property("EnableStartDate") + .HasColumnType("INTEGER"); + + b.Property("EnableSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableTags") + .HasColumnType("INTEGER"); + + b.Property("Enabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("FirstLastPeopleNaming") + .HasColumnType("INTEGER"); + + b.Property("Overrides") + .HasColumnType("TEXT"); + + b.PrimitiveCollection("PersonRoles") + .HasColumnType("TEXT"); + + b.Property("Whitelist") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .HasColumnType("INTEGER"); + + b.HasKey("ChapterId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("ChapterPeople"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("Asin") + .HasColumnType("TEXT"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("HardcoverId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.PersonAlias", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Alias") + .HasColumnType("TEXT"); + + b.Property("NormalizedAlias") + .HasColumnType("TEXT"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("PersonId"); + + b.ToTable("PersonAlias"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.Property("SeriesMetadataId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.HasKey("SeriesMetadataId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EndingMonth") + .HasColumnType("INTEGER"); + + b.Property("EndingYear") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("StartingMonth") + .HasColumnType("INTEGER"); + + b.Property("StartingYear") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("ReadingList"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("ReadingListId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.HasIndex("ReadingListId"); + + b.HasIndex("SeriesId"); + + b.HasIndex("VolumeId"); + + b.ToTable("ReadingListItem"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId1") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ScrobbleEventId1"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleError"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterNumber") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("ErrorDetails") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsErrored") + .HasColumnType("INTEGER"); + + b.Property("IsProcessed") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("ProcessDateUtc") + .HasColumnType("TEXT"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("ReviewBody") + .HasColumnType("TEXT"); + + b.Property("ReviewTitle") + .HasColumnType("TEXT"); + + b.Property("ScrobbleEventType") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeNumber") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("LibraryId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleEvent"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleHold"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DontMatch") + .HasColumnType("INTEGER"); + + b.Property("FolderPath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsBlacklisted") + .HasColumnType("INTEGER"); + + b.Property("LastChapterAdded") + .HasColumnType("TEXT"); + + b.Property("LastChapterAddedUtc") + .HasColumnType("TEXT"); + + b.Property("LastFolderScanned") + .HasColumnType("TEXT"); + + b.Property("LastFolderScannedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("LocalizedName") + .HasColumnType("TEXT"); + + b.Property("LocalizedNameLocked") + .HasColumnType("INTEGER"); + + b.Property("LowestFolderPath") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedLocalizedName") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("OriginalName") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SortName") + .HasColumnType("TEXT"); + + b.Property("SortNameLocked") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("Series"); + }); + + modelBuilder.Entity("API.Entities.ServerSetting", b => + { + b.Property("Key") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.ToTable("ServerSetting"); + }); + + modelBuilder.Entity("API.Entities.ServerStatistics", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterCount") + .HasColumnType("INTEGER"); + + b.Property("FileCount") + .HasColumnType("INTEGER"); + + b.Property("GenreCount") + .HasColumnType("INTEGER"); + + b.Property("PersonCount") + .HasColumnType("INTEGER"); + + b.Property("SeriesCount") + .HasColumnType("INTEGER"); + + b.Property("TagCount") + .HasColumnType("INTEGER"); + + b.Property("UserCount") + .HasColumnType("INTEGER"); + + b.Property("VolumeCount") + .HasColumnType("INTEGER"); + + b.Property("Year") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ServerStatistics"); + }); + + modelBuilder.Entity("API.Entities.SiteTheme", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Author") + .HasColumnType("TEXT"); + + b.Property("CompatibleVersion") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("GitHubPath") + .HasColumnType("TEXT"); + + b.Property("IsDefault") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PreviewUrls") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ShaHash") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("SiteTheme"); + }); + + modelBuilder.Entity("API.Entities.Tag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Tag"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LookupName") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Number") + .HasColumnType("INTEGER"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("Volume"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.Property("CollectionsId") + .HasColumnType("INTEGER"); + + b.Property("ItemsId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionsId", "ItemsId"); + + b.HasIndex("ItemsId"); + + b.ToTable("AppUserCollectionSeries"); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.Property("AppUsersId") + .HasColumnType("INTEGER"); + + b.Property("LibrariesId") + .HasColumnType("INTEGER"); + + b.HasKey("AppUsersId", "LibrariesId"); + + b.HasIndex("LibrariesId"); + + b.ToTable("AppUserLibrary"); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "GenresId"); + + b.HasIndex("GenresId"); + + b.ToTable("ChapterGenre"); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("ChapterTag"); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.Property("CollectionTagsId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionTagsId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("CollectionTagSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.Property("ExternalRatingsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRatingsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRatingExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.Property("ExternalRecommendationsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRecommendationsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRecommendationExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.Property("ExternalReviewsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalReviewsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalReviewExternalSeriesMetadata"); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("GenresId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("GenreSeriesMetadata"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("ProviderKey") + .HasColumnType("TEXT"); + + b.Property("ProviderDisplayName") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("SeriesMetadatasId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("SeriesMetadataTag"); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Bookmarks") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserChapterRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ChapterRatings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Ratings") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Collections") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("DashboardStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ExternalSources") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithOne("UserPreferences") + .HasForeignKey("API.Entities.AppUserPreferences", "AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.SiteTheme", "Theme") + .WithMany() + .HasForeignKey("ThemeId"); + + b.Navigation("AppUser"); + + b.Navigation("Theme"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Progresses") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", null) + .WithMany("UserProgress") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany("Progress") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Ratings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany("Ratings") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserReadingProfile", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingProfiles") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.HasOne("API.Entities.AppRole", "Role") + .WithMany("UserRoles") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUser", "User") + .WithMany("UserRoles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SideNavStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SmartFilters") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("TableOfContents") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("WantToRead") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.HasOne("API.Entities.Volume", "Volume") + .WithMany("Chapters") + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Devices") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Folders") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryExcludePatterns") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryFileTypes") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Files") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany("ExternalRatings") + .HasForeignKey("ChapterId"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany("ExternalReviews") + .HasForeignKey("ChapterId"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("ExternalSeriesMetadata") + .HasForeignKey("API.Entities.Metadata.ExternalSeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("Metadata") + .HasForeignKey("API.Entities.Metadata.SeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Relations") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "TargetSeries") + .WithMany("RelationOf") + .HasForeignKey("TargetSeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + + b.Navigation("TargetSeries"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.HasOne("API.Entities.MetadataMatching.MetadataSettings", "MetadataSettings") + .WithMany("FieldMappings") + .HasForeignKey("MetadataSettingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("People") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("ChapterPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.PersonAlias", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("Aliases") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("SeriesMetadataPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", "SeriesMetadata") + .WithMany("People") + .HasForeignKey("SeriesMetadataId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + + b.Navigation("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingLists") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.ReadingList", "ReadingList") + .WithMany("Items") + .HasForeignKey("ReadingListId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Volume", "Volume") + .WithMany() + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("ReadingList"); + + b.Navigation("Series"); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.HasOne("API.Entities.Scrobble.ScrobbleEvent", "ScrobbleEvent") + .WithMany() + .HasForeignKey("ScrobbleEventId1"); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ScrobbleEvent"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", "Library") + .WithMany() + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Library"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ScrobbleHolds") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Series") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Volumes") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.HasOne("API.Entities.AppUserCollection", null) + .WithMany() + .HasForeignKey("CollectionsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany() + .HasForeignKey("ItemsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("AppUsersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", null) + .WithMany() + .HasForeignKey("LibrariesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.HasOne("API.Entities.CollectionTag", null) + .WithMany() + .HasForeignKey("CollectionTagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRating", null) + .WithMany() + .HasForeignKey("ExternalRatingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRecommendation", null) + .WithMany() + .HasForeignKey("ExternalRecommendationsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalReview", null) + .WithMany() + .HasForeignKey("ExternalReviewsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("API.Entities.AppRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Navigation("UserRoles"); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Navigation("Bookmarks"); + + b.Navigation("ChapterRatings"); + + b.Navigation("Collections"); + + b.Navigation("DashboardStreams"); + + b.Navigation("Devices"); + + b.Navigation("ExternalSources"); + + b.Navigation("Progresses"); + + b.Navigation("Ratings"); + + b.Navigation("ReadingLists"); + + b.Navigation("ReadingProfiles"); + + b.Navigation("ScrobbleHolds"); + + b.Navigation("SideNavStreams"); + + b.Navigation("SmartFilters"); + + b.Navigation("TableOfContents"); + + b.Navigation("UserPreferences"); + + b.Navigation("UserRoles"); + + b.Navigation("WantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Navigation("ExternalRatings"); + + b.Navigation("ExternalReviews"); + + b.Navigation("Files"); + + b.Navigation("People"); + + b.Navigation("Ratings"); + + b.Navigation("UserProgress"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Navigation("Folders"); + + b.Navigation("LibraryExcludePatterns"); + + b.Navigation("LibraryFileTypes"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Navigation("People"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Navigation("FieldMappings"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Navigation("Aliases"); + + b.Navigation("ChapterPeople"); + + b.Navigation("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Navigation("ExternalSeriesMetadata"); + + b.Navigation("Metadata"); + + b.Navigation("Progress"); + + b.Navigation("Ratings"); + + b.Navigation("RelationOf"); + + b.Navigation("Relations"); + + b.Navigation("Volumes"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Navigation("Chapters"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/API/Data/Migrations/20250620215058_EnableMetadataLibrary.cs b/API/Data/Migrations/20250620215058_EnableMetadataLibrary.cs new file mode 100644 index 000000000..f9e38c01d --- /dev/null +++ b/API/Data/Migrations/20250620215058_EnableMetadataLibrary.cs @@ -0,0 +1,29 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace API.Data.Migrations +{ + /// + public partial class EnableMetadataLibrary : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "EnableMetadata", + table: "Library", + type: "INTEGER", + nullable: false, + defaultValue: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "EnableMetadata", + table: "Library"); + } + } +} diff --git a/API/Data/Migrations/20250626162548_TrackKavitaPlusMetadata.Designer.cs b/API/Data/Migrations/20250626162548_TrackKavitaPlusMetadata.Designer.cs new file mode 100644 index 000000000..b72239924 --- /dev/null +++ b/API/Data/Migrations/20250626162548_TrackKavitaPlusMetadata.Designer.cs @@ -0,0 +1,3721 @@ +// +using System; +using System.Collections.Generic; +using API.Data; +using API.Entities.MetadataMatching; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace API.Data.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20250626162548_TrackKavitaPlusMetadata")] + partial class TrackKavitaPlusMetadata + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "9.0.6"); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AccessFailedCount") + .HasColumnType("INTEGER"); + + b.Property("AgeRestriction") + .HasColumnType("INTEGER"); + + b.Property("AgeRestrictionIncludeUnknowns") + .HasColumnType("INTEGER"); + + b.Property("AniListAccessToken") + .HasColumnType("TEXT"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("ConfirmationToken") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("EmailConfirmed") + .HasColumnType("INTEGER"); + + b.Property("HasRunScrobbleEventGeneration") + .HasColumnType("INTEGER"); + + b.Property("LastActive") + .HasColumnType("TEXT"); + + b.Property("LastActiveUtc") + .HasColumnType("TEXT"); + + b.Property("LockoutEnabled") + .HasColumnType("INTEGER"); + + b.Property("LockoutEnd") + .HasColumnType("TEXT"); + + b.Property("MalAccessToken") + .HasColumnType("TEXT"); + + b.Property("MalUserName") + .HasColumnType("TEXT"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("PasswordHash") + .HasColumnType("TEXT"); + + b.Property("PhoneNumber") + .HasColumnType("TEXT"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventGenerationRan") + .HasColumnType("TEXT"); + + b.Property("SecurityStamp") + .HasColumnType("TEXT"); + + b.Property("TwoFactorEnabled") + .HasColumnType("INTEGER"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Page") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserBookmark"); + }); + + modelBuilder.Entity("API.Entities.AppUserChapterRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserChapterRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastSyncUtc") + .HasColumnType("TEXT"); + + b.Property("MissingSeriesFromSource") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.Property("SourceUrl") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TotalSourceCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserCollection"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(4); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserDashboardStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Host") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserExternalSource"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserOnDeckRemoval"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowAutomaticWebtoonReaderDetection") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AniListScrobblingEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BlurUnreadSummaries") + .HasColumnType("INTEGER"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("CollapseSeriesRelationships") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("GlobalPageLayoutMode") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("Locale") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("en"); + + b.Property("NoTransitions") + .HasColumnType("INTEGER"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("PromptForDownloadSize") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("ShareReviews") + .HasColumnType("INTEGER"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("ThemeId") + .HasColumnType("INTEGER"); + + b.Property("WantToReadSync") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.HasKey("Id"); + + b.HasIndex("AppUserId") + .IsUnique(); + + b.HasIndex("ThemeId"); + + b.ToTable("AppUserPreferences"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PagesRead") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserProgresses"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserReadingProfile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowAutomaticWebtoonReaderDetection") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("DisableWidthOverride") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("Kind") + .HasColumnType("INTEGER"); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("LibraryIds") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("SeriesIds") + .HasColumnType("TEXT"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("WidthOverride") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserReadingProfiles"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSourceId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(5); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserSideNavStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Filter") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserSmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PageNumber") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserTableOfContent"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserWantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("AlternateCount") + .HasColumnType("INTEGER"); + + b.Property("AlternateNumber") + .HasColumnType("TEXT"); + + b.Property("AlternateSeries") + .HasColumnType("TEXT"); + + b.Property("AverageExternalRating") + .HasColumnType("REAL"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("Count") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ISBN") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("ISBNLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("IsSpecial") + .HasColumnType("INTEGER"); + + b.Property("KPlusOverrides") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("[]"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Number") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("Range") + .HasColumnType("TEXT"); + + b.Property("ReleaseDate") + .HasColumnType("TEXT"); + + b.Property("ReleaseDateLocked") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesGroup") + .HasColumnType("TEXT"); + + b.Property("SortOrder") + .HasColumnType("REAL"); + + b.Property("SortOrderLocked") + .HasColumnType("INTEGER"); + + b.Property("StoryArc") + .HasColumnType("TEXT"); + + b.Property("StoryArcNumber") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TitleName") + .HasColumnType("TEXT"); + + b.Property("TitleNameLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("VolumeId"); + + b.ToTable("Chapter"); + }); + + modelBuilder.Entity("API.Entities.CollectionTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Id", "Promoted") + .IsUnique(); + + b.ToTable("CollectionTag"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EmailAddress") + .HasColumnType("TEXT"); + + b.Property("IpAddress") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastUsed") + .HasColumnType("TEXT"); + + b.Property("LastUsedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Platform") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("Device"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DeliveryStatus") + .HasColumnType("TEXT"); + + b.Property("EmailTemplate") + .HasColumnType("TEXT"); + + b.Property("ErrorMessage") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SendDate") + .HasColumnType("TEXT"); + + b.Property("Sent") + .HasColumnType("INTEGER"); + + b.Property("Subject") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("Sent", "AppUserId", "EmailTemplate", "SendDate"); + + b.ToTable("EmailHistory"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Path") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("FolderPath"); + }); + + modelBuilder.Entity("API.Entities.Genre", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Genre"); + }); + + modelBuilder.Entity("API.Entities.History.ManualMigrationHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("ProductVersion") + .HasColumnType("TEXT"); + + b.Property("RanAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ManualMigrationHistory"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowMetadataMatching") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AllowScrobbling") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EnableMetadata") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("FolderWatching") + .HasColumnType("INTEGER"); + + b.Property("IncludeInDashboard") + .HasColumnType("INTEGER"); + + b.Property("IncludeInRecommended") + .HasColumnType("INTEGER"); + + b.Property("IncludeInSearch") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("ManageCollections") + .HasColumnType("INTEGER"); + + b.Property("ManageReadingLists") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Pattern") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryExcludePattern"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("FileTypeGroup") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryFileTypeGroup"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Bytes") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("KoreaderHash") + .HasColumnType("TEXT"); + + b.Property("LastFileAnalysis") + .HasColumnType("TEXT"); + + b.Property("LastFileAnalysisUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("MangaFile"); + }); + + modelBuilder.Entity("API.Entities.MediaError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MediaError"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Authority") + .HasColumnType("INTEGER"); + + b.Property("AverageScore") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("FavoriteCount") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ProviderUrl") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("ExternalRating"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRecommendation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("CoverUrl") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Url") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("ExternalRecommendation"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Authority") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("BodyJustText") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("INTEGER"); + + b.Property("RawBody") + .HasColumnType("TEXT"); + + b.Property("Score") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("SiteUrl") + .HasColumnType("TEXT"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.Property("TotalVotes") + .HasColumnType("INTEGER"); + + b.Property("Username") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("ExternalReview"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AverageExternalRating") + .HasColumnType("INTEGER"); + + b.Property("CbrId") + .HasColumnType("INTEGER"); + + b.Property("GoogleBooksId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("ValidUntilUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.ToTable("ExternalSeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastChecked") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("SeriesBlacklist"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("KPlusOverrides") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("[]"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxCount") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatusLocked") + .HasColumnType("INTEGER"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYear") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYearLocked") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.HasIndex("Id", "SeriesId") + .IsUnique(); + + b.ToTable("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("RelationKind") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("TargetSeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.HasIndex("TargetSeriesId"); + + b.ToTable("SeriesRelation"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("DestinationType") + .HasColumnType("INTEGER"); + + b.Property("DestinationValue") + .HasColumnType("TEXT"); + + b.Property("ExcludeFromSource") + .HasColumnType("INTEGER"); + + b.Property("MetadataSettingsId") + .HasColumnType("INTEGER"); + + b.Property("SourceType") + .HasColumnType("INTEGER"); + + b.Property("SourceValue") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("MetadataSettingsId"); + + b.ToTable("MetadataFieldMapping"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRatingMappings") + .HasColumnType("TEXT"); + + b.Property("Blacklist") + .HasColumnType("TEXT"); + + b.Property("EnableChapterCoverImage") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterPublisher") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterReleaseDate") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterTitle") + .HasColumnType("INTEGER"); + + b.Property("EnableCoverImage") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("EnableGenres") + .HasColumnType("INTEGER"); + + b.Property("EnableLocalizedName") + .HasColumnType("INTEGER"); + + b.Property("EnablePeople") + .HasColumnType("INTEGER"); + + b.Property("EnablePublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("EnableRelationships") + .HasColumnType("INTEGER"); + + b.Property("EnableStartDate") + .HasColumnType("INTEGER"); + + b.Property("EnableSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableTags") + .HasColumnType("INTEGER"); + + b.Property("Enabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("FirstLastPeopleNaming") + .HasColumnType("INTEGER"); + + b.Property("Overrides") + .HasColumnType("TEXT"); + + b.PrimitiveCollection("PersonRoles") + .HasColumnType("TEXT"); + + b.Property("Whitelist") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .HasColumnType("INTEGER"); + + b.HasKey("ChapterId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("ChapterPeople"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("Asin") + .HasColumnType("TEXT"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("HardcoverId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.PersonAlias", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Alias") + .HasColumnType("TEXT"); + + b.Property("NormalizedAlias") + .HasColumnType("TEXT"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("PersonId"); + + b.ToTable("PersonAlias"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.Property("SeriesMetadataId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.HasKey("SeriesMetadataId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EndingMonth") + .HasColumnType("INTEGER"); + + b.Property("EndingYear") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("StartingMonth") + .HasColumnType("INTEGER"); + + b.Property("StartingYear") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("ReadingList"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("ReadingListId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.HasIndex("ReadingListId"); + + b.HasIndex("SeriesId"); + + b.HasIndex("VolumeId"); + + b.ToTable("ReadingListItem"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId1") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ScrobbleEventId1"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleError"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterNumber") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("ErrorDetails") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsErrored") + .HasColumnType("INTEGER"); + + b.Property("IsProcessed") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("ProcessDateUtc") + .HasColumnType("TEXT"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("ReviewBody") + .HasColumnType("TEXT"); + + b.Property("ReviewTitle") + .HasColumnType("TEXT"); + + b.Property("ScrobbleEventType") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeNumber") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("LibraryId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleEvent"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleHold"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DontMatch") + .HasColumnType("INTEGER"); + + b.Property("FolderPath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsBlacklisted") + .HasColumnType("INTEGER"); + + b.Property("LastChapterAdded") + .HasColumnType("TEXT"); + + b.Property("LastChapterAddedUtc") + .HasColumnType("TEXT"); + + b.Property("LastFolderScanned") + .HasColumnType("TEXT"); + + b.Property("LastFolderScannedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("LocalizedName") + .HasColumnType("TEXT"); + + b.Property("LocalizedNameLocked") + .HasColumnType("INTEGER"); + + b.Property("LowestFolderPath") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedLocalizedName") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("OriginalName") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SortName") + .HasColumnType("TEXT"); + + b.Property("SortNameLocked") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("Series"); + }); + + modelBuilder.Entity("API.Entities.ServerSetting", b => + { + b.Property("Key") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.ToTable("ServerSetting"); + }); + + modelBuilder.Entity("API.Entities.ServerStatistics", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterCount") + .HasColumnType("INTEGER"); + + b.Property("FileCount") + .HasColumnType("INTEGER"); + + b.Property("GenreCount") + .HasColumnType("INTEGER"); + + b.Property("PersonCount") + .HasColumnType("INTEGER"); + + b.Property("SeriesCount") + .HasColumnType("INTEGER"); + + b.Property("TagCount") + .HasColumnType("INTEGER"); + + b.Property("UserCount") + .HasColumnType("INTEGER"); + + b.Property("VolumeCount") + .HasColumnType("INTEGER"); + + b.Property("Year") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ServerStatistics"); + }); + + modelBuilder.Entity("API.Entities.SiteTheme", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Author") + .HasColumnType("TEXT"); + + b.Property("CompatibleVersion") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("GitHubPath") + .HasColumnType("TEXT"); + + b.Property("IsDefault") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PreviewUrls") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ShaHash") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("SiteTheme"); + }); + + modelBuilder.Entity("API.Entities.Tag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Tag"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LookupName") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Number") + .HasColumnType("INTEGER"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("Volume"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.Property("CollectionsId") + .HasColumnType("INTEGER"); + + b.Property("ItemsId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionsId", "ItemsId"); + + b.HasIndex("ItemsId"); + + b.ToTable("AppUserCollectionSeries"); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.Property("AppUsersId") + .HasColumnType("INTEGER"); + + b.Property("LibrariesId") + .HasColumnType("INTEGER"); + + b.HasKey("AppUsersId", "LibrariesId"); + + b.HasIndex("LibrariesId"); + + b.ToTable("AppUserLibrary"); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "GenresId"); + + b.HasIndex("GenresId"); + + b.ToTable("ChapterGenre"); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("ChapterTag"); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.Property("CollectionTagsId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionTagsId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("CollectionTagSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.Property("ExternalRatingsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRatingsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRatingExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.Property("ExternalRecommendationsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRecommendationsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRecommendationExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.Property("ExternalReviewsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalReviewsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalReviewExternalSeriesMetadata"); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("GenresId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("GenreSeriesMetadata"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("ProviderKey") + .HasColumnType("TEXT"); + + b.Property("ProviderDisplayName") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("SeriesMetadatasId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("SeriesMetadataTag"); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Bookmarks") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserChapterRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ChapterRatings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Ratings") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Collections") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("DashboardStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ExternalSources") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithOne("UserPreferences") + .HasForeignKey("API.Entities.AppUserPreferences", "AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.SiteTheme", "Theme") + .WithMany() + .HasForeignKey("ThemeId"); + + b.Navigation("AppUser"); + + b.Navigation("Theme"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Progresses") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", null) + .WithMany("UserProgress") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany("Progress") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Ratings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany("Ratings") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserReadingProfile", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingProfiles") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.HasOne("API.Entities.AppRole", "Role") + .WithMany("UserRoles") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUser", "User") + .WithMany("UserRoles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SideNavStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SmartFilters") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("TableOfContents") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("WantToRead") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.HasOne("API.Entities.Volume", "Volume") + .WithMany("Chapters") + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Devices") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Folders") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryExcludePatterns") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryFileTypes") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Files") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany("ExternalRatings") + .HasForeignKey("ChapterId"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany("ExternalReviews") + .HasForeignKey("ChapterId"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("ExternalSeriesMetadata") + .HasForeignKey("API.Entities.Metadata.ExternalSeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("Metadata") + .HasForeignKey("API.Entities.Metadata.SeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Relations") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "TargetSeries") + .WithMany("RelationOf") + .HasForeignKey("TargetSeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + + b.Navigation("TargetSeries"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.HasOne("API.Entities.MetadataMatching.MetadataSettings", "MetadataSettings") + .WithMany("FieldMappings") + .HasForeignKey("MetadataSettingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("People") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("ChapterPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.PersonAlias", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("Aliases") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("SeriesMetadataPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", "SeriesMetadata") + .WithMany("People") + .HasForeignKey("SeriesMetadataId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + + b.Navigation("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingLists") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.ReadingList", "ReadingList") + .WithMany("Items") + .HasForeignKey("ReadingListId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Volume", "Volume") + .WithMany() + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("ReadingList"); + + b.Navigation("Series"); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.HasOne("API.Entities.Scrobble.ScrobbleEvent", "ScrobbleEvent") + .WithMany() + .HasForeignKey("ScrobbleEventId1"); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ScrobbleEvent"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", "Library") + .WithMany() + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Library"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ScrobbleHolds") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Series") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Volumes") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.HasOne("API.Entities.AppUserCollection", null) + .WithMany() + .HasForeignKey("CollectionsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany() + .HasForeignKey("ItemsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("AppUsersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", null) + .WithMany() + .HasForeignKey("LibrariesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.HasOne("API.Entities.CollectionTag", null) + .WithMany() + .HasForeignKey("CollectionTagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRating", null) + .WithMany() + .HasForeignKey("ExternalRatingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRecommendation", null) + .WithMany() + .HasForeignKey("ExternalRecommendationsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalReview", null) + .WithMany() + .HasForeignKey("ExternalReviewsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("API.Entities.AppRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Navigation("UserRoles"); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Navigation("Bookmarks"); + + b.Navigation("ChapterRatings"); + + b.Navigation("Collections"); + + b.Navigation("DashboardStreams"); + + b.Navigation("Devices"); + + b.Navigation("ExternalSources"); + + b.Navigation("Progresses"); + + b.Navigation("Ratings"); + + b.Navigation("ReadingLists"); + + b.Navigation("ReadingProfiles"); + + b.Navigation("ScrobbleHolds"); + + b.Navigation("SideNavStreams"); + + b.Navigation("SmartFilters"); + + b.Navigation("TableOfContents"); + + b.Navigation("UserPreferences"); + + b.Navigation("UserRoles"); + + b.Navigation("WantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Navigation("ExternalRatings"); + + b.Navigation("ExternalReviews"); + + b.Navigation("Files"); + + b.Navigation("People"); + + b.Navigation("Ratings"); + + b.Navigation("UserProgress"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Navigation("Folders"); + + b.Navigation("LibraryExcludePatterns"); + + b.Navigation("LibraryFileTypes"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Navigation("People"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Navigation("FieldMappings"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Navigation("Aliases"); + + b.Navigation("ChapterPeople"); + + b.Navigation("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Navigation("ExternalSeriesMetadata"); + + b.Navigation("Metadata"); + + b.Navigation("Progress"); + + b.Navigation("Ratings"); + + b.Navigation("RelationOf"); + + b.Navigation("Relations"); + + b.Navigation("Volumes"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Navigation("Chapters"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/API/Data/Migrations/20250626162548_TrackKavitaPlusMetadata.cs b/API/Data/Migrations/20250626162548_TrackKavitaPlusMetadata.cs new file mode 100644 index 000000000..ac253e0a8 --- /dev/null +++ b/API/Data/Migrations/20250626162548_TrackKavitaPlusMetadata.cs @@ -0,0 +1,40 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace API.Data.Migrations +{ + /// + public partial class TrackKavitaPlusMetadata : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "KPlusOverrides", + table: "SeriesMetadata", + type: "TEXT", + nullable: true, + defaultValue: "[]"); + + migrationBuilder.AddColumn( + name: "KPlusOverrides", + table: "Chapter", + type: "TEXT", + nullable: true, + defaultValue: "[]"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "KPlusOverrides", + table: "SeriesMetadata"); + + migrationBuilder.DropColumn( + name: "KPlusOverrides", + table: "Chapter"); + } + } +} diff --git a/API/Data/Migrations/20250629153840_LibraryRemoveSortPrefix.Designer.cs b/API/Data/Migrations/20250629153840_LibraryRemoveSortPrefix.Designer.cs new file mode 100644 index 000000000..165663f3d --- /dev/null +++ b/API/Data/Migrations/20250629153840_LibraryRemoveSortPrefix.Designer.cs @@ -0,0 +1,3724 @@ +// +using System; +using System.Collections.Generic; +using API.Data; +using API.Entities.MetadataMatching; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace API.Data.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20250629153840_LibraryRemoveSortPrefix")] + partial class LibraryRemoveSortPrefix + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "9.0.6"); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("Name") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedName") + .IsUnique() + .HasDatabaseName("RoleNameIndex"); + + b.ToTable("AspNetRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AccessFailedCount") + .HasColumnType("INTEGER"); + + b.Property("AgeRestriction") + .HasColumnType("INTEGER"); + + b.Property("AgeRestrictionIncludeUnknowns") + .HasColumnType("INTEGER"); + + b.Property("AniListAccessToken") + .HasColumnType("TEXT"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("ConcurrencyStamp") + .IsConcurrencyToken() + .HasColumnType("TEXT"); + + b.Property("ConfirmationToken") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Email") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("EmailConfirmed") + .HasColumnType("INTEGER"); + + b.Property("HasRunScrobbleEventGeneration") + .HasColumnType("INTEGER"); + + b.Property("LastActive") + .HasColumnType("TEXT"); + + b.Property("LastActiveUtc") + .HasColumnType("TEXT"); + + b.Property("LockoutEnabled") + .HasColumnType("INTEGER"); + + b.Property("LockoutEnd") + .HasColumnType("TEXT"); + + b.Property("MalAccessToken") + .HasColumnType("TEXT"); + + b.Property("MalUserName") + .HasColumnType("TEXT"); + + b.Property("NormalizedEmail") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("NormalizedUserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.Property("PasswordHash") + .HasColumnType("TEXT"); + + b.Property("PhoneNumber") + .HasColumnType("TEXT"); + + b.Property("PhoneNumberConfirmed") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventGenerationRan") + .HasColumnType("TEXT"); + + b.Property("SecurityStamp") + .HasColumnType("TEXT"); + + b.Property("TwoFactorEnabled") + .HasColumnType("INTEGER"); + + b.Property("UserName") + .HasMaxLength(256) + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedEmail") + .HasDatabaseName("EmailIndex"); + + b.HasIndex("NormalizedUserName") + .IsUnique() + .HasDatabaseName("UserNameIndex"); + + b.ToTable("AspNetUsers", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Page") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserBookmark"); + }); + + modelBuilder.Entity("API.Entities.AppUserChapterRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserChapterRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastSyncUtc") + .HasColumnType("TEXT"); + + b.Property("MissingSeriesFromSource") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.Property("SourceUrl") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TotalSourceCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserCollection"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(4); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserDashboardStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ApiKey") + .HasColumnType("TEXT"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Host") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserExternalSource"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserOnDeckRemoval"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowAutomaticWebtoonReaderDetection") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AniListScrobblingEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BlurUnreadSummaries") + .HasColumnType("INTEGER"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("CollapseSeriesRelationships") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("GlobalPageLayoutMode") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("Locale") + .IsRequired() + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("en"); + + b.Property("NoTransitions") + .HasColumnType("INTEGER"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("PromptForDownloadSize") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("ShareReviews") + .HasColumnType("INTEGER"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("ThemeId") + .HasColumnType("INTEGER"); + + b.Property("WantToReadSync") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.HasKey("Id"); + + b.HasIndex("AppUserId") + .IsUnique(); + + b.HasIndex("ThemeId"); + + b.ToTable("AppUserPreferences"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PagesRead") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserProgresses"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserRating"); + }); + + modelBuilder.Entity("API.Entities.AppUserReadingProfile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowAutomaticWebtoonReaderDetection") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("DisableWidthOverride") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("Kind") + .HasColumnType("INTEGER"); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("LibraryIds") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("SeriesIds") + .HasColumnType("TEXT"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("WidthOverride") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserReadingProfiles"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("UserId", "RoleId"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetUserRoles", (string)null); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSourceId") + .HasColumnType("INTEGER"); + + b.Property("IsProvided") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("SmartFilterId") + .HasColumnType("INTEGER"); + + b.Property("StreamType") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(5); + + b.Property("Visible") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SmartFilterId"); + + b.HasIndex("Visible"); + + b.ToTable("AppUserSideNavStream"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Filter") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserSmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("BookScrollId") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("PageNumber") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserTableOfContent"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserWantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("AlternateCount") + .HasColumnType("INTEGER"); + + b.Property("AlternateNumber") + .HasColumnType("TEXT"); + + b.Property("AlternateSeries") + .HasColumnType("TEXT"); + + b.Property("AverageExternalRating") + .HasColumnType("REAL"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("Count") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ISBN") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("ISBNLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("IsSpecial") + .HasColumnType("INTEGER"); + + b.Property("KPlusOverrides") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("[]"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Number") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("Range") + .HasColumnType("TEXT"); + + b.Property("ReleaseDate") + .HasColumnType("TEXT"); + + b.Property("ReleaseDateLocked") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesGroup") + .HasColumnType("TEXT"); + + b.Property("SortOrder") + .HasColumnType("REAL"); + + b.Property("SortOrderLocked") + .HasColumnType("INTEGER"); + + b.Property("StoryArc") + .HasColumnType("TEXT"); + + b.Property("StoryArcNumber") + .HasColumnType("TEXT"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.Property("TitleName") + .HasColumnType("TEXT"); + + b.Property("TitleNameLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("VolumeId"); + + b.ToTable("Chapter"); + }); + + modelBuilder.Entity("API.Entities.CollectionTag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("Id", "Promoted") + .IsUnique(); + + b.ToTable("CollectionTag"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EmailAddress") + .HasColumnType("TEXT"); + + b.Property("IpAddress") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastUsed") + .HasColumnType("TEXT"); + + b.Property("LastUsedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Platform") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("Device"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DeliveryStatus") + .HasColumnType("TEXT"); + + b.Property("EmailTemplate") + .HasColumnType("TEXT"); + + b.Property("ErrorMessage") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SendDate") + .HasColumnType("TEXT"); + + b.Property("Sent") + .HasColumnType("INTEGER"); + + b.Property("Subject") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("Sent", "AppUserId", "EmailTemplate", "SendDate"); + + b.ToTable("EmailHistory"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Path") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("FolderPath"); + }); + + modelBuilder.Entity("API.Entities.Genre", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Genre"); + }); + + modelBuilder.Entity("API.Entities.History.ManualMigrationHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("ProductVersion") + .HasColumnType("TEXT"); + + b.Property("RanAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ManualMigrationHistory"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowMetadataMatching") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AllowScrobbling") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EnableMetadata") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("FolderWatching") + .HasColumnType("INTEGER"); + + b.Property("IncludeInDashboard") + .HasColumnType("INTEGER"); + + b.Property("IncludeInRecommended") + .HasColumnType("INTEGER"); + + b.Property("IncludeInSearch") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LastScanned") + .HasColumnType("TEXT"); + + b.Property("ManageCollections") + .HasColumnType("INTEGER"); + + b.Property("ManageReadingLists") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("RemovePrefixForSortName") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("Type") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("Pattern") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryExcludePattern"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("FileTypeGroup") + .HasColumnType("INTEGER"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("LibraryFileTypeGroup"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Bytes") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("KoreaderHash") + .HasColumnType("TEXT"); + + b.Property("LastFileAnalysis") + .HasColumnType("TEXT"); + + b.Property("LastFileAnalysisUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("MangaFile"); + }); + + modelBuilder.Entity("API.Entities.MediaError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("Extension") + .HasColumnType("TEXT"); + + b.Property("FilePath") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MediaError"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Authority") + .HasColumnType("INTEGER"); + + b.Property("AverageScore") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("FavoriteCount") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ProviderUrl") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("ExternalRating"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRecommendation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("CoverUrl") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Url") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("ExternalRecommendation"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Authority") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("BodyJustText") + .HasColumnType("TEXT"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("INTEGER"); + + b.Property("RawBody") + .HasColumnType("TEXT"); + + b.Property("Score") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("SiteUrl") + .HasColumnType("TEXT"); + + b.Property("Tagline") + .HasColumnType("TEXT"); + + b.Property("TotalVotes") + .HasColumnType("INTEGER"); + + b.Property("Username") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.ToTable("ExternalReview"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AverageExternalRating") + .HasColumnType("INTEGER"); + + b.Property("CbrId") + .HasColumnType("INTEGER"); + + b.Property("GoogleBooksId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("ValidUntilUtc") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.ToTable("ExternalSeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("LastChecked") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("SeriesBlacklist"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AgeRatingLocked") + .HasColumnType("INTEGER"); + + b.Property("CharacterLocked") + .HasColumnType("INTEGER"); + + b.Property("ColoristLocked") + .HasColumnType("INTEGER"); + + b.Property("CoverArtistLocked") + .HasColumnType("INTEGER"); + + b.Property("EditorLocked") + .HasColumnType("INTEGER"); + + b.Property("GenresLocked") + .HasColumnType("INTEGER"); + + b.Property("ImprintLocked") + .HasColumnType("INTEGER"); + + b.Property("InkerLocked") + .HasColumnType("INTEGER"); + + b.Property("KPlusOverrides") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("[]"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LanguageLocked") + .HasColumnType("INTEGER"); + + b.Property("LettererLocked") + .HasColumnType("INTEGER"); + + b.Property("LocationLocked") + .HasColumnType("INTEGER"); + + b.Property("MaxCount") + .HasColumnType("INTEGER"); + + b.Property("PencillerLocked") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("PublicationStatusLocked") + .HasColumnType("INTEGER"); + + b.Property("PublisherLocked") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYear") + .HasColumnType("INTEGER"); + + b.Property("ReleaseYearLocked") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("SummaryLocked") + .HasColumnType("INTEGER"); + + b.Property("TagsLocked") + .HasColumnType("INTEGER"); + + b.Property("TeamLocked") + .HasColumnType("INTEGER"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("TranslatorLocked") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WriterLocked") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId") + .IsUnique(); + + b.HasIndex("Id", "SeriesId") + .IsUnique(); + + b.ToTable("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("RelationKind") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("TargetSeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.HasIndex("TargetSeriesId"); + + b.ToTable("SeriesRelation"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("DestinationType") + .HasColumnType("INTEGER"); + + b.Property("DestinationValue") + .HasColumnType("TEXT"); + + b.Property("ExcludeFromSource") + .HasColumnType("INTEGER"); + + b.Property("MetadataSettingsId") + .HasColumnType("INTEGER"); + + b.Property("SourceType") + .HasColumnType("INTEGER"); + + b.Property("SourceValue") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("MetadataSettingsId"); + + b.ToTable("MetadataFieldMapping"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRatingMappings") + .HasColumnType("TEXT"); + + b.Property("Blacklist") + .HasColumnType("TEXT"); + + b.Property("EnableChapterCoverImage") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterPublisher") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterReleaseDate") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterTitle") + .HasColumnType("INTEGER"); + + b.Property("EnableCoverImage") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("EnableGenres") + .HasColumnType("INTEGER"); + + b.Property("EnableLocalizedName") + .HasColumnType("INTEGER"); + + b.Property("EnablePeople") + .HasColumnType("INTEGER"); + + b.Property("EnablePublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("EnableRelationships") + .HasColumnType("INTEGER"); + + b.Property("EnableStartDate") + .HasColumnType("INTEGER"); + + b.Property("EnableSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableTags") + .HasColumnType("INTEGER"); + + b.Property("Enabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("FirstLastPeopleNaming") + .HasColumnType("INTEGER"); + + b.Property("Overrides") + .HasColumnType("TEXT"); + + b.PrimitiveCollection("PersonRoles") + .HasColumnType("TEXT"); + + b.Property("Whitelist") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .HasColumnType("INTEGER"); + + b.HasKey("ChapterId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("ChapterPeople"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("Asin") + .HasColumnType("TEXT"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("HardcoverId") + .HasColumnType("TEXT"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.PersonAlias", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Alias") + .HasColumnType("TEXT"); + + b.Property("NormalizedAlias") + .HasColumnType("TEXT"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("PersonId"); + + b.ToTable("PersonAlias"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.Property("SeriesMetadataId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.HasKey("SeriesMetadataId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRating") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("EndingMonth") + .HasColumnType("INTEGER"); + + b.Property("EndingYear") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("NormalizedTitle") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("Promoted") + .HasColumnType("INTEGER"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("StartingMonth") + .HasColumnType("INTEGER"); + + b.Property("StartingYear") + .HasColumnType("INTEGER"); + + b.Property("Summary") + .HasColumnType("TEXT"); + + b.Property("Title") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("ReadingList"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("Order") + .HasColumnType("INTEGER"); + + b.Property("ReadingListId") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ChapterId"); + + b.HasIndex("ReadingListId"); + + b.HasIndex("SeriesId"); + + b.HasIndex("VolumeId"); + + b.ToTable("ReadingListItem"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Comment") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Details") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId") + .HasColumnType("INTEGER"); + + b.Property("ScrobbleEventId1") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("ScrobbleEventId1"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleError"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AniListId") + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterNumber") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("ErrorDetails") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsErrored") + .HasColumnType("INTEGER"); + + b.Property("IsProcessed") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("MalId") + .HasColumnType("INTEGER"); + + b.Property("ProcessDateUtc") + .HasColumnType("TEXT"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("ReviewBody") + .HasColumnType("TEXT"); + + b.Property("ReviewTitle") + .HasColumnType("TEXT"); + + b.Property("ScrobbleEventType") + .HasColumnType("INTEGER"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("VolumeNumber") + .HasColumnType("REAL"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("LibraryId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleEvent"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("SeriesId"); + + b.ToTable("ScrobbleHold"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DontMatch") + .HasColumnType("INTEGER"); + + b.Property("FolderPath") + .HasColumnType("TEXT"); + + b.Property("Format") + .HasColumnType("INTEGER"); + + b.Property("IsBlacklisted") + .HasColumnType("INTEGER"); + + b.Property("LastChapterAdded") + .HasColumnType("TEXT"); + + b.Property("LastChapterAddedUtc") + .HasColumnType("TEXT"); + + b.Property("LastFolderScanned") + .HasColumnType("TEXT"); + + b.Property("LastFolderScannedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LibraryId") + .HasColumnType("INTEGER"); + + b.Property("LocalizedName") + .HasColumnType("TEXT"); + + b.Property("LocalizedNameLocked") + .HasColumnType("INTEGER"); + + b.Property("LowestFolderPath") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedLocalizedName") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("OriginalName") + .HasColumnType("TEXT"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SortName") + .HasColumnType("TEXT"); + + b.Property("SortNameLocked") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("LibraryId"); + + b.ToTable("Series"); + }); + + modelBuilder.Entity("API.Entities.ServerSetting", b => + { + b.Property("Key") + .HasColumnType("INTEGER"); + + b.Property("RowVersion") + .IsConcurrencyToken() + .HasColumnType("INTEGER"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("Key"); + + b.ToTable("ServerSetting"); + }); + + modelBuilder.Entity("API.Entities.ServerStatistics", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ChapterCount") + .HasColumnType("INTEGER"); + + b.Property("FileCount") + .HasColumnType("INTEGER"); + + b.Property("GenreCount") + .HasColumnType("INTEGER"); + + b.Property("PersonCount") + .HasColumnType("INTEGER"); + + b.Property("SeriesCount") + .HasColumnType("INTEGER"); + + b.Property("TagCount") + .HasColumnType("INTEGER"); + + b.Property("UserCount") + .HasColumnType("INTEGER"); + + b.Property("VolumeCount") + .HasColumnType("INTEGER"); + + b.Property("Year") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.ToTable("ServerStatistics"); + }); + + modelBuilder.Entity("API.Entities.SiteTheme", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Author") + .HasColumnType("TEXT"); + + b.Property("CompatibleVersion") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("Description") + .HasColumnType("TEXT"); + + b.Property("FileName") + .HasColumnType("TEXT"); + + b.Property("GitHubPath") + .HasColumnType("TEXT"); + + b.Property("IsDefault") + .HasColumnType("INTEGER"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PreviewUrls") + .HasColumnType("TEXT"); + + b.Property("Provider") + .HasColumnType("INTEGER"); + + b.Property("ShaHash") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("SiteTheme"); + }); + + modelBuilder.Entity("API.Entities.Tag", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("NormalizedTitle") + .HasColumnType("TEXT"); + + b.Property("Title") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("NormalizedTitle") + .IsUnique(); + + b.ToTable("Tag"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AvgHoursToRead") + .HasColumnType("REAL"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("LookupName") + .HasColumnType("TEXT"); + + b.Property("MaxHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MaxNumber") + .HasColumnType("REAL"); + + b.Property("MinHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("MinNumber") + .HasColumnType("REAL"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Number") + .HasColumnType("INTEGER"); + + b.Property("Pages") + .HasColumnType("INTEGER"); + + b.Property("PrimaryColor") + .HasColumnType("TEXT"); + + b.Property("SecondaryColor") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.Property("WordCount") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("SeriesId"); + + b.ToTable("Volume"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.Property("CollectionsId") + .HasColumnType("INTEGER"); + + b.Property("ItemsId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionsId", "ItemsId"); + + b.HasIndex("ItemsId"); + + b.ToTable("AppUserCollectionSeries"); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.Property("AppUsersId") + .HasColumnType("INTEGER"); + + b.Property("LibrariesId") + .HasColumnType("INTEGER"); + + b.HasKey("AppUsersId", "LibrariesId"); + + b.HasIndex("LibrariesId"); + + b.ToTable("AppUserLibrary"); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "GenresId"); + + b.HasIndex("GenresId"); + + b.ToTable("ChapterGenre"); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.Property("ChaptersId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("ChaptersId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("ChapterTag"); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.Property("CollectionTagsId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("CollectionTagsId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("CollectionTagSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.Property("ExternalRatingsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRatingsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRatingExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.Property("ExternalRecommendationsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalRecommendationsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalRecommendationExternalSeriesMetadata"); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.Property("ExternalReviewsId") + .HasColumnType("INTEGER"); + + b.Property("ExternalSeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("ExternalReviewsId", "ExternalSeriesMetadatasId"); + + b.HasIndex("ExternalSeriesMetadatasId"); + + b.ToTable("ExternalReviewExternalSeriesMetadata"); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.Property("GenresId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("GenresId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("GenreSeriesMetadata"); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("RoleId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("RoleId"); + + b.ToTable("AspNetRoleClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("ClaimType") + .HasColumnType("TEXT"); + + b.Property("ClaimValue") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserClaims", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("ProviderKey") + .HasColumnType("TEXT"); + + b.Property("ProviderDisplayName") + .HasColumnType("TEXT"); + + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.HasKey("LoginProvider", "ProviderKey"); + + b.HasIndex("UserId"); + + b.ToTable("AspNetUserLogins", (string)null); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.Property("UserId") + .HasColumnType("INTEGER"); + + b.Property("LoginProvider") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Value") + .HasColumnType("TEXT"); + + b.HasKey("UserId", "LoginProvider", "Name"); + + b.ToTable("AspNetUserTokens", (string)null); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.Property("TagsId") + .HasColumnType("INTEGER"); + + b.HasKey("SeriesMetadatasId", "TagsId"); + + b.HasIndex("TagsId"); + + b.ToTable("SeriesMetadataTag"); + }); + + modelBuilder.Entity("API.Entities.AppUserBookmark", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Bookmarks") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserChapterRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ChapterRatings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Ratings") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserCollection", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Collections") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserDashboardStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("DashboardStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserExternalSource", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ExternalSources") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserOnDeckRemoval", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserPreferences", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithOne("UserPreferences") + .HasForeignKey("API.Entities.AppUserPreferences", "AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.SiteTheme", "Theme") + .WithMany() + .HasForeignKey("ThemeId"); + + b.Navigation("AppUser"); + + b.Navigation("Theme"); + }); + + modelBuilder.Entity("API.Entities.AppUserProgress", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Progresses") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", null) + .WithMany("UserProgress") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany("Progress") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Ratings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany("Ratings") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserReadingProfile", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingProfiles") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserRole", b => + { + b.HasOne("API.Entities.AppRole", "Role") + .WithMany("UserRoles") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUser", "User") + .WithMany("UserRoles") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Role"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("API.Entities.AppUserSideNavStream", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SideNavStreams") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.AppUserSmartFilter", "SmartFilter") + .WithMany() + .HasForeignKey("SmartFilterId"); + + b.Navigation("AppUser"); + + b.Navigation("SmartFilter"); + }); + + modelBuilder.Entity("API.Entities.AppUserSmartFilter", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("SmartFilters") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.AppUserTableOfContent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("TableOfContents") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.AppUserWantToRead", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("WantToRead") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.HasOne("API.Entities.Volume", "Volume") + .WithMany("Chapters") + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Device", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("Devices") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.FolderPath", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Folders") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryExcludePattern", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryExcludePatterns") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.LibraryFileTypeGroup", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("LibraryFileTypes") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.MangaFile", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Files") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany("ExternalRatings") + .HasForeignKey("ChapterId"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany("ExternalReviews") + .HasForeignKey("ChapterId"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("ExternalSeriesMetadata") + .HasForeignKey("API.Entities.Metadata.ExternalSeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesBlacklist", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithOne("Metadata") + .HasForeignKey("API.Entities.Metadata.SeriesMetadata", "SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesRelation", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Relations") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "TargetSeries") + .WithMany("RelationOf") + .HasForeignKey("TargetSeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + + b.Navigation("TargetSeries"); + }); + + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.HasOne("API.Entities.MetadataMatching.MetadataSettings", "MetadataSettings") + .WithMany("FieldMappings") + .HasForeignKey("MetadataSettingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("People") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("ChapterPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.PersonAlias", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("Aliases") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("SeriesMetadataPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", "SeriesMetadata") + .WithMany("People") + .HasForeignKey("SeriesMetadataId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + + b.Navigation("SeriesMetadata"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingLists") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + + modelBuilder.Entity("API.Entities.ReadingListItem", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany() + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.ReadingList", "ReadingList") + .WithMany("Items") + .HasForeignKey("ReadingListId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Volume", "Volume") + .WithMany() + .HasForeignKey("VolumeId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("ReadingList"); + + b.Navigation("Series"); + + b.Navigation("Volume"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleError", b => + { + b.HasOne("API.Entities.Scrobble.ScrobbleEvent", "ScrobbleEvent") + .WithMany() + .HasForeignKey("ScrobbleEventId1"); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ScrobbleEvent"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleEvent", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", "Library") + .WithMany() + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Library"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Scrobble.ScrobbleHold", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ScrobbleHolds") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.HasOne("API.Entities.Library", "Library") + .WithMany("Series") + .HasForeignKey("LibraryId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Library"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.HasOne("API.Entities.Series", "Series") + .WithMany("Volumes") + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("AppUserCollectionSeries", b => + { + b.HasOne("API.Entities.AppUserCollection", null) + .WithMany() + .HasForeignKey("CollectionsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", null) + .WithMany() + .HasForeignKey("ItemsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("AppUserLibrary", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("AppUsersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Library", null) + .WithMany() + .HasForeignKey("LibrariesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterGenre", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ChapterTag", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChaptersId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("CollectionTagSeriesMetadata", b => + { + b.HasOne("API.Entities.CollectionTag", null) + .WithMany() + .HasForeignKey("CollectionTagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRatingExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRating", null) + .WithMany() + .HasForeignKey("ExternalRatingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalRecommendationExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalRecommendation", null) + .WithMany() + .HasForeignKey("ExternalRecommendationsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("ExternalReviewExternalSeriesMetadata", b => + { + b.HasOne("API.Entities.Metadata.ExternalReview", null) + .WithMany() + .HasForeignKey("ExternalReviewsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.ExternalSeriesMetadata", null) + .WithMany() + .HasForeignKey("ExternalSeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("GenreSeriesMetadata", b => + { + b.HasOne("API.Entities.Genre", null) + .WithMany() + .HasForeignKey("GenresId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b => + { + b.HasOne("API.Entities.AppRole", null) + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b => + { + b.HasOne("API.Entities.AppUser", null) + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("SeriesMetadataTag", b => + { + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Tag", null) + .WithMany() + .HasForeignKey("TagsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + }); + + modelBuilder.Entity("API.Entities.AppRole", b => + { + b.Navigation("UserRoles"); + }); + + modelBuilder.Entity("API.Entities.AppUser", b => + { + b.Navigation("Bookmarks"); + + b.Navigation("ChapterRatings"); + + b.Navigation("Collections"); + + b.Navigation("DashboardStreams"); + + b.Navigation("Devices"); + + b.Navigation("ExternalSources"); + + b.Navigation("Progresses"); + + b.Navigation("Ratings"); + + b.Navigation("ReadingLists"); + + b.Navigation("ReadingProfiles"); + + b.Navigation("ScrobbleHolds"); + + b.Navigation("SideNavStreams"); + + b.Navigation("SmartFilters"); + + b.Navigation("TableOfContents"); + + b.Navigation("UserPreferences"); + + b.Navigation("UserRoles"); + + b.Navigation("WantToRead"); + }); + + modelBuilder.Entity("API.Entities.Chapter", b => + { + b.Navigation("ExternalRatings"); + + b.Navigation("ExternalReviews"); + + b.Navigation("Files"); + + b.Navigation("People"); + + b.Navigation("Ratings"); + + b.Navigation("UserProgress"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Navigation("Folders"); + + b.Navigation("LibraryExcludePatterns"); + + b.Navigation("LibraryFileTypes"); + + b.Navigation("Series"); + }); + + modelBuilder.Entity("API.Entities.Metadata.SeriesMetadata", b => + { + b.Navigation("People"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Navigation("FieldMappings"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Navigation("Aliases"); + + b.Navigation("ChapterPeople"); + + b.Navigation("SeriesMetadataPeople"); + }); + + modelBuilder.Entity("API.Entities.ReadingList", b => + { + b.Navigation("Items"); + }); + + modelBuilder.Entity("API.Entities.Series", b => + { + b.Navigation("ExternalSeriesMetadata"); + + b.Navigation("Metadata"); + + b.Navigation("Progress"); + + b.Navigation("Ratings"); + + b.Navigation("RelationOf"); + + b.Navigation("Relations"); + + b.Navigation("Volumes"); + }); + + modelBuilder.Entity("API.Entities.Volume", b => + { + b.Navigation("Chapters"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/API/Data/Migrations/20250629153840_LibraryRemoveSortPrefix.cs b/API/Data/Migrations/20250629153840_LibraryRemoveSortPrefix.cs new file mode 100644 index 000000000..4800cf3fa --- /dev/null +++ b/API/Data/Migrations/20250629153840_LibraryRemoveSortPrefix.cs @@ -0,0 +1,29 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace API.Data.Migrations +{ + /// + public partial class LibraryRemoveSortPrefix : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "RemovePrefixForSortName", + table: "Library", + type: "INTEGER", + nullable: false, + defaultValue: false); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "RemovePrefixForSortName", + table: "Library"); + } + } +} diff --git a/API/Data/Migrations/DataContextModelSnapshot.cs b/API/Data/Migrations/DataContextModelSnapshot.cs index ddcfeb10e..62d1fb1ef 100644 --- a/API/Data/Migrations/DataContextModelSnapshot.cs +++ b/API/Data/Migrations/DataContextModelSnapshot.cs @@ -1,6 +1,8 @@ // using System; +using System.Collections.Generic; using API.Data; +using API.Entities.MetadataMatching; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; @@ -15,7 +17,7 @@ namespace API.Data.Migrations protected override void BuildModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 - modelBuilder.HasAnnotation("ProductVersion", "8.0.8"); + modelBuilder.HasAnnotation("ProductVersion", "9.0.6"); modelBuilder.Entity("API.Entities.AppRole", b => { @@ -85,6 +87,9 @@ namespace API.Data.Migrations b.Property("EmailConfirmed") .HasColumnType("INTEGER"); + b.Property("HasRunScrobbleEventGeneration") + .HasColumnType("INTEGER"); + b.Property("LastActive") .HasColumnType("TEXT"); @@ -124,6 +129,9 @@ namespace API.Data.Migrations .IsConcurrencyToken() .HasColumnType("INTEGER"); + b.Property("ScrobbleEventGenerationRan") + .HasColumnType("TEXT"); + b.Property("SecurityStamp") .HasColumnType("TEXT"); @@ -189,6 +197,41 @@ namespace API.Data.Migrations b.ToTable("AppUserBookmark"); }); + modelBuilder.Entity("API.Entities.AppUserChapterRating", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("HasBeenRated") + .HasColumnType("INTEGER"); + + b.Property("Rating") + .HasColumnType("REAL"); + + b.Property("Review") + .HasColumnType("TEXT"); + + b.Property("SeriesId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("ChapterId"); + + b.HasIndex("SeriesId"); + + b.ToTable("AppUserChapterRating"); + }); + modelBuilder.Entity("API.Entities.AppUserCollection", b => { b.Property("Id") @@ -353,6 +396,16 @@ namespace API.Data.Migrations .ValueGeneratedOnAdd() .HasColumnType("INTEGER"); + b.Property("AllowAutomaticWebtoonReaderDetection") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AniListScrobblingEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + b.Property("AppUserId") .HasColumnType("INTEGER"); @@ -460,6 +513,11 @@ namespace API.Data.Migrations b.Property("ThemeId") .HasColumnType("INTEGER"); + b.Property("WantToReadSync") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + b.HasKey("Id"); b.HasIndex("AppUserId") @@ -553,6 +611,123 @@ namespace API.Data.Migrations b.ToTable("AppUserRating"); }); + modelBuilder.Entity("API.Entities.AppUserReadingProfile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AllowAutomaticWebtoonReaderDetection") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("AutoCloseMenu") + .HasColumnType("INTEGER"); + + b.Property("BackgroundColor") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("#000000"); + + b.Property("BookReaderFontFamily") + .HasColumnType("TEXT"); + + b.Property("BookReaderFontSize") + .HasColumnType("INTEGER"); + + b.Property("BookReaderImmersiveMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLayoutMode") + .HasColumnType("INTEGER"); + + b.Property("BookReaderLineSpacing") + .HasColumnType("INTEGER"); + + b.Property("BookReaderMargin") + .HasColumnType("INTEGER"); + + b.Property("BookReaderReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("BookReaderTapToPaginate") + .HasColumnType("INTEGER"); + + b.Property("BookReaderWritingStyle") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.Property("BookThemeName") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("Dark"); + + b.Property("DisableWidthOverride") + .HasColumnType("INTEGER"); + + b.Property("EmulateBook") + .HasColumnType("INTEGER"); + + b.Property("Kind") + .HasColumnType("INTEGER"); + + b.Property("LayoutMode") + .HasColumnType("INTEGER"); + + b.Property("LibraryIds") + .HasColumnType("TEXT"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("PageSplitOption") + .HasColumnType("INTEGER"); + + b.Property("PdfScrollMode") + .HasColumnType("INTEGER"); + + b.Property("PdfSpreadMode") + .HasColumnType("INTEGER"); + + b.Property("PdfTheme") + .HasColumnType("INTEGER"); + + b.Property("ReaderMode") + .HasColumnType("INTEGER"); + + b.Property("ReadingDirection") + .HasColumnType("INTEGER"); + + b.Property("ScalingOption") + .HasColumnType("INTEGER"); + + b.Property("SeriesIds") + .HasColumnType("TEXT"); + + b.Property("ShowScreenHints") + .HasColumnType("INTEGER"); + + b.Property("SwipeToPaginate") + .HasColumnType("INTEGER"); + + b.Property("WidthOverride") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.ToTable("AppUserReadingProfiles"); + }); + modelBuilder.Entity("API.Entities.AppUserRole", b => { b.Property("UserId") @@ -731,6 +906,9 @@ namespace API.Data.Migrations b.Property("AlternateSeries") .HasColumnType("TEXT"); + b.Property("AverageExternalRating") + .HasColumnType("REAL"); + b.Property("AvgHoursToRead") .HasColumnType("REAL"); @@ -781,6 +959,11 @@ namespace API.Data.Migrations b.Property("IsSpecial") .HasColumnType("INTEGER"); + b.Property("KPlusOverrides") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("[]"); + b.Property("Language") .HasColumnType("TEXT"); @@ -901,24 +1084,6 @@ namespace API.Data.Migrations b.ToTable("Chapter"); }); - modelBuilder.Entity("API.Entities.ChapterPeople", b => - { - b.Property("ChapterId") - .HasColumnType("INTEGER"); - - b.Property("PersonId") - .HasColumnType("INTEGER"); - - b.Property("Role") - .HasColumnType("INTEGER"); - - b.HasKey("ChapterId", "PersonId", "Role"); - - b.HasIndex("PersonId"); - - b.ToTable("ChapterPeople"); - }); - modelBuilder.Entity("API.Entities.CollectionTag", b => { b.Property("Id") @@ -1000,6 +1165,57 @@ namespace API.Data.Migrations b.ToTable("Device"); }); + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AppUserId") + .HasColumnType("INTEGER"); + + b.Property("Body") + .HasColumnType("TEXT"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("DeliveryStatus") + .HasColumnType("TEXT"); + + b.Property("EmailTemplate") + .HasColumnType("TEXT"); + + b.Property("ErrorMessage") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + b.Property("SendDate") + .HasColumnType("TEXT"); + + b.Property("Sent") + .HasColumnType("INTEGER"); + + b.Property("Subject") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("AppUserId"); + + b.HasIndex("Sent", "AppUserId", "EmailTemplate", "SendDate"); + + b.ToTable("EmailHistory"); + }); + modelBuilder.Entity("API.Entities.FolderPath", b => { b.Property("Id") @@ -1042,12 +1258,37 @@ namespace API.Data.Migrations b.ToTable("Genre"); }); + modelBuilder.Entity("API.Entities.History.ManualMigrationHistory", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("ProductVersion") + .HasColumnType("TEXT"); + + b.Property("RanAt") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("ManualMigrationHistory"); + }); + modelBuilder.Entity("API.Entities.Library", b => { b.Property("Id") .ValueGeneratedOnAdd() .HasColumnType("INTEGER"); + b.Property("AllowMetadataMatching") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + b.Property("AllowScrobbling") .ValueGeneratedOnAdd() .HasColumnType("INTEGER") @@ -1062,6 +1303,11 @@ namespace API.Data.Migrations b.Property("CreatedUtc") .HasColumnType("TEXT"); + b.Property("EnableMetadata") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + b.Property("FolderWatching") .HasColumnType("INTEGER"); @@ -1095,6 +1341,9 @@ namespace API.Data.Migrations b.Property("PrimaryColor") .HasColumnType("TEXT"); + b.Property("RemovePrefixForSortName") + .HasColumnType("INTEGER"); + b.Property("SecondaryColor") .HasColumnType("TEXT"); @@ -1174,6 +1423,9 @@ namespace API.Data.Migrations b.Property("Format") .HasColumnType("INTEGER"); + b.Property("KoreaderHash") + .HasColumnType("TEXT"); + b.Property("LastFileAnalysis") .HasColumnType("TEXT"); @@ -1196,26 +1448,6 @@ namespace API.Data.Migrations b.ToTable("MangaFile"); }); - modelBuilder.Entity("API.Entities.ManualMigrationHistory", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("INTEGER"); - - b.Property("Name") - .HasColumnType("TEXT"); - - b.Property("ProductVersion") - .HasColumnType("TEXT"); - - b.Property("RanAt") - .HasColumnType("TEXT"); - - b.HasKey("Id"); - - b.ToTable("ManualMigrationHistory"); - }); - modelBuilder.Entity("API.Entities.MediaError", b => { b.Property("Id") @@ -1257,9 +1489,15 @@ namespace API.Data.Migrations .ValueGeneratedOnAdd() .HasColumnType("INTEGER"); + b.Property("Authority") + .HasColumnType("INTEGER"); + b.Property("AverageScore") .HasColumnType("INTEGER"); + b.Property("ChapterId") + .HasColumnType("INTEGER"); + b.Property("FavoriteCount") .HasColumnType("INTEGER"); @@ -1274,6 +1512,8 @@ namespace API.Data.Migrations b.HasKey("Id"); + b.HasIndex("ChapterId"); + b.ToTable("ExternalRating"); }); @@ -1320,12 +1560,18 @@ namespace API.Data.Migrations .ValueGeneratedOnAdd() .HasColumnType("INTEGER"); + b.Property("Authority") + .HasColumnType("INTEGER"); + b.Property("Body") .HasColumnType("TEXT"); b.Property("BodyJustText") .HasColumnType("TEXT"); + b.Property("ChapterId") + .HasColumnType("INTEGER"); + b.Property("Provider") .HasColumnType("INTEGER"); @@ -1355,6 +1601,8 @@ namespace API.Data.Migrations b.HasKey("Id"); + b.HasIndex("ChapterId"); + b.ToTable("ExternalReview"); }); @@ -1370,6 +1618,9 @@ namespace API.Data.Migrations b.Property("AverageExternalRating") .HasColumnType("INTEGER"); + b.Property("CbrId") + .HasColumnType("INTEGER"); + b.Property("GoogleBooksId") .HasColumnType("TEXT"); @@ -1442,6 +1693,11 @@ namespace API.Data.Migrations b.Property("InkerLocked") .HasColumnType("INTEGER"); + b.Property("KPlusOverrides") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue("[]"); + b.Property("Language") .HasColumnType("TEXT"); @@ -1543,7 +1799,140 @@ namespace API.Data.Migrations b.ToTable("SeriesRelation"); }); - modelBuilder.Entity("API.Entities.Person", b => + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("DestinationType") + .HasColumnType("INTEGER"); + + b.Property("DestinationValue") + .HasColumnType("TEXT"); + + b.Property("ExcludeFromSource") + .HasColumnType("INTEGER"); + + b.Property("MetadataSettingsId") + .HasColumnType("INTEGER"); + + b.Property("SourceType") + .HasColumnType("INTEGER"); + + b.Property("SourceValue") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.HasIndex("MetadataSettingsId"); + + b.ToTable("MetadataFieldMapping"); + }); + + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("AgeRatingMappings") + .HasColumnType("TEXT"); + + b.Property("Blacklist") + .HasColumnType("TEXT"); + + b.Property("EnableChapterCoverImage") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterPublisher") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterReleaseDate") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableChapterTitle") + .HasColumnType("INTEGER"); + + b.Property("EnableCoverImage") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("EnableGenres") + .HasColumnType("INTEGER"); + + b.Property("EnableLocalizedName") + .HasColumnType("INTEGER"); + + b.Property("EnablePeople") + .HasColumnType("INTEGER"); + + b.Property("EnablePublicationStatus") + .HasColumnType("INTEGER"); + + b.Property("EnableRelationships") + .HasColumnType("INTEGER"); + + b.Property("EnableStartDate") + .HasColumnType("INTEGER"); + + b.Property("EnableSummary") + .HasColumnType("INTEGER"); + + b.Property("EnableTags") + .HasColumnType("INTEGER"); + + b.Property("Enabled") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(true); + + b.Property("FirstLastPeopleNaming") + .HasColumnType("INTEGER"); + + b.Property("Overrides") + .HasColumnType("TEXT"); + + b.PrimitiveCollection("PersonRoles") + .HasColumnType("TEXT"); + + b.Property("Whitelist") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.Property("ChapterId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .HasColumnType("INTEGER"); + + b.HasKey("ChapterId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("ChapterPeople"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1587,6 +1976,54 @@ namespace API.Data.Migrations b.ToTable("Person"); }); + modelBuilder.Entity("API.Entities.Person.PersonAlias", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Alias") + .HasColumnType("TEXT"); + + b.Property("NormalizedAlias") + .HasColumnType("TEXT"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("PersonId"); + + b.ToTable("PersonAlias"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.Property("SeriesMetadataId") + .HasColumnType("INTEGER"); + + b.Property("PersonId") + .HasColumnType("INTEGER"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + b.Property("KavitaPlusConnection") + .HasColumnType("INTEGER"); + + b.Property("OrderWeight") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER") + .HasDefaultValue(0); + + b.HasKey("SeriesMetadataId", "PersonId", "Role"); + + b.HasIndex("PersonId"); + + b.ToTable("SeriesMetadataPeople"); + }); + modelBuilder.Entity("API.Entities.ReadingList", b => { b.Property("Id") @@ -1866,12 +2303,18 @@ namespace API.Data.Migrations b.Property("CreatedUtc") .HasColumnType("TEXT"); + b.Property("DontMatch") + .HasColumnType("INTEGER"); + b.Property("FolderPath") .HasColumnType("TEXT"); b.Property("Format") .HasColumnType("INTEGER"); + b.Property("IsBlacklisted") + .HasColumnType("INTEGER"); + b.Property("LastChapterAdded") .HasColumnType("TEXT"); @@ -1945,24 +2388,6 @@ namespace API.Data.Migrations b.ToTable("Series"); }); - modelBuilder.Entity("API.Entities.SeriesMetadataPeople", b => - { - b.Property("SeriesMetadataId") - .HasColumnType("INTEGER"); - - b.Property("PersonId") - .HasColumnType("INTEGER"); - - b.Property("Role") - .HasColumnType("INTEGER"); - - b.HasKey("SeriesMetadataId", "PersonId", "Role"); - - b.HasIndex("PersonId"); - - b.ToTable("SeriesMetadataPeople"); - }); - modelBuilder.Entity("API.Entities.ServerSetting", b => { b.Property("Key") @@ -2409,6 +2834,33 @@ namespace API.Data.Migrations b.Navigation("AppUser"); }); + modelBuilder.Entity("API.Entities.AppUserChapterRating", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ChapterRatings") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("Ratings") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Series", "Series") + .WithMany() + .HasForeignKey("SeriesId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + + b.Navigation("Chapter"); + + b.Navigation("Series"); + }); + modelBuilder.Entity("API.Entities.AppUserCollection", b => { b.HasOne("API.Entities.AppUser", "AppUser") @@ -2526,6 +2978,17 @@ namespace API.Data.Migrations b.Navigation("Series"); }); + modelBuilder.Entity("API.Entities.AppUserReadingProfile", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany("ReadingProfiles") + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + modelBuilder.Entity("API.Entities.AppUserRole", b => { b.HasOne("API.Entities.AppRole", "Role") @@ -2630,25 +3093,6 @@ namespace API.Data.Migrations b.Navigation("Volume"); }); - modelBuilder.Entity("API.Entities.ChapterPeople", b => - { - b.HasOne("API.Entities.Chapter", "Chapter") - .WithMany("People") - .HasForeignKey("ChapterId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("API.Entities.Person", "Person") - .WithMany("ChapterPeople") - .HasForeignKey("PersonId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Chapter"); - - b.Navigation("Person"); - }); - modelBuilder.Entity("API.Entities.Device", b => { b.HasOne("API.Entities.AppUser", "AppUser") @@ -2660,6 +3104,17 @@ namespace API.Data.Migrations b.Navigation("AppUser"); }); + modelBuilder.Entity("API.Entities.EmailHistory", b => + { + b.HasOne("API.Entities.AppUser", "AppUser") + .WithMany() + .HasForeignKey("AppUserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("AppUser"); + }); + modelBuilder.Entity("API.Entities.FolderPath", b => { b.HasOne("API.Entities.Library", "Library") @@ -2704,6 +3159,20 @@ namespace API.Data.Migrations b.Navigation("Chapter"); }); + modelBuilder.Entity("API.Entities.Metadata.ExternalRating", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany("ExternalRatings") + .HasForeignKey("ChapterId"); + }); + + modelBuilder.Entity("API.Entities.Metadata.ExternalReview", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany("ExternalReviews") + .HasForeignKey("ChapterId"); + }); + modelBuilder.Entity("API.Entities.Metadata.ExternalSeriesMetadata", b => { b.HasOne("API.Entities.Series", "Series") @@ -2756,6 +3225,66 @@ namespace API.Data.Migrations b.Navigation("TargetSeries"); }); + modelBuilder.Entity("API.Entities.MetadataFieldMapping", b => + { + b.HasOne("API.Entities.MetadataMatching.MetadataSettings", "MetadataSettings") + .WithMany("FieldMappings") + .HasForeignKey("MetadataSettingsId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("MetadataSettings"); + }); + + modelBuilder.Entity("API.Entities.Person.ChapterPeople", b => + { + b.HasOne("API.Entities.Chapter", "Chapter") + .WithMany("People") + .HasForeignKey("ChapterId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("ChapterPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Chapter"); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.PersonAlias", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("Aliases") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + }); + + modelBuilder.Entity("API.Entities.Person.SeriesMetadataPeople", b => + { + b.HasOne("API.Entities.Person.Person", "Person") + .WithMany("SeriesMetadataPeople") + .HasForeignKey("PersonId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", "SeriesMetadata") + .WithMany("People") + .HasForeignKey("SeriesMetadataId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Person"); + + b.Navigation("SeriesMetadata"); + }); + modelBuilder.Entity("API.Entities.ReadingList", b => { b.HasOne("API.Entities.AppUser", "AppUser") @@ -2876,25 +3405,6 @@ namespace API.Data.Migrations b.Navigation("Library"); }); - modelBuilder.Entity("API.Entities.SeriesMetadataPeople", b => - { - b.HasOne("API.Entities.Person", "Person") - .WithMany("SeriesMetadataPeople") - .HasForeignKey("PersonId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("API.Entities.Metadata.SeriesMetadata", "SeriesMetadata") - .WithMany("People") - .HasForeignKey("SeriesMetadataId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Person"); - - b.Navigation("SeriesMetadata"); - }); - modelBuilder.Entity("API.Entities.Volume", b => { b.HasOne("API.Entities.Series", "Series") @@ -3101,6 +3611,8 @@ namespace API.Data.Migrations { b.Navigation("Bookmarks"); + b.Navigation("ChapterRatings"); + b.Navigation("Collections"); b.Navigation("DashboardStreams"); @@ -3115,6 +3627,8 @@ namespace API.Data.Migrations b.Navigation("ReadingLists"); + b.Navigation("ReadingProfiles"); + b.Navigation("ScrobbleHolds"); b.Navigation("SideNavStreams"); @@ -3132,10 +3646,16 @@ namespace API.Data.Migrations modelBuilder.Entity("API.Entities.Chapter", b => { + b.Navigation("ExternalRatings"); + + b.Navigation("ExternalReviews"); + b.Navigation("Files"); b.Navigation("People"); + b.Navigation("Ratings"); + b.Navigation("UserProgress"); }); @@ -3155,8 +3675,15 @@ namespace API.Data.Migrations b.Navigation("People"); }); - modelBuilder.Entity("API.Entities.Person", b => + modelBuilder.Entity("API.Entities.MetadataMatching.MetadataSettings", b => { + b.Navigation("FieldMappings"); + }); + + modelBuilder.Entity("API.Entities.Person.Person", b => + { + b.Navigation("Aliases"); + b.Navigation("ChapterPeople"); b.Navigation("SeriesMetadataPeople"); diff --git a/API/Data/Repositories/AppUserProgressRepository.cs b/API/Data/Repositories/AppUserProgressRepository.cs index 3b065f2e0..a672259ad 100644 --- a/API/Data/Repositories/AppUserProgressRepository.cs +++ b/API/Data/Repositories/AppUserProgressRepository.cs @@ -16,9 +16,11 @@ using Microsoft.EntityFrameworkCore; namespace API.Data.Repositories; #nullable enable + public interface IAppUserProgressRepository { void Update(AppUserProgress userProgress); + void Remove(AppUserProgress userProgress); Task CleanupAbandonedChapters(); Task UserHasProgress(LibraryType libraryType, int userId); Task GetUserProgressAsync(int chapterId, int userId); @@ -40,7 +42,7 @@ public interface IAppUserProgressRepository Task UpdateAllProgressThatAreMoreThanChapterPages(); Task> GetUserProgressForChapter(int chapterId, int userId = 0); } -#nullable disable + public class AppUserProgressRepository : IAppUserProgressRepository { private readonly DataContext _context; @@ -57,6 +59,11 @@ public class AppUserProgressRepository : IAppUserProgressRepository _context.Entry(userProgress).State = EntityState.Modified; } + public void Remove(AppUserProgress userProgress) + { + _context.Remove(userProgress); + } + /// /// This will remove any entries that have chapterIds that no longer exists. This will execute the save as well. /// @@ -186,6 +193,7 @@ public class AppUserProgressRepository : IAppUserProgressRepository .Where(p => p.chapter.MaxNumber != Parser.SpecialVolumeNumber) .Select(p => p.chapter.Volume.MaxNumber) .ToListAsync(); + return list.Count == 0 ? 0 : list.DefaultIfEmpty().Max(); } diff --git a/API/Data/Repositories/AppUserReadingProfileRepository.cs b/API/Data/Repositories/AppUserReadingProfileRepository.cs new file mode 100644 index 000000000..11b97f21a --- /dev/null +++ b/API/Data/Repositories/AppUserReadingProfileRepository.cs @@ -0,0 +1,112 @@ +#nullable enable +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using API.DTOs; +using API.Entities; +using API.Entities.Enums; +using API.Extensions; +using API.Extensions.QueryExtensions; +using AutoMapper; +using AutoMapper.QueryableExtensions; +using Microsoft.EntityFrameworkCore; + +namespace API.Data.Repositories; + + +public interface IAppUserReadingProfileRepository +{ + + /// + /// Return the given profile if it belongs the user + /// + /// + /// + /// + Task GetUserProfile(int userId, int profileId); + /// + /// Returns all reading profiles for the user + /// + /// + /// + Task> GetProfilesForUser(int userId, bool skipImplicit = false); + /// + /// Returns all reading profiles for the user + /// + /// + /// + Task> GetProfilesDtoForUser(int userId, bool skipImplicit = false); + /// + /// Is there a user reading profile with this name (normalized) + /// + /// + /// + /// + Task IsProfileNameInUse(int userId, string name); + + void Add(AppUserReadingProfile readingProfile); + void Update(AppUserReadingProfile readingProfile); + void Remove(AppUserReadingProfile readingProfile); + void RemoveRange(IEnumerable readingProfiles); +} + +public class AppUserReadingProfileRepository(DataContext context, IMapper mapper): IAppUserReadingProfileRepository +{ + public async Task GetUserProfile(int userId, int profileId) + { + return await context.AppUserReadingProfiles + .Where(rp => rp.AppUserId == userId && rp.Id == profileId) + .FirstOrDefaultAsync(); + } + + public async Task> GetProfilesForUser(int userId, bool skipImplicit = false) + { + return await context.AppUserReadingProfiles + .Where(rp => rp.AppUserId == userId) + .WhereIf(skipImplicit, rp => rp.Kind != ReadingProfileKind.Implicit) + .ToListAsync(); + } + + /// + /// Returns all Reading Profiles for the User + /// + /// + /// + public async Task> GetProfilesDtoForUser(int userId, bool skipImplicit = false) + { + return await context.AppUserReadingProfiles + .Where(rp => rp.AppUserId == userId) + .WhereIf(skipImplicit, rp => rp.Kind != ReadingProfileKind.Implicit) + .ProjectTo(mapper.ConfigurationProvider) + .ToListAsync(); + } + + public async Task IsProfileNameInUse(int userId, string name) + { + var normalizedName = name.ToNormalized(); + + return await context.AppUserReadingProfiles + .Where(rp => rp.NormalizedName == normalizedName && rp.AppUserId == userId) + .AnyAsync(); + } + + public void Add(AppUserReadingProfile readingProfile) + { + context.AppUserReadingProfiles.Add(readingProfile); + } + + public void Update(AppUserReadingProfile readingProfile) + { + context.AppUserReadingProfiles.Update(readingProfile).State = EntityState.Modified; + } + + public void Remove(AppUserReadingProfile readingProfile) + { + context.AppUserReadingProfiles.Remove(readingProfile); + } + + public void RemoveRange(IEnumerable readingProfiles) + { + context.AppUserReadingProfiles.RemoveRange(readingProfiles); + } +} diff --git a/API/Data/Repositories/ChapterRepository.cs b/API/Data/Repositories/ChapterRepository.cs index 52ded9e94..27d21df74 100644 --- a/API/Data/Repositories/ChapterRepository.cs +++ b/API/Data/Repositories/ChapterRepository.cs @@ -5,8 +5,10 @@ using System.Threading.Tasks; using API.DTOs; using API.DTOs.Metadata; using API.DTOs.Reader; +using API.DTOs.SeriesDetail; using API.Entities; using API.Entities.Enums; +using API.Entities.Metadata; using API.Extensions; using API.Extensions.QueryExtensions; using AutoMapper; @@ -24,7 +26,9 @@ public enum ChapterIncludes Files = 4, People = 8, Genres = 16, - Tags = 32 + Tags = 32, + ExternalReviews = 1 << 6, + ExternalRatings = 1 << 7 } public interface IChapterRepository @@ -47,6 +51,12 @@ public interface IChapterRepository Task> GetCoverImagesForLockedChaptersAsync(); Task AddChapterModifiers(int userId, ChapterDto chapter); IEnumerable GetChaptersForSeries(int seriesId); + Task> GetAllChaptersForSeries(int seriesId); + Task GetAverageUserRating(int chapterId, int userId); + Task> GetExternalChapterReviewDtos(int chapterId); + Task> GetExternalChapterReview(int chapterId); + Task> GetExternalChapterRatingDtos(int chapterId); + Task> GetExternalChapterRatings(int chapterId); } public class ChapterRepository : IChapterRepository { @@ -298,4 +308,66 @@ public class ChapterRepository : IChapterRepository .Include(c => c.Volume) .AsEnumerable(); } + + public async Task> GetAllChaptersForSeries(int seriesId) + { + return await _context.Chapter + .Where(c => c.Volume.SeriesId == seriesId) + .OrderBy(c => c.SortOrder) + .Include(c => c.Volume) + .Include(c => c.People) + .ThenInclude(cp => cp.Person) + .ToListAsync(); + } + + public async Task GetAverageUserRating(int chapterId, int userId) + { + // If there is 0 or 1 rating and that rating is you, return 0 back + var countOfRatingsThatAreUser = await _context.AppUserChapterRating + .Where(r => r.ChapterId == chapterId && r.HasBeenRated) + .CountAsync(u => u.AppUserId == userId); + if (countOfRatingsThatAreUser == 1) + { + return 0; + } + var avg = (await _context.AppUserChapterRating + .Where(r => r.ChapterId == chapterId && r.HasBeenRated) + .AverageAsync(r => (int?) r.Rating)); + return avg.HasValue ? (int) (avg.Value * 20) : 0; + } + + public async Task> GetExternalChapterReviewDtos(int chapterId) + { + return await _context.Chapter + .Where(c => c.Id == chapterId) + .SelectMany(c => c.ExternalReviews) + // Don't use ProjectTo, it fails to map int to float (??) + .Select(r => _mapper.Map(r)) + .ToListAsync(); + } + + public async Task> GetExternalChapterReview(int chapterId) + { + return await _context.Chapter + .Where(c => c.Id == chapterId) + .SelectMany(c => c.ExternalReviews) + .ToListAsync(); + } + + public async Task> GetExternalChapterRatingDtos(int chapterId) + { + return await _context.Chapter + .Where(c => c.Id == chapterId) + .SelectMany(c => c.ExternalRatings) + .ProjectTo(_mapper.ConfigurationProvider) + .ToListAsync(); + } + + public async Task> GetExternalChapterRatings(int chapterId) + { + return await _context.Chapter + .Where(c => c.Id == chapterId) + .SelectMany(c => c.ExternalRatings) + .ToListAsync(); + } } diff --git a/API/Data/Repositories/CoverDbRepository.cs b/API/Data/Repositories/CoverDbRepository.cs index 3563f9357..ed13493ab 100644 --- a/API/Data/Repositories/CoverDbRepository.cs +++ b/API/Data/Repositories/CoverDbRepository.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq; using API.DTOs.CoverDb; using API.Entities; +using API.Entities.Person; using YamlDotNet.Serialization; using YamlDotNet.Serialization.NamingConventions; diff --git a/API/Data/Repositories/EmailHistoryRepository.cs b/API/Data/Repositories/EmailHistoryRepository.cs new file mode 100644 index 000000000..e5ed1377a --- /dev/null +++ b/API/Data/Repositories/EmailHistoryRepository.cs @@ -0,0 +1,37 @@ +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using API.DTOs.Email; +using API.Entities; +using API.Helpers; +using AutoMapper; +using AutoMapper.QueryableExtensions; +using Microsoft.EntityFrameworkCore; + +namespace API.Data.Repositories; + +public interface IEmailHistoryRepository +{ + Task> GetEmailDtos(UserParams userParams); +} + +public class EmailHistoryRepository : IEmailHistoryRepository +{ + private readonly DataContext _context; + private readonly IMapper _mapper; + + public EmailHistoryRepository(DataContext context, IMapper mapper) + { + _context = context; + _mapper = mapper; + } + + + public async Task> GetEmailDtos(UserParams userParams) + { + return await _context.EmailHistory + .OrderByDescending(h => h.SendDate) + .ProjectTo(_mapper.ConfigurationProvider) + .ToListAsync(); + } +} diff --git a/API/Data/Repositories/ExternalSeriesMetadataRepository.cs b/API/Data/Repositories/ExternalSeriesMetadataRepository.cs index 2fabce824..377344a3c 100644 --- a/API/Data/Repositories/ExternalSeriesMetadataRepository.cs +++ b/API/Data/Repositories/ExternalSeriesMetadataRepository.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Threading.Tasks; using API.Constants; using API.DTOs; +using API.DTOs.KavitaPlus.Manage; using API.DTOs.Recommendation; using API.DTOs.Scrobbling; using API.DTOs.SeriesDetail; @@ -31,14 +32,12 @@ public interface IExternalSeriesMetadataRepository void Remove(IEnumerable? recommendations); void Remove(ExternalSeriesMetadata metadata); Task GetExternalSeriesMetadata(int seriesId); - Task ExternalSeriesMetadataNeedsRefresh(int seriesId); - Task GetSeriesDetailPlusDto(int seriesId); + Task NeedsDataRefresh(int seriesId); + Task GetSeriesDetailPlusDto(int seriesId); Task LinkRecommendationsToSeries(Series series); - Task LinkRecommendationsToSeries(int seriesId); Task IsBlacklistedSeries(int seriesId); - Task CreateBlacklistedSeries(int seriesId, bool saveChanges = true); - Task RemoveFromBlacklist(int seriesId); - Task> GetAllSeriesIdsWithoutMetadata(int limit); + Task> GetSeriesThatNeedExternalMetadata(int limit, bool includeStaleData = false); + Task> GetAllSeries(ManageMatchFilterDto filter); } public class ExternalSeriesMetadataRepository : IExternalSeriesMetadataRepository @@ -107,16 +106,19 @@ public class ExternalSeriesMetadataRepository : IExternalSeriesMetadataRepositor .FirstOrDefaultAsync(); } - public async Task ExternalSeriesMetadataNeedsRefresh(int seriesId) + public async Task NeedsDataRefresh(int seriesId) { + // TODO: Add unit test var row = await _context.ExternalSeriesMetadata .Where(s => s.SeriesId == seriesId) .FirstOrDefaultAsync(); + return row == null || row.ValidUntilUtc <= DateTime.UtcNow; } - public async Task GetSeriesDetailPlusDto(int seriesId) + public async Task GetSeriesDetailPlusDto(int seriesId) { + // TODO: Add unit test var seriesDetailDto = await _context.ExternalSeriesMetadata .Where(m => m.SeriesId == seriesId) .Include(m => m.ExternalRatings) @@ -145,7 +147,7 @@ public class ExternalSeriesMetadataRepository : IExternalSeriesMetadataRepositor .ProjectTo(_mapper.ConfigurationProvider) .ToListAsync(); - IEnumerable reviews = new List(); + IEnumerable reviews = []; if (seriesDetailDto.ExternalReviews != null && seriesDetailDto.ExternalReviews.Any()) { reviews = seriesDetailDto.ExternalReviews @@ -158,8 +160,8 @@ public class ExternalSeriesMetadataRepository : IExternalSeriesMetadataRepositor .OrderByDescending(r => r.Score); } - IEnumerable ratings = new List(); - if (seriesDetailDto.ExternalRatings != null && seriesDetailDto.ExternalRatings.Any()) + IEnumerable ratings = []; + if (seriesDetailDto.ExternalRatings != null && seriesDetailDto.ExternalRatings.Count != 0) { ratings = seriesDetailDto.ExternalRatings .Select(r => _mapper.Map(r)); @@ -180,13 +182,6 @@ public class ExternalSeriesMetadataRepository : IExternalSeriesMetadataRepositor return seriesDetailPlusDto; } - public async Task LinkRecommendationsToSeries(int seriesId) - { - var series = await _context.Series.Where(s => s.Id == seriesId).AsNoTracking().SingleOrDefaultAsync(); - if (series == null) return; - await LinkRecommendationsToSeries(series); - } - /// /// Searches Recommendations without a SeriesId on record and attempts to link based on Series Name/Localized Name /// @@ -210,55 +205,39 @@ public class ExternalSeriesMetadataRepository : IExternalSeriesMetadataRepositor public Task IsBlacklistedSeries(int seriesId) { - return _context.SeriesBlacklist.AnyAsync(s => s.SeriesId == seriesId); + return _context.Series + .Where(s => s.Id == seriesId) + .Select(s => s.IsBlacklisted) + .FirstOrDefaultAsync(); } - /// - /// Creates a new instance against SeriesId and Saves to the DB - /// - /// - /// - public async Task CreateBlacklistedSeries(int seriesId, bool saveChanges = true) - { - if (seriesId <= 0 || await _context.SeriesBlacklist.AnyAsync(s => s.SeriesId == seriesId)) return; - await _context.SeriesBlacklist.AddAsync(new SeriesBlacklist() - { - SeriesId = seriesId - }); - if (saveChanges) - { - await _context.SaveChangesAsync(); - } - } - - /// - /// Removes the Series from Blacklist and Saves to the DB - /// - /// - public async Task RemoveFromBlacklist(int seriesId) - { - var seriesBlacklist = await _context.SeriesBlacklist.FirstOrDefaultAsync(sb => sb.SeriesId == seriesId); - - if (seriesBlacklist != null) - { - // Remove the SeriesBlacklist entity from the context - _context.SeriesBlacklist.Remove(seriesBlacklist); - - // Save the changes to the database - await _context.SaveChangesAsync(); - } - } - - public async Task> GetAllSeriesIdsWithoutMetadata(int limit) + public async Task> GetSeriesThatNeedExternalMetadata(int limit, bool includeStaleData = false) { return await _context.Series .Where(s => !ExternalMetadataService.NonEligibleLibraryTypes.Contains(s.Library.Type)) - .Where(s => s.ExternalSeriesMetadata == null || s.ExternalSeriesMetadata.ValidUntilUtc < DateTime.UtcNow) + .Where(s => s.Library.AllowMetadataMatching) + .WhereIf(includeStaleData, s => s.ExternalSeriesMetadata == null || s.ExternalSeriesMetadata.ValidUntilUtc < DateTime.UtcNow) + .Where(s => s.ExternalSeriesMetadata == null || s.ExternalSeriesMetadata.AniListId == 0) + .Where(s => !s.IsBlacklisted && !s.DontMatch) .OrderByDescending(s => s.Library.Type) .ThenBy(s => s.NormalizedName) .Select(s => s.Id) .Take(limit) .ToListAsync(); } + + public async Task> GetAllSeries(ManageMatchFilterDto filter) + { + return await _context.Series + .Include(s => s.Library) + .Include(s => s.ExternalSeriesMetadata) + .Where(s => !ExternalMetadataService.NonEligibleLibraryTypes.Contains(s.Library.Type)) + .Where(s => s.Library.AllowMetadataMatching) + .WhereIf(filter.LibraryType >= 0, s => s.Library.Type == (LibraryType) filter.LibraryType) + .FilterMatchState(filter.MatchStateOption) + .OrderBy(s => s.NormalizedName) + .ProjectTo(_mapper.ConfigurationProvider) + .ToListAsync(); + } } diff --git a/API/Data/Repositories/GenreRepository.cs b/API/Data/Repositories/GenreRepository.cs index 7492ba5dd..d3baa4de6 100644 --- a/API/Data/Repositories/GenreRepository.cs +++ b/API/Data/Repositories/GenreRepository.cs @@ -3,15 +3,18 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using API.DTOs.Metadata; +using API.DTOs.Metadata.Browse; using API.Entities; using API.Extensions; using API.Extensions.QueryExtensions; +using API.Helpers; using API.Services.Tasks.Scanner.Parser; using AutoMapper; using AutoMapper.QueryableExtensions; using Microsoft.EntityFrameworkCore; namespace API.Data.Repositories; +#nullable enable public interface IGenreRepository { @@ -26,6 +29,7 @@ public interface IGenreRepository Task GetRandomGenre(); Task GetGenreById(int id); Task> GetAllGenresNotInListAsync(ICollection genreNames); + Task> GetBrowseableGenre(int userId, UserParams userParams); } public class GenreRepository : IGenreRepository @@ -110,7 +114,7 @@ public class GenreRepository : IGenreRepository /// /// Returns a set of Genre tags for a set of library Ids. - /// UserId will restrict returned Genres based on user's age restriction and library access. + /// AppUserId will restrict returned Genres based on user's age restriction and library access. /// /// /// @@ -164,4 +168,38 @@ public class GenreRepository : IGenreRepository // Return the original non-normalized genres for the missing ones return missingGenres.Select(normalizedName => normalizedToOriginalMap[normalizedName]).ToList(); } + + public async Task> GetBrowseableGenre(int userId, UserParams userParams) + { + var ageRating = await _context.AppUser.GetUserAgeRestriction(userId); + + var allLibrariesCount = await _context.Library.CountAsync(); + var userLibs = await _context.Library.GetUserLibraries(userId).ToListAsync(); + + var seriesIds = await _context.Series.Where(s => userLibs.Contains(s.LibraryId)).Select(s => s.Id).ToListAsync(); + + var query = _context.Genre + .RestrictAgainstAgeRestriction(ageRating) + .WhereIf(allLibrariesCount != userLibs.Count, + genre => genre.Chapters.Any(cp => seriesIds.Contains(cp.Volume.SeriesId)) || + genre.SeriesMetadatas.Any(sm => seriesIds.Contains(sm.SeriesId))) + .Select(g => new BrowseGenreDto + { + Id = g.Id, + Title = g.Title, + SeriesCount = g.SeriesMetadatas + .Where(sm => allLibrariesCount == userLibs.Count || seriesIds.Contains(sm.SeriesId)) + .RestrictAgainstAgeRestriction(ageRating) + .Distinct() + .Count(), + ChapterCount = g.Chapters + .Where(cp => allLibrariesCount == userLibs.Count || seriesIds.Contains(cp.Volume.SeriesId)) + .RestrictAgainstAgeRestriction(ageRating) + .Distinct() + .Count(), + }) + .OrderBy(g => g.Title); + + return await PagedList.CreateAsync(query, userParams.PageNumber, userParams.PageSize); + } } diff --git a/API/Data/Repositories/LibraryRepository.cs b/API/Data/Repositories/LibraryRepository.cs index 605656d91..78022fa9a 100644 --- a/API/Data/Repositories/LibraryRepository.cs +++ b/API/Data/Repositories/LibraryRepository.cs @@ -18,6 +18,7 @@ using Kavita.Common.Extensions; using Microsoft.EntityFrameworkCore; namespace API.Data.Repositories; +#nullable enable [Flags] public enum LibraryIncludes @@ -260,7 +261,7 @@ public class LibraryRepository : ILibraryRepository public async Task> GetAllLanguagesForLibrariesAsync(List? libraryIds) { var ret = await _context.Series - .WhereIf(libraryIds is {Count: > 0} , s => libraryIds.Contains(s.LibraryId)) + .WhereIf(libraryIds is {Count: > 0} , s => libraryIds!.Contains(s.LibraryId)) .Select(s => s.Metadata.Language) .AsSplitQuery() .AsNoTracking() diff --git a/API/Data/Repositories/MangaFileRepository.cs b/API/Data/Repositories/MangaFileRepository.cs index debd52199..89c6bb418 100644 --- a/API/Data/Repositories/MangaFileRepository.cs +++ b/API/Data/Repositories/MangaFileRepository.cs @@ -5,11 +5,13 @@ using API.Entities; using Microsoft.EntityFrameworkCore; namespace API.Data.Repositories; +#nullable enable public interface IMangaFileRepository { void Update(MangaFile file); Task> GetAllWithMissingExtension(); + Task GetByKoreaderHash(string hash); } public class MangaFileRepository : IMangaFileRepository @@ -32,4 +34,13 @@ public class MangaFileRepository : IMangaFileRepository .Where(f => string.IsNullOrEmpty(f.Extension)) .ToListAsync(); } + + public async Task GetByKoreaderHash(string hash) + { + if (string.IsNullOrEmpty(hash)) return null; + + return await _context.MangaFile + .FirstOrDefaultAsync(f => f.KoreaderHash != null && + f.KoreaderHash.Equals(hash.ToUpper())); + } } diff --git a/API/Data/Repositories/MediaErrorRepository.cs b/API/Data/Repositories/MediaErrorRepository.cs index c2e932d32..40501768e 100644 --- a/API/Data/Repositories/MediaErrorRepository.cs +++ b/API/Data/Repositories/MediaErrorRepository.cs @@ -9,15 +9,18 @@ using AutoMapper.QueryableExtensions; using Microsoft.EntityFrameworkCore; namespace API.Data.Repositories; +#nullable enable public interface IMediaErrorRepository { void Attach(MediaError error); void Remove(MediaError error); + void Remove(IList errors); Task Find(string filename); IEnumerable GetAllErrorDtosAsync(); Task ExistsAsync(MediaError error); Task DeleteAll(); + Task> GetAllErrorsAsync(IList comments); } public class MediaErrorRepository : IMediaErrorRepository @@ -43,6 +46,11 @@ public class MediaErrorRepository : IMediaErrorRepository _context.MediaError.Remove(error); } + public void Remove(IList errors) + { + _context.MediaError.RemoveRange(errors); + } + public Task Find(string filename) { return _context.MediaError.Where(e => e.FilePath == filename).SingleOrDefaultAsync(); @@ -70,4 +78,11 @@ public class MediaErrorRepository : IMediaErrorRepository _context.MediaError.RemoveRange(await _context.MediaError.ToListAsync()); await _context.SaveChangesAsync(); } + + public Task> GetAllErrorsAsync(IList comments) + { + return _context.MediaError + .Where(m => comments.Contains(m.Comment)) + .ToListAsync(); + } } diff --git a/API/Data/Repositories/PersonRepository.cs b/API/Data/Repositories/PersonRepository.cs index ee911ccba..76ae94735 100644 --- a/API/Data/Repositories/PersonRepository.cs +++ b/API/Data/Repositories/PersonRepository.cs @@ -1,19 +1,37 @@ -using System.Collections; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using API.Data.Misc; using API.DTOs; -using API.Entities; +using API.DTOs.Filtering.v2; +using API.DTOs.Metadata.Browse; +using API.DTOs.Metadata.Browse.Requests; +using API.DTOs.Person; using API.Entities.Enums; +using API.Entities.Person; using API.Extensions; using API.Extensions.QueryExtensions; +using API.Extensions.QueryExtensions.Filtering; using API.Helpers; +using API.Helpers.Converters; using AutoMapper; using AutoMapper.QueryableExtensions; using Microsoft.EntityFrameworkCore; namespace API.Data.Repositories; +#nullable enable + +[Flags] +public enum PersonIncludes +{ + None = 1 << 0, + Aliases = 1 << 1, + ChapterPeople = 1 << 2, + SeriesPeople = 1 << 3, + + All = Aliases | ChapterPeople | SeriesPeople, +} public interface IPersonRepository { @@ -24,25 +42,41 @@ public interface IPersonRepository void Remove(SeriesMetadataPeople person); void Update(Person person); - Task> GetAllPeople(); - Task> GetAllPersonDtosAsync(int userId); - Task> GetAllPersonDtosByRoleAsync(int userId, PersonRole role); + Task> GetAllPeople(PersonIncludes includes = PersonIncludes.Aliases); + Task> GetAllPersonDtosAsync(int userId, PersonIncludes includes = PersonIncludes.None); + Task> GetAllPersonDtosByRoleAsync(int userId, PersonRole role, PersonIncludes includes = PersonIncludes.None); Task RemoveAllPeopleNoLongerAssociated(); - Task> GetAllPeopleDtosForLibrariesAsync(int userId, List? libraryIds = null); - Task GetCountAsync(); + Task> GetAllPeopleDtosForLibrariesAsync(int userId, List? libraryIds = null, PersonIncludes includes = PersonIncludes.None); - Task GetCoverImageAsync(int personId); + Task GetCoverImageAsync(int personId); Task GetCoverImageByNameAsync(string name); Task> GetRolesForPersonByName(int personId, int userId); - Task> GetAllWritersAndSeriesCount(int userId, UserParams userParams); - Task GetPersonById(int personId); - Task GetPersonDtoByName(string name, int userId); - Task GetPersonByName(string name); + Task> GetBrowsePersonDtos(int userId, BrowsePersonFilterDto filter, UserParams userParams); + Task GetPersonById(int personId, PersonIncludes includes = PersonIncludes.None); + Task GetPersonDtoByName(string name, int userId, PersonIncludes includes = PersonIncludes.Aliases); + /// + /// Returns a person matched on normalized name or alias + /// + /// + /// + /// + Task GetPersonByNameOrAliasAsync(string name, PersonIncludes includes = PersonIncludes.Aliases); Task IsNameUnique(string name); - Task> GetSeriesKnownFor(int personId); + Task> GetSeriesKnownFor(int personId, int userId); Task> GetChaptersForPersonByRole(int personId, int userId, PersonRole role); - Task> GetPeopleByNames(List normalizedNames); + /// + /// Returns all people with a matching name, or alias + /// + /// + /// + /// + Task> GetPeopleByNames(List normalizedNames, PersonIncludes includes = PersonIncludes.Aliases); + Task GetPersonByAniListId(int aniListId, PersonIncludes includes = PersonIncludes.Aliases); + + Task> SearchPeople(string searchQuery, PersonIncludes includes = PersonIncludes.Aliases); + + Task AnyAliasExist(string alias); } public class PersonRepository : IPersonRepository @@ -101,7 +135,7 @@ public class PersonRepository : IPersonRepository } - public async Task> GetAllPeopleDtosForLibrariesAsync(int userId, List? libraryIds = null) + public async Task> GetAllPeopleDtosForLibrariesAsync(int userId, List? libraryIds = null, PersonIncludes includes = PersonIncludes.Aliases) { var ageRating = await _context.AppUser.GetUserAgeRestriction(userId); var userLibs = await _context.Library.GetUserLibraries(userId).ToListAsync(); @@ -115,6 +149,7 @@ public class PersonRepository : IPersonRepository .Where(s => userLibs.Contains(s.LibraryId)) .RestrictAgainstAgeRestriction(ageRating) .SelectMany(s => s.Metadata.People.Select(p => p.Person)) + .Includes(includes) .Distinct() .OrderBy(p => p.Name) .AsNoTracking() @@ -123,12 +158,8 @@ public class PersonRepository : IPersonRepository .ToListAsync(); } - public async Task GetCountAsync() - { - return await _context.Person.CountAsync(); - } - public async Task GetCoverImageAsync(int personId) + public async Task GetCoverImageAsync(int personId) { return await _context.Person .Where(c => c.Id == personId) @@ -136,7 +167,7 @@ public class PersonRepository : IPersonRepository .SingleOrDefaultAsync(); } - public async Task GetCoverImageByNameAsync(string name) + public async Task GetCoverImageByNameAsync(string name) { var normalized = name.ToNormalized(); return await _context.Person @@ -148,20 +179,25 @@ public class PersonRepository : IPersonRepository public async Task> GetRolesForPersonByName(int personId, int userId) { var ageRating = await _context.AppUser.GetUserAgeRestriction(userId); + var userLibs = _context.Library.GetUserLibraries(userId); // Query roles from ChapterPeople var chapterRoles = await _context.Person .Where(p => p.Id == personId) + .SelectMany(p => p.ChapterPeople) .RestrictAgainstAgeRestriction(ageRating) - .SelectMany(p => p.ChapterPeople.Select(cp => cp.Role)) + .RestrictByLibrary(userLibs) + .Select(cp => cp.Role) .Distinct() .ToListAsync(); // Query roles from SeriesMetadataPeople var seriesRoles = await _context.Person .Where(p => p.Id == personId) + .SelectMany(p => p.SeriesMetadataPeople) .RestrictAgainstAgeRestriction(ageRating) - .SelectMany(p => p.SeriesMetadataPeople.Select(smp => smp.Role)) + .RestrictByLibrary(userLibs) + .Select(smp => smp.Role) .Distinct() .ToListAsync(); @@ -169,71 +205,142 @@ public class PersonRepository : IPersonRepository return chapterRoles.Union(seriesRoles).Distinct(); } - public async Task> GetAllWritersAndSeriesCount(int userId, UserParams userParams) + public async Task> GetBrowsePersonDtos(int userId, BrowsePersonFilterDto filter, UserParams userParams) { - List roles = [PersonRole.Writer, PersonRole.CoverArtist]; var ageRating = await _context.AppUser.GetUserAgeRestriction(userId); - var query = _context.Person - .Where(p => p.SeriesMetadataPeople.Any(smp => roles.Contains(smp.Role)) || p.ChapterPeople.Any(cmp => roles.Contains(cmp.Role))) - .RestrictAgainstAgeRestriction(ageRating) - .Select(p => new BrowsePersonDto - { - Id = p.Id, - Name = p.Name, - Description = p.Description, - CoverImage = p.CoverImage, - SeriesCount = p.SeriesMetadataPeople - .Where(smp => roles.Contains(smp.Role)) - .Select(smp => smp.SeriesMetadata.SeriesId) - .Distinct() - .Count(), - IssueCount = p.ChapterPeople - .Where(cp => roles.Contains(cp.Role)) - .Select(cp => cp.Chapter.Id) - .Distinct() - .Count() - }) - .OrderBy(p => p.Name); + var query = await CreateFilteredPersonQueryable(userId, filter, ageRating); return await PagedList.CreateAsync(query, userParams.PageNumber, userParams.PageSize); } - public async Task GetPersonById(int personId) + private async Task> CreateFilteredPersonQueryable(int userId, BrowsePersonFilterDto filter, AgeRestriction ageRating) + { + var allLibrariesCount = await _context.Library.CountAsync(); + var userLibs = await _context.Library.GetUserLibraries(userId).ToListAsync(); + + var seriesIds = await _context.Series.Where(s => userLibs.Contains(s.LibraryId)).Select(s => s.Id).ToListAsync(); + + var query = _context.Person.AsNoTracking(); + + // Apply filtering based on statements + query = BuildPersonFilterQuery(userId, filter, query); + + // Apply restrictions + query = query.RestrictAgainstAgeRestriction(ageRating) + .WhereIf(allLibrariesCount != userLibs.Count, + person => person.ChapterPeople.Any(cp => seriesIds.Contains(cp.Chapter.Volume.SeriesId)) || + person.SeriesMetadataPeople.Any(smp => seriesIds.Contains(smp.SeriesMetadata.SeriesId))); + + // Apply sorting and limiting + var sortedQuery = query.SortBy(filter.SortOptions); + + var limitedQuery = ApplyPersonLimit(sortedQuery, filter.LimitTo); + + return limitedQuery.Select(p => new BrowsePersonDto + { + Id = p.Id, + Name = p.Name, + Description = p.Description, + CoverImage = p.CoverImage, + SeriesCount = p.SeriesMetadataPeople + .Select(smp => smp.SeriesMetadata) + .Where(sm => allLibrariesCount == userLibs.Count || seriesIds.Contains(sm.SeriesId)) + .RestrictAgainstAgeRestriction(ageRating) + .Distinct() + .Count(), + ChapterCount = p.ChapterPeople + .Select(chp => chp.Chapter) + .Where(ch => allLibrariesCount == userLibs.Count || seriesIds.Contains(ch.Volume.SeriesId)) + .RestrictAgainstAgeRestriction(ageRating) + .Distinct() + .Count(), + }); + } + + private static IQueryable BuildPersonFilterQuery(int userId, BrowsePersonFilterDto filterDto, IQueryable query) + { + if (filterDto.Statements == null || filterDto.Statements.Count == 0) return query; + + var queries = filterDto.Statements + .Select(statement => BuildPersonFilterGroup(userId, statement, query)) + .ToList(); + + return filterDto.Combination == FilterCombination.And + ? queries.Aggregate((q1, q2) => q1.Intersect(q2)) + : queries.Aggregate((q1, q2) => q1.Union(q2)); + } + + private static IQueryable BuildPersonFilterGroup(int userId, PersonFilterStatementDto statement, IQueryable query) + { + var value = PersonFilterFieldValueConverter.ConvertValue(statement.Field, statement.Value); + + return statement.Field switch + { + PersonFilterField.Name => query.HasPersonName(true, statement.Comparison, (string)value), + PersonFilterField.Role => query.HasPersonRole(true, statement.Comparison, (IList)value), + PersonFilterField.SeriesCount => query.HasPersonSeriesCount(true, statement.Comparison, (int)value), + PersonFilterField.ChapterCount => query.HasPersonChapterCount(true, statement.Comparison, (int)value), + _ => throw new ArgumentOutOfRangeException(nameof(statement.Field), $"Unexpected value for field: {statement.Field}") + }; + } + + private static IQueryable ApplyPersonLimit(IQueryable query, int limit) + { + return limit <= 0 ? query : query.Take(limit); + } + + public async Task GetPersonById(int personId, PersonIncludes includes = PersonIncludes.None) { return await _context.Person.Where(p => p.Id == personId) + .Includes(includes) .FirstOrDefaultAsync(); } - public async Task GetPersonDtoByName(string name, int userId) + public async Task GetPersonDtoByName(string name, int userId, PersonIncludes includes = PersonIncludes.Aliases) { var normalized = name.ToNormalized(); var ageRating = await _context.AppUser.GetUserAgeRestriction(userId); + var userLibs = _context.Library.GetUserLibraries(userId); return await _context.Person .Where(p => p.NormalizedName == normalized) + .Includes(includes) .RestrictAgainstAgeRestriction(ageRating) + .RestrictByLibrary(userLibs) .ProjectTo(_mapper.ConfigurationProvider) .FirstOrDefaultAsync(); } - public async Task GetPersonByName(string name) + public Task GetPersonByNameOrAliasAsync(string name, PersonIncludes includes = PersonIncludes.Aliases) { - return await _context.Person.FirstOrDefaultAsync(p => p.NormalizedName == name.ToNormalized()); + var normalized = name.ToNormalized(); + return _context.Person + .Includes(includes) + .Where(p => p.NormalizedName == normalized || p.Aliases.Any(pa => pa.NormalizedAlias == normalized)) + .FirstOrDefaultAsync(); } public async Task IsNameUnique(string name) { - return !(await _context.Person.AnyAsync(p => p.Name == name)); + // Should this use Normalized to check? + return !(await _context.Person + .Includes(PersonIncludes.Aliases) + .AnyAsync(p => p.Name == name || p.Aliases.Any(pa => pa.Alias == name))); } - public async Task> GetSeriesKnownFor(int personId) + public async Task> GetSeriesKnownFor(int personId, int userId) { + var ageRating = await _context.AppUser.GetUserAgeRestriction(userId); + var userLibs = await _context.Library.GetUserLibraries(userId).ToListAsync(); + return await _context.Person .Where(p => p.Id == personId) .SelectMany(p => p.SeriesMetadataPeople) .Select(smp => smp.SeriesMetadata) .Select(sm => sm.Series) + .RestrictAgainstAgeRestriction(ageRating) + .Where(s => userLibs.Contains(s.LibraryId)) .Distinct() .OrderByDescending(s => s.ExternalSeriesMetadata.AverageExternalRating) .Take(20) @@ -244,51 +351,88 @@ public class PersonRepository : IPersonRepository public async Task> GetChaptersForPersonByRole(int personId, int userId, PersonRole role) { var ageRating = await _context.AppUser.GetUserAgeRestriction(userId); + var userLibs = _context.Library.GetUserLibraries(userId); return await _context.ChapterPeople .Where(cp => cp.PersonId == personId && cp.Role == role) .Select(cp => cp.Chapter) .RestrictAgainstAgeRestriction(ageRating) + .RestrictByLibrary(userLibs) .OrderBy(ch => ch.SortOrder) .Take(20) .ProjectTo(_mapper.ConfigurationProvider) .ToListAsync(); } - public async Task> GetPeopleByNames(List normalizedNames) + public async Task> GetPeopleByNames(List normalizedNames, PersonIncludes includes = PersonIncludes.Aliases) { return await _context.Person - .Where(p => normalizedNames.Contains(p.NormalizedName)) + .Includes(includes) + .Where(p => normalizedNames.Contains(p.NormalizedName) || p.Aliases.Any(pa => normalizedNames.Contains(pa.NormalizedAlias))) .OrderBy(p => p.Name) .ToListAsync(); } - public async Task> GetAllPeople() + public async Task GetPersonByAniListId(int aniListId, PersonIncludes includes = PersonIncludes.Aliases) { return await _context.Person - .OrderBy(p => p.Name) - .ToListAsync(); + .Where(p => p.AniListId == aniListId) + .Includes(includes) + .FirstOrDefaultAsync(); } - public async Task> GetAllPersonDtosAsync(int userId) + public async Task> SearchPeople(string searchQuery, PersonIncludes includes = PersonIncludes.Aliases) { - var ageRating = await _context.AppUser.GetUserAgeRestriction(userId); + searchQuery = searchQuery.ToNormalized(); return await _context.Person - .OrderBy(p => p.Name) - .RestrictAgainstAgeRestriction(ageRating) + .Includes(includes) + .Where(p => EF.Functions.Like(p.NormalizedName, $"%{searchQuery}%") + || p.Aliases.Any(pa => EF.Functions.Like(pa.NormalizedAlias, $"%{searchQuery}%"))) .ProjectTo(_mapper.ConfigurationProvider) .ToListAsync(); } - public async Task> GetAllPersonDtosByRoleAsync(int userId, PersonRole role) + + public async Task AnyAliasExist(string alias) + { + return await _context.PersonAlias.AnyAsync(pa => pa.NormalizedAlias == alias.ToNormalized()); + } + + + public async Task> GetAllPeople(PersonIncludes includes = PersonIncludes.Aliases) + { + return await _context.Person + .Includes(includes) + .OrderBy(p => p.Name) + .ToListAsync(); + } + + public async Task> GetAllPersonDtosAsync(int userId, PersonIncludes includes = PersonIncludes.None) { var ageRating = await _context.AppUser.GetUserAgeRestriction(userId); + var userLibs = _context.Library.GetUserLibraries(userId); + + return await _context.Person + .Includes(includes) + .RestrictAgainstAgeRestriction(ageRating) + .RestrictByLibrary(userLibs) + .OrderBy(p => p.Name) + .ProjectTo(_mapper.ConfigurationProvider) + .ToListAsync(); + } + + public async Task> GetAllPersonDtosByRoleAsync(int userId, PersonRole role, PersonIncludes includes = PersonIncludes.None) + { + var ageRating = await _context.AppUser.GetUserAgeRestriction(userId); + var userLibs = _context.Library.GetUserLibraries(userId); return await _context.Person .Where(p => p.SeriesMetadataPeople.Any(smp => smp.Role == role) || p.ChapterPeople.Any(cp => cp.Role == role)) // Filter by role in both series and chapters - .OrderBy(p => p.Name) + .Includes(includes) .RestrictAgainstAgeRestriction(ageRating) + .RestrictByLibrary(userLibs) + .OrderBy(p => p.Name) .ProjectTo(_mapper.ConfigurationProvider) .ToListAsync(); } diff --git a/API/Data/Repositories/ReadingListRepository.cs b/API/Data/Repositories/ReadingListRepository.cs index b2cc5d007..6992b2950 100644 --- a/API/Data/Repositories/ReadingListRepository.cs +++ b/API/Data/Repositories/ReadingListRepository.cs @@ -2,7 +2,8 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using API.DTOs; +using API.Data.Misc; +using API.DTOs.Person; using API.DTOs.ReadingLists; using API.Entities; using API.Entities.Enums; @@ -16,6 +17,7 @@ using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; namespace API.Data.Repositories; +#nullable enable [Flags] public enum ReadingListIncludes @@ -47,11 +49,15 @@ public interface IReadingListRepository Task> GetRandomCoverImagesAsync(int readingListId); Task> GetAllCoverImagesAsync(); Task ReadingListExists(string name); - IEnumerable GetReadingListCharactersAsync(int readingListId); + Task ReadingListExistsForUser(string name, int userId); + IEnumerable GetReadingListPeopleAsync(int readingListId, PersonRole role); + Task GetReadingListAllPeopleAsync(int readingListId); Task> GetAllWithCoversInDifferentEncoding(EncodeFormat encodeFormat); Task RemoveReadingListsWithoutSeries(); Task GetReadingListByTitleAsync(string name, int userId, ReadingListIncludes includes = ReadingListIncludes.Items); Task> GetReadingListsByIds(IList ids, ReadingListIncludes includes = ReadingListIncludes.Items); + Task> GetReadingListsBySeriesId(int seriesId, ReadingListIncludes includes = ReadingListIncludes.Items); + Task GetReadingListInfoAsync(int readingListId); } public class ReadingListRepository : IReadingListRepository @@ -104,6 +110,7 @@ public class ReadingListRepository : IReadingListRepository .SelectMany(r => r.Items.Select(ri => ri.Chapter.CoverImage)) .Where(t => !string.IsNullOrEmpty(t)) .ToListAsync(); + return data .OrderBy(_ => random.Next()) .Take(4) @@ -118,12 +125,19 @@ public class ReadingListRepository : IReadingListRepository .AnyAsync(x => x.NormalizedTitle != null && x.NormalizedTitle.Equals(normalized)); } - public IEnumerable GetReadingListCharactersAsync(int readingListId) + public async Task ReadingListExistsForUser(string name, int userId) + { + var normalized = name.ToNormalized(); + return await _context.ReadingList + .AnyAsync(x => x.NormalizedTitle != null && x.NormalizedTitle.Equals(normalized) && x.AppUserId == userId); + } + + public IEnumerable GetReadingListPeopleAsync(int readingListId, PersonRole role) { return _context.ReadingListItem .Where(item => item.ReadingListId == readingListId) .SelectMany(item => item.Chapter.People) - .Where(p => p.Role == PersonRole.Character) + .Where(p => p.Role == role) .OrderBy(p => p.Person.NormalizedName) .Select(p => p.Person) .Distinct() @@ -131,6 +145,77 @@ public class ReadingListRepository : IReadingListRepository .AsEnumerable(); } + public async Task GetReadingListAllPeopleAsync(int readingListId) + { + var allPeople = await _context.ReadingListItem + .Where(item => item.ReadingListId == readingListId) + .SelectMany(item => item.Chapter.People) + .OrderBy(p => p.Person.NormalizedName) + .Select(p => new + { + Role = p.Role, + Person = _mapper.Map(p.Person) + }) + .Distinct() + .ToListAsync(); + + // Create the ReadingListCast object + var cast = new ReadingListCast(); + + // Group people by role and populate the appropriate collections + foreach (var personGroup in allPeople.GroupBy(p => p.Role)) + { + var people = personGroup.Select(pg => pg.Person).ToList(); + + switch (personGroup.Key) + { + case PersonRole.Writer: + cast.Writers = people; + break; + case PersonRole.CoverArtist: + cast.CoverArtists = people; + break; + case PersonRole.Publisher: + cast.Publishers = people; + break; + case PersonRole.Character: + cast.Characters = people; + break; + case PersonRole.Penciller: + cast.Pencillers = people; + break; + case PersonRole.Inker: + cast.Inkers = people; + break; + case PersonRole.Imprint: + cast.Imprints = people; + break; + case PersonRole.Colorist: + cast.Colorists = people; + break; + case PersonRole.Letterer: + cast.Letterers = people; + break; + case PersonRole.Editor: + cast.Editors = people; + break; + case PersonRole.Translator: + cast.Translators = people; + break; + case PersonRole.Team: + cast.Teams = people; + break; + case PersonRole.Location: + cast.Locations = people; + break; + case PersonRole.Other: + break; + } + } + + return cast; + } + public async Task> GetAllWithCoversInDifferentEncoding(EncodeFormat encodeFormat) { var extension = encodeFormat.GetExtension(); @@ -169,7 +254,41 @@ public class ReadingListRepository : IReadingListRepository .AsSplitQuery() .ToListAsync(); } + public async Task> GetReadingListsBySeriesId(int seriesId, ReadingListIncludes includes = ReadingListIncludes.Items) + { + return await _context.ReadingList + .Where(rl => rl.Items.Any(rli => rli.SeriesId == seriesId)) + .Includes(includes) + .AsSplitQuery() + .ToListAsync(); + } + /// + /// Returns a Partial ReadingListInfoDto. The HourEstimate needs to be calculated outside the repo + /// + /// + /// + public async Task GetReadingListInfoAsync(int readingListId) + { + // Get sum of these across all ReadingListItems: long wordCount, int pageCount, bool isEpub (assume false if any ReadingListeItem.Series.Format is non-epub) + var readingList = await _context.ReadingList + .Where(rl => rl.Id == readingListId) + .Include(rl => rl.Items) + .ThenInclude(item => item.Series) + .Include(rl => rl.Items) + .ThenInclude(item => item.Volume) + .Include(rl => rl.Items) + .ThenInclude(item => item.Chapter) + .Select(rl => new ReadingListInfoDto() + { + WordCount = rl.Items.Sum(item => item.Chapter.WordCount), + Pages = rl.Items.Sum(item => item.Chapter.Pages), + IsAllEpub = rl.Items.All(item => item.Series.Format == MangaFormat.Epub), + }) + .FirstOrDefaultAsync(); + + return readingList; + } public void Remove(ReadingListItem item) @@ -185,10 +304,11 @@ public class ReadingListRepository : IReadingListRepository public async Task> GetReadingListDtosForUserAsync(int userId, bool includePromoted, UserParams userParams, bool sortByLastModified = true) { - var userAgeRating = (await _context.AppUser.SingleAsync(u => u.Id == userId)).AgeRestriction; + var user = await _context.AppUser.FirstAsync(u => u.Id == userId); var query = _context.ReadingList .Where(l => l.AppUserId == userId || (includePromoted && l.Promoted )) - .Where(l => l.AgeRating >= userAgeRating); + .RestrictAgainstAgeRestriction(user.GetAgeRestriction()); + query = sortByLastModified ? query.OrderByDescending(l => l.LastModified) : query.OrderBy(l => l.NormalizedTitle); var finalQuery = query.ProjectTo(_mapper.ConfigurationProvider) @@ -199,8 +319,10 @@ public class ReadingListRepository : IReadingListRepository public async Task> GetReadingListDtosForSeriesAndUserAsync(int userId, int seriesId, bool includePromoted) { + var user = await _context.AppUser.FirstAsync(u => u.Id == userId); var query = _context.ReadingList .Where(l => l.AppUserId == userId || (includePromoted && l.Promoted )) + .RestrictAgainstAgeRestriction(user.GetAgeRestriction()) .Where(l => l.Items.Any(i => i.SeriesId == seriesId)) .AsSplitQuery() .OrderBy(l => l.Title) @@ -212,8 +334,10 @@ public class ReadingListRepository : IReadingListRepository public async Task> GetReadingListDtosForChapterAndUserAsync(int userId, int chapterId, bool includePromoted) { + var user = await _context.AppUser.FirstAsync(u => u.Id == userId); var query = _context.ReadingList .Where(l => l.AppUserId == userId || (includePromoted && l.Promoted )) + .RestrictAgainstAgeRestriction(user.GetAgeRestriction()) .Where(l => l.Items.Any(i => i.ChapterId == chapterId)) .AsSplitQuery() .OrderBy(l => l.Title) @@ -337,8 +461,10 @@ public class ReadingListRepository : IReadingListRepository public async Task GetReadingListDtoByIdAsync(int readingListId, int userId) { + var user = await _context.AppUser.FirstAsync(u => u.Id == userId); return await _context.ReadingList .Where(r => r.Id == readingListId && (r.AppUserId == userId || r.Promoted)) + .RestrictAgainstAgeRestriction(user.GetAgeRestriction()) .ProjectTo(_mapper.ConfigurationProvider) .SingleOrDefaultAsync(); } diff --git a/API/Data/Repositories/ScrobbleEventRepository.cs b/API/Data/Repositories/ScrobbleEventRepository.cs index 7d3567831..144a3b88e 100644 --- a/API/Data/Repositories/ScrobbleEventRepository.cs +++ b/API/Data/Repositories/ScrobbleEventRepository.cs @@ -12,6 +12,7 @@ using AutoMapper.QueryableExtensions; using Microsoft.EntityFrameworkCore; namespace API.Data.Repositories; +#nullable enable public interface IScrobbleRepository { @@ -19,16 +20,36 @@ public interface IScrobbleRepository void Attach(ScrobbleError error); void Remove(ScrobbleEvent evt); void Remove(IEnumerable events); + void Remove(IEnumerable errors); void Update(ScrobbleEvent evt); Task> GetByEvent(ScrobbleEventType type, bool isProcessed = false); Task> GetProcessedEvents(int daysAgo); Task Exists(int userId, int seriesId, ScrobbleEventType eventType); Task> GetScrobbleErrors(); + Task> GetAllScrobbleErrorsForSeries(int seriesId); Task ClearScrobbleErrors(); Task HasErrorForSeries(int seriesId); - Task GetEvent(int userId, int seriesId, ScrobbleEventType eventType); + /// + /// Get all events for a specific user and type + /// + /// + /// + /// + /// If true, only returned not processed events + /// + Task GetEvent(int userId, int seriesId, ScrobbleEventType eventType, bool isNotProcessed = false); Task> GetUserEventsForSeries(int userId, int seriesId); + /// + /// Return the events with given ids, when belonging to the passed user + /// + /// + /// + /// + Task> GetUserEvents(int userId, IList scrobbleEventIds); Task> GetUserEvents(int userId, ScrobbleEventFilter filter, UserParams pagination); + Task> GetAllEventsForSeries(int seriesId); + Task> GetAllEventsWithSeriesIds(IEnumerable seriesIds); + Task> GetEvents(); } /// @@ -65,6 +86,11 @@ public class ScrobbleRepository : IScrobbleRepository _context.ScrobbleEvent.RemoveRange(events); } + public void Remove(IEnumerable errors) + { + _context.ScrobbleError.RemoveRange(errors); + } + public void Update(ScrobbleEvent evt) { _context.Entry(evt).State = EntityState.Modified; @@ -78,6 +104,7 @@ public class ScrobbleRepository : IScrobbleRepository .Include(s => s.Series) .ThenInclude(s => s.Metadata) .Include(s => s.AppUser) + .ThenInclude(u => u.UserPreferences) .Where(s => s.ScrobbleEventType == type) .Where(s => s.IsProcessed == isProcessed) .AsSplitQuery() @@ -88,6 +115,11 @@ public class ScrobbleRepository : IScrobbleRepository .ToListAsync(); } + /// + /// Returns all processed events that were processed 7 or more days ago + /// + /// + /// public async Task> GetProcessedEvents(int daysAgo) { var date = DateTime.UtcNow.Subtract(TimeSpan.FromDays(daysAgo)); @@ -111,6 +143,13 @@ public class ScrobbleRepository : IScrobbleRepository .ToListAsync(); } + public async Task> GetAllScrobbleErrorsForSeries(int seriesId) + { + return await _context.ScrobbleError + .Where(e => e.SeriesId == seriesId) + .ToListAsync(); + } + public async Task ClearScrobbleErrors() { _context.ScrobbleError.RemoveRange(_context.ScrobbleError); @@ -122,35 +161,66 @@ public class ScrobbleRepository : IScrobbleRepository return await _context.ScrobbleError.AnyAsync(n => n.SeriesId == seriesId); } - public async Task GetEvent(int userId, int seriesId, ScrobbleEventType eventType) + public async Task GetEvent(int userId, int seriesId, ScrobbleEventType eventType, bool isNotProcessed = false) { - return await _context.ScrobbleEvent.FirstOrDefaultAsync(e => - e.AppUserId == userId && e.SeriesId == seriesId && e.ScrobbleEventType == eventType); + return await _context.ScrobbleEvent + .Where(e => e.AppUserId == userId && e.SeriesId == seriesId && e.ScrobbleEventType == eventType) + .WhereIf(isNotProcessed, e => !e.IsProcessed) + .OrderBy(e => e.LastModifiedUtc) + .FirstOrDefaultAsync(); } public async Task> GetUserEventsForSeries(int userId, int seriesId) { return await _context.ScrobbleEvent - .Where(e => e.AppUserId == userId && !e.IsProcessed) + .Where(e => e.AppUserId == userId && !e.IsProcessed && e.SeriesId == seriesId) .Include(e => e.Series) .OrderBy(e => e.LastModifiedUtc) .AsSplitQuery() .ToListAsync(); } + public async Task> GetUserEvents(int userId, IList scrobbleEventIds) + { + return await _context.ScrobbleEvent + .Where(e => e.AppUserId == userId && scrobbleEventIds.Contains(e.Id)) + .ToListAsync(); + } + public async Task> GetUserEvents(int userId, ScrobbleEventFilter filter, UserParams pagination) { var query = _context.ScrobbleEvent .Where(e => e.AppUserId == userId) .Include(e => e.Series) - .SortBy(filter.Field, filter.IsDescending) .WhereIf(!string.IsNullOrEmpty(filter.Query), s => EF.Functions.Like(s.Series.Name, $"%{filter.Query}%") ) .WhereIf(!filter.IncludeReviews, e => e.ScrobbleEventType != ScrobbleEventType.Review) + .SortBy(filter.Field, filter.IsDescending) .AsSplitQuery() .ProjectTo(_mapper.ConfigurationProvider); return await PagedList.CreateAsync(query, pagination.PageNumber, pagination.PageSize); } + + public async Task> GetAllEventsForSeries(int seriesId) + { + return await _context.ScrobbleEvent + .Where(e => e.SeriesId == seriesId) + .ToListAsync(); + } + + public async Task> GetAllEventsWithSeriesIds(IEnumerable seriesIds) + { + return await _context.ScrobbleEvent + .Where(e => seriesIds.Contains(e.SeriesId)) + .ToListAsync(); + } + + public async Task> GetEvents() + { + return await _context.ScrobbleEvent + .Include(e => e.AppUser) + .ToListAsync(); + } } diff --git a/API/Data/Repositories/SeriesRepository.cs b/API/Data/Repositories/SeriesRepository.cs index 91a186746..0c4b8350a 100644 --- a/API/Data/Repositories/SeriesRepository.cs +++ b/API/Data/Repositories/SeriesRepository.cs @@ -13,8 +13,11 @@ using API.DTOs.CollectionTags; using API.DTOs.Dashboard; using API.DTOs.Filtering; using API.DTOs.Filtering.v2; +using API.DTOs.KavitaPlus.Metadata; using API.DTOs.Metadata; +using API.DTOs.Person; using API.DTOs.ReadingLists; +using API.DTOs.Recommendation; using API.DTOs.Scrobbling; using API.DTOs.Search; using API.DTOs.SeriesDetail; @@ -38,6 +41,7 @@ using Microsoft.EntityFrameworkCore; namespace API.Data.Repositories; +#nullable enable [Flags] public enum SeriesIncludes @@ -55,6 +59,8 @@ public enum SeriesIncludes ExternalRatings = 128, ExternalRecommendations = 256, ExternalMetadata = 512, + + ExternalData = ExternalMetadata | ExternalReviews | ExternalRatings | ExternalRecommendations, } /// @@ -74,7 +80,9 @@ public interface ISeriesRepository { void Add(Series series); void Attach(Series series); + void Attach(SeriesRelation relation); void Update(Series series); + void Update(SeriesMetadata seriesMetadata); void Remove(Series series); void Remove(IEnumerable series); void Detach(Series series); @@ -145,7 +153,10 @@ public interface ISeriesRepository Task> GetAllSeriesByNameAsync(IList normalizedNames, int userId, SeriesIncludes includes = SeriesIncludes.None); Task GetFullSeriesByAnyName(string seriesName, string localizedName, int libraryId, MangaFormat format, bool withFullIncludes = true); - Task GetSeriesByAnyName(string seriesName, string localizedName, IList formats, int userId); + + Task GetSeriesByAnyName(IList names, IList formats, + int userId, int? aniListId = null, SeriesIncludes includes = SeriesIncludes.None); + Task GetSeriesByAnyName(string seriesName, string localizedName, IList formats, int userId, int? aniListId = null, SeriesIncludes includes = SeriesIncludes.None); public Task> GetAllSeriesByAnyName(string seriesName, string localizedName, int libraryId, MangaFormat format); Task> RemoveSeriesNotInList(IList seenSeries, int libraryId); @@ -163,8 +174,9 @@ public interface ISeriesRepository Task RemoveFromOnDeck(int seriesId, int userId); Task ClearOnDeckRemoval(int seriesId, int userId); Task> GetSeriesDtoForLibraryIdV2Async(int userId, UserParams userParams, FilterV2Dto filterDto, QueryContext queryContext = QueryContext.None); - Task GetPlusSeriesDto(int seriesId); + Task GetPlusSeriesDto(int seriesId); Task GetCountAsync(); + Task MatchSeries(ExternalSeriesDetailDto externalSeries); } public class SeriesRepository : ISeriesRepository @@ -193,6 +205,11 @@ public class SeriesRepository : ISeriesRepository _context.Series.Attach(series); } + public void Attach(SeriesRelation relation) + { + _context.SeriesRelation.Attach(relation); + } + public void Attach(ExternalSeriesMetadata metadata) { _context.ExternalSeriesMetadata.Attach(metadata); @@ -203,6 +220,11 @@ public class SeriesRepository : ISeriesRepository _context.Entry(series).State = EntityState.Modified; } + public void Update(SeriesMetadata seriesMetadata) + { + _context.Entry(seriesMetadata).State = EntityState.Modified; + } + public void Remove(Series series) { _context.Series.Remove(series); @@ -440,11 +462,18 @@ public class SeriesRepository : ISeriesRepository .ProjectTo(_mapper.ConfigurationProvider) .ToListAsync(); - result.Persons = await _context.SeriesMetadata + // I can't work out how to map people in DB layer + var personIds = await _context.SeriesMetadata .SearchPeople(searchQuery, seriesIds) - .Take(maxRecords) - .OrderBy(t => t.NormalizedName) + .Select(p => p.Id) .Distinct() + .OrderBy(id => id) + .Take(maxRecords) + .ToListAsync(); + + result.Persons = await _context.Person + .Where(p => personIds.Contains(p.Id)) + .OrderBy(p => p.NormalizedName) .ProjectTo(_mapper.ConfigurationProvider) .ToListAsync(); @@ -460,8 +489,8 @@ public class SeriesRepository : ISeriesRepository .ProjectTo(_mapper.ConfigurationProvider) .ToListAsync(); - result.Files = new List(); - result.Chapters = new List(); + result.Files = []; + result.Chapters = (List) []; if (includeChapterAndFiles) @@ -551,7 +580,13 @@ public class SeriesRepository : ISeriesRepository if (!fullSeries) return await query.ToListAsync(); - return await query.Include(s => s.Volumes) + return await query + .Include(s => s.Volumes) + .ThenInclude(v => v.Chapters) + .ThenInclude(c => c.ExternalRatings) + .Include(s => s.Volumes) + .ThenInclude(v => v.Chapters) + .ThenInclude(c => c.ExternalReviews) .Include(s => s.Relations) .Include(s => s.Metadata) @@ -697,25 +732,26 @@ public class SeriesRepository : ISeriesRepository var retSeries = query .ProjectTo(_mapper.ConfigurationProvider) - //.AsSplitQuery() .AsNoTracking(); return await PagedList.CreateAsync(retSeries, userParams.PageNumber, userParams.PageSize); } - public async Task GetPlusSeriesDto(int seriesId) + public async Task GetPlusSeriesDto(int seriesId) { return await _context.Series .Where(s => s.Id == seriesId) - .Select(series => new PlusSeriesDto() + .Include(s => s.ExternalSeriesMetadata) + .Select(series => new PlusSeriesRequestDto() { - MediaFormat = LibraryTypeHelper.GetFormat(series.Library.Type), + MediaFormat = series.Library.Type.ConvertToPlusMediaFormat(series.Format), SeriesName = series.Name, AltSeriesName = series.LocalizedName, AniListId = ScrobblingService.ExtractId(series.Metadata.WebLinks, ScrobblingService.AniListWeblinkWebsite), MalId = ScrobblingService.ExtractId(series.Metadata.WebLinks, ScrobblingService.MalWeblinkWebsite), + CbrId = series.ExternalSeriesMetadata.CbrId, GoogleBooksId = ScrobblingService.ExtractId(series.Metadata.WebLinks, ScrobblingService.GoogleBooksWeblinkWebsite), MangaDexId = ScrobblingService.ExtractId(series.Metadata.WebLinks, @@ -1060,8 +1096,6 @@ public class SeriesRepository : ISeriesRepository return query.Where(s => false); } - - // First setup any FilterField.Libraries in the statements, as these don't have any traditional query statements applied here query = ApplyLibraryFilter(filter, query); @@ -1262,7 +1296,7 @@ public class SeriesRepository : ISeriesRepository FilterField.ReadingDate => query.HasReadingDate(true, statement.Comparison, (DateTime) value, userId), FilterField.ReadLast => query.HasReadLast(true, statement.Comparison, (int) value, userId), FilterField.AverageRating => query.HasAverageRating(true, statement.Comparison, (float) value), - _ => throw new ArgumentOutOfRangeException() + _ => throw new ArgumentOutOfRangeException(nameof(statement.Field), $"Unexpected value for field: {statement.Field}") }; } @@ -1723,24 +1757,71 @@ public class SeriesRepository : ISeriesRepository #nullable enable } - public async Task GetSeriesByAnyName(string seriesName, string localizedName, IList formats, int userId) + public async Task GetSeriesByAnyName(string seriesName, string localizedName, IList formats, + int userId, int? aniListId = null, SeriesIncludes includes = SeriesIncludes.None) { var libraryIds = GetLibraryIdsForUser(userId); var normalizedSeries = seriesName.ToNormalized(); var normalizedLocalized = localizedName.ToNormalized(); - return await _context.Series + var query = _context.Series .Where(s => libraryIds.Contains(s.LibraryId)) - .Where(s => formats.Contains(s.Format)) - .Where(s => + .Where(s => formats.Contains(s.Format)); + + if (aniListId.HasValue && aniListId.Value > 0) + { + // If AniList ID is provided, override name checks + query = query.Where(s => s.ExternalSeriesMetadata.AniListId == aniListId.Value); + } + else + { + // Otherwise, use name checks + query = query.Where(s => s.NormalizedName.Equals(normalizedSeries) || s.NormalizedName.Equals(normalizedLocalized) - || s.NormalizedLocalizedName.Equals(normalizedSeries) || (!string.IsNullOrEmpty(normalizedLocalized) && s.NormalizedLocalizedName.Equals(normalizedLocalized)) - || (s.OriginalName != null && s.OriginalName.Equals(seriesName)) - ) + ); + } + + return await query + .Includes(includes) + .FirstOrDefaultAsync(); + } + + + public async Task GetSeriesByAnyName(IList names, IList formats, + int userId, int? aniListId = null, SeriesIncludes includes = SeriesIncludes.None) + { + var libraryIds = GetLibraryIdsForUser(userId); + names = names.Where(s => !string.IsNullOrEmpty(s)).Distinct().ToList(); + var normalizedNames = names.Select(s => s.ToNormalized()).ToList(); + + + var query = _context.Series + .Where(s => libraryIds.Contains(s.LibraryId)) + .Where(s => formats.Contains(s.Format)); + + if (aniListId.HasValue && aniListId.Value > 0) + { + // If AniList ID is provided, override name checks + query = query.Where(s => s.ExternalSeriesMetadata.AniListId == aniListId.Value || + normalizedNames.Contains(s.NormalizedName) + || normalizedNames.Contains(s.NormalizedLocalizedName) + || names.Contains(s.OriginalName)); + } + else + { + // Otherwise, use name checks + query = query.Where(s => + normalizedNames.Contains(s.NormalizedName) + || normalizedNames.Contains(s.NormalizedLocalizedName) + || names.Contains(s.OriginalName)); + } + + return await query + .Includes(includes) .FirstOrDefaultAsync(); } @@ -1791,7 +1872,7 @@ public class SeriesRepository : ISeriesRepository .ToList(); // Prefer the first match or handle duplicates by choosing the last one - if (matchingSeries.Any()) + if (matchingSeries.Count != 0) { ids.Add(matchingSeries.Last().Id); } @@ -2037,9 +2118,6 @@ public class SeriesRepository : ISeriesRepository /// Uses multiple names to find a match against a series. If not, returns null. /// /// This does not restrict to the user at all. That is handled at the API level. - /// - /// - /// public async Task GetSeriesDtoByNamesAndMetadataIds(IEnumerable names, LibraryType libraryType, string aniListUrl, string malUrl) { var libraryIds = await _context.Library @@ -2073,6 +2151,47 @@ public class SeriesRepository : ISeriesRepository .FirstOrDefaultAsync(); // Some users may have improperly configured libraries } + public async Task MatchSeries(ExternalSeriesDetailDto externalSeries) + { + var libraryIds = await _context.Library + .Where(lib => externalSeries.PlusMediaFormat.ConvertToLibraryTypes().Contains(lib.Type)) + .Select(l => l.Id) + .ToListAsync(); + + var normalizedNames = (externalSeries.Synonyms ?? Enumerable.Empty()) + .Prepend(externalSeries.Name) + .Select(n => n.ToNormalized()) + .ToList(); + + var aniListWebLink = + ScrobblingService.CreateUrl(ScrobblingService.AniListWeblinkWebsite, externalSeries.AniListId); + var malWebLink = + ScrobblingService.CreateUrl(ScrobblingService.MalWeblinkWebsite, externalSeries.MALId); + + Series? result = null; + if (!string.IsNullOrEmpty(aniListWebLink) || !string.IsNullOrEmpty(malWebLink)) + { + result = await _context.Series + .Where(s => !string.IsNullOrEmpty(s.Metadata.WebLinks)) + .Where(s => libraryIds.Contains(s.Library.Id)) + .WhereIf(!string.IsNullOrEmpty(aniListWebLink), s => s.Metadata.WebLinks.Contains(aniListWebLink)) + .WhereIf(!string.IsNullOrEmpty(malWebLink), s => s.Metadata.WebLinks.Contains(malWebLink)) + .Include(s => s.Metadata) + .AsSplitQuery() + .FirstOrDefaultAsync(); + } + + if (result != null) return result; + + return await _context.Series + .Where(s => normalizedNames.Contains(s.NormalizedName) || + normalizedNames.Contains(s.NormalizedLocalizedName)) + .Where(s => libraryIds.Contains(s.Library.Id)) + .AsSplitQuery() + .Include(s => s.Metadata) + .FirstOrDefaultAsync(); // Some users may have improperly configured libraries + } + /// /// Returns the Average rating for all users within Kavita instance /// diff --git a/API/Data/Repositories/SettingsRepository.cs b/API/Data/Repositories/SettingsRepository.cs index 6d67b36b5..90246e75f 100644 --- a/API/Data/Repositories/SettingsRepository.cs +++ b/API/Data/Repositories/SettingsRepository.cs @@ -1,24 +1,32 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using API.DTOs.KavitaPlus.Metadata; using API.DTOs.SeriesDetail; using API.DTOs.Settings; using API.Entities; using API.Entities.Enums; using API.Entities.Metadata; +using API.Entities.MetadataMatching; using AutoMapper; +using AutoMapper.QueryableExtensions; using Microsoft.EntityFrameworkCore; namespace API.Data.Repositories; +#nullable enable public interface ISettingsRepository { void Update(ServerSetting settings); + void Update(MetadataSettings settings); + void RemoveRange(List fieldMappings); Task GetSettingsDtoAsync(); Task GetSettingAsync(ServerSettingKey key); Task> GetSettingsAsync(); void Remove(ServerSetting setting); Task GetExternalSeriesMetadata(int seriesId); + Task GetMetadataSettings(); + Task GetMetadataSettingDto(); } public class SettingsRepository : ISettingsRepository { @@ -36,6 +44,16 @@ public class SettingsRepository : ISettingsRepository _context.Entry(settings).State = EntityState.Modified; } + public void Update(MetadataSettings settings) + { + _context.Entry(settings).State = EntityState.Modified; + } + + public void RemoveRange(List fieldMappings) + { + _context.MetadataFieldMapping.RemoveRange(fieldMappings); + } + public void Remove(ServerSetting setting) { _context.Remove(setting); @@ -48,6 +66,21 @@ public class SettingsRepository : ISettingsRepository .FirstOrDefaultAsync(); } + public async Task GetMetadataSettings() + { + return await _context.MetadataSettings + .Include(m => m.FieldMappings) + .FirstAsync(); + } + + public async Task GetMetadataSettingDto() + { + return await _context.MetadataSettings + .Include(m => m.FieldMappings) + .ProjectTo(_mapper.ConfigurationProvider) + .FirstAsync(); + } + public async Task GetSettingsDtoAsync() { var settings = await _context.ServerSetting diff --git a/API/Data/Repositories/SiteThemeRepository.cs b/API/Data/Repositories/SiteThemeRepository.cs index 2498dfa60..33517e846 100644 --- a/API/Data/Repositories/SiteThemeRepository.cs +++ b/API/Data/Repositories/SiteThemeRepository.cs @@ -8,6 +8,7 @@ using AutoMapper.QueryableExtensions; using Microsoft.EntityFrameworkCore; namespace API.Data.Repositories; +#nullable enable public interface ISiteThemeRepository { diff --git a/API/Data/Repositories/TagRepository.cs b/API/Data/Repositories/TagRepository.cs index 4a7fbf4ab..40d40a675 100644 --- a/API/Data/Repositories/TagRepository.cs +++ b/API/Data/Repositories/TagRepository.cs @@ -2,15 +2,18 @@ using System.Linq; using System.Threading.Tasks; using API.DTOs.Metadata; +using API.DTOs.Metadata.Browse; using API.Entities; using API.Extensions; using API.Extensions.QueryExtensions; +using API.Helpers; using API.Services.Tasks.Scanner.Parser; using AutoMapper; using AutoMapper.QueryableExtensions; using Microsoft.EntityFrameworkCore; namespace API.Data.Repositories; +#nullable enable public interface ITagRepository { @@ -22,6 +25,7 @@ public interface ITagRepository Task RemoveAllTagNoLongerAssociated(); Task> GetAllTagDtosForLibrariesAsync(int userId, IList? libraryIds = null); Task> GetAllTagsNotInListAsync(ICollection tags); + Task> GetBrowseableTag(int userId, UserParams userParams); } public class TagRepository : ITagRepository @@ -103,6 +107,40 @@ public class TagRepository : ITagRepository return missingTags.Select(normalizedName => normalizedToOriginalMap[normalizedName]).ToList(); } + public async Task> GetBrowseableTag(int userId, UserParams userParams) + { + var ageRating = await _context.AppUser.GetUserAgeRestriction(userId); + + var allLibrariesCount = await _context.Library.CountAsync(); + var userLibs = await _context.Library.GetUserLibraries(userId).ToListAsync(); + + var seriesIds = _context.Series.Where(s => userLibs.Contains(s.LibraryId)).Select(s => s.Id); + + var query = _context.Tag + .RestrictAgainstAgeRestriction(ageRating) + .WhereIf(userLibs.Count != allLibrariesCount, + tag => tag.Chapters.Any(cp => seriesIds.Contains(cp.Volume.SeriesId)) || + tag.SeriesMetadatas.Any(sm => seriesIds.Contains(sm.SeriesId))) + .Select(g => new BrowseTagDto + { + Id = g.Id, + Title = g.Title, + SeriesCount = g.SeriesMetadatas + .Where(sm => allLibrariesCount == userLibs.Count || seriesIds.Contains(sm.SeriesId)) + .RestrictAgainstAgeRestriction(ageRating) + .Distinct() + .Count(), + ChapterCount = g.Chapters + .Where(ch => allLibrariesCount == userLibs.Count || seriesIds.Contains(ch.Volume.SeriesId)) + .RestrictAgainstAgeRestriction(ageRating) + .Distinct() + .Count() + }) + .OrderBy(g => g.Title); + + return await PagedList.CreateAsync(query, userParams.PageNumber, userParams.PageSize); + } + public async Task> GetAllTagsAsync() { return await _context.Tag.ToListAsync(); diff --git a/API/Data/Repositories/UserRepository.cs b/API/Data/Repositories/UserRepository.cs index 40e614e59..6437cfcfe 100644 --- a/API/Data/Repositories/UserRepository.cs +++ b/API/Data/Repositories/UserRepository.cs @@ -7,6 +7,7 @@ using API.DTOs; using API.DTOs.Account; using API.DTOs.Dashboard; using API.DTOs.Filtering.v2; +using API.DTOs.KavitaPlus.Account; using API.DTOs.Reader; using API.DTOs.Scrobbling; using API.DTOs.SeriesDetail; @@ -15,12 +16,14 @@ using API.Entities; using API.Extensions; using API.Extensions.QueryExtensions; using API.Extensions.QueryExtensions.Filtering; +using API.Helpers; using AutoMapper; using AutoMapper.QueryableExtensions; using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; namespace API.Data.Repositories; +#nullable enable [Flags] public enum AppUserIncludes @@ -39,7 +42,8 @@ public enum AppUserIncludes DashboardStreams = 2048, SideNavStreams = 4096, ExternalSources = 8192, - Collections = 16384 // 2^14 + Collections = 16384, // 2^14 + ChapterRatings = 1 << 15, } public interface IUserRepository @@ -54,13 +58,17 @@ public interface IUserRepository void Delete(AppUser? user); void Delete(AppUserBookmark bookmark); void Delete(IEnumerable streams); + void Delete(AppUserDashboardStream stream); void Delete(IEnumerable streams); + void Delete(AppUserSideNavStream stream); Task> GetEmailConfirmedMemberDtosAsync(bool emailConfirmed = true); Task> GetAdminUsersAsync(); Task IsUserAdminAsync(AppUser? user); Task> GetRoles(int userId); Task GetUserRatingAsync(int seriesId, int userId); + Task GetUserChapterRatingAsync(int userId, int chapterId); Task> GetUserRatingDtosForSeriesAsync(int seriesId, int userId); + Task> GetUserRatingDtosForChapterAsync(int chapterId, int userId); Task GetPreferencesAsync(string username); Task> GetBookmarkDtosForSeries(int userId, int seriesId); Task> GetBookmarkDtosForVolume(int userId, int volumeId); @@ -92,10 +100,13 @@ public interface IUserRepository Task> GetDashboardStreamWithFilter(int filterId); Task> GetSideNavStreams(int userId, bool visibleOnly = false); Task GetSideNavStream(int streamId); + Task GetSideNavStreamWithUser(int streamId); Task> GetSideNavStreamWithFilter(int filterId); Task> GetSideNavStreamsByLibraryId(int libraryId); Task> GetSideNavStreamWithExternalSource(int externalSourceId); Task> GetDashboardStreamsByIds(IList streamIds); + Task> GetUserTokenInfo(); + Task GetUserByDeviceEmail(string deviceEmail); } public class UserRepository : IUserRepository @@ -162,11 +173,21 @@ public class UserRepository : IUserRepository _context.AppUserDashboardStream.RemoveRange(streams); } + public void Delete(AppUserDashboardStream stream) + { + _context.AppUserDashboardStream.Remove(stream); + } + public void Delete(IEnumerable streams) { _context.AppUserSideNavStream.RemoveRange(streams); } + public void Delete(AppUserSideNavStream stream) + { + _context.AppUserSideNavStream.Remove(stream); + } + /// /// A one stop shop to get a tracked AppUser instance with any number of JOINs generated by passing bitwise flags. /// @@ -391,6 +412,7 @@ public class UserRepository : IUserRepository .FirstOrDefaultAsync(d => d.Id == streamId); } + public async Task> GetDashboardStreamWithFilter(int filterId) { return await _context.AppUserDashboardStream @@ -427,10 +449,10 @@ public class UserRepository : IUserRepository .Select(d => d.LibraryId) .ToList(); - var libraryDtos = _context.Library + var libraryDtos = await _context.Library .Where(l => libraryIds.Contains(l.Id)) .ProjectTo(_mapper.ConfigurationProvider) - .ToList(); + .ToListAsync(); foreach (var dto in sideNavStreams.Where(dto => dto.StreamType == SideNavStreamType.Library)) { @@ -454,13 +476,21 @@ public class UserRepository : IUserRepository return sideNavStreams; } - public async Task GetSideNavStream(int streamId) + public async Task GetSideNavStream(int streamId) { return await _context.AppUserSideNavStream .Include(d => d.SmartFilter) .FirstOrDefaultAsync(d => d.Id == streamId); } + public async Task GetSideNavStreamWithUser(int streamId) + { + return await _context.AppUserSideNavStream + .Include(d => d.SmartFilter) + .Include(d => d.AppUser) + .FirstOrDefaultAsync(d => d.Id == streamId); + } + public async Task> GetSideNavStreamWithFilter(int filterId) { return await _context.AppUserSideNavStream @@ -490,6 +520,43 @@ public class UserRepository : IUserRepository .ToListAsync(); } + public async Task> GetUserTokenInfo() + { + var users = await _context.AppUser + .Select(u => new + { + u.Id, + u.UserName, + u.AniListAccessToken, // JWT Token + u.MalAccessToken // JWT Token + }) + .ToListAsync(); + + var userTokenInfos = users.Select(user => new UserTokenInfo + { + UserId = user.Id, + Username = user.UserName, + IsAniListTokenSet = !string.IsNullOrEmpty(user.AniListAccessToken), + AniListValidUntilUtc = JwtHelper.GetTokenExpiry(user.AniListAccessToken), + IsAniListTokenValid = JwtHelper.IsTokenValid(user.AniListAccessToken), + IsMalTokenSet = !string.IsNullOrEmpty(user.MalAccessToken), + }); + + return userTokenInfos; + } + + /// + /// Returns the first user with a device email matching + /// + /// + /// + public async Task GetUserByDeviceEmail(string deviceEmail) + { + return await _context.AppUser + .Where(u => u.Devices.Any(d => d.EmailAddress == deviceEmail)) + .FirstOrDefaultAsync(); + } + public async Task> GetAdminUsersAsync() { @@ -505,7 +572,16 @@ public class UserRepository : IUserRepository public async Task> GetRoles(int userId) { var user = await _context.Users.FirstOrDefaultAsync(u => u.Id == userId); - if (user == null || _userManager == null) return ArraySegment.Empty; // userManager is null on Unit Tests only + if (user == null) return ArraySegment.Empty; + + if (_userManager == null) + { + // userManager is null on Unit Tests only + return await _context.UserRoles + .Where(ur => ur.UserId == userId) + .Select(ur => ur.Role.Name) + .ToListAsync(); + } return await _userManager.GetRolesAsync(user); } @@ -514,7 +590,14 @@ public class UserRepository : IUserRepository { return await _context.AppUserRating .Where(r => r.SeriesId == seriesId && r.AppUserId == userId) - .SingleOrDefaultAsync(); + .FirstOrDefaultAsync(); + } + + public async Task GetUserChapterRatingAsync(int userId, int chapterId) + { + return await _context.AppUserChapterRating + .Where(r => r.AppUserId == userId && r.ChapterId == chapterId) + .FirstOrDefaultAsync(); } public async Task> GetUserRatingDtosForSeriesAsync(int seriesId, int userId) @@ -530,6 +613,19 @@ public class UserRepository : IUserRepository .ToListAsync(); } + public async Task> GetUserRatingDtosForChapterAsync(int chapterId, int userId) + { + return await _context.AppUserChapterRating + .Include(r => r.AppUser) + .Where(r => r.ChapterId == chapterId) + .Where(r => r.AppUser.UserPreferences.ShareReviews || r.AppUserId == userId) + .OrderBy(r => r.AppUserId == userId) + .ThenBy(r => r.Rating) + .AsSplitQuery() + .ProjectTo(_mapper.ConfigurationProvider) + .ToListAsync(); + } + public async Task GetPreferencesAsync(string username) { return await _context.AppUserPreferences @@ -661,7 +757,7 @@ public class UserRepository : IUserRepository /// - /// Fetches the UserId by API Key. This does not include any extra information + /// Fetches the AppUserId by API Key. This does not include any extra information /// /// /// diff --git a/API/Data/Repositories/VolumeRepository.cs b/API/Data/Repositories/VolumeRepository.cs index 0dfbd6393..4b07ade96 100644 --- a/API/Data/Repositories/VolumeRepository.cs +++ b/API/Data/Repositories/VolumeRepository.cs @@ -15,6 +15,7 @@ using Kavita.Common; using Microsoft.EntityFrameworkCore; namespace API.Data.Repositories; +#nullable enable [Flags] public enum VolumeIncludes @@ -34,6 +35,7 @@ public interface IVolumeRepository void Add(Volume volume); void Update(Volume volume); void Remove(Volume volume); + void Remove(IList volumes); Task> GetFilesForVolume(int volumeId); Task GetVolumeCoverImageAsync(int volumeId); Task> GetChapterIdsByVolumeIds(IReadOnlyList volumeIds); @@ -42,6 +44,7 @@ public interface IVolumeRepository Task GetVolumeDtoAsync(int volumeId, int userId); Task> GetVolumesForSeriesAsync(IList seriesIds, bool includeChapters = false); Task> GetVolumes(int seriesId); + Task> GetVolumesById(IList volumeIds, VolumeIncludes includes = VolumeIncludes.None); Task GetVolumeByIdAsync(int volumeId); Task> GetAllWithCoversInDifferentEncoding(EncodeFormat encodeFormat); Task> GetCoverImagesForLockedVolumesAsync(); @@ -71,6 +74,10 @@ public class VolumeRepository : IVolumeRepository { _context.Volume.Remove(volume); } + public void Remove(IList volumes) + { + _context.Volume.RemoveRange(volumes); + } /// /// Returns a list of non-tracked files for a given volume. @@ -179,6 +186,15 @@ public class VolumeRepository : IVolumeRepository .OrderBy(vol => vol.MinNumber) .ToListAsync(); } + public async Task> GetVolumesById(IList volumeIds, VolumeIncludes includes = VolumeIncludes.None) + { + return await _context.Volume + .Where(vol => volumeIds.Contains(vol.Id)) + .Includes(includes) + .AsSplitQuery() + .OrderBy(vol => vol.MinNumber) + .ToListAsync(); + } /// /// Returns a single volume with Chapter and Files diff --git a/API/Data/Seed.cs b/API/Data/Seed.cs index 85971558c..c08f80afa 100644 --- a/API/Data/Seed.cs +++ b/API/Data/Seed.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; +using System.Globalization; using System.IO; using System.Linq; using System.Reflection; @@ -10,6 +11,7 @@ using API.Data.Repositories; using API.Entities; using API.Entities.Enums; using API.Entities.Enums.Theme; +using API.Entities.MetadataMatching; using API.Extensions; using API.Services; using Kavita.Common; @@ -118,7 +120,7 @@ public static class Seed new AppUserSideNavStream() { Name = "browse-authors", - StreamType = SideNavStreamType.BrowseAuthors, + StreamType = SideNavStreamType.BrowsePeople, Order = 6, IsProvided = true, Visible = true @@ -261,13 +263,12 @@ public static class Seed new() {Key = ServerSettingKey.EmailSizeLimit, Value = 26_214_400 + string.Empty}, new() {Key = ServerSettingKey.EmailCustomizedTemplates, Value = "false"}, new() {Key = ServerSettingKey.FirstInstallVersion, Value = BuildInfo.Version.ToString()}, - new() {Key = ServerSettingKey.FirstInstallDate, Value = DateTime.UtcNow.ToString()}, - + new() {Key = ServerSettingKey.FirstInstallDate, Value = DateTime.UtcNow.ToString(CultureInfo.InvariantCulture)}, }.ToArray()); foreach (var defaultSetting in DefaultSettings) { - var existing = context.ServerSetting.FirstOrDefault(s => s.Key == defaultSetting.Key); + var existing = await context.ServerSetting.FirstOrDefaultAsync(s => s.Key == defaultSetting.Key); if (existing == null) { await context.ServerSetting.AddAsync(defaultSetting); @@ -277,16 +278,51 @@ public static class Seed await context.SaveChangesAsync(); // Port, IpAddresses and LoggingLevel are managed in appSettings.json. Update the DB values to match - context.ServerSetting.First(s => s.Key == ServerSettingKey.Port).Value = + (await context.ServerSetting.FirstAsync(s => s.Key == ServerSettingKey.Port)).Value = Configuration.Port + string.Empty; - context.ServerSetting.First(s => s.Key == ServerSettingKey.IpAddresses).Value = + (await context.ServerSetting.FirstAsync(s => s.Key == ServerSettingKey.IpAddresses)).Value = Configuration.IpAddresses; - context.ServerSetting.First(s => s.Key == ServerSettingKey.CacheDirectory).Value = + (await context.ServerSetting.FirstAsync(s => s.Key == ServerSettingKey.CacheDirectory)).Value = directoryService.CacheDirectory + string.Empty; - context.ServerSetting.First(s => s.Key == ServerSettingKey.BackupDirectory).Value = + (await context.ServerSetting.FirstAsync(s => s.Key == ServerSettingKey.BackupDirectory)).Value = DirectoryService.BackupDirectory + string.Empty; - context.ServerSetting.First(s => s.Key == ServerSettingKey.CacheSize).Value = + (await context.ServerSetting.FirstAsync(s => s.Key == ServerSettingKey.CacheSize)).Value = Configuration.CacheSize + string.Empty; + + await context.SaveChangesAsync(); + } + + public static async Task SeedMetadataSettings(DataContext context) + { + await context.Database.EnsureCreatedAsync(); + + var existing = await context.MetadataSettings.FirstOrDefaultAsync(); + if (existing == null) + { + existing = new MetadataSettings() + { + Enabled = true, + EnablePeople = true, + EnableRelationships = true, + EnableSummary = true, + EnablePublicationStatus = true, + EnableStartDate = true, + EnableTags = false, + EnableGenres = true, + EnableLocalizedName = false, + FirstLastPeopleNaming = true, + EnableCoverImage = true, + EnableChapterTitle = false, + EnableChapterSummary = true, + EnableChapterPublisher = true, + EnableChapterCoverImage = false, + EnableChapterReleaseDate = true, + PersonRoles = [PersonRole.Writer, PersonRole.CoverArtist, PersonRole.Character] + }; + await context.MetadataSettings.AddAsync(existing); + } + + await context.SaveChangesAsync(); } diff --git a/API/Data/UnitOfWork.cs b/API/Data/UnitOfWork.cs index e3c1ffcb1..d72dd3bc7 100644 --- a/API/Data/UnitOfWork.cs +++ b/API/Data/UnitOfWork.cs @@ -32,6 +32,8 @@ public interface IUnitOfWork IAppUserSmartFilterRepository AppUserSmartFilterRepository { get; } IAppUserExternalSourceRepository AppUserExternalSourceRepository { get; } IExternalSeriesMetadataRepository ExternalSeriesMetadataRepository { get; } + IEmailHistoryRepository EmailHistoryRepository { get; } + IAppUserReadingProfileRepository AppUserReadingProfileRepository { get; } bool Commit(); Task CommitAsync(); bool HasChanges(); @@ -72,6 +74,8 @@ public class UnitOfWork : IUnitOfWork AppUserSmartFilterRepository = new AppUserSmartFilterRepository(_context, _mapper); AppUserExternalSourceRepository = new AppUserExternalSourceRepository(_context, _mapper); ExternalSeriesMetadataRepository = new ExternalSeriesMetadataRepository(_context, _mapper); + EmailHistoryRepository = new EmailHistoryRepository(_context, _mapper); + AppUserReadingProfileRepository = new AppUserReadingProfileRepository(_context, _mapper); } /// @@ -100,6 +104,8 @@ public class UnitOfWork : IUnitOfWork public IAppUserSmartFilterRepository AppUserSmartFilterRepository { get; } public IAppUserExternalSourceRepository AppUserExternalSourceRepository { get; } public IExternalSeriesMetadataRepository ExternalSeriesMetadataRepository { get; } + public IEmailHistoryRepository EmailHistoryRepository { get; } + public IAppUserReadingProfileRepository AppUserReadingProfileRepository { get; } /// /// Commits changes to the DB. Completes the open transaction. diff --git a/API/EmailTemplates/KavitaPlusDebug.html b/API/EmailTemplates/KavitaPlusDebug.html new file mode 100644 index 000000000..e165dfb98 --- /dev/null +++ b/API/EmailTemplates/KavitaPlusDebug.html @@ -0,0 +1,20 @@ + + +

A User needs manual registration

+ + + +
+ + + + + + +
+ + diff --git a/API/EmailTemplates/TokenExpiration.html b/API/EmailTemplates/TokenExpiration.html new file mode 100644 index 000000000..1162dc75b --- /dev/null +++ b/API/EmailTemplates/TokenExpiration.html @@ -0,0 +1,28 @@ + + +

Your {{Provider}} Token is Expired!

+ + + +

Kavita will stop syncing with {{Provider}} until you renew your token.

+ + + + + +
+ + + + + +
+ + + +

If the button above does not work, please find the link here: {{Link}}

+ + diff --git a/API/EmailTemplates/TokenExpiringSoon.html b/API/EmailTemplates/TokenExpiringSoon.html new file mode 100644 index 000000000..960b9b6e5 --- /dev/null +++ b/API/EmailTemplates/TokenExpiringSoon.html @@ -0,0 +1,28 @@ + + +

Your {{Provider}} Token will Expire soon!

+ + + +

Kavita will stop syncing with {{Provider}} until you renew your token.

+ + + + + +
+ + + + + +
+ + + +

If the button above does not work, please find the link here: {{Link}}

+ + diff --git a/API/Entities/AppUser.cs b/API/Entities/AppUser.cs index 2e6f42d3d..848636209 100644 --- a/API/Entities/AppUser.cs +++ b/API/Entities/AppUser.cs @@ -19,7 +19,9 @@ public class AppUser : IdentityUser, IHasConcurrencyToken public ICollection UserRoles { get; set; } = null!; public ICollection Progresses { get; set; } = null!; public ICollection Ratings { get; set; } = null!; + public ICollection ChapterRatings { get; set; } = null!; public AppUserPreferences UserPreferences { get; set; } = null!; + public ICollection ReadingProfiles { get; set; } = null!; /// /// Bookmarks associated with this User /// @@ -76,6 +78,18 @@ public class AppUser : IdentityUser, IHasConcurrencyToken /// public string? MalAccessToken { get; set; } + /// + /// Has the user ran Scrobble Event Generation + /// + /// Only applicable for Kavita+ and when a Token is present + public bool HasRunScrobbleEventGeneration { get; set; } + /// + /// The timestamp of when Scrobble Event Generation ran (Utc) + /// + /// Kavita+ only + public DateTime ScrobbleEventGenerationRan { get; set; } + + /// /// A list of Series the user doesn't want scrobbling for /// diff --git a/API/Entities/AppUserChapterRating.cs b/API/Entities/AppUserChapterRating.cs new file mode 100644 index 000000000..a78096bda --- /dev/null +++ b/API/Entities/AppUserChapterRating.cs @@ -0,0 +1,30 @@ +namespace API.Entities; + +public class AppUserChapterRating +{ + public int Id { get; set; } + /// + /// A number between 0-5.0 that represents how good a series is. + /// + public float Rating { get; set; } + /// + /// If the rating has been explicitly set. Otherwise, the 0.0 rating should be ignored as it's not rated + /// + public bool HasBeenRated { get; set; } + /// + /// A short summary the user can write when giving their review. + /// + public string? Review { get; set; } + /// + /// An optional tagline for the review + /// + public int SeriesId { get; set; } + public Series Series { get; set; } = null!; + + public int ChapterId { get; set; } + public Chapter Chapter { get; set; } = null!; + + // Relationships + public int AppUserId { get; set; } + public AppUser AppUser { get; set; } = null!; +} diff --git a/API/Entities/AppUserPreferences.cs b/API/Entities/AppUserPreferences.cs index 006d9037c..b0f21bcba 100644 --- a/API/Entities/AppUserPreferences.cs +++ b/API/Entities/AppUserPreferences.cs @@ -1,4 +1,5 @@ -using API.Data; +using System.Collections.Generic; +using API.Data; using API.Entities.Enums; using API.Entities.Enums.UserPreferences; @@ -54,6 +55,10 @@ public class AppUserPreferences /// Manga Reader Option: Should swiping trigger pagination /// public bool SwipeToPaginate { get; set; } + /// + /// Manga Reader Option: Allow Automatic Webtoon detection + /// + public bool AllowAutomaticWebtoonReaderDetection { get; set; } #endregion @@ -160,7 +165,17 @@ public class AppUserPreferences /// UI Site Global Setting: The language locale that should be used for the user /// public string Locale { get; set; } + #endregion + #region KavitaPlus + /// + /// Should this account have Scrobbling enabled for AniList + /// + public bool AniListScrobblingEnabled { get; set; } + /// + /// Should this account have Want to Read Sync enabled + /// + public bool WantToReadSync { get; set; } #endregion public AppUser AppUser { get; set; } = null!; diff --git a/API/Entities/AppUserProgress.cs b/API/Entities/AppUserProgress.cs index edbd25aa7..beaf07220 100644 --- a/API/Entities/AppUserProgress.cs +++ b/API/Entities/AppUserProgress.cs @@ -7,7 +7,7 @@ namespace API.Entities; /// /// Represents the progress a single user has on a given Chapter. /// -public class AppUserProgress +public class AppUserProgress : IEntityDate { /// /// Id of Entity diff --git a/API/Entities/AppUserRating.cs b/API/Entities/AppUserRating.cs index 5d66a06e4..e76838926 100644 --- a/API/Entities/AppUserRating.cs +++ b/API/Entities/AppUserRating.cs @@ -26,7 +26,6 @@ public class AppUserRating public int SeriesId { get; set; } public Series Series { get; set; } = null!; - // Relationships public int AppUserId { get; set; } public AppUser AppUser { get; set; } = null!; diff --git a/API/Entities/AppUserReadingProfile.cs b/API/Entities/AppUserReadingProfile.cs new file mode 100644 index 000000000..9b238b4f5 --- /dev/null +++ b/API/Entities/AppUserReadingProfile.cs @@ -0,0 +1,160 @@ +using System.Collections.Generic; +using System.ComponentModel; +using API.Entities.Enums; +using API.Entities.Enums.UserPreferences; + +namespace API.Entities; + +public enum BreakPoint +{ + [Description("Never")] + Never = 0, + [Description("Mobile")] + Mobile = 1, + [Description("Tablet")] + Tablet = 2, + [Description("Desktop")] + Desktop = 3, +} + +public class AppUserReadingProfile +{ + public int Id { get; set; } + + public string Name { get; set; } + public string NormalizedName { get; set; } + + public int AppUserId { get; set; } + public AppUser AppUser { get; set; } + + public ReadingProfileKind Kind { get; set; } + public List LibraryIds { get; set; } + public List SeriesIds { get; set; } + + #region MangaReader + + /// + /// Manga Reader Option: What direction should the next/prev page buttons go + /// + public ReadingDirection ReadingDirection { get; set; } = ReadingDirection.LeftToRight; + /// + /// Manga Reader Option: How should the image be scaled to screen + /// + public ScalingOption ScalingOption { get; set; } = ScalingOption.Automatic; + /// + /// Manga Reader Option: Which side of a split image should we show first + /// + public PageSplitOption PageSplitOption { get; set; } = PageSplitOption.FitSplit; + /// + /// Manga Reader Option: How the manga reader should perform paging or reading of the file + /// + /// Webtoon uses scrolling to page, MANGA_LR uses paging by clicking left/right side of reader, MANGA_UD uses paging + /// by clicking top/bottom sides of reader. + /// + /// + public ReaderMode ReaderMode { get; set; } + /// + /// Manga Reader Option: Allow the menu to close after 6 seconds without interaction + /// + public bool AutoCloseMenu { get; set; } = true; + /// + /// Manga Reader Option: Show screen hints to the user on some actions, ie) pagination direction change + /// + public bool ShowScreenHints { get; set; } = true; + /// + /// Manga Reader Option: Emulate a book by applying a shadow effect on the pages + /// + public bool EmulateBook { get; set; } = false; + /// + /// Manga Reader Option: How many pages to display in the reader at once + /// + public LayoutMode LayoutMode { get; set; } = LayoutMode.Single; + /// + /// Manga Reader Option: Background color of the reader + /// + public string BackgroundColor { get; set; } = "#000000"; + /// + /// Manga Reader Option: Should swiping trigger pagination + /// + public bool SwipeToPaginate { get; set; } + /// + /// Manga Reader Option: Allow Automatic Webtoon detection + /// + public bool AllowAutomaticWebtoonReaderDetection { get; set; } + /// + /// Manga Reader Option: Optional fixed width override + /// + public int? WidthOverride { get; set; } = null; + /// + /// Manga Reader Option: Disable the width override if the screen is past the breakpoint + /// + public BreakPoint DisableWidthOverride { get; set; } = BreakPoint.Never; + + #endregion + + #region EpubReader + + /// + /// Book Reader Option: Override extra Margin + /// + public int BookReaderMargin { get; set; } = 15; + /// + /// Book Reader Option: Override line-height + /// + public int BookReaderLineSpacing { get; set; } = 100; + /// + /// Book Reader Option: Override font size + /// + public int BookReaderFontSize { get; set; } = 100; + /// + /// Book Reader Option: Maps to the default Kavita font-family (inherit) or an override + /// + public string BookReaderFontFamily { get; set; } = "default"; + /// + /// Book Reader Option: Allows tapping on side of screens to paginate + /// + public bool BookReaderTapToPaginate { get; set; } = false; + /// + /// Book Reader Option: What direction should the next/prev page buttons go + /// + public ReadingDirection BookReaderReadingDirection { get; set; } = ReadingDirection.LeftToRight; + /// + /// Book Reader Option: Defines the writing styles vertical/horizontal + /// + public WritingStyle BookReaderWritingStyle { get; set; } = WritingStyle.Horizontal; + /// + /// Book Reader Option: The color theme to decorate the book contents + /// + /// Should default to Dark + public string BookThemeName { get; set; } = "Dark"; + /// + /// Book Reader Option: The way a page from a book is rendered. Default is as book dictates, 1 column is fit to height, + /// 2 column is fit to height, 2 columns + /// + /// Defaults to Default + public BookPageLayoutMode BookReaderLayoutMode { get; set; } = BookPageLayoutMode.Default; + /// + /// Book Reader Option: A flag that hides the menu-ing system behind a click on the screen. This should be used with tap to paginate, but the app doesn't enforce this. + /// + /// Defaults to false + public bool BookReaderImmersiveMode { get; set; } = false; + #endregion + + #region PdfReader + + /// + /// PDF Reader: Theme of the Reader + /// + public PdfTheme PdfTheme { get; set; } = PdfTheme.Dark; + /// + /// PDF Reader: Scroll mode of the reader + /// + public PdfScrollMode PdfScrollMode { get; set; } = PdfScrollMode.Vertical; + /// + /// PDF Reader: Spread Mode of the reader + /// + public PdfSpreadMode PdfSpreadMode { get; set; } = PdfSpreadMode.None; + + + #endregion +} diff --git a/API/Entities/Chapter.cs b/API/Entities/Chapter.cs index a00f315c3..fe3646943 100644 --- a/API/Entities/Chapter.cs +++ b/API/Entities/Chapter.cs @@ -3,12 +3,15 @@ using System.Collections.Generic; using System.Globalization; using API.Entities.Enums; using API.Entities.Interfaces; +using API.Entities.Metadata; +using API.Entities.MetadataMatching; +using API.Entities.Person; using API.Extensions; using API.Services.Tasks.Scanner.Parser; namespace API.Entities; -public class Chapter : IEntityDate, IHasReadTimeEstimate, IHasCoverImage +public class Chapter : IEntityDate, IHasReadTimeEstimate, IHasCoverImage, IHasKPlusMetadata { public int Id { get; set; } /// @@ -124,6 +127,16 @@ public class Chapter : IEntityDate, IHasReadTimeEstimate, IHasCoverImage public string WebLinks { get; set; } = string.Empty; public string ISBN { get; set; } = string.Empty; + /// + /// Tracks which metadata has been set by K+ + /// + public IList KPlusOverrides { get; set; } = []; + + /// + /// (Kavita+) Average rating from Kavita+ metadata + /// + public float AverageExternalRating { get; set; } = 0f; + #region Locks public bool AgeRatingLocked { get; set; } @@ -159,6 +172,7 @@ public class Chapter : IEntityDate, IHasReadTimeEstimate, IHasCoverImage /// public ICollection Genres { get; set; } = new List(); public ICollection Tags { get; set; } = new List(); + public ICollection Ratings { get; set; } = []; public ICollection UserProgress { get; set; } @@ -167,6 +181,9 @@ public class Chapter : IEntityDate, IHasReadTimeEstimate, IHasCoverImage public Volume Volume { get; set; } = null!; public int VolumeId { get; set; } + public ICollection ExternalReviews { get; set; } = []; + public ICollection ExternalRatings { get; set; } = null!; + public void UpdateFrom(ParserInfo info) { Files ??= new List(); @@ -177,8 +194,7 @@ public class Chapter : IEntityDate, IHasReadTimeEstimate, IHasCoverImage MinNumber = Parser.DefaultChapterNumber; MaxNumber = Parser.DefaultChapterNumber; } - // NOTE: This doesn't work well for all because Pdf usually should use into.Title or even filename - Title = (IsSpecial && info.Format == MangaFormat.Epub) + Title = (IsSpecial && info.Format is MangaFormat.Epub or MangaFormat.Pdf) ? info.Title : Parser.RemoveExtensionIfSupported(Range); @@ -192,8 +208,6 @@ public class Chapter : IEntityDate, IHasReadTimeEstimate, IHasCoverImage /// public string GetNumberTitle() { - // BUG: TODO: On non-english locales, for floats, the range will be 20,5 but the NumberTitle will return 20.5 - // Have I fixed this with TryParse CultureInvariant try { if (MinNumber.Is(MaxNumber)) @@ -234,4 +248,25 @@ public class Chapter : IEntityDate, IHasReadTimeEstimate, IHasCoverImage PrimaryColor = string.Empty; SecondaryColor = string.Empty; } + + public bool IsPersonRoleLocked(PersonRole role) + { + return role switch + { + PersonRole.Character => CharacterLocked, + PersonRole.Writer => WriterLocked, + PersonRole.Penciller => PencillerLocked, + PersonRole.Inker => InkerLocked, + PersonRole.Colorist => ColoristLocked, + PersonRole.Letterer => LettererLocked, + PersonRole.CoverArtist => CoverArtistLocked, + PersonRole.Editor => EditorLocked, + PersonRole.Publisher => PublisherLocked, + PersonRole.Translator => TranslatorLocked, + PersonRole.Imprint => ImprintLocked, + PersonRole.Team => TeamLocked, + PersonRole.Location => LocationLocked, + _ => throw new ArgumentOutOfRangeException(nameof(role), role, null) + }; + } } diff --git a/API/Entities/EmailHistory.cs b/API/Entities/EmailHistory.cs new file mode 100644 index 000000000..f1ab95ca5 --- /dev/null +++ b/API/Entities/EmailHistory.cs @@ -0,0 +1,31 @@ +using System; +using API.Entities.Interfaces; +using Microsoft.EntityFrameworkCore; + +namespace API.Entities; + +/// +/// Records all emails that are sent from Kavita +/// +[Index("Sent", "AppUserId", "EmailTemplate", "SendDate")] +public class EmailHistory : IEntityDate +{ + public long Id { get; set; } + public bool Sent { get; set; } + public DateTime SendDate { get; set; } = DateTime.UtcNow; + public string EmailTemplate { get; set; } + public string Subject { get; set; } + public string Body { get; set; } + + public string DeliveryStatus { get; set; } + public string ErrorMessage { get; set; } + + public int AppUserId { get; set; } + public virtual AppUser AppUser { get; set; } + + + public DateTime Created { get; set; } + public DateTime CreatedUtc { get; set; } + public DateTime LastModified { get; set; } + public DateTime LastModifiedUtc { get; set; } +} diff --git a/API/Entities/Enums/LibraryType.cs b/API/Entities/Enums/LibraryType.cs index 40d1b10a8..a8d943b2d 100644 --- a/API/Entities/Enums/LibraryType.cs +++ b/API/Entities/Enums/LibraryType.cs @@ -12,7 +12,7 @@ public enum LibraryType /// /// Uses Comic regex for filename parsing /// - [Description("Comic")] + [Description("Comic (Legacy)")] Comic = 1, /// /// Uses Manga regex for filename parsing also uses epub metadata @@ -30,8 +30,8 @@ public enum LibraryType [Description("Light Novel")] LightNovel = 4, /// - /// Uses Comic regex for filename parsing, uses Comic Vine type of Parsing. Will replace Comic type in future + /// Uses Comic regex for filename parsing, uses Comic Vine type of Parsing /// - [Description("Comic (Comic Vine)")] + [Description("Comic")] ComicVine = 5, } diff --git a/API/Entities/Enums/MetadataFieldType.cs b/API/Entities/Enums/MetadataFieldType.cs new file mode 100644 index 000000000..0052b6599 --- /dev/null +++ b/API/Entities/Enums/MetadataFieldType.cs @@ -0,0 +1,7 @@ +namespace API.Entities.Enums; + +public enum MetadataFieldType +{ + Genre = 0, + Tag = 1, +} diff --git a/API/Entities/Enums/RatingAuthority.cs b/API/Entities/Enums/RatingAuthority.cs new file mode 100644 index 000000000..0f358a9a7 --- /dev/null +++ b/API/Entities/Enums/RatingAuthority.cs @@ -0,0 +1,17 @@ +using System.ComponentModel; + +namespace API.Entities.Enums; + +public enum RatingAuthority +{ + /// + /// Rating was from a User (internet or local) + /// + [Description("User")] + User = 0, + /// + /// Rating was from Professional Critics + /// + [Description("Critic")] + Critic = 1, +} diff --git a/API/Entities/Enums/ReadingProfileKind.cs b/API/Entities/Enums/ReadingProfileKind.cs new file mode 100644 index 000000000..0f9cfa20b --- /dev/null +++ b/API/Entities/Enums/ReadingProfileKind.cs @@ -0,0 +1,17 @@ +namespace API.Entities.Enums; + +public enum ReadingProfileKind +{ + /// + /// Generate by Kavita when registering a user, this is your default profile + /// + Default, + /// + /// Created by the user in the UI or via the API + /// + User, + /// + /// Automatically generated by Kavita to track changes made in the readers. Can be converted to a User Reading Profile. + /// + Implicit +} diff --git a/API/Entities/History/KavitaPlusHistory.cs b/API/Entities/History/KavitaPlusHistory.cs new file mode 100644 index 000000000..81b7e5e40 --- /dev/null +++ b/API/Entities/History/KavitaPlusHistory.cs @@ -0,0 +1,9 @@ +namespace API.Entities.History; + +/// +/// Records history of actions Kavita+ takes +/// +// public class KavitaPlusHistory +// { +// +// } diff --git a/API/Entities/ManualMigrationHistory.cs b/API/Entities/History/ManualMigrationHistory.cs similarity index 91% rename from API/Entities/ManualMigrationHistory.cs rename to API/Entities/History/ManualMigrationHistory.cs index e65e07b2c..2f407ca1d 100644 --- a/API/Entities/ManualMigrationHistory.cs +++ b/API/Entities/History/ManualMigrationHistory.cs @@ -1,6 +1,6 @@ using System; -namespace API.Entities; +namespace API.Entities.History; /// /// This will track manual migrations so that I can use simple selects to check if a Manual Migration is needed diff --git a/API/Entities/Interfaces/IHasKPlusMetadata.cs b/API/Entities/Interfaces/IHasKPlusMetadata.cs new file mode 100644 index 000000000..062afd7e1 --- /dev/null +++ b/API/Entities/Interfaces/IHasKPlusMetadata.cs @@ -0,0 +1,12 @@ +using System.Collections.Generic; +using API.Entities.MetadataMatching; + +namespace API.Entities.Interfaces; + +public interface IHasKPlusMetadata +{ + /// + /// Tracks which metadata has been set by K+ + /// + public IList KPlusOverrides { get; set; } +} diff --git a/API/Entities/Library.cs b/API/Entities/Library.cs index 097c382d5..4a48fed99 100644 --- a/API/Entities/Library.cs +++ b/API/Entities/Library.cs @@ -40,8 +40,22 @@ public class Library : IEntityDate, IHasCoverImage /// /// Should this library allow Scrobble events to emit from it /// - /// Scrobbling requires a valid LicenseKey + /// Requires a valid LicenseKey public bool AllowScrobbling { get; set; } = true; + /// + /// Allow any series within this Library to download metadata. + /// + /// This does not exclude the library from being linked to wrt Series Relationships + /// Requires a valid LicenseKey + public bool AllowMetadataMatching { get; set; } = true; + /// + /// Should Kavita read metadata files from the library + /// + public bool EnableMetadata { get; set; } = true; + /// + /// Should Kavita remove sort articles "The" for the sort name + /// + public bool RemovePrefixForSortName { get; set; } = false; public DateTime Created { get; set; } diff --git a/API/Entities/MangaFile.cs b/API/Entities/MangaFile.cs index f104f4c72..afcb23e97 100644 --- a/API/Entities/MangaFile.cs +++ b/API/Entities/MangaFile.cs @@ -21,6 +21,11 @@ public class MangaFile : IEntityDate /// public required string FilePath { get; set; } /// + /// A hash of the document using Koreader's unique hashing algorithm + /// + /// KoreaderHash is only available for epub types + public string? KoreaderHash { get; set; } + /// /// Number of pages for the given file /// public int Pages { get; set; } diff --git a/API/Entities/Metadata/ExternalRating.cs b/API/Entities/Metadata/ExternalRating.cs index b325353e4..7fc2b9353 100644 --- a/API/Entities/Metadata/ExternalRating.cs +++ b/API/Entities/Metadata/ExternalRating.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using API.Entities.Enums; using API.Services.Plus; namespace API.Entities.Metadata; @@ -10,8 +11,16 @@ public class ExternalRating public int AverageScore { get; set; } public int FavoriteCount { get; set; } public ScrobbleProvider Provider { get; set; } + /// + /// Where this rating comes from: Critic or User + /// + public RatingAuthority Authority { get; set; } = RatingAuthority.User; public string? ProviderUrl { get; set; } public int SeriesId { get; set; } + /// + /// This can be null when for a series-rating + /// + public int? ChapterId { get; set; } public ICollection ExternalSeriesMetadatas { get; set; } = null!; } diff --git a/API/Entities/Metadata/ExternalReview.cs b/API/Entities/Metadata/ExternalReview.cs index 6304d98ad..73c71e5ee 100644 --- a/API/Entities/Metadata/ExternalReview.cs +++ b/API/Entities/Metadata/ExternalReview.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using API.Entities.Enums; using API.Services.Plus; namespace API.Entities.Metadata; @@ -20,6 +21,7 @@ public class ExternalReview /// public string RawBody { get; set; } public required ScrobbleProvider Provider { get; set; } + public RatingAuthority Authority { get; set; } = RatingAuthority.User; public string SiteUrl { get; set; } /// /// Reviewer's username @@ -37,6 +39,7 @@ public class ExternalReview public int SeriesId { get; set; } + public int? ChapterId { get; set; } // Relationships public ICollection ExternalSeriesMetadatas { get; set; } = null!; diff --git a/API/Entities/Metadata/ExternalSeriesMetadata.cs b/API/Entities/Metadata/ExternalSeriesMetadata.cs index 598d02184..1ab37ba3c 100644 --- a/API/Entities/Metadata/ExternalSeriesMetadata.cs +++ b/API/Entities/Metadata/ExternalSeriesMetadata.cs @@ -23,9 +23,10 @@ public class ExternalSeriesMetadata /// /// Average External Rating. -1 means not set, 0 - 100 /// - public int AverageExternalRating { get; set; } = 0; + public int AverageExternalRating { get; set; } = -1; public int AniListId { get; set; } + public int CbrId { get; set; } public long MalId { get; set; } public string GoogleBooksId { get; set; } diff --git a/API/Entities/Metadata/SeriesBlacklist.cs b/API/Entities/Metadata/SeriesBlacklist.cs index 09ff06153..3d262eeb4 100644 --- a/API/Entities/Metadata/SeriesBlacklist.cs +++ b/API/Entities/Metadata/SeriesBlacklist.cs @@ -5,10 +5,12 @@ namespace API.Entities.Metadata; /// /// A blacklist of Series for Kavita+ /// +[Obsolete("Kavita v0.8.5 moved the implementation to Series.IsBlacklisted")] public class SeriesBlacklist { public int Id { get; set; } + public DateTime LastChecked { get; set; } = DateTime.UtcNow; + public int SeriesId { get; set; } public Series Series { get; set; } - public DateTime LastChecked { get; set; } = DateTime.UtcNow; } diff --git a/API/Entities/Metadata/SeriesMetadata.cs b/API/Entities/Metadata/SeriesMetadata.cs index 6e594aa73..8bb33fdc0 100644 --- a/API/Entities/Metadata/SeriesMetadata.cs +++ b/API/Entities/Metadata/SeriesMetadata.cs @@ -1,14 +1,17 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using System.Linq; using API.Entities.Enums; using API.Entities.Interfaces; +using API.Entities.MetadataMatching; +using API.Entities.Person; using Microsoft.EntityFrameworkCore; namespace API.Entities.Metadata; [Index(nameof(Id), nameof(SeriesId), IsUnique = true)] -public class SeriesMetadata : IHasConcurrencyToken +public class SeriesMetadata : IHasConcurrencyToken, IHasKPlusMetadata { public int Id { get; set; } @@ -40,6 +43,10 @@ public class SeriesMetadata : IHasConcurrencyToken /// /// This is not populated from Chapters of the Series public string WebLinks { get; set; } = string.Empty; + /// + /// Tracks which metadata has been set by K+ + /// + public IList KPlusOverrides { get; set; } = []; #region Locks @@ -101,4 +108,26 @@ public class SeriesMetadata : IHasConcurrencyToken { RowVersion++; } + + /// + /// Any People in this Role present + /// + /// + /// + public bool AnyOfRole(PersonRole role) + { + return People.Any(p => p.Role == role); + } + + /// + /// Are all instances of the role from Kavita+ + /// + /// + /// + public bool AllKavitaPlus(PersonRole role) + { + var people = People.Where(p => p.Role == role); + if (people.Any()) return people.All(p => p.KavitaPlusConnection); + return false; + } } diff --git a/API/Entities/MetadataMatching/MetadataFieldMapping.cs b/API/Entities/MetadataMatching/MetadataFieldMapping.cs new file mode 100644 index 000000000..e7dd88c03 --- /dev/null +++ b/API/Entities/MetadataMatching/MetadataFieldMapping.cs @@ -0,0 +1,26 @@ +using API.Entities.Enums; +using API.Entities.MetadataMatching; + +namespace API.Entities; + +public class MetadataFieldMapping +{ + public int Id { get; set; } + public MetadataFieldType SourceType { get; set; } + public MetadataFieldType DestinationType { get; set; } + /// + /// The string in the source + /// + public string SourceValue { get; set; } + /// + /// Write the string as this in the Destination (can also just be the Source) + /// + public string DestinationValue { get; set; } + /// + /// If true, the tag will be Moved over vs Copied over + /// + public bool ExcludeFromSource { get; set; } + + public int MetadataSettingsId { get; set; } + public virtual MetadataSettings MetadataSettings { get; set; } +} diff --git a/API/Entities/MetadataMatching/MetadataSettingField.cs b/API/Entities/MetadataMatching/MetadataSettingField.cs new file mode 100644 index 000000000..9333c269e --- /dev/null +++ b/API/Entities/MetadataMatching/MetadataSettingField.cs @@ -0,0 +1,31 @@ +namespace API.Entities.MetadataMatching; + +/// +/// Represents which field that can be written to as an override when already locked +/// +public enum MetadataSettingField +{ + #region Series Metadata + Summary = 1, + PublicationStatus = 2, + StartDate = 3, + Genres = 4, + Tags = 5, + LocalizedName = 6, + Covers = 7, + AgeRating = 8, + People = 9, + #endregion + + #region Chapter Metadata + + ChapterTitle = 10, + ChapterSummary = 11, + ChapterReleaseDate = 12, + ChapterPublisher = 13, + ChapterCovers = 14, + + #endregion + + +} diff --git a/API/Entities/MetadataMatching/MetadataSettings.cs b/API/Entities/MetadataMatching/MetadataSettings.cs new file mode 100644 index 000000000..aeb44b619 --- /dev/null +++ b/API/Entities/MetadataMatching/MetadataSettings.cs @@ -0,0 +1,110 @@ +using System.Collections.Generic; +using API.Entities.Enums; + +namespace API.Entities.MetadataMatching; + +/// +/// Handles the metadata settings for Kavita+ +/// +public class MetadataSettings +{ + public int Id { get; set; } + /// + /// If writing any sort of metadata from upstream (AniList, Hardcover) source is allowed + /// + public bool Enabled { get; set; } + + #region Series Metadata + + /// + /// Allow the Summary to be written + /// + public bool EnableSummary { get; set; } + /// + /// Allow Publication status to be derived and updated + /// + public bool EnablePublicationStatus { get; set; } + /// + /// Allow Relationships between series to be set + /// + public bool EnableRelationships { get; set; } + /// + /// Allow People to be created (including downloading images) + /// + public bool EnablePeople { get; set; } + /// + /// Allow Start date to be set within the Series + /// + public bool EnableStartDate { get; set; } + /// + /// Allow setting the Localized name + /// + public bool EnableLocalizedName { get; set; } + /// + /// Allow setting the cover image + /// + public bool EnableCoverImage { get; set; } + #endregion + + #region Chapter Metadata + /// + /// Allow Summary to be set within Chapter/Issue + /// + public bool EnableChapterSummary { get; set; } + /// + /// Allow Release Date to be set within Chapter/Issue + /// + public bool EnableChapterReleaseDate { get; set; } + /// + /// Allow Title to be set within Chapter/Issue + /// + public bool EnableChapterTitle { get; set; } + /// + /// Allow Publisher to be set within Chapter/Issue + /// + public bool EnableChapterPublisher { get; set; } + /// + /// Allow setting the cover image for the Chapter/Issue + /// + public bool EnableChapterCoverImage { get; set; } + #endregion + + // Need to handle the Genre/tags stuff + public bool EnableGenres { get; set; } = true; + public bool EnableTags { get; set; } = true; + + /// + /// For Authors and Writers, how should names be stored (Exclusively applied for AniList). This does not affect Character names. + /// + public bool FirstLastPeopleNaming { get; set; } + + /// + /// Any Genres or Tags that if present, will trigger an Age Rating Override. Highest rating will be prioritized for matching. + /// + public Dictionary AgeRatingMappings { get; set; } + + /// + /// A list of rules that allow mapping a genre/tag to another genre/tag + /// + public List FieldMappings { get; set; } + + /// + /// A list of overrides that will enable writing to locked fields + /// + public List Overrides { get; set; } + + /// + /// Do not allow any Genre/Tag in this list to be written to Kavita + /// + public List Blacklist { get; set; } + + /// + /// Only allow these Tags to be written to Kavita + /// + public List Whitelist { get; set; } + + /// + /// Which Roles to allow metadata downloading for + /// + public List PersonRoles { get; set; } +} diff --git a/API/Entities/Person/ChapterPeople.cs b/API/Entities/Person/ChapterPeople.cs index cc0802782..c6a08a7dd 100644 --- a/API/Entities/Person/ChapterPeople.cs +++ b/API/Entities/Person/ChapterPeople.cs @@ -1,6 +1,6 @@ using API.Entities.Enums; -namespace API.Entities; +namespace API.Entities.Person; public class ChapterPeople { @@ -10,5 +10,14 @@ public class ChapterPeople public int PersonId { get; set; } public virtual Person Person { get; set; } + /// + /// The source of this connection. If not Kavita, this implies Metadata Download linked this and it can be removed between matches + /// + public bool KavitaPlusConnection { get; set; } + /// + /// A weight that allows lower numbers to sort first + /// + public int OrderWeight { get; set; } + public required PersonRole Role { get; set; } } diff --git a/API/Entities/Person/Person.cs b/API/Entities/Person/Person.cs index ba40b5f82..ed57fd6d3 100644 --- a/API/Entities/Person/Person.cs +++ b/API/Entities/Person/Person.cs @@ -1,46 +1,44 @@ using System.Collections.Generic; -using API.Entities.Enums; using API.Entities.Interfaces; -using API.Entities.Metadata; -namespace API.Entities; +namespace API.Entities.Person; public class Person : IHasCoverImage { public int Id { get; set; } public required string Name { get; set; } public required string NormalizedName { get; set; } - - //public ICollection Aliases { get; set; } = default!; + public ICollection Aliases { get; set; } = []; public string? CoverImage { get; set; } public bool CoverImageLocked { get; set; } public string PrimaryColor { get; set; } public string SecondaryColor { get; set; } - public string Description { get; set; } - /// - /// ASIN for person - /// - /// Can be used for Amazon author lookup - public string? Asin { get; set; } + public string Description { get; set; } + /// + /// ASIN for person + /// + /// Can be used for Amazon author lookup + public string? Asin { get; set; } + + /// + /// https://anilist.co/staff/{AniListId}/ + /// + /// Kavita+ Only + public int AniListId { get; set; } = 0; + /// + /// https://myanimelist.net/people/{MalId}/ + /// https://myanimelist.net/character/{MalId}/CharacterName + /// + /// Kavita+ Only + public long MalId { get; set; } = 0; + /// + /// https://hardcover.app/authors/{HardcoverId} + /// + /// Kavita+ Only + public string? HardcoverId { get; set; } - /// - /// https://anilist.co/staff/{AniListId}/ - /// - /// Kavita+ Only - public int AniListId { get; set; } = 0; - /// - /// https://myanimelist.net/people/{MalId}/ - /// https://myanimelist.net/character/{MalId}/CharacterName - /// - /// Kavita+ Only - public long MalId { get; set; } = 0; - /// - /// https://hardcover.app/authors/{HardcoverId} - /// - /// Kavita+ Only - public string? HardcoverId { get; set; } /// /// https://metron.cloud/creator/{slug}/ /// @@ -48,8 +46,8 @@ public class Person : IHasCoverImage //public long MetronId { get; set; } = 0; // Relationships - public ICollection ChapterPeople { get; set; } = new List(); - public ICollection SeriesMetadataPeople { get; set; } = new List(); + public ICollection ChapterPeople { get; set; } = []; + public ICollection SeriesMetadataPeople { get; set; } = []; public void ResetColorScape() diff --git a/API/Entities/Person/PersonAlias.cs b/API/Entities/Person/PersonAlias.cs new file mode 100644 index 000000000..f053f608d --- /dev/null +++ b/API/Entities/Person/PersonAlias.cs @@ -0,0 +1,11 @@ +namespace API.Entities.Person; + +public class PersonAlias +{ + public int Id { get; set; } + public required string Alias { get; set; } + public required string NormalizedAlias { get; set; } + + public int PersonId { get; set; } + public Person Person { get; set; } +} diff --git a/API/Entities/Person/SeriesMetadataPeople.cs b/API/Entities/Person/SeriesMetadataPeople.cs index dd188ddf0..caea10cd6 100644 --- a/API/Entities/Person/SeriesMetadataPeople.cs +++ b/API/Entities/Person/SeriesMetadataPeople.cs @@ -1,7 +1,7 @@ using API.Entities.Enums; using API.Entities.Metadata; -namespace API.Entities; +namespace API.Entities.Person; public class SeriesMetadataPeople { @@ -11,5 +11,14 @@ public class SeriesMetadataPeople public int PersonId { get; set; } public virtual Person Person { get; set; } + /// + /// The source of this connection. If not Kavita, this implies Metadata Download linked this and it can be removed between matches + /// + public bool KavitaPlusConnection { get; set; } = false; + /// + /// A weight that allows lower numbers to sort first + /// + public int OrderWeight { get; set; } + public required PersonRole Role { get; set; } } diff --git a/API/Entities/Scrobble/ScrobbleEvent.cs b/API/Entities/Scrobble/ScrobbleEvent.cs index a02363992..8adfdcc2e 100644 --- a/API/Entities/Scrobble/ScrobbleEvent.cs +++ b/API/Entities/Scrobble/ScrobbleEvent.cs @@ -28,7 +28,7 @@ public class ScrobbleEvent : IEntityDate /// public string? ReviewBody { get; set; } public string? ReviewTitle { get; set; } - public required MediaFormat Format { get; set; } + public required PlusMediaFormat Format { get; set; } /// /// Depends on the ScrobbleEvent if filled in /// @@ -68,4 +68,14 @@ public class ScrobbleEvent : IEntityDate public DateTime LastModified { get; set; } public DateTime CreatedUtc { get; set; } public DateTime LastModifiedUtc { get; set; } + + /// + /// Sets the ErrorDetail and marks the event as + /// + /// + public void SetErrorMessage(string errorMessage) + { + ErrorDetails = errorMessage; + IsErrored = true; + } } diff --git a/API/Entities/Scrobble/ScrobbleEventSortField.cs b/API/Entities/Scrobble/ScrobbleEventSortField.cs index 729ac7fbe..51b3a2146 100644 --- a/API/Entities/Scrobble/ScrobbleEventSortField.cs +++ b/API/Entities/Scrobble/ScrobbleEventSortField.cs @@ -7,5 +7,6 @@ public enum ScrobbleEventSortField LastModified = 2, Type= 3, Series = 4, - IsProcessed = 5 + IsProcessed = 5, + ScrobbleEventFilter = 6 } diff --git a/API/Entities/Series.cs b/API/Entities/Series.cs index c467ee076..4f06ab0fc 100644 --- a/API/Entities/Series.cs +++ b/API/Entities/Series.cs @@ -103,6 +103,17 @@ public class Series : IEntityDate, IHasReadTimeEstimate, IHasCoverImage public int MaxHoursToRead { get; set; } public float AvgHoursToRead { get; set; } + #region KavitaPlus + /// + /// Do not match the series with any external Metadata service. This will automatically opt it out of scrobbling. + /// + public bool DontMatch { get; set; } + /// + /// If the series was unable to match, it will be blacklisted until a manual metadata match overrides it + /// + public bool IsBlacklisted { get; set; } + #endregion + public SeriesMetadata Metadata { get; set; } = null!; public ExternalSeriesMetadata ExternalSeriesMetadata { get; set; } = null!; @@ -151,4 +162,14 @@ public class Series : IEntityDate, IHasReadTimeEstimate, IHasCoverImage PrimaryColor = string.Empty; SecondaryColor = string.Empty; } + + /// + /// Is this Series capable of Scrobbling + /// + /// This includes if there is no Match/Manual Match needed, the series is blacklisted, or has a NoMatch + /// + public bool WillScrobble() + { + return !IsBlacklisted && !DontMatch; + } } diff --git a/API/Entities/SideNavStreamType.cs b/API/Entities/SideNavStreamType.cs index 545c630d8..62f429889 100644 --- a/API/Entities/SideNavStreamType.cs +++ b/API/Entities/SideNavStreamType.cs @@ -10,5 +10,5 @@ public enum SideNavStreamType ExternalSource = 6, AllSeries = 7, WantToRead = 8, - BrowseAuthors = 9 + BrowsePeople = 9 } diff --git a/API/Extensions/AppUserExtensions.cs b/API/Extensions/AppUserExtensions.cs index 07b348c2d..be3d2c064 100644 --- a/API/Extensions/AppUserExtensions.cs +++ b/API/Extensions/AppUserExtensions.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using API.Data.Misc; using API.Entities; using API.Helpers; @@ -44,4 +45,13 @@ public static class AppUserExtensions OrderableHelper.ReorderItems(user.SideNavStreams); } + + public static AgeRestriction GetAgeRestriction(this AppUser user) + { + return new AgeRestriction() + { + AgeRating = user.AgeRestriction, + IncludeUnknowns = user.AgeRestrictionIncludeUnknowns, + }; + } } diff --git a/API/Extensions/ApplicationServiceExtensions.cs b/API/Extensions/ApplicationServiceExtensions.cs index b5c76b443..bd4783f25 100644 --- a/API/Extensions/ApplicationServiceExtensions.cs +++ b/API/Extensions/ApplicationServiceExtensions.cs @@ -12,6 +12,7 @@ using API.SignalR.Presence; using Kavita.Common; using Microsoft.AspNetCore.Hosting; using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -24,8 +25,6 @@ public static class ApplicationServiceExtensions { services.AddAutoMapper(typeof(AutoMapperProfiles).Assembly); - //services.AddScoped(); - services.AddScoped(); services.AddScoped(); services.AddScoped(); @@ -52,8 +51,11 @@ public static class ApplicationServiceExtensions services.AddScoped(); services.AddScoped(); services.AddScoped(); - services.AddScoped(); services.AddScoped(); + services.AddScoped(); + services.AddScoped(); + services.AddScoped(); + services.AddScoped(); services.AddScoped(); services.AddScoped(); @@ -71,12 +73,15 @@ public static class ApplicationServiceExtensions services.AddScoped(); services.AddScoped(); + services.AddScoped(); + services.AddScoped(); services.AddScoped(); services.AddScoped(); services.AddScoped(); services.AddScoped(); + services.AddScoped(); services.AddSqLite(); services.AddSignalR(opt => opt.EnableDetailedErrors = true); @@ -84,12 +89,16 @@ public static class ApplicationServiceExtensions services.AddEasyCaching(options => { options.UseInMemory(EasyCacheProfiles.Favicon); - options.UseInMemory(EasyCacheProfiles.License); + options.UseInMemory(EasyCacheProfiles.Publisher); options.UseInMemory(EasyCacheProfiles.Library); options.UseInMemory(EasyCacheProfiles.RevokedJwt); + options.UseInMemory(EasyCacheProfiles.LocaleOptions); // KavitaPlus stuff options.UseInMemory(EasyCacheProfiles.KavitaPlusExternalSeries); + options.UseInMemory(EasyCacheProfiles.License); + options.UseInMemory(EasyCacheProfiles.LicenseInfo); + options.UseInMemory(EasyCacheProfiles.KavitaPlusMatchSeries); }); services.AddMemoryCache(options => @@ -114,6 +123,8 @@ public static class ApplicationServiceExtensions }); options.EnableDetailedErrors(); options.EnableSensitiveDataLogging(); + options.ConfigureWarnings(warnings => + warnings.Ignore(RelationalEventId.PendingModelChangesWarning)); }); } } diff --git a/API/Extensions/EnumerableExtensions.cs b/API/Extensions/EnumerableExtensions.cs index 4e84e2fa5..9bc06bab4 100644 --- a/API/Extensions/EnumerableExtensions.cs +++ b/API/Extensions/EnumerableExtensions.cs @@ -3,7 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; using API.Data.Misc; +using API.Entities; using API.Entities.Enums; +using API.Entities.Metadata; namespace API.Extensions; #nullable enable @@ -42,4 +44,28 @@ public static class EnumerableExtensions return q; } + + public static IEnumerable RestrictAgainstAgeRestriction(this IEnumerable items, AgeRestriction restriction) + { + if (restriction.AgeRating == AgeRating.NotApplicable) return items; + var q = items.Where(s => s.AgeRating <= restriction.AgeRating); + if (!restriction.IncludeUnknowns) + { + return q.Where(s => s.AgeRating != AgeRating.Unknown); + } + + return q; + } + + public static IEnumerable RestrictAgainstAgeRestriction(this IEnumerable items, AgeRestriction restriction) + { + if (restriction.AgeRating == AgeRating.NotApplicable) return items; + var q = items.Where(s => s.AgeRating <= restriction.AgeRating); + if (!restriction.IncludeUnknowns) + { + return q.Where(s => s.AgeRating != AgeRating.Unknown); + } + + return q; + } } diff --git a/API/Extensions/FlurlExtensions.cs b/API/Extensions/FlurlExtensions.cs new file mode 100644 index 000000000..62d8543b6 --- /dev/null +++ b/API/Extensions/FlurlExtensions.cs @@ -0,0 +1,35 @@ +using System; +using Flurl.Http; +using Kavita.Common; +using Kavita.Common.EnvironmentInfo; + +namespace API.Extensions; +#nullable enable + +public static class FlurlExtensions +{ + public static IFlurlRequest WithKavitaPlusHeaders(this string request, string license, string? anilistToken = null) + { + return request + .WithHeader("Accept", "application/json") + .WithHeader("User-Agent", "Kavita") + .WithHeader("x-license-key", license) + .WithHeader("x-installId", HashUtil.ServerToken()) + .WithHeader("x-anilist-token", anilistToken ?? string.Empty) + .WithHeader("x-kavita-version", BuildInfo.Version) + .WithHeader("Content-Type", "application/json") + .WithTimeout(TimeSpan.FromSeconds(Configuration.DefaultTimeOutSecs)); + } + + public static IFlurlRequest WithBasicHeaders(this string request, string apiKey) + { + return request + .WithHeader("Accept", "application/json") + .WithHeader("User-Agent", "Kavita") + .WithHeader("x-api-key", apiKey) + .WithHeader("x-installId", HashUtil.ServerToken()) + .WithHeader("x-kavita-version", BuildInfo.Version) + .WithHeader("Content-Type", "application/json") + .WithTimeout(TimeSpan.FromSeconds(Configuration.DefaultTimeOutSecs)); + } +} diff --git a/API/Extensions/IHasKPlusMetadataExtensions.cs b/API/Extensions/IHasKPlusMetadataExtensions.cs new file mode 100644 index 000000000..84e35adc4 --- /dev/null +++ b/API/Extensions/IHasKPlusMetadataExtensions.cs @@ -0,0 +1,21 @@ +using API.Entities.Interfaces; +using API.Entities.MetadataMatching; + +namespace API.Extensions; + +public static class IHasKPlusMetadataExtensions +{ + + public static bool HasSetKPlusMetadata(this IHasKPlusMetadata hasKPlusMetadata, MetadataSettingField field) + { + return hasKPlusMetadata.KPlusOverrides.Contains(field); + } + + public static void AddKPlusOverride(this IHasKPlusMetadata hasKPlusMetadata, MetadataSettingField field) + { + if (hasKPlusMetadata.KPlusOverrides.Contains(field)) return; + + hasKPlusMetadata.KPlusOverrides.Add(field); + } + +} diff --git a/API/Extensions/ImageExtensions.cs b/API/Extensions/ImageExtensions.cs new file mode 100644 index 000000000..5779b18ec --- /dev/null +++ b/API/Extensions/ImageExtensions.cs @@ -0,0 +1,437 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using SixLabors.ImageSharp; +using SixLabors.ImageSharp.PixelFormats; +using SixLabors.ImageSharp.Processing; +using Image = SixLabors.ImageSharp.Image; + +namespace API.Extensions; + +public static class ImageExtensions +{ + + /// + /// Structure to hold various image quality metrics + /// + private sealed class ImageQualityMetrics + { + public int Width { get; set; } + public int Height { get; set; } + public bool IsColor { get; set; } + public double Colorfulness { get; set; } + public double Contrast { get; set; } + public double Sharpness { get; set; } + public double NoiseLevel { get; set; } + } + + + /// + /// Calculate a similarity score (0-1f) based on resolution difference and MSE. + /// + /// Path to first image + /// Path to the second image + /// Similarity score between 0-1, where 1 is identical + public static float CalculateSimilarity(this string imagePath1, string imagePath2) + { + if (!File.Exists(imagePath1) || !File.Exists(imagePath2)) + { + throw new FileNotFoundException("One or both image files do not exist"); + } + + // Load both images as Rgba32 (consistent with the rest of the code) + using var img1 = Image.Load(imagePath1); + using var img2 = Image.Load(imagePath2); + + // Calculate resolution difference factor + var res1 = img1.Width * img1.Height; + var res2 = img2.Width * img2.Height; + var resolutionDiff = Math.Abs(res1 - res2) / (float) Math.Max(res1, res2); + + // Calculate mean squared error for pixel differences + var mse = img1.GetMeanSquaredError(img2); + + // Normalize MSE (65025 = 255², which is the max possible squared difference per channel) + var normalizedMse = 1f - Math.Min(1f, mse / 65025f); + + // Final similarity score (weighted average of resolution difference and color difference) + return Math.Max(0f, 1f - (resolutionDiff * 0.5f) - (1f - normalizedMse) * 0.5f); + } + + /// + /// Smaller is better + /// + /// + /// + /// + public static float GetMeanSquaredError(this Image img1, Image img2) + { + if (img1.Width != img2.Width || img1.Height != img2.Height) + { + img2.Mutate(x => x.Resize(img1.Width, img1.Height)); + } + + double totalDiff = 0; + for (var y = 0; y < img1.Height; y++) + { + for (var x = 0; x < img1.Width; x++) + { + var pixel1 = img1[x, y]; + var pixel2 = img2[x, y]; + + var diff = Math.Pow(pixel1.R - pixel2.R, 2) + + Math.Pow(pixel1.G - pixel2.G, 2) + + Math.Pow(pixel1.B - pixel2.B, 2); + totalDiff += diff; + } + } + + return (float) (totalDiff / (img1.Width * img1.Height)); + } + + /// + /// Determines which image is "better" based on multiple quality factors + /// using only the cross-platform ImageSharp library + /// + /// Path to first image + /// Path to the second image + /// Whether to prefer color images over grayscale (default: true) + /// The path of the better image + public static string GetBetterImage(this string imagePath1, string imagePath2, bool preferColor = true) + { + if (!File.Exists(imagePath1) || !File.Exists(imagePath2)) + { + throw new FileNotFoundException("One or both image files do not exist"); + } + + // Quick metadata check to get width/height without loading full pixel data + var info1 = Image.Identify(imagePath1); + var info2 = Image.Identify(imagePath2); + + // Calculate resolution factor + double resolutionFactor1 = info1.Width * info1.Height; + double resolutionFactor2 = info2.Width * info2.Height; + + // If one image is significantly higher resolution (3x or more), just pick it + // This avoids fully loading both images when the choice is obvious + if (resolutionFactor1 > resolutionFactor2 * 3) + return imagePath1; + if (resolutionFactor2 > resolutionFactor1 * 3) + return imagePath2; + + // Otherwise, we need to analyze the actual image data for both + + // NOTE: We HAVE to use these scope blocks and load image here otherwise memory-mapped section exception will occur + ImageQualityMetrics metrics1; + using (var img1 = Image.Load(imagePath1)) + { + metrics1 = GetImageQualityMetrics(img1); + } + + ImageQualityMetrics metrics2; + using (var img2 = Image.Load(imagePath2)) + { + metrics2 = GetImageQualityMetrics(img2); + } + + + // If one is color, and one is grayscale, then we prefer color + if (preferColor && metrics1.IsColor != metrics2.IsColor) + { + return metrics1.IsColor ? imagePath1 : imagePath2; + } + + // Calculate overall quality scores + var score1 = CalculateOverallScore(metrics1); + var score2 = CalculateOverallScore(metrics2); + + return score1 >= score2 ? imagePath1 : imagePath2; + } + + + /// + /// Calculate a weighted overall score based on metrics + /// + private static double CalculateOverallScore(ImageQualityMetrics metrics) + { + // Resolution factor (normalized to HD resolution) + var resolutionFactor = Math.Min(1.0, (metrics.Width * metrics.Height) / (double) (1920 * 1080)); + + // Color factor + var colorFactor = metrics.IsColor ? (0.5 + 0.5 * metrics.Colorfulness) : 0.3; + + // Quality factors + var contrastFactor = Math.Min(1.0, metrics.Contrast); + var sharpnessFactor = Math.Min(1.0, metrics.Sharpness); + + // Noise penalty (less noise is better) + var noisePenalty = Math.Max(0, 1.0 - metrics.NoiseLevel); + + // Weighted combination + return (resolutionFactor * 0.35) + + (colorFactor * 0.3) + + (contrastFactor * 0.15) + + (sharpnessFactor * 0.15) + + (noisePenalty * 0.05); + } + + /// + /// Gets quality metrics for an image + /// + private static ImageQualityMetrics GetImageQualityMetrics(Image image) + { + // Create a smaller version if the image is large to speed up analysis + Image workingImage; + if (image.Width > 512 || image.Height > 512) + { + workingImage = image.Clone(ctx => ctx.Resize( + new ResizeOptions { + Size = new Size(512), + Mode = ResizeMode.Max + })); + } + else + { + workingImage = image.Clone(); + } + + var metrics = new ImageQualityMetrics + { + Width = image.Width, + Height = image.Height + }; + + // Color analysis (is the image color or grayscale?) + var colorInfo = AnalyzeColorfulness(workingImage); + metrics.IsColor = colorInfo.IsColor; + metrics.Colorfulness = colorInfo.Colorfulness; + + // Contrast analysis + metrics.Contrast = CalculateContrast(workingImage); + + // Sharpness estimation + metrics.Sharpness = EstimateSharpness(workingImage); + + // Noise estimation + metrics.NoiseLevel = EstimateNoiseLevel(workingImage); + + // Clean up + workingImage.Dispose(); + + return metrics; + } + + /// + /// Analyzes colorfulness of an image + /// + private static (bool IsColor, double Colorfulness) AnalyzeColorfulness(Image image) + { + // For performance, sample a subset of pixels + var sampleSize = Math.Min(1000, image.Width * image.Height); + var stepSize = Math.Max(1, (image.Width * image.Height) / sampleSize); + + var colorCount = 0; + List<(int R, int G, int B)> samples = []; + + // Sample pixels + for (var i = 0; i < image.Width * image.Height; i += stepSize) + { + var x = i % image.Width; + var y = i / image.Width; + + var pixel = image[x, y]; + + // Check if RGB channels differ by a threshold + // High difference indicates color, low difference indicates grayscale + var rMinusG = Math.Abs(pixel.R - pixel.G); + var rMinusB = Math.Abs(pixel.R - pixel.B); + var gMinusB = Math.Abs(pixel.G - pixel.B); + + if (rMinusG > 15 || rMinusB > 15 || gMinusB > 15) + { + colorCount++; + } + + samples.Add((pixel.R, pixel.G, pixel.B)); + } + + // Calculate colorfulness metric based on Hasler and Süsstrunk's approach + // This measures the spread and intensity of colors + if (samples.Count <= 0) return (false, 0); + + // Calculate rg and yb opponent channels + var rg = samples.Select(p => p.R - p.G).ToList(); + var yb = samples.Select(p => 0.5 * (p.R + p.G) - p.B).ToList(); + + // Calculate standard deviation and mean of opponent channels + var rgStdDev = CalculateStdDev(rg); + var ybStdDev = CalculateStdDev(yb); + var rgMean = rg.Average(); + var ybMean = yb.Average(); + + // Combine into colorfulness metric + var stdRoot = Math.Sqrt(rgStdDev * rgStdDev + ybStdDev * ybStdDev); + var meanRoot = Math.Sqrt(rgMean * rgMean + ybMean * ybMean); + + var colorfulness = stdRoot + 0.3 * meanRoot; + + // Normalize to 0-1 range (typical colorfulness is 0-100) + colorfulness = Math.Min(1.0, colorfulness / 100.0); + + var isColor = (double)colorCount / samples.Count > 0.05; + + return (isColor, colorfulness); + + } + + /// + /// Calculate standard deviation of a list of values + /// + private static double CalculateStdDev(List values) + { + var mean = values.Average(); + var sumOfSquaresOfDifferences = values.Select(val => (val - mean) * (val - mean)).Sum(); + return Math.Sqrt(sumOfSquaresOfDifferences / values.Count); + } + + /// + /// Calculate standard deviation of a list of values + /// + private static double CalculateStdDev(List values) + { + var mean = values.Average(); + var sumOfSquaresOfDifferences = values.Select(val => (val - mean) * (val - mean)).Sum(); + return Math.Sqrt(sumOfSquaresOfDifferences / values.Count); + } + + /// + /// Calculates contrast of an image + /// + private static double CalculateContrast(Image image) + { + // For performance, sample a subset of pixels + var sampleSize = Math.Min(1000, image.Width * image.Height); + var stepSize = Math.Max(1, (image.Width * image.Height) / sampleSize); + + List luminanceValues = new(); + + // Sample pixels and calculate luminance + for (var i = 0; i < image.Width * image.Height; i += stepSize) + { + var x = i % image.Width; + var y = i / image.Width; + + var pixel = image[x, y]; + + // Calculate luminance + var luminance = (int)(0.299 * pixel.R + 0.587 * pixel.G + 0.114 * pixel.B); + luminanceValues.Add(luminance); + } + + if (luminanceValues.Count < 2) + return 0; + + // Use RMS contrast (root-mean-square of pixel intensity) + var mean = luminanceValues.Average(); + var sumOfSquaresOfDifferences = luminanceValues.Sum(l => Math.Pow(l - mean, 2)); + var rmsContrast = Math.Sqrt(sumOfSquaresOfDifferences / luminanceValues.Count) / mean; + + // Normalize to 0-1 range + return Math.Min(1.0, rmsContrast); + } + + /// + /// Estimates sharpness using simple Laplacian-based method + /// + private static double EstimateSharpness(Image image) + { + // For simplicity, convert to grayscale + var grayImage = new int[image.Width, image.Height]; + + // Convert to grayscale + for (var y = 0; y < image.Height; y++) + { + for (var x = 0; x < image.Width; x++) + { + var pixel = image[x, y]; + grayImage[x, y] = (int)(0.299 * pixel.R + 0.587 * pixel.G + 0.114 * pixel.B); + } + } + + // Apply Laplacian filter (3x3) + // The Laplacian measures local variations - higher values indicate edges/details + double laplacianSum = 0; + var validPixels = 0; + + // Laplacian kernel: [0, 1, 0, 1, -4, 1, 0, 1, 0] + for (var y = 1; y < image.Height - 1; y++) + { + for (var x = 1; x < image.Width - 1; x++) + { + var laplacian = + grayImage[x, y - 1] + + grayImage[x - 1, y] - 4 * grayImage[x, y] + grayImage[x + 1, y] + + grayImage[x, y + 1]; + + laplacianSum += Math.Abs(laplacian); + validPixels++; + } + } + + if (validPixels == 0) + return 0; + + // Calculate variance of Laplacian + var laplacianVariance = laplacianSum / validPixels; + + // Normalize to 0-1 range (typical values range from 0-1000) + return Math.Min(1.0, laplacianVariance / 1000.0); + } + + /// + /// Estimates noise level using simple block-based variance method + /// + private static double EstimateNoiseLevel(Image image) + { + // Block size for noise estimation + const int blockSize = 8; + List blockVariances = new(); + + // Calculate variance in small blocks throughout the image + for (var y = 0; y < image.Height - blockSize; y += blockSize) + { + for (var x = 0; x < image.Width - blockSize; x += blockSize) + { + List blockValues = new(); + + // Sample block + for (var by = 0; by < blockSize; by++) + { + for (var bx = 0; bx < blockSize; bx++) + { + var pixel = image[x + bx, y + by]; + var value = (int)(0.299 * pixel.R + 0.587 * pixel.G + 0.114 * pixel.B); + blockValues.Add(value); + } + } + + // Calculate variance of this block + var blockMean = blockValues.Average(); + var blockVariance = blockValues.Sum(v => Math.Pow(v - blockMean, 2)) / blockValues.Count; + blockVariances.Add(blockVariance); + } + } + + if (blockVariances.Count == 0) + return 0; + + // Sort block variances and take lowest 10% (likely uniform areas where noise is most visible) + blockVariances.Sort(); + var smoothBlocksCount = Math.Max(1, blockVariances.Count / 10); + var averageNoiseVariance = blockVariances.Take(smoothBlocksCount).Average(); + + // Normalize to 0-1 range (typical noise variances are 0-100) + return Math.Min(1.0, averageNoiseVariance / 100.0); + } +} diff --git a/API/Extensions/PlusMediaFormatExtensions.cs b/API/Extensions/PlusMediaFormatExtensions.cs new file mode 100644 index 000000000..a88b9c2f9 --- /dev/null +++ b/API/Extensions/PlusMediaFormatExtensions.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Generic; +using API.DTOs.Scrobbling; +using API.Entities.Enums; + +namespace API.Extensions; + +public static class PlusMediaFormatExtensions +{ + public static PlusMediaFormat ConvertToPlusMediaFormat(this LibraryType libraryType, MangaFormat? seriesFormat = null) + { + + return libraryType switch + { + LibraryType.Manga => seriesFormat is MangaFormat.Epub ? PlusMediaFormat.LightNovel : PlusMediaFormat.Manga, + LibraryType.Comic => PlusMediaFormat.Comic, + LibraryType.LightNovel => PlusMediaFormat.LightNovel, + LibraryType.Book => PlusMediaFormat.LightNovel, + LibraryType.Image => PlusMediaFormat.Manga, + LibraryType.ComicVine => PlusMediaFormat.Comic, + _ => throw new ArgumentOutOfRangeException(nameof(libraryType), libraryType, null) + }; + } + + public static IEnumerable ConvertToLibraryTypes(this PlusMediaFormat plusMediaFormat) + { + return plusMediaFormat switch + { + PlusMediaFormat.Manga => [LibraryType.Manga, LibraryType.Image], + PlusMediaFormat.Comic => [LibraryType.Comic, LibraryType.ComicVine], + PlusMediaFormat.LightNovel => [LibraryType.LightNovel, LibraryType.Book, LibraryType.Manga], + PlusMediaFormat.Book => [LibraryType.LightNovel, LibraryType.Book], + _ => throw new ArgumentOutOfRangeException(nameof(plusMediaFormat), plusMediaFormat, null) + }; + } + + public static IList GetMangaFormats(this PlusMediaFormat? mediaFormat) + { + return mediaFormat.HasValue ? mediaFormat.Value.GetMangaFormats() : [MangaFormat.Archive]; + } + + public static IList GetMangaFormats(this PlusMediaFormat mediaFormat) + { + return mediaFormat switch + { + PlusMediaFormat.Manga => [MangaFormat.Archive, MangaFormat.Image], + PlusMediaFormat.Comic => [MangaFormat.Archive], + PlusMediaFormat.LightNovel => [MangaFormat.Epub, MangaFormat.Pdf], + PlusMediaFormat.Book => [MangaFormat.Epub, MangaFormat.Pdf], + _ => [MangaFormat.Archive] + }; + } + + +} diff --git a/API/Extensions/QueryExtensions/Filtering/PersonFilter.cs b/API/Extensions/QueryExtensions/Filtering/PersonFilter.cs new file mode 100644 index 000000000..c36164d9d --- /dev/null +++ b/API/Extensions/QueryExtensions/Filtering/PersonFilter.cs @@ -0,0 +1,136 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using API.DTOs.Filtering.v2; +using API.Entities.Enums; +using API.Entities.Person; +using Kavita.Common; +using Microsoft.EntityFrameworkCore; + +namespace API.Extensions.QueryExtensions.Filtering; + +public static class PersonFilter +{ + public static IQueryable HasPersonName(this IQueryable queryable, bool condition, + FilterComparison comparison, string queryString) + { + if (string.IsNullOrEmpty(queryString) || !condition) return queryable; + + return comparison switch + { + FilterComparison.Equal => queryable.Where(p => p.Name.Equals(queryString)), + FilterComparison.BeginsWith => queryable.Where(p => EF.Functions.Like(p.Name, $"{queryString}%")), + FilterComparison.EndsWith => queryable.Where(p => EF.Functions.Like(p.Name, $"%{queryString}")), + FilterComparison.Matches => queryable.Where(p => EF.Functions.Like(p.Name, $"%{queryString}%")), + FilterComparison.NotEqual => queryable.Where(p => p.Name != queryString), + FilterComparison.NotContains or FilterComparison.GreaterThan or FilterComparison.GreaterThanEqual + or FilterComparison.LessThan or FilterComparison.LessThanEqual or FilterComparison.Contains + or FilterComparison.IsBefore or FilterComparison.IsAfter or FilterComparison.IsInLast + or FilterComparison.IsNotInLast or FilterComparison.MustContains + or FilterComparison.IsEmpty => + throw new KavitaException($"{comparison} not applicable for Person.Name"), + _ => throw new ArgumentOutOfRangeException(nameof(comparison), comparison, + "Filter Comparison is not supported") + }; + } + public static IQueryable HasPersonRole(this IQueryable queryable, bool condition, + FilterComparison comparison, IList roles) + { + if (roles == null || roles.Count == 0 || !condition) return queryable; + + return comparison switch + { + FilterComparison.Contains or FilterComparison.MustContains => queryable.Where(p => + p.SeriesMetadataPeople.Any(smp => roles.Contains(smp.Role)) || + p.ChapterPeople.Any(cmp => roles.Contains(cmp.Role))), + FilterComparison.NotContains => queryable.Where(p => + !p.SeriesMetadataPeople.Any(smp => roles.Contains(smp.Role)) && + !p.ChapterPeople.Any(cmp => roles.Contains(cmp.Role))), + FilterComparison.Equal or FilterComparison.NotEqual or FilterComparison.BeginsWith + or FilterComparison.EndsWith or FilterComparison.Matches or FilterComparison.GreaterThan + or FilterComparison.GreaterThanEqual or FilterComparison.LessThan or FilterComparison.LessThanEqual + or FilterComparison.IsBefore or FilterComparison.IsAfter or FilterComparison.IsInLast + or FilterComparison.IsNotInLast + or FilterComparison.IsEmpty => + throw new KavitaException($"{comparison} not applicable for Person.Role"), + _ => throw new ArgumentOutOfRangeException(nameof(comparison), comparison, + "Filter Comparison is not supported") + }; + } + + public static IQueryable HasPersonSeriesCount(this IQueryable queryable, bool condition, + FilterComparison comparison, int count) + { + if (!condition) return queryable; + + return comparison switch + { + FilterComparison.Equal => queryable.Where(p => p.SeriesMetadataPeople + .Select(smp => smp.SeriesMetadata.SeriesId) + .Distinct() + .Count() == count), + FilterComparison.GreaterThan => queryable.Where(p => p.SeriesMetadataPeople + .Select(smp => smp.SeriesMetadata.SeriesId) + .Distinct() + .Count() > count), + FilterComparison.GreaterThanEqual => queryable.Where(p => p.SeriesMetadataPeople + .Select(smp => smp.SeriesMetadata.SeriesId) + .Distinct() + .Count() >= count), + FilterComparison.LessThan => queryable.Where(p => p.SeriesMetadataPeople + .Select(smp => smp.SeriesMetadata.SeriesId) + .Distinct() + .Count() < count), + FilterComparison.LessThanEqual => queryable.Where(p => p.SeriesMetadataPeople + .Select(smp => smp.SeriesMetadata.SeriesId) + .Distinct() + .Count() <= count), + FilterComparison.NotEqual => queryable.Where(p => p.SeriesMetadataPeople + .Select(smp => smp.SeriesMetadata.SeriesId) + .Distinct() + .Count() != count), + FilterComparison.BeginsWith or FilterComparison.EndsWith or FilterComparison.Matches + or FilterComparison.Contains or FilterComparison.NotContains or FilterComparison.IsBefore + or FilterComparison.IsAfter or FilterComparison.IsInLast or FilterComparison.IsNotInLast + or FilterComparison.MustContains + or FilterComparison.IsEmpty => throw new KavitaException( + $"{comparison} not applicable for Person.SeriesCount"), + _ => throw new ArgumentOutOfRangeException(nameof(comparison), comparison, "Filter Comparison is not supported") + }; + } + + public static IQueryable HasPersonChapterCount(this IQueryable queryable, bool condition, + FilterComparison comparison, int count) + { + if (!condition) return queryable; + + return comparison switch + { + FilterComparison.Equal => queryable.Where(p => + p.ChapterPeople.Select(cp => cp.Chapter.Id).Distinct().Count() == count), + FilterComparison.GreaterThan => queryable.Where(p => p.ChapterPeople + .Select(cp => cp.Chapter.Id) + .Distinct() + .Count() > count), + FilterComparison.GreaterThanEqual => queryable.Where(p => p.ChapterPeople + .Select(cp => cp.Chapter.Id) + .Distinct() + .Count() >= count), + FilterComparison.LessThan => queryable.Where(p => + p.ChapterPeople.Select(cp => cp.Chapter.Id).Distinct().Count() < count), + FilterComparison.LessThanEqual => queryable.Where(p => p.ChapterPeople + .Select(cp => cp.Chapter.Id) + .Distinct() + .Count() <= count), + FilterComparison.NotEqual => queryable.Where(p => + p.ChapterPeople.Select(cp => cp.Chapter.Id).Distinct().Count() != count), + FilterComparison.BeginsWith or FilterComparison.EndsWith or FilterComparison.Matches + or FilterComparison.Contains or FilterComparison.NotContains or FilterComparison.IsBefore + or FilterComparison.IsAfter or FilterComparison.IsInLast or FilterComparison.IsNotInLast + or FilterComparison.MustContains + or FilterComparison.IsEmpty => throw new KavitaException( + $"{comparison} not applicable for Person.ChapterCount"), + _ => throw new ArgumentOutOfRangeException(nameof(comparison), comparison, "Filter Comparison is not supported") + }; + } +} diff --git a/API/Extensions/QueryExtensions/Filtering/SearchQueryableExtensions.cs b/API/Extensions/QueryExtensions/Filtering/SearchQueryableExtensions.cs index f6606026b..d7acf9381 100644 --- a/API/Extensions/QueryExtensions/Filtering/SearchQueryableExtensions.cs +++ b/API/Extensions/QueryExtensions/Filtering/SearchQueryableExtensions.cs @@ -1,10 +1,11 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using API.Data.Misc; using API.Data.Repositories; using API.Entities; using API.Entities.Metadata; -using AutoMapper.QueryableExtensions; +using API.Entities.Person; using Microsoft.EntityFrameworkCore; namespace API.Extensions.QueryExtensions.Filtering; @@ -49,23 +50,26 @@ public static class SearchQueryableExtensions // Get people from SeriesMetadata var peopleFromSeriesMetadata = queryable .Where(sm => seriesIds.Contains(sm.SeriesId)) - .SelectMany(sm => sm.People) - .Where(p => p.Person.Name != null && EF.Functions.Like(p.Person.Name, $"%{searchQuery}%")) - .Select(p => p.Person); + .SelectMany(sm => sm.People.Select(sp => sp.Person)) + .Where(p => + EF.Functions.Like(p.Name, $"%{searchQuery}%") || + p.Aliases.Any(pa => EF.Functions.Like(pa.Alias, $"%{searchQuery}%")) + ); - // Get people from ChapterPeople by navigating through Volume -> Series var peopleFromChapterPeople = queryable .Where(sm => seriesIds.Contains(sm.SeriesId)) .SelectMany(sm => sm.Series.Volumes) .SelectMany(v => v.Chapters) - .SelectMany(ch => ch.People) - .Where(cp => cp.Person.Name != null && EF.Functions.Like(cp.Person.Name, $"%{searchQuery}%")) - .Select(cp => cp.Person); + .SelectMany(ch => ch.People.Select(cp => cp.Person)) + .Where(p => + EF.Functions.Like(p.Name, $"%{searchQuery}%") || + p.Aliases.Any(pa => EF.Functions.Like(pa.Alias, $"%{searchQuery}%")) + ); // Combine both queries and ensure distinct results return peopleFromSeriesMetadata .Union(peopleFromChapterPeople) - .Distinct() + .Select(p => p) .OrderBy(p => p.NormalizedName); } diff --git a/API/Extensions/QueryExtensions/Filtering/SeriesFilter.cs b/API/Extensions/QueryExtensions/Filtering/SeriesFilter.cs index 822a859c5..ad51a4a62 100644 --- a/API/Extensions/QueryExtensions/Filtering/SeriesFilter.cs +++ b/API/Extensions/QueryExtensions/Filtering/SeriesFilter.cs @@ -252,8 +252,6 @@ public static class SeriesFilter if (!condition) return queryable; var subQuery = queryable - .Include(s => s.Progress) - .Where(s => s.Progress != null) .Select(s => new { SeriesId = s.Id, @@ -372,7 +370,7 @@ public static class SeriesFilter var subQuery = queryable .Include(s => s.Progress) - .Where(s => s.Progress != null) + .Where(s => s.Progress.Any()) .Select(s => new { SeriesId = s.Id, @@ -435,7 +433,7 @@ public static class SeriesFilter var subQuery = queryable .Include(s => s.Progress) - .Where(s => s.Progress != null) + .Where(s => s.Progress.Any()) .Select(s => new { SeriesId = s.Id, @@ -512,7 +510,7 @@ public static class SeriesFilter return queries.Aggregate((q1, q2) => q1.Intersect(q2)); case FilterComparison.IsEmpty: - return queryable.Where(s => s.Metadata.Tags == null || s.Metadata.Tags.Count == 0); + return queryable.Where(s => s.Metadata.Tags.Count == 0); case FilterComparison.GreaterThan: case FilterComparison.GreaterThanEqual: case FilterComparison.LessThan: @@ -709,7 +707,7 @@ public static class SeriesFilter return queries.Aggregate((q1, q2) => q1.Intersect(q2)); case FilterComparison.IsEmpty: - return queryable.Where(s => collectionSeries.All(c => c != s.Id)); + return queryable.Where(s => s.Collections.Count == 0); case FilterComparison.GreaterThan: case FilterComparison.GreaterThanEqual: case FilterComparison.LessThan: diff --git a/API/Extensions/QueryExtensions/IncludesExtensions.cs b/API/Extensions/QueryExtensions/IncludesExtensions.cs index 983f6798e..bfc585455 100644 --- a/API/Extensions/QueryExtensions/IncludesExtensions.cs +++ b/API/Extensions/QueryExtensions/IncludesExtensions.cs @@ -1,6 +1,7 @@ using System.Linq; using API.Data.Repositories; using API.Entities; +using API.Entities.Person; using Microsoft.EntityFrameworkCore; namespace API.Extensions.QueryExtensions; @@ -72,6 +73,18 @@ public static class IncludesExtensions .Include(c => c.Tags); } + if (includes.HasFlag(ChapterIncludes.ExternalReviews)) + { + queryable = queryable + .Include(c => c.ExternalReviews); + } + + if (includes.HasFlag(ChapterIncludes.ExternalRatings)) + { + queryable = queryable + .Include(c => c.ExternalRatings); + } + return queryable.AsSplitQuery(); } @@ -253,6 +266,11 @@ public static class IncludesExtensions .ThenInclude(c => c.Items); } + if (includeFlags.HasFlag(AppUserIncludes.ChapterRatings)) + { + query = query.Include(u => u.ChapterRatings); + } + return query.AsSplitQuery(); } @@ -303,4 +321,25 @@ public static class IncludesExtensions return query.AsSplitQuery(); } + + public static IQueryable Includes(this IQueryable queryable, PersonIncludes includeFlags) + { + + if (includeFlags.HasFlag(PersonIncludes.Aliases)) + { + queryable = queryable.Include(p => p.Aliases); + } + + if (includeFlags.HasFlag(PersonIncludes.ChapterPeople)) + { + queryable = queryable.Include(p => p.ChapterPeople); + } + + if (includeFlags.HasFlag(PersonIncludes.SeriesPeople)) + { + queryable = queryable.Include(p => p.SeriesMetadataPeople); + } + + return queryable; + } } diff --git a/API/Extensions/QueryExtensions/QueryableExtensions.cs b/API/Extensions/QueryExtensions/QueryableExtensions.cs index 571e9430c..ef2af721f 100644 --- a/API/Extensions/QueryExtensions/QueryableExtensions.cs +++ b/API/Extensions/QueryExtensions/QueryableExtensions.cs @@ -5,9 +5,13 @@ using System.Linq.Expressions; using System.Threading.Tasks; using API.Data.Misc; using API.Data.Repositories; +using API.DTOs; using API.DTOs.Filtering; +using API.DTOs.KavitaPlus.Manage; +using API.DTOs.Metadata.Browse; using API.Entities; using API.Entities.Enums; +using API.Entities.Person; using API.Entities.Scrobble; using Microsoft.EntityFrameworkCore; @@ -254,6 +258,7 @@ public static class QueryableExtensions ScrobbleEventSortField.Type => query.OrderByDescending(s => s.ScrobbleEventType), ScrobbleEventSortField.Series => query.OrderByDescending(s => s.Series.NormalizedName), ScrobbleEventSortField.IsProcessed => query.OrderByDescending(s => s.IsProcessed), + ScrobbleEventSortField.ScrobbleEventFilter => query.OrderByDescending(s => s.ScrobbleEventType), _ => query }; } @@ -266,10 +271,32 @@ public static class QueryableExtensions ScrobbleEventSortField.Type => query.OrderBy(s => s.ScrobbleEventType), ScrobbleEventSortField.Series => query.OrderBy(s => s.Series.NormalizedName), ScrobbleEventSortField.IsProcessed => query.OrderBy(s => s.IsProcessed), + ScrobbleEventSortField.ScrobbleEventFilter => query.OrderBy(s => s.ScrobbleEventType), _ => query }; } + public static IQueryable SortBy(this IQueryable query, PersonSortOptions? sort) + { + if (sort == null) + { + return query.OrderBy(p => p.Name); + } + + return sort.SortField switch + { + PersonSortField.Name when sort.IsAscending => query.OrderBy(p => p.Name), + PersonSortField.Name => query.OrderByDescending(p => p.Name), + PersonSortField.SeriesCount when sort.IsAscending => query.OrderBy(p => p.SeriesMetadataPeople.Count), + PersonSortField.SeriesCount => query.OrderByDescending(p => p.SeriesMetadataPeople.Count), + PersonSortField.ChapterCount when sort.IsAscending => query.OrderBy(p => p.ChapterPeople.Count), + PersonSortField.ChapterCount => query.OrderByDescending(p => p.ChapterPeople.Count), + _ => query.OrderBy(p => p.Name) + }; + + + } + /// /// Performs either OrderBy or OrderByDescending on the given query based on the value of SortOptions.IsAscending. /// @@ -281,4 +308,21 @@ public static class QueryableExtensions { return sortOptions.IsAscending ? query.OrderBy(keySelector) : query.OrderByDescending(keySelector); } + + public static IQueryable FilterMatchState(this IQueryable query, MatchStateOption stateOption) + { + return stateOption switch + { + MatchStateOption.All => query, + MatchStateOption.Matched => query + .Include(s => s.ExternalSeriesMetadata) + .Where(s => s.ExternalSeriesMetadata != null && s.ExternalSeriesMetadata.ValidUntilUtc > DateTime.MinValue && !s.IsBlacklisted), + MatchStateOption.NotMatched => query. + Include(s => s.ExternalSeriesMetadata) + .Where(s => (s.ExternalSeriesMetadata == null || s.ExternalSeriesMetadata.ValidUntilUtc == DateTime.MinValue) && !s.IsBlacklisted && !s.DontMatch), + MatchStateOption.Error => query.Where(s => s.IsBlacklisted && !s.DontMatch), + MatchStateOption.DontMatch => query.Where(s => s.DontMatch), + _ => query + }; + } } diff --git a/API/Extensions/QueryExtensions/RestrictByAgeExtensions.cs b/API/Extensions/QueryExtensions/RestrictByAgeExtensions.cs index ebc233056..e0738bdf3 100644 --- a/API/Extensions/QueryExtensions/RestrictByAgeExtensions.cs +++ b/API/Extensions/QueryExtensions/RestrictByAgeExtensions.cs @@ -3,6 +3,8 @@ using System.Linq; using API.Data.Misc; using API.Entities; using API.Entities.Enums; +using API.Entities.Metadata; +using API.Entities.Person; namespace API.Extensions.QueryExtensions; #nullable enable @@ -25,6 +27,20 @@ public static class RestrictByAgeExtensions return q; } + public static IQueryable RestrictAgainstAgeRestriction(this IQueryable queryable, AgeRestriction restriction) + { + if (restriction.AgeRating == AgeRating.NotApplicable) return queryable; + var q = queryable.Where(s => s.SeriesMetadata.AgeRating <= restriction.AgeRating); + + if (!restriction.IncludeUnknowns) + { + return q.Where(s => s.SeriesMetadata.AgeRating != AgeRating.Unknown); + } + + return q; + } + + public static IQueryable RestrictAgainstAgeRestriction(this IQueryable queryable, AgeRestriction restriction) { if (restriction.AgeRating == AgeRating.NotApplicable) return queryable; @@ -38,21 +54,20 @@ public static class RestrictByAgeExtensions return q; } - [Obsolete] - public static IQueryable RestrictAgainstAgeRestriction(this IQueryable queryable, AgeRestriction restriction) + public static IQueryable RestrictAgainstAgeRestriction(this IQueryable queryable, AgeRestriction restriction) { if (restriction.AgeRating == AgeRating.NotApplicable) return queryable; + var q = queryable.Where(cp => cp.Chapter.Volume.Series.Metadata.AgeRating <= restriction.AgeRating); - if (restriction.IncludeUnknowns) + if (!restriction.IncludeUnknowns) { - return queryable.Where(c => c.SeriesMetadatas.All(sm => - sm.AgeRating <= restriction.AgeRating)); + return q.Where(cp => cp.Chapter.Volume.Series.Metadata.AgeRating != AgeRating.Unknown); } - return queryable.Where(c => c.SeriesMetadatas.All(sm => - sm.AgeRating <= restriction.AgeRating && sm.AgeRating > AgeRating.Unknown)); + return q; } + public static IQueryable RestrictAgainstAgeRestriction(this IQueryable queryable, AgeRestriction restriction) { if (restriction.AgeRating == AgeRating.NotApplicable) return queryable; @@ -67,18 +82,27 @@ public static class RestrictByAgeExtensions sm.Metadata.AgeRating <= restriction.AgeRating && sm.Metadata.AgeRating > AgeRating.Unknown)); } + /// + /// Returns all Genres where any of the linked Series/Chapters are less than or equal to restriction age rating + /// + /// + /// + /// public static IQueryable RestrictAgainstAgeRestriction(this IQueryable queryable, AgeRestriction restriction) { if (restriction.AgeRating == AgeRating.NotApplicable) return queryable; if (restriction.IncludeUnknowns) { - return queryable.Where(c => c.SeriesMetadatas.All(sm => - sm.AgeRating <= restriction.AgeRating)); + return queryable.Where(c => + c.SeriesMetadatas.Any(sm => sm.AgeRating <= restriction.AgeRating) || + c.Chapters.Any(cp => cp.AgeRating <= restriction.AgeRating)); } - return queryable.Where(c => c.SeriesMetadatas.All(sm => - sm.AgeRating <= restriction.AgeRating && sm.AgeRating > AgeRating.Unknown)); + return queryable.Where(c => + c.SeriesMetadatas.Any(sm => sm.AgeRating <= restriction.AgeRating && sm.AgeRating != AgeRating.Unknown) || + c.Chapters.Any(cp => cp.AgeRating <= restriction.AgeRating && cp.AgeRating != AgeRating.Unknown) + ); } public static IQueryable RestrictAgainstAgeRestriction(this IQueryable queryable, AgeRestriction restriction) @@ -87,12 +111,15 @@ public static class RestrictByAgeExtensions if (restriction.IncludeUnknowns) { - return queryable.Where(c => c.SeriesMetadatas.All(sm => - sm.AgeRating <= restriction.AgeRating)); + return queryable.Where(c => + c.SeriesMetadatas.Any(sm => sm.AgeRating <= restriction.AgeRating) || + c.Chapters.Any(cp => cp.AgeRating <= restriction.AgeRating)); } - return queryable.Where(c => c.SeriesMetadatas.All(sm => - sm.AgeRating <= restriction.AgeRating && sm.AgeRating > AgeRating.Unknown)); + return queryable.Where(c => + c.SeriesMetadatas.Any(sm => sm.AgeRating <= restriction.AgeRating && sm.AgeRating != AgeRating.Unknown) || + c.Chapters.Any(cp => cp.AgeRating <= restriction.AgeRating && cp.AgeRating != AgeRating.Unknown) + ); } public static IQueryable RestrictAgainstAgeRestriction(this IQueryable queryable, AgeRestriction restriction) diff --git a/API/Extensions/QueryExtensions/RestrictByLibraryExtensions.cs b/API/Extensions/QueryExtensions/RestrictByLibraryExtensions.cs new file mode 100644 index 000000000..9ec1b8621 --- /dev/null +++ b/API/Extensions/QueryExtensions/RestrictByLibraryExtensions.cs @@ -0,0 +1,31 @@ +using System.Linq; +using API.Entities; +using API.Entities.Person; + +namespace API.Extensions.QueryExtensions; + +public static class RestrictByLibraryExtensions +{ + + public static IQueryable RestrictByLibrary(this IQueryable query, IQueryable userLibs) + { + return query.Where(p => + p.ChapterPeople.Any(cp => userLibs.Contains(cp.Chapter.Volume.Series.LibraryId)) || + p.SeriesMetadataPeople.Any(sm => userLibs.Contains(sm.SeriesMetadata.Series.LibraryId))); + } + + public static IQueryable RestrictByLibrary(this IQueryable query, IQueryable userLibs) + { + return query.Where(cp => userLibs.Contains(cp.Volume.Series.LibraryId)); + } + + public static IQueryable RestrictByLibrary(this IQueryable query, IQueryable userLibs) + { + return query.Where(sm => userLibs.Contains(sm.SeriesMetadata.Series.LibraryId)); + } + + public static IQueryable RestrictByLibrary(this IQueryable query, IQueryable userLibs) + { + return query.Where(cp => userLibs.Contains(cp.Chapter.Volume.Series.LibraryId)); + } +} diff --git a/API/Extensions/StringExtensions.cs b/API/Extensions/StringExtensions.cs index 138209e0d..28419921a 100644 --- a/API/Extensions/StringExtensions.cs +++ b/API/Extensions/StringExtensions.cs @@ -18,9 +18,9 @@ public static class StringExtensions // Remove all newline and control characters var sanitized = input - .Replace(Environment.NewLine, "") - .Replace("\n", "") - .Replace("\r", ""); + .Replace(Environment.NewLine, string.Empty) + .Replace("\n", string.Empty) + .Replace("\r", string.Empty); // Optionally remove other potentially unwanted characters sanitized = Regex.Replace(sanitized, @"[^\u0020-\u007E]", string.Empty); // Removes non-printable ASCII diff --git a/API/Extensions/VersionExtensions.cs b/API/Extensions/VersionExtensions.cs new file mode 100644 index 000000000..1877b48b1 --- /dev/null +++ b/API/Extensions/VersionExtensions.cs @@ -0,0 +1,17 @@ +using System; + +namespace API.Extensions; + +public static class VersionExtensions +{ + public static bool CompareWithoutRevision(this Version v1, Version v2) + { + if (v1.Major != v2.Major) + return v1.Major == v2.Major; + if (v1.Minor != v2.Minor) + return v1.Minor == v2.Minor; + if (v1.Build != v2.Build) + return v1.Build == v2.Build; + return true; + } +} diff --git a/API/Helpers/AutoMapperProfiles.cs b/API/Helpers/AutoMapperProfiles.cs index 6c8ad418f..bb7511c64 100644 --- a/API/Helpers/AutoMapperProfiles.cs +++ b/API/Helpers/AutoMapperProfiles.cs @@ -8,10 +8,14 @@ using API.DTOs.Collection; using API.DTOs.CollectionTags; using API.DTOs.Dashboard; using API.DTOs.Device; +using API.DTOs.Email; using API.DTOs.Filtering; using API.DTOs.Filtering.v2; +using API.DTOs.KavitaPlus.Manage; +using API.DTOs.KavitaPlus.Metadata; using API.DTOs.MediaErrors; using API.DTOs.Metadata; +using API.DTOs.Person; using API.DTOs.Progress; using API.DTOs.Reader; using API.DTOs.ReadingLists; @@ -26,12 +30,16 @@ using API.DTOs.Theme; using API.Entities; using API.Entities.Enums; using API.Entities.Metadata; +using API.Entities.MetadataMatching; +using API.Entities.Person; using API.Entities.Scrobble; using API.Extensions.QueryExtensions.Filtering; using API.Helpers.Converters; using API.Services; using AutoMapper; using CollectionTag = API.Entities.CollectionTag; +using EmailHistory = API.Entities.EmailHistory; +using ExternalSeriesMetadata = API.Entities.Metadata.ExternalSeriesMetadata; using MediaError = API.Entities.MediaError; using PublicationStatus = API.Entities.Enums.PublicationStatus; using SiteTheme = API.Entities.SiteTheme; @@ -61,7 +69,8 @@ public class AutoMapperProfiles : Profile CreateMap() .ForMember(dest => dest.Owner, opt => opt.MapFrom(src => src.AppUser.UserName)) .ForMember(dest => dest.ItemCount, opt => opt.MapFrom(src => src.Items.Count)); - CreateMap(); + CreateMap() + .ForMember(dest => dest.Aliases, opt => opt.MapFrom(src => src.Aliases.Select(s => s.Alias))); CreateMap(); CreateMap(); CreateMap(); @@ -90,6 +99,16 @@ public class AutoMapperProfiles : Profile .ForMember(dest => dest.Username, opt => opt.MapFrom(src => src.AppUser.UserName)); + CreateMap() + .ForMember(dest => dest.LibraryId, + opt => + opt.MapFrom(src => src.Series.LibraryId)) + .ForMember(dest => dest.Body, + opt => + opt.MapFrom(src => src.Review)) + .ForMember(dest => dest.Username, + opt => + opt.MapFrom(src => src.AppUser.UserName)); CreateMap() .ForMember(dest => dest.PageNum, @@ -116,8 +135,8 @@ public class AutoMapperProfiles : Profile // Map Characters .ForMember(dest => dest.Characters, opt => opt.MapFrom(src => src.People .Where(cp => cp.Role == PersonRole.Character) - .Select(cp => cp.Person) - .OrderBy(p => p.NormalizedName))) + .OrderBy(cp => cp.OrderWeight) + .Select(cp => cp.Person))) // Map Pencillers .ForMember(dest => dest.Pencillers, opt => opt.MapFrom(src => src.People .Where(cp => cp.Role == PersonRole.Penciller) @@ -256,19 +275,19 @@ public class AutoMapperProfiles : Profile CreateMap() .ForMember(dest => dest.Theme, opt => - opt.MapFrom(src => src.Theme)) + opt.MapFrom(src => src.Theme)); + + CreateMap() .ForMember(dest => dest.BookReaderThemeName, opt => - opt.MapFrom(src => src.BookThemeName)) - .ForMember(dest => dest.BookReaderLayoutMode, - opt => - opt.MapFrom(src => src.BookReaderLayoutMode)); + opt.MapFrom(src => src.BookThemeName)); CreateMap(); CreateMap() - .ForMember(dest => dest.ItemCount, opt => opt.MapFrom(src => src.Items.Count)); + .ForMember(dest => dest.ItemCount, opt => opt.MapFrom(src => src.Items.Count)) + .ForMember(dest => dest.OwnerUserName, opt => opt.MapFrom(src => src.AppUser.UserName)); CreateMap(); CreateMap(); CreateMap(); @@ -331,17 +350,43 @@ public class AutoMapperProfiles : Profile CreateMap() .ForMember(dest => dest.BodyJustText, opt => - opt.MapFrom(src => ReviewService.GetCharacters(src.Body))); + opt.MapFrom(src => ReviewHelper.GetCharacters(src.Body))); CreateMap(); + CreateMap() + .ForMember(dest => dest.Series, + opt => + opt.MapFrom(src => src)) + .ForMember(dest => dest.IsMatched, + opt => + opt.MapFrom(src => src.ExternalSeriesMetadata != null && src.ExternalSeriesMetadata.AniListId != 0 + && src.ExternalSeriesMetadata.ValidUntilUtc > DateTime.MinValue)) + .ForMember(dest => dest.ValidUntilUtc, + opt => opt.MapFrom(src => + src.ExternalSeriesMetadata != null + ? src.ExternalSeriesMetadata.ValidUntilUtc + : DateTime.MinValue)); CreateMap(); + CreateMap() + .ForMember(dest => dest.ToUserName, opt => opt.MapFrom(src => src.AppUser.UserName)); CreateMap() .ForMember(dest => dest.SeriesId, opt => opt.MapFrom(src => src.Volume.SeriesId)) .ForMember(dest => dest.VolumeTitle, opt => opt.MapFrom(src => src.Volume.Name)) .ForMember(dest => dest.LibraryId, opt => opt.MapFrom(src => src.Volume.Series.LibraryId)) .ForMember(dest => dest.LibraryType, opt => opt.MapFrom(src => src.Volume.Series.Library.Type)); + + CreateMap(); + + CreateMap() + .ForMember(dest => dest.Blacklist, opt => opt.MapFrom(src => src.Blacklist ?? new List())) + .ForMember(dest => dest.Whitelist, opt => opt.MapFrom(src => src.Whitelist ?? new List())) + .ForMember(dest => dest.Overrides, opt => opt.MapFrom(src => src.Overrides ?? new List())) + .ForMember(dest => dest.AgeRatingMappings, opt => opt.MapFrom(src => src.AgeRatingMappings ?? new Dictionary())); + + + } } diff --git a/API/Helpers/BookSortTitlePrefixHelper.cs b/API/Helpers/BookSortTitlePrefixHelper.cs new file mode 100644 index 000000000..c92df5d65 --- /dev/null +++ b/API/Helpers/BookSortTitlePrefixHelper.cs @@ -0,0 +1,101 @@ +using System; +using System.Collections.Generic; +using System.Runtime.CompilerServices; + +namespace API.Helpers; + +/// +/// Responsible for parsing book titles "The man on the street" and removing the prefix -> "man on the street". +/// +/// This code is performance sensitive +public static class BookSortTitlePrefixHelper +{ + private static readonly Dictionary PrefixLookup; + private static readonly Dictionary> PrefixesByFirstChar; + + static BookSortTitlePrefixHelper() + { + var prefixes = new[] + { + // English + "the", "a", "an", + // Spanish + "el", "la", "los", "las", "un", "una", "unos", "unas", + // French + "le", "la", "les", "un", "une", "des", + // German + "der", "die", "das", "den", "dem", "ein", "eine", "einen", "einer", + // Italian + "il", "lo", "la", "gli", "le", "un", "uno", "una", + // Portuguese + "o", "a", "os", "as", "um", "uma", "uns", "umas", + // Russian (transliterated common ones) + "в", "на", "с", "к", "от", "для", + }; + + // Build lookup structures + PrefixLookup = new Dictionary(prefixes.Length, StringComparer.OrdinalIgnoreCase); + PrefixesByFirstChar = new Dictionary>(); + + foreach (var prefix in prefixes) + { + PrefixLookup[prefix] = 1; + + var firstChar = char.ToLowerInvariant(prefix[0]); + if (!PrefixesByFirstChar.TryGetValue(firstChar, out var list)) + { + list = []; + PrefixesByFirstChar[firstChar] = list; + } + list.Add(prefix); + } + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static ReadOnlySpan GetSortTitle(ReadOnlySpan title) + { + if (title.IsEmpty) return title; + + // Fast detection of script type by first character + var firstChar = title[0]; + + // CJK Unicode ranges - no processing needed for most cases + if ((firstChar >= 0x4E00 && firstChar <= 0x9FFF) || // CJK Unified + (firstChar >= 0x3040 && firstChar <= 0x309F) || // Hiragana + (firstChar >= 0x30A0 && firstChar <= 0x30FF)) // Katakana + { + return title; + } + + var firstSpaceIndex = title.IndexOf(' '); + if (firstSpaceIndex <= 0) return title; + + var potentialPrefix = title.Slice(0, firstSpaceIndex); + + // Fast path: check if first character could match any prefix + firstChar = char.ToLowerInvariant(potentialPrefix[0]); + if (!PrefixesByFirstChar.ContainsKey(firstChar)) + return title; + + // Only do the expensive lookup if first character matches + if (PrefixLookup.ContainsKey(potentialPrefix.ToString())) + { + var remainder = title.Slice(firstSpaceIndex + 1); + return remainder.IsEmpty ? title : remainder; + } + + return title; + } + + /// + /// Removes the sort prefix + /// + /// + /// + public static string GetSortTitle(string title) + { + var result = GetSortTitle(title.AsSpan()); + + return result.ToString(); + } +} diff --git a/API/Helpers/Builders/AppUserBuilder.cs b/API/Helpers/Builders/AppUserBuilder.cs index bc044c301..7ffac355e 100644 --- a/API/Helpers/Builders/AppUserBuilder.cs +++ b/API/Helpers/Builders/AppUserBuilder.cs @@ -21,7 +21,7 @@ public class AppUserBuilder : IEntityBuilder ApiKey = HashUtil.ApiKey(), UserPreferences = new AppUserPreferences { - Theme = theme ?? Seed.DefaultThemes.First() + Theme = theme ?? Seed.DefaultThemes.First(), }, ReadingLists = new List(), Bookmarks = new List(), @@ -31,7 +31,8 @@ public class AppUserBuilder : IEntityBuilder Devices = new List(), Id = 0, DashboardStreams = new List(), - SideNavStreams = new List() + SideNavStreams = new List(), + ReadingProfiles = [], }; } @@ -61,4 +62,10 @@ public class AppUserBuilder : IEntityBuilder return this; } + public AppUserBuilder WithRole(string role) + { + _appUser.UserRoles ??= new List(); + _appUser.UserRoles.Add(new AppUserRole() {Role = new AppRole() {Name = role}}); + return this; + } } diff --git a/API/Helpers/Builders/AppUserChapterRatingBuilder.cs b/API/Helpers/Builders/AppUserChapterRatingBuilder.cs new file mode 100644 index 000000000..b5deb9228 --- /dev/null +++ b/API/Helpers/Builders/AppUserChapterRatingBuilder.cs @@ -0,0 +1,40 @@ +#nullable enable +using System; +using API.Entities; + +namespace API.Helpers.Builders; + +public class ChapterRatingBuilder : IEntityBuilder +{ + private readonly AppUserChapterRating _rating; + public AppUserChapterRating Build() => _rating; + + public ChapterRatingBuilder(AppUserChapterRating? rating = null) + { + _rating = rating ?? new AppUserChapterRating(); + } + + public ChapterRatingBuilder WithSeriesId(int seriesId) + { + _rating.SeriesId = seriesId; + return this; + } + + public ChapterRatingBuilder WithChapterId(int chapterId) + { + _rating.ChapterId = chapterId; + return this; + } + + public ChapterRatingBuilder WithRating(int rating) + { + _rating.Rating = Math.Clamp(rating, 0, 5); + return this; + } + + public ChapterRatingBuilder WithBody(string body) + { + _rating.Review = body; + return this; + } +} diff --git a/API/Helpers/Builders/AppUserReadingProfileBuilder.cs b/API/Helpers/Builders/AppUserReadingProfileBuilder.cs new file mode 100644 index 000000000..26da5fd86 --- /dev/null +++ b/API/Helpers/Builders/AppUserReadingProfileBuilder.cs @@ -0,0 +1,54 @@ +using API.Entities; +using API.Entities.Enums; +using API.Extensions; + +namespace API.Helpers.Builders; + +public class AppUserReadingProfileBuilder +{ + private readonly AppUserReadingProfile _profile; + + public AppUserReadingProfile Build() => _profile; + + /// + /// The profile's kind will be unless overwritten with + /// + /// + public AppUserReadingProfileBuilder(int userId) + { + _profile = new AppUserReadingProfile + { + AppUserId = userId, + Kind = ReadingProfileKind.User, + SeriesIds = [], + LibraryIds = [] + }; + } + + public AppUserReadingProfileBuilder WithSeries(Series series) + { + _profile.SeriesIds.Add(series.Id); + return this; + } + + public AppUserReadingProfileBuilder WithLibrary(Library library) + { + _profile.LibraryIds.Add(library.Id); + return this; + } + + public AppUserReadingProfileBuilder WithKind(ReadingProfileKind kind) + { + _profile.Kind = kind; + return this; + } + + public AppUserReadingProfileBuilder WithName(string name) + { + _profile.Name = name; + _profile.NormalizedName = name.ToNormalized(); + return this; + } + + +} diff --git a/API/Helpers/Builders/ChapterBuilder.cs b/API/Helpers/Builders/ChapterBuilder.cs index 4d09a7abf..d9976d92a 100644 --- a/API/Helpers/Builders/ChapterBuilder.cs +++ b/API/Helpers/Builders/ChapterBuilder.cs @@ -4,6 +4,7 @@ using System.Globalization; using System.IO; using API.Entities; using API.Entities.Enums; +using API.Entities.Person; using API.Services.Tasks.Scanner.Parser; namespace API.Helpers.Builders; @@ -24,7 +25,7 @@ public class ChapterBuilder : IEntityBuilder MinNumber = Parser.MinNumberFromRange(number), MaxNumber = Parser.MaxNumberFromRange(number), SortOrder = Parser.MinNumberFromRange(number), - Files = new List(), + Files = [], Pages = 1, CreatedUtc = DateTime.UtcNow }; @@ -38,9 +39,9 @@ public class ChapterBuilder : IEntityBuilder return builder.WithNumber(Parser.RemoveExtensionIfSupported(info.Chapters)!) .WithRange(specialTreatment ? info.Filename : info.Chapters) - .WithTitle((specialTreatment && info.Format == MangaFormat.Epub) + .WithTitle(specialTreatment && info.Format is MangaFormat.Epub or MangaFormat.Pdf ? info.Title - : specialTitle) + : specialTitle ?? string.Empty) .WithIsSpecial(specialTreatment); } @@ -155,4 +156,24 @@ public class ChapterBuilder : IEntityBuilder return this; } + + public ChapterBuilder WithTags(IList tags) + { + _chapter.Tags ??= []; + foreach (var tag in tags) + { + _chapter.Tags.Add(tag); + } + return this; + } + + public ChapterBuilder WithGenres(IList genres) + { + _chapter.Genres ??= []; + foreach (var genre in genres) + { + _chapter.Genres.Add(genre); + } + return this; + } } diff --git a/API/Helpers/Builders/GenreBuilder.cs b/API/Helpers/Builders/GenreBuilder.cs index 69e68f6c1..9b2f1590e 100644 --- a/API/Helpers/Builders/GenreBuilder.cs +++ b/API/Helpers/Builders/GenreBuilder.cs @@ -16,14 +16,14 @@ public class GenreBuilder : IEntityBuilder { Title = name.Trim().SentenceCase(), NormalizedTitle = name.ToNormalized(), - Chapters = new List(), - SeriesMetadatas = new List() + Chapters = [], + SeriesMetadatas = [] }; } public GenreBuilder WithSeriesMetadata(SeriesMetadata seriesMetadata) { - _genre.SeriesMetadatas ??= new List(); + _genre.SeriesMetadatas ??= []; _genre.SeriesMetadatas.Add(seriesMetadata); return this; } diff --git a/API/Helpers/Builders/KoreaderBookDtoBuilder.cs b/API/Helpers/Builders/KoreaderBookDtoBuilder.cs new file mode 100644 index 000000000..debbe0347 --- /dev/null +++ b/API/Helpers/Builders/KoreaderBookDtoBuilder.cs @@ -0,0 +1,46 @@ +using System; +using System.Security.Cryptography; +using System.Text; +using API.DTOs.Koreader; + +namespace API.Helpers.Builders; + +public class KoreaderBookDtoBuilder : IEntityBuilder +{ + private readonly KoreaderBookDto _dto; + public KoreaderBookDto Build() => _dto; + + public KoreaderBookDtoBuilder(string documentHash) + { + _dto = new KoreaderBookDto() + { + Document = documentHash, + Device = "Kavita" + }; + } + + public KoreaderBookDtoBuilder WithDocument(string documentHash) + { + _dto.Document = documentHash; + return this; + } + + public KoreaderBookDtoBuilder WithProgress(string progress) + { + _dto.Progress = progress; + return this; + } + + public KoreaderBookDtoBuilder WithPercentage(int? pageNum, int pages) + { + _dto.Percentage = (pageNum ?? 0) / (float) pages; + return this; + } + + public KoreaderBookDtoBuilder WithDeviceId(string installId, int userId) + { + var hash = SHA256.HashData(Encoding.UTF8.GetBytes(installId + userId)); + _dto.Device_id = Convert.ToHexString(hash); + return this; + } +} diff --git a/API/Helpers/Builders/LibraryBuilder.cs b/API/Helpers/Builders/LibraryBuilder.cs index 5550cfd51..950c5d3d2 100644 --- a/API/Helpers/Builders/LibraryBuilder.cs +++ b/API/Helpers/Builders/LibraryBuilder.cs @@ -104,7 +104,19 @@ public class LibraryBuilder : IEntityBuilder return this; } - public LibraryBuilder WIthAllowScrobbling(bool allowScrobbling) + public LibraryBuilder WithAllowMetadataMatching(bool allow) + { + _library.AllowMetadataMatching = allow; + return this; + } + + public LibraryBuilder WithEnableMetadata(bool enable) + { + _library.EnableMetadata = enable; + return this; + } + + public LibraryBuilder WithAllowScrobbling(bool allowScrobbling) { _library.AllowScrobbling = allowScrobbling; return this; diff --git a/API/Helpers/Builders/MangaFileBuilder.cs b/API/Helpers/Builders/MangaFileBuilder.cs index 5387a3349..ea3ff0c6d 100644 --- a/API/Helpers/Builders/MangaFileBuilder.cs +++ b/API/Helpers/Builders/MangaFileBuilder.cs @@ -60,4 +60,17 @@ public class MangaFileBuilder : IEntityBuilder _mangaFile.Id = Math.Max(id, 0); return this; } + + /// + /// Generate the Hash on the underlying file + /// + /// Only applicable to Epubs + public MangaFileBuilder WithHash() + { + if (_mangaFile.Format != MangaFormat.Epub) return this; + + _mangaFile.KoreaderHash = KoreaderHelper.HashContents(_mangaFile.FilePath); + + return this; + } } diff --git a/API/Helpers/Builders/MediaErrorBuilder.cs b/API/Helpers/Builders/MediaErrorBuilder.cs index 56b19ba33..4d0f7f3a0 100644 --- a/API/Helpers/Builders/MediaErrorBuilder.cs +++ b/API/Helpers/Builders/MediaErrorBuilder.cs @@ -1,5 +1,6 @@ using System.IO; using API.Entities; +using API.Services.Tasks.Scanner.Parser; namespace API.Helpers.Builders; @@ -12,7 +13,7 @@ public class MediaErrorBuilder : IEntityBuilder { _mediaError = new MediaError() { - FilePath = filePath, + FilePath = Parser.NormalizePath(filePath), Extension = Path.GetExtension(filePath).Replace(".", string.Empty).ToUpperInvariant() }; } diff --git a/API/Helpers/Builders/PersonAliasBuilder.cs b/API/Helpers/Builders/PersonAliasBuilder.cs new file mode 100644 index 000000000..e54ea8975 --- /dev/null +++ b/API/Helpers/Builders/PersonAliasBuilder.cs @@ -0,0 +1,19 @@ +using API.Entities.Person; +using API.Extensions; + +namespace API.Helpers.Builders; + +public class PersonAliasBuilder : IEntityBuilder +{ + private readonly PersonAlias _alias; + public PersonAlias Build() => _alias; + + public PersonAliasBuilder(string name) + { + _alias = new PersonAlias() + { + Alias = name.Trim(), + NormalizedAlias = name.ToNormalized(), + }; + } +} diff --git a/API/Helpers/Builders/PersonBuilder.cs b/API/Helpers/Builders/PersonBuilder.cs index 2bbdfa744..afd0c84af 100644 --- a/API/Helpers/Builders/PersonBuilder.cs +++ b/API/Helpers/Builders/PersonBuilder.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; -using API.Entities; -using API.Entities.Enums; -using API.Entities.Metadata; +using System.Linq; +using API.Entities.Person; using API.Extensions; namespace API.Helpers.Builders; @@ -33,6 +32,20 @@ public class PersonBuilder : IEntityBuilder return this; } + public PersonBuilder WithAlias(string alias) + { + if (_person.Aliases.Any(a => a.NormalizedAlias.Equals(alias.ToNormalized()))) + { + return this; + } + + _person.Aliases.Add(new PersonAliasBuilder(alias).Build()); + + return this; + } + + + public PersonBuilder WithSeriesMetadata(SeriesMetadataPeople seriesMetadataPeople) { _person.SeriesMetadataPeople.Add(seriesMetadataPeople); diff --git a/API/Helpers/Builders/PlusSeriesDtoBuilder.cs b/API/Helpers/Builders/PlusSeriesDtoBuilder.cs index 6a8e70bde..3da217b9f 100644 --- a/API/Helpers/Builders/PlusSeriesDtoBuilder.cs +++ b/API/Helpers/Builders/PlusSeriesDtoBuilder.cs @@ -2,14 +2,15 @@ using API.DTOs; using API.DTOs.Scrobbling; using API.Entities; +using API.Extensions; using API.Services.Plus; namespace API.Helpers.Builders; -public class PlusSeriesDtoBuilder : IEntityBuilder +public class PlusSeriesDtoBuilder : IEntityBuilder { - private readonly PlusSeriesDto _seriesDto; - public PlusSeriesDto Build() => _seriesDto; + private readonly PlusSeriesRequestDto _seriesRequestDto; + public PlusSeriesRequestDto Build() => _seriesRequestDto; /// /// This must be a FULL Series @@ -17,9 +18,9 @@ public class PlusSeriesDtoBuilder : IEntityBuilder /// public PlusSeriesDtoBuilder(Series series) { - _seriesDto = new PlusSeriesDto() + _seriesRequestDto = new PlusSeriesRequestDto() { - MediaFormat = LibraryTypeHelper.GetFormat(series.Library.Type), + MediaFormat = series.Library.Type.ConvertToPlusMediaFormat(series.Format), SeriesName = series.Name, AltSeriesName = series.LocalizedName, AniListId = ScrobblingService.ExtractId(series.Metadata.WebLinks, diff --git a/API/Helpers/Builders/SeriesBuilder.cs b/API/Helpers/Builders/SeriesBuilder.cs index 525b0cddc..96e820659 100644 --- a/API/Helpers/Builders/SeriesBuilder.cs +++ b/API/Helpers/Builders/SeriesBuilder.cs @@ -21,11 +21,13 @@ public class SeriesBuilder : IEntityBuilder _series = new Series() { Name = name, + LocalizedName = name.ToNormalized(), + NormalizedLocalizedName = name.ToNormalized(), + OriginalName = name, SortName = name, NormalizedName = name.ToNormalized(), - NormalizedLocalizedName = name.ToNormalized(), Metadata = new SeriesMetadataBuilder() .WithPublicationStatus(PublicationStatus.OnGoing) .Build(), @@ -39,14 +41,25 @@ public class SeriesBuilder : IEntityBuilder /// /// /// - public SeriesBuilder WithLocalizedName(string localizedName) + public SeriesBuilder WithLocalizedName(string localizedName, bool lockStatus = false) { + // Why is this here? if (string.IsNullOrEmpty(localizedName)) { localizedName = _series.Name; } + _series.LocalizedName = localizedName; _series.NormalizedLocalizedName = localizedName.ToNormalized(); + _series.LocalizedNameLocked = lockStatus; + return this; + } + + public SeriesBuilder WithLocalizedNameAllowEmpty(string localizedName, bool lockStatus = false) + { + _series.LocalizedName = localizedName; + _series.NormalizedLocalizedName = localizedName.ToNormalized(); + _series.LocalizedNameLocked = lockStatus; return this; } @@ -106,4 +119,15 @@ public class SeriesBuilder : IEntityBuilder } + public SeriesBuilder WithRelationship(int targetSeriesId, RelationKind kind) + { + _series.Relations ??= []; + _series.Relations.Add(new SeriesRelation() + { + RelationKind = kind, + TargetSeriesId = targetSeriesId + }); + + return this; + } } diff --git a/API/Helpers/Builders/SeriesMetadataBuilder.cs b/API/Helpers/Builders/SeriesMetadataBuilder.cs index 316eaaf83..462bc4455 100644 --- a/API/Helpers/Builders/SeriesMetadataBuilder.cs +++ b/API/Helpers/Builders/SeriesMetadataBuilder.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using API.Entities; using API.Entities.Enums; using API.Entities.Metadata; +using API.Entities.Person; namespace API.Helpers.Builders; @@ -39,15 +40,17 @@ public class SeriesMetadataBuilder : IEntityBuilder return this; } - public SeriesMetadataBuilder WithPublicationStatus(PublicationStatus status) + public SeriesMetadataBuilder WithPublicationStatus(PublicationStatus status, bool lockState = false) { _seriesMetadata.PublicationStatus = status; + _seriesMetadata.PublicationStatusLocked = lockState; return this; } - public SeriesMetadataBuilder WithAgeRating(AgeRating rating) + public SeriesMetadataBuilder WithAgeRating(AgeRating rating, bool lockState = false) { _seriesMetadata.AgeRating = rating; + _seriesMetadata.AgeRatingLocked = lockState; return this; } @@ -60,7 +63,6 @@ public class SeriesMetadataBuilder : IEntityBuilder Person = person, SeriesMetadata = _seriesMetadata, }); - return this; } @@ -70,15 +72,59 @@ public class SeriesMetadataBuilder : IEntityBuilder return this; } - public SeriesMetadataBuilder WithReleaseYear(int year) + public SeriesMetadataBuilder WithReleaseYear(int year, bool lockStatus = false) { _seriesMetadata.ReleaseYear = year; + _seriesMetadata.ReleaseYearLocked = lockStatus; return this; } - public SeriesMetadataBuilder WithSummary(string summary) + public SeriesMetadataBuilder WithSummary(string summary, bool lockStatus = false) { _seriesMetadata.Summary = summary; + _seriesMetadata.SummaryLocked = lockStatus; + return this; + } + + public SeriesMetadataBuilder WithGenre(Genre genre, bool lockStatus = false) + { + _seriesMetadata.Genres ??= []; + _seriesMetadata.Genres.Add(genre); + _seriesMetadata.GenresLocked = lockStatus; + return this; + } + + public SeriesMetadataBuilder WithGenres(List genres, bool lockStatus = false) + { + _seriesMetadata.Genres = genres; + _seriesMetadata.GenresLocked = lockStatus; + return this; + } + + public SeriesMetadataBuilder WithTag(Tag tag, bool lockStatus = false) + { + _seriesMetadata.Tags ??= []; + _seriesMetadata.Tags.Add(tag); + _seriesMetadata.TagsLocked = lockStatus; + return this; + } + + public SeriesMetadataBuilder WithTags(List tags, bool lockStatus = false) + { + _seriesMetadata.Tags = tags; + _seriesMetadata.TagsLocked = lockStatus; + return this; + } + + public SeriesMetadataBuilder WithMaxCount(int count) + { + _seriesMetadata.MaxCount = count; + return this; + } + + public SeriesMetadataBuilder WithTotalCount(int count) + { + _seriesMetadata.TotalCount = count; return this; } } diff --git a/API/Helpers/Builders/TagBuilder.cs b/API/Helpers/Builders/TagBuilder.cs index 084171f54..623587fd1 100644 --- a/API/Helpers/Builders/TagBuilder.cs +++ b/API/Helpers/Builders/TagBuilder.cs @@ -16,8 +16,8 @@ public class TagBuilder : IEntityBuilder { Title = name.Trim().SentenceCase(), NormalizedTitle = name.ToNormalized(), - Chapters = new List(), - SeriesMetadatas = new List() + Chapters = [], + SeriesMetadatas = [] }; } diff --git a/API/Helpers/Converters/FilterFieldValueConverter.cs b/API/Helpers/Converters/FilterFieldValueConverter.cs index b0fb8fd0f..631332f5f 100644 --- a/API/Helpers/Converters/FilterFieldValueConverter.cs +++ b/API/Helpers/Converters/FilterFieldValueConverter.cs @@ -100,7 +100,7 @@ public static class FilterFieldValueConverter .ToList(), FilterField.WantToRead => bool.Parse(value), FilterField.ReadProgress => string.IsNullOrEmpty(value) ? 0f : value.AsFloat(), - FilterField.ReadingDate => DateTime.Parse(value), + FilterField.ReadingDate => DateTime.Parse(value, CultureInfo.InvariantCulture), FilterField.ReadLast => int.Parse(value), FilterField.Formats => value.Split(',') .Select(x => (MangaFormat) Enum.Parse(typeof(MangaFormat), x)) diff --git a/API/Helpers/Converters/PersonFilterFieldValueConverter.cs b/API/Helpers/Converters/PersonFilterFieldValueConverter.cs new file mode 100644 index 000000000..822ce105a --- /dev/null +++ b/API/Helpers/Converters/PersonFilterFieldValueConverter.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using API.DTOs.Filtering.v2; +using API.Entities.Enums; + +namespace API.Helpers.Converters; + +public static class PersonFilterFieldValueConverter +{ + public static object ConvertValue(PersonFilterField field, string value) + { + return field switch + { + PersonFilterField.Name => value, + PersonFilterField.Role => ParsePersonRoles(value), + PersonFilterField.SeriesCount => int.Parse(value), + PersonFilterField.ChapterCount => int.Parse(value), + _ => throw new ArgumentOutOfRangeException(nameof(field), field, "Field is not supported") + }; + } + + private static IList ParsePersonRoles(string value) + { + if (string.IsNullOrEmpty(value)) return []; + + return value.Split(',', StringSplitOptions.RemoveEmptyEntries) + .Select(v => Enum.Parse(v.Trim())) + .ToList(); + } +} diff --git a/API/Helpers/DayOfWeekHelper.cs b/API/Helpers/DayOfWeekHelper.cs new file mode 100644 index 000000000..10cdb4170 --- /dev/null +++ b/API/Helpers/DayOfWeekHelper.cs @@ -0,0 +1,18 @@ +using System; + +namespace API.Helpers; + +public static class DayOfWeekHelper +{ + private static readonly Random Rnd = new(); + + /// + /// Returns a random DayOfWeek value. + /// + /// A randomly selected DayOfWeek. + public static DayOfWeek Random() + { + var values = Enum.GetValues(); + return (DayOfWeek)values.GetValue(Rnd.Next(values.Length))!; + } +} diff --git a/API/Helpers/GenreHelper.cs b/API/Helpers/GenreHelper.cs index b11915053..8580178d9 100644 --- a/API/Helpers/GenreHelper.cs +++ b/API/Helpers/GenreHelper.cs @@ -12,12 +12,19 @@ using Microsoft.EntityFrameworkCore; namespace API.Helpers; #nullable enable + public static class GenreHelper { + public static async Task UpdateChapterGenres(Chapter chapter, IEnumerable genreNames, IUnitOfWork unitOfWork) { // Normalize genre names once and store them in a hash set for quick lookups - var normalizedGenresToAdd = new HashSet(genreNames.Select(g => g.ToNormalized())); + var normalizedToOriginal = genreNames + .Select(g => new { Original = g, Normalized = g.ToNormalized() }) + .GroupBy(x => x.Normalized) + .ToDictionary(g => g.Key, g => g.First().Original); + + var normalizedGenresToAdd = new HashSet(normalizedToOriginal.Keys); // Remove genres that are no longer in the new list var genresToRemove = chapter.Genres @@ -40,7 +47,7 @@ public static class GenreHelper // Find missing genres that are not in the database var missingGenres = normalizedGenresToAdd .Where(nt => !existingGenreTitles.ContainsKey(nt)) - .Select(title => new GenreBuilder(title).Build()) + .Select(nt => new GenreBuilder(normalizedToOriginal[nt]).Build()) .ToList(); // Add missing genres to the database @@ -71,13 +78,19 @@ public static class GenreHelper public static void UpdateGenreList(ICollection? existingGenres, Series series, IReadOnlyCollection newGenres, Action handleAdd, Action onModified) + { + UpdateGenreList(existingGenres.DefaultIfEmpty().Select(t => t.Title).ToList(), series, newGenres, handleAdd, onModified); + } + + public static void UpdateGenreList(ICollection? existingGenres, Series series, + IReadOnlyCollection newGenres, Action handleAdd, Action onModified) { if (existingGenres == null) return; var isModified = false; // Convert tags and existing genres to hash sets for quick lookups by normalized title - var tagSet = new HashSet(existingGenres.Select(t => t.Title.ToNormalized())); + var tagSet = new HashSet(existingGenres.Select(t => t.ToNormalized())); var genreSet = new HashSet(series.Metadata.Genres.Select(g => g.NormalizedTitle)); // Remove tags that are no longer present in the input tags @@ -97,7 +110,7 @@ public static class GenreHelper // Add new tags from the input list foreach (var tagDto in existingGenres) { - var normalizedTitle = tagDto.Title.ToNormalized(); + var normalizedTitle = tagDto.ToNormalized(); if (genreSet.Contains(normalizedTitle)) continue; // This prevents re-adding existing genres @@ -107,7 +120,7 @@ public static class GenreHelper } else { - handleAdd(new GenreBuilder(tagDto.Title).Build()); // Add new genre if not found + handleAdd(new GenreBuilder(tagDto).Build()); // Add new genre if not found } isModified = true; } diff --git a/API/Helpers/JwtHelper.cs b/API/Helpers/JwtHelper.cs new file mode 100644 index 000000000..0f9219804 --- /dev/null +++ b/API/Helpers/JwtHelper.cs @@ -0,0 +1,45 @@ +using System; +using System.Globalization; +using System.IdentityModel.Tokens.Jwt; +using System.Linq; + +namespace API.Helpers; + +public static class JwtHelper +{ + /// + /// Extracts the expiration date from a JWT token. + /// + public static DateTime GetTokenExpiry(string jwtToken) + { + if (string.IsNullOrEmpty(jwtToken)) + return DateTime.MinValue; + + // Parse the JWT and extract the expiry claim + var jwtHandler = new JwtSecurityTokenHandler(); + var token = jwtHandler.ReadJwtToken(jwtToken); + return token.ValidTo; + + // var exp = token.Claims.FirstOrDefault(c => c.Type == "exp")?.Value; + // + // if (long.TryParse(exp, CultureInfo.InvariantCulture, out var expSeconds)) + // { + // return DateTimeOffset.FromUnixTimeSeconds(expSeconds).UtcDateTime; + // } + // + // + // + // return DateTime.MinValue; + } + + /// + /// Checks if a JWT token is valid based on its expiry date. + /// + public static bool IsTokenValid(string jwtToken) + { + if (string.IsNullOrEmpty(jwtToken)) return false; + + var expiry = GetTokenExpiry(jwtToken); + return expiry > DateTime.UtcNow; + } +} diff --git a/API/Helpers/KoreaderHelper.cs b/API/Helpers/KoreaderHelper.cs new file mode 100644 index 000000000..e779cd911 --- /dev/null +++ b/API/Helpers/KoreaderHelper.cs @@ -0,0 +1,113 @@ +using API.DTOs.Progress; +using System; +using System.IO; +using System.Security.Cryptography; +using System.Text; +using API.Services.Tasks.Scanner.Parser; + +namespace API.Helpers; + +/// +/// All things related to Koreader +/// +/// Original developer: https://github.com/MFDeAngelo +public static class KoreaderHelper +{ + /// + /// Hashes the document according to a custom Koreader hashing algorithm. + /// Look at the util.partialMD5 method in the attached link. + /// Note: Only applies to epub files + /// + /// The hashing algorithm is relatively quick as it only hashes ~10,000 bytes for the biggest of files. + /// + /// The path to the file to hash + public static string HashContents(string filePath) + { + if (string.IsNullOrEmpty(filePath) || !File.Exists(filePath) || !Parser.IsEpub(filePath)) + { + return null; + } + + using var file = File.OpenRead(filePath); + + const int step = 1024; + const int size = 1024; + var md5 = MD5.Create(); + var buffer = new byte[size]; + + for (var i = -1; i < 10; i++) + { + file.Position = step << 2 * i; + var bytesRead = file.Read(buffer, 0, size); + if (bytesRead > 0) + { + md5.TransformBlock(buffer, 0, bytesRead, buffer, 0); + } + else + { + break; + } + } + + file.Close(); + md5.TransformFinalBlock([], 0, 0); + + return md5.Hash == null ? null : Convert.ToHexString(md5.Hash).ToUpper(); + } + + /// + /// Koreader can identify documents based on contents or title. + /// For now, we only support by contents. + /// + public static string HashTitle(string filePath) + { + var fileName = Path.GetFileName(filePath); + var fileNameBytes = Encoding.ASCII.GetBytes(fileName); + var bytes = MD5.HashData(fileNameBytes); + + return Convert.ToHexString(bytes); + } + + public static void UpdateProgressDto(ProgressDto progress, string koreaderPosition) + { + var path = koreaderPosition.Split('/'); + if (path.Length < 6) + { + return; + } + + var docNumber = path[2].Replace("DocFragment[", string.Empty).Replace("]", string.Empty); + progress.PageNum = int.Parse(docNumber) - 1; + var lastTag = path[5].ToUpper(); + + if (lastTag == "A") + { + progress.BookScrollId = null; + } + else + { + // The format that Kavita accepts as a progress string. It tells Kavita where Koreader last left off. + progress.BookScrollId = $"//html[1]/BODY/APP-ROOT[1]/DIV[1]/DIV[1]/DIV[1]/APP-BOOK-READER[1]/DIV[1]/DIV[2]/DIV[1]/DIV[1]/DIV[1]/{lastTag}"; + } + } + + + public static string GetKoreaderPosition(ProgressDto progressDto) + { + string lastTag; + var koreaderPageNumber = progressDto.PageNum + 1; + + if (string.IsNullOrEmpty(progressDto.BookScrollId)) + { + lastTag = "a"; + } + else + { + var tokens = progressDto.BookScrollId.Split('/'); + lastTag = tokens[^1].ToLower(); + } + + // The format that Koreader accepts as a progress string. It tells Koreader where Kavita last left off. + return $"/body/DocFragment[{koreaderPageNumber}]/body/div/{lastTag}"; + } +} diff --git a/API/Helpers/LibraryTypeHelper.cs b/API/Helpers/LibraryTypeHelper.cs deleted file mode 100644 index 423d93f0e..000000000 --- a/API/Helpers/LibraryTypeHelper.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using API.DTOs.Scrobbling; -using API.Entities.Enums; - -namespace API.Helpers; -#nullable enable - -public static class LibraryTypeHelper -{ - public static MediaFormat GetFormat(LibraryType libraryType) - { - // TODO: Refactor this to an extension on LibraryType - return libraryType switch - { - LibraryType.Manga => MediaFormat.Manga, - LibraryType.Comic => MediaFormat.Comic, - LibraryType.LightNovel => MediaFormat.LightNovel, - LibraryType.Book => MediaFormat.LightNovel, - LibraryType.Image => MediaFormat.Manga, - LibraryType.ComicVine => MediaFormat.Comic, - _ => throw new ArgumentOutOfRangeException(nameof(libraryType), libraryType, null) - }; - } -} diff --git a/API/Helpers/OrderableHelper.cs b/API/Helpers/OrderableHelper.cs index 3313ca658..d4ff89573 100644 --- a/API/Helpers/OrderableHelper.cs +++ b/API/Helpers/OrderableHelper.cs @@ -9,6 +9,8 @@ public static class OrderableHelper { public static void ReorderItems(List items, int itemId, int toPosition) { + if (toPosition < 0) throw new ArgumentException("toPosition cannot be less than 0"); + var item = items.Find(r => r.Id == itemId); if (item != null) { @@ -24,6 +26,8 @@ public static class OrderableHelper public static void ReorderItems(List items, int itemId, int toPosition) { + if (toPosition < 0) throw new ArgumentException("toPosition cannot be less than 0"); + var item = items.Find(r => r.Id == itemId); if (item != null && toPosition < items.Count) { @@ -48,10 +52,15 @@ public static class OrderableHelper public static void ReorderItems(List items, int readingListItemId, int toPosition) { if (toPosition < 0) throw new ArgumentException("toPosition cannot be less than 0"); + var item = items.Find(r => r.Id == readingListItemId); if (item != null) { items.Remove(item); + + // Ensure toPosition is within the new list bounds + toPosition = Math.Min(toPosition, items.Count); + items.Insert(toPosition, item); } diff --git a/API/Helpers/PdfComicInfoExtractor.cs b/API/Helpers/PdfComicInfoExtractor.cs new file mode 100644 index 000000000..ce74ae97d --- /dev/null +++ b/API/Helpers/PdfComicInfoExtractor.cs @@ -0,0 +1,146 @@ +/** + * Contributed by https://github.com/microtherion + * + * All references to the "PDF Spec" (section numbers, etc) refer to the + * PDF 1.7 Specification a.k.a. PDF32000-1:2008 + * https://opensource.adobe.com/dc-acrobat-sdk-docs/pdfstandards/PDF32000_2008.pdf + */ +using System; +using API.Data.Metadata; +using API.Entities.Enums; +using API.Services; +using API.Services.Tasks.Scanner.Parser; +using Microsoft.Extensions.Logging; +using Nager.ArticleNumber; +using System.Collections.Generic; +using System.Globalization; + +namespace API.Helpers; +#nullable enable + +public interface IPdfComicInfoExtractor +{ + ComicInfo? GetComicInfo(string filePath); +} + +/// +/// Translate PDF metadata (See PdfMetadataExtractor.cs) into ComicInfo structure. +/// +public class PdfComicInfoExtractor : IPdfComicInfoExtractor +{ + private readonly ILogger _logger; + private readonly IMediaErrorService _mediaErrorService; + private readonly string[] _pdfDateFormats = [ // PDF Spec 7.9.4 + "D:yyyyMMddHHmmsszzz:", "D:yyyyMMddHHmmss+", "D:yyyyMMddHHmmss", + "D:yyyyMMddHHmmzzz:", "D:yyyyMMddHHmm+", "D:yyyyMMddHHmm", + "D:yyyyMMddHHzzz:", "D:yyyyMMddHH+", "D:yyyyMMddHH", + "D:yyyyMMdd", "D:yyyyMM", "D:yyyy" + ]; + + public PdfComicInfoExtractor(ILogger logger, IMediaErrorService mediaErrorService) + { + _logger = logger; + _mediaErrorService = mediaErrorService; + } + + private static float? GetFloatFromText(string? text) + { + if (string.IsNullOrEmpty(text)) return null; + + if (float.TryParse(text, CultureInfo.InvariantCulture, out var value)) return value; + + return null; + } + + private DateTime? GetDateTimeFromText(string? text) + { + if (string.IsNullOrEmpty(text)) return null; + + // Dates stored in the XMP metadata stream (PDF Spec 14.3.2) + // are stored in ISO 8601 format, which is handled by C# out of the box + if (DateTime.TryParse(text, CultureInfo.InvariantCulture, out var date)) return date; + + // Dates stored in the document information directory (PDF Spec 14.3.3) + // are stored in a proprietary format (PDF Spec 7.9.4) that needs to be + // massaged slightly to be expressible by a DateTime format. + if (text[0] != 'D') { + text = "D:" + text; + } + text = text.Replace("'", ":"); + text = text.Replace("Z", "+"); + + foreach(var format in _pdfDateFormats) + { + if (DateTime.TryParseExact(text, format, CultureInfo.InvariantCulture, DateTimeStyles.None, out var pdfDate)) return pdfDate; + } + + return null; + } + + private static string? MaybeGetMetadata(Dictionary metadata, string key) + { + return metadata.TryGetValue(key, out var value) ? value : null; + } + + private ComicInfo? GetComicInfoFromMetadata(Dictionary metadata, string filePath) + { + var info = new ComicInfo(); + + var publicationDate = GetDateTimeFromText(MaybeGetMetadata(metadata, "CreationDate")); + + if (publicationDate != null) + { + info.Year = publicationDate.Value.Year; + info.Month = publicationDate.Value.Month; + info.Day = publicationDate.Value.Day; + } + + info.Summary = MaybeGetMetadata(metadata, "Summary") ?? string.Empty; + info.Publisher = MaybeGetMetadata(metadata, "Publisher") ?? string.Empty; + info.Writer = MaybeGetMetadata(metadata, "Author") ?? string.Empty; + info.Title = MaybeGetMetadata(metadata, "Title") ?? string.Empty; + info.TitleSort = MaybeGetMetadata(metadata, "TitleSort") ?? string.Empty; + info.Genre = MaybeGetMetadata(metadata, "Subject") ?? string.Empty; + info.LanguageISO = BookService.ValidateLanguage(MaybeGetMetadata(metadata, "Language")); + info.Isbn = MaybeGetMetadata(metadata, "ISBN") ?? string.Empty; + + if (info.Isbn != string.Empty && !ArticleNumberHelper.IsValidIsbn10(info.Isbn) && !ArticleNumberHelper.IsValidIsbn13(info.Isbn)) + { + _logger.LogDebug("[BookService] {File} has an invalid ISBN number", filePath); + info.Isbn = string.Empty; + } + + info.UserRating = GetFloatFromText(MaybeGetMetadata(metadata, "UserRating")) ?? 0.0f; + info.Series = MaybeGetMetadata(metadata, "Series") ?? info.Title; + info.SeriesSort = info.Series; + info.Volume = MaybeGetMetadata(metadata, "Volume") ?? string.Empty; + + // If this is a single book and not a collection, set publication status to Completed + if (string.IsNullOrEmpty(info.Volume) && Parser.ParseVolume(filePath, LibraryType.Manga).Equals(Parser.LooseLeafVolume)) + { + info.Count = 1; + } + + ComicInfo.CleanComicInfo(info); + + return info; + } + + public ComicInfo? GetComicInfo(string filePath) + { + try + { + var extractor = new PdfMetadataExtractor(_logger, filePath); + + return GetComicInfoFromMetadata(extractor.GetMetadata(), filePath); + } + catch (Exception ex) + { + _logger.LogWarning(ex, "[GetComicInfo] There was an exception parsing PDF metadata for {File}", filePath); + _mediaErrorService.ReportMediaIssue(filePath, MediaErrorProducer.BookService, + "There was an exception parsing PDF metadata", ex); + } + + return null; + } +} diff --git a/API/Helpers/PdfMetadataExtractor.cs b/API/Helpers/PdfMetadataExtractor.cs new file mode 100644 index 000000000..44327672b --- /dev/null +++ b/API/Helpers/PdfMetadataExtractor.cs @@ -0,0 +1,1637 @@ +/** + * Contributed by https://github.com/microtherion + * + * All references to the "PDF Spec" (section numbers, etc) refer to the + * PDF 1.7 Specification a.k.a. PDF32000-1:2008 + * https://opensource.adobe.com/dc-acrobat-sdk-docs/pdfstandards/PDF32000_2008.pdf + */ + +using System; +using System.Collections.Generic; +using System.IO.Compression; +using System.Text; +using System.Xml; +using System.IO; +using Microsoft.Extensions.Logging; +using API.Services; + +namespace API.Helpers; +#nullable enable + +/// +/// Parse PDF file and try to extract as much metadata as possible. +/// Supports both text based XRef tables and compressed XRef streams (Deflate only). +/// Supports both UTF-16 and PDFDocEncoding for strings. +/// Lacks support for many PDF configurations that are theoretically possible, but should handle most common cases. +/// +public class PdfMetadataExtractorException : Exception +{ + public PdfMetadataExtractorException() + { + } + + public PdfMetadataExtractorException(string message) + : base(message) + { + } + + public PdfMetadataExtractorException(string message, Exception inner) + : base(message, inner) + { + } +} + +public interface IPdfMetadataExtractor +{ + Dictionary GetMetadata(); +} + +class PdfStringBuilder +{ + private readonly StringBuilder _builder = new(); + private bool _secondByte = false; + private byte _prevByte = 0; + private bool _isUnicode = false; + + // PDFDocEncoding defined in PDF Spec D.1 + + private readonly char[] _pdfDocMappingLow = + [ + '\u02D8', '\u02C7', '\u02C6', '\u02D9', '\u02DD', '\u02DB', '\u02DA', '\u02DC' + ]; + + private readonly char[] _pdfDocMappingHigh = + [ + '\u2022', '\u2020', '\u2021', '\u2026', '\u2014', '\u2013', '\u0192', '\u2044', + '\u2039', '\u203A', '\u2212', '\u2030', '\u201E', '\u201C', '\u201D', '\u2018', + '\u2019', '\u201A', '\u2122', '\uFB01', '\uFB02', '\u0141', '\u0152', '\u0160', + '\u0178', '\u017D', '\u0131', '\u0142', '\u0153', '\u0161', '\u017E', ' ', + '\u20AC' + ]; + + private void AppendPdfDocByte(byte b) + { + if (b >= 0x18 && b < 0x20) + { + _builder.Append(_pdfDocMappingLow[b - 0x18]); + } + else if (b >= 0x80 && b < 0xA1) + { + _builder.Append(_pdfDocMappingHigh[b - 0x80]); + } + else + { + _builder.Append((char)b); + } + } + + public void Append(char c) + { + _builder.Append(c); + } + + public void AppendByte(byte b) + { + // PDF Spec 7.9.2.1: Strings are either UTF-16BE or PDFDocEncoded + if (_builder.Length == 0 && !_isUnicode) + { + // Unicode strings are prefixed by a big endian BOM \uFEFF + if (_secondByte) + { + if (b == 0xFF) + { + _isUnicode = true; + _secondByte = false; + } + else + { + AppendPdfDocByte(_prevByte); + AppendPdfDocByte(b); + } + } + else if (!_secondByte && b == 0xFE) + { + _secondByte = true; + _prevByte = b; + } + else + { + AppendPdfDocByte(b); + } + } + else if (_isUnicode) + { + if (_secondByte) + { + _builder.Append((char)(((char)_prevByte) << 8 | (char)b)); + _secondByte = false; + } + else + { + _prevByte = b; + _secondByte = true; + } + } + else + { + AppendPdfDocByte(b); + } + } + + override public string ToString() + { + if (_builder.Length == 0 && _secondByte) + { + AppendPdfDocByte(_prevByte); + } + + return _builder.ToString(); + } +} + +internal class PdfLexer(Stream stream) +{ + private const int BufferSize = 1024; + private readonly byte[] _buffer = new byte[BufferSize]; + private int _pos = 0; + private int _valid = 0; + + public enum TokenType + { + None, + Bool, + Int, + Double, + Name, + String, + ArrayStart, + ArrayEnd, + DictionaryStart, + DictionaryEnd, + StreamStart, + StreamEnd, + ObjectStart, + ObjectEnd, + ObjectRef, + Keyword, + Newline, + } + + public struct Token(TokenType type, object value) + { + public TokenType Type = type; + public object Value = value; + } + + public Token NextToken(bool reportNewlines = false) + { + while (true) + { + switch ((char)NextByte()) + { + case '\n' when reportNewlines: + return new Token(TokenType.Newline, true); + + case '\r' when reportNewlines: + if (NextByte() != '\n') + { + PutBack(); + } + return new Token(TokenType.Newline, true); + + case ' ': + case '\x00': + case '\t': + case '\n': + case '\f': + case '\r': + continue; // Skip whitespace + + case '%': + SkipComment(); + continue; + + case '+': + case '-': + case '.': + case >= '0' and <= '9': + return ScanNumber(); + + case '/': + return ScanName(); + + case '(': + return ScanString(); + + case '[': + return new Token(TokenType.ArrayStart, true); + + case ']': + return new Token(TokenType.ArrayEnd, true); + + case '<': + if (NextByte() == '<') + { + return new Token(TokenType.DictionaryStart, true); + } + else + { + PutBack(); + return ScanHexString(); + } + case '>': + ExpectByte((byte)'>'); + + return new Token(TokenType.DictionaryEnd, true); + + case >= 'a' and <= 'z': + case >= 'A' and <= 'Z': + return ScanKeyword(); + + default: + throw new PdfMetadataExtractorException("Unexpected byte, got {LastByte()}"); + } + } + } + + public void ResetBuffer() + { + _pos = 0; + _valid = 0; + } + + public bool TestByte(byte expected) + { + var result = NextByte() == expected; + + PutBack(); + + return result; + } + + public void ExpectNewline() + { + while (true) + { + var b = NextByte(); + switch ((char)b) + { + case ' ': + case '\t': + case '\f': + continue; // Skip whitespace + + case '\n': + return; + + case '\r': + if (NextByte() != '\n') + { + PutBack(); + } + + return; + + default: + throw new PdfMetadataExtractorException("Unexpected character, expected newline, got {b}"); + } + } + } + + public long GetXRefStart() + { + // Look for the startxref element as per PDF Spec 7.5.5 + while (true) + { + var b = NextByte(); + + switch ((char)b) + { + case '\r': + b = NextByte(); + + if (b != '\n') + { + PutBack(); + } + + goto case '\n'; + + case '\n': + // Handle consecutive newlines + while (true) + { + b = NextByte(); + + if (b == '\r') + { + goto case '\r'; + } + else if (b == '\n') + { + goto case '\n'; + } + else if (b == ' ' || b == '\t' || b == '\f') + { + continue; + } + else + { + PutBack(); + + break; + } + } + + var token = NextToken(true); + + if (token.Type == TokenType.Keyword && (string)token.Value == "startxref") + { + token = NextToken(); + + if (token.Type == TokenType.Int) + { + return (long)token.Value; + } + else + { + throw new PdfMetadataExtractorException("Expected integer after startxref keyword"); + } + } + + continue; + + default: + continue; + } + } + } + + public bool NextXRefEntry(ref long obj, ref int generation) + { + // Cross-reference table entry as per PDF Spec 7.5.4 + + WantLookahead(20); + + if (_valid - _pos < 20) + { + throw new PdfMetadataExtractorException("End of stream"); + } + + var inUse = true; + + if (obj == 0) + { + obj = Convert.ToInt64(Encoding.ASCII.GetString(_buffer, _pos, 10)); + generation = Convert.ToInt32(Encoding.ASCII.GetString(_buffer, _pos + 11, 5)); + inUse = _buffer[_pos + 17] == 'n'; + } + + _pos += 20; + + return inUse; + } + + public Stream StreamObject(int length, bool deflate) + { + // Read a stream object as per PDF Spec 7.3.8 + // At the moment, we only accept uncompressed streams or the FlateDecode (PDF Spec 7.4.1) filter + // with no parameters. These cover the vast majority of streams we're interested in. + + var rawData = new MemoryStream(); + + ExpectNewline(); + + if (_pos < _valid) + { + var buffered = Math.Min(_valid - _pos, length); + rawData.Write(_buffer, _pos, buffered); + length -= buffered; + _pos += buffered; + } + + while (length > 0) + { + var buffered = Math.Min(length, BufferSize); + stream.ReadExactly(_buffer, 0, buffered); + rawData.Write(_buffer, 0, buffered); + _pos = 0; + _valid = 0; + length -= buffered; + } + + rawData.Seek(0, SeekOrigin.Begin); + + if (deflate) + { + return new ZLibStream(rawData, CompressionMode.Decompress, false); + } + else + { + return rawData; + } + } + + private byte NextByte() + { + if (_pos >= _valid) + { + _pos = 0; + _valid = stream.Read(_buffer, 0, BufferSize); + + if (_valid <= 0) + { + throw new PdfMetadataExtractorException("End of stream"); + } + } + + return _buffer[_pos++]; + } + + private byte LastByte() + { + return _buffer[_pos - 1]; + } + + private void PutBack() + { + --_pos; + } + + private void ExpectByte(byte expected) + { + if (NextByte() != expected) + { + throw new PdfMetadataExtractorException($"Unexpected character, expected {expected}"); + } + } + + private void WantLookahead(int length) + { + if (_pos + length > _valid) + { + Buffer.BlockCopy(_buffer, _pos, _buffer, 0, _valid - _pos); + _valid -= _pos; + _pos = 0; + _valid += stream.Read(_buffer, _valid, BufferSize - _valid); + } + } + + private void SkipComment() + { + while (true) + { + var b = NextByte(); + + if (b == '\n') + { + break; + } + else if (b == '\r') + { + if (NextByte() != '\n') + { + PutBack(); + } + + break; + } + } + } + + private Token ScanNumber() + { + StringBuilder sb = new(); + var hasDot = LastByte() == '.'; + var followedBySpace = false; + + sb.Append((char)LastByte()); + + while (true) + { + var b = NextByte(); + + if (b == '.' || b >= '0' && b <= '9') + { + sb.Append((char)b); + + if (b == '.') + { + hasDot = true; + } + } + else + { + followedBySpace = (b == ' ' || b == '\t'); + PutBack(); + + break; + } + } + + if (hasDot) + { + return new Token(TokenType.Double, double.Parse(sb.ToString())); + } + + if (followedBySpace) + { + // Look ahead to see if it's an object reference (PDF Spec 7.3.10) + WantLookahead(32); + + var savedPos = _pos; + var b = NextByte(); + + while (b == ' ' || b == '\t') + { + b = NextByte(); + } + + // Generation number (ignored) + while (b >= '0' && b <= '9') + { + b = NextByte(); + } + + while (b == ' ' || b == '\t') + { + b = NextByte(); + } + + if (b == 'R') + { + return new Token(TokenType.ObjectRef, long.Parse(sb.ToString())); + } + else if (b == 'o' && NextByte() == 'b' && NextByte() == 'j') + { + return new Token(TokenType.ObjectStart, long.Parse(sb.ToString())); + } + else + { + _pos = savedPos; + } + } + + return new Token(TokenType.Int, long.Parse(sb.ToString())); + } + + private static int HexDigit(byte b) + { + return (char) b switch + { + >= '0' and <= '9' => b - (byte) '0', + >= 'a' and <= 'f' => b - (byte) 'a' + 10, + >= 'A' and <= 'F' => b - (byte) 'A' + 10, + _ => throw new PdfMetadataExtractorException("Invalid hex digit, got {b}") + }; + } + + private Token ScanName() + { + // PDF Spec 7.3.5 + + var sb = new StringBuilder(); + while (true) + { + var b = NextByte(); + switch ((char)b) + { + case '(': + case ')': + case '[': + case ']': + case '{': + case '}': + case '<': + case '>': + case '/': + case '%': + PutBack(); + + goto case ' '; + + case ' ': + case '\t': + case '\n': + case '\f': + case '\r': + return new Token(TokenType.Name, sb.ToString()); + + case '#': + var b1 = NextByte(); + var b2 = NextByte(); + b = (byte)((HexDigit(b1) << 4) | HexDigit(b2)); + + goto default; + + default: + sb.Append((char)b); + break; + } + } + } + + private Token ScanString() + { + // PDF Spec 7.3.4.2 + + PdfStringBuilder sb = new(); + var parenLevel = 1; + + while (true) + { + var b = NextByte(); + + switch ((char)b) + { + case '(': + parenLevel++; + + goto default; + + case ')': + if (--parenLevel == 0) + { + return new Token(TokenType.String, sb.ToString()); + } + + goto default; + + case '\\': + b = NextByte(); + + switch ((char)b) + { + case 'b': + sb.Append('\b'); + + break; + + case 'f': + sb.Append('\f'); + + break; + + case 'n': + sb.Append('\n'); + + break; + + case 'r': + sb.Append('\r'); + + break; + + case 't': + sb.Append('\t'); + + break; + + case >= '0' and <= '7': + var b1 = b; + var b2 = NextByte(); + var b3 = NextByte(); + + if (b2 < '0' || b2 > '7' || b3 < '0' || b3 > '7') + { + throw new PdfMetadataExtractorException("Invalid octal escape, got {b1}{b2}{b3}"); + } + + sb.AppendByte((byte)((b1 - '0') << 6 | (b2 - '0') << 3 | (b3 - '0'))); + + break; + } + break; + + default: + sb.AppendByte(b); + break; + } + } + } + + private Token ScanHexString() + { + // PDF Spec 7.3.4.3 + + PdfStringBuilder sb = new(); + + while (true) + { + var b = NextByte(); + + switch ((char)b) + { + case (>= '0' and <= '9') or (>= 'a' and <= 'f') or (>= 'A' and <= 'F'): + var b1 = NextByte(); + if (b1 == '>') + { + PutBack(); + b1 = (byte)'0'; + } + sb.AppendByte((byte)(HexDigit(b) << 4 | HexDigit(b1))); + + break; + + case '>': + return new Token(TokenType.String, sb.ToString()); + + default: + throw new PdfMetadataExtractorException("Invalid hex string, got {b}"); + } + } + } + + private Token ScanKeyword() + { + StringBuilder sb = new(); + + sb.Append((char)LastByte()); + + while (true) + { + var b = NextByte(); + if ((b >= 'a' && b <= 'z') || (b >= 'A' && b <= 'Z')) + { + sb.Append((char)b); + } + else + { + PutBack(); + + break; + } + } + + switch (sb.ToString()) + { + case "true": + return new Token(TokenType.Bool, true); + + case "false": + return new Token(TokenType.Bool, false); + + case "stream": + return new Token(TokenType.StreamStart, true); + + case "endstream": + return new Token(TokenType.StreamEnd, true); + + case "endobj": + return new Token(TokenType.ObjectEnd, true); + + default: + return new Token(TokenType.Keyword, sb.ToString()); + } + } +} + +internal class PdfMetadataExtractor : IPdfMetadataExtractor +{ + private readonly ILogger _logger; + private readonly PdfLexer _lexer; + private readonly FileStream _stream; + private long[] _objectOffsets = new long[0]; + private readonly Dictionary _metadata = []; + private readonly Stack _metadataRef = new(); + + private struct MetadataRef(long root, long info) + { + public long Root = root; + public long Info = info; + } + + private struct XRefSection(long first, long count) + { + public readonly long First = first; + public readonly long Count = count; + } + + public PdfMetadataExtractor(ILogger logger, string filename) + { + _logger = logger; + _stream = File.OpenRead(filename); + _lexer = new PdfLexer(_stream); + + ReadObjectOffsets(); + ReadMetadata(filename); + } + + public Dictionary GetMetadata() + { + return _metadata; + } + + private void LogMetadata(string filename) + { + _logger.LogTrace("Metadata for {Path}:", filename); + + foreach (var entry in _metadata) + { + _logger.LogTrace(" {Key:0,-5} : {Value:1}", entry.Key, entry.Value); + } + } + + private void ReadObjectOffsets() + { + // Look for file trailer (PDF Spec 7.5.5) + // Spec says trailer must be strictly at end of file. + // Adobe software accepts trailer within last 1K of EOF, + // but in practice, virtually all PDFs have trailer at end. + + _stream.Seek(-32, SeekOrigin.End); + + var xrefOffset = _lexer.GetXRefStart(); + + ReadXRefAndTrailer(xrefOffset); + } + + private void ReadXRefAndTrailer(long xrefOffset) + { + _stream.Seek(xrefOffset, SeekOrigin.Begin); + _lexer.ResetBuffer(); + + if (!_lexer.TestByte((byte)'x')) + { + // Cross-reference stream (PDF Spec 7.5.8) + + ReadXRefStream(); + + return; + } + + // Cross-reference table (PDF Spec 7.5.4) + + var token = _lexer.NextToken(); + + if (token.Type != PdfLexer.TokenType.Keyword || (string)token.Value != "xref") + { + throw new PdfMetadataExtractorException("Expected xref keyword"); + } + + while (true) + { + token = _lexer.NextToken(); + + if (token.Type == PdfLexer.TokenType.Int) + { + var startObj = (long)token.Value; + token = _lexer.NextToken(); + + if (token.Type != PdfLexer.TokenType.Int) + { + throw new PdfMetadataExtractorException("Expected number of objects in xref subsection"); + } + + var numObj = (long)token.Value; + + if (_objectOffsets.Length < startObj + numObj) + { + Array.Resize(ref _objectOffsets, (int)(startObj + numObj)); + } + + _lexer.ExpectNewline(); + + var generation = 0; + + for (var obj = startObj; obj < startObj + numObj; ++obj) + { + var inUse = _lexer.NextXRefEntry(ref _objectOffsets[obj], ref generation); + + if (!inUse) + { + _objectOffsets[obj] = 0; + } + } + } + else if (token.Type == PdfLexer.TokenType.Keyword && (string)token.Value == "trailer") + { + break; + } + else + { + throw new PdfMetadataExtractorException("Unexpected token in xref"); + } + } + + ReadTrailerDictionary(); + } + + private void ReadXRefStream() + { + // Cross-reference stream (PDF Spec 7.5.8) + + var token = _lexer.NextToken(); + + if (token.Type != PdfLexer.TokenType.ObjectStart) + { + throw new PdfMetadataExtractorException("Expected obj keyword"); + } + + long length = -1; + long size = -1; + var deflate = false; + long prev = -1; + long typeWidth = -1; + long offsetWidth = -1; + long generationWidth = -1; + Queue sections = new(); + var meta = new MetadataRef(-1, -1); + + // Cross-reference stream dictionary (PDF Spec 7.5.8.2) + + ParseDictionary(delegate(string key, PdfLexer.Token value) { + switch (key) + { + case "Type": + if (value.Type != PdfLexer.TokenType.Name || (string)value.Value != "XRef") + { + throw new PdfMetadataExtractorException("Expected /Type to be /XRef"); + } + + return true; + + case "Length": + if (value.Type != PdfLexer.TokenType.Int) + { + throw new PdfMetadataExtractorException("Expected integer after /Length"); + } + + length = (long)value.Value; + + return true; + + case "Size": + if (value.Type != PdfLexer.TokenType.Int) + { + throw new PdfMetadataExtractorException("Expected integer after /Size"); + } + + size = (long)value.Value; + + return true; + + case "Prev": + if (value.Type != PdfLexer.TokenType.Int) + { + throw new PdfMetadataExtractorException("Expected offset after /Prev"); + } + + prev = (long)value.Value; + + return true; + + case "Index": + if (value.Type != PdfLexer.TokenType.ArrayStart) + { + throw new PdfMetadataExtractorException("Expected array after /Index"); + } + + while (true) + { + token = _lexer.NextToken(); + + if (token.Type == PdfLexer.TokenType.ArrayEnd) + { + break; + } + else if (token.Type != PdfLexer.TokenType.Int) + { + throw new PdfMetadataExtractorException("Expected integer in /Index array"); + } + + var first = (long)token.Value; + token = _lexer.NextToken(); + + if (token.Type != PdfLexer.TokenType.Int) + { + throw new PdfMetadataExtractorException("Expected integer pair in /Index array"); + } + + var count = (long)token.Value; + sections.Enqueue(new XRefSection(first, count)); + } + + return true; + + case "W": + if (value.Type != PdfLexer.TokenType.ArrayStart) + { + throw new PdfMetadataExtractorException("Expected array after /W"); + } + + var widths = new long[3]; + + for (var i = 0; i < 3; ++i) + { + token = _lexer.NextToken(); + + if (token.Type != PdfLexer.TokenType.Int) + { + throw new PdfMetadataExtractorException("Expected integer in /W array"); + } + + widths[i] = (long)token.Value; + } + + token = _lexer.NextToken(); + + if (token.Type != PdfLexer.TokenType.ArrayEnd) + { + throw new PdfMetadataExtractorException("Unclosed array after /W"); + } + + typeWidth = widths[0]; + offsetWidth = widths[1]; + generationWidth = widths[2]; + + return true; + + case "Filter": + if (value.Type != PdfLexer.TokenType.Name) + { + throw new PdfMetadataExtractorException("Expected name after /Filter"); + } + + if ((string)value.Value != "FlateDecode") + { + throw new PdfMetadataExtractorException("Unsupported filter, only FlateDecode is supported"); + } + + deflate = true; + + return true; + + case "Root": + if (value.Type != PdfLexer.TokenType.ObjectRef) + { + throw new PdfMetadataExtractorException("Expected object reference after /Root"); + } + + meta.Root = (long)value.Value; + + return true; + + case "Info": + if (value.Type != PdfLexer.TokenType.ObjectRef) + { + throw new PdfMetadataExtractorException("Expected object reference after /Info"); + } + + meta.Info = (long)value.Value; + + return true; + + default: + return false; + } + }); + + token = _lexer.NextToken(); + + if (token.Type != PdfLexer.TokenType.StreamStart) + { + throw new PdfMetadataExtractorException("Expected xref stream after dictionary"); + } + + var stream = _lexer.StreamObject((int)length, deflate); + + if (sections.Count == 0) + { + sections.Enqueue(new XRefSection(0, size)); + } + + while (sections.Count > 0) + { + var section = sections.Dequeue(); + + if (_objectOffsets.Length < size) + { + Array.Resize(ref _objectOffsets, (int)size); + } + + for (var i = section.First; i < section.First + section.Count; ++i) + { + long type = 0; + long offset = 0; + long generation = 0; + + if (typeWidth == 0) + { + type = 1; + } + + for (var j = 0; j < typeWidth; ++j) + { + type = (type << 8) | (ushort)stream.ReadByte(); + } + + for (var j = 0; j < offsetWidth; ++j) + { + offset = (offset << 8) | (ushort)stream.ReadByte(); + } + + for (var j = 0; j < generationWidth; ++j) + { + generation = (generation << 8) | (ushort)stream.ReadByte(); + } + + if (type == 1 && _objectOffsets[i] == 0) + { + _objectOffsets[i] = offset; + } + } + } + + if (prev > -1) + { + ReadXRefAndTrailer(prev); + } + + PushMetadataRef(meta); + } + + private void PushMetadataRef(MetadataRef meta) + { + if (_metadataRef.Count > 0) + { + if (meta.Root == _metadataRef.Peek().Root) + { + meta.Root = -1; + } + + if (meta.Info == _metadataRef.Peek().Info) + { + meta.Info = -1; + } + } + + if (meta.Root != -1 || meta.Info != -1) + { + _metadataRef.Push(meta); + } + } + + private void ReadTrailerDictionary() + { + // Read trailer directory (PDF Spec 7.5.5) + + long prev = -1; + long xrefStm = -1; + + MetadataRef meta = new(-1, -1); + + ParseDictionary(delegate(string key, PdfLexer.Token value) + { + switch (key) + { + case "Root": + if (value.Type != PdfLexer.TokenType.ObjectRef) + { + throw new PdfMetadataExtractorException("Expected object reference after /Root"); + } + + meta.Root = (long)value.Value; + + return true; + case "Prev": + if (value.Type != PdfLexer.TokenType.Int) + { + throw new PdfMetadataExtractorException("Expected offset after /Prev"); + } + + prev = (long)value.Value; + + return true; + case "Info": + if (value.Type != PdfLexer.TokenType.ObjectRef) + { + throw new PdfMetadataExtractorException("Expected object reference after /Info"); + } + + meta.Info = (long)value.Value; + + return true; + case "XRefStm": + // Prefer encoded xref stream over xref table + if (value.Type != PdfLexer.TokenType.Int) + { + throw new PdfMetadataExtractorException("Expected offset after /XRefStm"); + } + + xrefStm = (long)value.Value; + + return true; + + case "Encrypt": + throw new PdfMetadataExtractorException("Encryption not supported"); + + default: + return false; + } + }); + + PushMetadataRef(meta); + + if (xrefStm != -1) + { + ReadXRefAndTrailer(xrefStm); + } + + if (prev != -1) + { + ReadXRefAndTrailer(prev); + } + } + + private void ReadMetadata(string filename) + { + // We read potential metadata sources in backwards historical order, so + // we can overwrite to our heart's content + + while (_metadataRef.Count > 0) + { + var meta = _metadataRef.Pop(); + + //_logger.LogTrace("DocumentCatalog for {Path}: {Root}, Info: {Info}", filename, meta.root, meta.info); + + ReadMetadataFromInfo(meta.Info); + ReadMetadataFromXml(MetadataObjInObjectCatalog(meta.Root)); + } + } + + private void ReadMetadataFromInfo(long infoObj) + { + // Document information dictionary (PDF Spec 14.3.3) + // We treat this as less authoritative than the Metadata stream. + + if (infoObj < 1 || infoObj >= _objectOffsets.Length || _objectOffsets[infoObj] == 0) + { + return; + } + + _stream.Seek(_objectOffsets[infoObj], SeekOrigin.Begin); + _lexer.ResetBuffer(); + + var token = _lexer.NextToken(); + + if (token.Type != PdfLexer.TokenType.ObjectStart) + { + throw new PdfMetadataExtractorException("Expected object header"); + } + + Dictionary indirectObjects = []; + + ParseDictionary(delegate(string key, PdfLexer.Token value) + { + switch (key) + { + case "Title": + case "Author": + case "Subject": + case "Keywords": + case "Creator": + case "Producer": + case "CreationDate": + case "ModDate": + if (value.Type == PdfLexer.TokenType.ObjectRef) { + indirectObjects[key] = (long)value.Value; + } + else if (value.Type != PdfLexer.TokenType.String) + { + throw new PdfMetadataExtractorException("Expected string value"); + } + else + { + _metadata[key] = (string)value.Value; + } + + return true; + + default: + return false; + } + }); + + // Resolve indirectly referenced values + foreach(var key in indirectObjects.Keys) { + _stream.Seek(_objectOffsets[indirectObjects[key]], SeekOrigin.Begin); + _lexer.ResetBuffer(); + + token = _lexer.NextToken(); + + if (token.Type != PdfLexer.TokenType.ObjectStart) { + throw new PdfMetadataExtractorException("Expected object here"); + } + + token = _lexer.NextToken(); + + if (token.Type != PdfLexer.TokenType.String) { + throw new PdfMetadataExtractorException("Expected string"); + } + + _metadata[key] = (string) token.Value; + } + } + + private long MetadataObjInObjectCatalog(long rootObj) + { + // Look for /Metadata entry in document catalog (PDF Spec 7.7.2) + + if (rootObj < 1 || rootObj >= _objectOffsets.Length || _objectOffsets[rootObj] == 0) + { + return -1; + } + + _stream.Seek(_objectOffsets[rootObj], SeekOrigin.Begin); + _lexer.ResetBuffer(); + + var token = _lexer.NextToken(); + + if (token.Type != PdfLexer.TokenType.ObjectStart) + { + throw new PdfMetadataExtractorException("Expected object header"); + } + + long meta = -1; + + ParseDictionary(delegate(string key, PdfLexer.Token value) + { + switch (key) { + case "Metadata": + if (value.Type != PdfLexer.TokenType.ObjectRef) + { + throw new PdfMetadataExtractorException("Expected object number after /Metadata"); + } + + meta = (long)value.Value; + + return true; + + default: + return false; + } + }); + + return meta; + } + + // Obtain metadata from XMP stream object + // See XMP specification: https://developer.adobe.com/xmp/docs/XMPSpecifications/ + // and Dublin Core: https://www.dublincore.org/specifications/dublin-core/ + + private static string? GetTextFromXmlNode(XmlDocument doc, XmlNamespaceManager ns, string path) + { + return (doc.DocumentElement?.SelectSingleNode(path + "//rdf:li", ns) + ?? doc.DocumentElement?.SelectSingleNode(path, ns))?.InnerText; + } + + private static string? GetListFromXmlNode(XmlDocument doc, XmlNamespaceManager ns, string path) + { + var nodes = doc.DocumentElement?.SelectNodes(path + "//rdf:li", ns); + + if (nodes == null) return null; + + var list = new StringBuilder(); + + foreach (XmlNode n in nodes) + { + if (list.Length > 0) + { + list.Append(','); + } + + list.Append(n.InnerText); + } + + return list.Length > 0 ? list.ToString() : null; + } + + private void SetMetadata(string key, string? value) + { + if (value == null) return; + + _metadata[key] = value; + } + + private void ReadMetadataFromXml(long meta) + { + if (meta < 1 || meta >= _objectOffsets.Length || _objectOffsets[meta] == 0) return; + + _stream.Seek(_objectOffsets[meta], SeekOrigin.Begin); + _lexer.ResetBuffer(); + + var token = _lexer.NextToken(); + + if (token.Type != PdfLexer.TokenType.ObjectStart) + { + throw new PdfMetadataExtractorException("Expected object header"); + } + + long length = -1; + var deflate = false; + + // Metadata stream dictionary (PDF Spec 14.3.2) + + ParseDictionary(delegate(string key, PdfLexer.Token value) + { + switch (key) { + case "Type": + if (value.Type != PdfLexer.TokenType.Name || (string)value.Value != "Metadata") + { + throw new PdfMetadataExtractorException("Expected /Type to be /Metadata"); + } + + return true; + + case "Subtype": + if (value.Type != PdfLexer.TokenType.Name || (string)value.Value != "XML") + { + throw new PdfMetadataExtractorException("Expected /Subtype to be /XML"); + } + + return true; + + case "Length": + if (value.Type != PdfLexer.TokenType.Int) + { + throw new PdfMetadataExtractorException("Expected integer after /Length"); + } + + length = (long)value.Value; + + return true; + + case "Filter": + if (value.Type != PdfLexer.TokenType.Name) + { + throw new PdfMetadataExtractorException("Expected name after /Filter"); + } + + if ((string)value.Value != "FlateDecode") + { + throw new PdfMetadataExtractorException("Unsupported filter, only FlateDecode is supported"); + } + + deflate = true; + + return true; + + default: + return false; + } + }); + + token = _lexer.NextToken(); + + if (token.Type != PdfLexer.TokenType.StreamStart) + { + throw new PdfMetadataExtractorException("Expected xref stream after dictionary"); + } + + var xmlStream = _lexer.StreamObject((int)length, deflate); + + // Skip XMP header + while (true) { + var b = xmlStream.ReadByte(); + + if (b < 0) { + throw new PdfMetadataExtractorException("Reached EOF in XMP header"); + } + + if (b == '?') { + while (b == '?') { + b = xmlStream.ReadByte(); + } + + if (b == '>') { + break; + } + } + } + + var metaDoc = new XmlDocument(); + metaDoc.Load(xmlStream); + + var ns = new XmlNamespaceManager(metaDoc.NameTable); + ns.AddNamespace("rdf", "http://www.w3.org/1999/02/22-rdf-syntax-ns#"); + ns.AddNamespace("dc", "http://purl.org/dc/elements/1.1/"); + ns.AddNamespace("calibreSI", "http://calibre-ebook.com/xmp-namespace-series-index"); + ns.AddNamespace("calibre", "http://calibre-ebook.com/xmp-namespace"); + ns.AddNamespace("pdfx", "http://ns.adobe.com/pdfx/1.3/"); + ns.AddNamespace("prism", "http://prismstandard.org/namespaces/basic/2.0/"); + ns.AddNamespace("xmp", "http://ns.adobe.com/xap/1.0/"); + + SetMetadata("CreationDate", + GetTextFromXmlNode(metaDoc, ns, "//dc:date") + ?? GetTextFromXmlNode(metaDoc, ns, "//xmp:CreateDate")); + SetMetadata("Summary", GetTextFromXmlNode(metaDoc, ns, "//dc:description")); + SetMetadata("Publisher", GetTextFromXmlNode(metaDoc, ns, "//dc:publisher")); + SetMetadata("Author", GetListFromXmlNode(metaDoc, ns, "//dc:creator")); + SetMetadata("Title", GetTextFromXmlNode(metaDoc, ns, "//dc:title")); + SetMetadata("Subject", GetListFromXmlNode(metaDoc, ns, "//dc:subject")); + SetMetadata("Language", GetTextFromXmlNode(metaDoc, ns, "//dc:language")); + SetMetadata("ISBN", GetTextFromXmlNode(metaDoc, ns, "//pdfx:isbn") ?? GetTextFromXmlNode(metaDoc, ns, "//prism:isbn")); + SetMetadata("UserRating", GetTextFromXmlNode(metaDoc, ns, "//calibre:rating")); + SetMetadata("TitleSort", GetTextFromXmlNode(metaDoc, ns, "//calibre:title_sort")); + SetMetadata("Series", GetTextFromXmlNode(metaDoc, ns, "//calibre:series/rdf:value")); + SetMetadata("Volume", GetTextFromXmlNode(metaDoc, ns, "//calibreSI:series_index")); + } + + private delegate bool DictionaryHandler(string key, PdfLexer.Token value); + + private void ParseDictionary(DictionaryHandler handler) + { + var token = _lexer.NextToken(); + + if (token.Type != PdfLexer.TokenType.DictionaryStart) + { + throw new PdfMetadataExtractorException("Expected dictionary"); + } + + while (true) + { + token = _lexer.NextToken(); + + if (token.Type == PdfLexer.TokenType.DictionaryEnd) + { + return; + } + + if (token.Type == PdfLexer.TokenType.Name) + { + var value = _lexer.NextToken(); + + if (!handler((string)token.Value, value)) { + SkipValue(value); + } + } + else + { + throw new PdfMetadataExtractorException("Improper token in dictionary"); + } + } + } + + private void SkipValue(PdfLexer.Token? existingToken = null) + { + var token = existingToken ?? _lexer.NextToken(); + + switch (token.Type) + { + case PdfLexer.TokenType.Bool: + case PdfLexer.TokenType.Int: + case PdfLexer.TokenType.Double: + case PdfLexer.TokenType.Name: + case PdfLexer.TokenType.String: + case PdfLexer.TokenType.ObjectRef: + break; + case PdfLexer.TokenType.ArrayStart: + { + SkipArray(); + break; + } + case PdfLexer.TokenType.DictionaryStart: + { + SkipDictionary(); + break; + } + default: + throw new PdfMetadataExtractorException("Unexpected token in SkipValue"); + } + } + + private void SkipArray() + { + while (true) + { + var token = _lexer.NextToken(); + + if (token.Type == PdfLexer.TokenType.ArrayEnd) + { + break; + } + + SkipValue(token); + } + } + + private void SkipDictionary() + { + while (true) + { + var token = _lexer.NextToken(); + + if (token.Type == PdfLexer.TokenType.DictionaryEnd) + { + break; + } + if (token.Type != PdfLexer.TokenType.Name) + { + throw new PdfMetadataExtractorException("Expected name in dictionary"); + } + + SkipValue(); + } + } +} diff --git a/API/Helpers/PersonHelper.cs b/API/Helpers/PersonHelper.cs index 193513453..b71ff2c1a 100644 --- a/API/Helpers/PersonHelper.cs +++ b/API/Helpers/PersonHelper.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using API.Data; @@ -7,6 +6,7 @@ using API.DTOs; using API.Entities; using API.Entities.Enums; using API.Entities.Metadata; +using API.Entities.Person; using API.Extensions; using API.Helpers.Builders; @@ -17,6 +17,20 @@ namespace API.Helpers; public static class PersonHelper { + public static Dictionary ConstructNameAndAliasDictionary(IList people) + { + var dict = new Dictionary(); + foreach (var person in people) + { + dict.TryAdd(person.NormalizedName, person); + foreach (var alias in person.Aliases) + { + dict.TryAdd(alias.NormalizedAlias, person); + } + } + return dict; + } + public static async Task UpdateSeriesMetadataPeopleAsync(SeriesMetadata metadata, ICollection metadataPeople, IEnumerable chapterPeople, PersonRole role, IUnitOfWork unitOfWork) { @@ -38,7 +52,9 @@ public static class PersonHelper // Identify people to remove from metadataPeople var peopleToRemove = existingMetadataPeople - .Where(person => !peopleToAddSet.Contains(person.Person.NormalizedName)) + .Where(person => + !peopleToAddSet.Contains(person.Person.NormalizedName) && + !person.Person.Aliases.Any(pa => peopleToAddSet.Contains(pa.NormalizedAlias))) .ToList(); // Remove identified people from metadataPeople @@ -53,11 +69,7 @@ public static class PersonHelper .GetPeopleByNames(peopleToAdd.Select(p => p.NormalizedName).ToList()); // Prepare a dictionary for quick lookup of existing people by normalized name - var existingPeopleDict = new Dictionary(); - foreach (var person in existingPeopleInDb) - { - existingPeopleDict.TryAdd(person.NormalizedName, person); - } + var existingPeopleDict = ConstructNameAndAliasDictionary(existingPeopleInDb); // Track the people to attach (newly created people) var peopleToAttach = new List(); @@ -80,7 +92,6 @@ public static class PersonHelper // If not, create a new Person entity using the real name dbPerson = new PersonBuilder(personName).Build(); peopleToAttach.Add(dbPerson); // Add new person to the list to be attached - modification = true; } // Add the person to the SeriesMetadataPeople collection @@ -130,15 +141,12 @@ public static class PersonHelper var existingPeople = await unitOfWork.PersonRepository.GetPeopleByNames(normalizedPeople); // Prepare a dictionary for quick lookup by normalized name - var existingPeopleDict = new Dictionary(); - foreach (var person in existingPeople) - { - existingPeopleDict.TryAdd(person.NormalizedName, person); - } + var existingPeopleDict = ConstructNameAndAliasDictionary(existingPeople); // Identify people to remove (those present in ChapterPeople but not in the new list) - foreach (var existingChapterPerson in existingChapterPeople - .Where(existingChapterPerson => !normalizedPeople.Contains(existingChapterPerson.Person.NormalizedName))) + var toRemove = existingChapterPeople + .Where(existingChapterPerson => !normalizedPeople.Contains(existingChapterPerson.Person.NormalizedName)); + foreach (var existingChapterPerson in toRemove) { chapter.People.Remove(existingChapterPerson); unitOfWork.PersonRepository.Remove(existingChapterPerson); diff --git a/API/Services/ReviewService.cs b/API/Helpers/ReviewHelper.cs similarity index 84% rename from API/Services/ReviewService.cs rename to API/Helpers/ReviewHelper.cs index c2c876b4b..03c50a4cf 100644 --- a/API/Services/ReviewService.cs +++ b/API/Helpers/ReviewHelper.cs @@ -5,10 +5,9 @@ using System.Text.RegularExpressions; using API.DTOs.SeriesDetail; using HtmlAgilityPack; +namespace API.Helpers; -namespace API.Services; - -public static class ReviewService +public static class ReviewHelper { private const int BodyTextLimit = 175; public static IEnumerable SelectSpectrumOfReviews(IList reviews) @@ -60,6 +59,9 @@ public static class ReviewService .Where(s => !s.Equals("\n"))); // Clean any leftover markdown out + plainText = Regex.Replace(plainText, @"\*\*(.*?)\*\*", "$1"); // Bold with ** + plainText = Regex.Replace(plainText, @"_(.*?)_", "$1"); // Italic with _ + plainText = Regex.Replace(plainText, @"\[(.*?)\]\((.*?)\)", "$1"); // Links [text](url) plainText = Regex.Replace(plainText, @"[_*\[\]~]", string.Empty); plainText = Regex.Replace(plainText, @"img\d*\((.*?)\)", string.Empty); plainText = Regex.Replace(plainText, @"~~~(.*?)~~~", "$1"); @@ -68,6 +70,7 @@ public static class ReviewService plainText = Regex.Replace(plainText, @"__(.*?)__", "$1"); plainText = Regex.Replace(plainText, @"#\s(.*?)", "$1"); + // Just strip symbols plainText = Regex.Replace(plainText, @"[_*\[\]~]", string.Empty); plainText = Regex.Replace(plainText, @"img\d*\((.*?)\)", string.Empty); @@ -76,8 +79,8 @@ public static class ReviewService plainText = Regex.Replace(plainText, @"~~", string.Empty); plainText = Regex.Replace(plainText, @"__", string.Empty); - // Take the first 100 characters - plainText = plainText.Length > 100 ? plainText.Substring(0, BodyTextLimit) : plainText; + // Take the first BodyTextLimit characters + plainText = plainText.Length > BodyTextLimit ? plainText.Substring(0, BodyTextLimit) : plainText; return plainText + "…"; } diff --git a/API/Helpers/StringHelper.cs b/API/Helpers/StringHelper.cs new file mode 100644 index 000000000..0a20910c5 --- /dev/null +++ b/API/Helpers/StringHelper.cs @@ -0,0 +1,69 @@ +using System.Text.RegularExpressions; + +namespace API.Helpers; +#nullable enable + +public static partial class StringHelper +{ + #region Regex Source Generators + [GeneratedRegex(@"\s?\(Source:\s*[^)]+\)")] + private static partial Regex SourceRegex(); + [GeneratedRegex(@"", RegexOptions.IgnoreCase | RegexOptions.Compiled, "en-US")] + private static partial Regex BrStandardizeRegex(); + [GeneratedRegex(@"(?:
\s*)+", RegexOptions.IgnoreCase | RegexOptions.Compiled, "en-US")] + private static partial Regex BrMultipleRegex(); + [GeneratedRegex(@"\s+")] + private static partial Regex WhiteSpaceRegex(); + [GeneratedRegex("&#64;")] + private static partial Regex HtmlEncodedAtSymbolRegex(); + #endregion + + /// + /// Used to squash duplicate break and new lines with a single new line. + /// + /// Test br br Test -> Test br Test + /// + /// + public static string? SquashBreaklines(string? summary) + { + if (string.IsNullOrWhiteSpace(summary)) + { + return null; + } + + // First standardize all br tags to
format + summary = BrStandardizeRegex().Replace(summary, "
"); + + // Replace multiple consecutive br tags with a single br tag + summary = BrMultipleRegex().Replace(summary, "
"); + + // Normalize remaining whitespace (replace multiple spaces with a single space) + summary = WhiteSpaceRegex().Replace(summary, " ").Trim(); + + return summary.Trim(); + } + + /// + /// Removes the (Source: MangaDex) type of tags at the end of descriptions from AL + /// + /// + /// + public static string? RemoveSourceInDescription(string? description) + { + if (string.IsNullOrEmpty(description)) return description; + + return SourceRegex().Replace(description, string.Empty).Trim(); + } + + /// + /// Replaces some HTML encoded characters in urls with the proper symbol. This is common in People Description's + /// + /// + /// + public static string? CorrectUrls(string? description) + { + if (string.IsNullOrEmpty(description)) return description; + + return HtmlEncodedAtSymbolRegex().Replace(description, "@"); + } +} diff --git a/API/Helpers/TagHelper.cs b/API/Helpers/TagHelper.cs index cceecc826..c00d6ee8f 100644 --- a/API/Helpers/TagHelper.cs +++ b/API/Helpers/TagHelper.cs @@ -20,7 +20,13 @@ public static class TagHelper public static async Task UpdateChapterTags(Chapter chapter, IEnumerable tagNames, IUnitOfWork unitOfWork) { // Normalize tag names once and store them in a hash set for quick lookups - var normalizedTagsToAdd = new HashSet(tagNames.Select(t => t.ToNormalized())); + // Create a dictionary: normalized => original + var normalizedToOriginal = tagNames + .Select(t => new { Original = t, Normalized = t.ToNormalized() }) + .GroupBy(x => x.Normalized) // in case of duplicates + .ToDictionary(g => g.Key, g => g.First().Original); + + var normalizedTagsToAdd = new HashSet(normalizedToOriginal.Keys); var existingTagsSet = new HashSet(chapter.Tags.Select(t => t.NormalizedTitle)); var isModified = false; @@ -30,7 +36,7 @@ public static class TagHelper .Where(t => !normalizedTagsToAdd.Contains(t.NormalizedTitle)) .ToList(); - if (tagsToRemove.Any()) + if (tagsToRemove.Count != 0) { foreach (var tagToRemove in tagsToRemove) { @@ -47,7 +53,7 @@ public static class TagHelper // Find missing tags that are not already in the database var missingTags = normalizedTagsToAdd .Where(nt => !existingTagTitles.ContainsKey(nt)) - .Select(title => new TagBuilder(title).Build()) + .Select(nt => new TagBuilder(normalizedToOriginal[nt]).Build()) .ToList(); // Add missing tags to the database if any @@ -67,13 +73,11 @@ public static class TagHelper // Add the new or existing tags to the chapter foreach (var normalizedTitle in normalizedTagsToAdd) { - var tag = existingTagTitles[normalizedTitle]; + if (existingTagsSet.Contains(normalizedTitle)) continue; - if (!existingTagsSet.Contains(normalizedTitle)) - { - chapter.Tags.Add(tag); - isModified = true; - } + var tag = existingTagTitles[normalizedTitle]; + chapter.Tags.Add(tag); + isModified = true; } // Commit changes if modifications were made to the chapter's tags @@ -103,13 +107,18 @@ public static class TagHelper public static void UpdateTagList(ICollection? existingDbTags, Series series, IReadOnlyCollection newTags, Action handleAdd, Action onModified) + { + UpdateTagList((existingDbTags ?? []).Select(t => t.Title).ToList(), series, newTags, handleAdd, onModified); + } + + public static void UpdateTagList(ICollection? existingDbTags, Series series, IReadOnlyCollection newTags, Action handleAdd, Action onModified) { if (existingDbTags == null) return; var isModified = false; // Convert tags and existing genres to hash sets for quick lookups by normalized title - var existingTagSet = new HashSet(existingDbTags.Select(t => t.Title.ToNormalized())); + var existingTagSet = new HashSet(existingDbTags.Select(t => t.ToNormalized())); var dbTagSet = new HashSet(series.Metadata.Tags.Select(g => g.NormalizedTitle)); // Remove tags that are no longer present in the input tags @@ -129,7 +138,7 @@ public static class TagHelper // Add new tags from the input list foreach (var tagDto in existingDbTags) { - var normalizedTitle = tagDto.Title.ToNormalized(); + var normalizedTitle = tagDto.ToNormalized(); if (dbTagSet.Contains(normalizedTitle)) continue; // This prevents re-adding existing genres @@ -139,7 +148,7 @@ public static class TagHelper } else { - handleAdd(new TagBuilder(tagDto.Title).Build()); // Add new genre if not found + handleAdd(new TagBuilder(tagDto).Build()); // Add new genre if not found } isModified = true; } @@ -150,5 +159,4 @@ public static class TagHelper onModified(); } } - } diff --git a/API/I18N/as.json b/API/I18N/as.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/API/I18N/as.json @@ -0,0 +1 @@ +{} diff --git a/API/I18N/ca.json b/API/I18N/ca.json new file mode 100644 index 000000000..b314a9374 --- /dev/null +++ b/API/I18N/ca.json @@ -0,0 +1,65 @@ +{ + "confirm-email": "Heu de confirmar l'adreça electrònica primer", + "invalid-password": "La contrasenya no és vàlida", + "nothing-to-do": "Res a fer", + "no-user": "El compte no existeix", + "invalid-token": "El testimoni no és vàlid", + "volume-num": "Volum {0}", + "book-num": "Llibre {0}", + "issue-num": "Número {0}{1}", + "chapter-num": "Capítol {0}", + "check-updates": "Comprova si hi ha actualitzacions", + "invalid-username": "El nom d'usuari no és vàlid", + "chapter-doesnt-exist": "El capítol no existeix", + "collection-updated": "S'ha actualitzat la col·lecció correctament", + "collection-deleted": "S'ha suprimit la col·lecció", + "collection-doesnt-exist": "La col·lecció no existeix", + "collection-already-exists": "La col·lecció ja existeix", + "person-doesnt-exist": "La persona no existeix", + "device-doesnt-exist": "El dispositiu no existeix", + "volume-doesnt-exist": "El volum no existeix", + "series-doesnt-exist": "La sèrie no existeix", + "no-cover-image": "No hi ha cap imatge de coberta", + "library-name-exists": "El nom de la biblioteca ja existeix. Trieu un nom únic per al servidor.", + "generic-library": "S'ha produït un error greu. Torneu-ho a provar.", + "invalid-filename": "El nom de fitxer no és vàlid", + "file-doesnt-exist": "El fitxer no existeix", + "user-doesnt-exist": "El compte no existeix", + "no-library-access": "El compte no té accés a aquesta biblioteca", + "library-doesnt-exist": "La biblioteca no existeix", + "invalid-path": "El camí no és vàlid", + "libraries": "Totes les biblioteques", + "browse-libraries": "Explora per biblioteques", + "collections": "Totes les col·leccions", + "browse-collections": "Explora per col·leccions", + "smart-filters": "Filtres intel·ligents", + "external-sources": "Fonts externes", + "browse-external-sources": "Explora les fonts externes", + "search": "Cerca", + "search-description": "Cerca sèries, col·leccions o llistes de lectura", + "external-source-required": "Cal la clau de l'API i l'amfitrió", + "smart-filter-doesnt-exist": "El filtre intel·ligent no existeix", + "collection-tag-duplicate": "Ja existeix una col·lecció amb aquest nom", + "device-duplicate": "Ja existeix un dispositiu amb aquest nom", + "send-to-permission": "No és possible enviar fitxers que no siguin EPUB o PDF perquè el Kindle no els admet", + "browse-smart-filters": "Explora per filtres intel·ligents", + "external-source-already-exists": "La font externa ja existeix", + "device-not-created": "Aquest dispositiu no existeix encara. Creeu-lo primer", + "external-source-doesnt-exist": "La font externa no existeix", + "backup": "Còpia de seguretat", + "file-missing": "No s'ha trobat el fitxer al llibre", + "reading-list-deleted": "S'ha suprimit la llista de lectura", + "generic-device-delete": "S'ha produït un error en suprimir el dispositiu", + "reading-list-position": "No s'ha pogut actualitzar la posició", + "generic-reading-list-delete": "S'ha produït un problema en suprimir la llista de lectura", + "generic-device-create": "S'ha produït un error en crear el dispositiu", + "generic-device-update": "S'ha produït un error en actualitzar el dispositiu", + "reading-list-doesnt-exist": "La llista de lectura no existeix", + "update-metadata-fail": "No s'han pogut actualitzar les metadades", + "reading-list-name-exists": "Ja existeix una llista de lectura amb aquest nom", + "ip-address-invalid": "L'adreça IP «{0}» no és vàlida", + "reading-list-item-delete": "No s'han pogut suprimir els elements", + "generic-reading-list-create": "S'ha produït un problema en crear la llista de lectura", + "generic-reading-list-update": "S'ha produït un problema en actualitzar la llista de lectura", + "generic-create-temp-archive": "S'ha produït un problema en crear l'arxiu temporal" +} diff --git a/API/I18N/cs.json b/API/I18N/cs.json index fa465b1fd..e136d8e75 100644 --- a/API/I18N/cs.json +++ b/API/I18N/cs.json @@ -187,7 +187,7 @@ "account-email-invalid": "Email v souboru účtu správce není platný email. Nelze poslat testovací email.", "email-settings-invalid": "Chybí informace o nastavení emailu. Ujistěte se, zda-li jsou uložena všechna nastavení.", "send-to-unallowed": "Nemůžete odeslat do zařízení které není vaše", - "send-to-size-limit": "Soubor(y) které se snažíte poslat jsou příliš velké pro vašeho email poskytovatele", + "send-to-size-limit": "Soubor(y) které se snažíte poslat jsou příliš velké pro vašeho poskytovatele emailu", "error-import-stack": "Při importu zásobníku MAL došlo k chybě", "collection-already-exists": "Kolekce již existuje", "generic-cover-person-save": "Nebylo možné uložit cover obrázek pro Osobu", @@ -197,5 +197,17 @@ "scan-libraries": "Skenovat Knihovny", "backup": "Záloha", "update-yearly-stats": "Aktualizovat roční statistiky", - "remove-from-want-to-read": "Vyčištění Chci si přečíst" + "remove-from-want-to-read": "Vyčištění Chci si přečíst", + "person-doesnt-exist": "Osoba neexistuje", + "person-name-required": "Jméno osoby je povinné a nesmí být prázdné", + "person-name-unique": "Jméno osoby musí být unikátní", + "person-image-doesnt-exist": "Osoba neexistuje v databázi CoversDB", + "email-taken": "Email je již používán", + "kavitaplus-restricted": "Toto je omezeno pouze na Kavita+", + "dashboard-stream-only-delete-smart-filter": "Z ovládacího panelu lze odstranit pouze streamy chytrých filtrů", + "smart-filter-name-required": "Vyžaduje se název chytrého filtru", + "smart-filter-system-name": "Nelze použít název streamu poskytovaného systémem", + "sidenav-stream-only-delete-smart-filter": "Z postranní navigace lze odstranit pouze streamy chytrých filtrů", + "aliases-have-overlap": "Jeden nebo více aliasů se překrývají s jinými osobami, nelze je aktualizovat", + "generated-reading-profile-name": "Generováno z {0}" } diff --git a/API/I18N/de.json b/API/I18N/de.json index 81aae4a8e..a6c865897 100644 --- a/API/I18N/de.json +++ b/API/I18N/de.json @@ -178,7 +178,7 @@ "unable-to-reset-k+": "Aufgrund eines Fehlers konnte die Kavita+ Lizenz nicht zurückgesetzt werden. Kontaktieren Sie den Kavita+ Support", "email-not-enabled": "Der Mailversand ist auf diesem Server nicht aktiviert. Sie können diese Aktion nicht durchführen.", "invalid-email": "Die für den Benutzer hinterlegte E-Mail ist ungültig. Links finden Sie in den Logs.", - "send-to-unallowed": "Sie können nicht an ein Gerät senden, das nicht Ihnen gehört.", + "send-to-unallowed": "Sie können nicht an ein Gerät senden, das nicht Ihnen gehört", "send-to-size-limit": "Die Datei(en), die Sie zu senden versuchen, sind zu groß für Ihren E-Mail-Anbieter", "check-updates": "Updates überprüfen", "email-settings-invalid": "E-Mail-Einstellungen fehlen Informationen. Stellen Sie sicher, dass alle E-Mail-Einstellungen gespeichert sind.", @@ -201,5 +201,13 @@ "person-doesnt-exist": "Die Person existiert nicht", "person-name-required": "Personenname ist erforderlich und darf nicht null sein", "person-name-unique": "Der Name der Person muss eindeutig sein", - "person-image-doesnt-exist": "Die Person existiert nicht in CoversDB" + "person-image-doesnt-exist": "Die Person existiert nicht in CoversDB", + "email-taken": "E-Mail bereits in Gebrauch", + "kavitaplus-restricted": "Dies ist nur auf Kavita+ beschränkt", + "sidenav-stream-only-delete-smart-filter": "Nur Smart-Filter-Streams können aus der Seitennavigation gelöscht werden", + "dashboard-stream-only-delete-smart-filter": "Nur Smart-Filter-Streams können aus dem Dashboard gelöscht werden", + "smart-filter-system-name": "Du kannst den Namen eines vom System bereitgestellten Streams nicht verwenden", + "smart-filter-name-required": "Name des Smart Filters erforderlich", + "aliases-have-overlap": "Ein oder mehrere Aliasnamen sind mit anderen Personen identisch und können nicht aktualisiert werden", + "generated-reading-profile-name": "Erstellt aus {0}" } diff --git a/API/I18N/en.json b/API/I18N/en.json index 418427111..d3cd1ecd3 100644 --- a/API/I18N/en.json +++ b/API/I18N/en.json @@ -186,6 +186,10 @@ "external-source-required": "ApiKey and Host required", "external-source-doesnt-exist": "External Source doesn't exist", "external-source-already-in-use": "There is an existing stream with this External Source", + "sidenav-stream-only-delete-smart-filter": "Only smart filter streams can be deleted from the SideNav", + "dashboard-stream-only-delete-smart-filter": "Only smart filter streams can be deleted from the dashboard", + "smart-filter-name-required": "Smart Filter name required", + "smart-filter-system-name": "You cannot use the name of a system provided stream", "not-authenticated": "User is not authenticated", "unable-to-register-k+": "Unable to register license due to error. Reach out to Kavita+ Support", @@ -207,6 +211,8 @@ "reading-list-name-exists": "A reading list of this name already exists", "user-no-access-library-from-series": "User does not have access to the library this series belongs to", "series-restricted-age-restriction": "User is not allowed to view this series due to age restrictions", + "kavitaplus-restricted": "This is restricted to Kavita+ only", + "aliases-have-overlap": "One or more of the aliases have overlap with other people, cannot update", "volume-num": "Volume {0}", "book-num": "Book {0}", @@ -224,6 +230,8 @@ "scan-libraries": "Scan Libraries", "kavita+-data-refresh": "Kavita+ Data Refresh", "backup": "Backup", - "update-yearly-stats": "Update Yearly Stats" + "update-yearly-stats": "Update Yearly Stats", + + "generated-reading-profile-name": "Generated from {0}" } diff --git a/API/I18N/es.json b/API/I18N/es.json index 2440d1c66..ca1a5c38a 100644 --- a/API/I18N/es.json +++ b/API/I18N/es.json @@ -22,7 +22,7 @@ "bookmarks-empty": "Los marcadores no pueden estar vacíos", "must-be-defined": "{0} debe estar definido", "invalid-filename": "Nombre de archivo no válido", - "library-name-exists": "El nombre de la biblioteca ya existe. Por favor, elige un nombre único.", + "library-name-exists": "El nombre de la biblioteca ya existe. Elija un nombre unívoco para el servidor.", "user-doesnt-exist": "El usuario no existe", "library-doesnt-exist": "La biblioteca no existe", "age-restriction-update": "Ha ocurrido un error al actualizar la restricción de edad", @@ -38,11 +38,11 @@ "generic-device-create": "Ha ocurrido un error al crear el dispositivo", "greater-0": "{0} debe ser mayor que 0", "send-to-kavita-email": "Enviar al dispositivo no se puede utilizar sin configurar el correo electrónico", - "no-cover-image": "No hay imagen de portada", + "no-cover-image": "No hay imagen de cubierta", "bookmark-doesnt-exist": "El marcador no existe", "generic-favicon": "Ha ocurrido un error al obtener el icono para el dominio", "file-doesnt-exist": "El archivo no existe", - "generic-library": "Ha ocurrido un error fatal. Por favor, inténtalo de nuevo.", + "generic-library": "Ha ocurrido un error grave. Inténtelo de nuevo.", "no-library-access": "El usuario no tiene acceso a esta biblioteca", "no-user": "El usuario no existe", "username-taken": "El nombre de usuario ya existe", @@ -87,7 +87,7 @@ "update-metadata-fail": "No se han podido actualizar los metadatos", "generic-relationship": "Hubo un problema al actualizar las relaciones", "job-already-running": "Trabajo ya en ejecución", - "ip-address-invalid": "La dirección IP '{0}' no es válida", + "ip-address-invalid": "La dirección IP «{0}» no es válida", "bookmark-dir-permissions": "El directorio de marcadores no tiene los permisos correctos para que Kavita pueda utilizarlo", "total-backups": "El número total de copias de seguridad debe estar entre 1 y 30", "stats-permission-denied": "No está autorizado a ver las estadísticas de otro usuario", @@ -116,18 +116,18 @@ "generic-create-temp-archive": "Hubo un problema al crear un archivo temporal", "epub-malformed": "¡El archivo está malformado! No se puede leer.", "book-num": "Libro {0}", - "issue-num": "Incidencia {0}{1}", + "issue-num": "Número {0}{1}", "search-description": "Buscar series, colecciones o listas de lectura", "unable-to-register-k+": "No se ha podido registrar la licencia debido a un error. Póngase en contacto con el servicio de asistencia de Kavita", "bad-copy-files-for-download": "No se pueden copiar archivos al directorio temporal de descarga de archivos.", - "send-to-permission": "No se puede enviar archivos que no sean EPUB o PDF a dispositivos no compatibles con Kindle", + "send-to-permission": "No se pueden enviar archivos que no sean EPUB o PDF a los dispositivos porque Kindle no los admite", "progress-must-exist": "El progreso debe existir en el usuario", "epub-html-missing": "No se ha podido encontrar el HTML apropiado para esa página", "collection-tag-duplicate": "Ya existe una colección con este nombre", "device-duplicate": "Ya existe un dispositivo con este nombre", "collection-tag-title-required": "El título de la colección no puede estar vacío", "reading-list-title-required": "El título de la lista de lectura no puede estar vacío", - "device-not-created": "Este dispositivo aún no existe. Por favor, créelo primero", + "device-not-created": "Este dispositivo aún no existe. Créelo primero", "reading-list-name-exists": "Ya existe una lista de lectura con este nombre", "user-no-access-library-from-series": "El usuario no tiene acceso a la biblioteca a la que pertenece esta serie", "series-restricted-age-restriction": "El usuario no puede ver esta serie debido a restricciones de edad", @@ -169,7 +169,7 @@ "sidenav-stream-doesnt-exist": "SideNav Stream no existe", "external-source-doesnt-exist": "La fuente externa no existe", "external-sources": "Fuentes externas", - "external-source-required": "Se requiere la clave API y el host", + "external-source-required": "Se requiere la clave de API y el anfitrión", "smart-filter-already-in-use": "Existe una transmisión con este filtro inteligente", "invalid-email": "La dirección de correo electrónico del usuario no es válida. Consulte los registros para ver si hay algún enlace.", "browse-more-in-genre": "Ver más en {0}", @@ -177,7 +177,7 @@ "recently-updated": "Actualizado recientemente", "browse-recently-updated": "Examinar las últimas actualizaciones", "unable-to-reset-k+": "No se ha podido restablecer la licencia de Kavita+ debido a un error. Contacta con el soporte de Kavita", - "send-to-unallowed": "No puedes enviar a un dispositivo que no sea el tuyo", + "send-to-unallowed": "No puede enviar a un dispositivo que no sea el suyo", "email-not-enabled": "El correo electrónico no está habilitado en este servidor. No puede realizar esta acción.", "send-to-size-limit": "El(Los) archivo(s) que intenta enviar es(son) demasiado(s) grande(s) para su proveedor de correo electrónico", "process-scrobbling-events": "Procesar eventos de scrobbling", @@ -187,7 +187,7 @@ "cleanup": "Limpieza", "remove-from-want-to-read": "Eliminar de querer leer", "kavita+-data-refresh": "Actualización de los datos de Kavita+", - "backup": "Copia de seguridad", + "backup": "Copia de respaldo", "update-yearly-stats": "Actualizar estadísticas anualmente", "license-check": "Comprobar la licencia", "scan-libraries": "Escanear la biblioteca", @@ -201,5 +201,7 @@ "person-doesnt-exist": "No existe la persona", "person-name-required": "El nombre de la persona es obligatorio y no debe estar vacío", "person-name-unique": "El nombre de la persona debe ser único", - "person-image-doesnt-exist": "La persona no existe en CoversDB" + "person-image-doesnt-exist": "La persona no existe en CoversDB", + "email-taken": "El correo electrónico ya está en uso", + "kavitaplus-restricted": "Esto está restringido a Kavita+" } diff --git a/API/I18N/fa.json b/API/I18N/fa.json new file mode 100644 index 000000000..0933c41d5 --- /dev/null +++ b/API/I18N/fa.json @@ -0,0 +1,7 @@ +{ + "validate-email": "در اعتبارسنجی ایمیل شما مشکلی رخ داد: {0}", + "confirm-email": "اول ایمیل خود را تایید کنید", + "locked-out": "شما به علت تلاش‌های ورود بیش از حد، محدود شدید. لطفاً ۱۰ دقیقه صبر کنید.", + "disabled-account": "حساب شما غیرفعال شده است ، لطفاً با مدیر سرور تماس حاصل کنید.", + "register-user": "در هنگام ثبت کاربر مشکلی رخ داد." +} diff --git a/API/I18N/fi.json b/API/I18N/fi.json index 8cea1b80a..dd2a3f070 100644 --- a/API/I18N/fi.json +++ b/API/I18N/fi.json @@ -10,7 +10,7 @@ "generic-device-update": "Laitteen päivittämisessä tapahtui virhe", "send-to-kavita-email": "Laitteelle lähettämistä ei voi käyttää ilman sähköpostin asetuksia", "send-to-unallowed": "Et voi lähettää laitteeseen, joka ei ole sinun", - "send-to-size-limit": "Tiedostot, joita yrität lähettää, ovat liian suuria sähköpostiisi", + "send-to-size-limit": "Tiedostot, joita yrität lähettää, ovat liian suuria sähköpostipalveluntarjoajallesi", "send-to-device-status": "Tiedostoja siirretään laitteellesi", "generic-send-to": "Tiedoston / tiedostojen lähettämisessä tapahtui virhe", "no-cover-image": "Ei kansikuvaa", @@ -42,8 +42,8 @@ "encode-as-warning": "Et voi muuttaa PNG:ksi. Kansikuville, kokeile päivitystä. Kirjamerkkejä ja faviconeja ei voi koodata takaisin.", "ip-address-invalid": "IP-osoite '{0}' on virheellinen", "bookmark-dir-permissions": "Kirjanmerkki hakemistolla ei ole oikeita käyttöoikeuksia Kavitalle", - "total-backups": "Varmuuskopioiden on oltava 1-30", - "total-logs": "Kokonaislokien on oltava 1-30", + "total-backups": "Varmuuskopioiden kokonaismäärän on oltava välillä 1–30", + "total-logs": "Lokien kokonaismäärän on oltava välillä 1–30", "stats-permission-denied": "Sinulla ei ole oikeutta katsoa toisen käyttäjän tilastoja", "url-not-valid": "Url ei palauta kelvollista kuvaa tai vaatii luvan", "url-required": "Sinun on annattava url käyttääksesi", @@ -77,7 +77,7 @@ "disabled-account": "Sinun tilisi on poistettu käytöstä. Ota yhteyttä palvelimen ylläpitäjään.", "register-user": "Jokin meni pieleen, kun käyttäjä rekisteröityi", "validate-email": "Sähköpostin vahvistamisessa oli ongelma: {0}", - "confirm-token-gen": "Vahvistus merkin tuottamisessa oli ongelma", + "confirm-token-gen": "Vahvistuspoletin luomisessa oli ongelma", "denied": "Ei sallittu", "permission-denied": "Tämä toiminto on sinulta kielletty", "invalid-password": "Virheellinen Salasana", @@ -170,5 +170,10 @@ "user-no-access-library-from-series": "Käyttäjällä ei ole pääsyä kirjastoon, johon sarja kuuluu", "chapter-num": "Luku {0}", "cleanup": "Puhdistus", - "browse-reading-lists": "Selaa Lukulistoja" + "browse-reading-lists": "Selaa Lukulistoja", + "person-doesnt-exist": "Henkilöä ei ole olemassa", + "person-name-required": "Henkilön nimi on pakollinen, eikä se saa olla tyhjä", + "person-name-unique": "Henkilön nimen on oltava yksilöllinen", + "person-image-doesnt-exist": "Henkilöä ei ole olemassa CoversDB:ssa", + "email-taken": "Sähköposti jo käytössä" } diff --git a/API/I18N/fr.json b/API/I18N/fr.json index feecc39d6..2b9a4f81b 100644 --- a/API/I18N/fr.json +++ b/API/I18N/fr.json @@ -201,5 +201,13 @@ "person-name-unique": "Le nom de la personne doit être unique", "person-image-doesnt-exist": "La personne n'existe pas dans CoversDB", "person-doesnt-exist": "La personne n'existe pas", - "person-name-required": "Le nom de la personne est obligatoire et ne doit pas être nul" + "person-name-required": "Le nom de la personne est obligatoire et ne doit pas être nul", + "email-taken": "Email déjà existant", + "kavitaplus-restricted": "Ce service est réservé à Kavita+", + "sidenav-stream-only-delete-smart-filter": "Seuls les flux de filtres intelligents peuvent être supprimés de la SideNav", + "dashboard-stream-only-delete-smart-filter": "Seuls les flux de filtres intelligents peuvent être supprimés du tableau de bord", + "smart-filter-name-required": "Nom du filtre intelligent requis", + "smart-filter-system-name": "Vous ne pouvez pas utiliser le nom d'un flux fourni par le système", + "aliases-have-overlap": "Un ou plusieurs alias se chevauchent avec d'autres personnes et ne peuvent pas être mis à jour", + "generated-reading-profile-name": "Généré à partir de {0}" } diff --git a/API/I18N/ga.json b/API/I18N/ga.json index bef3c436b..142425aec 100644 --- a/API/I18N/ga.json +++ b/API/I18N/ga.json @@ -201,5 +201,13 @@ "person-doesnt-exist": "Níl duine ann", "person-name-required": "Tá ainm an duine ag teastáil agus ní féidir é a bheith ar neamhní", "person-name-unique": "Caithfidh ainm duine a bheith uathúil", - "person-image-doesnt-exist": "Níl an duine in CoversDB" + "person-image-doesnt-exist": "Níl an duine in CoversDB", + "email-taken": "Ríomhphost in úsáid cheana féin", + "kavitaplus-restricted": "Tá sé seo teoranta do Kavita+ amháin", + "smart-filter-system-name": "Ní féidir leat ainm srutha an chórais a sholáthair tú a úsáid", + "sidenav-stream-only-delete-smart-filter": "Ní féidir ach sruthanna cliste scagaire a scriosadh as an SideNav", + "dashboard-stream-only-delete-smart-filter": "Ní féidir ach sruthanna cliste scagaire a scriosadh ón deais", + "smart-filter-name-required": "Ainm Scagaire Cliste ag teastáil", + "aliases-have-overlap": "Tá forluí idir ceann amháin nó níos mó de na leasainmneacha agus daoine eile, ní féidir iad a nuashonrú", + "generated-reading-profile-name": "Gineadh ó {0}" } diff --git a/API/I18N/he.json b/API/I18N/he.json index 41a9a7de7..3b2386bf6 100644 --- a/API/I18N/he.json +++ b/API/I18N/he.json @@ -21,5 +21,6 @@ "age-restriction-update": "אירעה תקלה בעת עדכון הגבלת גיל", "generic-user-update": "אירעה תקלה בעת עדכון משתמש", "user-already-registered": "משתמש רשום כבר בתור {0}", - "manual-setup-fail": "לא מתאפשר להשלים הגדרה ידנית. יש לבטל וליצור מחדש את ההזמנה" + "manual-setup-fail": "לא מתאפשר להשלים הגדרה ידנית. יש לבטל וליצור מחדש את ההזמנה", + "email-taken": "דואר אלקטרוני כבר בשימוש" } diff --git a/API/I18N/hu.json b/API/I18N/hu.json index 7c9473116..21649e2ce 100644 --- a/API/I18N/hu.json +++ b/API/I18N/hu.json @@ -196,5 +196,9 @@ "check-scrobbling-tokens": "Ellenőrizd a Feldolgozó tokeneket", "process-scrobbling-events": "Feldolgozó események feldolgozása", "process-processed-scrobbling-events": "A feldolgozott Feldolgozó események felolgozása", - "generic-cover-volume-save": "Nem lehet borítóképet menteni a kötethez" + "generic-cover-volume-save": "Nem lehet borítóképet menteni a kötethez", + "person-doesnt-exist": "A személy nem létezik", + "person-name-required": "A személy neve kötelező, és nem lehet üres", + "email-taken": "Az e-mail már használatban van", + "person-name-unique": "A személy nevének egyedinek kell lennie" } diff --git a/API/I18N/it.json b/API/I18N/it.json index a5f8cbf31..cf43101a6 100644 --- a/API/I18N/it.json +++ b/API/I18N/it.json @@ -90,7 +90,7 @@ "user-no-access-library-from-series": "L'utente non ha accesso alla libreria a cui appartiene questa serie", "volume-num": "Volume {0}", "book-num": "Libro {0}", - "issue-num": "Problema {0}{1}", + "issue-num": "Numero {0}{1}", "chapter-num": "Capitolo {0}", "epub-malformed": "Il file è corrotto! Non posso leggere.", "collection-updated": "Collezione aggiornata con successo", @@ -178,7 +178,7 @@ "browse-recently-updated": "Sfoglia gli aggiornamenti recenti", "email-not-enabled": "L'email non è attivata in questo server. Non puoi compiere questa azione.", "send-to-unallowed": "Non puoi inviare ad un dispositivo non tuo", - "send-to-size-limit": "Il/I file che stai cercando di mandare sono troppo grandi per l'email", + "send-to-size-limit": "Il/I file che stai cercando di mandare sono troppo grandi per il tuo provider email", "unable-to-reset-k+": "Impossibile ripristinare la licenza Kavita+. Contatta il supporto Kavita+", "check-updates": "Controlla aggiornamenti", "license-check": "Controlla Licenza", @@ -193,5 +193,15 @@ "kavita+-data-refresh": "Aggiornamento dati Kavita+", "backup": "Backup", "account-email-invalid": "L'e-mail in archivio per l'account amministratore non è un'e-mail valida. Impossibile inviare e-mail di prova.", - "email-settings-invalid": "Informazioni mancanti nelle impoastazioni email. Assicurati che tutte le impostazioni email siano salvate." + "email-settings-invalid": "Informazioni mancanti nelle impoastazioni email. Assicurati che tutte le impostazioni email siano salvate.", + "person-doesnt-exist": "La persona non esiste", + "email-taken": "Email già in uso", + "person-name-required": "Il nome della persona è richiesto e non può essere null", + "person-name-unique": "Il nome della persona deve essere univoco", + "person-image-doesnt-exist": "La persona non esiste su CoversDB", + "collection-already-exists": "La collezione esiste già", + "generic-cover-volume-save": "Impossibile salvare l'immagine di copertina nel Volume", + "generic-cover-person-save": "Impossibile salvare l'immagine di copertina nella Persona", + "error-import-stack": "Si è verificato un errore durante l'importazione dello stack MAL", + "kavitaplus-restricted": "Riservato a Kavita+" } diff --git a/API/I18N/ja.json b/API/I18N/ja.json index ba6b6e8e7..07efb40ef 100644 --- a/API/I18N/ja.json +++ b/API/I18N/ja.json @@ -95,7 +95,7 @@ "bookmark-permission": "ブックマーク/ブックマークを解除する権限があなたにはありません｡", "valid-number": "有効なページ番号である必要があります", "duplicate-bookmark": "重複したブックマークエントリーがすでに存在します", - "send-to-size-limit": "送信しようとしているファイルはメーラーにとっては大きすぎます｡", + "send-to-size-limit": "送信しようとしているファイルはあなたのメールプロバイダにとっては大きすぎます｡", "series-doesnt-exist": "シリーズが存在しません", "pdf-doesnt-exist": "PDFが存在すべきですが存在しません｡", "generic-reading-list-create": "リーディングリストを作成している際に問題が発生しました", @@ -180,9 +180,16 @@ "generic-create-temp-archive": "一時アーカイブの作成中に問題が発生しました", "user-no-access-library-from-series": "ユーザーは、このシリーズが所属するライブラリにアクセス権限がありません", "collection-tag-duplicate": "この名前のコレクションは既に存在しています", - "account-email-invalid": "管理者アカウントに登録されている電子メールは有効な電子メールではありません。 テストメールを送信できませんでした。", + "account-email-invalid": "管理者アカウントに登録されている電子メールは有効な電子メールではありません。 テストメールを送信できません。", "check-updates": "アップデートをチェックする", "license-check": "ライセンスを確認", "collection-already-exists": "コレクションは既に存在しています", - "email-settings-invalid": "メール設定に不足している情報があります。すべてのメール設定が保存されていることを確認してください。" + "email-settings-invalid": "メール設定に不足している情報があります。すべてのメール設定が保存されていることを確認してください。", + "email-taken": "メールアドレスは既に使われています", + "person-doesnt-exist": "人物は存在しません", + "person-name-unique": "人名は一意でなければなりません", + "person-name-required": "人物の名前は必須であり、空にすることはできません", + "person-image-doesnt-exist": "人物はCoversDBに存在しません", + "generic-cover-person-save": "カバー画像を人物に保存できません", + "generic-cover-volume-save": "カバー画像を巻に保存できません" } diff --git a/API/I18N/ko.json b/API/I18N/ko.json index d0963908e..7fec9f60a 100644 --- a/API/I18N/ko.json +++ b/API/I18N/ko.json @@ -201,5 +201,13 @@ "person-doesnt-exist": "사람이 존재하지 않습니다", "person-name-required": "개인 이름은 필수 항목이며 null일 수 없습니다", "person-name-unique": "개인 이름은 고유해야 합니다", - "person-image-doesnt-exist": "CoversDB에 사람이 존재하지 않습니다" + "person-image-doesnt-exist": "CoversDB에 사람이 존재하지 않습니다", + "kavitaplus-restricted": "Kavita+만 해당", + "email-taken": "이미 사용중인 이메일", + "dashboard-stream-only-delete-smart-filter": "대시보드에서 스마트 필터 스트림만 삭제할 수 있습니다", + "sidenav-stream-only-delete-smart-filter": "사이드 메뉴에서 스마트 필터 스트림만 삭제할 수 있습니다", + "smart-filter-name-required": "스마트 필터 이름이 필요합니다", + "smart-filter-system-name": "시스템 제공 스트림 이름은 사용할 수 없습니다", + "aliases-have-overlap": "하나 이상의 별명이 다른 사용자와 중복되어 업데이트할 수 없습니다", + "generated-reading-profile-name": "{0}(으)로부터 생성됨" } diff --git a/API/I18N/pl.json b/API/I18N/pl.json index e537729f2..5372fddc0 100644 --- a/API/I18N/pl.json +++ b/API/I18N/pl.json @@ -201,5 +201,13 @@ "person-doesnt-exist": "Osoba nie istnieje", "person-name-required": "Nazwa osoby jest wymagana i nie może mieć wartości null", "person-name-unique": "Nazwa osoby musi być unikatowa", - "person-image-doesnt-exist": "Osoba nie istnieje w CoversDB" + "person-image-doesnt-exist": "Osoba nie istnieje w CoversDB", + "email-taken": "Adres e-mail jest już używany", + "kavitaplus-restricted": "Jest to dostępne tylko dla Kavita+", + "smart-filter-name-required": "Inteligentny filtr wymaga nazwy", + "sidenav-stream-only-delete-smart-filter": "Tylko inteligentne filtry mogą zostać usunięte z panelu bocznego", + "dashboard-stream-only-delete-smart-filter": "Tylko inteligentne strumienie filtrów może zostać usunięte z głównego panelu", + "smart-filter-system-name": "Nie można użyć nazwy systemu dostarczanego strumieniem", + "aliases-have-overlap": "Jeden lub więcej aliasów pokrywa się z innymi osobami, nie można ich zaktualizować", + "generated-reading-profile-name": "Wygenerowano z {0}" } diff --git a/API/I18N/pt.json b/API/I18N/pt.json index 72c58771a..726c843bb 100644 --- a/API/I18N/pt.json +++ b/API/I18N/pt.json @@ -201,5 +201,13 @@ "person-doesnt-exist": "Pessoa não existe", "person-name-required": "O nome da pessoa é obrigatório e não pode nulo", "person-name-unique": "O nome da pessoa tem de ser único", - "person-image-doesnt-exist": "A pessoa não existe na CoversDB" + "person-image-doesnt-exist": "A pessoa não existe na CoversDB", + "email-taken": "Email já em uso", + "kavitaplus-restricted": "Ação restrita ao Kavita+", + "sidenav-stream-only-delete-smart-filter": "Apenas os filtros inteligentes podem ser removidos da Navegação Lateral", + "dashboard-stream-only-delete-smart-filter": "Apenas os filtros inteligentes podem ser removidos do painel", + "smart-filter-system-name": "Não pode usar o nome de um fluxo disponibilizado pelo sistema", + "smart-filter-name-required": "Nome requerido para o filtro inteligente", + "aliases-have-overlap": "Um ou mais pseudónimos sobrepõem-se com outras pessoas, não vai ser possível atualizar", + "generated-reading-profile-name": "Gerado de {0}" } diff --git a/API/I18N/pt_BR.json b/API/I18N/pt_BR.json index 0bd4fecbc..418e0ea3b 100644 --- a/API/I18N/pt_BR.json +++ b/API/I18N/pt_BR.json @@ -201,5 +201,13 @@ "person-doesnt-exist": "Pessoa não existe", "person-image-doesnt-exist": "A pessoa não existe no CoversDB", "person-name-required": "O nome da pessoa é obrigatório e não deve ser nulo", - "person-name-unique": "O nome da pessoa deve ser exclusivo" + "person-name-unique": "O nome da pessoa deve ser exclusivo", + "email-taken": "E-mail já em uso", + "kavitaplus-restricted": "Isso é restrito apenas ao Kavita+", + "smart-filter-name-required": "Nome do Filtro Inteligente obrigatório", + "dashboard-stream-only-delete-smart-filter": "Somente fluxos de filtros inteligentes podem ser excluídos do painel", + "smart-filter-system-name": "Você não pode usar o nome de um fluxo fornecido pelo sistema", + "sidenav-stream-only-delete-smart-filter": "Somente fluxos de filtros inteligentes podem ser excluídos do Navegador Lateral", + "aliases-have-overlap": "Um ou mais dos pseudônimos se sobrepõem a outras pessoas, não pode atualizar", + "generated-reading-profile-name": "Gerado a partir de {0}" } diff --git a/API/I18N/ru.json b/API/I18N/ru.json index c75f58fb1..fdea5920f 100644 --- a/API/I18N/ru.json +++ b/API/I18N/ru.json @@ -1,5 +1,5 @@ { - "confirm-email": "Вы обязаны сначала подтвердить свою почту", + "confirm-email": "Сначала Вы обязаны подтвердить свою электронную почту", "generate-token": "Возникла проблема с генерацией токена подтверждения электронной почты. Смотрите журналы", "invalid-password": "Неверный пароль", "invalid-email-confirmation": "Неверное подтверждение электронной почты", @@ -35,15 +35,15 @@ "no-user": "Пользователь не существует", "generic-invite-user": "Возникла проблема с приглашением пользователя. Пожалуйста, проверьте журналы.", "permission-denied": "Вам запрещено выполнять эту операцию", - "invalid-access": "Недопустимый доступ", + "invalid-access": "В доступе отказано", "reading-list-name-exists": "Такой список для чтения уже существует", "perform-scan": "Пожалуйста, выполните сканирование этой серии или библиотеки и повторите попытку", "generic-device-create": "При создании устройства возникла ошибка", "generic-read-progress": "Возникла проблема с сохранением прогресса", "file-doesnt-exist": "Файл не существует", "admin-already-exists": "Администратор уже существует", - "send-to-kavita-email": "Отправка на устройство не может быть использована с почтовым сервисом Kavita. Пожалуйста, настройте свой собственный.", - "no-image-for-page": "Нет такого изображения для страницы {0}. Попробуйте обновить, чтобы обновить кэш.", + "send-to-kavita-email": "Отправка на устройство не может быть использована без настройки электронной почты", + "no-image-for-page": "Нет такого изображения для страницы {0}. Попробуйте обновить, для повторного кеширования.", "reading-list-permission": "У вас нет прав на этот список чтения или список не существует", "volume-doesnt-exist": "Том не существует", "generic-library": "Возникла критическая проблема. Пожалуйста, попробуйте еще раз.", @@ -57,7 +57,7 @@ "generic-reading-list-create": "Возникла проблема с созданием списка для чтения", "no-cover-image": "Изображение на обложке отсутствует", "collection-updated": "Коллекция успешно обновлена", - "critical-email-migration": "Возникла проблема при переносе электронной почты. Обратитесь в службу поддержки", + "critical-email-migration": "Возникла проблема при смене электронной почты. Обратитесь в службу поддержки", "cache-file-find": "Не удалось найти изображение в кэше. Перезагрузитесь и попробуйте снова.", "duplicate-bookmark": "Дублирующая закладка уже существует", "collection-tag-duplicate": "Такая коллекция уже существует", @@ -72,7 +72,7 @@ "pdf-doesnt-exist": "PDF не существует, когда он должен существовать", "generic-device-delete": "При удалении устройства возникла ошибка", "bookmarks-empty": "Закладки не могут быть пустыми", - "valid-number": "Должен быть действительный номер страницы", + "valid-number": "Номер страницы должен быть действительным", "series-doesnt-exist": "Серия не существует", "no-library-access": "Пользователь не имеет доступа к этой библиотеке", "reading-list-item-delete": "Не удалось удалить элемент(ы)", @@ -121,7 +121,7 @@ "opds-disabled": "OPDS не включен на этом сервере", "stats-permission-denied": "Вы не имеете права просматривать статистику другого пользователя", "reading-list-restricted": "Список чтения не существует или у вас нет доступа", - "favicon-doesnt-exist": "Фавикон не существует", + "favicon-doesnt-exist": "Favicon не существует", "external-source-already-in-use": "Существует поток с этим внешним источником", "issue-num": "Вопрос {0}{1}", "generic-create-temp-archive": "Возникла проблема с созданием временного архива", @@ -155,7 +155,7 @@ "generic-user-delete": "Не удалось удалить пользователя", "generic-cover-reading-list-save": "Невозможно сохранить изображение обложки в списке для чтения", "unable-to-register-k+": "Невозможно зарегистрировать лицензию из-за ошибки. Обратитесь в службу поддержки Кавита+", - "encode-as-warning": "Конвертировать в PNG невозможно. Для обложек используйте Обновить Обложки. Закладки и фавиконки нельзя закодировать обратно.", + "encode-as-warning": "Вы не можете конвертировать в формат PNG. Для обновления обложек используйте команду \"Обновить обложку\". Закладки и значки не могут быть закодированы обратно.", "want-to-read": "Хотите прочитать", "generic-user-pref": "Возникла проблема с сохранением предпочтений", "external-sources": "Внешние источники", @@ -194,5 +194,13 @@ "backup": "Резервное копирование", "process-processed-scrobbling-events": "Обработка обработанных событий скроблинга", "scan-libraries": "Сканирование библиотек", - "kavita+-data-refresh": "Обновление данных Kavita+" + "kavita+-data-refresh": "Обновление данных Kavita+", + "kavitaplus-restricted": "Это доступно только для Kavita+", + "person-doesnt-exist": "Персона не существует", + "generic-cover-volume-save": "Не удается сохранить обложку для тома", + "generic-cover-person-save": "Не удается сохранить изображение обложки для Персоны", + "person-name-unique": "Имя персоны должно быть уникальным", + "person-image-doesnt-exist": "Персона не существует в CoversDB", + "email-taken": "Почта уже используется", + "person-name-required": "Имя персоны обязательно и не может быть пустым" } diff --git a/API/I18N/sk.json b/API/I18N/sk.json index 0967ef424..ef267ed02 100644 --- a/API/I18N/sk.json +++ b/API/I18N/sk.json @@ -1 +1,213 @@ -{} +{ + "disabled-account": "Váš účet je deaktivovaný. Kontaktujte správcu servera.", + "register-user": "Niečo sa pokazilo pri registrácii užívateľa", + "confirm-email": "Najprv musíte potvrdiť svoj e-mail", + "locked-out": "Boli ste zamknutí z dôvodu veľkého počtu neúspešných pokusov o prihlásenie. Počkajte 10 minút.", + "validate-email": "Pri validácii vášho e-mailu sa vyskytla chyba: {0}", + "confirm-token-gen": "Pri vytváraní potvrdzovacieho tokenu sa vyskytla chyba", + "permission-denied": "Na vykonanie tejto úlohy nemáte oprávnenie", + "password-required": "Ak nie ste administrátor, musíte na vykonanie zmien vo vašom profile zadať vaše aktuálne heslo", + "invalid-password": "Nesprávne heslo", + "invalid-token": "Nesprávny token", + "unable-to-reset-key": "Niečo sa pokazilo, kľúč nie je možné resetovať", + "invalid-payload": "Nesprávny payload", + "nothing-to-do": "Nič na vykonanie", + "share-multiple-emails": "Nemôžete zdielať e-maily medzi rôznymi účtami", + "generate-token": "Pri generovaní potvrdzovacieho tokenu e-mailu sa vyskytla chyba. Pozrite záznamy udalostí", + "age-restriction-update": "Pri aktualizovaní vekového obmedzenia sa vyskytla chyba", + "no-user": "Používateľ neexistuje", + "generic-user-update": "Aktualizácia používateľa prebehla s výnimkou", + "username-taken": "Používateľské meno už existuje", + "user-already-confirmed": "Používateľ je už potvrdený", + "user-already-registered": "Používateľ je už registrovaný ako {0}", + "user-already-invited": "Používateľ je už pod týmto e-mailom pozvaný a musí ešte prijať pozvanie.", + "generic-password-update": "Pri potvrdení nového hesla sa vyskytla neočakávaná chyba", + "generic-invite-user": "Pri pozývaní tohto používateľa sa vyskytla chyba. Pozrite záznamy udalostí.", + "password-updated": "Heslo aktualizované", + "forgot-password-generic": "E-mail bude odoslaný na zadanú adresu len v prípade, ak existuje v databáze", + "invalid-email-confirmation": "Neplatné potvrdenie e-mailu", + "not-accessible-password": "Váš server nie je dostupný. Odkaz na resetovanie vášho hesla je v záznamoch udalostí", + "email-taken": "Zadaný e-mail už existuje", + "denied": "Nepovolené", + "manual-setup-fail": "Manuálne nastavenie nie je možné dokončiť. Prosím zrušte aktuálny postup a znovu vytvorte pozvánku", + "generic-user-email-update": "Nemožno aktualizovať e-mail používateľa. Skontrolujte záznamy udalostí.", + "email-not-enabled": "E-mail nie je na tomto serveri povolený. Preto túto akciu nemôžete vykonať.", + "collection-updated": "Zbierka bola úspešne aktualizovaná", + "device-doesnt-exist": "Zariadenie neexistuje", + "generic-device-delete": "Pri odstraňovaní zariadenia sa vyskytla chyba", + "greater-0": "{0} musí byť väčší ako 0", + "send-to-size-limit": "Snažíte sa odoslať súbor(y), ktoré sú príliš veľké pre vášho e-mailového poskytovateľa", + "send-to-device-status": "Prenos súborov do vášho zariadenia", + "no-cover-image": "Žiadny prebal", + "must-be-defined": "{0} musí byť definovaný", + "generic-favicon": "Pri získavaní favicon-u domény sa vyskytla chyba", + "no-library-access": "Pozužívateľ nemá prístup do tejto knižnice", + "user-doesnt-exist": "Používateľ neexistuje", + "collection-already-exists": "Zbierka už existuje", + "not-accessible": "Váš server nie je dostupný z vonkajšieho prostredia", + "email-sent": "E-mail odoslaný", + "user-migration-needed": "Uvedený používateľ potrebuje migrovať. Odhláste ho a opäť prihláste na spustenie migrácie", + "generic-invite-email": "Pri opakovanom odosielaní pozývacieho e-mailu sa vyskytla chyba", + "email-settings-invalid": "V nastaveniach e-mailu chýbajú potrebné údaje. Uistite sa, že všetky nastavenia e-mailu sú uložené.", + "chapter-doesnt-exist": "Kapitola neexistuje", + "critical-email-migration": "Počas migrácie e-mailu sa vyskytla chyba. Kontaktujte podporu", + "collection-deleted": "Zbierka bola vymazaná", + "generic-error": "Niečo sa pokazilo, skúste to znova", + "collection-doesnt-exist": "Zbierka neexistuje", + "generic-device-update": "Pri aktualizácii zariadenia sa vyskytla chyba", + "bookmark-doesnt-exist": "Záložka neexistuje", + "person-doesnt-exist": "Osoba neexistuje", + "send-to-kavita-email": "Odoslanie do zariadenia nemôže byť použité bez nastavenia e-amilu", + "send-to-unallowed": "Nemôžete odosielať do zariadenia, ktoré nie je vaše", + "generic-library": "Vyskytla sa kritická chyba. Prosím skúste to opäť.", + "pdf-doesnt-exist": "PDF neexistuje, hoci by malo", + "generic-library-update": "Počas aktualizácie knižnice sa vyskytla kritická chyba.", + "invalid-access": "Neplatný prístup", + "perform-scan": "Prosím, vykonajte opakovaný sken na tejto sérii alebo knižnici", + "generic-read-progress": "Pri ukladaní aktuálneho stavu sa vyskytla chyba", + "generic-clear-bookmarks": "Záložky nie je možné vymazať", + "bookmark-permission": "Nemáte oprávnenie na vkladanie/odstraňovanie záložiek", + "bookmark-save": "Nemožno uložiť záložku", + "bookmarks-empty": "Záložky nemôžu byť prázdne", + "library-doesnt-exist": "Knižnica neexistuje", + "invalid-path": "Neplatné umiestnenie", + "generic-send-to": "Pri odosielaní súboru(-ov) do vášho zariadenia sa vyskytla chyba", + "no-image-for-page": "Žiadny taký obrázok pre stránku {0}. Pokúste sa ju obnoviť, aby ste ju mohli nanovo uložiť.", + "delete-library-while-scan": "Nemôžete odstrániť knižnicu počas prebiehajúceho skenovania. Prosím, vyčkajte na dokončenie skenovania alebo reštartujte Kavitu a skúste ju opäť odstrániť", + "invalid-username": "Neplatné používateľské meno", + "account-email-invalid": "E-mail uvedený v údajoch administrátora nie je platným e-mailom. Nie je možné zaslať testovací e-mail.", + "admin-already-exists": "Administrátor už existuje", + "invalid-filename": "Neplatný názov súboru", + "file-doesnt-exist": "Súbor neexistuje", + "invalid-email": "E-mail v záznamoch pre používateľov nie platný e-mail. Odkazy sú uvedené v záznamoch udalostí.", + "file-missing": "Súbor nebol nájdený v knihe", + "error-import-stack": "Pri importovaní MAL balíka sa vyskytla chyba", + "person-name-required": "Meno osoby je povinné a nesmie byť prázdne", + "person-name-unique": "Meno osoby musí byť jedinečné", + "person-image-doesnt-exist": "Osoba neexistuje v databáze CoversDB", + "generic-device-create": "Pri vytváraní zariadenia sa vyskytla chyba", + "series-doesnt-exist": "Séria neexistuje", + "volume-doesnt-exist": "Zväzok neexistuje", + "library-name-exists": "Názov knižnice už existuje. Prosím, vyberte si pre daný server jedinečný názov.", + "cache-file-find": "Nepodarilo sa nájsť obrázok vo vyrovnávacej pamäti. Znova načítajte a skúste to znova.", + "name-required": "Názov nemôže byť prázdny", + "valid-number": "Musí to byť platné číslo strany", + "duplicate-bookmark": "Duplicitný záznam záložky už existuje", + "reading-list-permission": "Nemáte povolenia na tento zoznam na čítanie alebo zoznam neexistuje", + "reading-list-position": "Nepodarilo sa aktualizovať pozíciu", + "reading-list-updated": "Aktualizované", + "reading-list-item-delete": "Položku(y) sa nepodarilo odstrániť", + "reading-list-deleted": "Zoznam na čítanie bol odstránený", + "generic-reading-list-delete": "Pri odstraňovaní zoznamu na čítanie sa vyskytol problém", + "generic-reading-list-update": "Pri aktualizácii zoznamu na čítanie sa vyskytol problém", + "generic-reading-list-create": "Pri vytváraní zoznamu na čítanie sa vyskytol problém", + "reading-list-doesnt-exist": "Zoznam na čítanie neexistuje", + "series-restricted": "Používateľ nemá prístup k tejto sérii", + "generic-scrobble-hold": "Pri pauznutí funkcie sa vyskytla chyba", + "libraries-restricted": "Používateľ nemá prístup k žiadnym knižniciam", + "no-series": "Nepodarilo sa získať sériu pre knižnicu", + "no-series-collection": "Nepodarilo sa získať sériu pre kolekciu", + "generic-series-delete": "Pri odstraňovaní série sa vyskytol problém", + "generic-series-update": "Pri aktualizácii série sa vyskytla chyba", + "series-updated": "Úspešne aktualizované", + "update-metadata-fail": "Nepodarilo sa aktualizovať metadáta", + "age-restriction-not-applicable": "Bez obmedzenia", + "generic-relationship": "Pri aktualizácii vzťahov sa vyskytol problém", + "job-already-running": "Úloha už beží", + "encode-as-warning": "Nedá sa konvertovať do formátu PNG. Pre obaly použite možnosť Obnoviť obaly. Záložky a favicony sa nedajú spätne zakódovať.", + "ip-address-invalid": "IP adresa „{0}“ je neplatná", + "bookmark-dir-permissions": "Adresár záložiek nemá správne povolenia pre použitie v aplikácii Kavita", + "total-backups": "Celkový počet záloh musí byť medzi 1 a 30", + "total-logs": "Celkový počet protokolov musí byť medzi 1 a 30", + "stats-permission-denied": "Nemáte oprávnenie zobraziť si štatistiky iného používateľa", + "url-not-valid": "URL nevracia platný obrázok alebo vyžaduje autorizáciu", + "url-required": "Na použitie musíte zadať URL adresu", + "generic-cover-series-save": "Obrázok obálky sa nepodarilo uložiť do série", + "generic-cover-collection-save": "Obrázok obálky sa nepodarilo uložiť do kolekcie", + "generic-cover-reading-list-save": "Obrázok obálky sa nepodarilo uložiť do zoznamu na čítanie", + "generic-cover-chapter-save": "Obrázok obálky sa nepodarilo uložiť do kapitoly", + "generic-cover-library-save": "Obrázok obálky sa nepodarilo uložiť do knižnice", + "generic-cover-person-save": "Obrázok obálky sa nepodarilo uložiť k tejto osobe", + "generic-cover-volume-save": "Obrázok obálky sa nepodarilo uložiť do zväzku", + "access-denied": "Nemáte prístup", + "reset-chapter-lock": "Nepodarilo sa resetovať zámok obalu pre kapitolu", + "generic-user-delete": "Používateľa sa nepodarilo odstrániť", + "generic-user-pref": "Pri ukladaní predvolieb sa vyskytol problém", + "opds-disabled": "OPDS nie je na tomto serveri povolený", + "on-deck": "Pokračovať v čítaní", + "browse-on-deck": "Prehliadať pokračovanie v čítaní", + "recently-added": "Nedávno pridané", + "want-to-read": "Chcem čítať", + "browse-want-to-read": "Prehliadať Chcem si prečítať", + "browse-recently-added": "Prehliadať nedávno pridané", + "reading-lists": "Zoznamy na čítanie", + "browse-reading-lists": "Prehliadať podľa zoznamov na čítanie", + "libraries": "Všetky knižnice", + "browse-libraries": "Prehliadať podľa knižníc", + "collections": "Všetky kolekcie", + "browse-collections": "Prehliadať podľa kolekcií", + "more-in-genre": "Viac v žánri {0}", + "browse-more-in-genre": "Prezrite si viac v {0}", + "recently-updated": "Nedávno aktualizované", + "browse-recently-updated": "Prehliadať nedávno aktualizované", + "smart-filters": "Inteligentné filtre", + "external-sources": "Externé zdroje", + "browse-external-sources": "Prehliadať externé zdroje", + "browse-smart-filters": "Prehliadať podľa inteligentných filtrov", + "reading-list-restricted": "Zoznam na čítanie neexistuje alebo k nemu nemáte prístup", + "query-required": "Musíte zadať parameter dopytu", + "search": "Hľadať", + "search-description": "Vyhľadávanie sérií, zbierok alebo zoznamov na čítanie", + "favicon-doesnt-exist": "Favicon neexistuje", + "smart-filter-doesnt-exist": "Inteligentný filter neexistuje", + "smart-filter-already-in-use": "Existuje existujúci stream s týmto inteligentným filtrom", + "dashboard-stream-doesnt-exist": "Stream dashboardu neexistuje", + "sidenav-stream-doesnt-exist": "SideNav Stream neexistuje", + "external-source-already-exists": "Externý zdroj už existuje", + "external-source-required": "Vyžaduje sa kľúč API a Host", + "external-source-doesnt-exist": "Externý zdroj neexistuje", + "external-source-already-in-use": "S týmto externým zdrojom existuje stream", + "sidenav-stream-only-delete-smart-filter": "Z bočného panela SideNav je možné odstrániť iba streamy inteligentných filtrov", + "dashboard-stream-only-delete-smart-filter": "Z ovládacieho panela je možné odstrániť iba streamy inteligentných filtrov", + "smart-filter-name-required": "Názov inteligentného filtra je povinný", + "smart-filter-system-name": "Nemôžete použiť názov streamu poskytnutého systémom", + "not-authenticated": "Používateľ nie je overený", + "unable-to-register-k+": "Licenciu sa nepodarilo zaregistrovať z dôvodu chyby. Kontaktujte podporu Kavita+", + "unable-to-reset-k+": "Licenciu Kavita+ sa nepodarilo resetovať z dôvodu chyby. Kontaktujte podporu Kavita+", + "anilist-cred-expired": "Prihlasovacie údaje AniList vypršali alebo chýbajú", + "scrobble-bad-payload": "Nesprávne údaje od poskytovateľa Scrobblovania", + "theme-doesnt-exist": "Súbor témy chýba alebo je neplatný", + "bad-copy-files-for-download": "Súbory sa nepodarilo skopírovať do dočasného adresára na stiahnutie archívu.", + "generic-create-temp-archive": "Pri vytváraní dočasného archívu sa vyskytla chyba", + "epub-malformed": "Súbor je nesprávne naformátovaný! Nedá sa prečítať.", + "epub-html-missing": "Zodpovedajúci súbor HTML pre túto stránku sa nenašiel", + "collection-tag-title-required": "Názov kolekcie nemôže byť prázdny", + "reading-list-title-required": "Názov zoznamu na čítanie nemôže byť prázdny", + "collection-tag-duplicate": "Kolekcia s týmto názvom už existuje", + "device-duplicate": "Zariadenie s týmto názvom už existuje", + "device-not-created": "Toto zariadenie ešte neexistuje. Najprv ho vytvorte", + "send-to-permission": "Nie je možné odoslať súbory iné ako EPUB alebo PDF na zariadenia, pretože nie sú podporované na Kindle", + "progress-must-exist": "Pokrok musí byť u používateľa k dispozícii", + "reading-list-name-exists": "Zoznam na prečítanie s týmto menom už existuje", + "user-no-access-library-from-series": "Používateľ nemá prístup do knižnice, do ktorej táto séria patrí", + "series-restricted-age-restriction": "Používateľ si nemôže pozrieť túto sériu z dôvodu vekového obmedzenia", + "kavitaplus-restricted": "Toto je obmedzené iba na Kavita+", + "aliases-have-overlap": "Jeden alebo viacero aliasov sa prekrýva s inými osobami, nie je možné ich aktualizovať", + "volume-num": "Zväzok {0}", + "book-num": "Kniha {0}", + "issue-num": "Problém {0}{1}", + "chapter-num": "Kapitola {0}", + "check-updates": "Skontrolovať aktualizácie", + "license-check": "Kontrola licencie", + "process-scrobbling-events": "Udalosti procesu scrobblovania", + "report-stats": "Štatistiky hlásení", + "check-scrobbling-tokens": "Skontrolujte Tokeny Scrobblingu", + "cleanup": "Čistenie", + "process-processed-scrobbling-events": "Spracovať udalosti scrobblovania", + "remove-from-want-to-read": "Upratanie listu Chcem si prečítať", + "scan-libraries": "Skenovanie knižníc", + "kavita+-data-refresh": "Obnovenie údajov Kavita+", + "backup": "Záloha", + "update-yearly-stats": "Aktualizovať ročné štatistiky", + "generated-reading-profile-name": "Vygenerované z {0}" +} diff --git a/API/I18N/sl.json b/API/I18N/sl.json new file mode 100644 index 000000000..0967ef424 --- /dev/null +++ b/API/I18N/sl.json @@ -0,0 +1 @@ +{} diff --git a/API/I18N/sv.json b/API/I18N/sv.json index 74b8d0353..64004a7a8 100644 --- a/API/I18N/sv.json +++ b/API/I18N/sv.json @@ -110,7 +110,7 @@ "search-description": "Sök efter Serier, Samlingar, eller Läslistor", "favicon-doesnt-exist": "Favikon saknas", "smart-filter-doesnt-exist": "Smart Filter saknas", - "smart-filter-already-in-use": "Det finns redan en stream med detta Smart Filter", + "smart-filter-already-in-use": "Det finns redan en ström med detta Smarta Filter", "external-source-already-exists": "Extern Källa finns redan", "external-source-required": "ApiKey och Host krävs", "external-source-doesnt-exist": "Extern Källa saknas", @@ -118,7 +118,7 @@ "not-authenticated": "Användaren är inte autentiserad", "unable-to-reset-k+": "Det gick inte att återställa Kavita+-licensen på grund av ett fel. Kontakta Kavita+ Support", "anilist-cred-expired": "AniList Autentiseringsuppgifter har gått ut eller är inte angivna", - "scrobble-bad-payload": "Felaktig payload från Scrobble Provider", + "scrobble-bad-payload": "Felaktig payload från Scrobble utgivare", "theme-doesnt-exist": "Temafil saknas eller är ogiltig", "generic-create-temp-archive": "Det uppstod ett problem vid skapandet av tillfällig katalog", "epub-malformed": "Filen är felaktigt utformad! Kan inte läsa.", @@ -178,7 +178,7 @@ "browse-collections": "Bläddra efter Samlingar", "more-in-genre": "Mer i Genre {0}", "browse-more-in-genre": "Bläddra mer i {0}", - "unable-to-register-k+": "Kan inte registrera licens på grund av fel. Kontakta Kavita+ Support", + "unable-to-register-k+": "Kan inte registrera licens på grund av ett fel. Kontakta Kavita+ Support", "bad-copy-files-for-download": "Kan inte kopiera filer till temp-katalogen för arkivnedladdning.", "epub-html-missing": "Kunde inte hitta lämplig html för den sidan", "device-not-created": "Denna enhet finns inte än. Vänligen skapa den först", @@ -194,12 +194,18 @@ "cleanup": "Städning", "on-deck": "Fortsätt Läsa", "browse-on-deck": "Bläddra i Fortsätt Läsa", - "dashboard-stream-doesnt-exist": "Dashboard Stream saknas", - "sidenav-stream-doesnt-exist": "SideNav Stream saknas", + "dashboard-stream-doesnt-exist": "Dashboard Ström saknas", + "sidenav-stream-doesnt-exist": "SideNav Ström saknas", "person-doesnt-exist": "Personen existerar inte", "person-name-required": "Personnamn är obligatorisk", "person-name-unique": "Personnamn måste vara unikt", "person-image-doesnt-exist": "Personen existerar inte i CoversDB", "generic-cover-person-save": "Kan inte spara omslagsbilden till Personen", - "generic-cover-volume-save": "Kan inte spara omslagsbilden till Volymen" + "generic-cover-volume-save": "Kan inte spara omslagsbilden till Volymen", + "email-taken": "E-postadressen används redan", + "kavitaplus-restricted": "Detta är enbart tillgängligt med Kavita+", + "dashboard-stream-only-delete-smart-filter": "Bara smarta-filter-strömmar kan tas bort från panelen", + "smart-filter-name-required": "Smart Filter namn krävs", + "sidenav-stream-only-delete-smart-filter": "Bara smarta-filter-strömmar kan tas bort från sidomenyn", + "smart-filter-system-name": "Du kan inte använda namnet från en ström som systemet tillhandahåller" } diff --git a/API/I18N/ta.json b/API/I18N/ta.json new file mode 100644 index 000000000..cc20ab40f --- /dev/null +++ b/API/I18N/ta.json @@ -0,0 +1,213 @@ +{ + "generic-invite-user": "பயனரை அழைக்கும் சிக்கல் இருந்தது. பதிவுகளை சரிபார்க்கவும்.", + "user-already-invited": "பயனர் ஏற்கனவே இந்த மின்னஞ்சலின் கீழ் அழைக்கப்படுகிறார், மேலும் அழைப்பை இன்னும் ஏற்கவில்லை.", + "invalid-email-confirmation": "தவறான மின்னஞ்சல் உறுதிப்படுத்தல்", + "generic-user-email-update": "பயனருக்கான மின்னஞ்சலைப் புதுப்பிக்க முடியவில்லை. பதிவுகளை சரிபார்க்கவும்.", + "generic-password-update": "புதிய கடவுச்சொல்லை உறுதிப்படுத்தும்போது எதிர்பாராத பிழை ஏற்பட்டது", + "password-updated": "கடவுச்சொல் புதுப்பிக்கப்பட்டது", + "forgot-password-generic": "எங்கள் தரவுத்தளத்தில் இருந்தால் மின்னஞ்சல் அனுப்பப்படும்", + "bad-copy-files-for-download": "கோப்புகளை தற்காலிக அடைவு காப்பக பதிவிறக்கத்திற்கு நகலெடுக்க முடியவில்லை.", + "generic-create-temp-archive": "தற்காலிக காப்பகத்தை உருவாக்கும் சிக்கல் இருந்தது", + "epub-malformed": "கோப்பு தவறாக உள்ளது! படிக்க முடியாது.", + "epub-html-missing": "அந்தப் பக்கத்திற்கு பொருத்தமான உஉகுமொ ஐக் கண்டுபிடிக்க முடியவில்லை", + "collection-tag-title-required": "சேகரிப்பு தலைப்பு காலியாக இருக்க முடியாது", + "collection-tag-duplicate": "இந்த பெயருடன் ஒரு தொகுப்பு ஏற்கனவே உள்ளது", + "device-duplicate": "இந்த பெயரைக் கொண்ட ஒரு சாதனம் ஏற்கனவே உள்ளது", + "not-accessible-password": "உங்கள் சேவையகம் அணுக முடியாது. உங்கள் கடவுச்சொல்லை மீட்டமைப்பதற்கான இணைப்பு பதிவுகளில் உள்ளது", + "device-not-created": "இந்த சாதனம் இன்னும் இல்லை. முதலில் உருவாக்கவும்", + "send-to-permission": "கின்டலில் ஆதரிக்கப்படாத சாதனங்களுக்கு எபப் அல்லாத அல்லது பி.டி.எஃப் அனுப்ப முடியாது", + "progress-must-exist": "பயனரில் முன்னேற்றம் இருக்க வேண்டும்", + "reading-list-name-exists": "இந்த பெயரின் வாசிப்பு பட்டியல் ஏற்கனவே உள்ளது", + "user-no-access-library-from-series": "பயனருக்கு நூலகத்திற்கு அணுகல் இல்லை இந்த தொடர் சொந்தமானது", + "series-restricted-age-restriction": "அகவை கட்டுப்பாடுகள் காரணமாக இந்தத் தொடரைப் பார்க்க பயனருக்கு இசைவு இல்லை", + "volume-num": "தொகுதி {0}", + "book-num": "நூல் {0}", + "issue-num": "வெளியீடு {0} {1}", + "chapter-num": "அத்தியாயம் {0}", + "check-updates": "புதுப்பிப்புகளை சரிபார்க்கவும்", + "license-check": "உரிம சோதனை", + "process-scrobbling-events": "செயலாக்க நிகழ்வுகளை செயலாக்கவும்", + "report-stats": "புள்ளிவிவரங்களைப் புகாரளிக்கவும்", + "check-scrobbling-tokens": "ச்க்ரோப்ளிங் டோக்கன்களை சரிபார்க்கவும்", + "cleanup": "தூய்மைப்படுத்துதல்", + "process-processed-scrobbling-events": "செயல்முறை செயலாக்கப்பட்ட ச்க்ரோப்லிங் நிகழ்வுகள்", + "remove-from-want-to-read": "தூய்மைப்படுத்தலைப் படிக்க விரும்புகிறேன்", + "scan-libraries": "நூலகங்களை ச்கேன் செய்யுங்கள்", + "kavita+-data-refresh": "கவிதா+ தரவு புதுப்பிப்பு", + "backup": "காப்புப்பிரதி", + "update-yearly-stats": "ஆண்டு புள்ளிவிவரங்களைப் புதுப்பிக்கவும்", + "invalid-email": "பயனருக்கான கோப்பில் உள்ள மின்னஞ்சல் சரியான மின்னஞ்சல் அல்ல. எந்த இணைப்புகளுக்கான பதிவுகளையும் காண்க.", + "not-accessible": "உங்கள் சேவையகம் வெளிப்புறமாக அணுக முடியாது", + "email-sent": "மின்னஞ்சல் அனுப்பப்பட்டது", + "user-migration-needed": "இந்த பயனர் இடம்பெயர வேண்டும். இடம்பெயர்வு ஓட்டத்தைத் தூண்டுவதற்கு அவை வெளியேறி உள்நுழைய வேண்டும்", + "generic-invite-email": "அழைப்பு மின்னஞ்சல் மீண்டும் ஒரு சிக்கல் இருந்தது", + "admin-already-exists": "நிர்வாகி ஏற்கனவே உள்ளது", + "invalid-username": "தவறான பயனர்பெயர்", + "critical-email-migration": "மின்னஞ்சல் இடம்பெயர்வு போது ஒரு சிக்கல் இருந்தது. தொடர்பு உதவி", + "email-not-enabled": "இந்த சேவையகத்தில் மின்னஞ்சல் இயக்கப்படவில்லை. இந்த செயலை நீங்கள் செய்ய முடியாது.", + "must-be-defined": "{0} வரையறுக்கப்பட வேண்டும்", + "generic-favicon": "டொமைனுக்கு ஃபேவிகானைப் பெறுவதில் சிக்கல் இருந்தது", + "invalid-filename": "தவறான கோப்பு பெயர்", + "file-doesnt-exist": "கோப்பு இல்லை", + "library-name-exists": "நூலக பெயர் ஏற்கனவே உள்ளது. சேவையகத்திற்கு ஒரு தனிப்பட்ட பெயரைத் தேர்வுசெய்க.", + "generic-library": "ஒரு முக்கியமான சிக்கல் இருந்தது. மீண்டும் முயற்சிக்கவும்.", + "no-library-access": "பயனருக்கு இந்த நூலகத்திற்கு அணுகல் இல்லை", + "library-doesnt-exist": "நூலகம் இல்லை", + "invalid-path": "தவறான பாதை", + "no-series-collection": "சேகரிப்புக்கான தொடர்களைப் பெற முடியவில்லை", + "generic-series-delete": "தொடரை நீக்குவதில் சிக்கல் இருந்தது", + "generic-series-update": "தொடரைப் புதுப்பிப்பதில் பிழை ஏற்பட்டது", + "series-updated": "வெற்றிகரமாக புதுப்பிக்கப்பட்டது", + "update-metadata-fail": "மெட்டாடேட்டாவை புதுப்பிக்க முடியவில்லை", + "age-restriction-not-applicable": "கட்டுப்பாடு இல்லை", + "generic-relationship": "உறவுகளைப் புதுப்பிப்பதில் சிக்கல் இருந்தது", + "job-already-running": "ஏற்கனவே இயங்கும் வேலை", + "browse-reading-lists": "பட்டியல்களைப் படிப்பதன் மூலம் உலாவுக", + "libraries": "அனைத்து நூலகங்களும்", + "browse-libraries": "நூலகங்களால் உலாவுக", + "collections": "அனைத்து சேகரிப்புகளும்", + "browse-collections": "வசூல் மூலம் உலாவுக", + "more-in-genre": "{0} வகைகளில் மேலும்", + "browse-more-in-genre": "{0} இல் மேலும் உலாவுக", + "recently-updated": "அண்மைக் காலத்தில் புதுப்பிக்கப்பட்டது", + "browse-recently-updated": "உலாவு அண்மைக் காலத்தில் புதுப்பிக்கப்பட்டது", + "smart-filters": "அறிவுள்ள வடிப்பான்கள்", + "external-sources": "வெளிப்புற ஆதாரங்கள்", + "browse-external-sources": "வெளிப்புற ஆதாரங்களை உலாவுக", + "browse-smart-filters": "அறிவுள்ள வடிப்பான்களால் உலாவுக", + "reading-list-restricted": "வாசிப்பு பட்டியல் இல்லை அல்லது உங்களுக்கு அணுகல் இல்லை", + "query-required": "நீங்கள் ஒரு வினவல் அளவுருவை அனுப்ப வேண்டும்", + "search-description": "தொடர், தொகுப்புகள் அல்லது வாசிப்பு பட்டியல்களைத் தேடுங்கள்", + "favicon-doesnt-exist": "ஃபாவிகான் இல்லை", + "smart-filter-doesnt-exist": "அறிவுள்ள வடிகட்டி இல்லை", + "smart-filter-already-in-use": "இந்த அறிவுள்ள வடிகட்டியுடன் ஏற்கனவே ச்ட்ரீம் உள்ளது", + "dashboard-stream-doesnt-exist": "டாச்போர்டு ச்ட்ரீம் இல்லை", + "sidenav-stream-doesnt-exist": "சிடெனவ் ச்ட்ரீம் இல்லை", + "external-source-already-exists": "வெளிப்புற மூலமானது ஏற்கனவே உள்ளது", + "external-source-required": "அப்பிகி மற்றும் புரவலன் தேவை", + "external-source-doesnt-exist": "வெளிப்புற மூல இல்லை", + "external-source-already-in-use": "இந்த வெளிப்புற மூலத்துடன் ஏற்கனவே ச்ட்ரீம் உள்ளது", + "not-authenticated": "பயனர் அங்கீகரிக்கப்படவில்லை", + "unable-to-register-k+": "பிழை காரணமாக உரிமத்தை பதிவு செய்ய முடியவில்லை. கவிதா+ ஆதரவை அணுகவும்", + "unable-to-reset-k+": "Unable பெறுநர் மீட்டமை Kavita+ உரிமம் due பெறுநர் error. கவிதா+ ஆதரவை அணுகவும்", + "anilist-cred-expired": "அனிலிச்ட் நற்சான்றிதழ்கள் காலாவதியானன அல்லது அமைக்கப்படவில்லை", + "scrobble-bad-payload": "ச்க்ரோபல் வழங்குநரிடமிருந்து மோசமான பேலோட்", + "theme-doesnt-exist": "கருப்பொருள் கோப்பு காணவில்லை அல்லது தவறானது", + "search": "தேடல்", + "age-restriction-update": "அகவை கட்டுப்பாட்டை புதுப்பிப்பதில் பிழை ஏற்பட்டது", + "bookmark-doesnt-exist": "புக்மார்க்கு இல்லை", + "user-doesnt-exist": "பயனர் இல்லை", + "reading-list-item-delete": "உருப்படி (களை) நீக்க முடியவில்லை", + "libraries-restricted": "பயனருக்கு எந்த நூலகங்களுக்கும் அணுகல் இல்லை", + "reading-list-title-required": "பட்டியல் தலைப்பு காலியாக இருக்க முடியாது", + "confirm-email": "முதலில் உங்கள் மின்னஞ்சலை உறுதிப்படுத்த வேண்டும்", + "locked-out": "பல அங்கீகார முயற்சிகளிலிருந்து நீங்கள் பூட்டப்பட்டுள்ளீர்கள். தயவுசெய்து 10 நிமிடங்கள் காத்திருக்கவும்.", + "disabled-account": "உங்கள் கணக்கு முடக்கப்பட்டுள்ளது. சேவையக நிர்வாகியைத் தொடர்பு கொள்ளுங்கள்.", + "register-user": "பயனரை பதிவு செய்யும் போது ஏதோ தவறு ஏற்பட்டது", + "validate-email": "உங்கள் மின்னஞ்சலை உறுதிப்படுத்தும் சிக்கல் இருந்தது: {0}", + "confirm-token-gen": "உறுதிப்படுத்தல் கிள்ளாக்கை உருவாக்கும் சிக்கல் இருந்தது", + "denied": "அனுமதிக்கப்படவில்லை", + "permission-denied": "இந்த நடவடிக்கைக்கு நீங்கள் அனுமதிக்கப்படவில்லை", + "password-required": "நீங்கள் ஒரு நிர்வாகி இல்லையென்றால் உங்கள் கணக்கை மாற்ற உங்கள் ஏற்கனவே உள்ள கடவுச்சொல்லை உள்ளிட வேண்டும்", + "invalid-password": "தவறான கடவுச்சொல்", + "invalid-token": "தவறான கிள்ளாக்கு", + "unable-to-reset-key": "விசையை மீட்டமைக்க முடியாமல் ஏதோ தவறு நடந்தது", + "invalid-payload": "தவறான பேலோட்", + "nothing-to-do": "செய்ய எதுவும் இல்லை", + "share-multiple-emails": "பல கணக்குகளில் மின்னஞ்சல்களைப் பகிர முடியாது", + "generate-token": "உறுதிப்படுத்தல் மின்னஞ்சல் கிள்ளாக்கை உருவாக்கும் சிக்கல் இருந்தது. பதிவுகள் பார்க்கவும்", + "no-user": "பயனர் இல்லை", + "username-taken": "ஏற்கனவே எடுக்கப்பட்ட பயனர்பெயர்", + "email-taken": "ஏற்கனவே பயன்பாட்டில் உள்ள மின்னஞ்சல்", + "user-already-confirmed": "பயனர் ஏற்கனவே உறுதிப்படுத்தப்பட்டுள்ளது", + "generic-user-update": "பயனரைப் புதுப்பிக்கும்போது விதிவிலக்கு இருந்தது", + "manual-setup-fail": "கையேடு அமைப்பை முடிக்க முடியவில்லை. தயவுசெய்து அழைப்பை ரத்து செய்து மீண்டும் உருவாக்கவும்", + "user-already-registered": "பயனர் ஏற்கனவே {0 அச் என பதிவு செய்யப்பட்டுள்ளார்", + "account-email-invalid": "நிர்வாகக் கணக்கிற்கான கோப்பில் உள்ள மின்னஞ்சல் சரியான மின்னஞ்சல் அல்ல. சோதனை மின்னஞ்சலை அனுப்ப முடியாது.", + "email-settings-invalid": "மின்னஞ்சல் அமைப்புகள் காணவில்லை. அனைத்து மின்னஞ்சல் அமைப்புகளும் சேமிக்கப்படுவதை உறுதிசெய்க.", + "chapter-doesnt-exist": "அத்தியாயம் இல்லை", + "file-missing": "கோப்பு புத்தகத்தில் காணப்படவில்லை", + "collection-updated": "சேகரிப்பு வெற்றிகரமாக புதுப்பிக்கப்பட்டது", + "collection-deleted": "சேகரிப்பு நீக்கப்பட்டது", + "generic-error": "ஏதோ தவறு நடந்தது, தயவுசெய்து மீண்டும் முயற்சிக்கவும்", + "collection-doesnt-exist": "சேகரிப்பு இல்லை", + "collection-already-exists": "சேகரிப்பு ஏற்கனவே உள்ளது", + "error-import-stack": "மால் ச்டேக்கை இறக்குமதி செய்வதில் சிக்கல் இருந்தது", + "person-doesnt-exist": "நபர் இல்லை", + "person-name-required": "நபரின் பெயர் தேவை மற்றும் பூச்யமாக இருக்கக்கூடாது", + "person-name-unique": "நபரின் பெயர் தனித்துவமாக இருக்க வேண்டும்", + "person-image-doesnt-exist": "கவர்ச்டிபியில் நபர் இல்லை", + "device-doesnt-exist": "சாதனம் இல்லை", + "generic-device-create": "சாதனத்தை உருவாக்கும் போது பிழை ஏற்பட்டது", + "generic-device-update": "சாதனத்தைப் புதுப்பிக்கும்போது பிழை ஏற்பட்டது", + "generic-device-delete": "சாதனத்தை நீக்கும்போது பிழை ஏற்பட்டது", + "greater-0": "{0} 0 ஐ விட அதிகமாக இருக்க வேண்டும்", + "send-to-kavita-email": "மின்னஞ்சல் அமைவு இல்லாமல் சாதனத்திற்கு அனுப்பு பயன்படுத்த முடியாது", + "send-to-unallowed": "உங்களுடையது இல்லாத சாதனத்திற்கு நீங்கள் அனுப்ப முடியாது", + "send-to-size-limit": "நீங்கள் அனுப்ப முயற்சிக்கும் கோப்பு (கள்) உங்கள் மின்னஞ்சல் வழங்குநருக்கு மிகப் பெரியது", + "send-to-device-status": "உங்கள் சாதனத்திற்கு கோப்புகளை மாற்றுகிறது", + "generic-send-to": "சாதனத்திற்கு கோப்பு (களை) அனுப்புவதில் பிழை ஏற்பட்டது", + "series-doesnt-exist": "தொடர் இல்லை", + "volume-doesnt-exist": "தொகுதி இல்லை", + "bookmarks-empty": "புக்மார்க்குகள் காலியாக இருக்க முடியாது", + "no-cover-image": "கவர் படம் இல்லை", + "delete-library-while-scan": "ச்கேன் நடந்து கொண்டிருக்கும்போது நீங்கள் ஒரு நூலகத்தை நீக்க முடியாது. கவிதாவை ச்கேன் முடிக்க அல்லது மறுதொடக்கம் செய்ய காத்திருங்கள்", + "generic-library-update": "நூலகத்தைப் புதுப்பிப்பதில் ஒரு முக்கியமான சிக்கல் இருந்தது.", + "pdf-doesnt-exist": "பி.டி.எஃப் எப்போது இருக்க வேண்டும்", + "invalid-access": "தவறான அணுகல்", + "no-image-for-page": "பக்கத்திற்கு அத்தகைய படம் இல்லை {0}. மறு கேச் அனுமதிக்க புத்துணர்ச்சியை முயற்சிக்கவும்.", + "perform-scan": "தயவுசெய்து இந்த தொடர் அல்லது நூலகத்தில் ச்கேன் செய்து மீண்டும் முயற்சிக்கவும்", + "generic-read-progress": "முன்னேற்றத்தை மிச்சப்படுத்தும் சிக்கல் இருந்தது", + "generic-clear-bookmarks": "புக்மார்க்குகளை அழிக்க முடியவில்லை", + "bookmark-permission": "புக்மார்க்கு/புத்தகமார்க்குக்கு உங்களுக்கு இசைவு இல்லை", + "bookmark-save": "புத்தகக்குறியை சேமிக்க முடியவில்லை", + "cache-file-find": "தற்காலிக சேமிப்பு படத்தைக் கண்டுபிடிக்க முடியவில்லை. மீண்டும் ஏற்றவும் மீண்டும் முயற்சிக்கவும்.", + "name-required": "பெயர் காலியாக இருக்க முடியாது", + "valid-number": "செல்லுபடியாகும் பக்க எண்ணாக இருக்க வேண்டும்", + "duplicate-bookmark": "நகல் புத்தகக்குறி நுழைவு ஏற்கனவே உள்ளது", + "reading-list-permission": "இந்த வாசிப்பு பட்டியலில் உங்களிடம் இசைவு இல்லை அல்லது பட்டியல் இல்லை", + "reading-list-position": "நிலையை புதுப்பிக்க முடியவில்லை", + "reading-list-updated": "புதுப்பிக்கப்பட்டது", + "reading-list-deleted": "வாசிப்பு பட்டியல் நீக்கப்பட்டது", + "generic-reading-list-delete": "வாசிப்பு பட்டியலை நீக்குவதில் சிக்கல் இருந்தது", + "generic-reading-list-update": "வாசிப்பு பட்டியலைப் புதுப்பிப்பதில் சிக்கல் இருந்தது", + "generic-reading-list-create": "வாசிப்பு பட்டியலை உருவாக்கும் சிக்கல் இருந்தது", + "reading-list-doesnt-exist": "வாசிப்பு பட்டியல் இல்லை", + "series-restricted": "பயனருக்கு இந்த தொடருக்கான அணுகல் இல்லை", + "generic-scrobble-hold": "பிடியைச் சேர்க்கும்போது பிழை ஏற்பட்டது", + "no-series": "நூலகத்திற்கான தொடர்களைப் பெற முடியவில்லை", + "encode-as-warning": "நீங்கள் பி.என்.சி.க்கு மாற்ற முடியாது. அட்டைகளுக்கு, புதுப்பிப்பு அட்டைகளைப் பயன்படுத்தவும். புக்மார்க்குகள் மற்றும் ஃபாவிகான்களை மீண்டும் குறியாக்கம் செய்ய முடியாது.", + "ip-address-invalid": "ஐபி முகவரி '{0}' தவறானது", + "bookmark-dir-permissions": "கவிதாவைப் பயன்படுத்த புக்மார்க்கு கோப்பகத்திற்கு சரியான அனுமதிகள் இல்லை", + "total-backups": "மொத்த காப்புப்பிரதிகள் 1 முதல் 30 வரை இருக்க வேண்டும்", + "total-logs": "மொத்த பதிவுகள் 1 முதல் 30 வரை இருக்க வேண்டும்", + "stats-permission-denied": "மற்றொரு பயனரின் புள்ளிவிவரங்களைக் காண உங்களுக்கு ஏற்பு இல்லை", + "url-not-valid": "முகவரி சரியான படத்தை திருப்பித் தராது அல்லது ஏற்பு தேவைப்படுகிறது", + "url-required": "பயன்படுத்த நீங்கள் ஒரு முகவரி ஐ அனுப்ப வேண்டும்", + "generic-cover-series-save": "கவர் படத்தை தொடருக்கு சேமிக்க முடியவில்லை", + "generic-cover-collection-save": "கவர் படத்தை சேகரிப்புக்கு சேமிக்க முடியவில்லை", + "generic-cover-reading-list-save": "கவர் படத்தை வாசிப்பு பட்டியலுக்கு சேமிக்க முடியவில்லை", + "generic-cover-chapter-save": "கவர் படத்தை அத்தியாயத்தில் சேமிக்க முடியவில்லை", + "generic-cover-library-save": "கவர் படத்தை நூலகத்தில் சேமிக்க முடியவில்லை", + "generic-cover-person-save": "கவர் படத்தை நபருக்கு சேமிக்க முடியவில்லை", + "generic-cover-volume-save": "கவர் படத்தை தொகுதிக்கு சேமிக்க முடியவில்லை", + "access-denied": "உங்களுக்கு அணுகல் இல்லை", + "reset-chapter-lock": "அத்தியாயத்திற்கான கவர் பூட்டை மீட்டமைக்க முடியவில்லை", + "generic-user-delete": "பயனரை நீக்க முடியவில்லை", + "generic-user-pref": "விருப்பங்களை சேமிக்கும் சிக்கல் இருந்தது", + "opds-disabled": "இந்த சேவையகத்தில் OPDS இயக்கப்படவில்லை", + "on-deck": "டெக்கில்", + "browse-on-deck": "டெக்கில் உலாவுக", + "recently-added": "அண்மைக் காலத்தில் சேர்க்கப்பட்டது", + "want-to-read": "படிக்க விரும்புகிறேன்", + "browse-want-to-read": "உலாவு படிக்க விரும்புகிறது", + "browse-recently-added": "உலாவு அண்மைக் காலத்தில் சேர்க்கப்பட்டது", + "reading-lists": "பட்டியல்களைப் படித்தல்", + "sidenav-stream-only-delete-smart-filter": "சைடனாவிலிருந்து அறிவுள்ள வடிகட்டி நீரோடைகளை மட்டுமே நீக்க முடியும்", + "dashboard-stream-only-delete-smart-filter": "டாச்போர்டில் இருந்து அறிவுள்ள வடிகட்டி ச்ட்ரீம்களை மட்டுமே நீக்க முடியும்", + "smart-filter-name-required": "அறிவுள்ள வடிகட்டி பெயர் தேவை", + "smart-filter-system-name": "வழங்கப்பட்ட ச்ட்ரீமின் பெயரை நீங்கள் பயன்படுத்த முடியாது", + "kavitaplus-restricted": "இது கவிதா+ க்கு மட்டுமே", + "aliases-have-overlap": "ஒன்று அல்லது அதற்கு மேற்பட்ட மாற்றுப்பெயர்கள் மற்றவர்களுடன் ஒன்றுடன் ஒன்று உள்ளன, புதுப்பிக்க முடியாது", + "generated-reading-profile-name": "{0 இருந்து இலிருந்து உருவாக்கப்பட்டது" +} diff --git a/API/I18N/tr.json b/API/I18N/tr.json index fb72952b1..370f13f20 100644 --- a/API/I18N/tr.json +++ b/API/I18N/tr.json @@ -3,7 +3,7 @@ "permission-denied": "Bu operasyona izniniz yok", "confirm-email": "İlk olarak E-Posta'nı onaylaman gerek", "register-user": "Kullanıcıyı kayıt ederken bir şeyler yanlış gitti", - "disabled-account": "Hesabınız devre dışı bırakıldı. Sunucu yöneticisiyle iletişime geçin.", + "disabled-account": "Hesabınız devre dışı. Sunucu yöneticisiyle iletişime geçin.", "validate-email": "E-Posta'yı doğrularken bir hata oluştu: {0}", "confirm-token-gen": "Doğrulama tokeni oluşturulurken bir sorun oluştu", "password-required": "Yönetici değilseniz, hesabınızı değiştirmek için mevcut şifrenizi girmelisiniz", diff --git a/API/I18N/uk.json b/API/I18N/uk.json index a8afe85a9..62f514a04 100644 --- a/API/I18N/uk.json +++ b/API/I18N/uk.json @@ -13,5 +13,12 @@ "nothing-to-do": "Тут нема роботи", "share-multiple-emails": "Не можна користуватися одним email з кількох облікових записів", "confirm-token-gen": "Щось пішло не так під час генерації коду підтвердження", - "invalid-password": "Неправильний пароль" + "invalid-password": "Неправильний пароль", + "generic-user-update": "Сталася помилка при спробі оновлення інформації користувача", + "generate-token": "Відбулась помилка при спробі підтвердження токену. Перегляньте логи", + "age-restriction-update": "Сталася помилка під час оновлення обмежень віку", + "no-user": "Користувача не існує", + "username-taken": "Ім'я користувача уже зайняте", + "user-already-confirmed": "Користувач уже підтверджений", + "email-taken": "Адреса електронної пошти уже зайнята" } diff --git a/API/I18N/zh_Hans.json b/API/I18N/zh_Hans.json index 01e1eaf52..14c8c902e 100644 --- a/API/I18N/zh_Hans.json +++ b/API/I18N/zh_Hans.json @@ -201,5 +201,13 @@ "person-doesnt-exist": "人员不存在", "person-name-required": "人员姓名为必填项，且不能为空", "person-name-unique": "人名必须是唯一的", - "person-image-doesnt-exist": "CoversDB 中不存在此人" + "person-image-doesnt-exist": "CoversDB 中不存在此人", + "email-taken": "电子邮件已被使用", + "kavitaplus-restricted": "仅限 Kavita+", + "dashboard-stream-only-delete-smart-filter": "只能从仪表板中删除智能筛选器流", + "smart-filter-name-required": "需要智能筛选器名称", + "smart-filter-system-name": "您不能使用系统提供的流名称", + "sidenav-stream-only-delete-smart-filter": "只能从侧边栏删除智能筛选器流", + "aliases-have-overlap": "一个或多个别名与其他人有重叠，无法更新", + "generated-reading-profile-name": "由 {0} 生成" } diff --git a/API/I18N/zh_Hant.json b/API/I18N/zh_Hant.json index 04ec9a4b2..31d4b69f6 100644 --- a/API/I18N/zh_Hant.json +++ b/API/I18N/zh_Hant.json @@ -173,7 +173,7 @@ "send-to-unallowed": "您無法傳送到不是您自己的裝置", "email-settings-invalid": "電子郵件設定缺少資訊。請確保所有電子郵件設定已保存。", "collection-already-exists": "組合已存在", - "send-to-size-limit": "您嘗試發送的文件對於您的電子郵件提供者來說太大", + "send-to-size-limit": "您嘗試傳送的文件過大，無法通過您的電子郵件服務提供商發送", "external-sources": "外部來源", "dashboard-stream-doesnt-exist": "儀表板串流不存在", "unable-to-reset-k+": "發生錯誤，無法重置 Kavita+ 授權。請聯繫 Kavita+ 支援", @@ -193,13 +193,21 @@ "update-yearly-stats": "更新年度統計", "invalid-email": "使用者檔案中的電子郵件無效。請查看日誌以獲得任何連結。", "browse-external-sources": "瀏覽外部來源", - "sidenav-stream-doesnt-exist": "側邊導覽串流不存在", + "sidenav-stream-doesnt-exist": "側邊導覽列的串流不存在", "smart-filter-already-in-use": "已存在具有此智慧篩選器的串流", "external-source-already-exists": "外部來源已存在", "generic-cover-volume-save": "無法保存封面圖片", "generic-cover-person-save": "無法保存封面圖片", "person-doesnt-exist": "此人不存在", - "person-name-required": "个人姓名是必需的,不得取消", - "person-name-unique": "个人姓名必须是独特的", - "person-image-doesnt-exist": "CoversDB 中不存在此人" + "person-name-required": "名稱為必填欄位，且不得留空", + "person-name-unique": "名稱不得重複", + "person-image-doesnt-exist": "CoversDB 中不存在此人", + "email-taken": "電子郵件已被使用", + "sidenav-stream-only-delete-smart-filter": "只有智慧篩選器可以從側邊導覽列中刪除", + "dashboard-stream-only-delete-smart-filter": "只有智慧篩選器串流可以從儀表板中刪除", + "smart-filter-name-required": "智慧篩選器名稱名稱不可為空", + "smart-filter-system-name": "您不能使用系統保留的串流名稱", + "kavitaplus-restricted": "此功能僅限 Kavita+ 使用", + "aliases-have-overlap": "一個或多個別名與其他人物重複，無法更新", + "generated-reading-profile-name": "由 {0} 生成" } diff --git a/API/Middleware/SecurityMiddleware.cs b/API/Middleware/SecurityMiddleware.cs index 61ca1c75d..67cb42d0c 100644 --- a/API/Middleware/SecurityMiddleware.cs +++ b/API/Middleware/SecurityMiddleware.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using System.Linq; using System.Net; using System.Text.Json; using System.Threading.Tasks; @@ -26,7 +27,7 @@ public class SecurityEventMiddleware(RequestDelegate next) } catch (KavitaUnauthenticatedUserException ex) { - var ipAddress = context.Connection.RemoteIpAddress?.ToString(); + var ipAddress = context.Request.Headers["X-Forwarded-For"].FirstOrDefault() ?? context.Connection.RemoteIpAddress?.ToString(); var requestMethod = context.Request.Method; var requestPath = context.Request.Path; var userAgent = context.Request.Headers.UserAgent; diff --git a/API/Program.cs b/API/Program.cs index 544d568d1..011a7de2a 100644 --- a/API/Program.cs +++ b/API/Program.cs @@ -1,5 +1,5 @@ using System; -using System.Globalization; +using System.IO; using System.IO.Abstractions; using System.Linq; using System.Security.Cryptography; @@ -21,9 +21,11 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; +using NetVips; using Serilog; using Serilog.Events; using Serilog.Sinks.AspNetCore.SignalR.Extensions; +using Log = Serilog.Log; namespace API; #nullable enable @@ -38,9 +40,6 @@ public class Program public static async Task Main(string[] args) { - CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture; - CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.InvariantCulture; - Console.OutputEncoding = System.Text.Encoding.UTF8; Log.Logger = new LoggerConfiguration() .WriteTo.Console() @@ -50,18 +49,13 @@ public class Program var directoryService = new DirectoryService(null!, new FileSystem()); - // Before anything, check if JWT has been generated properly or if user still has default - if (!Configuration.CheckIfJwtTokenSet() && - Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") != Environments.Development) - { - Log.Logger.Information("Generating JWT TokenKey for encrypting user sessions..."); - var rBytes = new byte[256]; - RandomNumberGenerator.Create().GetBytes(rBytes); - Configuration.JwtToken = Convert.ToBase64String(rBytes).Replace("/", string.Empty); - } - Configuration.KavitaPlusApiUrl = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") == Environments.Development - ? "http://localhost:5020" : "https://plus.kavitareader.com"; + // Check if this is the first time running and if so, rename appsettings-init.json to appsettings.json + HandleFirstRunConfiguration(); + + + // Before anything, check if JWT has been generated properly or if user still has default + EnsureJwtTokenKey(); try { @@ -75,6 +69,7 @@ public class Program { var logger = services.GetRequiredService>(); var context = services.GetRequiredService(); + var pendingMigrations = await context.Database.GetPendingMigrationsAsync(); var isDbCreated = await context.Database.CanConnectAsync(); if (isDbCreated && pendingMigrations.Any()) @@ -132,6 +127,7 @@ public class Program await Seed.SeedDefaultStreams(unitOfWork); await Seed.SeedDefaultSideNavStreams(unitOfWork); await Seed.SeedUserApiKeys(context); + await Seed.SeedMetadataSettings(context); } catch (Exception ex) { @@ -149,6 +145,8 @@ public class Program var settings = await unitOfWork.SettingsRepository.GetSettingsDtoAsync(); LogLevelOptions.SwitchLogLevel(settings.LoggingLevel); + InitNetVips(); + await host.RunAsync(); } catch (Exception ex) { @@ -159,6 +157,26 @@ public class Program } } + private static void EnsureJwtTokenKey() + { + if (Configuration.CheckIfJwtTokenSet() || Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") == Environments.Development) return; + + Log.Logger.Information("Generating JWT TokenKey for encrypting user sessions..."); + var rBytes = new byte[256]; + RandomNumberGenerator.Create().GetBytes(rBytes); + Configuration.JwtToken = Convert.ToBase64String(rBytes).Replace("/", string.Empty); + } + + private static void HandleFirstRunConfiguration() + { + var firstRunConfigFilePath = Path.Join(Directory.GetCurrentDirectory(), "config/appsettings-init.json"); + if (File.Exists(firstRunConfigFilePath) && + !File.Exists(Path.Join(Directory.GetCurrentDirectory(), "config/appsettings.json"))) + { + File.Move(firstRunConfigFilePath, Path.Join(Directory.GetCurrentDirectory(), "config/appsettings.json")); + } + } + private static async Task GetMigrationDirectory(DataContext context, IDirectoryService directoryService) { string? currentVersion = null; @@ -231,4 +249,14 @@ public class Program webBuilder.UseStartup(); }); + + /// + /// Ensure NetVips does not cache + /// + /// https://github.com/kleisauke/net-vips/issues/6#issuecomment-394379299 + private static void InitNetVips() + { + Cache.MaxFiles = 0; + + } } diff --git a/API/Services/AccountService.cs b/API/Services/AccountService.cs index 241198811..74b6709fa 100644 --- a/API/Services/AccountService.cs +++ b/API/Services/AccountService.cs @@ -5,8 +5,10 @@ using System.Threading.Tasks; using System.Web; using API.Constants; using API.Data; +using API.DTOs.Account; using API.Entities; using API.Errors; +using API.Extensions; using Kavita.Common; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; @@ -46,7 +48,7 @@ public class AccountService : IAccountService public async Task> ChangeUserPassword(AppUser user, string newPassword) { var passwordValidationIssues = (await ValidatePassword(user, newPassword)).ToList(); - if (passwordValidationIssues.Any()) return passwordValidationIssues; + if (passwordValidationIssues.Count != 0) return passwordValidationIssues; var result = await _userManager.RemovePasswordAsync(user); if (!result.Succeeded) @@ -55,15 +57,11 @@ public class AccountService : IAccountService return result.Errors.Select(e => new ApiException(400, e.Code, e.Description)); } - result = await _userManager.AddPasswordAsync(user, newPassword); - if (!result.Succeeded) - { - _logger.LogError("Could not update password"); - return result.Errors.Select(e => new ApiException(400, e.Code, e.Description)); - } + if (result.Succeeded) return []; - return new List(); + _logger.LogError("Could not update password"); + return result.Errors.Select(e => new ApiException(400, e.Code, e.Description)); } public async Task> ValidatePassword(AppUser user, string password) @@ -81,15 +79,17 @@ public class AccountService : IAccountService } public async Task> ValidateUsername(string username) { - if (await _userManager.Users.AnyAsync(x => x.NormalizedUserName == username.ToUpper())) + // Reverted because of https://go.microsoft.com/fwlink/?linkid=2129535 + if (await _userManager.Users.AnyAsync(x => x.NormalizedUserName != null + && x.NormalizedUserName == username.ToUpper())) { - return new List() - { - new ApiException(400, "Username is already taken") - }; + return + [ + new(400, "Username is already taken") + ]; } - return Array.Empty(); + return []; } public async Task> ValidateEmail(string email) @@ -112,6 +112,7 @@ public class AccountService : IAccountService { if (user == null) return false; var roles = await _userManager.GetRolesAsync(user); + return roles.Contains(PolicyConstants.BookmarkRole) || roles.Contains(PolicyConstants.AdminRole); } @@ -124,6 +125,7 @@ public class AccountService : IAccountService { if (user == null) return false; var roles = await _userManager.GetRolesAsync(user); + return roles.Contains(PolicyConstants.DownloadRole) || roles.Contains(PolicyConstants.AdminRole); } @@ -135,9 +137,10 @@ public class AccountService : IAccountService public async Task CanChangeAgeRestriction(AppUser? user) { if (user == null) return false; + var roles = await _userManager.GetRolesAsync(user); if (roles.Contains(PolicyConstants.ReadOnlyRole)) return false; + return roles.Contains(PolicyConstants.ChangePasswordRole) || roles.Contains(PolicyConstants.AdminRole); } - } diff --git a/API/Services/ArchiveService.cs b/API/Services/ArchiveService.cs index aa0447fc2..335a5a74b 100644 --- a/API/Services/ArchiveService.cs +++ b/API/Services/ArchiveService.cs @@ -16,6 +16,7 @@ using Kavita.Common; using Microsoft.Extensions.Logging; using SharpCompress.Archives; using SharpCompress.Common; +using YamlDotNet.Core; namespace API.Services; @@ -354,16 +355,23 @@ public class ArchiveService : IArchiveService foreach (var path in files) { var tempPath = Path.Join(tempLocation, _directoryService.FileSystem.Path.GetFileNameWithoutExtension(_directoryService.FileSystem.FileInfo.New(path).Name)); - progressCallback(Tuple.Create(_directoryService.FileSystem.FileInfo.New(path).Name, (1.0f * totalFiles) / count)); - if (Tasks.Scanner.Parser.Parser.IsArchive(path)) + + // Image series need different handling + if (Tasks.Scanner.Parser.Parser.IsImage(path)) { - ExtractArchive(path, tempPath); - } - else - { - _directoryService.CopyFileToDirectory(path, tempPath); + var parentDirectory = _directoryService.FileSystem.DirectoryInfo.New(path).Parent?.Name; + tempPath = Path.Join(tempLocation, parentDirectory ?? _directoryService.FileSystem.FileInfo.New(path).Name); } + if (Tasks.Scanner.Parser.Parser.IsArchive(path)) + { + // Archives don't need to be put into a subdirectory of the same name + tempPath = _directoryService.GetParentDirectoryName(tempPath); + } + + progressCallback(Tuple.Create(_directoryService.FileSystem.FileInfo.New(path).Name, (1.0f * totalFiles) / count)); + + _directoryService.CopyFileToDirectory(path, tempPath); count++; } } diff --git a/API/Services/BookService.cs b/API/Services/BookService.cs index 740227af8..99fdd1400 100644 --- a/API/Services/BookService.cs +++ b/API/Services/BookService.cs @@ -6,12 +6,14 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; +using System.Xml; using API.Data.Metadata; using API.DTOs.Reader; using API.Entities; using API.Entities.Enums; using API.Extensions; using API.Services.Tasks.Scanner.Parser; +using API.Helpers; using Docnet.Core; using Docnet.Core.Converters; using Docnet.Core.Models; @@ -69,12 +71,50 @@ public class BookService : IBookService private static readonly RecyclableMemoryStreamManager StreamManager = new (); private const string CssScopeClass = ".book-content"; private const string BookApiUrl = "book-resources?file="; + private readonly PdfComicInfoExtractor _pdfComicInfoExtractor; + + /// + /// Setup the most lenient book parsing options possible as people have some really bad epubs + /// public static readonly EpubReaderOptions BookReaderOptions = new() { PackageReaderOptions = new PackageReaderOptions { IgnoreMissingToc = true, - SkipInvalidManifestItems = true + SkipInvalidManifestItems = true, + }, + Epub2NcxReaderOptions = new Epub2NcxReaderOptions + { + IgnoreMissingContentForNavigationPoints = false + }, + SpineReaderOptions = new SpineReaderOptions + { + IgnoreMissingManifestItems = false + }, + BookCoverReaderOptions = new BookCoverReaderOptions + { + Epub2MetadataIgnoreMissingManifestItem = false + } + }; + + public static readonly EpubReaderOptions LenientBookReaderOptions = new() + { + PackageReaderOptions = new PackageReaderOptions + { + IgnoreMissingToc = true, + SkipInvalidManifestItems = true, + }, + Epub2NcxReaderOptions = new Epub2NcxReaderOptions + { + IgnoreMissingContentForNavigationPoints = false + }, + SpineReaderOptions = new SpineReaderOptions + { + IgnoreMissingManifestItems = false + }, + BookCoverReaderOptions = new BookCoverReaderOptions + { + Epub2MetadataIgnoreMissingManifestItem = true } }; @@ -84,6 +124,7 @@ public class BookService : IBookService _directoryService = directoryService; _imageService = imageService; _mediaErrorService = mediaErrorService; + _pdfComicInfoExtractor = new PdfComicInfoExtractor(_logger, _mediaErrorService); } private static bool HasClickableHrefPart(HtmlNode anchor) @@ -306,8 +347,16 @@ public class BookService : IBookService var imageFile = GetKeyForImage(book, image.Attributes[key].Value); image.Attributes.Remove(key); - // UrlEncode here to transform ../ into an escaped version, which avoids blocking on nginx - image.Attributes.Add(key, $"{apiBase}" + Uri.EscapeDataString(imageFile)); + + if (!imageFile.StartsWith("http")) + { + // UrlEncode here to transform ../ into an escaped version, which avoids blocking on nginx + image.Attributes.Add(key, $"{apiBase}" + Uri.EscapeDataString(imageFile)); + } + else + { + image.Attributes.Add(key, imageFile); + } // Add a custom class that the reader uses to ensure images stay within reader parent.AddClass("kavita-scale-width-container"); @@ -350,11 +399,14 @@ public class BookService : IBookService { // Check if any classes on the html node (some r2l books do this) and move them to body tag for scoping var htmlNode = doc.DocumentNode.SelectSingleNode("//html"); - if (htmlNode == null || !htmlNode.Attributes.Contains("class")) return body.InnerHtml; + if (htmlNode == null) return body.InnerHtml; var bodyClasses = body.Attributes.Contains("class") ? body.Attributes["class"].Value : string.Empty; - var classes = htmlNode.Attributes["class"].Value + " " + bodyClasses; - body.Attributes.Add("class", $"{classes}"); + var htmlClasses = htmlNode.Attributes.Contains("class") ? htmlNode.Attributes["class"].Value : string.Empty; + + body.Attributes.Add("class", $"{htmlClasses} {bodyClasses}"); + + // I actually need the body tag itself for the classes, so i will create a div and put the body stuff there. return $"
{body.InnerHtml}
"; } @@ -425,13 +477,14 @@ public class BookService : IBookService } } - public ComicInfo? GetComicInfo(string filePath) + private ComicInfo? GetEpubComicInfo(string filePath) { - if (!IsValidFile(filePath) || Parser.IsPdf(filePath)) return null; + EpubBookRef? epubBook = null; try { - using var epubBook = EpubReader.OpenBook(filePath, BookReaderOptions); + epubBook = OpenEpubWithFallback(filePath, epubBook); + var publicationDate = epubBook.Schema.Package.Metadata.Dates.Find(pDate => pDate.Event == "publication")?.Date; @@ -439,10 +492,11 @@ public class BookService : IBookService { publicationDate = epubBook.Schema.Package.Metadata.Dates.FirstOrDefault()?.Date; } + var (year, month, day) = GetPublicationDate(publicationDate); var summary = epubBook.Schema.Package.Metadata.Descriptions.FirstOrDefault(); - var info = new ComicInfo + var info = new ComicInfo { Summary = string.IsNullOrEmpty(summary?.Description) ? string.Empty : summary.Description, Publisher = string.Join(",", epubBook.Schema.Package.Metadata.Publishers.Select(p => p.Publisher)), @@ -450,7 +504,8 @@ public class BookService : IBookService Day = day, Year = year, Title = epubBook.Title, - Genre = string.Join(",", epubBook.Schema.Package.Metadata.Subjects.Select(s => s.Subject.ToLower().Trim())), + Genre = string.Join(",", + epubBook.Schema.Package.Metadata.Subjects.Select(s => s.Subject.ToLower().Trim())), LanguageISO = ValidateLanguage(epubBook.Schema.Package.Metadata.Languages .Select(l => l.Language) .FirstOrDefault()) @@ -461,7 +516,8 @@ public class BookService : IBookService foreach (var identifier in epubBook.Schema.Package.Metadata.Identifiers) { if (string.IsNullOrEmpty(identifier.Identifier)) continue; - if (!string.IsNullOrEmpty(identifier.Scheme) && identifier.Scheme.Equals("ISBN", StringComparison.InvariantCultureIgnoreCase)) + if (!string.IsNullOrEmpty(identifier.Scheme) && + identifier.Scheme.Equals("ISBN", StringComparison.InvariantCultureIgnoreCase)) { var isbn = identifier.Identifier.Replace("urn:isbn:", string.Empty).Replace("isbn:", string.Empty); if (!ArticleNumberHelper.IsValidIsbn10(isbn) && !ArticleNumberHelper.IsValidIsbn13(isbn)) @@ -469,11 +525,13 @@ public class BookService : IBookService _logger.LogDebug("[BookService] {File} has invalid ISBN number", filePath); continue; } + info.Isbn = isbn; } - if ((!string.IsNullOrEmpty(identifier.Scheme) && identifier.Scheme.Equals("URL", StringComparison.InvariantCultureIgnoreCase)) || - identifier.Identifier.StartsWith("url:")) + if ((!string.IsNullOrEmpty(identifier.Scheme) && + identifier.Scheme.Equals("URL", StringComparison.InvariantCultureIgnoreCase)) || + identifier.Identifier.StartsWith("url:")) { var url = identifier.Identifier.Replace("url:", string.Empty); weblinks.Add(url.Trim()); @@ -503,6 +561,7 @@ public class BookService : IBookService { info.SeriesSort = metadataItem.Content; } + break; case "calibre:series_index": info.Volume = metadataItem.Content; @@ -522,6 +581,7 @@ public class BookService : IBookService { info.SeriesSort = metadataItem.Content; } + break; case "collection-type": // These look to be genres from https://manual.calibre-ebook.com/sub_groups.html or can be "series" @@ -552,7 +612,8 @@ public class BookService : IBookService } // If this is a single book and not a collection, set publication status to Completed - if (string.IsNullOrEmpty(info.Volume) && Parser.ParseVolume(filePath, LibraryType.Manga).Equals(Parser.LooseLeafVolume)) + if (string.IsNullOrEmpty(info.Volume) && + Parser.ParseVolume(filePath, LibraryType.Manga).Equals(Parser.LooseLeafVolume)) { info.Count = 1; } @@ -564,7 +625,8 @@ public class BookService : IBookService var hasVolumeInSeries = !Parser.ParseVolume(info.Title, LibraryType.Manga) .Equals(Parser.LooseLeafVolume); - if (string.IsNullOrEmpty(info.Volume) && hasVolumeInSeries && (!info.Series.Equals(info.Title) || string.IsNullOrEmpty(info.Series))) + if (string.IsNullOrEmpty(info.Volume) && hasVolumeInSeries && + (!info.Series.Equals(info.Title) || string.IsNullOrEmpty(info.Series))) { // This is likely a light novel for which we can set series from parsed title info.Series = Parser.ParseSeries(info.Title, LibraryType.Manga); @@ -575,14 +637,54 @@ public class BookService : IBookService } catch (Exception ex) { - _logger.LogWarning(ex, "[GetComicInfo] There was an exception parsing metadata"); + _logger.LogWarning(ex, "[GetComicInfo] There was an exception parsing metadata: {FilePath}", filePath); _mediaErrorService.ReportMediaIssue(filePath, MediaErrorProducer.BookService, "There was an exception parsing metadata", ex); } + finally + { + epubBook?.Dispose(); + } return null; } + private EpubBookRef? OpenEpubWithFallback(string filePath, EpubBookRef? epubBook) + { + try + { + epubBook = EpubReader.OpenBook(filePath, BookReaderOptions); + } + catch (Exception ex) + { + _logger.LogWarning(ex, + "[GetComicInfo] There was an exception parsing metadata, falling back to a more lenient parsing method: {FilePath}", + filePath); + _mediaErrorService.ReportMediaIssue(filePath, MediaErrorProducer.BookService, + "There was an exception parsing metadata", ex); + } + finally + { + epubBook ??= EpubReader.OpenBook(filePath, LenientBookReaderOptions); + } + + return epubBook; + } + + public ComicInfo? GetComicInfo(string filePath) + { + if (!IsValidFile(filePath)) return null; + + if (Parser.IsPdf(filePath)) + { + return _pdfComicInfoExtractor.GetComicInfo(filePath); + } + else + { + return GetEpubComicInfo(filePath); + } + } + private static void ExtractSortTitle(EpubMetadataMeta metadataItem, EpubBookRef epubBook, ComicInfo info) { var titleId = metadataItem.Refines?.Replace("#", string.Empty); @@ -670,7 +772,7 @@ public class BookService : IBookService var month = 0; var day = 0; if (string.IsNullOrEmpty(publicationDate)) return (year, month, day); - switch (DateTime.TryParse(publicationDate, out var date)) + switch (DateTime.TryParse(publicationDate, CultureInfo.InvariantCulture, out var date)) { case true: year = date.Year; @@ -685,7 +787,7 @@ public class BookService : IBookService return (year, month, day); } - private static string ValidateLanguage(string? language) + public static string ValidateLanguage(string? language) { if (string.IsNullOrEmpty(language)) return string.Empty; @@ -725,7 +827,7 @@ public class BookService : IBookService return docReader.GetPageCount(); } - using var epubBook = EpubReader.OpenBook(filePath, BookReaderOptions); + using var epubBook = EpubReader.OpenBook(filePath, LenientBookReaderOptions); return epubBook.GetReadingOrder().Count; } catch (Exception ex) @@ -783,7 +885,7 @@ public class BookService : IBookService try { - using var epubBook = EpubReader.OpenBook(filePath, BookReaderOptions); + using var epubBook = EpubReader.OpenBook(filePath, LenientBookReaderOptions); // // @@ -987,7 +1089,7 @@ public class BookService : IBookService /// public async Task> GenerateTableOfContents(Chapter chapter) { - using var book = await EpubReader.OpenBookAsync(chapter.Files.ElementAt(0).FilePath, BookReaderOptions); + using var book = await EpubReader.OpenBookAsync(chapter.Files.ElementAt(0).FilePath, LenientBookReaderOptions); var mappings = await CreateKeyToPageMappingAsync(book); var navItems = await book.GetNavigationAsync(); @@ -1115,7 +1217,7 @@ public class BookService : IBookService /// All exceptions throw this public async Task GetBookPage(int page, int chapterId, string cachedEpubPath, string baseUrl) { - using var book = await EpubReader.OpenBookAsync(cachedEpubPath, BookReaderOptions); + using var book = await EpubReader.OpenBookAsync(cachedEpubPath, LenientBookReaderOptions); var mappings = await CreateKeyToPageMappingAsync(book); var apiBase = baseUrl + "book/" + chapterId + "/" + BookApiUrl; @@ -1217,7 +1319,7 @@ public class BookService : IBookService return GetPdfCoverImage(fileFilePath, fileName, outputDirectory, encodeFormat, size); } - using var epubBook = EpubReader.OpenBook(fileFilePath, BookReaderOptions); + using var epubBook = EpubReader.OpenBook(fileFilePath, LenientBookReaderOptions); try { diff --git a/API/Services/CacheService.cs b/API/Services/CacheService.cs index 9a8ef64ce..283d4b1ac 100644 --- a/API/Services/CacheService.cs +++ b/API/Services/CacheService.cs @@ -80,7 +80,6 @@ public class CacheService : ICacheService /// public IEnumerable GetCachedFileDimensions(string cachePath) { - var sw = Stopwatch.StartNew(); var files = _directoryService.GetFilesWithExtension(cachePath, Tasks.Scanner.Parser.Parser.ImageFileExtensions) .OrderByNatural(Path.GetFileNameWithoutExtension) .ToArray(); @@ -173,7 +172,30 @@ public class CacheService : ICacheService await extractLock.WaitAsync(); try { - if(_directoryService.Exists(extractPath)) return chapter; + if (_directoryService.Exists(extractPath)) + { + if (extractPdfToImages) + { + var pdfImages = _directoryService.GetFiles(extractPath, + Tasks.Scanner.Parser.Parser.ImageFileExtensions); + if (pdfImages.Any()) + { + return chapter; + } + } + else + { + // Do an explicit check for files since rarely a "permission denied" error on deleting + // the file can occur, thus leaving an empty folder and we would never re-cache the files. + if (_directoryService.GetFiles(extractPath).Any()) + { + return chapter; + } + + // Delete the extractPath as ExtractArchive will return if the directory already exists + _directoryService.ClearAndDeleteDirectory(extractPath); + } + } var files = chapter?.Files.ToList(); ExtractChapterFiles(extractPath, files, extractPdfToImages); @@ -194,13 +216,13 @@ public class CacheService : ICacheService /// public void ExtractChapterFiles(string extractPath, IReadOnlyList? files, bool extractPdfImages = false) { - if (files == null) return; + if (files == null || files.Count == 0) return; var removeNonImages = true; var fileCount = files.Count; var extraPath = string.Empty; var extractDi = _directoryService.FileSystem.DirectoryInfo.New(extractPath); - if (files.Count > 0 && files[0].Format == MangaFormat.Image) + if (files[0].Format == MangaFormat.Image) { // Check if all the files are Images. If so, do a directory copy, else do the normal copy if (files.All(f => f.Format == MangaFormat.Image)) diff --git a/API/Services/CollectionTagService.cs b/API/Services/CollectionTagService.cs index 645cffcfa..a73c0cea2 100644 --- a/API/Services/CollectionTagService.cs +++ b/API/Services/CollectionTagService.cs @@ -58,7 +58,7 @@ public class CollectionTagService : ICollectionTagService if (!title.Equals(existingTag.Title) && await _unitOfWork.CollectionTagRepository.CollectionExists(dto.Title, userId)) throw new KavitaException("collection-tag-duplicate"); - existingTag.Items ??= new List(); + existingTag.Items ??= []; if (existingTag.Source == ScrobbleProvider.Kavita) { existingTag.Title = title; @@ -74,7 +74,7 @@ public class CollectionTagService : ICollectionTagService _unitOfWork.CollectionTagRepository.Update(existingTag); // Check if Tag has updated (Summary) - var summary = dto.Summary.Trim(); + var summary = (dto.Summary ?? string.Empty).Trim(); if (existingTag.Summary == null || !existingTag.Summary.Equals(summary)) { existingTag.Summary = summary; @@ -105,7 +105,7 @@ public class CollectionTagService : ICollectionTagService { if (tag == null) return false; - tag.Items ??= new List(); + tag.Items ??= []; tag.Items = tag.Items.Where(s => !seriesIds.Contains(s.Id)).ToList(); if (tag.Items.Count == 0) diff --git a/API/Services/DirectoryService.cs b/API/Services/DirectoryService.cs index 338ea0537..7e308d92e 100644 --- a/API/Services/DirectoryService.cs +++ b/API/Services/DirectoryService.cs @@ -31,10 +31,18 @@ public interface IDirectoryService string TemplateDirectory { get; } string PublisherDirectory { get; } /// + /// Used for caching documents that may need to stay on disk for more than a day + /// + string LongTermCacheDirectory { get; } + /// /// Original BookmarkDirectory. Only used for resetting directory. Use for actual path. /// string BookmarkDirectory { get; } /// + /// Used for random files needed, like images to check against, list of countries, etc + /// + string AssetsDirectory { get; } + /// /// Lists out top-level folders for a given directory. Filters out System and Hidden folders. /// /// Absolute path of directory to scan. @@ -61,6 +69,7 @@ public interface IDirectoryService IEnumerable GetFiles(string path, string fileNameRegex = "", SearchOption searchOption = SearchOption.TopDirectoryOnly); bool ExistOrCreate(string directoryPath); void DeleteFiles(IEnumerable files); + void CopyFile(string sourcePath, string destinationPath, bool overwrite = true); void RemoveNonImages(string directoryName); void Flatten(string directoryName); Task CheckWriteAccess(string directoryName); @@ -83,12 +92,14 @@ public class DirectoryService : IDirectoryService public string TempDirectory { get; } public string ConfigDirectory { get; } public string BookmarkDirectory { get; } + public string AssetsDirectory { get; } public string SiteThemeDirectory { get; } public string FaviconDirectory { get; } public string LocalizationDirectory { get; } public string CustomizedTemplateDirectory { get; } public string TemplateDirectory { get; } public string PublisherDirectory { get; } + public string LongTermCacheDirectory { get; } private readonly ILogger _logger; private const RegexOptions MatchOptions = RegexOptions.Compiled | RegexOptions.IgnoreCase; @@ -115,6 +126,8 @@ public class DirectoryService : IDirectoryService ExistOrCreate(TempDirectory); BookmarkDirectory = FileSystem.Path.Join(FileSystem.Directory.GetCurrentDirectory(), "config", "bookmarks"); ExistOrCreate(BookmarkDirectory); + AssetsDirectory = FileSystem.Path.Join(FileSystem.Directory.GetCurrentDirectory(), "Assets"); + ExistOrCreate(AssetsDirectory); SiteThemeDirectory = FileSystem.Path.Join(FileSystem.Directory.GetCurrentDirectory(), "config", "themes"); ExistOrCreate(SiteThemeDirectory); FaviconDirectory = FileSystem.Path.Join(FileSystem.Directory.GetCurrentDirectory(), "config", "favicons"); @@ -126,6 +139,8 @@ public class DirectoryService : IDirectoryService ExistOrCreate(TemplateDirectory); PublisherDirectory = FileSystem.Path.Join(FileSystem.Directory.GetCurrentDirectory(), "config", "images", "publishers"); ExistOrCreate(PublisherDirectory); + LongTermCacheDirectory = FileSystem.Path.Join(FileSystem.Directory.GetCurrentDirectory(), "config", "cache-long"); + ExistOrCreate(LongTermCacheDirectory); } /// @@ -923,6 +938,27 @@ public class DirectoryService : IDirectoryService } } + public void CopyFile(string sourcePath, string destinationPath, bool overwrite = true) + { + if (!File.Exists(sourcePath)) + { + throw new FileNotFoundException("Source file not found", sourcePath); + } + + var destinationDirectory = Path.GetDirectoryName(destinationPath); + if (string.IsNullOrEmpty(destinationDirectory)) + { + throw new ArgumentException("Destination path does not contain a directory", nameof(destinationPath)); + } + + if (!Directory.Exists(destinationDirectory)) + { + FileSystem.Directory.CreateDirectory(destinationDirectory); + } + + FileSystem.File.Copy(sourcePath, destinationPath, overwrite); + } + /// /// Returns the human-readable file size for an arbitrary, 64-bit file size /// The default format is "0.## XB", e.g. "4.2 KB" or "1.43 GB" @@ -1076,4 +1112,23 @@ public class DirectoryService : IDirectoryService FlattenDirectory(root, subDirectory, ref directoryIndex); } } + + /// + /// If the file is locked or not existing + /// + /// + /// + public static bool IsFileLocked(string filePath) + { + try + { + if (!File.Exists(filePath)) return false; + using var stream = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.None); + return false; // If this works, the file is not locked + } + catch (IOException) + { + return true; // File is locked by another process + } + } } diff --git a/API/Services/EmailService.cs b/API/Services/EmailService.cs index 0a8ba6404..35cfa7b04 100644 --- a/API/Services/EmailService.cs +++ b/API/Services/EmailService.cs @@ -4,16 +4,22 @@ using System.ComponentModel.DataAnnotations; using System.IO; using System.Linq; using System.Net; +using System.Text; using System.Threading.Tasks; using System.Web; using API.Data; using API.DTOs.Email; +using API.Entities; +using API.Services.Plus; using Kavita.Common; +using Kavita.Common.EnvironmentInfo; +using Kavita.Common.Extensions; using MailKit.Security; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using MimeKit; +using MimeTypes; namespace API.Services; #nullable enable @@ -29,6 +35,8 @@ internal class EmailOptionsDto /// Filenames to attach /// public IList? Attachments { get; set; } + public int? ToUserId { get; set; } + public required string Template { get; set; } } public interface IEmailService @@ -43,6 +51,10 @@ public interface IEmailService Task GenerateEmailLink(HttpRequest request, string token, string routePart, string email, bool withHost = true); + + Task SendTokenExpiredEmail(int userId, ScrobbleProvider provider); + Task SendTokenExpiringSoonEmail(int userId, ScrobbleProvider provider); + Task SendKavitaPlusDebug(); } public class EmailService : IEmailService @@ -56,6 +68,15 @@ public class EmailService : IEmailService private const string TemplatePath = @"{0}.html"; private const string LocalHost = "localhost:4200"; + public const string SendToDeviceTemplate = "SendToDevice"; + public const string EmailTestTemplate = "EmailTest"; + public const string EmailChangeTemplate = "EmailChange"; + public const string TokenExpirationTemplate = "TokenExpiration"; + public const string TokenExpiringSoonTemplate = "TokenExpiringSoon"; + public const string EmailConfirmTemplate = "EmailConfirm"; + public const string EmailPasswordResetTemplate = "EmailPasswordReset"; + public const string KavitaPlusDebugTemplate = "KavitaPlusDebug"; + public EmailService(ILogger logger, IUnitOfWork unitOfWork, IDirectoryService directoryService, IHostEnvironment environment, ILocalizationService localizationService) { @@ -104,12 +125,13 @@ public class EmailService : IEmailService var emailOptions = new EmailOptionsDto() { Subject = "Kavita - Email Test", - Body = UpdatePlaceHolders(await GetEmailBody("EmailTest"), placeholders), + Template = EmailTestTemplate, + Body = UpdatePlaceHolders(await GetEmailBody(EmailTestTemplate), placeholders), Preheader = "Kavita - Email Test", ToEmails = new List() { adminEmail - } + }, }; await SendEmail(emailOptions); @@ -139,7 +161,8 @@ public class EmailService : IEmailService var emailOptions = new EmailOptionsDto() { Subject = UpdatePlaceHolders("Your email has been changed on {{InvitingUser}}'s Server", placeholders), - Body = UpdatePlaceHolders(await GetEmailBody("EmailChange"), placeholders), + Template = EmailChangeTemplate, + Body = UpdatePlaceHolders(await GetEmailBody(EmailChangeTemplate), placeholders), Preheader = UpdatePlaceHolders("Your email has been changed on {{InvitingUser}}'s Server", placeholders), ToEmails = new List() { @@ -155,9 +178,9 @@ public class EmailService : IEmailService /// /// /// - public bool IsValidEmail(string email) + public bool IsValidEmail(string? email) { - return new EmailAddressAttribute().IsValid(email); + return !string.IsNullOrEmpty(email) && new EmailAddressAttribute().IsValid(email); } public async Task GenerateEmailLink(HttpRequest request, string token, string routePart, string email, bool withHost = true) @@ -180,6 +203,100 @@ public class EmailService : IEmailService .Replace("//", "/"); } + public async Task SendTokenExpiredEmail(int userId, ScrobbleProvider provider) + { + var user = await _unitOfWork.UserRepository.GetUserByIdAsync(userId); + var settings = await _unitOfWork.SettingsRepository.GetSettingsDtoAsync(); + if (user == null || !IsValidEmail(user.Email) || !settings.IsEmailSetup()) return false; + + var placeholders = new List> + { + new ("{{UserName}}", user.UserName!), + new ("{{Provider}}", provider.ToDescription()), + new ("{{Link}}", $"{settings.HostName}/settings#account" ), + }; + + var emailOptions = new EmailOptionsDto() + { + Subject = UpdatePlaceHolders("Kavita - Your {{Provider}} token has expired and scrobbling events have stopped", placeholders), + Template = TokenExpirationTemplate, + Body = UpdatePlaceHolders(await GetEmailBody(TokenExpirationTemplate), placeholders), + Preheader = UpdatePlaceHolders("Kavita - Your {{Provider}} token has expired and scrobbling events have stopped", placeholders), + ToEmails = new List() + { + user.Email + } + }; + + await SendEmail(emailOptions); + + return true; + } + + public async Task SendTokenExpiringSoonEmail(int userId, ScrobbleProvider provider) + { + var user = await _unitOfWork.UserRepository.GetUserByIdAsync(userId); + var settings = await _unitOfWork.SettingsRepository.GetSettingsDtoAsync(); + if (user == null || !IsValidEmail(user.Email) || !settings.IsEmailSetup()) return false; + + var placeholders = new List> + { + new ("{{UserName}}", user.UserName!), + new ("{{Provider}}", provider.ToDescription()), + new ("{{Link}}", $"{settings.HostName}/settings#account" ), + }; + + var emailOptions = new EmailOptionsDto() + { + Subject = UpdatePlaceHolders("Kavita - Your {{Provider}} token will expire soon!", placeholders), + Template = TokenExpiringSoonTemplate, + Body = UpdatePlaceHolders(await GetEmailBody(TokenExpiringSoonTemplate), placeholders), + Preheader = UpdatePlaceHolders("Kavita - Your {{Provider}} token will expire soon!", placeholders), + ToEmails = new List() + { + user.Email + } + }; + + await SendEmail(emailOptions); + + return true; + } + + /// + /// Sends information about Kavita install for Kavita+ registration + /// + /// Users in China can have issues subscribing, this flow will allow me to register their instance on their behalf + /// + public async Task SendKavitaPlusDebug() + { + var settings = await _unitOfWork.SettingsRepository.GetSettingsDtoAsync(); + if (!settings.IsEmailSetup()) return false; + + var placeholders = new List> + { + new ("{{InstallId}}", HashUtil.ServerToken()), + new ("{{Build}}", BuildInfo.Version.ToString()), + }; + + var emailOptions = new EmailOptionsDto() + { + Subject = UpdatePlaceHolders("Kavita+: A User needs manual registration", placeholders), + Template = KavitaPlusDebugTemplate, + Body = UpdatePlaceHolders(await GetEmailBody(KavitaPlusDebugTemplate), placeholders), + Preheader = UpdatePlaceHolders("Kavita+: A User needs manual registration", placeholders), + ToEmails = + [ + // My kavita email + Encoding.UTF8.GetString(Convert.FromBase64String("a2F2aXRhcmVhZGVyQGdtYWlsLmNvbQ==")) + ] + }; + + await SendEmail(emailOptions); + + return true; + } + /// /// Sends an invite email to a user to setup their account /// @@ -195,7 +312,8 @@ public class EmailService : IEmailService var emailOptions = new EmailOptionsDto() { Subject = UpdatePlaceHolders("You've been invited to join {{InvitingUser}}'s Server", placeholders), - Body = UpdatePlaceHolders(await GetEmailBody("EmailConfirm"), placeholders), + Template = EmailConfirmTemplate, + Body = UpdatePlaceHolders(await GetEmailBody(EmailConfirmTemplate), placeholders), Preheader = UpdatePlaceHolders("You've been invited to join {{InvitingUser}}'s Server", placeholders), ToEmails = new List() { @@ -221,12 +339,13 @@ public class EmailService : IEmailService var emailOptions = new EmailOptionsDto() { Subject = UpdatePlaceHolders("A password reset has been requested", placeholders), - Body = UpdatePlaceHolders(await GetEmailBody("EmailPasswordReset"), placeholders), - Preheader = "A password reset has been requested", - ToEmails = new List() - { + Template = EmailPasswordResetTemplate, + Body = UpdatePlaceHolders(await GetEmailBody(EmailPasswordResetTemplate), placeholders), + Preheader = "Email confirmation is required for continued access. Click the button to confirm your email.", + ToEmails = + [ dto.EmailAddress - } + ] }; await SendEmail(emailOptions); @@ -242,11 +361,9 @@ public class EmailService : IEmailService { Subject = "Send file from Kavita", Preheader = "File(s) sent from Kavita", - ToEmails = new List() - { - data.DestinationEmail - }, - Body = await GetEmailBody("SendToDevice"), + ToEmails = [data.DestinationEmail], + Template = SendToDeviceTemplate, + Body = await GetEmailBody(SendToDeviceTemplate), Attachments = data.FilePaths.ToList() }; @@ -277,9 +394,21 @@ public class EmailService : IEmailService if (userEmailOptions.Attachments != null) { - foreach (var attachment in userEmailOptions.Attachments) + foreach (var attachmentPath in userEmailOptions.Attachments) { - await body.Attachments.AddAsync(attachment); + var mimeType = MimeTypeMap.GetMimeType(attachmentPath) ?? "application/octet-stream"; + var mediaType = mimeType.Split('/')[0]; + var mediaSubtype = mimeType.Split('/')[1]; + + var attachment = new MimePart(mediaType, mediaSubtype) + { + Content = new MimeContent(File.OpenRead(attachmentPath)), + ContentDisposition = new ContentDisposition(ContentDisposition.Attachment), + ContentTransferEncoding = ContentEncoding.Base64, + FileName = Path.GetFileName(attachmentPath) + }; + + body.Attachments.Add(attachment); } } @@ -302,21 +431,66 @@ public class EmailService : IEmailService ServicePointManager.SecurityProtocol = SecurityProtocolType.SystemDefault; + var emailAddress = userEmailOptions.ToEmails[0]; + AppUser? user; + if (userEmailOptions.Template == SendToDeviceTemplate) + { + user = await _unitOfWork.UserRepository.GetUserByDeviceEmail(emailAddress); + } + else + { + user = await _unitOfWork.UserRepository.GetUserByEmailAsync(emailAddress); + } + + try { await smtpClient.SendAsync(email); + if (user != null) + { + await LogEmailHistory(user.Id, userEmailOptions.Template, userEmailOptions.Subject, userEmailOptions.Body, "Sent"); + } } catch (Exception ex) { _logger.LogError(ex, "There was an issue sending the email"); + + if (user != null) + { + await LogEmailHistory(user.Id, userEmailOptions.Template, userEmailOptions.Subject, userEmailOptions.Body, "Failed", ex.Message); + } + _logger.LogError("Could not find user on file for email, {Template} email was not sent and not recorded into history table", userEmailOptions.Template); + throw; } finally { await smtpClient.DisconnectAsync(true); + } } + /// + /// Logs email history for the specified user. + /// + private async Task LogEmailHistory(int appUserId, string emailTemplate, string subject, string body, string deliveryStatus, string? errorMessage = null) + { + var emailHistory = new EmailHistory + { + AppUserId = appUserId, + EmailTemplate = emailTemplate, + Sent = deliveryStatus == "Sent", + Body = body, + Subject = subject, + SendDate = DateTime.UtcNow, + DeliveryStatus = deliveryStatus, + ErrorMessage = errorMessage + }; + + _unitOfWork.DataContext.EmailHistory.Add(emailHistory); + await _unitOfWork.CommitAsync(); + } + private async Task GetTemplatePath(string templateName) { if ((await _unitOfWork.SettingsRepository.GetSettingsDtoAsync()).SmtpConfig.CustomizedTemplates) diff --git a/API/Services/FileService.cs b/API/Services/FileService.cs index 37222655a..2cb34c601 100644 --- a/API/Services/FileService.cs +++ b/API/Services/FileService.cs @@ -70,7 +70,6 @@ public class FileService : IFileService // Compute SHA hash var checksum = SHA256.HashData(Encoding.UTF8.GetBytes(content)); - return BitConverter.ToString(checksum).Replace("-", string.Empty).Equals(sha); - + return Convert.ToHexString(checksum).Equals(sha); } } diff --git a/API/Services/ImageService.cs b/API/Services/ImageService.cs index c1c3ea71f..544efa4ce 100644 --- a/API/Services/ImageService.cs +++ b/API/Services/ImageService.cs @@ -1,21 +1,13 @@ using System; using System.Collections.Generic; -using System.Drawing; using System.IO; using System.Linq; using System.Numerics; using System.Threading.Tasks; -using API.Constants; using API.DTOs; -using API.Entities; using API.Entities.Enums; using API.Entities.Interfaces; using API.Extensions; -using EasyCaching.Core; -using Flurl; -using Flurl.Http; -using HtmlAgilityPack; -using Kavita.Common; using Microsoft.Extensions.Logging; using NetVips; using SixLabors.ImageSharp.PixelFormats; @@ -58,6 +50,7 @@ public interface IImageService /// /// string WriteCoverThumbnail(string sourceFile, string fileName, string outputDirectory, EncodeFormat encodeFormat, CoverImageSize size = CoverImageSize.Default); + /// /// Converts the passed image to encoding and outputs it in the same directory /// @@ -601,6 +594,7 @@ public class ImageService : IImageService return string.Empty; } + /// /// Returns the name format for a chapter cover image /// @@ -753,7 +747,8 @@ public class ImageService : IImageService entity.SecondaryColor = colors.Secondary; } - public static Color HexToRgb(string? hex) + + public static (int R, int G, int B) HexToRgb(string? hex) { if (string.IsNullOrEmpty(hex)) throw new ArgumentException("Hex cannot be null"); @@ -777,7 +772,7 @@ public class ImageService : IImageService var g = Convert.ToInt32(hex.Substring(2, 2), 16); var b = Convert.ToInt32(hex.Substring(4, 2), 16); - return Color.FromArgb(r, g, b); + return (r, g, b); } diff --git a/API/Services/KoreaderService.cs b/API/Services/KoreaderService.cs new file mode 100644 index 000000000..a38e8c468 --- /dev/null +++ b/API/Services/KoreaderService.cs @@ -0,0 +1,91 @@ +using System.Threading.Tasks; +using API.Data; +using API.DTOs.Koreader; +using API.DTOs.Progress; +using API.Extensions; +using API.Helpers; +using API.Helpers.Builders; +using Kavita.Common; +using Microsoft.Extensions.Logging; + +namespace API.Services; + +#nullable enable + +public interface IKoreaderService +{ + Task SaveProgress(KoreaderBookDto koreaderBookDto, int userId); + Task GetProgress(string bookHash, int userId); +} + +public class KoreaderService : IKoreaderService +{ + private readonly IReaderService _readerService; + private readonly IUnitOfWork _unitOfWork; + private readonly ILocalizationService _localizationService; + private readonly ILogger _logger; + + public KoreaderService(IReaderService readerService, IUnitOfWork unitOfWork, ILocalizationService localizationService, ILogger logger) + { + _readerService = readerService; + _unitOfWork = unitOfWork; + _localizationService = localizationService; + _logger = logger; + } + + /// + /// Given a Koreader hash, locate the underlying file and generate/update a progress event. + /// + /// + /// + public async Task SaveProgress(KoreaderBookDto koreaderBookDto, int userId) + { + _logger.LogDebug("Saving Koreader progress for User ({UserId}): {KoreaderProgress}", userId, koreaderBookDto.Progress.Sanitize()); + var file = await _unitOfWork.MangaFileRepository.GetByKoreaderHash(koreaderBookDto.Document); + if (file == null) throw new KavitaException(await _localizationService.Translate(userId, "file-missing")); + + var userProgressDto = await _unitOfWork.AppUserProgressRepository.GetUserProgressDtoAsync(file.ChapterId, userId); + if (userProgressDto == null) + { + var chapterDto = await _unitOfWork.ChapterRepository.GetChapterDtoAsync(file.ChapterId); + if (chapterDto == null) throw new KavitaException(await _localizationService.Translate(userId, "chapter-doesnt-exist")); + + var volumeDto = await _unitOfWork.VolumeRepository.GetVolumeByIdAsync(chapterDto.VolumeId); + if (volumeDto == null) throw new KavitaException(await _localizationService.Translate(userId, "volume-doesnt-exist")); + + userProgressDto = new ProgressDto() + { + ChapterId = file.ChapterId, + VolumeId = chapterDto.VolumeId, + SeriesId = volumeDto.SeriesId, + }; + } + // Update the bookScrollId if possible + KoreaderHelper.UpdateProgressDto(userProgressDto, koreaderBookDto.Progress); + + await _readerService.SaveReadingProgress(userProgressDto, userId); + } + + /// + /// Returns a Koreader Dto representing current book and the progress within + /// + /// + /// + /// + public async Task GetProgress(string bookHash, int userId) + { + var settingsDto = await _unitOfWork.SettingsRepository.GetSettingsDtoAsync(); + + var file = await _unitOfWork.MangaFileRepository.GetByKoreaderHash(bookHash); + + if (file == null) throw new KavitaException(await _localizationService.Translate(userId, "file-missing")); + + var progressDto = await _unitOfWork.AppUserProgressRepository.GetUserProgressDtoAsync(file.ChapterId, userId); + var koreaderProgress = KoreaderHelper.GetKoreaderPosition(progressDto); + + return new KoreaderBookDtoBuilder(bookHash).WithProgress(koreaderProgress) + .WithPercentage(progressDto?.PageNum, file.Pages) + .WithDeviceId(settingsDto.InstallId, userId) + .Build(); + } +} diff --git a/API/Services/LocalizationService.cs b/API/Services/LocalizationService.cs index ab3ad3d89..7db35bb8e 100644 --- a/API/Services/LocalizationService.cs +++ b/API/Services/LocalizationService.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text.Json; using System.Threading.Tasks; using API.Data; +using API.DTOs; using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Hosting; @@ -11,11 +12,13 @@ namespace API.Services; #nullable enable + + public interface ILocalizationService { Task Get(string locale, string key, params object[] args); Task Translate(int userId, string key, params object[] args); - IEnumerable GetLocales(); + IEnumerable GetLocales(); } public class LocalizationService : ILocalizationService @@ -134,14 +137,260 @@ public class LocalizationService : ILocalizationService /// Returns all available locales that exist on both the Frontend and the Backend /// /// - public IEnumerable GetLocales() + public IEnumerable GetLocales() { var uiLanguages = _directoryService - .GetFilesWithExtension(_directoryService.FileSystem.Path.GetFullPath(_localizationDirectoryUi), @"\.json") - .Select(f => _directoryService.FileSystem.Path.GetFileName(f).Replace(".json", string.Empty)); + .GetFilesWithExtension(_directoryService.FileSystem.Path.GetFullPath(_localizationDirectoryUi), @"\.json"); var backendLanguages = _directoryService - .GetFilesWithExtension(_directoryService.LocalizationDirectory, @"\.json") - .Select(f => _directoryService.FileSystem.Path.GetFileName(f).Replace(".json", string.Empty)); - return uiLanguages.Intersect(backendLanguages).Distinct(); + .GetFilesWithExtension(_directoryService.LocalizationDirectory, @"\.json"); + + var locales = new Dictionary(); + var localeCounts = new Dictionary>(); // fileName -> (nonEmptyValues, totalKeys) + + // First pass: collect all files and count non-empty strings + + // Process UI language files + foreach (var file in uiLanguages) + { + var fileName = _directoryService.FileSystem.Path.GetFileNameWithoutExtension(file); + var fileContent = _directoryService.FileSystem.File.ReadAllText(file); + var hash = ComputeHash(fileContent); + + var counts = CalculateNonEmptyStrings(fileContent); + + if (localeCounts.TryGetValue(fileName, out var existingCount)) + { + // Update existing counts + localeCounts[fileName] = Tuple.Create( + existingCount.Item1 + counts.Item1, + existingCount.Item2 + counts.Item2 + ); + } + else + { + // Add new counts + localeCounts[fileName] = counts; + } + + if (!locales.TryGetValue(fileName, out var locale)) + { + locales[fileName] = new KavitaLocale + { + FileName = fileName, + RenderName = GetDisplayName(fileName), + TranslationCompletion = 0, // Will be calculated later + IsRtL = IsRightToLeft(fileName), + Hash = hash + }; + } + else + { + // Update existing locale hash + locale.Hash = CombineHashes(locale.Hash, hash); + } + } + + // Process backend language files + foreach (var file in backendLanguages) + { + var fileName = _directoryService.FileSystem.Path.GetFileNameWithoutExtension(file); + var fileContent = _directoryService.FileSystem.File.ReadAllText(file); + var hash = ComputeHash(fileContent); + + var counts = CalculateNonEmptyStrings(fileContent); + + if (localeCounts.TryGetValue(fileName, out var existingCount)) + { + // Update existing counts + localeCounts[fileName] = Tuple.Create( + existingCount.Item1 + counts.Item1, + existingCount.Item2 + counts.Item2 + ); + } + else + { + // Add new counts + localeCounts[fileName] = counts; + } + + if (!locales.TryGetValue(fileName, out var locale)) + { + locales[fileName] = new KavitaLocale + { + FileName = fileName, + RenderName = GetDisplayName(fileName), + TranslationCompletion = 0, // Will be calculated later + IsRtL = IsRightToLeft(fileName), + Hash = hash + }; + } + else + { + // Update existing locale hash + locale.Hash = CombineHashes(locale.Hash, hash); + } + } + + // Second pass: calculate completion percentages based on English total + if (localeCounts.TryGetValue("en", out var englishCounts) && englishCounts.Item2 > 0) + { + var englishTotalKeys = englishCounts.Item2; + + foreach (var locale in locales.Values) + { + if (localeCounts.TryGetValue(locale.FileName, out var counts)) + { + // Calculate percentage based on English total keys + locale.TranslationCompletion = (float)counts.Item1 / englishTotalKeys * 100; + } + } + } + + return locales.Values; + } + + // Helper methods that would need to be implemented + private static string ComputeHash(string content) + { + // Implement a hashing algorithm (e.g., SHA256, MD5) to generate a hash for the content + using var md5 = System.Security.Cryptography.MD5.Create(); + var inputBytes = System.Text.Encoding.UTF8.GetBytes(content); + var hashBytes = md5.ComputeHash(inputBytes); + return Convert.ToBase64String(hashBytes); + } + + private static string CombineHashes(string hash1, string hash2) + { + // Combine two hashes, possibly by concatenating and rehashing + return ComputeHash(hash1 + hash2); + } + + private static string GetDisplayName(string fileName) + { + // Map the filename to a human-readable display name + // This could use a lookup table or follow a naming convention + try + { + var cultureInfo = new System.Globalization.CultureInfo(fileName.Replace('_', '-')); + return cultureInfo.NativeName; + } + catch + { + // Fall back to the file name if the culture isn't recognized + return fileName; + } + } + + private static bool IsRightToLeft(string fileName) + { + // Determine if the language is right-to-left + try + { + var cultureInfo = new System.Globalization.CultureInfo(fileName); + return cultureInfo.TextInfo.IsRightToLeft; + } + catch + { + return false; // Default to left-to-right + } + } + + private static float CalculateTranslationCompletion(string fileContent) + { + try + { + var jsonObject = System.Text.Json.JsonDocument.Parse(fileContent); + + int totalKeys = 0; + int nonEmptyValues = 0; + + // Count all keys and non-empty values + CountNonEmptyValues(jsonObject.RootElement, ref totalKeys, ref nonEmptyValues); + + return totalKeys > 0 ? (nonEmptyValues * 1f) / totalKeys * 100 : 0; + } + catch (Exception ex) + { + // Consider logging the exception + return 0; // Return 0% completion if there's an error parsing + } + } + private static Tuple CalculateNonEmptyStrings(string fileContent) + { + try + { + var jsonObject = JsonDocument.Parse(fileContent); + + var totalKeys = 0; + var nonEmptyValues = 0; + + // Count all keys and non-empty values + CountNonEmptyValues(jsonObject.RootElement, ref totalKeys, ref nonEmptyValues); + + return Tuple.Create(nonEmptyValues, totalKeys); + } + catch (Exception) + { + // Consider logging the exception + return Tuple.Create(0, 0); // Return 0% completion if there's an error parsing + } + } + + private static void CountNonEmptyValues(JsonElement element, ref int totalKeys, ref int nonEmptyValues) + { + if (element.ValueKind == JsonValueKind.Object) + { + foreach (var property in element.EnumerateObject()) + { + if (property.Value.ValueKind == System.Text.Json.JsonValueKind.String) + { + totalKeys++; + var value = property.Value.GetString(); + if (!string.IsNullOrWhiteSpace(value)) + { + nonEmptyValues++; + } + } + else + { + // Recursively process nested objects + CountNonEmptyValues(property.Value, ref totalKeys, ref nonEmptyValues); + } + } + } + else if (element.ValueKind == System.Text.Json.JsonValueKind.Array) + { + foreach (var item in element.EnumerateArray()) + { + CountNonEmptyValues(item, ref totalKeys, ref nonEmptyValues); + } + } + } + + private void CountEntries(System.Text.Json.JsonElement element, ref int total, ref int translated) + { + if (element.ValueKind == System.Text.Json.JsonValueKind.Object) + { + foreach (var property in element.EnumerateObject()) + { + CountEntries(property.Value, ref total, ref translated); + } + } + else if (element.ValueKind == System.Text.Json.JsonValueKind.Array) + { + foreach (var item in element.EnumerateArray()) + { + CountEntries(item, ref total, ref translated); + } + } + else if (element.ValueKind == System.Text.Json.JsonValueKind.String) + { + total++; + string value = element.GetString(); + if (!string.IsNullOrWhiteSpace(value)) + { + translated++; + } + } } } diff --git a/API/Services/MediaConversionService.cs b/API/Services/MediaConversionService.cs index 9f6b18374..fc3e5f318 100644 --- a/API/Services/MediaConversionService.cs +++ b/API/Services/MediaConversionService.cs @@ -222,6 +222,10 @@ public class MediaConversionService : IMediaConversionService { if (string.IsNullOrEmpty(series.CoverImage)) continue; series.CoverImage = series.GetCoverImage(); + if (series.CoverImage == null) + { + _logger.LogDebug("[SeriesCoverImageBug] Setting Series Cover Image to null: {SeriesId}", series.Id); + } _unitOfWork.SeriesRepository.Update(series); await _unitOfWork.CommitAsync(); } diff --git a/API/Services/MetadataService.cs b/API/Services/MetadataService.cs index 7a406fe48..e0e86f4dc 100644 --- a/API/Services/MetadataService.cs +++ b/API/Services/MetadataService.cs @@ -28,7 +28,7 @@ public interface IMetadataService [AutomaticRetry(Attempts = 3, OnAttemptsExceeded = AttemptsExceededAction.Delete)] Task GenerateCoversForLibrary(int libraryId, bool forceUpdate = false, bool forceColorScape = false); /// - /// Performs a forced refresh of cover images just for a series and it's nested entities + /// Performs a forced refresh of cover images just for a series, and it's nested entities /// /// /// @@ -75,12 +75,12 @@ public class MetadataService : IMetadataService /// Force updating cover image even if underlying file has not been modified or chapter already has a cover image /// Convert image to Encoding Format when extracting the cover /// Force colorscape gen - private Task UpdateChapterCoverImage(Chapter? chapter, bool forceUpdate, EncodeFormat encodeFormat, CoverImageSize coverImageSize, bool forceColorScape = false) + private bool UpdateChapterCoverImage(Chapter? chapter, bool forceUpdate, EncodeFormat encodeFormat, CoverImageSize coverImageSize, bool forceColorScape = false) { - if (chapter == null) return Task.FromResult(false); + if (chapter == null) return false; var firstFile = chapter.Files.MinBy(x => x.Chapter); - if (firstFile == null) return Task.FromResult(false); + if (firstFile == null) return false; if (!_cacheHelper.ShouldUpdateCoverImage( _directoryService.FileSystem.Path.Join(_directoryService.CoverImageDirectory, chapter.CoverImage), @@ -93,7 +93,7 @@ public class MetadataService : IMetadataService _updateEvents.Add(MessageFactory.CoverUpdateEvent(chapter.Id, MessageFactoryEntityTypes.Chapter)); } - return Task.FromResult(false); + return false; } @@ -107,7 +107,7 @@ public class MetadataService : IMetadataService _unitOfWork.ChapterRepository.Update(chapter); _updateEvents.Add(MessageFactory.CoverUpdateEvent(chapter.Id, MessageFactoryEntityTypes.Chapter)); - return Task.FromResult(true); + return true; } private void UpdateChapterLastModified(Chapter chapter, bool forceUpdate) @@ -135,10 +135,10 @@ public class MetadataService : IMetadataService /// /// Force updating cover image even if underlying file has not been modified or chapter already has a cover image /// Force updating colorscape - private Task UpdateVolumeCoverImage(Volume? volume, bool forceUpdate, bool forceColorScape = false) + private bool UpdateVolumeCoverImage(Volume? volume, bool forceUpdate, bool forceColorScape = false) { // We need to check if Volume coverImage matches first chapters if forceUpdate is false - if (volume == null) return Task.FromResult(false); + if (volume == null) return false; if (!_cacheHelper.ShouldUpdateCoverImage( _directoryService.FileSystem.Path.Join(_directoryService.CoverImageDirectory, volume.CoverImage), @@ -150,7 +150,7 @@ public class MetadataService : IMetadataService _unitOfWork.VolumeRepository.Update(volume); _updateEvents.Add(MessageFactory.CoverUpdateEvent(volume.Id, MessageFactoryEntityTypes.Volume)); } - return Task.FromResult(false); + return false; } if (!volume.CoverImageLocked) @@ -162,7 +162,7 @@ public class MetadataService : IMetadataService if (firstChapter == null) { firstChapter = volume.Chapters.MinBy(x => x.SortOrder, ChapterSortComparerDefaultFirst.Default); - if (firstChapter == null) return Task.FromResult(false); + if (firstChapter == null) return false; } volume.CoverImage = firstChapter.CoverImage; @@ -171,7 +171,7 @@ public class MetadataService : IMetadataService _updateEvents.Add(MessageFactory.CoverUpdateEvent(volume.Id, MessageFactoryEntityTypes.Volume)); - return Task.FromResult(true); + return true; } /// @@ -179,9 +179,9 @@ public class MetadataService : IMetadataService /// /// /// Force updating cover image even if underlying file has not been modified or chapter already has a cover image - private Task UpdateSeriesCoverImage(Series? series, bool forceUpdate, bool forceColorScape = false) + private void UpdateSeriesCoverImage(Series? series, bool forceUpdate, bool forceColorScape = false) { - if (series == null) return Task.CompletedTask; + if (series == null) return; if (!_cacheHelper.ShouldUpdateCoverImage( _directoryService.FileSystem.Path.Join(_directoryService.CoverImageDirectory, series.CoverImage), @@ -194,16 +194,19 @@ public class MetadataService : IMetadataService _updateEvents.Add(MessageFactory.CoverUpdateEvent(series.Id, MessageFactoryEntityTypes.Series)); } - return Task.CompletedTask; + return; } series.Volumes ??= []; series.CoverImage = series.GetCoverImage(); + if (series.CoverImage == null) + { + _logger.LogDebug("[SeriesCoverImageBug] Setting Series Cover Image to null: {SeriesId}", series.Id); + } _imageService.UpdateColorScape(series); _updateEvents.Add(MessageFactory.CoverUpdateEvent(series.Id, MessageFactoryEntityTypes.Series)); - return Task.CompletedTask; } @@ -213,7 +216,7 @@ public class MetadataService : IMetadataService /// /// /// - private async Task ProcessSeriesCoverGen(Series series, bool forceUpdate, EncodeFormat encodeFormat, CoverImageSize coverImageSize, bool forceColorScape = false) + private void ProcessSeriesCoverGen(Series series, bool forceUpdate, EncodeFormat encodeFormat, CoverImageSize coverImageSize, bool forceColorScape = false) { _logger.LogDebug("[MetadataService] Processing cover image generation for series: {SeriesName}", series.OriginalName); try @@ -226,8 +229,8 @@ public class MetadataService : IMetadataService var index = 0; foreach (var chapter in volume.Chapters) { - var chapterUpdated = await UpdateChapterCoverImage(chapter, forceUpdate, encodeFormat, coverImageSize, forceColorScape); - // If cover was update, either the file has changed or first scan and we should force a metadata update + var chapterUpdated = UpdateChapterCoverImage(chapter, forceUpdate, encodeFormat, coverImageSize, forceColorScape); + // If cover was update, either the file has changed or first scan, and we should force a metadata update UpdateChapterLastModified(chapter, forceUpdate || chapterUpdated); if (index == 0 && chapterUpdated) { @@ -237,7 +240,7 @@ public class MetadataService : IMetadataService index++; } - var volumeUpdated = await UpdateVolumeCoverImage(volume, firstChapterUpdated || forceUpdate, forceColorScape); + var volumeUpdated = UpdateVolumeCoverImage(volume, firstChapterUpdated || forceUpdate, forceColorScape); if (volumeIndex == 0 && volumeUpdated) { firstVolumeUpdated = true; @@ -245,7 +248,7 @@ public class MetadataService : IMetadataService volumeIndex++; } - await UpdateSeriesCoverImage(series, firstVolumeUpdated || forceUpdate, forceColorScape); + UpdateSeriesCoverImage(series, firstVolumeUpdated || forceUpdate, forceColorScape); } catch (Exception ex) { @@ -311,7 +314,7 @@ public class MetadataService : IMetadataService try { - await ProcessSeriesCoverGen(series, forceUpdate, encodeFormat, coverImageSize, forceColorScape); + ProcessSeriesCoverGen(series, forceUpdate, encodeFormat, coverImageSize, forceColorScape); } catch (Exception ex) { @@ -383,7 +386,7 @@ public class MetadataService : IMetadataService await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress, MessageFactory.CoverUpdateProgressEvent(series.LibraryId, 0F, ProgressEventType.Started, series.Name)); - await ProcessSeriesCoverGen(series, forceUpdate, encodeFormat, coverImageSize, forceColorScape); + ProcessSeriesCoverGen(series, forceUpdate, encodeFormat, coverImageSize, forceColorScape); if (_unitOfWork.HasChanges()) diff --git a/API/Services/PersonService.cs b/API/Services/PersonService.cs new file mode 100644 index 000000000..ff0049cbe --- /dev/null +++ b/API/Services/PersonService.cs @@ -0,0 +1,147 @@ +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using API.Data; +using API.Entities.Person; +using API.Extensions; +using API.Helpers.Builders; + +namespace API.Services; + +public interface IPersonService +{ + /// + /// Adds src as an alias to dst, this is a destructive operation + /// + /// Merged person + /// Remaining person + /// The entities passed as arguments **must** include all relations + /// + Task MergePeopleAsync(Person src, Person dst); + + /// + /// Adds the alias to the person, requires that the aliases are not shared with anyone else + /// + /// This method does NOT commit changes + /// + /// + /// + Task UpdatePersonAliasesAsync(Person person, IList aliases); +} + +public class PersonService(IUnitOfWork unitOfWork): IPersonService +{ + + public async Task MergePeopleAsync(Person src, Person dst) + { + if (dst.Id == src.Id) return; + + if (string.IsNullOrWhiteSpace(dst.Description) && !string.IsNullOrWhiteSpace(src.Description)) + { + dst.Description = src.Description; + } + + if (dst.MalId == 0 && src.MalId != 0) + { + dst.MalId = src.MalId; + } + + if (dst.AniListId == 0 && src.AniListId != 0) + { + dst.AniListId = src.AniListId; + } + + if (dst.HardcoverId == null && src.HardcoverId != null) + { + dst.HardcoverId = src.HardcoverId; + } + + if (dst.Asin == null && src.Asin != null) + { + dst.Asin = src.Asin; + } + + if (dst.CoverImage == null && src.CoverImage != null) + { + dst.CoverImage = src.CoverImage; + } + + MergeChapterPeople(dst, src); + MergeSeriesMetadataPeople(dst, src); + + dst.Aliases.Add(new PersonAliasBuilder(src.Name).Build()); + + foreach (var alias in src.Aliases) + { + dst.Aliases.Add(alias); + } + + unitOfWork.PersonRepository.Remove(src); + unitOfWork.PersonRepository.Update(dst); + await unitOfWork.CommitAsync(); + } + + private static void MergeChapterPeople(Person dst, Person src) + { + + foreach (var chapter in src.ChapterPeople) + { + var alreadyPresent = dst.ChapterPeople + .Any(x => x.ChapterId == chapter.ChapterId && x.Role == chapter.Role); + + if (alreadyPresent) continue; + + dst.ChapterPeople.Add(new ChapterPeople + { + Role = chapter.Role, + ChapterId = chapter.ChapterId, + Person = dst, + KavitaPlusConnection = chapter.KavitaPlusConnection, + OrderWeight = chapter.OrderWeight, + }); + } + } + + private static void MergeSeriesMetadataPeople(Person dst, Person src) + { + foreach (var series in src.SeriesMetadataPeople) + { + var alreadyPresent = dst.SeriesMetadataPeople + .Any(x => x.SeriesMetadataId == series.SeriesMetadataId && x.Role == series.Role); + + if (alreadyPresent) continue; + + dst.SeriesMetadataPeople.Add(new SeriesMetadataPeople + { + SeriesMetadataId = series.SeriesMetadataId, + Role = series.Role, + Person = dst, + KavitaPlusConnection = series.KavitaPlusConnection, + OrderWeight = series.OrderWeight, + }); + } + } + + public async Task UpdatePersonAliasesAsync(Person person, IList aliases) + { + var normalizedAliases = aliases + .Select(a => a.ToNormalized()) + .Where(a => !string.IsNullOrEmpty(a) && a != person.NormalizedName) + .ToList(); + + if (normalizedAliases.Count == 0) + { + person.Aliases = []; + return true; + } + + var others = await unitOfWork.PersonRepository.GetPeopleByNames(normalizedAliases); + others = others.Where(p => p.Id != person.Id).ToList(); + + if (others.Count != 0) return false; + + person.Aliases = aliases.Select(a => new PersonAliasBuilder(a).Build()).ToList(); + + return true; + } +} diff --git a/API/Services/Plus/ExternalMetadataService.cs b/API/Services/Plus/ExternalMetadataService.cs index 4bc55eb88..0777e1baa 100644 --- a/API/Services/Plus/ExternalMetadataService.cs +++ b/API/Services/Plus/ExternalMetadataService.cs @@ -1,58 +1,47 @@ using System; using System.Collections.Generic; -using System.Collections.Immutable; using System.Linq; +using System.Text.RegularExpressions; using System.Threading.Tasks; using API.Data; using API.Data.Repositories; using API.DTOs; using API.DTOs.Collection; +using API.DTOs.KavitaPlus.ExternalMetadata; +using API.DTOs.KavitaPlus.Metadata; +using API.DTOs.Metadata.Matching; +using API.DTOs.Person; using API.DTOs.Recommendation; using API.DTOs.Scrobbling; using API.DTOs.SeriesDetail; using API.Entities; using API.Entities.Enums; +using API.Entities.Interfaces; using API.Entities.Metadata; +using API.Entities.MetadataMatching; +using API.Entities.Person; using API.Extensions; using API.Helpers; +using API.Helpers.Builders; +using API.Services.Tasks.Metadata; +using API.Services.Tasks.Scanner.Parser; +using API.SignalR; using AutoMapper; using Flurl.Http; using Hangfire; using Kavita.Common; -using Kavita.Common.EnvironmentInfo; using Kavita.Common.Helpers; using Microsoft.Extensions.Logging; namespace API.Services.Plus; #nullable enable -/// -/// Used for matching and fetching metadata on a series -/// -internal class ExternalMetadataIdsDto -{ - public long? MalId { get; set; } - public int? AniListId { get; set; } - public string? SeriesName { get; set; } - public string? LocalizedSeriesName { get; set; } - public MediaFormat? PlusMediaFormat { get; set; } = MediaFormat.Unknown; -} - -internal class SeriesDetailPlusApiDto -{ - public IEnumerable Recommendations { get; set; } - public IEnumerable Reviews { get; set; } - public IEnumerable Ratings { get; set; } - public int? AniListId { get; set; } - public long? MalId { get; set; } -} public interface IExternalMetadataService { Task GetExternalSeriesDetail(int? aniListId, long? malId, int? seriesId); - Task GetSeriesDetailPlus(int seriesId, LibraryType libraryType); - Task ForceKavitaPlusRefresh(int seriesId); + Task GetSeriesDetailPlus(int seriesId, LibraryType libraryType); Task FetchExternalDataTask(); /// /// This is an entry point and provides a level of protection against calling upstream API. Will only allow 100 new @@ -60,10 +49,14 @@ public interface IExternalMetadataService /// /// /// - /// - Task GetNewSeriesData(int seriesId, LibraryType libraryType); + /// If the fetch was made + Task FetchSeriesMetadata(int seriesId, LibraryType libraryType); Task> GetStacksForUser(int userId); + Task> MatchSeries(MatchSeriesDto dto); + Task FixSeriesMatch(int seriesId, int? aniListId, long? malId, int? cbrId); + Task UpdateSeriesDontMatch(int seriesId, bool dontMatch); + Task WriteExternalMetadataToSeries(ExternalSeriesDetailDto externalMetadata, int seriesId); } public class ExternalMetadataService : IExternalMetadataService @@ -72,28 +65,38 @@ public class ExternalMetadataService : IExternalMetadataService private readonly ILogger _logger; private readonly IMapper _mapper; private readonly ILicenseService _licenseService; + private readonly IScrobblingService _scrobblingService; + private readonly IEventHub _eventHub; + private readonly ICoverDbService _coverDbService; + private readonly IKavitaPlusApiService _kavitaPlusApiService; private readonly TimeSpan _externalSeriesMetadataCache = TimeSpan.FromDays(30); - public static readonly ImmutableArray NonEligibleLibraryTypes = ImmutableArray.Create - (LibraryType.Comic, LibraryType.Book, LibraryType.Image, LibraryType.ComicVine); + public static readonly HashSet NonEligibleLibraryTypes = + [LibraryType.Comic, LibraryType.Book, LibraryType.Image]; private readonly SeriesDetailPlusDto _defaultReturn = new() { + Series = null, Recommendations = null, - Ratings = ArraySegment.Empty, - Reviews = ArraySegment.Empty + Ratings = [], + Reviews = [] }; // Allow 50 requests per 24 hours private static readonly RateLimiter RateLimiter = new RateLimiter(50, TimeSpan.FromHours(24), false); + private static bool IsRomanCharacters(string input) => Regex.IsMatch(input, @"^[\p{IsBasicLatin}\p{IsLatin-1Supplement}]+$"); - public ExternalMetadataService(IUnitOfWork unitOfWork, ILogger logger, IMapper mapper, ILicenseService licenseService) + public ExternalMetadataService(IUnitOfWork unitOfWork, ILogger logger, IMapper mapper, + ILicenseService licenseService, IScrobblingService scrobblingService, IEventHub eventHub, ICoverDbService coverDbService, + IKavitaPlusApiService kavitaPlusApiService) { _unitOfWork = unitOfWork; _logger = logger; _mapper = mapper; _licenseService = licenseService; + _scrobblingService = scrobblingService; + _eventHub = eventHub; + _coverDbService = coverDbService; + _kavitaPlusApiService = kavitaPlusApiService; - - FlurlHttp.ConfigureClient(Configuration.KavitaPlusApiUrl, cli => - cli.Settings.HttpClientFactory = new UntrustedCertClientFactory()); + FlurlConfiguration.ConfigureClientForUrl(Configuration.KavitaPlusApiUrl); } /// @@ -110,75 +113,58 @@ public class ExternalMetadataService : IExternalMetadataService /// This is a task that runs on a schedule and slowly fetches data from Kavita+ to keep /// data in the DB non-stale and fetched. /// - /// To avoid blasting Kavita+ API, this only processes a few records. The goal is to slowly build + /// To avoid blasting Kavita+ API, this only processes 25 records. The goal is to slowly build out/refresh the data /// [DisableConcurrentExecution(60 * 60 * 60)] [AutomaticRetry(Attempts = 3, OnAttemptsExceeded = AttemptsExceededAction.Delete)] public async Task FetchExternalDataTask() { // Find all Series that are eligible and limit - var ids = await _unitOfWork.ExternalSeriesMetadataRepository.GetAllSeriesIdsWithoutMetadata(25); + var ids = await _unitOfWork.ExternalSeriesMetadataRepository.GetSeriesThatNeedExternalMetadata(25); if (ids.Count == 0) return; + ids = await _unitOfWork.ExternalSeriesMetadataRepository.GetSeriesThatNeedExternalMetadata(25, true); - _logger.LogInformation("[Kavita+ Data Refresh] Started Refreshing {Count} series data from Kavita+", ids.Count); + _logger.LogInformation("[Kavita+ Data Refresh] Started Refreshing {Count} series data from Kavita+: {Ids}", ids.Count, string.Join(',', ids)); var count = 0; + var successfulMatches = new List(); var libTypes = await _unitOfWork.LibraryRepository.GetLibraryTypesBySeriesIdsAsync(ids); foreach (var seriesId in ids) { var libraryType = libTypes[seriesId]; - await GetNewSeriesData(seriesId, libraryType); - await Task.Delay(1500); - count++; + var success = await FetchSeriesMetadata(seriesId, libraryType); + if (success) + { + count++; + successfulMatches.Add(seriesId); + } + await Task.Delay(6000); // Currently AL is degraded and has 30 requests/min, give a little padding since this is a background request } - _logger.LogInformation("[Kavita+ Data Refresh] Finished Refreshing {Count} series data from Kavita+", count); + _logger.LogInformation("[Kavita+ Data Refresh] Finished Refreshing {Count} / {Total} series data from Kavita+: {Ids}", count, ids.Count, string.Join(',', successfulMatches)); } - /// - /// Removes from Blacklist and Invalidates the cache - /// - /// - /// - public async Task ForceKavitaPlusRefresh(int seriesId) - { - if (!await _licenseService.HasActiveLicense()) return; - var libraryType = await _unitOfWork.LibraryRepository.GetLibraryTypeBySeriesIdAsync(seriesId); - if (!IsPlusEligible(libraryType)) return; - - // Remove from Blacklist if applicable - await _unitOfWork.ExternalSeriesMetadataRepository.RemoveFromBlacklist(seriesId); - - var metadata = await _unitOfWork.ExternalSeriesMetadataRepository.GetExternalSeriesMetadata(seriesId); - if (metadata == null) return; - - metadata.ValidUntilUtc = DateTime.UtcNow.Subtract(_externalSeriesMetadataCache); - await _unitOfWork.CommitAsync(); - } /// /// Fetches data from Kavita+ /// /// /// - public async Task GetNewSeriesData(int seriesId, LibraryType libraryType) + /// If a successful match was made + public async Task FetchSeriesMetadata(int seriesId, LibraryType libraryType) { - if (!IsPlusEligible(libraryType)) return; - if (!await _licenseService.HasActiveLicense()) return; + if (!IsPlusEligible(libraryType)) return false; + if (!await _licenseService.HasActiveLicense()) return false; // Generate key based on seriesId and libraryType or any unique identifier for the request // Check if the request is allowed based on the rate limit if (!RateLimiter.TryAcquire(string.Empty)) { // Request not allowed due to rate limit - _logger.LogDebug("Rate Limit hit for Kavita+ prefetch"); - return; + _logger.LogInformation("Rate Limit hit for Kavita+ prefetch"); + return false; } - _logger.LogDebug("Prefetching Kavita+ data for Series {SeriesId}", seriesId); // Prefetch SeriesDetail data - await GetSeriesDetailPlus(seriesId, libraryType); - - // TODO: Fetch Series Metadata (Summary, etc) - + return await GetSeriesDetailPlus(seriesId, libraryType) != null; } public async Task> GetStacksForUser(int userId) @@ -197,15 +183,7 @@ public class ExternalMetadataService : IExternalMetadataService _logger.LogDebug("Fetching Kavita+ for MAL Stacks for user {UserName}", user.MalUserName); var license = (await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey)).Value; - var result = await ($"{Configuration.KavitaPlusApiUrl}/api/metadata/v2/stacks?username={user.MalUserName}") - .WithHeader("Accept", "application/json") - .WithHeader("User-Agent", "Kavita") - .WithHeader("x-license-key", license) - .WithHeader("x-installId", HashUtil.ServerToken()) - .WithHeader("x-kavita-version", BuildInfo.Version) - .WithHeader("Content-Type", "application/json") - .WithTimeout(TimeSpan.FromSeconds(Configuration.DefaultTimeOutSecs)) - .GetJsonAsync>(); + var result = await _kavitaPlusApiService.GetMalStacks(user.MalUserName, license); if (result == null) { @@ -221,6 +199,75 @@ public class ExternalMetadataService : IExternalMetadataService } } + /// + /// Returns the match results for a Series from UI Flow + /// + /// + /// Will extract alternative names like Localized name, year will send as ReleaseYear but fallback to Comic Vine syntax if applicable + /// + /// + /// + public async Task> MatchSeries(MatchSeriesDto dto) + { + + var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(dto.SeriesId, + SeriesIncludes.Metadata | SeriesIncludes.ExternalMetadata | SeriesIncludes.Library); + if (series == null) return []; + + var potentialAnilistId = ScrobblingService.ExtractId(dto.Query, ScrobblingService.AniListWeblinkWebsite); + var potentialMalId = ScrobblingService.ExtractId(dto.Query, ScrobblingService.MalWeblinkWebsite); + + var format = series.Library.Type.ConvertToPlusMediaFormat(series.Format); + var otherNames = ExtractAlternativeNames(series); + + var year = series.Metadata.ReleaseYear; + if (year == 0 && format == PlusMediaFormat.Comic && !string.IsNullOrWhiteSpace(series.Name)) + { + var potentialYear = Parser.ParseYear(series.Name); + if (!string.IsNullOrEmpty(potentialYear)) + { + year = int.Parse(potentialYear); + } + } + + var matchRequest = new MatchSeriesRequestDto() + { + Format = format, + Query = dto.Query, + SeriesName = series.Name, + AlternativeNames = otherNames, + Year = year, + AniListId = potentialAnilistId ?? ScrobblingService.GetAniListId(series), + MalId = potentialMalId ?? ScrobblingService.GetMalId(series) + }; + + try + { + var results = await _kavitaPlusApiService.MatchSeries(matchRequest); + + // Some summaries can contain multiple
s, we need to ensure it's only 1 + foreach (var result in results) + { + result.Series.Summary = StringHelper.RemoveSourceInDescription(StringHelper.SquashBreaklines(result.Series.Summary)); + } + + return results; + } + catch (Exception ex) + { + _logger.LogError(ex, "An error happened during the request to Kavita+ API"); + } + + return ArraySegment.Empty; + } + + private static List ExtractAlternativeNames(Series series) + { + List altNames = [series.LocalizedName, series.OriginalName]; + return altNames.Where(s => !string.IsNullOrEmpty(s)).Distinct().ToList(); + } + + /// /// Retrieves Metadata about a Recommended External Series /// @@ -237,9 +284,7 @@ public class ExternalMetadataService : IExternalMetadataService } // This is for the Series drawer. We can get this extra information during the initial SeriesDetail call so it's all coming from the DB - - var license = (await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey)).Value; - var details = await GetSeriesDetail(license, aniListId, malId, seriesId); + var details = await GetSeriesDetail(aniListId, malId, seriesId); return details; @@ -249,16 +294,18 @@ public class ExternalMetadataService : IExternalMetadataService /// Returns Series Detail data from Kavita+ - Review, Recs, Ratings /// /// + /// /// - public async Task GetSeriesDetailPlus(int seriesId, LibraryType libraryType) + public async Task GetSeriesDetailPlus(int seriesId, LibraryType libraryType) { if (!IsPlusEligible(libraryType) || !await _licenseService.HasActiveLicense()) return _defaultReturn; - // Check blacklist (bad matches) - if (await _unitOfWork.ExternalSeriesMetadataRepository.IsBlacklistedSeries(seriesId)) return _defaultReturn; + // Check blacklist (bad matches) or if there is a don't match + var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId); + if (series == null || !series.WillScrobble()) return _defaultReturn; var needsRefresh = - await _unitOfWork.ExternalSeriesMetadataRepository.ExternalSeriesMetadataNeedsRefresh(seriesId); + await _unitOfWork.ExternalSeriesMetadataRepository.NeedsDataRefresh(seriesId); if (!needsRefresh) { @@ -266,28 +313,172 @@ public class ExternalMetadataService : IExternalMetadataService return await _unitOfWork.ExternalSeriesMetadataRepository.GetSeriesDetailPlusDto(seriesId); } + var data = await _unitOfWork.SeriesRepository.GetPlusSeriesDto(seriesId); + if (data == null) return _defaultReturn; + + // Get from Kavita+ API the Full Series metadata with rec/rev and cache to ExternalMetadata tables try { - var data = await _unitOfWork.SeriesRepository.GetPlusSeriesDto(seriesId); - if (data == null) return _defaultReturn; - _logger.LogDebug("Fetching Kavita+ Series Detail data for {SeriesName}", data.SeriesName); + return await FetchExternalMetadataForSeries(seriesId, libraryType, data); + } + catch (KavitaException ex) + { + _logger.LogError(ex, "Rate limit hit fetching metadata"); + // This can happen when we hit rate limit + return _defaultReturn; + } + } - var license = (await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey)).Value; - var result = await (Configuration.KavitaPlusApiUrl + "/api/metadata/v2/series-detail") - .WithHeader("Accept", "application/json") - .WithHeader("User-Agent", "Kavita") - .WithHeader("x-license-key", license) - .WithHeader("x-installId", HashUtil.ServerToken()) - .WithHeader("x-kavita-version", BuildInfo.Version) - .WithHeader("Content-Type", "application/json") - .WithTimeout(TimeSpan.FromSeconds(Configuration.DefaultTimeOutSecs)) - .PostJsonAsync(data) - .ReceiveJson(); + /// + /// This will override any sort of matching that was done prior and force it to be what the user Selected + /// + /// + /// + /// + /// + public async Task FixSeriesMatch(int seriesId, int? aniListId, long? malId, int? cbrId) + { + var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId, SeriesIncludes.Library); + if (series == null) return; + + // Remove from Blacklist + series.IsBlacklisted = false; + series.DontMatch = false; + _unitOfWork.SeriesRepository.Update(series); + + // Refetch metadata with a Direct lookup + try + { + var metadata = await FetchExternalMetadataForSeries(seriesId, series.Library.Type, + new PlusSeriesRequestDto() + { + AniListId = aniListId, + MalId = malId, + CbrId = cbrId, + MediaFormat = series.Library.Type.ConvertToPlusMediaFormat(series.Format), + SeriesName = series.Name // Required field, not used since AniList/Mal Id are passed + }); + + if (metadata.Series == null) + { + _logger.LogError("Unable to Match {SeriesName} with Kavita+ Series with Id: {AniListId}/{MalId}/{CbrId}", + series.Name, aniListId, malId, cbrId); + return; + } + + // Find all scrobble events and rewrite them to be the correct + var events = await _unitOfWork.ScrobbleRepository.GetAllEventsForSeries(seriesId); + _unitOfWork.ScrobbleRepository.Remove(events); + + // Find all scrobble errors and remove them + var errors = await _unitOfWork.ScrobbleRepository.GetAllScrobbleErrorsForSeries(seriesId); + _unitOfWork.ScrobbleRepository.Remove(errors); + + await _unitOfWork.CommitAsync(); + + // Regenerate all events for the series for all users + BackgroundJob.Enqueue(() => _scrobblingService.CreateEventsFromExistingHistoryForSeries(seriesId)); + + // Name can be null on Series even with a direct match + _logger.LogInformation("Matched {SeriesName} with Kavita+ Series {MatchSeriesName}", series.Name, + metadata.Series.Name); + } + catch (KavitaException ex) + { + // We can't rethrow because Fix match is done in a background thread and Hangfire will requeue multiple times + _logger.LogInformation(ex, "Rate limit hit for matching {SeriesName} with Kavita+", series.Name); + // Fire SignalR event about this + await _eventHub.SendMessageAsync(MessageFactory.ExternalMatchRateLimitError, + MessageFactory.ExternalMatchRateLimitErrorEvent(series.Id, series.Name)); + } + } + + /// + /// Sets a series to Don't Match and removes all previously cached + /// + /// + public async Task UpdateSeriesDontMatch(int seriesId, bool dontMatch) + { + var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId, SeriesIncludes.ExternalMetadata); + if (series == null) return; + + _logger.LogInformation("User has asked Kavita to stop matching/scrobbling on {SeriesName}", series.Name); + + series.DontMatch = dontMatch; + + if (dontMatch) + { + // When we set as DontMatch, we will clear existing External Metadata + var externalSeriesMetadata = await GetOrCreateExternalSeriesMetadataForSeries(seriesId, series); + _unitOfWork.ExternalSeriesMetadataRepository.Remove(series.ExternalSeriesMetadata); + _unitOfWork.ExternalSeriesMetadataRepository.Remove(externalSeriesMetadata.ExternalReviews); + _unitOfWork.ExternalSeriesMetadataRepository.Remove(externalSeriesMetadata.ExternalRatings); + _unitOfWork.ExternalSeriesMetadataRepository.Remove(externalSeriesMetadata.ExternalRecommendations); + } + + _unitOfWork.SeriesRepository.Update(series); + + await _unitOfWork.CommitAsync(); + } + + /// + /// Requests the full SeriesDetail (rec, review, metadata) data for a Series. Will save to ExternalMetadata tables. + /// + /// + /// + /// + /// + private async Task FetchExternalMetadataForSeries(int seriesId, LibraryType libraryType, PlusSeriesRequestDto data) + { + + var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId, SeriesIncludes.Library); + if (series == null) + { + return _defaultReturn; + } + + try + { + _logger.LogDebug("Fetching Kavita+ Series Detail data for {SeriesName}", string.IsNullOrEmpty(data.SeriesName) ? data.AniListId : data.SeriesName); + SeriesDetailPlusApiDto? result = null; + + try + { + // This returns an AniListSeries and Match returns ExternalSeriesDto + result = await _kavitaPlusApiService.GetSeriesDetail(data); + } + catch (FlurlHttpException ex) + { + var errorMessage = await ex.GetResponseStringAsync(); + // Trim quotes if the response is a JSON string + errorMessage = errorMessage.Trim('"'); + + if (ex.StatusCode == 400) + { + if (errorMessage.Contains("Too many Requests")) + { + _logger.LogDebug("Hit rate limit, will retry in 3 seconds"); + await Task.Delay(3000); + + result = await _kavitaPlusApiService.GetSeriesDetail(data); + } + else if (errorMessage.Contains("Unknown Series")) + { + series.IsBlacklisted = true; + await _unitOfWork.CommitAsync(); + } + } + } + + if (result == null) + { + _logger.LogInformation("Hit rate limit twice, try again later"); + return _defaultReturn; + } // Clear out existing results - var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId); - var externalSeriesMetadata = await GetExternalSeriesMetadataForSeries(seriesId, series!); + var externalSeriesMetadata = await GetOrCreateExternalSeriesMetadataForSeries(seriesId, series); _unitOfWork.ExternalSeriesMetadataRepository.Remove(externalSeriesMetadata.ExternalReviews); _unitOfWork.ExternalSeriesMetadataRepository.Remove(externalSeriesMetadata.ExternalRatings); _unitOfWork.ExternalSeriesMetadataRepository.Remove(externalSeriesMetadata.ExternalRecommendations); @@ -303,12 +494,13 @@ public class ExternalMetadataService : IExternalMetadataService { var rating = _mapper.Map(r); rating.SeriesId = externalSeriesMetadata.SeriesId; + rating.ProviderUrl = r.ProviderUrl; return rating; }).ToList(); // Recommendations - externalSeriesMetadata.ExternalRecommendations ??= new List(); + externalSeriesMetadata.ExternalRecommendations ??= []; var recs = await ProcessRecommendations(libraryType, result.Recommendations, externalSeriesMetadata); var extRatings = externalSeriesMetadata.ExternalRatings @@ -321,35 +513,1268 @@ public class ExternalMetadataService : IExternalMetadataService if (result.MalId.HasValue) externalSeriesMetadata.MalId = result.MalId.Value; if (result.AniListId.HasValue) externalSeriesMetadata.AniListId = result.AniListId.Value; - await _unitOfWork.CommitAsync(); + if (result.CbrId.HasValue) externalSeriesMetadata.CbrId = result.CbrId.Value; + + // If there is metadata and the user has metadata download turned on + var madeMetadataModification = false; + if (result.Series != null && series.Library.AllowMetadataMatching) + { + externalSeriesMetadata.Series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId); + + try + { + madeMetadataModification = await WriteExternalMetadataToSeries(result.Series, seriesId); + if (madeMetadataModification) + { + _unitOfWork.SeriesRepository.Update(series); + _unitOfWork.SeriesRepository.Update(series.Metadata); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "There was an exception when trying to write Series metadata from Kavita+"); + } + + } + + // WriteExternalMetadataToSeries will commit but not always + if (_unitOfWork.HasChanges()) + { + await _unitOfWork.CommitAsync(); + } + + if (madeMetadataModification) + { + // Inform the UI of the update + await _eventHub.SendMessageAsync(MessageFactory.ScanSeries, MessageFactory.ScanSeriesEvent(series.LibraryId, series.Id, series.Name), false); + } return new SeriesDetailPlusDto() { Recommendations = recs, Ratings = result.Ratings, - Reviews = externalSeriesMetadata.ExternalReviews.Select(r => _mapper.Map(r)) + Reviews = externalSeriesMetadata.ExternalReviews.Select(r => _mapper.Map(r)), + Series = result.Series }; } catch (FlurlHttpException ex) { + var errorMessage = await ex.GetResponseStringAsync(); + // Trim quotes if the response is a JSON string + errorMessage = errorMessage.Trim('"'); + if (ex.StatusCode == 500) { return _defaultReturn; } + + if (ex.StatusCode == 400 && errorMessage.Contains("Too many Requests")) + { + throw new KavitaException("Too many requests, slow down"); + } } catch (Exception ex) { - _logger.LogError(ex, "An error happened during the request to Kavita+ API"); + if (ex.Message.Contains("Too Many Requests")) + { + throw new KavitaException("Too many requests, slow down"); + } + + _logger.LogError(ex, "Unable to fetch external series metadata from Kavita+"); } // Blacklist the series as it wasn't found in Kavita+ - await _unitOfWork.ExternalSeriesMetadataRepository.CreateBlacklistedSeries(seriesId); + series.IsBlacklisted = true; + await _unitOfWork.CommitAsync(); return _defaultReturn; } + /// + /// Given external metadata from Kavita+, write as much as possible to the Kavita series as possible + /// + /// + /// + /// + public async Task WriteExternalMetadataToSeries(ExternalSeriesDetailDto externalMetadata, int seriesId) + { + var settings = await _unitOfWork.SettingsRepository.GetMetadataSettingDto(); + if (!settings.Enabled) return false; - private async Task GetExternalSeriesMetadataForSeries(int seriesId, Series series) + var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId, SeriesIncludes.Metadata | SeriesIncludes.Related); + if (series == null) return false; + + var defaultAdmin = await _unitOfWork.UserRepository.GetDefaultAdminUser(); + + _logger.LogInformation("Writing External metadata to Series {SeriesName}", series.Name); + + var madeModification = false; + var processedGenres = new List(); + var processedTags = new List(); + + madeModification = UpdateSummary(series, settings, externalMetadata) || madeModification; + madeModification = UpdateReleaseYear(series, settings, externalMetadata) || madeModification; + madeModification = UpdateLocalizedName(series, settings, externalMetadata) || madeModification; + madeModification = await UpdatePublicationStatus(series, settings, externalMetadata) || madeModification; + + // Apply field mappings + GenerateGenreAndTagLists(externalMetadata, settings, ref processedTags, ref processedGenres); + + madeModification = await UpdateGenres(series, settings, externalMetadata, processedGenres) || madeModification; + madeModification = await UpdateTags(series, settings, externalMetadata, processedTags) || madeModification; + madeModification = UpdateAgeRating(series, settings, processedGenres.Concat(processedTags)) || madeModification; + + var staff = await SetNameAndAddAliases(settings, externalMetadata.Staff); + + madeModification = await UpdateWriters(series, settings, staff) || madeModification; + madeModification = await UpdateArtists(series, settings, staff) || madeModification; + madeModification = await UpdateCharacters(series, settings, externalMetadata.Characters) || madeModification; + + madeModification = await UpdateRelationships(series, settings, externalMetadata.Relations, defaultAdmin) || madeModification; + madeModification = await UpdateCoverImage(series, settings, externalMetadata) || madeModification; + + madeModification = await UpdateChapters(series, settings, externalMetadata) || madeModification; + + return madeModification; + } + + private async Task> SetNameAndAddAliases(MetadataSettingsDto settings, IList? staff) + { + if (staff == null || staff.Count == 0) return []; + + var nameMappings = staff.Select(s => new + { + Staff = s, + PreferredName = settings.FirstLastPeopleNaming ? $"{s.FirstName} {s.LastName}" : $"{s.LastName} {s.FirstName}", + AlternativeName = !settings.FirstLastPeopleNaming ? $"{s.FirstName} {s.LastName}" : $"{s.LastName} {s.FirstName}" + }).ToList(); + + var preferredNames = nameMappings.Select(n => n.PreferredName.ToNormalized()).Distinct().ToList(); + var alternativeNames = nameMappings.Select(n => n.AlternativeName.ToNormalized()).Distinct().ToList(); + + var existingPeople = await _unitOfWork.PersonRepository.GetPeopleByNames(preferredNames.Union(alternativeNames).ToList()); + var existingPeopleDictionary = PersonHelper.ConstructNameAndAliasDictionary(existingPeople); + + var modified = false; + foreach (var mapping in nameMappings) + { + mapping.Staff.Name = mapping.PreferredName; + + if (existingPeopleDictionary.ContainsKey(mapping.PreferredName.ToNormalized())) + { + continue; + } + + + if (existingPeopleDictionary.TryGetValue(mapping.AlternativeName.ToNormalized(), out var person)) + { + modified = true; + person.Aliases.Add(new PersonAliasBuilder(mapping.PreferredName).Build()); + } + } + + if (modified) + { + await _unitOfWork.CommitAsync(); + } + + return [.. staff]; + } + + private static void GenerateGenreAndTagLists(ExternalSeriesDetailDto externalMetadata, MetadataSettingsDto settings, + ref List processedTags, ref List processedGenres) + { + externalMetadata.Tags ??= []; + externalMetadata.Genres ??= []; + + var mappings = ApplyFieldMappings(externalMetadata.Tags.Select(t => t.Name), MetadataFieldType.Tag, settings.FieldMappings); + if (mappings.TryGetValue(MetadataFieldType.Tag, out var tagsToTags)) + { + processedTags.AddRange(tagsToTags); + } + if (mappings.TryGetValue(MetadataFieldType.Genre, out var tagsToGenres)) + { + processedGenres.AddRange(tagsToGenres); + } + + mappings = ApplyFieldMappings(externalMetadata.Genres, MetadataFieldType.Genre, settings.FieldMappings); + if (mappings.TryGetValue(MetadataFieldType.Tag, out var genresToTags)) + { + processedTags.AddRange(genresToTags); + } + if (mappings.TryGetValue(MetadataFieldType.Genre, out var genresToGenres)) + { + processedGenres.AddRange(genresToGenres); + } + + processedTags = ApplyBlackWhiteList(settings, MetadataFieldType.Tag, processedTags); + processedGenres = ApplyBlackWhiteList(settings, MetadataFieldType.Genre, processedGenres); + } + + private async Task UpdateRelationships(Series series, MetadataSettingsDto settings, IList? externalMetadataRelations, AppUser defaultAdmin) + { + if (!settings.EnableRelationships) return false; + + if (externalMetadataRelations == null || externalMetadataRelations.Count == 0 || defaultAdmin == null) + { + return false; + } + + foreach (var relation in externalMetadataRelations.Where(r => r.Relation != RelationKind.Parent)) + { + List names = new [] {relation.SeriesName.PreferredTitle, relation.SeriesName.RomajiTitle, relation.SeriesName.EnglishTitle, relation.SeriesName.NativeTitle}.Where(s => !string.IsNullOrEmpty(s)).ToList()!; + var relatedSeries = await _unitOfWork.SeriesRepository.GetSeriesByAnyName( + names, + relation.PlusMediaFormat.GetMangaFormats(), + defaultAdmin.Id, + relation.AniListId, + SeriesIncludes.Related); + + // Skip if no related series found or series is the parent + if (relatedSeries == null || relatedSeries.Id == series.Id || relation.Relation == RelationKind.Parent) continue; + + // Check if the relationship already exists + var relationshipExists = series.Relations.Any(r => + r.TargetSeriesId == relatedSeries.Id && r.RelationKind == relation.Relation); + + if (relationshipExists) continue; + + // Add new relationship + var newRelation = new SeriesRelation + { + RelationKind = relation.Relation, + TargetSeriesId = relatedSeries.Id, + SeriesId = series.Id, + }; + series.Relations.Add(newRelation); + + // Handle sequel/prequel: add reverse relationship + if (relation.Relation is RelationKind.Prequel or RelationKind.Sequel) + { + var reverseExists = relatedSeries.Relations.Any(r => + r.TargetSeriesId == series.Id && r.RelationKind == GetReverseRelation(relation.Relation)); + + if (!reverseExists) + { + var reverseRelation = new SeriesRelation + { + RelationKind = GetReverseRelation(relation.Relation), + TargetSeriesId = series.Id, + SeriesId = relatedSeries.Id, + }; + relatedSeries.Relations.Add(reverseRelation); + _unitOfWork.SeriesRepository.Attach(reverseRelation); + } + } + + _unitOfWork.SeriesRepository.Update(series); + } + + if (_unitOfWork.HasChanges()) + { + await _unitOfWork.CommitAsync(); + } + + return true; + } + + private async Task UpdateCharacters(Series series, MetadataSettingsDto settings, IList? externalCharacters) + { + if (!settings.EnablePeople) return false; + + if (externalCharacters == null || externalCharacters.Count == 0) return false; + + if (series.Metadata.CharacterLocked && !HasForceOverride(settings, series.Metadata, MetadataSettingField.People)) + { + return false; + } + + if (!settings.IsPersonAllowed(PersonRole.Character)) + { + return false; + } + + series.Metadata.People ??= []; + + var characters = externalCharacters + .Select(w => new PersonDto() + { + Name = w.Name.Trim(), + AniListId = ScrobblingService.ExtractId(w.Url, ScrobblingService.AniListCharacterWebsite), + Description = StringHelper.CorrectUrls(StringHelper.RemoveSourceInDescription(StringHelper.SquashBreaklines(w.Description))), + }) + .Concat(series.Metadata.People + .Where(p => p.Role == PersonRole.Character) + // Need to ensure existing people are retained, but we overwrite anything from a bad match + .Where(p => !p.KavitaPlusConnection) + .Select(p => _mapper.Map(p.Person)) + ) + .DistinctBy(p => Parser.Normalize(p.Name)) + .ToList(); + + if (characters.Count == 0) return false; + + await SeriesService.HandlePeopleUpdateAsync(series.Metadata, characters, PersonRole.Character, _unitOfWork); + + foreach (var spPerson in series.Metadata.People.Where(p => p.Role == PersonRole.Character)) + { + // Set a sort order based on their role + var characterMeta = externalCharacters.FirstOrDefault(c => c.Name == spPerson.Person.Name); + spPerson.OrderWeight = 0; + + if (characterMeta != null) + { + spPerson.KavitaPlusConnection = true; + + spPerson.OrderWeight = characterMeta.Role switch + { + CharacterRole.Main => 0, + CharacterRole.Supporting => 1, + CharacterRole.Background => 2, + _ => 99 // Default for unknown roles + }; + } + } + + // Download the image and save it + _unitOfWork.SeriesRepository.Update(series); + await _unitOfWork.CommitAsync(); + + foreach (var character in externalCharacters) + { + var aniListId = ScrobblingService.ExtractId(character.Url, ScrobblingService.AniListCharacterWebsite); + if (aniListId <= 0) continue; + var person = await _unitOfWork.PersonRepository.GetPersonByAniListId(aniListId); + if (person != null && !string.IsNullOrEmpty(character.ImageUrl) && string.IsNullOrEmpty(person.CoverImage)) + { + await _coverDbService.SetPersonCoverByUrl(person, character.ImageUrl, false); + } + } + + series.Metadata.AddKPlusOverride(MetadataSettingField.People); + return true; + } + + private async Task UpdateArtists(Series series, MetadataSettingsDto settings, List staff) + { + if (!settings.EnablePeople) return false; + + + var upstreamArtists = staff + .Where(s => s.Role is "Art" or "Story & Art") + .ToList(); + + if (upstreamArtists.Count == 0) return false; + + if (series.Metadata.CoverArtistLocked && !HasForceOverride(settings, series.Metadata, MetadataSettingField.People)) + { + return false; + } + + if (!settings.IsPersonAllowed(PersonRole.CoverArtist)) + { + return false; + } + + series.Metadata.People ??= []; + var artists = upstreamArtists + .Select(w => new PersonDto() + { + Name = w.Name.Trim(), + AniListId = ScrobblingService.ExtractId(w.Url, ScrobblingService.AniListStaffWebsite), + Description = StringHelper.CorrectUrls(StringHelper.RemoveSourceInDescription(StringHelper.SquashBreaklines(w.Description))), + }) + .Concat(series.Metadata.People + .Where(p => p.Role == PersonRole.CoverArtist) + .Where(p => !p.KavitaPlusConnection) + .Select(p => _mapper.Map(p.Person)) + ) + .DistinctBy(p => Parser.Normalize(p.Name)) + .ToList(); + + await SeriesService.HandlePeopleUpdateAsync(series.Metadata, artists, PersonRole.CoverArtist, _unitOfWork); + + foreach (var person in series.Metadata.People.Where(p => p.Role == PersonRole.CoverArtist)) + { + var meta = upstreamArtists.FirstOrDefault(c => c.Name == person.Person.Name); + person.OrderWeight = 0; + if (meta != null) + { + person.KavitaPlusConnection = true; + } + } + + _unitOfWork.SeriesRepository.Update(series); + await _unitOfWork.CommitAsync(); + + await DownloadAndSetPersonCovers(upstreamArtists); + + series.Metadata.AddKPlusOverride(MetadataSettingField.People); + return true; + } + + private async Task UpdateWriters(Series series, MetadataSettingsDto settings, List staff) + { + if (!settings.EnablePeople) return false; + + var upstreamWriters = staff + .Where(s => s.Role is "Story" or "Story & Art") + .ToList(); + + if (upstreamWriters.Count == 0) return false; + + if (series.Metadata.WriterLocked && !HasForceOverride(settings, series.Metadata, MetadataSettingField.People)) + { + return false; + } + + if (!settings.IsPersonAllowed(PersonRole.Writer)) + { + return false; + } + + series.Metadata.People ??= []; + var writers = upstreamWriters + .Select(w => new PersonDto() + { + Name = w.Name.Trim(), + AniListId = ScrobblingService.ExtractId(w.Url, ScrobblingService.AniListStaffWebsite), + Description = StringHelper.CorrectUrls(StringHelper.RemoveSourceInDescription(StringHelper.SquashBreaklines(w.Description))), + }) + .Concat(series.Metadata.People + .Where(p => p.Role == PersonRole.Writer) + .Where(p => !p.KavitaPlusConnection) + .Select(p => _mapper.Map(p.Person)) + ) + .DistinctBy(p => Parser.Normalize(p.Name)) + .ToList(); + + + await SeriesService.HandlePeopleUpdateAsync(series.Metadata, writers, PersonRole.Writer, _unitOfWork); + + foreach (var person in series.Metadata.People.Where(p => p.Role == PersonRole.Writer)) + { + var meta = upstreamWriters.FirstOrDefault(c => c.Name == person.Person.Name); + person.OrderWeight = 0; + if (meta != null) + { + person.KavitaPlusConnection = true; + } + } + + _unitOfWork.SeriesRepository.Update(series); + await _unitOfWork.CommitAsync(); + + await DownloadAndSetPersonCovers(upstreamWriters); + series.Metadata.AddKPlusOverride(MetadataSettingField.People); + return true; + } + + private async Task UpdateTags(Series series, MetadataSettingsDto settings, ExternalSeriesDetailDto externalMetadata, List processedTags) + { + externalMetadata.Tags ??= []; + + if (!settings.EnableTags || processedTags.Count == 0) return false; + + if (series.Metadata.TagsLocked && !HasForceOverride(settings, series.Metadata, MetadataSettingField.Tags)) + { + return false; + } + + _logger.LogDebug("Found {TagCount} tags for {SeriesName}", processedTags.Count, series.Name); + var madeModification = false; + var allTags = (await _unitOfWork.TagRepository.GetAllTagsByNameAsync(processedTags.Select(Parser.Normalize))) + .ToList(); + series.Metadata.Tags ??= []; + + TagHelper.UpdateTagList(processedTags, series, allTags, tag => + { + series.Metadata.Tags.Add(tag); + madeModification = true; + }, () => series.Metadata.TagsLocked = true); + + if (madeModification) + { + series.Metadata.AddKPlusOverride(MetadataSettingField.Tags); + } + + return madeModification; + } + + private static List ApplyBlackWhiteList(MetadataSettingsDto settings, MetadataFieldType fieldType, List processedStrings) + { + return fieldType switch + { + MetadataFieldType.Genre => processedStrings.Distinct() + .Where(g => settings.Blacklist.Count == 0 || !settings.Blacklist.Contains(g)) + .ToList(), + MetadataFieldType.Tag => processedStrings.Distinct() + .Where(g => settings.Blacklist.Count == 0 || !settings.Blacklist.Contains(g)) + .Where(g => settings.Whitelist.Count == 0 || settings.Whitelist.Contains(g)) + .ToList(), + _ => throw new ArgumentOutOfRangeException(nameof(fieldType), fieldType, null) + }; + } + + private async Task UpdateGenres(Series series, MetadataSettingsDto settings, ExternalSeriesDetailDto externalMetadata, List processedGenres) + { + externalMetadata.Genres ??= []; + + if (!settings.EnableGenres || processedGenres.Count == 0) return false; + + if (series.Metadata.GenresLocked && !HasForceOverride(settings, series.Metadata, MetadataSettingField.Genres)) + { + return false; + } + + _logger.LogDebug("Found {GenreCount} genres for {SeriesName}", processedGenres.Count, series.Name); + var madeModification = false; + var allGenres = (await _unitOfWork.GenreRepository.GetAllGenresByNamesAsync(processedGenres.Select(Parser.Normalize))).ToList(); + series.Metadata.Genres ??= []; + var exisitingGenres = series.Metadata.Genres; + + GenreHelper.UpdateGenreList(processedGenres, series, allGenres, genre => + { + series.Metadata.Genres.Add(genre); + madeModification = true; + }, () => series.Metadata.GenresLocked = true); + + foreach (var genre in exisitingGenres) + { + if (series.Metadata.Genres.FirstOrDefault(g => g.NormalizedTitle == genre.NormalizedTitle) != null) continue; + series.Metadata.Genres.Add(genre); + madeModification = true; + } + + if (madeModification) + { + series.Metadata.AddKPlusOverride(MetadataSettingField.Genres); + } + + return madeModification; + } + + private async Task UpdatePublicationStatus(Series series, MetadataSettingsDto settings, ExternalSeriesDetailDto externalMetadata) + { + if (!settings.EnablePublicationStatus) return false; + + if (series.Metadata.PublicationStatusLocked && !HasForceOverride(settings, series.Metadata, MetadataSettingField.PublicationStatus)) + { + return false; + } + + try + { + var chapters = + (await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(series.Id, SeriesIncludes.Chapters))!.Volumes + .SelectMany(v => v.Chapters).ToList(); + var status = DeterminePublicationStatus(series, chapters, externalMetadata); + + series.Metadata.PublicationStatus = status; + series.Metadata.PublicationStatusLocked = true; + series.Metadata.AddKPlusOverride(MetadataSettingField.PublicationStatus); + return true; + } + catch (Exception ex) + { + _logger.LogError(ex, "There was an issue determining Publication Status for Series {SeriesName} ({SeriesId})", series.Name, series.Id); + } + + return false; + } + + private bool UpdateAgeRating(Series series, MetadataSettingsDto settings, IEnumerable allExternalTags) + { + + if (series.Metadata.AgeRatingLocked && !HasForceOverride(settings, series.Metadata, MetadataSettingField.AgeRating)) + { + return false; + } + + try + { + // Determine Age Rating + var totalTags = allExternalTags + .Concat(series.Metadata.Genres.Select(g => g.Title)) + .Concat(series.Metadata.Tags.Select(g => g.Title)); + + var ageRating = DetermineAgeRating(totalTags, settings.AgeRatingMappings); + if (series.Metadata.AgeRating <= ageRating) + { + series.Metadata.AgeRating = ageRating; + series.Metadata.AddKPlusOverride(MetadataSettingField.AgeRating); + return true; + } + } + catch (Exception ex) + { + _logger.LogError(ex, "There was an issue determining Age Rating for Series {SeriesName} ({SeriesId})", series.Name, series.Id); + } + + return false; + } + + + private async Task UpdateChapters(Series series, MetadataSettingsDto settings, + ExternalSeriesDetailDto externalMetadata) + { + if (externalMetadata.PlusMediaFormat != PlusMediaFormat.Comic) return false; + + if (externalMetadata.ChapterDtos == null || externalMetadata.ChapterDtos.Count == 0) return false; + + // Get all volumes and chapters + var madeModification = false; + var allChapters = await _unitOfWork.ChapterRepository.GetAllChaptersForSeries(series.Id); + + var matchedChapters = allChapters + .Join( + externalMetadata.ChapterDtos, + chapter => chapter.Range, + dto => dto.IssueNumber, + (chapter, dto) => (chapter, dto) // Create a tuple of matched pairs + ) + .ToList(); + + foreach (var (chapter, potentialMatch) in matchedChapters) + { + _logger.LogDebug("Updating {ChapterNumber} with metadata", chapter.Range); + + // Write the metadata + madeModification = UpdateChapterTitle(chapter, settings, potentialMatch.Title, series.Name) || madeModification; + madeModification = UpdateChapterSummary(chapter, settings, potentialMatch.Summary) || madeModification; + madeModification = UpdateChapterReleaseDate(chapter, settings, potentialMatch.ReleaseDate) || madeModification; + + var hasUpdatedPublisher = await UpdateChapterPublisher(chapter, settings, potentialMatch.Publisher); + if (hasUpdatedPublisher) chapter.AddKPlusOverride(MetadataSettingField.ChapterPublisher); + madeModification = hasUpdatedPublisher || madeModification; + + madeModification = await UpdateChapterPeople(chapter, settings, PersonRole.CoverArtist, potentialMatch.Artists) || madeModification; + madeModification = await UpdateChapterPeople(chapter, settings, PersonRole.Writer, potentialMatch.Writers) || madeModification; + + madeModification = await UpdateChapterCoverImage(chapter, settings, potentialMatch.CoverImageUrl) || madeModification; + madeModification = await UpdateExternalChapterMetadata(chapter, settings, potentialMatch) || madeModification; + + _unitOfWork.ChapterRepository.Update(chapter); + await _unitOfWork.CommitAsync(); + } + + return madeModification; + } + + private async Task UpdateExternalChapterMetadata(Chapter chapter, MetadataSettingsDto settings, ExternalChapterDto metadata) + { + if (!settings.Enabled) return false; + + if (metadata.UserReviews.Count == 0 && metadata.CriticReviews.Count == 0) + { + return false; + } + + var madeModification = false; + + #region Review + + // Remove existing Reviews + var existingReviews = await _unitOfWork.ChapterRepository.GetExternalChapterReview(chapter.Id); + _unitOfWork.ExternalSeriesMetadataRepository.Remove(existingReviews); + + + List externalReviews = []; + externalReviews.AddRange(metadata.CriticReviews + .Where(r => !string.IsNullOrWhiteSpace(r.Username) && !string.IsNullOrWhiteSpace(r.Body)) + .Select(r => + { + var review = _mapper.Map(r); + review.ChapterId = chapter.Id; + review.Authority = RatingAuthority.Critic; + CleanCbrReview(ref review); + return review; + })); + externalReviews.AddRange(metadata.UserReviews + .Where(r => !string.IsNullOrWhiteSpace(r.Username) && !string.IsNullOrWhiteSpace(r.Body)) + .Select(r => + { + var review = _mapper.Map(r); + review.ChapterId = chapter.Id; + review.Authority = RatingAuthority.User; + CleanCbrReview(ref review); + return review; + })); + + chapter.ExternalReviews = externalReviews; + madeModification = externalReviews.Count > 0; + _logger.LogDebug("Added {Count} reviews for chapter {ChapterId}", externalReviews.Count, chapter.Id); + #endregion + + #region Rating + + // C# can't make the implicit conversation here + float? averageCriticRating = metadata.CriticReviews.Count > 0 ? metadata.CriticReviews.Average(r => r.Rating) : null; + float? averageUserRating = metadata.UserReviews.Count > 0 ? metadata.UserReviews.Average(r => r.Rating) : null; + + var existingRatings = await _unitOfWork.ChapterRepository.GetExternalChapterRatings(chapter.Id); + _unitOfWork.ExternalSeriesMetadataRepository.Remove(existingRatings); + + chapter.ExternalRatings = []; + + if (averageUserRating != null) + { + chapter.ExternalRatings.Add(new ExternalRating + { + AverageScore = (int) averageUserRating, + Provider = ScrobbleProvider.Cbr, + Authority = RatingAuthority.User, + ProviderUrl = metadata.IssueUrl, + + }); + chapter.AverageExternalRating = averageUserRating.Value; + } + + if (averageCriticRating != null) + { + chapter.ExternalRatings.Add(new ExternalRating + { + AverageScore = (int) averageCriticRating, + Provider = ScrobbleProvider.Cbr, + Authority = RatingAuthority.Critic, + ProviderUrl = metadata.IssueUrl, + + }); + } + + madeModification = averageUserRating > 0f || averageCriticRating > 0f || madeModification; + + #endregion + + return madeModification; + } + + private static void CleanCbrReview(ref ExternalReview review) + { + // CBR has Read Full Review which links to site, but we already have that + review.Body = review.Body.Replace("Read Full Review", string.Empty).TrimEnd(); + review.RawBody = review.RawBody.Replace("Read Full Review", string.Empty).TrimEnd(); + review.BodyJustText = review.BodyJustText.Replace("Read Full Review", string.Empty).TrimEnd(); + } + + + private static bool UpdateChapterSummary(Chapter chapter, MetadataSettingsDto settings, string? summary) + { + if (!settings.EnableChapterSummary) return false; + + if (string.IsNullOrEmpty(summary)) return false; + + if (chapter.SummaryLocked && !HasForceOverride(settings, chapter, MetadataSettingField.ChapterSummary)) + { + return false; + } + + if (!string.IsNullOrWhiteSpace(summary) && !HasForceOverride(settings, chapter, MetadataSettingField.ChapterSummary)) + { + return false; + } + + chapter.Summary = StringHelper.RemoveSourceInDescription(StringHelper.SquashBreaklines(summary)); + chapter.AddKPlusOverride(MetadataSettingField.ChapterSummary); + return true; + } + + private static bool UpdateChapterTitle(Chapter chapter, MetadataSettingsDto settings, string? title, string seriesName) + { + if (!settings.EnableChapterTitle) return false; + + if (string.IsNullOrEmpty(title)) return false; + + if (chapter.TitleNameLocked && !HasForceOverride(settings, chapter, MetadataSettingField.ChapterTitle)) + { + return false; + } + + if (!title.Contains(seriesName) && !HasForceOverride(settings, chapter, MetadataSettingField.ChapterTitle)) + { + return false; + } + + chapter.TitleName = title; + chapter.AddKPlusOverride(MetadataSettingField.ChapterTitle); + return true; + } + + private static bool UpdateChapterReleaseDate(Chapter chapter, MetadataSettingsDto settings, DateTime? releaseDate) + { + if (!settings.EnableChapterReleaseDate) return false; + + if (releaseDate == null || releaseDate == DateTime.MinValue) return false; + + if (chapter.ReleaseDateLocked && !HasForceOverride(settings, chapter, MetadataSettingField.ChapterReleaseDate)) + { + return false; + } + + if (!HasForceOverride(settings, chapter, MetadataSettingField.ChapterReleaseDate)) + { + return false; + } + + chapter.ReleaseDate = releaseDate.Value; + chapter.AddKPlusOverride(MetadataSettingField.ChapterReleaseDate); + return true; + } + + private async Task UpdateChapterPublisher(Chapter chapter, MetadataSettingsDto settings, string? publisher) + { + if (!settings.EnableChapterPublisher) return false; + + if (string.IsNullOrEmpty(publisher)) return false; + + if (chapter.PublisherLocked && !HasForceOverride(settings, chapter, MetadataSettingField.ChapterPublisher)) + { + return false; + } + + if (!string.IsNullOrWhiteSpace(publisher) && !HasForceOverride(settings, chapter, MetadataSettingField.ChapterPublisher)) + { + return false; + } + + // Some publishers (CBR) can be represented as Boom! Studios/Boom! Town imprint, so let's handle that appropriately + if (publisher.Contains('/') || publisher.Contains("imprint", StringComparison.InvariantCultureIgnoreCase)) + { + var imprint = publisher.Split('/')[1].Replace("imprint", string.Empty); + return await UpdateChapterPeople(chapter, settings, PersonRole.Publisher, [publisher]) || + await UpdateChapterPeople(chapter, settings, PersonRole.Imprint, [imprint]); + } + + return await UpdateChapterPeople(chapter, settings, PersonRole.Publisher, [publisher]); + } + + private async Task UpdateChapterCoverImage(Chapter chapter, MetadataSettingsDto settings, string? coverUrl) + { + if (!settings.EnableChapterCoverImage) return false; + + if (string.IsNullOrEmpty(coverUrl)) return false; + + if (chapter.CoverImageLocked && !HasForceOverride(settings, chapter, MetadataSettingField.ChapterCovers)) + { + return false; + } + + if (string.IsNullOrEmpty(coverUrl)) + { + return false; + } + + await DownloadChapterCovers(chapter, coverUrl); + chapter.AddKPlusOverride(MetadataSettingField.ChapterCovers); + return true; + } + + private async Task UpdateChapterPeople(Chapter chapter, MetadataSettingsDto settings, PersonRole role, IList? staff) + { + if (!settings.EnablePeople) return false; + + if (staff?.Count == 0) return false; + + if (chapter.IsPersonRoleLocked(role) && !HasForceOverride(settings, chapter, MetadataSettingField.People)) + { + return false; + } + + if (!settings.IsPersonAllowed(role) && role != PersonRole.Publisher) + { + return false; + } + + chapter.People ??= []; + var people = staff! + .Select(w => new PersonDto() + { + Name = w.Trim(), + }) + .Concat(chapter.People + .Where(p => p.Role == role) + .Where(p => !p.KavitaPlusConnection) + .Select(p => _mapper.Map(p.Person)) + ) + .DistinctBy(p => Parser.Normalize(p.Name)) + .ToList(); + + await PersonHelper.UpdateChapterPeopleAsync(chapter, staff ?? [], role, _unitOfWork); + + foreach (var person in chapter.People.Where(p => p.Role == role)) + { + var meta = people.FirstOrDefault(c => c.Name == person.Person.Name); + person.OrderWeight = 0; + + if (meta != null) + { + person.KavitaPlusConnection = true; + } + } + + _unitOfWork.ChapterRepository.Update(chapter); + await _unitOfWork.CommitAsync(); + + return true; + } + + private async Task UpdateCoverImage(Series series, MetadataSettingsDto settings, ExternalSeriesDetailDto externalMetadata) + { + if (!settings.EnableCoverImage) return false; + + if (string.IsNullOrEmpty(externalMetadata.CoverUrl)) return false; + + if (series.CoverImageLocked && !HasForceOverride(settings, series.Metadata, MetadataSettingField.Covers)) + { + return false; + } + + if (string.IsNullOrEmpty(externalMetadata.CoverUrl)) + { + return false; + } + + await DownloadSeriesCovers(series, externalMetadata.CoverUrl); + series.Metadata.AddKPlusOverride(MetadataSettingField.Covers); + return true; + } + + + private static bool UpdateReleaseYear(Series series, MetadataSettingsDto settings, ExternalSeriesDetailDto externalMetadata) + { + if (!settings.EnableStartDate) return false; + + if (!externalMetadata.StartDate.HasValue) return false; + + if (series.Metadata.ReleaseYearLocked && !HasForceOverride(settings, series.Metadata, MetadataSettingField.StartDate)) + { + return false; + } + + if (series.Metadata.ReleaseYear != 0 && !HasForceOverride(settings, series.Metadata, MetadataSettingField.StartDate)) + { + return false; + } + + series.Metadata.ReleaseYear = externalMetadata.StartDate.Value.Year; + series.Metadata.AddKPlusOverride(MetadataSettingField.StartDate); + return true; + } + + private static bool UpdateLocalizedName(Series series, MetadataSettingsDto settings, ExternalSeriesDetailDto externalMetadata) + { + if (!settings.EnableLocalizedName) return false; + + if (series.LocalizedNameLocked && !HasForceOverride(settings, series.Metadata, MetadataSettingField.LocalizedName)) + { + return false; + } + + if (!string.IsNullOrWhiteSpace(series.LocalizedName) && !HasForceOverride(settings, series.Metadata, MetadataSettingField.LocalizedName)) + { + return false; + } + + // We need to make the best appropriate guess + if (externalMetadata.Name == series.Name) + { + // Choose closest (usually last) synonym + var validSynonyms = externalMetadata.Synonyms + .Where(IsRomanCharacters) + .Where(s => s.ToNormalized() != series.Name.ToNormalized()) + .ToList(); + + if (validSynonyms.Count == 0) return false; + + series.LocalizedName = validSynonyms[^1]; + series.LocalizedNameLocked = true; + } + else if (IsRomanCharacters(externalMetadata.Name)) + { + series.LocalizedName = externalMetadata.Name; + series.LocalizedNameLocked = true; + } + + + series.Metadata.AddKPlusOverride(MetadataSettingField.LocalizedName); + return true; + } + + private static bool UpdateSummary(Series series, MetadataSettingsDto settings, ExternalSeriesDetailDto externalMetadata) + { + if (!settings.EnableSummary) return false; + + if (string.IsNullOrEmpty(externalMetadata.Summary)) return false; + + if (series.Metadata.SummaryLocked && !HasForceOverride(settings, series.Metadata, MetadataSettingField.Summary)) + { + return false; + } + + if (!string.IsNullOrWhiteSpace(series.Metadata.Summary) && !HasForceOverride(settings, series.Metadata, MetadataSettingField.Summary)) + { + return false; + } + + series.Metadata.Summary = StringHelper.RemoveSourceInDescription(StringHelper.SquashBreaklines(externalMetadata.Summary)); + series.Metadata.AddKPlusOverride(MetadataSettingField.Summary); + return true; + } + + + private static RelationKind GetReverseRelation(RelationKind relation) + { + return relation switch + { + RelationKind.Prequel => RelationKind.Sequel, + RelationKind.Sequel => RelationKind.Prequel, + _ => relation // For other relationships, no reverse needed + }; + } + + private async Task DownloadSeriesCovers(Series series, string coverUrl) + { + try + { + // Only choose the better image if we're overriding a user provided cover + await _coverDbService.SetSeriesCoverByUrl(series, coverUrl, false, !series.Metadata.HasSetKPlusMetadata(MetadataSettingField.Covers)); + } + catch (Exception ex) + { + _logger.LogError(ex, "There was an exception downloading cover image for Series {SeriesName} ({SeriesId})", series.Name, series.Id); + } + } + + private async Task DownloadChapterCovers(Chapter chapter, string coverUrl) + { + try + { + await _coverDbService.SetChapterCoverByUrl(chapter, coverUrl, false, true); + } + catch (Exception ex) + { + _logger.LogError(ex, "There was an exception downloading cover image for Chapter {ChapterName} ({SeriesId})", chapter.Range, chapter.Id); + } + } + + private async Task DownloadAndSetPersonCovers(List people) + { + foreach (var staff in people) + { + var aniListId = ScrobblingService.ExtractId(staff.Url, ScrobblingService.AniListStaffWebsite); + if (aniListId is null or <= 0) continue; + var person = await _unitOfWork.PersonRepository.GetPersonByAniListId(aniListId.Value); + if (person == null || string.IsNullOrEmpty(staff.ImageUrl) || + !string.IsNullOrEmpty(person.CoverImage) || staff.ImageUrl.EndsWith("default.jpg")) continue; + + try + { + await _coverDbService.SetPersonCoverByUrl(person, staff.ImageUrl, false, true); + } + catch (Exception ex) + { + _logger.LogError(ex, "There was an exception saving cover image for Person {PersonName} ({PersonId})", person.Name, person.Id); + } + + } + } + + private PublicationStatus DeterminePublicationStatus(Series series, List chapters, ExternalSeriesDetailDto externalMetadata) + { + try + { + // Determine the expected total count based on local metadata + series.Metadata.TotalCount = Math.Max( + chapters.Max(chapter => chapter.TotalCount), + externalMetadata.Volumes > 0 ? externalMetadata.Volumes : externalMetadata.Chapters + ); + + // The actual number of count's defined across all chapter's metadata + series.Metadata.MaxCount = chapters.Max(chapter => chapter.Count); + + var nonSpecialVolumes = series.Volumes + .Where(v => v.MaxNumber.IsNot(Parser.SpecialVolumeNumber)) + .ToList(); + + var maxVolume = (int)(nonSpecialVolumes.Count != 0 ? nonSpecialVolumes.Max(v => v.MaxNumber) : 0); + var maxChapter = (int)chapters.Max(c => c.MaxNumber); + + if (series.Format is MangaFormat.Epub or MangaFormat.Pdf && chapters.Count == 1) + { + series.Metadata.MaxCount = 1; + } + else if (series.Metadata.TotalCount <= 1 && chapters is [{ IsSpecial: true }]) + { + series.Metadata.MaxCount = series.Metadata.TotalCount; + } + else if ((maxChapter == Parser.DefaultChapterNumber || maxChapter > series.Metadata.TotalCount) && + maxVolume <= series.Metadata.TotalCount && maxVolume != Parser.DefaultChapterNumber) + { + series.Metadata.MaxCount = maxVolume; + } + else if (maxVolume == series.Metadata.TotalCount) + { + series.Metadata.MaxCount = maxVolume; + } + else + { + series.Metadata.MaxCount = maxChapter; + } + + var status = PublicationStatus.OnGoing; + + var hasExternalCounts = externalMetadata.Volumes > 0 || externalMetadata.Chapters > 0; + + if (hasExternalCounts) + { + status = PublicationStatus.Ended; + + if (IsSeriesCompleted(series, chapters, externalMetadata, maxVolume)) + { + status = PublicationStatus.Completed; + } + } + + return status; + } + catch (Exception ex) + { + _logger.LogCritical(ex, "There was an issue determining Publication Status"); + } + + return PublicationStatus.OnGoing; + } + + /// + /// Returns true if the series should be marked as completed, checks loosey with chapter and series numbers. + /// Respects Specials to reach the required amount. + /// + /// + /// + /// + /// + /// + /// Updates MaxCount and TotalCount if a loosey check is used to set as completed + public static bool IsSeriesCompleted(Series series, List chapters, ExternalSeriesDetailDto externalMetadata, int maxVolumes) + { + // A series is completed if exactly the amount is found + if (series.Metadata.MaxCount == series.Metadata.TotalCount && series.Metadata.TotalCount > 0) + { + return true; + } + + // If volumes are collected, check if we reach the required volumes by including specials, and decimal volumes + // + // TODO BUG: If the series has specials, that are not included in the external count. But you do own them + // This may mark the series as completed pre-maturely + // Note: I've currently opted to keep this an equals to prevent the above bug from happening + // We *could* change this to >= in the future in case this is reported by users + // If we do; test IsSeriesCompleted_Volumes_TooManySpecials needs to be updated + if (maxVolumes != Parser.DefaultChapterNumber && externalMetadata.Volumes == series.Volumes.Count) + { + series.Metadata.MaxCount = series.Volumes.Count; + series.Metadata.TotalCount = series.Volumes.Count; + return true; + } + + // Note: If Kavita has specials, we should be lenient and ignore for the volume check + var volumeModifier = series.Volumes.Any(v => v.Name == Parser.SpecialVolume) ? 1 : 0; + var modifiedMinVolumeCount = series.Volumes.Count - volumeModifier; + if (maxVolumes != Parser.DefaultChapterNumber && externalMetadata.Volumes == modifiedMinVolumeCount) + { + series.Metadata.MaxCount = modifiedMinVolumeCount; + series.Metadata.TotalCount = modifiedMinVolumeCount; + return true; + } + + // If no volumes are collected, the series is completed if we reach or exceed the external chapters + if (maxVolumes == Parser.DefaultChapterNumber && series.Metadata.MaxCount >= externalMetadata.Chapters) + { + series.Metadata.TotalCount = series.Metadata.MaxCount; + return true; + } + + // If no volumes are collected, the series is complete if we reach or exceed the external chapters while including + // prologues, and extra chapters + if (maxVolumes == Parser.DefaultChapterNumber && chapters.Count >= externalMetadata.Chapters) + { + series.Metadata.TotalCount = chapters.Count; + series.Metadata.MaxCount = chapters.Count; + return true; + } + + + return false; + } + + private static Dictionary> ApplyFieldMappings(IEnumerable values, MetadataFieldType sourceType, List mappings) + { + var result = new Dictionary>(); + + foreach (var field in Enum.GetValues()) + { + result[field] = []; + } + + foreach (var value in values) + { + var mapping = mappings.FirstOrDefault(m => + m.SourceType == sourceType && + m.SourceValue.Equals(value, StringComparison.OrdinalIgnoreCase)); + + if (mapping != null && !string.IsNullOrWhiteSpace(mapping.DestinationValue)) + { + var targetType = mapping.DestinationType; + + if (!mapping.ExcludeFromSource) + { + result[sourceType].Add(mapping.SourceValue); + } + + result[targetType].Add(mapping.DestinationValue); + } + else + { + // If no mapping, keep the original value + result[sourceType].Add(value); + } + } + + // Ensure distinct + foreach (var key in result.Keys) + { + result[key] = result[key].Distinct().ToList(); + } + + return result; + } + + + /// + /// Returns the highest age rating from all tags/genres based on user-supplied mappings + /// + /// A combo of all tags/genres + /// + /// + public static AgeRating DetermineAgeRating(IEnumerable values, Dictionary mappings) + { + // Find highest age rating from mappings + mappings ??= new Dictionary(); + + return values + .Select(v => mappings.TryGetValue(v, out var mapping) ? mapping : AgeRating.Unknown) + .DefaultIfEmpty(AgeRating.Unknown) + .Max(); + } + + + /// + /// Gets from DB or creates a new one with just SeriesId + /// + /// + /// + /// + private async Task GetOrCreateExternalSeriesMetadataForSeries(int seriesId, Series series) { var externalSeriesMetadata = await _unitOfWork.ExternalSeriesMetadataRepository.GetExternalSeriesMetadata(seriesId); if (externalSeriesMetadata != null) return externalSeriesMetadata; @@ -360,6 +1785,7 @@ public class ExternalMetadataService : IExternalMetadataService }; series.ExternalSeriesMetadata = externalSeriesMetadata; _unitOfWork.ExternalSeriesMetadataRepository.Attach(externalSeriesMetadata); + return externalSeriesMetadata; } @@ -428,7 +1854,16 @@ public class ExternalMetadataService : IExternalMetadataService } - private async Task GetSeriesDetail(string license, int? aniListId, long? malId, int? seriesId) + /// + /// This is to get series information for the recommendation drawer on Kavita + /// + /// This uses a different API that series detail + /// + /// + /// + /// + /// + private async Task GetSeriesDetail(int? aniListId, long? malId, int? seriesId) { var payload = new ExternalMetadataIdsDto() { @@ -454,22 +1889,17 @@ public class ExternalMetadataService : IExternalMetadataService } payload.SeriesName = series.Name; payload.LocalizedSeriesName = series.LocalizedName; - payload.PlusMediaFormat = ConvertToMediaFormat(series.Library.Type, series.Format); + payload.PlusMediaFormat = series.Library.Type.ConvertToPlusMediaFormat(series.Format); } } try { - return await (Configuration.KavitaPlusApiUrl + "/api/metadata/v2/series-by-ids") - .WithHeader("Accept", "application/json") - .WithHeader("User-Agent", "Kavita") - .WithHeader("x-license-key", license) - .WithHeader("x-installId", HashUtil.ServerToken()) - .WithHeader("x-kavita-version", BuildInfo.Version) - .WithHeader("Content-Type", "application/json") - .WithTimeout(TimeSpan.FromSeconds(Configuration.DefaultTimeOutSecs)) - .PostJsonAsync(payload) - .ReceiveJson(); + var ret = await _kavitaPlusApiService.GetSeriesDetailById(payload); + + ret.Summary = StringHelper.RemoveSourceInDescription(StringHelper.SquashBreaklines(ret.Summary)); + + return ret; } catch (Exception e) @@ -480,15 +1910,9 @@ public class ExternalMetadataService : IExternalMetadataService return null; } - private static MediaFormat ConvertToMediaFormat(LibraryType libraryType, MangaFormat seriesFormat) + private static bool HasForceOverride(MetadataSettingsDto settings, IHasKPlusMetadata kPlusMetadata, + MetadataSettingField field) { - return libraryType switch - { - LibraryType.Manga => seriesFormat == MangaFormat.Epub ? MediaFormat.LightNovel : MediaFormat.Manga, - LibraryType.Comic => MediaFormat.Comic, - LibraryType.Book => MediaFormat.Book, - LibraryType.LightNovel => MediaFormat.LightNovel, - _ => MediaFormat.Unknown - }; + return settings.HasOverride(field) || kPlusMetadata.HasSetKPlusMetadata(field); } } diff --git a/API/Services/Plus/KavitaPlusApiService.cs b/API/Services/Plus/KavitaPlusApiService.cs new file mode 100644 index 000000000..ec4f414c3 --- /dev/null +++ b/API/Services/Plus/KavitaPlusApiService.cs @@ -0,0 +1,126 @@ +#nullable enable +using System.Collections.Generic; +using System.Threading.Tasks; +using API.Data; +using API.DTOs.Collection; +using API.DTOs.KavitaPlus.ExternalMetadata; +using API.DTOs.KavitaPlus.Metadata; +using API.DTOs.Metadata.Matching; +using API.DTOs.Scrobbling; +using API.Entities.Enums; +using API.Extensions; +using Flurl.Http; +using Kavita.Common; +using Microsoft.Extensions.Logging; + +namespace API.Services.Plus; + +/// +/// All Http requests to K+ should be contained in this service, the service will not handle any errors. +/// This is expected from the caller. +/// +public interface IKavitaPlusApiService +{ + Task HasTokenExpired(string license, string token, ScrobbleProvider provider); + Task GetRateLimit(string license, string token); + Task PostScrobbleUpdate(ScrobbleDto data, string license); + Task> GetMalStacks(string malUsername, string license); + Task> MatchSeries(MatchSeriesRequestDto request); + Task GetSeriesDetail(PlusSeriesRequestDto request); + Task GetSeriesDetailById(ExternalMetadataIdsDto request); +} + +public class KavitaPlusApiService(ILogger logger, IUnitOfWork unitOfWork): IKavitaPlusApiService +{ + private const string ScrobblingPath = "/api/scrobbling/"; + + public async Task HasTokenExpired(string license, string token, ScrobbleProvider provider) + { + var res = await Get(ScrobblingPath + "valid-key?provider=" + provider + "&key=" + token, license, token); + var str = await res.GetStringAsync(); + return bool.Parse(str); + } + + public async Task GetRateLimit(string license, string token) + { + var res = await Get(ScrobblingPath + "rate-limit?accessToken=" + token, license, token); + var str = await res.GetStringAsync(); + return int.Parse(str); + } + + public async Task PostScrobbleUpdate(ScrobbleDto data, string license) + { + return await PostAndReceive(ScrobblingPath + "update", data, license); + } + + public async Task> GetMalStacks(string malUsername, string license) + { + return await $"{Configuration.KavitaPlusApiUrl}/api/metadata/v2/stacks?username={malUsername}" + .WithKavitaPlusHeaders(license) + .GetJsonAsync>(); + } + + public async Task> MatchSeries(MatchSeriesRequestDto request) + { + var license = (await unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey)).Value; + var token = (await unitOfWork.UserRepository.GetDefaultAdminUser()).AniListAccessToken; + + return await (Configuration.KavitaPlusApiUrl + "/api/metadata/v2/match-series") + .WithKavitaPlusHeaders(license, token) + .PostJsonAsync(request) + .ReceiveJson>(); + } + + public async Task GetSeriesDetail(PlusSeriesRequestDto request) + { + var license = (await unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey)).Value; + var token = (await unitOfWork.UserRepository.GetDefaultAdminUser()).AniListAccessToken; + + return await (Configuration.KavitaPlusApiUrl + "/api/metadata/v2/series-detail") + .WithKavitaPlusHeaders(license, token) + .PostJsonAsync(request) + .ReceiveJson(); + } + + public async Task GetSeriesDetailById(ExternalMetadataIdsDto request) + { + var license = (await unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey)).Value; + var token = (await unitOfWork.UserRepository.GetDefaultAdminUser()).AniListAccessToken; + + return await (Configuration.KavitaPlusApiUrl + "/api/metadata/v2/series-by-ids") + .WithKavitaPlusHeaders(license, token) + .PostJsonAsync(request) + .ReceiveJson(); + } + + /// + /// Send a GET request to K+ + /// + /// only path of the uri, the host is added + /// + /// + /// + private static async Task Get(string url, string license, string? aniListToken = null) + { + return await (Configuration.KavitaPlusApiUrl + url) + .WithKavitaPlusHeaders(license, aniListToken) + .GetAsync(); + } + + /// + /// Send a POST request to K+ + /// + /// only path of the uri, the host is added + /// + /// + /// + /// Return type + /// + private static async Task PostAndReceive(string url, object body, string license, string? aniListToken = null) + { + return await (Configuration.KavitaPlusApiUrl + url) + .WithKavitaPlusHeaders(license, aniListToken) + .PostJsonAsync(body) + .ReceiveJson(); + } +} diff --git a/API/Services/Plus/LicenseService.cs b/API/Services/Plus/LicenseService.cs index 5a12f7c0b..91f5a8fdd 100644 --- a/API/Services/Plus/LicenseService.cs +++ b/API/Services/Plus/LicenseService.cs @@ -1,10 +1,13 @@ using System; +using System.Linq; using System.Threading.Tasks; using API.Constants; using API.Data; using API.DTOs.Account; -using API.DTOs.License; +using API.DTOs.KavitaPlus.License; using API.Entities.Enums; +using API.Extensions; +using API.Services.Tasks; using EasyCaching.Core; using Flurl.Http; using Kavita.Common; @@ -29,17 +32,23 @@ public interface ILicenseService Task HasActiveLicense(bool forceCheck = false); Task HasActiveSubscription(string? license); Task ResetLicense(string license, string email); + Task GetLicenseInfo(bool forceCheck = false); } public class LicenseService( IEasyCachingProviderFactory cachingProviderFactory, IUnitOfWork unitOfWork, - ILogger logger) + ILogger logger, + IVersionUpdaterService versionUpdaterService) : ILicenseService { private readonly TimeSpan _licenseCacheTimeout = TimeSpan.FromHours(8); - public const string Cron = "0 */4 * * *"; - private const string CacheKey = "license"; + public const string Cron = "0 */9 * * *"; + /// + /// Cache key for if license is valid or not + /// + public const string CacheKey = "license"; + private const string LicenseInfoCacheKey = "license-info"; /// @@ -53,13 +62,7 @@ public class LicenseService( try { var response = await (Configuration.KavitaPlusApiUrl + "/api/license/check") - .WithHeader("Accept", "application/json") - .WithHeader("User-Agent", "Kavita") - .WithHeader("x-license-key", license) - .WithHeader("x-installId", HashUtil.ServerToken()) - .WithHeader("x-kavita-version", BuildInfo.Version) - .WithHeader("Content-Type", "application/json") - .WithTimeout(TimeSpan.FromSeconds(Configuration.DefaultTimeOutSecs)) + .WithKavitaPlusHeaders(license) .PostJsonAsync(new LicenseValidDto() { License = license, @@ -87,13 +90,7 @@ public class LicenseService( try { var response = await (Configuration.KavitaPlusApiUrl + "/api/license/register") - .WithHeader("Accept", "application/json") - .WithHeader("User-Agent", "Kavita") - .WithHeader("x-license-key", license) - .WithHeader("x-installId", HashUtil.ServerToken()) - .WithHeader("x-kavita-version", BuildInfo.Version) - .WithHeader("Content-Type", "application/json") - .WithTimeout(TimeSpan.FromSeconds(Configuration.DefaultTimeOutSecs)) + .WithKavitaPlusHeaders(license) .PostJsonAsync(new EncryptLicenseDto() { License = license.Trim(), @@ -118,36 +115,6 @@ public class LicenseService( } } - /// - /// Checks licenses and updates cache - /// - /// Expected to be called at startup and on reoccurring basis - // public async Task ValidateLicenseStatus() - // { - // var provider = _cachingProviderFactory.GetCachingProvider(EasyCacheProfiles.License); - // try - // { - // var license = await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey); - // if (string.IsNullOrEmpty(license.Value)) { - // await provider.SetAsync(CacheKey, false, _licenseCacheTimeout); - // return; - // } - // - // _logger.LogInformation("Validating Kavita+ License"); - // - // await provider.FlushAsync(); - // var isValid = await IsLicenseValid(license.Value); - // await provider.SetAsync(CacheKey, isValid, _licenseCacheTimeout); - // - // _logger.LogInformation("Validating Kavita+ License - Complete"); - // } - // catch (Exception ex) - // { - // _logger.LogError(ex, "There was an error talking with Kavita+ API for license validation. Rescheduling check in 30 mins"); - // await provider.SetAsync(CacheKey, false, _licenseCacheTimeout); - // BackgroundJob.Schedule(() => ValidateLicenseStatus(), TimeSpan.FromMinutes(30)); - // } - // } /// /// Checks licenses and updates cache @@ -163,22 +130,23 @@ public class LicenseService( if (cacheValue.HasValue) return cacheValue.Value; } + var result = false; try { var serverSetting = await unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey); - var result = await IsLicenseValid(serverSetting.Value); - await provider.FlushAsync(); - await provider.SetAsync(CacheKey, result, _licenseCacheTimeout); - return result; + result = await IsLicenseValid(serverSetting.Value); } catch (Exception ex) { logger.LogError(ex, "There was an issue connecting to Kavita+"); + } + finally + { await provider.FlushAsync(); - await provider.SetAsync(CacheKey, false, _licenseCacheTimeout); + await provider.SetAsync(CacheKey, result, _licenseCacheTimeout); } - return false; + return result; } /// @@ -192,13 +160,7 @@ public class LicenseService( try { var response = await (Configuration.KavitaPlusApiUrl + "/api/license/check-sub") - .WithHeader("Accept", "application/json") - .WithHeader("User-Agent", "Kavita") - .WithHeader("x-license-key", license) - .WithHeader("x-installId", HashUtil.ServerToken()) - .WithHeader("x-kavita-version", BuildInfo.Version) - .WithHeader("Content-Type", "application/json") - .WithTimeout(TimeSpan.FromSeconds(Configuration.DefaultTimeOutSecs)) + .WithKavitaPlusHeaders(license) .PostJsonAsync(new LicenseValidDto() { License = license, @@ -230,6 +192,8 @@ public class LicenseService( var provider = cachingProviderFactory.GetCachingProvider(EasyCacheProfiles.License); await provider.RemoveAsync(CacheKey); + + } public async Task AddLicense(string license, string email, string? discordId) @@ -251,13 +215,7 @@ public class LicenseService( { var encryptedLicense = await unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey); var response = await (Configuration.KavitaPlusApiUrl + "/api/license/reset") - .WithHeader("Accept", "application/json") - .WithHeader("User-Agent", "Kavita") - .WithHeader("x-license-key", encryptedLicense.Value) - .WithHeader("x-installId", HashUtil.ServerToken()) - .WithHeader("x-kavita-version", BuildInfo.Version) - .WithHeader("Content-Type", "application/json") - .WithTimeout(TimeSpan.FromSeconds(Configuration.DefaultTimeOutSecs)) + .WithKavitaPlusHeaders(encryptedLicense.Value) .PostJsonAsync(new ResetLicenseDto() { License = license.Trim(), @@ -283,4 +241,68 @@ public class LicenseService( return false; } + + /// + /// Fetches information about the license from Kavita+. If there is no license or an exception, will return null and can be assumed it is not active + /// + /// + /// + public async Task GetLicenseInfo(bool forceCheck = false) + { + // Check if there is a license + var hasLicense = + !string.IsNullOrEmpty((await unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey)) + .Value); + + if (!hasLicense) return null; + + // Check the cache + var licenseInfoProvider = cachingProviderFactory.GetCachingProvider(EasyCacheProfiles.LicenseInfo); + if (!forceCheck) + { + var cacheValue = await licenseInfoProvider.GetAsync(LicenseInfoCacheKey); + if (cacheValue.HasValue) return cacheValue.Value; + } + + // TODO: If info.IsCancelled && notActive, let's remove the license so we aren't constantly checking + + try + { + var encryptedLicense = await unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey); + var response = await (Configuration.KavitaPlusApiUrl + "/api/license/info") + .WithKavitaPlusHeaders(encryptedLicense.Value) + .GetJsonAsync(); + + // This indicates a mismatch on installId or no active subscription + if (response == null) return null; + + // Ensure that current version is within the 3 version limit. Don't count Nightly releases or Hotfixes + var releases = await versionUpdaterService.GetAllReleases(); + response.IsValidVersion = releases + .Where(r => !r.UpdateTitle.Contains("Hotfix")) // We don't care about Hotfix releases + .Where(r => !r.IsPrerelease) // Ensure we don't take current nightlies within the current/last stable + .Take(3) + .All(r => new Version(r.UpdateVersion) <= BuildInfo.Version); + + response.HasLicense = hasLicense; + + // Cache if the license is valid here as well + var licenseProvider = cachingProviderFactory.GetCachingProvider(EasyCacheProfiles.License); + await licenseProvider.SetAsync(CacheKey, response.IsActive, _licenseCacheTimeout); + + // Cache the license info if IsActive and ExpirationDate > DateTime.UtcNow + 2 + if (response.IsActive && response.ExpirationDate > DateTime.UtcNow.AddDays(2)) + { + await licenseInfoProvider.SetAsync(LicenseInfoCacheKey, response, _licenseCacheTimeout); + } + + return response; + } + catch (FlurlHttpException e) + { + logger.LogError(e, "An error happened during the request to Kavita+ API"); + } + + return null; + } } diff --git a/API/Services/Plus/RecommendationService.cs b/API/Services/Plus/RecommendationService.cs deleted file mode 100644 index 24cb1445b..000000000 --- a/API/Services/Plus/RecommendationService.cs +++ /dev/null @@ -1,122 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using API.Data; -using API.Data.Repositories; -using API.DTOs; -using API.DTOs.Recommendation; -using API.DTOs.Scrobbling; -using API.Entities; -using API.Entities.Enums; -using API.Extensions; -using API.Helpers.Builders; -using Flurl.Http; -using Kavita.Common; -using Kavita.Common.EnvironmentInfo; -using Kavita.Common.Helpers; -using Microsoft.Extensions.Logging; - -namespace API.Services.Plus; -#nullable enable - - -public interface IRecommendationService -{ - //Task GetRecommendationsForSeries(int userId, int seriesId); -} - - -public class RecommendationService : IRecommendationService -{ - private readonly IUnitOfWork _unitOfWork; - private readonly ILogger _logger; - - public RecommendationService(IUnitOfWork unitOfWork, ILogger logger) - { - _unitOfWork = unitOfWork; - _logger = logger; - - FlurlHttp.ConfigureClient(Configuration.KavitaPlusApiUrl, cli => - cli.Settings.HttpClientFactory = new UntrustedCertClientFactory()); - } - - public async Task GetRecommendationsForSeries(int userId, int seriesId) - { - var series = - await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId, - SeriesIncludes.Metadata | SeriesIncludes.Library | SeriesIncludes.Volumes | SeriesIncludes.Chapters); - if (series == null || series.Library.Type == LibraryType.Comic) return new RecommendationDto(); - var license = await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey); - - var user = await _unitOfWork.UserRepository.GetUserByIdAsync(userId); - var canSeeExternalSeries = user is {AgeRestriction: AgeRating.NotApplicable} && - await _unitOfWork.UserRepository.IsUserAdminAsync(user); - - var recDto = new RecommendationDto() - { - ExternalSeries = new List(), - OwnedSeries = new List() - }; - - var recs = await GetRecommendations(license.Value, series); - foreach (var rec in recs) - { - // Find the series based on name and type and that the user has access too - var seriesForRec = await _unitOfWork.SeriesRepository.GetSeriesDtoByNamesAndMetadataIds(rec.RecommendationNames, - series.Library.Type, ScrobblingService.CreateUrl(ScrobblingService.AniListWeblinkWebsite, rec.AniListId), - ScrobblingService.CreateUrl(ScrobblingService.MalWeblinkWebsite, rec.MalId)); - - if (seriesForRec != null) - { - recDto.OwnedSeries.Add(seriesForRec); - continue; - } - - if (!canSeeExternalSeries) continue; - // We can show this based on user permissions - if (string.IsNullOrEmpty(rec.Name) || string.IsNullOrEmpty(rec.SiteUrl) || string.IsNullOrEmpty(rec.CoverUrl)) continue; - recDto.ExternalSeries.Add(new ExternalSeriesDto() - { - Name = string.IsNullOrEmpty(rec.Name) ? rec.RecommendationNames.First() : rec.Name, - Url = rec.SiteUrl, - CoverUrl = rec.CoverUrl, - Summary = rec.Summary, - AniListId = rec.AniListId, - MalId = rec.MalId - }); - } - - await _unitOfWork.SeriesRepository.AddSeriesModifiers(userId, recDto.OwnedSeries); - - recDto.OwnedSeries = recDto.OwnedSeries.DistinctBy(s => s.Id).OrderBy(r => r.Name).ToList(); - recDto.ExternalSeries = recDto.ExternalSeries.DistinctBy(s => s.Name.ToNormalized()).OrderBy(r => r.Name).ToList(); - - return recDto; - } - - - protected async Task> GetRecommendations(string license, Series series) - { - try - { - return await (Configuration.KavitaPlusApiUrl + "/api/recommendation") - .WithHeader("Accept", "application/json") - .WithHeader("User-Agent", "Kavita") - .WithHeader("x-license-key", license) - .WithHeader("x-installId", HashUtil.ServerToken()) - .WithHeader("x-kavita-version", BuildInfo.Version) - .WithHeader("Content-Type", "application/json") - .WithTimeout(TimeSpan.FromSeconds(Configuration.DefaultTimeOutSecs)) - .PostJsonAsync(new PlusSeriesDtoBuilder(series).Build()) - .ReceiveJson>(); - - } - catch (Exception e) - { - _logger.LogError(e, "An error happened during the request to Kavita+ API"); - } - - return new List(); - } -} diff --git a/API/Services/Plus/ScrobblingService.cs b/API/Services/Plus/ScrobblingService.cs index 5dba6f56e..f9c3fdb09 100644 --- a/API/Services/Plus/ScrobblingService.cs +++ b/API/Services/Plus/ScrobblingService.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Collections.Immutable; +using System.Globalization; using System.Linq; using System.Net.Http; using System.Threading.Tasks; @@ -10,6 +11,7 @@ using API.DTOs.Filtering; using API.DTOs.Scrobbling; using API.Entities; using API.Entities.Enums; +using API.Entities.Metadata; using API.Entities.Scrobble; using API.Extensions; using API.Helpers; @@ -18,8 +20,8 @@ using API.SignalR; using Flurl.Http; using Hangfire; using Kavita.Common; -using Kavita.Common.EnvironmentInfo; using Kavita.Common.Helpers; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; namespace API.Services.Plus; @@ -36,27 +38,124 @@ public enum ScrobbleProvider Kavita = 0, AniList = 1, Mal = 2, + [Obsolete("No longer supported")] + GoogleBooks = 3, + Cbr = 4 } public interface IScrobblingService { + /// + /// An automated job that will run against all user's tokens and validate if they are still active + /// + /// This service can validate without license check as the task which calls will be guarded + /// Task CheckExternalAccessTokens(); + + /// + /// Checks if the token has expired with , if it has double checks with K+, + /// otherwise return false. + /// + /// + /// + /// + /// Returns true if there is no license present Task HasTokenExpired(int userId, ScrobbleProvider provider); + /// + /// Create, or update a non-processed, event, for the given series + /// + /// + /// + /// + /// Task ScrobbleRatingUpdate(int userId, int seriesId, float rating); + /// + /// NOP, until hardcover support has been worked out + /// + /// + /// + /// + /// + /// Task ScrobbleReviewUpdate(int userId, int seriesId, string? reviewTitle, string reviewBody); + /// + /// Create, or update a non-processed, event, for the given series + /// + /// + /// + /// Task ScrobbleReadingUpdate(int userId, int seriesId); + /// + /// Creates an or for + /// the given series + /// + /// + /// + /// + /// + /// Only the result of both WantToRead types is send to K+ Task ScrobbleWantToReadUpdate(int userId, int seriesId, bool onWantToRead); + /// + /// Removed all processed events that are at least 7 days old + /// + /// [DisableConcurrentExecution(60 * 60 * 60)] [AutomaticRetry(Attempts = 3, OnAttemptsExceeded = AttemptsExceededAction.Delete)] public Task ClearProcessedEvents(); + + /// + /// Makes K+ requests for all non-processed events until rate limits are reached + /// + /// [DisableConcurrentExecution(60 * 60 * 60)] [AutomaticRetry(Attempts = 3, OnAttemptsExceeded = AttemptsExceededAction.Delete)] Task ProcessUpdatesSinceLastSync(); + Task CreateEventsFromExistingHistory(int userId = 0); + Task CreateEventsFromExistingHistoryForSeries(int seriesId); Task ClearEventsForSeries(int userId, int seriesId); } +/// +/// Context used when syncing scrobble events. Do NOT reuse between syncs +/// +public class ScrobbleSyncContext +{ + public required List ReadEvents {get; init;} + public required List RatingEvents {get; init;} + /// Do not use this as events to send to K+, use + public required List AddToWantToRead {get; init;} + /// Do not use this as events to send to K+, use + public required List RemoveWantToRead {get; init;} + /// + /// Final events list if all AddTo- and RemoveWantToRead would be processed sequentially + /// + public required List Decisions {get; init;} + /// + /// K+ license + /// + public required string License { get; init; } + /// + /// Maps userId to left over request amount + /// + public required Dictionary RateLimits { get; init; } + + /// + /// All users being scrobbled for + /// + public List Users { get; set; } = []; + /// + /// Amount of already processed events + /// + public int ProgressCounter { get; set; } + + /// + /// Sum of all events to process + /// + public int TotalCount => ReadEvents.Count + RatingEvents.Count + AddToWantToRead.Count + RemoveWantToRead.Count; +} + public class ScrobblingService : IScrobblingService { private readonly IUnitOfWork _unitOfWork; @@ -64,53 +163,62 @@ public class ScrobblingService : IScrobblingService private readonly ILogger _logger; private readonly ILicenseService _licenseService; private readonly ILocalizationService _localizationService; + private readonly IEmailService _emailService; + private readonly IKavitaPlusApiService _kavitaPlusApiService; public const string AniListWeblinkWebsite = "https://anilist.co/manga/"; public const string MalWeblinkWebsite = "https://myanimelist.net/manga/"; public const string GoogleBooksWeblinkWebsite = "https://books.google.com/books?id="; public const string MangaDexWeblinkWebsite = "https://mangadex.org/title/"; + public const string AniListStaffWebsite = "https://anilist.co/staff/"; + public const string AniListCharacterWebsite = "https://anilist.co/character/"; - private static readonly IDictionary WeblinkExtractionMap = new Dictionary() + + private static readonly Dictionary WeblinkExtractionMap = new() { {AniListWeblinkWebsite, 0}, {MalWeblinkWebsite, 0}, {GoogleBooksWeblinkWebsite, 0}, {MangaDexWeblinkWebsite, 0}, + {AniListStaffWebsite, 0}, + {AniListCharacterWebsite, 0}, }; private const int ScrobbleSleepTime = 1000; // We can likely tie this to AniList's 90 rate / min ((60 * 1000) / 90) - private static readonly IList BookProviders = new List() - { - }; - private static readonly IList LightNovelProviders = new List() - { + private static readonly IList BookProviders = []; + private static readonly IList LightNovelProviders = + [ ScrobbleProvider.AniList - }; - private static readonly IList ComicProviders = new List(); - private static readonly IList MangaProviders = new List() - { - ScrobbleProvider.AniList - }; + ]; + private static readonly IList ComicProviders = []; + private static readonly IList MangaProviders = (List) + [ScrobbleProvider.AniList]; private const string UnknownSeriesErrorMessage = "Series cannot be matched for Scrobbling"; private const string AccessTokenErrorMessage = "Access Token needs to be rotated to continue scrobbling"; + private const string InvalidKPlusLicenseErrorMessage = "Kavita+ subscription no longer active"; + private const string ReviewFailedErrorMessage = "Review was unable to be saved due to upstream requirements"; + private const string BadPayLoadErrorMessage = "Bad payload from Scrobble Provider"; public ScrobblingService(IUnitOfWork unitOfWork, IEventHub eventHub, ILogger logger, - ILicenseService licenseService, ILocalizationService localizationService) + ILicenseService licenseService, ILocalizationService localizationService, IEmailService emailService, + IKavitaPlusApiService kavitaPlusApiService) { _unitOfWork = unitOfWork; _eventHub = eventHub; _logger = logger; _licenseService = licenseService; _localizationService = localizationService; + _emailService = emailService; + _kavitaPlusApiService = kavitaPlusApiService; - FlurlHttp.ConfigureClient(Configuration.KavitaPlusApiUrl, cli => - cli.Settings.HttpClientFactory = new UntrustedCertClientFactory()); + FlurlConfiguration.ConfigureClientForUrl(Configuration.KavitaPlusApiUrl); } + #region Access token checks /// /// An automated job that will run against all user's tokens and validate if they are still active @@ -123,13 +231,71 @@ public class ScrobblingService : IScrobblingService var users = await _unitOfWork.UserRepository.GetAllUsersAsync(); foreach (var user in users) { - if (string.IsNullOrEmpty(user.AniListAccessToken) || !TokenService.HasTokenExpired(user.AniListAccessToken)) continue; - _logger.LogInformation("User {UserName}'s AniList token has expired! They need to regenerate it for scrobbling to work", user.UserName); - await _eventHub.SendMessageToAsync(MessageFactory.ScrobblingKeyExpired, - MessageFactory.ScrobblingKeyExpiredEvent(ScrobbleProvider.AniList), user.Id); + if (string.IsNullOrEmpty(user.AniListAccessToken)) continue; + + var tokenExpiry = JwtHelper.GetTokenExpiry(user.AniListAccessToken); + + // Send early reminder 5 days before token expiry + if (await ShouldSendEarlyReminder(user.Id, tokenExpiry)) + { + await _emailService.SendTokenExpiringSoonEmail(user.Id, ScrobbleProvider.AniList); + } + + // Send expiration notification after token expiry + if (await ShouldSendExpirationReminder(user.Id, tokenExpiry)) + { + await _emailService.SendTokenExpiredEmail(user.Id, ScrobbleProvider.AniList); + } + + // Check token validity + if (JwtHelper.IsTokenValid(user.AniListAccessToken)) continue; + + _logger.LogInformation( + "User {UserName}'s AniList token has expired or is expiring in a few days! They need to regenerate it for scrobbling to work", + user.UserName); + + // Notify user via event + await _eventHub.SendMessageToAsync( + MessageFactory.ScrobblingKeyExpired, + MessageFactory.ScrobblingKeyExpiredEvent(ScrobbleProvider.AniList), + user.Id); + } } + /// + /// Checks if an early reminder email should be sent. + /// + private async Task ShouldSendEarlyReminder(int userId, DateTime tokenExpiry) + { + var earlyReminderDate = tokenExpiry.AddDays(-5); + if (earlyReminderDate > DateTime.UtcNow) return false; + + var hasAlreadySentReminder = await _unitOfWork.DataContext.EmailHistory + .AnyAsync(h => h.AppUserId == userId && h.Sent && + h.EmailTemplate == EmailService.TokenExpiringSoonTemplate && + h.SendDate >= earlyReminderDate); + + return !hasAlreadySentReminder; + + } + + /// + /// Checks if an expiration notification email should be sent. + /// + private async Task ShouldSendExpirationReminder(int userId, DateTime tokenExpiry) + { + if (tokenExpiry > DateTime.UtcNow) return false; + + var hasAlreadySentExpirationEmail = await _unitOfWork.DataContext.EmailHistory + .AnyAsync(h => h.AppUserId == userId && h.Sent && + h.EmailTemplate == EmailService.TokenExpirationTemplate && + h.SendDate >= tokenExpiry); + + return !hasAlreadySentExpirationEmail; + + } + public async Task HasTokenExpired(int userId, ScrobbleProvider provider) { var token = await GetTokenForProvider(userId, provider); @@ -147,25 +313,14 @@ public class ScrobblingService : IScrobblingService private async Task HasTokenExpired(string token, ScrobbleProvider provider) { - if (string.IsNullOrEmpty(token) || - !TokenService.HasTokenExpired(token)) return false; + if (string.IsNullOrEmpty(token) || !TokenService.HasTokenExpired(token)) return false; var license = await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey); if (string.IsNullOrEmpty(license.Value)) return true; try { - var response = await (Configuration.KavitaPlusApiUrl + "/api/scrobbling/valid-key?provider=" + provider + "&key=" + token) - .WithHeader("Accept", "application/json") - .WithHeader("User-Agent", "Kavita") - .WithHeader("x-license-key", license.Value) - .WithHeader("x-installId", HashUtil.ServerToken()) - .WithHeader("x-kavita-version", BuildInfo.Version) - .WithHeader("Content-Type", "application/json") - .WithTimeout(TimeSpan.FromSeconds(Configuration.DefaultTimeOutSecs)) - .GetStringAsync(); - - return bool.Parse(response); + return await _kavitaPlusApiService.HasTokenExpired(license.Value, token, provider); } catch (HttpRequestException e) { @@ -191,59 +346,14 @@ public class ScrobblingService : IScrobblingService } ?? string.Empty; } - public async Task ScrobbleReviewUpdate(int userId, int seriesId, string? reviewTitle, string reviewBody) + #endregion + + #region Scrobble ingest + + public Task ScrobbleReviewUpdate(int userId, int seriesId, string? reviewTitle, string reviewBody) { // Currently disabled until at least hardcover is implemented - return; - if (!await _licenseService.HasActiveLicense()) return; - - var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId, SeriesIncludes.Metadata | SeriesIncludes.Library); - if (series == null) throw new KavitaException(await _localizationService.Translate(userId, "series-doesnt-exist")); - - _logger.LogInformation("Processing Scrobbling review event for {UserId} on {SeriesName}", userId, series.Name); - if (await CheckIfCannotScrobble(userId, seriesId, series)) return; - - if (IsAniListReviewValid(reviewTitle, reviewBody)) - { - _logger.LogDebug( - "Rejecting Scrobble event for {Series}. Review is not long enough to meet requirements", series.Name); - return; - } - - var existingEvt = await _unitOfWork.ScrobbleRepository.GetEvent(userId, series.Id, - ScrobbleEventType.Review); - if (existingEvt is {IsProcessed: false}) - { - _logger.LogDebug("Overriding Review scrobble event for {Series}", existingEvt.Series.Name); - existingEvt.ReviewBody = reviewBody; - existingEvt.ReviewTitle = reviewTitle; - _unitOfWork.ScrobbleRepository.Update(existingEvt); - await _unitOfWork.CommitAsync(); - return; - } - - var evt = new ScrobbleEvent() - { - SeriesId = series.Id, - LibraryId = series.LibraryId, - ScrobbleEventType = ScrobbleEventType.Review, - AniListId = ExtractId(series.Metadata.WebLinks, AniListWeblinkWebsite), - MalId = GetMalId(series), - AppUserId = userId, - Format = LibraryTypeHelper.GetFormat(series.Library.Type), - ReviewBody = reviewBody, - ReviewTitle = reviewTitle - }; - _unitOfWork.ScrobbleRepository.Attach(evt); - await _unitOfWork.CommitAsync(); - _logger.LogDebug("Added Scrobbling Review update on {SeriesName} with Userid {UserId} ", series.Name, userId); - } - - private static bool IsAniListReviewValid(string reviewTitle, string reviewBody) - { - return string.IsNullOrEmpty(reviewTitle) || string.IsNullOrEmpty(reviewBody) || (reviewTitle.Length < 2200 || - reviewTitle.Length > 120 || - reviewTitle.Length < 20); + return Task.CompletedTask; } public async Task ScrobbleRatingUpdate(int userId, int seriesId, float rating) @@ -253,11 +363,14 @@ public class ScrobblingService : IScrobblingService var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId, SeriesIncludes.Metadata | SeriesIncludes.Library | SeriesIncludes.ExternalMetadata); if (series == null) throw new KavitaException(await _localizationService.Translate(userId, "series-doesnt-exist")); - _logger.LogInformation("Processing Scrobbling rating event for {UserId} on {SeriesName}", userId, series.Name); + var user = await _unitOfWork.UserRepository.GetUserByIdAsync(userId, AppUserIncludes.UserPreferences); + if (user == null || !user.UserPreferences.AniListScrobblingEnabled) return; + + _logger.LogInformation("Processing Scrobbling rating event for {AppUserId} on {SeriesName}", userId, series.Name); if (await CheckIfCannotScrobble(userId, seriesId, series)) return; var existingEvt = await _unitOfWork.ScrobbleRepository.GetEvent(userId, series.Id, - ScrobbleEventType.ScoreUpdated); + ScrobbleEventType.ScoreUpdated, true); if (existingEvt is {IsProcessed: false}) { // We need to just update Volume/Chapter number @@ -277,24 +390,12 @@ public class ScrobblingService : IScrobblingService AniListId = GetAniListId(series), MalId = GetMalId(series), AppUserId = userId, - Format = LibraryTypeHelper.GetFormat(series.Library.Type), + Format = series.Library.Type.ConvertToPlusMediaFormat(series.Format), Rating = rating }; _unitOfWork.ScrobbleRepository.Attach(evt); await _unitOfWork.CommitAsync(); - _logger.LogDebug("Added Scrobbling Rating update on {SeriesName} with Userid {UserId}", series.Name, userId); - } - - private static long? GetMalId(Series series) - { - var malId = ExtractId(series.Metadata.WebLinks, MalWeblinkWebsite); - return malId ?? series.ExternalSeriesMetadata.MalId; - } - - private static int? GetAniListId(Series series) - { - var aniListId = ExtractId(series.Metadata.WebLinks, AniListWeblinkWebsite); - return aniListId ?? series.ExternalSeriesMetadata.AniListId; + _logger.LogDebug("Added Scrobbling Rating update on {SeriesName} with Userid {AppUserId}", series.Name, userId); } public async Task ScrobbleReadingUpdate(int userId, int seriesId) @@ -304,31 +405,55 @@ public class ScrobblingService : IScrobblingService var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId, SeriesIncludes.Metadata | SeriesIncludes.Library | SeriesIncludes.ExternalMetadata); if (series == null) throw new KavitaException(await _localizationService.Translate(userId, "series-doesnt-exist")); - _logger.LogInformation("Processing Scrobbling reading event for {UserId} on {SeriesName}", userId, series.Name); + var user = await _unitOfWork.UserRepository.GetUserByIdAsync(userId, AppUserIncludes.UserPreferences); + if (user == null || !user.UserPreferences.AniListScrobblingEnabled) return; + + _logger.LogInformation("Processing Scrobbling reading event for {AppUserId} on {SeriesName}", userId, series.Name); if (await CheckIfCannotScrobble(userId, seriesId, series)) return; + var isAnyProgressOnSeries = await _unitOfWork.AppUserProgressRepository.HasAnyProgressOnSeriesAsync(seriesId, userId); + + var volumeNumber = (int) await _unitOfWork.AppUserProgressRepository.GetHighestFullyReadVolumeForSeries(seriesId, userId); + var chapterNumber = await _unitOfWork.AppUserProgressRepository.GetHighestFullyReadChapterForSeries(seriesId, userId); + + // Check if there is an existing not yet processed event, if so update it var existingEvt = await _unitOfWork.ScrobbleRepository.GetEvent(userId, series.Id, - ScrobbleEventType.ChapterRead); + ScrobbleEventType.ChapterRead, true); + if (existingEvt is {IsProcessed: false}) { + if (!isAnyProgressOnSeries) + { + _unitOfWork.ScrobbleRepository.Remove(existingEvt); + await _unitOfWork.CommitAsync(); + _logger.LogDebug("Removed scrobble event for {Series} as there is no reading progress", series.Name); + return; + } + // We need to just update Volume/Chapter number var prevChapter = $"{existingEvt.ChapterNumber}"; var prevVol = $"{existingEvt.VolumeNumber}"; - existingEvt.VolumeNumber = - (int) await _unitOfWork.AppUserProgressRepository.GetHighestFullyReadVolumeForSeries(seriesId, userId); - existingEvt.ChapterNumber = - await _unitOfWork.AppUserProgressRepository.GetHighestFullyReadChapterForSeries(seriesId, userId); + existingEvt.VolumeNumber = volumeNumber; + existingEvt.ChapterNumber = chapterNumber; + _unitOfWork.ScrobbleRepository.Update(existingEvt); await _unitOfWork.CommitAsync(); + _logger.LogDebug("Overriding scrobble event for {Series} from vol {PrevVol} ch {PrevChap} -> vol {UpdatedVol} ch {UpdatedChap}", existingEvt.Series.Name, prevVol, prevChapter, existingEvt.VolumeNumber, existingEvt.ChapterNumber); return; } + if (!isAnyProgressOnSeries) + { + // Do not create a new scrobble event if there is no progress + return; + } + try { - var evt = new ScrobbleEvent() + var evt = new ScrobbleEvent { SeriesId = series.Id, LibraryId = series.LibraryId, @@ -336,16 +461,20 @@ public class ScrobblingService : IScrobblingService AniListId = GetAniListId(series), MalId = GetMalId(series), AppUserId = userId, - VolumeNumber = - (int) await _unitOfWork.AppUserProgressRepository.GetHighestFullyReadVolumeForSeries(seriesId, userId), - ChapterNumber = - await _unitOfWork.AppUserProgressRepository.GetHighestFullyReadChapterForSeries(seriesId, userId), - Format = LibraryTypeHelper.GetFormat(series.Library.Type), + VolumeNumber = volumeNumber, + ChapterNumber = chapterNumber, + Format = series.Library.Type.ConvertToPlusMediaFormat(series.Format), }; + if (evt.VolumeNumber is Parser.SpecialVolumeNumber) + { + // We don't process Specials because they will never match on AniList + return; + } + _unitOfWork.ScrobbleRepository.Attach(evt); await _unitOfWork.CommitAsync(); - _logger.LogDebug("Added Scrobbling Read update on {SeriesName} - Volume: {VolumeNumber} Chapter: {ChapterNumber} for User: {UserId}", series.Name, evt.VolumeNumber, evt.ChapterNumber, userId); + _logger.LogDebug("Added Scrobbling Read update on {SeriesName} - Volume: {VolumeNumber} Chapter: {ChapterNumber} for User: {AppUserId}", series.Name, evt.VolumeNumber, evt.ChapterNumber, userId); } catch (Exception ex) { @@ -360,13 +489,22 @@ public class ScrobblingService : IScrobblingService var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId, SeriesIncludes.Metadata | SeriesIncludes.Library | SeriesIncludes.ExternalMetadata); if (series == null) throw new KavitaException(await _localizationService.Translate(userId, "series-doesnt-exist")); - _logger.LogInformation("Processing Scrobbling want-to-read event for {UserId} on {SeriesName}", userId, series.Name); + if (!series.Library.AllowScrobbling) return; + + var user = await _unitOfWork.UserRepository.GetUserByIdAsync(userId, AppUserIncludes.UserPreferences); + if (user == null || !user.UserPreferences.AniListScrobblingEnabled) return; + if (await CheckIfCannotScrobble(userId, seriesId, series)) return; + _logger.LogInformation("Processing Scrobbling want-to-read event for {AppUserId} on {SeriesName}", userId, series.Name); - var existing = await _unitOfWork.ScrobbleRepository.Exists(userId, series.Id, - onWantToRead ? ScrobbleEventType.AddWantToRead : ScrobbleEventType.RemoveWantToRead); - if (existing) return; // BUG: If I take a series and add to remove from want to read, then add to want to read, Kavita rejects the second as a duplicate, when it's not + // Get existing events for this series/user + var existingEvents = (await _unitOfWork.ScrobbleRepository.GetUserEventsForSeries(userId, seriesId)) + .Where(e => new[] { ScrobbleEventType.AddWantToRead, ScrobbleEventType.RemoveWantToRead }.Contains(e.ScrobbleEventType)); + // Remove all existing want-to-read events for this series/user + _unitOfWork.ScrobbleRepository.Remove(existingEvents); + + // Create the new event var evt = new ScrobbleEvent() { SeriesId = series.Id, @@ -375,552 +513,35 @@ public class ScrobblingService : IScrobblingService AniListId = GetAniListId(series), MalId = GetMalId(series), AppUserId = userId, - Format = LibraryTypeHelper.GetFormat(series.Library.Type), + Format = series.Library.Type.ConvertToPlusMediaFormat(series.Format), }; + _unitOfWork.ScrobbleRepository.Attach(evt); await _unitOfWork.CommitAsync(); - _logger.LogDebug("Added Scrobbling WantToRead update on {SeriesName} with Userid {UserId} ", series.Name, userId); + _logger.LogDebug("Added Scrobbling WantToRead update on {SeriesName} with Userid {AppUserId} ", series.Name, userId); } - private async Task CheckIfCannotScrobble(int userId, int seriesId, Series series) - { - if (await _unitOfWork.UserRepository.HasHoldOnSeries(userId, seriesId)) - { - _logger.LogInformation("Series {SeriesName} is on UserId {UserId}'s hold list. Not scrobbling", series.Name, - userId); - return true; - } + #endregion - var library = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(series.LibraryId); - if (library is not {AllowScrobbling: true}) return true; - if (!ExternalMetadataService.IsPlusEligible(library.Type)) return true; - return false; + #region Scrobble provider methods + + private static bool IsAniListReviewValid(string reviewTitle, string reviewBody) + { + return string.IsNullOrEmpty(reviewTitle) || string.IsNullOrEmpty(reviewBody) || (reviewTitle.Length < 2200 || + reviewTitle.Length > 120 || + reviewTitle.Length < 20); } - private async Task GetRateLimit(string license, string aniListToken) + public static long? GetMalId(Series series) { - if (string.IsNullOrWhiteSpace(aniListToken)) return 0; - try - { - var response = await (Configuration.KavitaPlusApiUrl + "/api/scrobbling/rate-limit?accessToken=" + aniListToken) - .WithHeader("Accept", "application/json") - .WithHeader("User-Agent", "Kavita") - .WithHeader("x-license-key", license) - .WithHeader("x-installId", HashUtil.ServerToken()) - .WithHeader("x-kavita-version", BuildInfo.Version) - .WithHeader("Content-Type", "application/json") - .WithTimeout(TimeSpan.FromSeconds(Configuration.DefaultTimeOutSecs)) - .GetStringAsync(); - - return int.Parse(response); - } - catch (Exception e) - { - _logger.LogError(e, "An error happened during the request to Kavita+ API"); - } - - return 0; + var malId = ExtractId(series.Metadata.WebLinks, MalWeblinkWebsite); + return malId ?? series.ExternalSeriesMetadata?.MalId; } - private async Task PostScrobbleUpdate(ScrobbleDto data, string license, ScrobbleEvent evt) + public static int? GetAniListId(Series seriesWithExternalMetadata) { - try - { - var response = await (Configuration.KavitaPlusApiUrl + "/api/scrobbling/update") - .WithHeader("Accept", "application/json") - .WithHeader("User-Agent", "Kavita") - .WithHeader("x-license-key", license) - .WithHeader("x-installId", HashUtil.ServerToken()) - .WithHeader("x-kavita-version", BuildInfo.Version) - .WithHeader("Content-Type", "application/json") - .WithTimeout(TimeSpan.FromSeconds(Configuration.DefaultTimeOutSecs)) - .PostJsonAsync(data) - .ReceiveJson(); - - if (!response.Successful) - { - // Might want to log this under ScrobbleError - if (response.ErrorMessage != null && response.ErrorMessage.Contains("Too Many Requests")) - { - _logger.LogInformation("Hit Too many requests, sleeping to regain requests and retrying"); - await Task.Delay(TimeSpan.FromMinutes(10)); - return await PostScrobbleUpdate(data, license, evt); - } - if (response.ErrorMessage != null && response.ErrorMessage.Contains("Unauthorized")) - { - _logger.LogCritical("Kavita+ responded with Unauthorized. Please check your subscription"); - await _licenseService.HasActiveLicense(true); - evt.IsErrored = true; - evt.ErrorDetails = "Kavita+ subscription no longer active"; - throw new KavitaException("Kavita+ responded with Unauthorized. Please check your subscription"); - } - if (response.ErrorMessage != null && response.ErrorMessage.Contains("Access token is invalid")) - { - evt.IsErrored = true; - evt.ErrorDetails = AccessTokenErrorMessage; - throw new KavitaException("Access token is invalid"); - } - if (response.ErrorMessage != null && response.ErrorMessage.Contains("Unknown Series")) - { - // Log the Series name and Id in ScrobbleErrors - _logger.LogInformation("Kavita+ was unable to match the series"); - if (!await _unitOfWork.ScrobbleRepository.HasErrorForSeries(evt.SeriesId)) - { - _unitOfWork.ScrobbleRepository.Attach(new ScrobbleError() - { - Comment = UnknownSeriesErrorMessage, - Details = data.SeriesName, - LibraryId = evt.LibraryId, - SeriesId = evt.SeriesId - }); - await _unitOfWork.ExternalSeriesMetadataRepository.CreateBlacklistedSeries(evt.SeriesId, false); - } - - evt.IsErrored = true; - evt.ErrorDetails = UnknownSeriesErrorMessage; - } else if (response.ErrorMessage != null && response.ErrorMessage.StartsWith("Review")) - { - // Log the Series name and Id in ScrobbleErrors - _logger.LogInformation("Kavita+ was unable to save the review"); - if (!await _unitOfWork.ScrobbleRepository.HasErrorForSeries(evt.SeriesId)) - { - _unitOfWork.ScrobbleRepository.Attach(new ScrobbleError() - { - Comment = response.ErrorMessage, - Details = data.SeriesName, - LibraryId = evt.LibraryId, - SeriesId = evt.SeriesId - }); - } - evt.IsErrored = true; - evt.ErrorDetails = "Review was unable to be saved due to upstream requirements"; - } - } - - return response.RateLeft; - } - catch (FlurlHttpException ex) - { - _logger.LogError("Scrobbling to Kavita+ API failed due to error: {ErrorMessage}", ex.Message); - if (ex.Message.Contains("Call failed with status code 500 (Internal Server Error)")) - { - if (!await _unitOfWork.ScrobbleRepository.HasErrorForSeries(evt.SeriesId)) - { - _unitOfWork.ScrobbleRepository.Attach(new ScrobbleError() - { - Comment = UnknownSeriesErrorMessage, - Details = data.SeriesName, - LibraryId = evt.LibraryId, - SeriesId = evt.SeriesId - }); - } - evt.IsErrored = true; - evt.ErrorDetails = "Bad payload from Scrobble Provider"; - throw new KavitaException("Bad payload from Scrobble Provider"); - } - throw; - } - } - - /// - /// This will back fill events from existing progress history, ratings, and want to read for users that have a valid license - /// - /// Defaults to 0 meaning all users. Allows a userId to be set if a scrobble key is added to a user - public async Task CreateEventsFromExistingHistory(int userId = 0) - { - var libAllowsScrobbling = (await _unitOfWork.LibraryRepository.GetLibrariesAsync()) - .ToDictionary(lib => lib.Id, lib => lib.AllowScrobbling); - - var userIds = (await _unitOfWork.UserRepository.GetAllUsersAsync()) - .Where(l => userId == 0 || userId == l.Id) - .Select(u => u.Id); - - if (!await _licenseService.HasActiveLicense()) return; - - foreach (var uId in userIds) - { - var wantToRead = await _unitOfWork.SeriesRepository.GetWantToReadForUserAsync(uId); - foreach (var wtr in wantToRead) - { - if (!libAllowsScrobbling[wtr.LibraryId]) continue; - await ScrobbleWantToReadUpdate(uId, wtr.Id, true); - } - - var ratings = await _unitOfWork.UserRepository.GetSeriesWithRatings(uId); - foreach (var rating in ratings) - { - if (!libAllowsScrobbling[rating.Series.LibraryId]) continue; - await ScrobbleRatingUpdate(uId, rating.SeriesId, rating.Rating); - } - - var reviews = await _unitOfWork.UserRepository.GetSeriesWithReviews(uId); - foreach (var review in reviews) - { - if (!libAllowsScrobbling[review.Series.LibraryId]) continue; - await ScrobbleReviewUpdate(uId, review.SeriesId, review.Tagline, review.Review); - } - - var seriesWithProgress = await _unitOfWork.SeriesRepository.GetSeriesDtoForLibraryIdAsync(0, uId, - new UserParams(), new FilterDto() - { - ReadStatus = new ReadStatus() - { - Read = true, - InProgress = true, - NotRead = false - }, - Libraries = libAllowsScrobbling.Keys.Where(k => libAllowsScrobbling[k]).ToList() - }); - - foreach (var series in seriesWithProgress) - { - if (!libAllowsScrobbling[series.LibraryId]) continue; - if (series.PagesRead <= 0) continue; // Since we only scrobble when things are higher, we can - await ScrobbleReadingUpdate(uId, series.Id); - } - - } - } - - /// - /// Removes all events (active) that are tied to a now-on hold series - /// - /// - /// - public async Task ClearEventsForSeries(int userId, int seriesId) - { - _logger.LogInformation("Clearing Pre-existing Scrobble events for Series {SeriesId} by User {UserId} as Series is now on hold list", seriesId, userId); - var events = await _unitOfWork.ScrobbleRepository.GetUserEventsForSeries(userId, seriesId); - foreach (var scrobble in events) - { - _unitOfWork.ScrobbleRepository.Remove(scrobble); - } - - await _unitOfWork.CommitAsync(); - } - - /// - /// Removes all events that have been processed that are 7 days old - /// - [DisableConcurrentExecution(60 * 60 * 60)] - [AutomaticRetry(Attempts = 3, OnAttemptsExceeded = AttemptsExceededAction.Delete)] - public async Task ClearProcessedEvents() - { - var events = await _unitOfWork.ScrobbleRepository.GetProcessedEvents(7); - _unitOfWork.ScrobbleRepository.Remove(events); - await _unitOfWork.CommitAsync(); - } - - /// - /// This is a task that is ran on a fixed schedule (every few hours or every day) that clears out the scrobble event table - /// and offloads the data to the API server which performs the syncing to the providers. - /// - [DisableConcurrentExecution(60 * 60 * 60)] - [AutomaticRetry(Attempts = 3, OnAttemptsExceeded = AttemptsExceededAction.Delete)] - public async Task ProcessUpdatesSinceLastSync() - { - // Check how many scrobble events we have available then only do those. - _logger.LogInformation("Starting Scrobble Processing"); - var userRateLimits = new Dictionary(); - var license = await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey); - - var progressCounter = 0; - - var librariesWithScrobbling = (await _unitOfWork.LibraryRepository.GetLibrariesAsync()) - .AsEnumerable() - .Where(l => l.AllowScrobbling) - .Select(l => l.Id) - .ToImmutableHashSet(); - - var errors = (await _unitOfWork.ScrobbleRepository.GetScrobbleErrors()) - .Where(e => e.Comment == "Unknown Series" || e.Comment == UnknownSeriesErrorMessage || e.Comment == AccessTokenErrorMessage) - .Select(e => e.SeriesId) - .ToList(); - - var readEvents = (await _unitOfWork.ScrobbleRepository.GetByEvent(ScrobbleEventType.ChapterRead)) - .Where(e => librariesWithScrobbling.Contains(e.LibraryId)) - .Where(e => !errors.Contains(e.SeriesId)) - .ToList(); - var addToWantToRead = (await _unitOfWork.ScrobbleRepository.GetByEvent(ScrobbleEventType.AddWantToRead)) - .Where(e => librariesWithScrobbling.Contains(e.LibraryId)) - .Where(e => !errors.Contains(e.SeriesId)) - .ToList(); - var removeWantToRead = (await _unitOfWork.ScrobbleRepository.GetByEvent(ScrobbleEventType.RemoveWantToRead)) - .Where(e => librariesWithScrobbling.Contains(e.LibraryId)) - .Where(e => !errors.Contains(e.SeriesId)) - .ToList(); - var ratingEvents = (await _unitOfWork.ScrobbleRepository.GetByEvent(ScrobbleEventType.ScoreUpdated)) - .Where(e => librariesWithScrobbling.Contains(e.LibraryId)) - .Where(e => !errors.Contains(e.SeriesId)) - .ToList(); - - var decisions = addToWantToRead - .GroupBy(item => new { item.SeriesId, item.AppUserId }) - .Select(group => new - { - group.Key.SeriesId, - UserId = group.Key.AppUserId, - Event = group.First(), - Decision = group.Count() - removeWantToRead - .Count(removeItem => removeItem.SeriesId == group.Key.SeriesId && removeItem.AppUserId == group.Key.AppUserId) - }) - .Where(d => d.Decision > 0) - .Select(d => d.Event) - .ToList(); - - // For all userIds, ensure that we can connect and have access - var usersToScrobble = readEvents.Select(r => r.AppUser) - .Concat(addToWantToRead.Select(r => r.AppUser)) - .Concat(removeWantToRead.Select(r => r.AppUser)) - .Concat(ratingEvents.Select(r => r.AppUser)) - .Where(user => !string.IsNullOrEmpty(user.AniListAccessToken)) - .DistinctBy(u => u.Id) - .ToList(); - foreach (var user in usersToScrobble) - { - await SetAndCheckRateLimit(userRateLimits, user, license.Value); - } - - var totalProgress = readEvents.Count + decisions.Count + ratingEvents.Count + decisions.Count; - - _logger.LogInformation("Found {TotalEvents} Scrobble Events", totalProgress); - try - { - // Recalculate the highest volume/chapter - foreach (var readEvt in readEvents) - { - readEvt.VolumeNumber = - (int) await _unitOfWork.AppUserProgressRepository.GetHighestFullyReadVolumeForSeries(readEvt.SeriesId, - readEvt.AppUser.Id); - readEvt.ChapterNumber = - await _unitOfWork.AppUserProgressRepository.GetHighestFullyReadChapterForSeries(readEvt.SeriesId, - readEvt.AppUser.Id); - _unitOfWork.ScrobbleRepository.Update(readEvt); - } - progressCounter = await ProcessEvents(readEvents, userRateLimits, usersToScrobble.Count, progressCounter, totalProgress, async evt => new ScrobbleDto() - { - Format = evt.Format, - AniListId = evt.AniListId, - MALId = (int?) evt.MalId, - ScrobbleEventType = evt.ScrobbleEventType, - ChapterNumber = evt.ChapterNumber, - VolumeNumber = (int?) evt.VolumeNumber, - AniListToken = evt.AppUser.AniListAccessToken, - SeriesName = evt.Series.Name, - LocalizedSeriesName = evt.Series.LocalizedName, - ScrobbleDateUtc = evt.LastModifiedUtc, - Year = evt.Series.Metadata.ReleaseYear, - StartedReadingDateUtc = await _unitOfWork.AppUserProgressRepository.GetFirstProgressForSeries(evt.SeriesId, evt.AppUser.Id), - LatestReadingDateUtc = await _unitOfWork.AppUserProgressRepository.GetLatestProgressForSeries(evt.SeriesId, evt.AppUser.Id), - }); - - progressCounter = await ProcessEvents(ratingEvents, userRateLimits, usersToScrobble.Count, progressCounter, - totalProgress, evt => Task.FromResult(new ScrobbleDto() - { - Format = evt.Format, - AniListId = evt.AniListId, - MALId = (int?) evt.MalId, - ScrobbleEventType = evt.ScrobbleEventType, - AniListToken = evt.AppUser.AniListAccessToken, - SeriesName = evt.Series.Name, - LocalizedSeriesName = evt.Series.LocalizedName, - Rating = evt.Rating, - Year = evt.Series.Metadata.ReleaseYear - })); - - progressCounter = await ProcessEvents(decisions, userRateLimits, usersToScrobble.Count, progressCounter, - totalProgress, evt => Task.FromResult(new ScrobbleDto() - { - Format = evt.Format, - AniListId = evt.AniListId, - MALId = (int?) evt.MalId, - ScrobbleEventType = evt.ScrobbleEventType, - ChapterNumber = evt.ChapterNumber, - VolumeNumber = (int?) evt.VolumeNumber, - AniListToken = evt.AppUser.AniListAccessToken, - SeriesName = evt.Series.Name, - LocalizedSeriesName = evt.Series.LocalizedName, - Year = evt.Series.Metadata.ReleaseYear - })); - - // After decisions, we need to mark all the want to read and remove from want to read as completed - if (decisions.All(d => d.IsProcessed)) - { - foreach (var scrobbleEvent in addToWantToRead) - { - scrobbleEvent.IsProcessed = true; - scrobbleEvent.ProcessDateUtc = DateTime.UtcNow; - _unitOfWork.ScrobbleRepository.Update(scrobbleEvent); - } - foreach (var scrobbleEvent in removeWantToRead) - { - scrobbleEvent.IsProcessed = true; - scrobbleEvent.ProcessDateUtc = DateTime.UtcNow; - _unitOfWork.ScrobbleRepository.Update(scrobbleEvent); - } - await _unitOfWork.CommitAsync(); - } - } - catch (FlurlHttpException) - { - _logger.LogError("Kavita+ API or a Scrobble service may be experiencing an outage. Stopping sending data"); - return; - } - - - await SaveToDb(progressCounter, true); - _logger.LogInformation("Scrobbling Events is complete"); - } - - - private async Task ProcessEvents(IEnumerable events, IDictionary userRateLimits, - int usersToScrobble, int progressCounter, int totalProgress, Func> createEvent) - { - var license = await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey); - foreach (var evt in events) - { - _logger.LogDebug("Processing Reading Events: {Count} / {Total}", progressCounter, totalProgress); - progressCounter++; - // Check if this media item can even be processed for this user - if (!DoesUserHaveProviderAndValid(evt)) - { - continue; - } - - if (TokenService.HasTokenExpired(evt.AppUser.AniListAccessToken)) - { - _unitOfWork.ScrobbleRepository.Attach(new ScrobbleError() - { - Comment = "AniList token has expired and needs rotating. Scrobbles wont work until then", - Details = $"User: {evt.AppUser.UserName}", - LibraryId = evt.LibraryId, - SeriesId = evt.SeriesId - }); - await _unitOfWork.CommitAsync(); - return 0; - } - - if (await _unitOfWork.ExternalSeriesMetadataRepository.IsBlacklistedSeries(evt.SeriesId)) - { - _unitOfWork.ScrobbleRepository.Attach(new ScrobbleError() - { - Comment = UnknownSeriesErrorMessage, - Details = $"User: {evt.AppUser.UserName} Series: {evt.Series.Name}", - LibraryId = evt.LibraryId, - SeriesId = evt.SeriesId - }); - evt.IsErrored = true; - evt.ErrorDetails = UnknownSeriesErrorMessage; - evt.ProcessDateUtc = DateTime.UtcNow; - _unitOfWork.ScrobbleRepository.Update(evt); - await _unitOfWork.CommitAsync(); - return 0; - } - - var count = await SetAndCheckRateLimit(userRateLimits, evt.AppUser, license.Value); - userRateLimits[evt.AppUserId] = count; - if (count == 0) - { - if (usersToScrobble == 1) break; - continue; - } - - try - { - var data = await createEvent(evt); - // We need to handle the encoding and changing it to the old one until we can update the API layer to handle these - // which could happen in v0.8.3 - if (data.VolumeNumber is Parser.SpecialVolumeNumber) - { - data.VolumeNumber = 0; - } - if (data.VolumeNumber is Parser.DefaultChapterNumber) - { - data.VolumeNumber = 0; - } - if (data.ChapterNumber is Parser.DefaultChapterNumber) - { - data.ChapterNumber = 0; - } - userRateLimits[evt.AppUserId] = await PostScrobbleUpdate(data, license.Value, evt); - evt.IsProcessed = true; - evt.ProcessDateUtc = DateTime.UtcNow; - _unitOfWork.ScrobbleRepository.Update(evt); - } - catch (FlurlHttpException) - { - // If a flurl exception occured, the API is likely down. Kill processing - throw; - } - catch (KavitaException ex) - { - if (ex.Message.Contains("Access token is invalid")) - { - _logger.LogCritical("Access Token for UserId: {UserId} needs to be rotated to continue scrobbling", evt.AppUser.Id); - evt.IsErrored = true; - evt.ErrorDetails = AccessTokenErrorMessage; - _unitOfWork.ScrobbleRepository.Update(evt); - return progressCounter; - } - } - catch (Exception) - { - /* Swallow as it's already been handled in PostScrobbleUpdate */ - } - await SaveToDb(progressCounter); - // We can use count to determine how long to sleep based on rate gain. It might be specific to AniList, but we can model others - var delay = count > 10 ? TimeSpan.FromMilliseconds(ScrobbleSleepTime) : TimeSpan.FromSeconds(60); - await Task.Delay(delay); - } - - await SaveToDb(progressCounter, true); - return progressCounter; - } - - private async Task SaveToDb(int progressCounter, bool force = false) - { - if (!force || progressCounter % 5 == 0) - { - _logger.LogDebug("Saving Progress"); - await _unitOfWork.CommitAsync(); - } - } - - - private static bool DoesUserHaveProviderAndValid(ScrobbleEvent readEvent) - { - var userProviders = GetUserProviders(readEvent.AppUser); - if (readEvent.Series.Library.Type == LibraryType.Manga && MangaProviders.Intersect(userProviders).Any()) - { - return true; - } - - if (readEvent.Series.Library.Type == LibraryType.Comic && - ComicProviders.Intersect(userProviders).Any()) - { - return true; - } - - if (readEvent.Series.Library.Type == LibraryType.Book && - BookProviders.Intersect(userProviders).Any()) - { - return true; - } - - if (readEvent.Series.Library.Type == LibraryType.LightNovel && - LightNovelProviders.Intersect(userProviders).Any()) - { - return true; - } - - return false; - } - - private static IList GetUserProviders(AppUser appUser) - { - var providers = new List(); - if (!string.IsNullOrEmpty(appUser.AniListAccessToken)) providers.Add(ScrobbleProvider.AniList); - return providers; + var aniListId = ExtractId(seriesWithExternalMetadata.Metadata.WebLinks, AniListWeblinkWebsite); + return aniListId ?? seriesWithExternalMetadata.ExternalSeriesMetadata?.AniListId; } /// @@ -935,17 +556,23 @@ public class ScrobblingService : IScrobblingService foreach (var webLink in webLinks.Split(',')) { if (!webLink.StartsWith(website)) continue; + var tokens = webLink.Split(website)[1].Split('/'); var value = tokens[index]; + if (typeof(T) == typeof(int?)) { - if (int.TryParse(value, out var intValue)) - return (T)(object)intValue; + if (int.TryParse(value, CultureInfo.InvariantCulture, out var intValue)) return (T)(object)intValue; + } + else if (typeof(T) == typeof(int)) + { + if (int.TryParse(value, CultureInfo.InvariantCulture, out var intValue)) return (T)(object)intValue; + + return default; } else if (typeof(T) == typeof(long?)) { - if (long.TryParse(value, out var longValue)) - return (T)(object)longValue; + if (long.TryParse(value, CultureInfo.InvariantCulture, out var longValue)) return (T)(object)longValue; } else if (typeof(T) == typeof(string)) { @@ -953,7 +580,813 @@ public class ScrobblingService : IScrobblingService } } - return default(T?); + return default; + } + + /// + /// Generate a URL from a given ID and website + /// + /// Type of the ID (e.g., int, long, string) + /// The ID to embed in the URL + /// The base website URL + /// The generated URL or null if the website is not supported + public static string? GenerateUrl(T id, string website) + { + if (!WeblinkExtractionMap.ContainsKey(website)) + { + return null; // Unsupported website + } + + if (Equals(id, default(T))) + { + throw new ArgumentNullException(nameof(id), "ID cannot be null."); + } + + // Ensure the type of the ID matches supported types + if (typeof(T) == typeof(int) || typeof(T) == typeof(long) || typeof(T) == typeof(string)) + { + return $"{website}{id}"; + } + + throw new ArgumentException("Unsupported ID type. Supported types are int, long, and string.", nameof(id)); + } + + public static string CreateUrl(string url, long? id) + { + return id is null or 0 ? string.Empty : $"{url}{id}/"; + } + + #endregion + + /// + /// Returns false if, the series is on hold or Don't Match, or when the library has scrobbling disable or not eligible + /// + /// + /// + /// + /// + private async Task CheckIfCannotScrobble(int userId, int seriesId, Series series) + { + if (series.DontMatch) return true; + + if (await _unitOfWork.UserRepository.HasHoldOnSeries(userId, seriesId)) + { + _logger.LogInformation("Series {SeriesName} is on AppUserId {AppUserId}'s hold list. Not scrobbling", series.Name, userId); + return true; + } + + var library = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(series.LibraryId); + if (library is not {AllowScrobbling: true} || !ExternalMetadataService.IsPlusEligible(library.Type)) return true; + + return false; + } + + /// + /// Returns the rate limit from the K+ api + /// + /// + /// + /// + private async Task GetRateLimit(string license, string aniListToken) + { + if (string.IsNullOrWhiteSpace(aniListToken)) return 0; + + try + { + return await _kavitaPlusApiService.GetRateLimit(license, aniListToken); + } + catch (Exception e) + { + _logger.LogError(e, "An error happened trying to get rate limit from Kavita+ API"); + } + + return 0; + } + + #region Scrobble process (Requests to K+) + + /// + /// Retrieve all events for which the series has not errored, then delete all current errors + /// + private async Task PrepareScrobbleContext() + { + var librariesWithScrobbling = (await _unitOfWork.LibraryRepository.GetLibrariesAsync()) + .AsEnumerable() + .Where(l => l.AllowScrobbling) + .Select(l => l.Id) + .ToImmutableHashSet(); + + var erroredSeries = (await _unitOfWork.ScrobbleRepository.GetScrobbleErrors()) + .Where(e => e.Comment is "Unknown Series" or UnknownSeriesErrorMessage or AccessTokenErrorMessage) + .Select(e => e.SeriesId) + .ToList(); + + var readEvents = (await _unitOfWork.ScrobbleRepository.GetByEvent(ScrobbleEventType.ChapterRead)) + .Where(e => librariesWithScrobbling.Contains(e.LibraryId)) + .Where(e => !erroredSeries.Contains(e.SeriesId)) + .ToList(); + var addToWantToRead = (await _unitOfWork.ScrobbleRepository.GetByEvent(ScrobbleEventType.AddWantToRead)) + .Where(e => librariesWithScrobbling.Contains(e.LibraryId)) + .Where(e => !erroredSeries.Contains(e.SeriesId)) + .ToList(); + var removeWantToRead = (await _unitOfWork.ScrobbleRepository.GetByEvent(ScrobbleEventType.RemoveWantToRead)) + .Where(e => librariesWithScrobbling.Contains(e.LibraryId)) + .Where(e => !erroredSeries.Contains(e.SeriesId)) + .ToList(); + var ratingEvents = (await _unitOfWork.ScrobbleRepository.GetByEvent(ScrobbleEventType.ScoreUpdated)) + .Where(e => librariesWithScrobbling.Contains(e.LibraryId)) + .Where(e => !erroredSeries.Contains(e.SeriesId)) + .ToList(); + + return new ScrobbleSyncContext + { + ReadEvents = readEvents, + RatingEvents = ratingEvents, + AddToWantToRead = addToWantToRead, + RemoveWantToRead = removeWantToRead, + Decisions = CalculateNetWantToReadDecisions(addToWantToRead, removeWantToRead), + RateLimits = [], + License = (await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey)).Value, + }; + } + + /// + /// Filters users who can scrobble, sets their rate limit and updates the + /// + /// + /// + private async Task PrepareUsersToScrobble(ScrobbleSyncContext ctx) + { + // For all userIds, ensure that we can connect and have access + var usersToScrobble = ctx.ReadEvents.Select(r => r.AppUser) + .Concat(ctx.AddToWantToRead.Select(r => r.AppUser)) + .Concat(ctx.RemoveWantToRead.Select(r => r.AppUser)) + .Concat(ctx.RatingEvents.Select(r => r.AppUser)) + .Where(user => !string.IsNullOrEmpty(user.AniListAccessToken)) + .Where(user => user.UserPreferences.AniListScrobblingEnabled) + .DistinctBy(u => u.Id) + .ToList(); + + foreach (var user in usersToScrobble) + { + await SetAndCheckRateLimit(ctx.RateLimits, user, ctx.License); + } + + ctx.Users = usersToScrobble; + } + + /// + /// Cleans up any events that are due to bugs or legacy + /// + private async Task CleanupOldOrBuggedEvents() + { + try + { + var eventsWithoutAnilistToken = (await _unitOfWork.ScrobbleRepository.GetEvents()) + .Where(e => e is { IsProcessed: false, IsErrored: false }) + .Where(e => string.IsNullOrEmpty(e.AppUser.AniListAccessToken)); + + _unitOfWork.ScrobbleRepository.Remove(eventsWithoutAnilistToken); + await _unitOfWork.CommitAsync(); + } + catch (Exception ex) + { + _logger.LogError(ex, "There was an exception when trying to delete old scrobble events when the user has no active token"); + } + } + + /// + /// This is a task that is run on a fixed schedule (every few hours or every day) that clears out the scrobble event table + /// and offloads the data to the API server which performs the syncing to the providers. + /// + [DisableConcurrentExecution(60 * 60 * 60)] + [AutomaticRetry(Attempts = 3, OnAttemptsExceeded = AttemptsExceededAction.Delete)] + public async Task ProcessUpdatesSinceLastSync() + { + var ctx = await PrepareScrobbleContext(); + if (ctx.TotalCount == 0) return; + + // Get all the applicable users to scrobble and set their rate limits + await PrepareUsersToScrobble(ctx); + + _logger.LogInformation("Scrobble Processing Details:" + + "\n Read Events: {ReadEventsCount}" + + "\n Want to Read Events: {WantToReadEventsCount}" + + "\n Rating Events: {RatingEventsCount}" + + "\n Users to Scrobble: {UsersToScrobbleCount}" + + "\n Total Events to Process: {TotalEvents}", + ctx.ReadEvents.Count, + ctx.Decisions.Count, + ctx.RatingEvents.Count, + ctx.Users.Count, + ctx.TotalCount); + + try + { + await ProcessReadEvents(ctx); + await ProcessRatingEvents(ctx); + await ProcessWantToReadRatingEvents(ctx); + } + catch (FlurlHttpException ex) + { + _logger.LogError(ex, "Kavita+ API or a Scrobble service may be experiencing an outage. Stopping sending data"); + return; + } + + + await SaveToDb(ctx.ProgressCounter, true); + _logger.LogInformation("Scrobbling Events is complete"); + + await CleanupOldOrBuggedEvents(); + } + + /// + /// Calculates the net want-to-read decisions by considering all events. + /// Returns events that represent the final state for each user/series pair. + /// + /// List of events for adding to want-to-read + /// List of events for removing from want-to-read + /// List of events that represent the final state (add or remove) + private static List CalculateNetWantToReadDecisions(List addEvents, List removeEvents) + { + // Create a dictionary to track the latest event for each user/series combination + var latestEvents = new Dictionary<(int SeriesId, int AppUserId), ScrobbleEvent>(); + + // Process all add events + foreach (var addEvent in addEvents) + { + var key = (addEvent.SeriesId, addEvent.AppUserId); + + if (latestEvents.TryGetValue(key, out var value) && addEvent.CreatedUtc <= value.CreatedUtc) continue; + + value = addEvent; + latestEvents[key] = value; + } + + // Process all remove events + foreach (var removeEvent in removeEvents) + { + var key = (removeEvent.SeriesId, removeEvent.AppUserId); + + if (latestEvents.TryGetValue(key, out var value) && removeEvent.CreatedUtc <= value.CreatedUtc) continue; + + value = removeEvent; + latestEvents[key] = value; + } + + // Return all events that represent the final state + return latestEvents.Values.ToList(); + } + + private async Task ProcessWantToReadRatingEvents(ScrobbleSyncContext ctx) + { + await ProcessEvents(ctx.Decisions, ctx, evt => Task.FromResult(new ScrobbleDto + { + Format = evt.Format, + AniListId = evt.AniListId, + MALId = (int?) evt.MalId, + ScrobbleEventType = evt.ScrobbleEventType, + ChapterNumber = evt.ChapterNumber, + VolumeNumber = (int?) evt.VolumeNumber, + AniListToken = evt.AppUser.AniListAccessToken ?? string.Empty, + SeriesName = evt.Series.Name, + LocalizedSeriesName = evt.Series.LocalizedName, + Year = evt.Series.Metadata.ReleaseYear + })); + + // After decisions, we need to mark all the want to read and remove from want to read as completed + var processedDecisions = ctx.Decisions.Where(d => d.IsProcessed).ToList(); + if (processedDecisions.Count > 0) + { + foreach (var scrobbleEvent in processedDecisions) + { + scrobbleEvent.IsProcessed = true; + scrobbleEvent.ProcessDateUtc = DateTime.UtcNow; + _unitOfWork.ScrobbleRepository.Update(scrobbleEvent); + } + await _unitOfWork.CommitAsync(); + } + } + + private async Task ProcessRatingEvents(ScrobbleSyncContext ctx) + { + await ProcessEvents(ctx.RatingEvents, ctx, evt => Task.FromResult(new ScrobbleDto + { + Format = evt.Format, + AniListId = evt.AniListId, + MALId = (int?) evt.MalId, + ScrobbleEventType = evt.ScrobbleEventType, + AniListToken = evt.AppUser.AniListAccessToken ?? string.Empty, + SeriesName = evt.Series.Name, + LocalizedSeriesName = evt.Series.LocalizedName, + Rating = evt.Rating, + Year = evt.Series.Metadata.ReleaseYear + })); + } + + private async Task ProcessReadEvents(ScrobbleSyncContext ctx) + { + // Recalculate the highest volume/chapter + foreach (var readEvt in ctx.ReadEvents) + { + // Note: this causes skewing in the scrobble history because it makes it look like there are duplicate events + readEvt.VolumeNumber = + (int) await _unitOfWork.AppUserProgressRepository.GetHighestFullyReadVolumeForSeries(readEvt.SeriesId, + readEvt.AppUser.Id); + readEvt.ChapterNumber = + await _unitOfWork.AppUserProgressRepository.GetHighestFullyReadChapterForSeries(readEvt.SeriesId, + readEvt.AppUser.Id); + _unitOfWork.ScrobbleRepository.Update(readEvt); + } + + await ProcessEvents(ctx.ReadEvents, ctx, async evt => new ScrobbleDto + { + Format = evt.Format, + AniListId = evt.AniListId, + MALId = (int?) evt.MalId, + ScrobbleEventType = evt.ScrobbleEventType, + ChapterNumber = evt.ChapterNumber, + VolumeNumber = (int?) evt.VolumeNumber, + AniListToken = evt.AppUser.AniListAccessToken ?? string.Empty, + SeriesName = evt.Series.Name, + LocalizedSeriesName = evt.Series.LocalizedName, + ScrobbleDateUtc = evt.LastModifiedUtc, + Year = evt.Series.Metadata.ReleaseYear, + StartedReadingDateUtc = await _unitOfWork.AppUserProgressRepository.GetFirstProgressForSeries(evt.SeriesId, evt.AppUser.Id), + LatestReadingDateUtc = await _unitOfWork.AppUserProgressRepository.GetLatestProgressForSeries(evt.SeriesId, evt.AppUser.Id), + }); + } + + /// + /// Returns true if the user token is valid + /// + /// + /// + /// If the token is not, adds a scrobble error + private async Task ValidateUserToken(ScrobbleEvent evt) + { + if (!TokenService.HasTokenExpired(evt.AppUser.AniListAccessToken)) + return true; + + _unitOfWork.ScrobbleRepository.Attach(new ScrobbleError + { + Comment = "AniList token has expired and needs rotating. Scrobbling wont work until then", + Details = $"User: {evt.AppUser.UserName}, Expired: {TokenService.GetTokenExpiry(evt.AppUser.AniListAccessToken)}", + LibraryId = evt.LibraryId, + SeriesId = evt.SeriesId + }); + await _unitOfWork.CommitAsync(); + return false; + } + + /// + /// Returns true if the series can be scrobbled + /// + /// + /// + /// If the series cannot be scrobbled, adds a scrobble error + private async Task ValidateSeriesCanBeScrobbled(ScrobbleEvent evt) + { + if (evt.Series is { IsBlacklisted: false, DontMatch: false }) + return true; + + _logger.LogInformation("Series {SeriesName} ({SeriesId}) can't be matched and thus cannot scrobble this event", + evt.Series.Name, evt.SeriesId); + + _unitOfWork.ScrobbleRepository.Attach(new ScrobbleError + { + Comment = UnknownSeriesErrorMessage, + Details = $"User: {evt.AppUser.UserName} Series: {evt.Series.Name}", + LibraryId = evt.LibraryId, + SeriesId = evt.SeriesId + }); + + evt.SetErrorMessage(UnknownSeriesErrorMessage); + evt.ProcessDateUtc = DateTime.UtcNow; + _unitOfWork.ScrobbleRepository.Update(evt); + await _unitOfWork.CommitAsync(); + return false; + } + + /// + /// Removed Special parses numbers from chatter and volume numbers + /// + /// + /// + private static ScrobbleDto NormalizeScrobbleData(ScrobbleDto data) + { + // We need to handle the encoding and changing it to the old one until we can update the API layer to handle these + // which could happen in v0.8.3 + if (data.VolumeNumber is Parser.SpecialVolumeNumber or Parser.DefaultChapterNumber) + { + data.VolumeNumber = 0; + } + + + if (data.ChapterNumber is Parser.DefaultChapterNumber) + { + data.ChapterNumber = 0; + } + + + return data; + } + + /// + /// Loops through all events, and post them to K+ + /// + /// + /// + /// + private async Task ProcessEvents(IEnumerable events, ScrobbleSyncContext ctx, Func> createEvent) + { + foreach (var evt in events.Where(CanProcessScrobbleEvent)) + { + _logger.LogDebug("Processing Scrobble Events: {Count} / {Total}", ctx.ProgressCounter, ctx.TotalCount); + ctx.ProgressCounter++; + + if (!await ValidateUserToken(evt)) continue; + if (!await ValidateSeriesCanBeScrobbled(evt)) continue; + + var count = await SetAndCheckRateLimit(ctx.RateLimits, evt.AppUser, ctx.License); + if (count == 0) + { + if (ctx.Users.Count == 1) break; + continue; + } + + try + { + var data = NormalizeScrobbleData(await createEvent(evt)); + + ctx.RateLimits[evt.AppUserId] = await PostScrobbleUpdate(data, ctx.License, evt); + + evt.IsProcessed = true; + evt.ProcessDateUtc = DateTime.UtcNow; + _unitOfWork.ScrobbleRepository.Update(evt); + } + catch (FlurlHttpException) + { + // If a flurl exception occured, the API is likely down. Kill processing + throw; + } + catch (KavitaException ex) + { + if (ex.Message.Contains("Access token is invalid")) + { + _logger.LogCritical(ex, "Access Token for AppUserId: {AppUserId} needs to be regenerated/renewed to continue scrobbling", evt.AppUser.Id); + evt.SetErrorMessage(AccessTokenErrorMessage); + _unitOfWork.ScrobbleRepository.Update(evt); + + // Ensure series with this error do not get re-processed next sync + _unitOfWork.ScrobbleRepository.Attach(new ScrobbleError + { + Comment = AccessTokenErrorMessage, + Details = $"{evt.AppUser.UserName} has an invalid access token (K+ Error)", + LibraryId = evt.LibraryId, + SeriesId = evt.SeriesId, + }); + } + } + catch (Exception ex) + { + /* Swallow as it's already been handled in PostScrobbleUpdate */ + _logger.LogError(ex, "Error processing event {EventId}", evt.Id); + } + + await SaveToDb(ctx.ProgressCounter); + + // We can use count to determine how long to sleep based on rate gain. It might be specific to AniList, but we can model others + var delay = count > 10 ? TimeSpan.FromMilliseconds(ScrobbleSleepTime) : TimeSpan.FromSeconds(60); + await Task.Delay(delay); + } + + await SaveToDb(ctx.ProgressCounter, true); + } + + /// + /// Save changes every five updates + /// + /// + /// Ignore update count check + private async Task SaveToDb(int progressCounter, bool force = false) + { + if ((force || progressCounter % 5 == 0) && _unitOfWork.HasChanges()) + { + _logger.LogDebug("Saving Scrobbling Event Processing Progress"); + await _unitOfWork.CommitAsync(); + } + } + + /// + /// If no errors have been logged for the given series, creates a new Unknown series error, and blacklists the series + /// + /// + /// + private async Task MarkSeriesAsUnknown(ScrobbleDto data, ScrobbleEvent evt) + { + if (await _unitOfWork.ScrobbleRepository.HasErrorForSeries(evt.SeriesId)) return; + + // Create a new ExternalMetadata entry to indicate that this is not matchable + var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(evt.SeriesId, SeriesIncludes.ExternalMetadata); + if (series == null) return; + + series.ExternalSeriesMetadata ??= new ExternalSeriesMetadata {SeriesId = evt.SeriesId}; + series.IsBlacklisted = true; + _unitOfWork.SeriesRepository.Update(series); + + _unitOfWork.ScrobbleRepository.Attach(new ScrobbleError + { + Comment = UnknownSeriesErrorMessage, + Details = data.SeriesName, + LibraryId = evt.LibraryId, + SeriesId = evt.SeriesId + }); + } + + /// + /// Makes the K+ request, and handles any exceptions that occur + /// + /// Data to send to K+ + /// K+ license key + /// Related scrobble event + /// + /// Exceptions may be rethrown as a KavitaException + /// Some FlurlHttpException are also rethrown + public async Task PostScrobbleUpdate(ScrobbleDto data, string license, ScrobbleEvent evt) + { + try + { + var response = await _kavitaPlusApiService.PostScrobbleUpdate(data, license); + + _logger.LogDebug("K+ API Scrobble response for series {SeriesName}: Successful {Successful}, ErrorMessage {ErrorMessage}, ExtraInformation: {ExtraInformation}, RateLeft: {RateLeft}", + data.SeriesName, response.Successful, response.ErrorMessage, response.ExtraInformation, response.RateLeft); + + if (response.Successful || response.ErrorMessage == null) return response.RateLeft; + + // Might want to log this under ScrobbleError + if (response.ErrorMessage.Contains("Too Many Requests")) + { + _logger.LogInformation("Hit Too many requests while posting scrobble updates, sleeping to regain requests and retrying"); + await Task.Delay(TimeSpan.FromMinutes(10)); + return await PostScrobbleUpdate(data, license, evt); + } + + if (response.ErrorMessage.Contains("Unauthorized")) + { + _logger.LogCritical("Kavita+ responded with Unauthorized. Please check your subscription"); + await _licenseService.HasActiveLicense(true); + evt.SetErrorMessage(InvalidKPlusLicenseErrorMessage); + throw new KavitaException("Kavita+ responded with Unauthorized. Please check your subscription"); + } + + if (response.ErrorMessage.Contains("Access token is invalid")) + { + evt.SetErrorMessage(AccessTokenErrorMessage); + throw new KavitaException("Access token is invalid"); + } + + if (response.ErrorMessage.Contains("Unknown Series")) + { + // Log the Series name and Id in ScrobbleErrors + _logger.LogInformation("Kavita+ was unable to match the series: {SeriesName}", evt.Series.Name); + await MarkSeriesAsUnknown(data, evt); + evt.SetErrorMessage(UnknownSeriesErrorMessage); + } else if (response.ErrorMessage.StartsWith("Review")) + { + // Log the Series name and Id in ScrobbleErrors + _logger.LogInformation("Kavita+ was unable to save the review"); + if (!await _unitOfWork.ScrobbleRepository.HasErrorForSeries(evt.SeriesId)) + { + _unitOfWork.ScrobbleRepository.Attach(new ScrobbleError() + { + Comment = response.ErrorMessage, + Details = data.SeriesName, + LibraryId = evt.LibraryId, + SeriesId = evt.SeriesId + }); + } + evt.SetErrorMessage(ReviewFailedErrorMessage); + } + + return response.RateLeft; + } + catch (FlurlHttpException ex) + { + var errorMessage = await ex.GetResponseStringAsync(); + // Trim quotes if the response is a JSON string + errorMessage = errorMessage.Trim('"'); + + if (errorMessage.Contains("Too Many Requests")) + { + _logger.LogInformation("Hit Too many requests while posting scrobble updates, sleeping to regain requests and retrying"); + await Task.Delay(TimeSpan.FromMinutes(10)); + return await PostScrobbleUpdate(data, license, evt); + } + + _logger.LogError(ex, "Scrobbling to Kavita+ API failed due to error: {ErrorMessage}", ex.Message); + if (ex.StatusCode == 500 || ex.Message.Contains("Call failed with status code 500 (Internal Server Error)")) + { + if (!await _unitOfWork.ScrobbleRepository.HasErrorForSeries(evt.SeriesId)) + { + _unitOfWork.ScrobbleRepository.Attach(new ScrobbleError() + { + Comment = UnknownSeriesErrorMessage, + Details = data.SeriesName, + LibraryId = evt.LibraryId, + SeriesId = evt.SeriesId + }); + } + evt.SetErrorMessage(BadPayLoadErrorMessage); + throw new KavitaException(BadPayLoadErrorMessage); + } + throw; + } + } + + #endregion + + #region BackFill + + + /// + /// This will backfill events from existing progress history, ratings, and want to read for users that have a valid license + /// + /// Defaults to 0 meaning all users. Allows a userId to be set if a scrobble key is added to a user + public async Task CreateEventsFromExistingHistory(int userId = 0) + { + if (!await _licenseService.HasActiveLicense()) return; + + if (userId != 0) + { + var user = await _unitOfWork.UserRepository.GetUserByIdAsync(userId); + if (user == null || string.IsNullOrEmpty(user.AniListAccessToken)) return; + if (user.HasRunScrobbleEventGeneration) + { + _logger.LogWarning("User {UserName} has already run scrobble event generation, Kavita will not generate more events", user.UserName); + return; + } + } + + var libAllowsScrobbling = (await _unitOfWork.LibraryRepository.GetLibrariesAsync()) + .ToDictionary(lib => lib.Id, lib => lib.AllowScrobbling); + + var userIds = (await _unitOfWork.UserRepository.GetAllUsersAsync()) + .Where(l => userId == 0 || userId == l.Id) + .Where(u => !u.HasRunScrobbleEventGeneration) + .Select(u => u.Id); + + foreach (var uId in userIds) + { + await CreateEventsFromExistingHistoryForUser(uId, libAllowsScrobbling); + } + } + + /// + /// Creates wantToRead, rating, reviews, and series progress events for the suer + /// + /// + /// + private async Task CreateEventsFromExistingHistoryForUser(int userId, Dictionary libAllowsScrobbling) + { + var wantToRead = await _unitOfWork.SeriesRepository.GetWantToReadForUserAsync(userId); + foreach (var wtr in wantToRead) + { + if (!libAllowsScrobbling[wtr.LibraryId]) continue; + await ScrobbleWantToReadUpdate(userId, wtr.Id, true); + } + + var ratings = await _unitOfWork.UserRepository.GetSeriesWithRatings(userId); + foreach (var rating in ratings) + { + if (!libAllowsScrobbling[rating.Series.LibraryId]) continue; + await ScrobbleRatingUpdate(userId, rating.SeriesId, rating.Rating); + } + + var reviews = await _unitOfWork.UserRepository.GetSeriesWithReviews(userId); + foreach (var review in reviews.Where(r => !string.IsNullOrEmpty(r.Review))) + { + if (!libAllowsScrobbling[review.Series.LibraryId]) continue; + await ScrobbleReviewUpdate(userId, review.SeriesId, string.Empty, review.Review!); + } + + var seriesWithProgress = await _unitOfWork.SeriesRepository.GetSeriesDtoForLibraryIdAsync(0, userId, + new UserParams(), new FilterDto + { + ReadStatus = new ReadStatus + { + Read = true, + InProgress = true, + NotRead = false + }, + Libraries = libAllowsScrobbling.Keys.Where(k => libAllowsScrobbling[k]).ToList() + }); + + foreach (var series in seriesWithProgress.Where(series => series.PagesRead > 0)) + { + if (!libAllowsScrobbling[series.LibraryId]) continue; + await ScrobbleReadingUpdate(userId, series.Id); + } + + var user = await _unitOfWork.UserRepository.GetUserByIdAsync(userId); + if (user != null) + { + user.HasRunScrobbleEventGeneration = true; + user.ScrobbleEventGenerationRan = DateTime.UtcNow; + await _unitOfWork.CommitAsync(); + } + } + + public async Task CreateEventsFromExistingHistoryForSeries(int seriesId) + { + if (!await _licenseService.HasActiveLicense()) return; + + var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId, SeriesIncludes.Library); + if (series == null || !series.Library.AllowScrobbling) return; + + _logger.LogInformation("Creating Scrobbling events for Series {SeriesName}", series.Name); + + var userIds = (await _unitOfWork.UserRepository.GetAllUsersAsync()).Select(u => u.Id); + + foreach (var uId in userIds) + { + // Handle "Want to Read" updates specific to the series + var wantToRead = await _unitOfWork.SeriesRepository.GetWantToReadForUserAsync(uId); + foreach (var wtr in wantToRead.Where(wtr => wtr.Id == seriesId)) + { + await ScrobbleWantToReadUpdate(uId, wtr.Id, true); + } + + // Handle ratings specific to the series + var ratings = await _unitOfWork.UserRepository.GetSeriesWithRatings(uId); + foreach (var rating in ratings.Where(rating => rating.SeriesId == seriesId)) + { + await ScrobbleRatingUpdate(uId, rating.SeriesId, rating.Rating); + } + + // Handle review specific to the series + var reviews = await _unitOfWork.UserRepository.GetSeriesWithReviews(uId); + foreach (var review in reviews.Where(r => r.SeriesId == seriesId && !string.IsNullOrEmpty(r.Review))) + { + await ScrobbleReviewUpdate(uId, review.SeriesId, string.Empty, review.Review!); + } + + // Handle progress updates for the specific series + await ScrobbleReadingUpdate(uId, seriesId); + } + } + + #endregion + + /// + /// Removes all events (active) that are tied to a now-on hold series + /// + /// + /// + public async Task ClearEventsForSeries(int userId, int seriesId) + { + _logger.LogInformation("Clearing Pre-existing Scrobble events for Series {SeriesId} by User {AppUserId} as Series is now on hold list", seriesId, userId); + + var events = await _unitOfWork.ScrobbleRepository.GetUserEventsForSeries(userId, seriesId); + _unitOfWork.ScrobbleRepository.Remove(events); + await _unitOfWork.CommitAsync(); + } + + /// + /// Removes all events that have been processed that are 7 days old + /// + [DisableConcurrentExecution(60 * 60 * 60)] + [AutomaticRetry(Attempts = 3, OnAttemptsExceeded = AttemptsExceededAction.Delete)] + public async Task ClearProcessedEvents() + { + const int daysAgo = 7; + var events = await _unitOfWork.ScrobbleRepository.GetProcessedEvents(daysAgo); + _unitOfWork.ScrobbleRepository.Remove(events); + _logger.LogInformation("Removing {Count} scrobble events that have been processed {DaysAgo}+ days ago", events.Count, daysAgo); + await _unitOfWork.CommitAsync(); + } + + private static bool CanProcessScrobbleEvent(ScrobbleEvent readEvent) + { + var userProviders = GetUserProviders(readEvent.AppUser); + switch (readEvent.Series.Library.Type) + { + case LibraryType.Manga when MangaProviders.Intersect(userProviders).Any(): + case LibraryType.Comic when ComicProviders.Intersect(userProviders).Any(): + case LibraryType.Book when BookProviders.Intersect(userProviders).Any(): + case LibraryType.LightNovel when LightNovelProviders.Intersect(userProviders).Any(): + return true; + default: + return false; + } + } + + private static List GetUserProviders(AppUser appUser) + { + var providers = new List(); + if (!string.IsNullOrEmpty(appUser.AniListAccessToken)) providers.Add(ScrobbleProvider.AniList); + + return providers; } private async Task SetAndCheckRateLimit(IDictionary userRateLimits, AppUser user, string license) @@ -969,7 +1402,7 @@ public class ScrobblingService : IScrobblingService } catch (Exception ex) { - _logger.LogInformation("User {UserName} had an issue figuring out rate: {Message}", user.UserName, ex.Message); + _logger.LogInformation(ex, "User {UserName} had an issue figuring out rate: {Message}", user.UserName, ex.Message); userRateLimits.Add(user.Id, 0); } @@ -982,9 +1415,4 @@ public class ScrobblingService : IScrobblingService return count; } - public static string CreateUrl(string url, long? id) - { - if (id is null or 0) return string.Empty; - return $"{url}{id}/"; - } } diff --git a/API/Services/Plus/SmartCollectionSyncService.cs b/API/Services/Plus/SmartCollectionSyncService.cs index d5bbf2cce..1bd0dfb6b 100644 --- a/API/Services/Plus/SmartCollectionSyncService.cs +++ b/API/Services/Plus/SmartCollectionSyncService.cs @@ -6,6 +6,7 @@ using System.Text; using System.Threading.Tasks; using API.Data; using API.Data.Repositories; +using API.DTOs.KavitaPlus.ExternalMetadata; using API.DTOs.Scrobbling; using API.Entities; using API.Entities.Enums; @@ -20,7 +21,7 @@ using Microsoft.Extensions.Logging; namespace API.Services.Plus; #nullable enable -sealed class SeriesCollection +internal sealed class SeriesCollection { public required IList Series { get; set; } public required string Summary { get; set; } @@ -158,7 +159,7 @@ public class SmartCollectionSyncService : ISmartCollectionSyncService var normalizedLocalizedSeriesName = seriesInfo.LocalizedSeriesName?.ToNormalized(); // Search for existing series in the collection - var formats = GetMangaFormats(seriesInfo.PlusMediaFormat); + var formats = seriesInfo.PlusMediaFormat.GetMangaFormats(); var existingSeries = collection.Items.FirstOrDefault(s => (s.Name.ToNormalized() == normalizedSeriesName || s.NormalizedName == normalizedSeriesName || @@ -243,19 +244,7 @@ public class SmartCollectionSyncService : ISmartCollectionSyncService } } - private static IList GetMangaFormats(MediaFormat? mediaFormat) - { - if (mediaFormat == null) return [MangaFormat.Archive]; - return mediaFormat switch - { - MediaFormat.Manga => [MangaFormat.Archive, MangaFormat.Image], - MediaFormat.Comic => [MangaFormat.Archive], - MediaFormat.LightNovel => [MangaFormat.Epub, MangaFormat.Pdf], - MediaFormat.Book => [MangaFormat.Epub, MangaFormat.Pdf], - MediaFormat.Unknown => [MangaFormat.Archive], - _ => [MangaFormat.Archive] - }; - } + private static long GetStackId(string url) { @@ -270,13 +259,7 @@ public class SmartCollectionSyncService : ISmartCollectionSyncService var license = (await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey)).Value; var seriesForStack = await ($"{Configuration.KavitaPlusApiUrl}/api/metadata/v2/stack?stackId=" + stackId) - .WithHeader("Accept", "application/json") - .WithHeader("User-Agent", "Kavita") - .WithHeader("x-license-key", license) - .WithHeader("x-installId", HashUtil.ServerToken()) - .WithHeader("x-kavita-version", BuildInfo.Version) - .WithHeader("Content-Type", "application/json") - .WithTimeout(TimeSpan.FromSeconds(Configuration.DefaultTimeOutSecs)) + .WithKavitaPlusHeaders(license) .GetJsonAsync(); return seriesForStack; diff --git a/API/Services/Plus/WantToReadSyncService.cs b/API/Services/Plus/WantToReadSyncService.cs new file mode 100644 index 000000000..a6d536911 --- /dev/null +++ b/API/Services/Plus/WantToReadSyncService.cs @@ -0,0 +1,111 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using API.Data; +using API.Data.Repositories; +using API.DTOs.KavitaPlus.Metadata; +using API.DTOs.Recommendation; +using API.DTOs.SeriesDetail; +using API.Entities; +using API.Entities.Enums; +using API.Extensions; +using Flurl.Http; +using Hangfire; +using Kavita.Common; +using Microsoft.Extensions.Logging; +using Org.BouncyCastle.Bcpg.Sig; + +namespace API.Services.Plus; + + +public interface IWantToReadSyncService +{ + Task Sync(); +} + +/// +/// Responsible for syncing Want To Read from upstream providers with Kavita +/// +public class WantToReadSyncService : IWantToReadSyncService +{ + private readonly IUnitOfWork _unitOfWork; + private readonly ILogger _logger; + private readonly ILicenseService _licenseService; + + public WantToReadSyncService(IUnitOfWork unitOfWork, ILogger logger, ILicenseService licenseService) + { + _unitOfWork = unitOfWork; + _logger = logger; + _licenseService = licenseService; + } + + public async Task Sync() + { + if (!await _licenseService.HasActiveLicense()) return; + + var license = (await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.LicenseKey)).Value; + + var users = await _unitOfWork.UserRepository.GetAllUsersAsync(AppUserIncludes.WantToRead | AppUserIncludes.UserPreferences); + foreach (var user in users.Where(u => u.UserPreferences.WantToReadSync)) + { + if (string.IsNullOrEmpty(user.MalUserName) && string.IsNullOrEmpty(user.AniListAccessToken)) continue; + + try + { + _logger.LogInformation("Syncing want to read for user: {UserName}", user.UserName); + var wantToReadSeries = + await ( + $"{Configuration.KavitaPlusApiUrl}/api/metadata/v2/want-to-read?malUsername={user.MalUserName}&aniListToken={user.AniListAccessToken}") + .WithKavitaPlusHeaders(license) + .WithTimeout( + TimeSpan.FromSeconds(120)) // Give extra time as MAL + AniList can result in a lot of data + .GetJsonAsync>(); + + // Match the series (note: There may be duplicates in the final result) + foreach (var unmatchedSeries in wantToReadSeries) + { + var match = await _unitOfWork.SeriesRepository.MatchSeries(unmatchedSeries); + if (match == null) + { + continue; + } + + // There is a match, add it + user.WantToRead.Add(new AppUserWantToRead() + { + SeriesId = match.Id, + }); + _logger.LogDebug("Added {MatchName} ({Format}) to Want to Read", match.Name, match.Format); + } + + // Remove existing Want to Read that are duplicates + user.WantToRead = user.WantToRead.DistinctBy(d => d.SeriesId).ToList(); + + // TODO: Need to write in the history table the last sync time + + // Save the left over entities + _unitOfWork.UserRepository.Update(user); + await _unitOfWork.CommitAsync(); + + // Trigger CleanupService to cleanup any series in WantToRead that don't belong + RecurringJob.TriggerJob(TaskScheduler.RemoveFromWantToReadTaskId); + } + catch (Exception ex) + { + _logger.LogError(ex, "There was an exception when processing want to read series sync for {User}", user.UserName); + } + } + + } + + // Allow syncing if there are any libraries that have an appropriate Provider, the user has the appropriate token, and the last Sync validates + // private async Task CanSync(AppUser? user) + // { + // + // if (collection is not {Source: ScrobbleProvider.Mal}) return false; + // if (string.IsNullOrEmpty(collection.SourceUrl)) return false; + // if (collection.LastSyncUtc.Truncate(TimeSpan.TicksPerHour) >= DateTime.UtcNow.AddDays(SyncDelta).Truncate(TimeSpan.TicksPerHour)) return false; + // return true; + // } +} diff --git a/API/Services/RatingService.cs b/API/Services/RatingService.cs new file mode 100644 index 000000000..ccaebba69 --- /dev/null +++ b/API/Services/RatingService.cs @@ -0,0 +1,126 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using API.Data; +using API.Data.Repositories; +using API.DTOs; +using API.Entities; +using API.Services.Plus; +using Hangfire; +using Microsoft.Extensions.Logging; + +namespace API.Services; + +public interface IRatingService +{ + /// + /// Updates the users' rating for a given series + /// + /// Should include ratings + /// + /// + Task UpdateSeriesRating(AppUser user, UpdateRatingDto updateRatingDto); + + /// + /// Updates the users' rating for a given chapter + /// + /// Should include ratings + /// chapterId must be set + /// + Task UpdateChapterRating(AppUser user, UpdateRatingDto updateRatingDto); +} + +public class RatingService: IRatingService +{ + + private readonly IUnitOfWork _unitOfWork; + private readonly IScrobblingService _scrobblingService; + private readonly ILogger _logger; + + public RatingService(IUnitOfWork unitOfWork, IScrobblingService scrobblingService, ILogger logger) + { + _unitOfWork = unitOfWork; + _scrobblingService = scrobblingService; + _logger = logger; + } + + public async Task UpdateSeriesRating(AppUser user, UpdateRatingDto updateRatingDto) + { + var userRating = + await _unitOfWork.UserRepository.GetUserRatingAsync(updateRatingDto.SeriesId, user.Id) ?? + new AppUserRating(); + + try + { + userRating.Rating = Math.Clamp(updateRatingDto.UserRating, 0f, 5f); + userRating.HasBeenRated = true; + userRating.SeriesId = updateRatingDto.SeriesId; + + if (userRating.Id == 0) + { + user.Ratings ??= new List(); + user.Ratings.Add(userRating); + } + + _unitOfWork.UserRepository.Update(user); + + if (!_unitOfWork.HasChanges() || await _unitOfWork.CommitAsync()) + { + BackgroundJob.Enqueue(() => + _scrobblingService.ScrobbleRatingUpdate(user.Id, updateRatingDto.SeriesId, + userRating.Rating)); + return true; + } + } + catch (Exception ex) + { + _logger.LogError(ex, "There was an exception saving rating"); + } + + await _unitOfWork.RollbackAsync(); + user.Ratings?.Remove(userRating); + + return false; + } + + public async Task UpdateChapterRating(AppUser user, UpdateRatingDto updateRatingDto) + { + if (updateRatingDto.ChapterId == null) + { + return false; + } + + var userRating = + await _unitOfWork.UserRepository.GetUserChapterRatingAsync(user.Id, updateRatingDto.ChapterId.Value) ?? + new AppUserChapterRating(); + + try + { + userRating.Rating = Math.Clamp(updateRatingDto.UserRating, 0f, 5f); + userRating.HasBeenRated = true; + userRating.SeriesId = updateRatingDto.SeriesId; + userRating.ChapterId = updateRatingDto.ChapterId.Value; + + if (userRating.Id == 0) + { + user.ChapterRatings ??= new List(); + user.ChapterRatings.Add(userRating); + } + + _unitOfWork.UserRepository.Update(user); + + await _unitOfWork.CommitAsync(); + return true; + } + catch (Exception ex) + { + _logger.LogError(ex, "There was an exception saving rating"); + } + + await _unitOfWork.RollbackAsync(); + user.ChapterRatings?.Remove(userRating); + + return false; + } + +} diff --git a/API/Services/ReaderService.cs b/API/Services/ReaderService.cs index dd4b824b8..3b3cb37d5 100644 --- a/API/Services/ReaderService.cs +++ b/API/Services/ReaderService.cs @@ -122,6 +122,7 @@ public class ReaderService : IReaderService var seenVolume = new Dictionary(); var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId); if (series == null) throw new KavitaException("series-doesnt-exist"); + foreach (var chapter in chapters) { var userProgress = GetUserProgressForChapter(user, chapter); @@ -135,10 +136,6 @@ public class ReaderService : IReaderService SeriesId = seriesId, ChapterId = chapter.Id, LibraryId = series.LibraryId, - Created = DateTime.Now, - CreatedUtc = DateTime.UtcNow, - LastModified = DateTime.Now, - LastModifiedUtc = DateTime.UtcNow }); } else @@ -206,7 +203,7 @@ public class ReaderService : IReaderService /// Must have Progresses populated /// /// - private static AppUserProgress? GetUserProgressForChapter(AppUser user, Chapter chapter) + private AppUserProgress? GetUserProgressForChapter(AppUser user, Chapter chapter) { AppUserProgress? userProgress = null; @@ -226,11 +223,12 @@ public class ReaderService : IReaderService var progresses = user.Progresses.Where(x => x.ChapterId == chapter.Id && x.AppUserId == user.Id).ToList(); if (progresses.Count > 1) { - user.Progresses = new List - { - user.Progresses.First() - }; + var highestProgress = progresses.Max(x => x.PagesRead); + var firstProgress = progresses.OrderBy(p => p.LastModifiedUtc).First(); + firstProgress.PagesRead = highestProgress; + user.Progresses = [firstProgress]; userProgress = user.Progresses.First(); + _logger.LogInformation("Trying to save progress and multiple progress entries exist, deleting and rewriting with highest progress rate: {@Progress}", userProgress); } } @@ -274,10 +272,6 @@ public class ReaderService : IReaderService ChapterId = progressDto.ChapterId, LibraryId = progressDto.LibraryId, BookScrollId = progressDto.BookScrollId, - Created = DateTime.Now, - CreatedUtc = DateTime.UtcNow, - LastModified = DateTime.Now, - LastModifiedUtc = DateTime.UtcNow }); _unitOfWork.UserRepository.Update(userWithProgress); } diff --git a/API/Services/ReadingItemService.cs b/API/Services/ReadingItemService.cs index 581690733..6ff8d19de 100644 --- a/API/Services/ReadingItemService.cs +++ b/API/Services/ReadingItemService.cs @@ -12,7 +12,7 @@ public interface IReadingItemService int GetNumberOfPages(string filePath, MangaFormat format); string GetCoverImage(string filePath, string fileName, MangaFormat format, EncodeFormat encodeFormat, CoverImageSize size = CoverImageSize.Default); void Extract(string fileFilePath, string targetDirectory, MangaFormat format, int imageCount = 1); - ParserInfo? ParseFile(string path, string rootPath, string libraryRoot, LibraryType type); + ParserInfo? ParseFile(string path, string rootPath, string libraryRoot, LibraryType type, bool enableMetadata); } public class ReadingItemService : IReadingItemService @@ -52,7 +52,7 @@ public class ReadingItemService : IReadingItemService /// private ComicInfo? GetComicInfo(string filePath) { - if (Parser.IsEpub(filePath)) + if (Parser.IsEpub(filePath) || Parser.IsPdf(filePath)) { return _bookService.GetComicInfo(filePath); } @@ -71,11 +71,12 @@ public class ReadingItemService : IReadingItemService /// Path of a file /// /// Library type to determine parsing to perform - public ParserInfo? ParseFile(string path, string rootPath, string libraryRoot, LibraryType type) + /// Enable Metadata parsing overriding filename parsing + public ParserInfo? ParseFile(string path, string rootPath, string libraryRoot, LibraryType type, bool enableMetadata) { try { - var info = Parse(path, rootPath, libraryRoot, type); + var info = Parse(path, rootPath, libraryRoot, type, enableMetadata); if (info == null) { _logger.LogError("Unable to parse any meaningful information out of file {FilePath}", path); @@ -174,28 +175,29 @@ public class ReadingItemService : IReadingItemService /// /// /// + /// /// - private ParserInfo? Parse(string path, string rootPath, string libraryRoot, LibraryType type) + private ParserInfo? Parse(string path, string rootPath, string libraryRoot, LibraryType type, bool enableMetadata) { if (_comicVineParser.IsApplicable(path, type)) { - return _comicVineParser.Parse(path, rootPath, libraryRoot, type, GetComicInfo(path)); + return _comicVineParser.Parse(path, rootPath, libraryRoot, type, enableMetadata, GetComicInfo(path)); } if (_imageParser.IsApplicable(path, type)) { - return _imageParser.Parse(path, rootPath, libraryRoot, type, GetComicInfo(path)); + return _imageParser.Parse(path, rootPath, libraryRoot, type, enableMetadata, GetComicInfo(path)); } if (_bookParser.IsApplicable(path, type)) { - return _bookParser.Parse(path, rootPath, libraryRoot, type, GetComicInfo(path)); + return _bookParser.Parse(path, rootPath, libraryRoot, type, enableMetadata, GetComicInfo(path)); } if (_pdfParser.IsApplicable(path, type)) { - return _pdfParser.Parse(path, rootPath, libraryRoot, type, GetComicInfo(path)); + return _pdfParser.Parse(path, rootPath, libraryRoot, type, enableMetadata, GetComicInfo(path)); } if (_basicParser.IsApplicable(path, type)) { - return _basicParser.Parse(path, rootPath, libraryRoot, type, GetComicInfo(path)); + return _basicParser.Parse(path, rootPath, libraryRoot, type, enableMetadata, GetComicInfo(path)); } return null; diff --git a/API/Services/ReadingListService.cs b/API/Services/ReadingListService.cs index 1394b131a..8c4f63430 100644 --- a/API/Services/ReadingListService.cs +++ b/API/Services/ReadingListService.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.IO; using System.Linq; using System.Text.RegularExpressions; @@ -49,6 +50,14 @@ public interface IReadingListService Task CreateReadingListsFromSeries(int libraryId, int seriesId); Task GenerateReadingListCoverImage(int readingListId); + /// + /// Check, and update if needed, all reading lists' AgeRating who contain the passed series + /// + /// The series whose age rating is being updated + /// The new (uncommited) age rating of the series + /// + /// This method does not commit changes + Task UpdateReadingListAgeRatingForSeries(int seriesId, AgeRating ageRating); } /// @@ -95,7 +104,13 @@ public class ReadingListService : IReadingListService { title = $"Volume {Parser.CleanSpecialTitle(item.VolumeNumber)}"; } - } else { + } + else if (item.VolumeNumber == Parser.SpecialVolume) + { + title = specialTitle; + } + else + { title = $"Volume {specialTitle}"; } } @@ -458,6 +473,7 @@ public class ReadingListService : IReadingListService _logger.LogInformation("Processing Reading Lists for {SeriesName}", series.Name); var user = await _unitOfWork.UserRepository.GetDefaultAdminUser(); series.Metadata ??= new SeriesMetadataBuilder().Build(); + foreach (var chapter in series.Volumes.SelectMany(v => v.Chapters)) { var pairs = new List>(); @@ -538,13 +554,13 @@ public class ReadingListService : IReadingListService var maxPairs = Math.Max(arcs.Length, arcNumbers.Length); for (var i = 0; i < maxPairs; i++) { - var arcNumber = int.MaxValue.ToString(); + var arcNumber = int.MaxValue.ToString(CultureInfo.InvariantCulture); if (arcNumbers.Length > i) { arcNumber = arcNumbers[i]; } - if (string.IsNullOrEmpty(arcs[i]) || !int.TryParse(arcNumber, out _)) continue; + if (string.IsNullOrEmpty(arcs[i]) || !int.TryParse(arcNumber, CultureInfo.InvariantCulture, out _)) continue; data.Add(new Tuple(arcs[i], arcNumber)); } @@ -563,14 +579,14 @@ public class ReadingListService : IReadingListService { CblName = cblReading.Name, Success = CblImportResult.Success, - Results = new List(), + Results = [], SuccessfulInserts = new List() }; if (IsCblEmpty(cblReading, importSummary, out var readingListFromCbl)) return readingListFromCbl; - // Is there another reading list with the same name? - if (await _unitOfWork.ReadingListRepository.ReadingListExists(cblReading.Name)) + // Is there another reading list with the same name on the user's account? + if (await _unitOfWork.ReadingListRepository.ReadingListExistsForUser(cblReading.Name, userId)) { importSummary.Success = CblImportResult.Fail; importSummary.Results.Add(new CblBookResult @@ -585,9 +601,6 @@ public class ReadingListService : IReadingListService var userSeries = (await _unitOfWork.SeriesRepository.GetAllSeriesByNameAsync(uniqueSeries, userId, SeriesIncludes.Chapters)).ToList(); - // How can we match properly with ComicVine library when year is part of the series unless we do this in 2 passes and see which has a better match - - if (userSeries.Count == 0) { // Report that no series exist in the reading list @@ -843,4 +856,22 @@ public class ReadingListService : IReadingListService return !_directoryService.FileSystem.File.Exists(destFile) ? string.Empty : destFile; } + + public async Task UpdateReadingListAgeRatingForSeries(int seriesId, AgeRating ageRating) + { + var readingLists = await _unitOfWork.ReadingListRepository.GetReadingListsBySeriesId(seriesId); + foreach (var readingList in readingLists) + { + var seriesIds = readingList.Items.Select(item => item.SeriesId).ToList(); + seriesIds.Remove(seriesId); // Don't get AgeRating from database + + var maxAgeRating = await _unitOfWork.SeriesRepository.GetMaxAgeRatingFromSeriesAsync(seriesIds); + if (ageRating > maxAgeRating) + { + maxAgeRating = ageRating; + } + + readingList.AgeRating = maxAgeRating; + } + } } diff --git a/API/Services/ReadingProfileService.cs b/API/Services/ReadingProfileService.cs new file mode 100644 index 000000000..4c3dab006 --- /dev/null +++ b/API/Services/ReadingProfileService.cs @@ -0,0 +1,454 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using API.Data; +using API.Data.Repositories; +using API.DTOs; +using API.Entities; +using API.Entities.Enums; +using API.Extensions; +using API.Helpers.Builders; +using AutoMapper; +using Kavita.Common; + +namespace API.Services; +#nullable enable + +public interface IReadingProfileService +{ + /// + /// Returns the ReadingProfile that should be applied to the given series, walks up the tree. + /// Series (Implicit) -> Series (User) -> Library (User) -> Default + /// + /// + /// + /// + /// + Task GetReadingProfileDtoForSeries(int userId, int seriesId, bool skipImplicit = false); + + /// + /// Creates a new reading profile for a user. Name must be unique per user + /// + /// + /// + /// + Task CreateReadingProfile(int userId, UserReadingProfileDto dto); + Task PromoteImplicitProfile(int userId, int profileId); + + /// + /// Updates the implicit reading profile for a series, creates one if none exists + /// + /// + /// + /// + /// + Task UpdateImplicitReadingProfile(int userId, int seriesId, UserReadingProfileDto dto); + + /// + /// Updates the non-implicit reading profile for the given series, and removes implicit profiles + /// + /// + /// + /// + /// + Task UpdateParent(int userId, int seriesId, UserReadingProfileDto dto); + + /// + /// Updates a given reading profile for a user + /// + /// + /// + /// + /// Does not update connected series and libraries + Task UpdateReadingProfile(int userId, UserReadingProfileDto dto); + + /// + /// Deletes a given profile for a user + /// + /// + /// + /// + /// + /// The default profile for the user cannot be deleted + Task DeleteReadingProfile(int userId, int profileId); + + /// + /// Binds the reading profile to the series, and remove the implicit RP from the series if it exists + /// + /// + /// + /// + /// + Task AddProfileToSeries(int userId, int profileId, int seriesId); + /// + /// Binds the reading profile to many series, and remove the implicit RP from the series if it exists + /// + /// + /// + /// + /// + Task BulkAddProfileToSeries(int userId, int profileId, IList seriesIds); + /// + /// Remove all reading profiles bound to the series + /// + /// + /// + /// + Task ClearSeriesProfile(int userId, int seriesId); + + /// + /// Bind the reading profile to the library + /// + /// + /// + /// + /// + Task AddProfileToLibrary(int userId, int profileId, int libraryId); + /// + /// Remove the reading profile bound to the library, if it exists + /// + /// + /// + /// + Task ClearLibraryProfile(int userId, int libraryId); + /// + /// Returns the bound Reading Profile to a Library + /// + /// + /// + /// + Task GetReadingProfileDtoForLibrary(int userId, int libraryId); +} + +public class ReadingProfileService(IUnitOfWork unitOfWork, ILocalizationService localizationService, IMapper mapper): IReadingProfileService +{ + /// + /// Tries to resolve the Reading Profile for a given Series. Will first check (optionally) Implicit profiles, then check for a bound Series profile, then a bound + /// Library profile, then default to the default profile. + /// + /// + /// + /// + /// + /// + public async Task GetReadingProfileForSeries(int userId, int seriesId, bool skipImplicit = false) + { + var profiles = await unitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(userId, skipImplicit); + + // If there is an implicit, send back + var implicitProfile = + profiles.FirstOrDefault(p => p.SeriesIds.Contains(seriesId) && p.Kind == ReadingProfileKind.Implicit); + if (implicitProfile != null) return implicitProfile; + + // Next check for a bound Series profile + var seriesProfile = profiles + .FirstOrDefault(p => p.SeriesIds.Contains(seriesId) && p.Kind != ReadingProfileKind.Implicit); + if (seriesProfile != null) return seriesProfile; + + // Check for a library bound profile + var series = await unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId); + if (series == null) throw new KavitaException(await localizationService.Translate(userId, "series-doesnt-exist")); + + var libraryProfile = profiles + .FirstOrDefault(p => p.LibraryIds.Contains(series.LibraryId) && p.Kind != ReadingProfileKind.Implicit); + if (libraryProfile != null) return libraryProfile; + + // Fallback to the default profile + return profiles.First(p => p.Kind == ReadingProfileKind.Default); + } + + public async Task GetReadingProfileDtoForSeries(int userId, int seriesId, bool skipImplicit = false) + { + return mapper.Map(await GetReadingProfileForSeries(userId, seriesId, skipImplicit)); + } + + public async Task UpdateParent(int userId, int seriesId, UserReadingProfileDto dto) + { + var parentProfile = await GetReadingProfileForSeries(userId, seriesId, true); + + UpdateReaderProfileFields(parentProfile, dto, false); + unitOfWork.AppUserReadingProfileRepository.Update(parentProfile); + + // Remove the implicit profile when we UpdateParent (from reader) as it is implied that we are already bound with a non-implicit profile + await DeleteImplicateReadingProfilesForSeries(userId, [seriesId]); + + await unitOfWork.CommitAsync(); + return mapper.Map(parentProfile); + } + + public async Task UpdateReadingProfile(int userId, UserReadingProfileDto dto) + { + var profile = await unitOfWork.AppUserReadingProfileRepository.GetUserProfile(userId, dto.Id); + if (profile == null) throw new KavitaException("profile-does-not-exist"); + + UpdateReaderProfileFields(profile, dto); + unitOfWork.AppUserReadingProfileRepository.Update(profile); + + await unitOfWork.CommitAsync(); + return mapper.Map(profile); + } + + public async Task CreateReadingProfile(int userId, UserReadingProfileDto dto) + { + var user = await unitOfWork.UserRepository.GetUserByIdAsync(userId, AppUserIncludes.UserPreferences); + if (user == null) throw new UnauthorizedAccessException(); + + if (await unitOfWork.AppUserReadingProfileRepository.IsProfileNameInUse(userId, dto.Name)) throw new KavitaException("name-already-in-use"); + + var newProfile = new AppUserReadingProfileBuilder(user.Id).Build(); + UpdateReaderProfileFields(newProfile, dto); + + unitOfWork.AppUserReadingProfileRepository.Add(newProfile); + user.ReadingProfiles.Add(newProfile); + + await unitOfWork.CommitAsync(); + + return mapper.Map(newProfile); + } + + /// + /// Promotes the implicit profile to a user profile. Removes the series from other profiles. + /// + /// + /// + /// + public async Task PromoteImplicitProfile(int userId, int profileId) + { + // Get all the user's profiles including the implicit + var allUserProfiles = await unitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(userId, false); + var profileToPromote = allUserProfiles.First(r => r.Id == profileId); + var seriesId = profileToPromote.SeriesIds[0]; // An Implicit series can only be bound to 1 Series + + // Check if there are any reading profiles (Series) already bound to the series + var existingSeriesProfile = allUserProfiles.FirstOrDefault(r => r.SeriesIds.Contains(seriesId) && r.Kind == ReadingProfileKind.User); + if (existingSeriesProfile != null) + { + existingSeriesProfile.SeriesIds.Remove(seriesId); + unitOfWork.AppUserReadingProfileRepository.Update(existingSeriesProfile); + } + + // Convert the implicit profile into a proper Series + var series = await unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId); + if (series == null) throw new KavitaException("series-doesnt-exist"); // Shouldn't happen + + profileToPromote.Kind = ReadingProfileKind.User; + profileToPromote.Name = await localizationService.Translate(userId, "generated-reading-profile-name", series.Name); + profileToPromote.Name = EnsureUniqueProfileName(allUserProfiles, profileToPromote.Name); + profileToPromote.NormalizedName = profileToPromote.Name.ToNormalized(); + unitOfWork.AppUserReadingProfileRepository.Update(profileToPromote); + + await unitOfWork.CommitAsync(); + + return mapper.Map(profileToPromote); + } + + private static string EnsureUniqueProfileName(IList allUserProfiles, string name) + { + var counter = 1; + var newName = name; + while (allUserProfiles.Any(p => p.Name == newName)) + { + newName = $"{name} ({counter})"; + counter++; + } + + return newName; + } + + public async Task UpdateImplicitReadingProfile(int userId, int seriesId, UserReadingProfileDto dto) + { + var user = await unitOfWork.UserRepository.GetUserByIdAsync(userId, AppUserIncludes.UserPreferences); + if (user == null) throw new UnauthorizedAccessException(); + + var profiles = await unitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(userId); + var existingProfile = profiles.FirstOrDefault(rp => rp.Kind == ReadingProfileKind.Implicit && rp.SeriesIds.Contains(seriesId)); + + // Series already had an implicit profile, update it + if (existingProfile is {Kind: ReadingProfileKind.Implicit}) + { + UpdateReaderProfileFields(existingProfile, dto, false); + unitOfWork.AppUserReadingProfileRepository.Update(existingProfile); + await unitOfWork.CommitAsync(); + + return mapper.Map(existingProfile); + } + + var series = await unitOfWork.SeriesRepository.GetSeriesByIdAsync(seriesId) ?? throw new KeyNotFoundException(); + var newProfile = new AppUserReadingProfileBuilder(userId) + .WithSeries(series) + .WithKind(ReadingProfileKind.Implicit) + .Build(); + + // Set name to something fitting for debugging if needed + UpdateReaderProfileFields(newProfile, dto, false); + newProfile.Name = $"Implicit Profile for {seriesId}"; + newProfile.NormalizedName = newProfile.Name.ToNormalized(); + + user.ReadingProfiles.Add(newProfile); + await unitOfWork.CommitAsync(); + + return mapper.Map(newProfile); + } + + public async Task DeleteReadingProfile(int userId, int profileId) + { + var profile = await unitOfWork.AppUserReadingProfileRepository.GetUserProfile(userId, profileId); + if (profile == null) throw new KavitaException("profile-doesnt-exist"); + + if (profile.Kind == ReadingProfileKind.Default) throw new KavitaException("cant-delete-default-profile"); + + unitOfWork.AppUserReadingProfileRepository.Remove(profile); + await unitOfWork.CommitAsync(); + } + + public async Task AddProfileToSeries(int userId, int profileId, int seriesId) + { + var profile = await unitOfWork.AppUserReadingProfileRepository.GetUserProfile(userId, profileId); + if (profile == null) throw new KavitaException("profile-doesnt-exist"); + + await DeleteImplicitAndRemoveFromUserProfiles(userId, [seriesId], []); + + profile.SeriesIds.Add(seriesId); + unitOfWork.AppUserReadingProfileRepository.Update(profile); + + await unitOfWork.CommitAsync(); + } + + public async Task BulkAddProfileToSeries(int userId, int profileId, IList seriesIds) + { + var profile = await unitOfWork.AppUserReadingProfileRepository.GetUserProfile(userId, profileId); + if (profile == null) throw new KavitaException("profile-doesnt-exist"); + + await DeleteImplicitAndRemoveFromUserProfiles(userId, seriesIds, []); + + profile.SeriesIds.AddRange(seriesIds.Except(profile.SeriesIds)); + unitOfWork.AppUserReadingProfileRepository.Update(profile); + + await unitOfWork.CommitAsync(); + } + + public async Task ClearSeriesProfile(int userId, int seriesId) + { + await DeleteImplicitAndRemoveFromUserProfiles(userId, [seriesId], []); + await unitOfWork.CommitAsync(); + } + + public async Task AddProfileToLibrary(int userId, int profileId, int libraryId) + { + var profile = await unitOfWork.AppUserReadingProfileRepository.GetUserProfile(userId, profileId); + if (profile == null) throw new KavitaException("profile-doesnt-exist"); + + await DeleteImplicitAndRemoveFromUserProfiles(userId, [], [libraryId]); + + profile.LibraryIds.Add(libraryId); + unitOfWork.AppUserReadingProfileRepository.Update(profile); + await unitOfWork.CommitAsync(); + } + + public async Task ClearLibraryProfile(int userId, int libraryId) + { + var profiles = await unitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(userId); + var libraryProfile = profiles.FirstOrDefault(p => p.LibraryIds.Contains(libraryId)); + if (libraryProfile != null) + { + libraryProfile.LibraryIds.Remove(libraryId); + unitOfWork.AppUserReadingProfileRepository.Update(libraryProfile); + } + + + if (unitOfWork.HasChanges()) + { + await unitOfWork.CommitAsync(); + } + } + + public async Task GetReadingProfileDtoForLibrary(int userId, int libraryId) + { + var profiles = await unitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(userId, true); + return mapper.Map(profiles.FirstOrDefault(p => p.LibraryIds.Contains(libraryId))); + } + + private async Task DeleteImplicitAndRemoveFromUserProfiles(int userId, IList seriesIds, IList libraryIds) + { + var profiles = await unitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(userId); + var implicitProfiles = profiles + .Where(rp => rp.SeriesIds.Intersect(seriesIds).Any()) + .Where(rp => rp.Kind == ReadingProfileKind.Implicit) + .ToList(); + unitOfWork.AppUserReadingProfileRepository.RemoveRange(implicitProfiles); + + var nonImplicitProfiles = profiles + .Where(rp => rp.SeriesIds.Intersect(seriesIds).Any() || rp.LibraryIds.Intersect(libraryIds).Any()) + .Where(rp => rp.Kind != ReadingProfileKind.Implicit); + + foreach (var profile in nonImplicitProfiles) + { + profile.SeriesIds.RemoveAll(seriesIds.Contains); + profile.LibraryIds.RemoveAll(libraryIds.Contains); + unitOfWork.AppUserReadingProfileRepository.Update(profile); + } + } + + private async Task DeleteImplicateReadingProfilesForSeries(int userId, IList seriesIds) + { + var profiles = await unitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(userId); + var implicitProfiles = profiles + .Where(rp => rp.SeriesIds.Intersect(seriesIds).Any()) + .Where(rp => rp.Kind == ReadingProfileKind.Implicit) + .ToList(); + unitOfWork.AppUserReadingProfileRepository.RemoveRange(implicitProfiles); + } + + private async Task RemoveSeriesFromUserProfiles(int userId, IList seriesIds) + { + var profiles = await unitOfWork.AppUserReadingProfileRepository.GetProfilesForUser(userId); + var userProfiles = profiles + .Where(rp => rp.SeriesIds.Intersect(seriesIds).Any()) + .Where(rp => rp.Kind == ReadingProfileKind.User) + .ToList(); + + unitOfWork.AppUserReadingProfileRepository.RemoveRange(userProfiles); + } + + public static void UpdateReaderProfileFields(AppUserReadingProfile existingProfile, UserReadingProfileDto dto, bool updateName = true) + { + if (updateName && !string.IsNullOrEmpty(dto.Name) && existingProfile.NormalizedName != dto.Name.ToNormalized()) + { + existingProfile.Name = dto.Name; + existingProfile.NormalizedName = dto.Name.ToNormalized(); + } + + // Manga Reader + existingProfile.ReadingDirection = dto.ReadingDirection; + existingProfile.ScalingOption = dto.ScalingOption; + existingProfile.PageSplitOption = dto.PageSplitOption; + existingProfile.ReaderMode = dto.ReaderMode; + existingProfile.AutoCloseMenu = dto.AutoCloseMenu; + existingProfile.ShowScreenHints = dto.ShowScreenHints; + existingProfile.EmulateBook = dto.EmulateBook; + existingProfile.LayoutMode = dto.LayoutMode; + existingProfile.BackgroundColor = string.IsNullOrEmpty(dto.BackgroundColor) ? "#000000" : dto.BackgroundColor; + existingProfile.SwipeToPaginate = dto.SwipeToPaginate; + existingProfile.AllowAutomaticWebtoonReaderDetection = dto.AllowAutomaticWebtoonReaderDetection; + existingProfile.WidthOverride = dto.WidthOverride; + existingProfile.DisableWidthOverride = dto.DisableWidthOverride; + + // Book Reader + existingProfile.BookReaderMargin = dto.BookReaderMargin; + existingProfile.BookReaderLineSpacing = dto.BookReaderLineSpacing; + existingProfile.BookReaderFontSize = dto.BookReaderFontSize; + existingProfile.BookReaderFontFamily = dto.BookReaderFontFamily; + existingProfile.BookReaderTapToPaginate = dto.BookReaderTapToPaginate; + existingProfile.BookReaderReadingDirection = dto.BookReaderReadingDirection; + existingProfile.BookReaderWritingStyle = dto.BookReaderWritingStyle; + existingProfile.BookThemeName = dto.BookReaderThemeName; + existingProfile.BookReaderLayoutMode = dto.BookReaderLayoutMode; + existingProfile.BookReaderImmersiveMode = dto.BookReaderImmersiveMode; + + // PDF Reading + existingProfile.PdfTheme = dto.PdfTheme; + existingProfile.PdfScrollMode = dto.PdfScrollMode; + existingProfile.PdfSpreadMode = dto.PdfSpreadMode; + } +} diff --git a/API/Services/SeriesService.cs b/API/Services/SeriesService.cs index 7d4a4b95a..78e3c41f1 100644 --- a/API/Services/SeriesService.cs +++ b/API/Services/SeriesService.cs @@ -1,27 +1,26 @@ using System; using System.Collections.Generic; -using System.Globalization; using System.IO; using System.Linq; using System.Threading.Tasks; using API.Comparators; -using API.Constants; -using API.Controllers; using API.Data; using API.Data.Repositories; using API.DTOs; -using API.DTOs.CollectionTags; +using API.DTOs.Person; using API.DTOs.SeriesDetail; using API.Entities; using API.Entities.Enums; +using API.Entities.Interfaces; using API.Entities.Metadata; +using API.Entities.MetadataMatching; +using API.Entities.Person; using API.Extensions; using API.Helpers; using API.Helpers.Builders; using API.Services.Plus; using API.Services.Tasks.Scanner.Parser; using API.SignalR; -using EasyCaching.Core; using Hangfire; using Kavita.Common; using Microsoft.Extensions.Logging; @@ -33,17 +32,16 @@ public interface ISeriesService { Task GetSeriesDetail(int seriesId, int userId); Task UpdateSeriesMetadata(UpdateSeriesMetadataDto updateSeriesMetadataDto); - Task UpdateRating(AppUser user, UpdateSeriesRatingDto updateSeriesRatingDto); Task DeleteMultipleSeries(IList seriesIds); Task UpdateRelatedSeries(UpdateRelatedSeriesDto dto); Task GetRelatedSeries(int userId, int seriesId); Task FormatChapterTitle(int userId, ChapterDto chapter, LibraryType libraryType, bool withHash = true); Task FormatChapterTitle(int userId, Chapter chapter, LibraryType libraryType, bool withHash = true); - Task FormatChapterTitle(int userId, bool isSpecial, LibraryType libraryType, string chapterRange, string? chapterTitle, bool withHash); Task FormatChapterName(int userId, LibraryType libraryType, bool withHash = false); Task GetEstimatedChapterCreationDate(int seriesId, int userId); + } public class SeriesService : ISeriesService @@ -54,6 +52,7 @@ public class SeriesService : ISeriesService private readonly ILogger _logger; private readonly IScrobblingService _scrobblingService; private readonly ILocalizationService _localizationService; + private readonly IReadingListService _readingListService; private readonly NextExpectedChapterDto _emptyExpectedChapter = new NextExpectedChapterDto { @@ -63,7 +62,8 @@ public class SeriesService : ISeriesService }; public SeriesService(IUnitOfWork unitOfWork, IEventHub eventHub, ITaskScheduler taskScheduler, - ILogger logger, IScrobblingService scrobblingService, ILocalizationService localizationService) + ILogger logger, IScrobblingService scrobblingService, ILocalizationService localizationService, + IReadingListService readingListService) { _unitOfWork = unitOfWork; _eventHub = eventHub; @@ -71,10 +71,11 @@ public class SeriesService : ISeriesService _logger = logger; _scrobblingService = scrobblingService; _localizationService = localizationService; + _readingListService = readingListService; } /// - /// Returns the first chapter for a series to extract metadata from (ie Summary, etc) + /// Returns the first chapter for a series to extract metadata from (ie Summary, etc.) /// /// The full series with all volumes and chapters on it /// @@ -117,33 +118,31 @@ public class SeriesService : ISeriesService series.Metadata ??= new SeriesMetadataBuilder() .Build(); - if (series.Metadata.AgeRating != updateSeriesMetadataDto.SeriesMetadata.AgeRating) - { - series.Metadata.AgeRating = updateSeriesMetadataDto.SeriesMetadata.AgeRating; - series.Metadata.AgeRatingLocked = true; - } - if (NumberHelper.IsValidYear(updateSeriesMetadataDto.SeriesMetadata.ReleaseYear) && series.Metadata.ReleaseYear != updateSeriesMetadataDto.SeriesMetadata.ReleaseYear) { series.Metadata.ReleaseYear = updateSeriesMetadataDto.SeriesMetadata.ReleaseYear; series.Metadata.ReleaseYearLocked = true; + series.Metadata.KPlusOverrides.Remove(MetadataSettingField.StartDate); } if (series.Metadata.PublicationStatus != updateSeriesMetadataDto.SeriesMetadata.PublicationStatus) { series.Metadata.PublicationStatus = updateSeriesMetadataDto.SeriesMetadata.PublicationStatus; series.Metadata.PublicationStatusLocked = true; + series.Metadata.KPlusOverrides.Remove(MetadataSettingField.PublicationStatus); } if (string.IsNullOrEmpty(updateSeriesMetadataDto.SeriesMetadata.Summary)) { updateSeriesMetadataDto.SeriesMetadata.Summary = string.Empty; + series.Metadata.KPlusOverrides.Remove(MetadataSettingField.Summary); } if (series.Metadata.Summary != updateSeriesMetadataDto.SeriesMetadata.Summary.Trim()) { series.Metadata.Summary = updateSeriesMetadataDto.SeriesMetadata?.Summary.Trim() ?? string.Empty; series.Metadata.SummaryLocked = true; + series.Metadata.KPlusOverrides.Remove(MetadataSettingField.Summary); } if (series.Metadata.Language != updateSeriesMetadataDto.SeriesMetadata?.Language) @@ -169,7 +168,7 @@ public class SeriesService : ISeriesService updateSeriesMetadataDto.SeriesMetadata.Genres.Count != 0) { var allGenres = (await _unitOfWork.GenreRepository.GetAllGenresByNamesAsync(updateSeriesMetadataDto.SeriesMetadata.Genres.Select(t => Parser.Normalize(t.Title)))).ToList(); - series.Metadata.Genres ??= new List(); + series.Metadata.Genres ??= []; GenreHelper.UpdateGenreList(updateSeriesMetadataDto.SeriesMetadata?.Genres, series, allGenres, genre => { series.Metadata.Genres.Add(genre); @@ -177,7 +176,7 @@ public class SeriesService : ISeriesService } else { - series.Metadata.Genres = new List(); + series.Metadata.Genres = []; } @@ -186,7 +185,7 @@ public class SeriesService : ISeriesService var allTags = (await _unitOfWork.TagRepository .GetAllTagsByNameAsync(updateSeriesMetadataDto.SeriesMetadata.Tags.Select(t => Parser.Normalize(t.Title)))) .ToList(); - series.Metadata.Tags ??= new List(); + series.Metadata.Tags ??= []; TagHelper.UpdateTagList(updateSeriesMetadataDto.SeriesMetadata?.Tags, series, allTags, tag => { series.Metadata.Tags.Add(tag); @@ -194,87 +193,112 @@ public class SeriesService : ISeriesService } else { - series.Metadata.Tags = new List(); + series.Metadata.Tags = []; } + if (series.Metadata.AgeRating != updateSeriesMetadataDto.SeriesMetadata?.AgeRating) + { + series.Metadata.AgeRating = updateSeriesMetadataDto.SeriesMetadata?.AgeRating ?? AgeRating.Unknown; + series.Metadata.AgeRatingLocked = true; + await _readingListService.UpdateReadingListAgeRatingForSeries(series.Id, series.Metadata.AgeRating); + series.Metadata.KPlusOverrides.Remove(MetadataSettingField.AgeRating); + } + else + { + if (!series.Metadata.AgeRatingLocked) + { + var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettingDto(); + var allTags = series.Metadata.Tags.Select(t => t.Title).Concat(series.Metadata.Genres.Select(g => g.Title)); + var updatedRating = ExternalMetadataService.DetermineAgeRating(allTags, metadataSettings.AgeRatingMappings); + if (updatedRating > series.Metadata.AgeRating) + { + series.Metadata.AgeRating = updatedRating; + series.Metadata.KPlusOverrides.Remove(MetadataSettingField.AgeRating); + } + } + } + + // Update people and locks if (updateSeriesMetadataDto.SeriesMetadata != null) { - if (PersonHelper.HasAnyPeople(updateSeriesMetadataDto.SeriesMetadata)) + series.Metadata.People ??= []; + + // Writers + if (!series.Metadata.WriterLocked || !updateSeriesMetadataDto.SeriesMetadata.WriterLocked) { - series.Metadata.People ??= new List(); + await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.Writers, PersonRole.Writer, _unitOfWork); + } - // Writers - if (!series.Metadata.WriterLocked) - { - await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.Writers, PersonRole.Writer); - } + // Cover Artists + if (!series.Metadata.CoverArtistLocked || !updateSeriesMetadataDto.SeriesMetadata.CoverArtistLocked) + { + await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.CoverArtists, PersonRole.CoverArtist, _unitOfWork); + } - // Cover Artists - if (!series.Metadata.CoverArtistLocked) - { - await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.CoverArtists, PersonRole.CoverArtist); - } + // Colorists + if (!series.Metadata.ColoristLocked || !updateSeriesMetadataDto.SeriesMetadata.ColoristLocked) + { + await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.Colorists, PersonRole.Colorist, _unitOfWork); + } - // Colorists - if (!series.Metadata.ColoristLocked) - { - await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.Colorists, PersonRole.Colorist); - } + // Editors + if (!series.Metadata.EditorLocked || !updateSeriesMetadataDto.SeriesMetadata.EditorLocked) + { + await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.Editors, PersonRole.Editor, _unitOfWork); + } - // Editors - if (!series.Metadata.EditorLocked) - { - await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.Editors, PersonRole.Editor); - } + // Inkers + if (!series.Metadata.InkerLocked || !updateSeriesMetadataDto.SeriesMetadata.InkerLocked) + { + await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.Inkers, PersonRole.Inker, _unitOfWork); + } - // Inkers - if (!series.Metadata.InkerLocked) - { - await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.Inkers, PersonRole.Inker); - } + // Letterers + if (!series.Metadata.LettererLocked || !updateSeriesMetadataDto.SeriesMetadata.LettererLocked) + { + await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.Letterers, PersonRole.Letterer, _unitOfWork); + } - // Letterers - if (!series.Metadata.LettererLocked) - { - await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.Letterers, PersonRole.Letterer); - } + // Pencillers + if (!series.Metadata.PencillerLocked || !updateSeriesMetadataDto.SeriesMetadata.PencillerLocked) + { + await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.Pencillers, PersonRole.Penciller, _unitOfWork); + } - // Pencillers - if (!series.Metadata.PencillerLocked) - { - await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.Pencillers, PersonRole.Penciller); - } + // Publishers + if (!series.Metadata.PublisherLocked || !updateSeriesMetadataDto.SeriesMetadata.PublisherLocked) + { + await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.Publishers, PersonRole.Publisher, _unitOfWork); + } - // Publishers - if (!series.Metadata.PublisherLocked) - { - await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.Publishers, PersonRole.Publisher); - } + // Imprints + if (!series.Metadata.ImprintLocked || !updateSeriesMetadataDto.SeriesMetadata.ImprintLocked) + { + await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.Imprints, PersonRole.Imprint, _unitOfWork); + } - // Imprints - if (!series.Metadata.ImprintLocked) - { - await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.Imprints, PersonRole.Imprint); - } + // Teams + if (!series.Metadata.TeamLocked || !updateSeriesMetadataDto.SeriesMetadata.TeamLocked) + { + await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.Teams, PersonRole.Team, _unitOfWork); + } - // Teams - if (!series.Metadata.TeamLocked) - { - await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.Teams, PersonRole.Team); - } + // Locations + if (!series.Metadata.LocationLocked || !updateSeriesMetadataDto.SeriesMetadata.LocationLocked) + { + await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.Locations, PersonRole.Location, _unitOfWork); + } - // Locations - if (!series.Metadata.LocationLocked) - { - await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.Locations, PersonRole.Location); - } - - // Translators - if (!series.Metadata.TranslatorLocked) - { - await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.Translators, PersonRole.Translator); - } + // Translators + if (!series.Metadata.TranslatorLocked || !updateSeriesMetadataDto.SeriesMetadata.TranslatorLocked) + { + await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.Translators, PersonRole.Translator, _unitOfWork); + } + // Characters + if (!series.Metadata.CharacterLocked || !updateSeriesMetadataDto.SeriesMetadata.CharacterLocked) + { + await HandlePeopleUpdateAsync(series.Metadata, updateSeriesMetadataDto.SeriesMetadata.Characters, PersonRole.Character, _unitOfWork); } series.Metadata.AgeRatingLocked = updateSeriesMetadataDto.SeriesMetadata.AgeRatingLocked; @@ -291,6 +315,7 @@ public class SeriesService : ISeriesService series.Metadata.PencillerLocked = updateSeriesMetadataDto.SeriesMetadata.PencillerLocked; series.Metadata.PublisherLocked = updateSeriesMetadataDto.SeriesMetadata.PublisherLocked; series.Metadata.TranslatorLocked = updateSeriesMetadataDto.SeriesMetadata.TranslatorLocked; + series.Metadata.LocationLocked = updateSeriesMetadataDto.SeriesMetadata.LocationLocked; series.Metadata.CoverArtistLocked = updateSeriesMetadataDto.SeriesMetadata.CoverArtistLocked; series.Metadata.WriterLocked = updateSeriesMetadataDto.SeriesMetadata.WriterLocked; series.Metadata.SummaryLocked = updateSeriesMetadataDto.SeriesMetadata.SummaryLocked; @@ -302,9 +327,10 @@ public class SeriesService : ISeriesService return true; } + _unitOfWork.SeriesRepository.Update(series.Metadata); await _unitOfWork.CommitAsync(); - // Trigger code to cleanup tags, collections, people, etc + // Trigger code to clean up tags, collections, people, etc try { await _taskScheduler.CleanupDbEntries(); @@ -331,8 +357,10 @@ public class SeriesService : ISeriesService /// /// /// - private async Task HandlePeopleUpdateAsync(SeriesMetadata metadata, ICollection peopleDtos, PersonRole role) + public static async Task HandlePeopleUpdateAsync(SeriesMetadata metadata, ICollection peopleDtos, PersonRole role, IUnitOfWork unitOfWork) { + // TODO: Cleanup this code so we aren't using UnitOfWork like this + // Normalize all names from the DTOs var normalizedNames = peopleDtos .Select(p => Parser.Normalize(p.Name)) @@ -340,10 +368,10 @@ public class SeriesService : ISeriesService .ToList(); // Bulk select people who already exist in the database - var existingPeople = await _unitOfWork.PersonRepository.GetPeopleByNames(normalizedNames); + var existingPeople = await unitOfWork.PersonRepository.GetPeopleByNames(normalizedNames); // Use a dictionary for quick lookups - var existingPeopleDictionary = existingPeople.DistinctBy(p => p.NormalizedName).ToDictionary(p => p.NormalizedName, p => p); + var existingPeopleDictionary = PersonHelper.ConstructNameAndAliasDictionary(existingPeople); // List to track people that will be added to the metadata var peopleToAdd = new List(); @@ -353,13 +381,28 @@ public class SeriesService : ISeriesService var normalizedPersonName = Parser.Normalize(personDto.Name); // Check if the person exists in the dictionary - if (existingPeopleDictionary.TryGetValue(normalizedPersonName, out _)) continue; + if (existingPeopleDictionary.TryGetValue(normalizedPersonName, out var p)) + { + // TODO: Should I add more controls here to map back? + if (personDto.AniListId > 0 && p.AniListId <= 0 && p.AniListId != personDto.AniListId) + { + p.AniListId = personDto.AniListId; + } + p.Description = string.IsNullOrEmpty(p.Description) ? personDto.Description : p.Description; + continue; // If we ever want to update metadata for existing people, we'd do it here + } // Person doesn't exist, so create a new one var newPerson = new Person { Name = personDto.Name, - NormalizedName = normalizedPersonName + NormalizedName = normalizedPersonName, + AniListId = personDto.AniListId, + Description = personDto.Description, + Asin = personDto.Asin, + CoverImage = personDto.CoverImage, + MalId = personDto.MalId, + HardcoverId = personDto.HardcoverId, }; peopleToAdd.Add(newPerson); @@ -369,7 +412,7 @@ public class SeriesService : ISeriesService // Add any new people to the database in bulk if (peopleToAdd.Count != 0) { - _unitOfWork.PersonRepository.Attach(peopleToAdd); + unitOfWork.PersonRepository.Attach(peopleToAdd); } // Now that we have all the people (new and existing), update the SeriesMetadataPeople @@ -411,63 +454,12 @@ public class SeriesService : ISeriesService } - - /// - /// - /// - /// User with Ratings includes - /// - /// - public async Task UpdateRating(AppUser? user, UpdateSeriesRatingDto updateSeriesRatingDto) - { - if (user == null) - { - _logger.LogError("Cannot update rating of null user"); - return false; - } - - var userRating = - await _unitOfWork.UserRepository.GetUserRatingAsync(updateSeriesRatingDto.SeriesId, user.Id) ?? - new AppUserRating(); - try - { - userRating.Rating = Math.Clamp(updateSeriesRatingDto.UserRating, 0f, 5f); - userRating.HasBeenRated = true; - userRating.SeriesId = updateSeriesRatingDto.SeriesId; - - if (userRating.Id == 0) - { - user.Ratings ??= new List(); - user.Ratings.Add(userRating); - } - - _unitOfWork.UserRepository.Update(user); - - if (!_unitOfWork.HasChanges() || await _unitOfWork.CommitAsync()) - { - BackgroundJob.Enqueue(() => - _scrobblingService.ScrobbleRatingUpdate(user.Id, updateSeriesRatingDto.SeriesId, - userRating.Rating)); - return true; - } - } - catch (Exception ex) - { - _logger.LogError(ex, "There was an exception saving rating"); - } - - await _unitOfWork.RollbackAsync(); - user.Ratings?.Remove(userRating); - - return false; - } - public async Task DeleteMultipleSeries(IList seriesIds) { try { var chapterMappings = - await _unitOfWork.SeriesRepository.GetChapterIdWithSeriesIdForSeriesAsync(seriesIds.ToArray()); + await _unitOfWork.SeriesRepository.GetChapterIdWithSeriesIdForSeriesAsync([.. seriesIds]); var allChapterIds = new List(); foreach (var mapping in chapterMappings) @@ -475,9 +467,8 @@ public class SeriesService : ISeriesService allChapterIds.AddRange(mapping.Value); } - // NOTE: This isn't getting all the people and whatnot currently + // NOTE: This isn't getting all the people and whatnot currently due to the lack of includes var series = await _unitOfWork.SeriesRepository.GetSeriesByIdsAsync(seriesIds); - _unitOfWork.SeriesRepository.Remove(series); var libraryIds = series.Select(s => s.LibraryId); @@ -498,7 +489,8 @@ public class SeriesService : ISeriesService await _unitOfWork.AppUserProgressRepository.CleanupAbandonedChapters(); await _unitOfWork.CollectionTagRepository.RemoveCollectionsWithoutSeries(); - _taskScheduler.CleanupChapters(allChapterIds.ToArray()); + _taskScheduler.CleanupChapters([.. allChapterIds]); + return true; } catch (Exception ex) @@ -877,19 +869,19 @@ public class SeriesService : ISeriesService // Calculate the time differences between consecutive chapters var timeDifferences = new List(); DateTime? previousChapterTime = null; - foreach (var chapter in chapters) + foreach (var chapterCreatedUtc in chapters.Select(c => c.CreatedUtc)) { - if (previousChapterTime.HasValue && (chapter.CreatedUtc - previousChapterTime.Value) <= TimeSpan.FromHours(1)) + if (previousChapterTime.HasValue && (chapterCreatedUtc - previousChapterTime.Value) <= TimeSpan.FromHours(1)) { continue; // Skip this chapter if it's within an hour of the previous one } - if ((chapter.CreatedUtc - previousChapterTime ?? TimeSpan.Zero) != TimeSpan.Zero) + if ((chapterCreatedUtc - previousChapterTime ?? TimeSpan.Zero) != TimeSpan.Zero) { - timeDifferences.Add(chapter.CreatedUtc - previousChapterTime ?? TimeSpan.Zero); + timeDifferences.Add(chapterCreatedUtc - previousChapterTime ?? TimeSpan.Zero); } - previousChapterTime = chapter.CreatedUtc; + previousChapterTime = chapterCreatedUtc; } if (timeDifferences.Count < minimumTimeDeltas) diff --git a/API/Services/SettingsService.cs b/API/Services/SettingsService.cs new file mode 100644 index 000000000..fd44b5962 --- /dev/null +++ b/API/Services/SettingsService.cs @@ -0,0 +1,447 @@ +using System; +using System.Linq; +using System.Net; +using System.Threading.Tasks; +using API.Data; +using API.DTOs.KavitaPlus.Metadata; +using API.DTOs.Settings; +using API.Entities; +using API.Entities.Enums; +using API.Extensions; +using API.Logging; +using API.Services.Tasks.Scanner; +using Hangfire; +using Kavita.Common; +using Kavita.Common.EnvironmentInfo; +using Kavita.Common.Helpers; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; + +namespace API.Services; + +public interface ISettingsService +{ + Task UpdateMetadataSettings(MetadataSettingsDto dto); + Task UpdateSettings(ServerSettingDto updateSettingsDto); +} + + +public class SettingsService : ISettingsService +{ + private readonly IUnitOfWork _unitOfWork; + private readonly IDirectoryService _directoryService; + private readonly ILibraryWatcher _libraryWatcher; + private readonly ITaskScheduler _taskScheduler; + private readonly ILogger _logger; + + public SettingsService(IUnitOfWork unitOfWork, IDirectoryService directoryService, + ILibraryWatcher libraryWatcher, ITaskScheduler taskScheduler, + ILogger logger) + { + _unitOfWork = unitOfWork; + _directoryService = directoryService; + _libraryWatcher = libraryWatcher; + _taskScheduler = taskScheduler; + _logger = logger; + } + + /// + /// Update the metadata settings for Kavita+ Metadata feature + /// + /// + /// + public async Task UpdateMetadataSettings(MetadataSettingsDto dto) + { + var existingMetadataSetting = await _unitOfWork.SettingsRepository.GetMetadataSettings(); + existingMetadataSetting.Enabled = dto.Enabled; + existingMetadataSetting.EnableSummary = dto.EnableSummary; + existingMetadataSetting.EnableLocalizedName = dto.EnableLocalizedName; + existingMetadataSetting.EnablePublicationStatus = dto.EnablePublicationStatus; + existingMetadataSetting.EnableRelationships = dto.EnableRelationships; + existingMetadataSetting.EnablePeople = dto.EnablePeople; + existingMetadataSetting.EnableStartDate = dto.EnableStartDate; + existingMetadataSetting.EnableGenres = dto.EnableGenres; + existingMetadataSetting.EnableTags = dto.EnableTags; + existingMetadataSetting.FirstLastPeopleNaming = dto.FirstLastPeopleNaming; + existingMetadataSetting.EnableCoverImage = dto.EnableCoverImage; + + existingMetadataSetting.EnableChapterPublisher = dto.EnableChapterPublisher; + existingMetadataSetting.EnableChapterSummary = dto.EnableChapterSummary; + existingMetadataSetting.EnableChapterTitle = dto.EnableChapterTitle; + existingMetadataSetting.EnableChapterReleaseDate = dto.EnableChapterReleaseDate; + existingMetadataSetting.EnableChapterCoverImage = dto.EnableChapterCoverImage; + + existingMetadataSetting.AgeRatingMappings = dto.AgeRatingMappings ?? []; + + existingMetadataSetting.Blacklist = (dto.Blacklist ?? []).Where(s => !string.IsNullOrWhiteSpace(s)).DistinctBy(d => d.ToNormalized()).ToList() ?? []; + existingMetadataSetting.Whitelist = (dto.Whitelist ?? []).Where(s => !string.IsNullOrWhiteSpace(s)).DistinctBy(d => d.ToNormalized()).ToList() ?? []; + existingMetadataSetting.Overrides = [.. dto.Overrides ?? []]; + existingMetadataSetting.PersonRoles = dto.PersonRoles ?? []; + + // Handle Field Mappings + + // Clear existing mappings + existingMetadataSetting.FieldMappings ??= []; + _unitOfWork.SettingsRepository.RemoveRange(existingMetadataSetting.FieldMappings); + existingMetadataSetting.FieldMappings.Clear(); + + if (dto.FieldMappings != null) + { + // Add new mappings + foreach (var mappingDto in dto.FieldMappings) + { + existingMetadataSetting.FieldMappings.Add(new MetadataFieldMapping + { + SourceType = mappingDto.SourceType, + DestinationType = mappingDto.DestinationType, + SourceValue = mappingDto.SourceValue, + DestinationValue = mappingDto.DestinationValue, + ExcludeFromSource = mappingDto.ExcludeFromSource + }); + } + } + + // Save changes + await _unitOfWork.CommitAsync(); + + // Return updated settings + return await _unitOfWork.SettingsRepository.GetMetadataSettingDto(); + } + + /// + /// Update Server Settings + /// + /// + /// + /// + public async Task UpdateSettings(ServerSettingDto updateSettingsDto) + { + // We do not allow CacheDirectory changes, so we will ignore. + var currentSettings = await _unitOfWork.SettingsRepository.GetSettingsAsync(); + var updateBookmarks = false; + var originalBookmarkDirectory = _directoryService.BookmarkDirectory; + + var bookmarkDirectory = updateSettingsDto.BookmarksDirectory; + if (!updateSettingsDto.BookmarksDirectory.EndsWith("bookmarks") && + !updateSettingsDto.BookmarksDirectory.EndsWith("bookmarks/")) + { + bookmarkDirectory = + _directoryService.FileSystem.Path.Join(updateSettingsDto.BookmarksDirectory, "bookmarks"); + } + + if (string.IsNullOrEmpty(updateSettingsDto.BookmarksDirectory)) + { + bookmarkDirectory = _directoryService.BookmarkDirectory; + } + + var updateTask = false; + foreach (var setting in currentSettings) + { + if (setting.Key == ServerSettingKey.OnDeckProgressDays && + updateSettingsDto.OnDeckProgressDays + string.Empty != setting.Value) + { + setting.Value = updateSettingsDto.OnDeckProgressDays + string.Empty; + _unitOfWork.SettingsRepository.Update(setting); + } + + if (setting.Key == ServerSettingKey.OnDeckUpdateDays && + updateSettingsDto.OnDeckUpdateDays + string.Empty != setting.Value) + { + setting.Value = updateSettingsDto.OnDeckUpdateDays + string.Empty; + _unitOfWork.SettingsRepository.Update(setting); + } + + if (setting.Key == ServerSettingKey.Port && updateSettingsDto.Port + string.Empty != setting.Value) + { + if (OsInfo.IsDocker) continue; + setting.Value = updateSettingsDto.Port + string.Empty; + // Port is managed in appSetting.json + Configuration.Port = updateSettingsDto.Port; + _unitOfWork.SettingsRepository.Update(setting); + } + + if (setting.Key == ServerSettingKey.CacheSize && + updateSettingsDto.CacheSize + string.Empty != setting.Value) + { + setting.Value = updateSettingsDto.CacheSize + string.Empty; + // CacheSize is managed in appSetting.json + Configuration.CacheSize = updateSettingsDto.CacheSize; + _unitOfWork.SettingsRepository.Update(setting); + } + + updateTask = updateTask || UpdateSchedulingSettings(setting, updateSettingsDto); + + UpdateEmailSettings(setting, updateSettingsDto); + + + + if (setting.Key == ServerSettingKey.IpAddresses && updateSettingsDto.IpAddresses != setting.Value) + { + if (OsInfo.IsDocker) continue; + // Validate IP addresses + foreach (var ipAddress in updateSettingsDto.IpAddresses.Split(',', + StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries)) + { + if (!IPAddress.TryParse(ipAddress.Trim(), out _)) + { + throw new KavitaException("ip-address-invalid"); + } + } + + setting.Value = updateSettingsDto.IpAddresses; + // IpAddresses is managed in appSetting.json + Configuration.IpAddresses = updateSettingsDto.IpAddresses; + _unitOfWork.SettingsRepository.Update(setting); + } + + if (setting.Key == ServerSettingKey.BaseUrl && updateSettingsDto.BaseUrl + string.Empty != setting.Value) + { + var path = !updateSettingsDto.BaseUrl.StartsWith('/') + ? $"/{updateSettingsDto.BaseUrl}" + : updateSettingsDto.BaseUrl; + path = !path.EndsWith('/') + ? $"{path}/" + : path; + setting.Value = path; + Configuration.BaseUrl = updateSettingsDto.BaseUrl; + _unitOfWork.SettingsRepository.Update(setting); + } + + if (setting.Key == ServerSettingKey.LoggingLevel && + updateSettingsDto.LoggingLevel + string.Empty != setting.Value) + { + setting.Value = updateSettingsDto.LoggingLevel + string.Empty; + LogLevelOptions.SwitchLogLevel(updateSettingsDto.LoggingLevel); + _unitOfWork.SettingsRepository.Update(setting); + } + + if (setting.Key == ServerSettingKey.EnableOpds && + updateSettingsDto.EnableOpds + string.Empty != setting.Value) + { + setting.Value = updateSettingsDto.EnableOpds + string.Empty; + _unitOfWork.SettingsRepository.Update(setting); + } + + if (setting.Key == ServerSettingKey.EncodeMediaAs && + ((int)updateSettingsDto.EncodeMediaAs).ToString() != setting.Value) + { + setting.Value = ((int)updateSettingsDto.EncodeMediaAs).ToString(); + _unitOfWork.SettingsRepository.Update(setting); + } + + if (setting.Key == ServerSettingKey.CoverImageSize && + ((int)updateSettingsDto.CoverImageSize).ToString() != setting.Value) + { + setting.Value = ((int)updateSettingsDto.CoverImageSize).ToString(); + _unitOfWork.SettingsRepository.Update(setting); + } + + if (setting.Key == ServerSettingKey.HostName && updateSettingsDto.HostName + string.Empty != setting.Value) + { + setting.Value = (updateSettingsDto.HostName + string.Empty).Trim(); + setting.Value = UrlHelper.RemoveEndingSlash(setting.Value); + _unitOfWork.SettingsRepository.Update(setting); + } + + if (setting.Key == ServerSettingKey.BookmarkDirectory && bookmarkDirectory != setting.Value) + { + // Validate new directory can be used + if (!await _directoryService.CheckWriteAccess(bookmarkDirectory)) + { + throw new KavitaException("bookmark-dir-permissions"); + } + + originalBookmarkDirectory = setting.Value; + + // Normalize the path deliminators. Just to look nice in DB, no functionality + setting.Value = _directoryService.FileSystem.Path.GetFullPath(bookmarkDirectory); + _unitOfWork.SettingsRepository.Update(setting); + updateBookmarks = true; + + } + + if (setting.Key == ServerSettingKey.AllowStatCollection && + updateSettingsDto.AllowStatCollection + string.Empty != setting.Value) + { + setting.Value = updateSettingsDto.AllowStatCollection + string.Empty; + _unitOfWork.SettingsRepository.Update(setting); + } + + if (setting.Key == ServerSettingKey.TotalBackups && + updateSettingsDto.TotalBackups + string.Empty != setting.Value) + { + if (updateSettingsDto.TotalBackups > 30 || updateSettingsDto.TotalBackups < 1) + { + throw new KavitaException("total-backups"); + } + + setting.Value = updateSettingsDto.TotalBackups + string.Empty; + _unitOfWork.SettingsRepository.Update(setting); + } + + if (setting.Key == ServerSettingKey.TotalLogs && + updateSettingsDto.TotalLogs + string.Empty != setting.Value) + { + if (updateSettingsDto.TotalLogs > 30 || updateSettingsDto.TotalLogs < 1) + { + throw new KavitaException("total-logs"); + } + + setting.Value = updateSettingsDto.TotalLogs + string.Empty; + _unitOfWork.SettingsRepository.Update(setting); + } + + if (setting.Key == ServerSettingKey.EnableFolderWatching && + updateSettingsDto.EnableFolderWatching + string.Empty != setting.Value) + { + setting.Value = updateSettingsDto.EnableFolderWatching + string.Empty; + _unitOfWork.SettingsRepository.Update(setting); + } + } + + if (!_unitOfWork.HasChanges()) return updateSettingsDto; + + try + { + await _unitOfWork.CommitAsync(); + + if (!updateSettingsDto.AllowStatCollection) + { + _taskScheduler.CancelStatsTasks(); + } + else + { + await _taskScheduler.ScheduleStatsTasks(); + } + + if (updateBookmarks) + { + UpdateBookmarkDirectory(originalBookmarkDirectory, bookmarkDirectory); + } + + if (updateTask) + { + BackgroundJob.Enqueue(() => _taskScheduler.ScheduleTasks()); + } + + if (updateSettingsDto.EnableFolderWatching) + { + BackgroundJob.Enqueue(() => _libraryWatcher.StartWatching()); + } + else + { + BackgroundJob.Enqueue(() => _libraryWatcher.StopWatching()); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "There was an exception when updating server settings"); + await _unitOfWork.RollbackAsync(); + throw new KavitaException("generic-error"); + } + + + _logger.LogInformation("Server Settings updated"); + + return updateSettingsDto; + } + + private void UpdateBookmarkDirectory(string originalBookmarkDirectory, string bookmarkDirectory) + { + _directoryService.ExistOrCreate(bookmarkDirectory); + _directoryService.CopyDirectoryToDirectory(originalBookmarkDirectory, bookmarkDirectory); + _directoryService.ClearAndDeleteDirectory(originalBookmarkDirectory); + } + + private bool UpdateSchedulingSettings(ServerSetting setting, ServerSettingDto updateSettingsDto) + { + if (setting.Key == ServerSettingKey.TaskBackup && updateSettingsDto.TaskBackup != setting.Value) + { + setting.Value = updateSettingsDto.TaskBackup; + _unitOfWork.SettingsRepository.Update(setting); + + return true; + } + + if (setting.Key == ServerSettingKey.TaskScan && updateSettingsDto.TaskScan != setting.Value) + { + setting.Value = updateSettingsDto.TaskScan; + _unitOfWork.SettingsRepository.Update(setting); + return true; + } + + if (setting.Key == ServerSettingKey.TaskCleanup && updateSettingsDto.TaskCleanup != setting.Value) + { + setting.Value = updateSettingsDto.TaskCleanup; + _unitOfWork.SettingsRepository.Update(setting); + return true; + } + return false; + } + + private void UpdateEmailSettings(ServerSetting setting, ServerSettingDto updateSettingsDto) + { + if (setting.Key == ServerSettingKey.EmailHost && + updateSettingsDto.SmtpConfig.Host + string.Empty != setting.Value) + { + setting.Value = updateSettingsDto.SmtpConfig.Host + string.Empty; + _unitOfWork.SettingsRepository.Update(setting); + } + + if (setting.Key == ServerSettingKey.EmailPort && + updateSettingsDto.SmtpConfig.Port + string.Empty != setting.Value) + { + setting.Value = updateSettingsDto.SmtpConfig.Port + string.Empty; + _unitOfWork.SettingsRepository.Update(setting); + } + + if (setting.Key == ServerSettingKey.EmailAuthPassword && + updateSettingsDto.SmtpConfig.Password + string.Empty != setting.Value) + { + setting.Value = updateSettingsDto.SmtpConfig.Password + string.Empty; + _unitOfWork.SettingsRepository.Update(setting); + } + + if (setting.Key == ServerSettingKey.EmailAuthUserName && + updateSettingsDto.SmtpConfig.UserName + string.Empty != setting.Value) + { + setting.Value = updateSettingsDto.SmtpConfig.UserName + string.Empty; + _unitOfWork.SettingsRepository.Update(setting); + } + + if (setting.Key == ServerSettingKey.EmailSenderAddress && + updateSettingsDto.SmtpConfig.SenderAddress + string.Empty != setting.Value) + { + setting.Value = updateSettingsDto.SmtpConfig.SenderAddress + string.Empty; + _unitOfWork.SettingsRepository.Update(setting); + } + + if (setting.Key == ServerSettingKey.EmailSenderDisplayName && + updateSettingsDto.SmtpConfig.SenderDisplayName + string.Empty != setting.Value) + { + setting.Value = updateSettingsDto.SmtpConfig.SenderDisplayName + string.Empty; + _unitOfWork.SettingsRepository.Update(setting); + } + + if (setting.Key == ServerSettingKey.EmailSizeLimit && + updateSettingsDto.SmtpConfig.SizeLimit + string.Empty != setting.Value) + { + setting.Value = updateSettingsDto.SmtpConfig.SizeLimit + string.Empty; + _unitOfWork.SettingsRepository.Update(setting); + } + + if (setting.Key == ServerSettingKey.EmailEnableSsl && + updateSettingsDto.SmtpConfig.EnableSsl + string.Empty != setting.Value) + { + setting.Value = updateSettingsDto.SmtpConfig.EnableSsl + string.Empty; + _unitOfWork.SettingsRepository.Update(setting); + } + + if (setting.Key == ServerSettingKey.EmailCustomizedTemplates && + updateSettingsDto.SmtpConfig.CustomizedTemplates + string.Empty != setting.Value) + { + setting.Value = updateSettingsDto.SmtpConfig.CustomizedTemplates + string.Empty; + _unitOfWork.SettingsRepository.Update(setting); + } + } +} diff --git a/API/Services/StatisticService.cs b/API/Services/StatisticService.cs index 8fa22cc2f..006bad184 100644 --- a/API/Services/StatisticService.cs +++ b/API/Services/StatisticService.cs @@ -36,7 +36,6 @@ public interface IStatisticService IEnumerable> GetWordsReadCountByYear(int userId = 0); Task UpdateServerStatistics(); Task TimeSpentReadingForUsersAsync(IList userIds, IList libraryIds); - Task GetKavitaPlusMetadataBreakdown(); Task> GetFilesByExtension(string fileExtension); } @@ -89,7 +88,9 @@ public class StatisticService : IStatisticService var lastActive = await _context.AppUserProgresses .Where(p => p.AppUserId == userId) - .MaxAsync(p => p.LastModified); + .Select(p => p.LastModified) + .DefaultIfEmpty() + .MaxAsync(); // First get the total pages per library @@ -127,12 +128,25 @@ public class StatisticService : IStatisticService var earliestReadDate = await _context.AppUserProgresses .Where(p => p.AppUserId == userId) - .MinAsync(p => p.Created); + .Select(p => p.Created) + .DefaultIfEmpty() + .MinAsync(); + + if (earliestReadDate == DateTime.MinValue) + { + averageReadingTimePerWeek = 0; + } + else + { +#pragma warning disable S6561 + var timeDifference = DateTime.Now - earliestReadDate; +#pragma warning restore S6561 + var deltaWeeks = (int)Math.Ceiling(timeDifference.TotalDays / 7); + + averageReadingTimePerWeek /= deltaWeeks; + } - var timeDifference = DateTime.Now - earliestReadDate; - var deltaWeeks = (int)Math.Ceiling(timeDifference.TotalDays / 7); - averageReadingTimePerWeek /= deltaWeeks; return new UserReadStatistics() @@ -344,6 +358,7 @@ public class StatisticService : IStatisticService SeriesId = u.SeriesId, LibraryId = u.LibraryId, ReadDate = u.LastModified, + ReadDateUtc = u.LastModifiedUtc, ChapterId = u.ChapterId, ChapterNumber = _context.Chapter.Single(c => c.Id == u.ChapterId).MinNumber }) @@ -540,29 +555,6 @@ public class StatisticService : IStatisticService p.chapter.AvgHoursToRead * (p.progress.PagesRead / (1.0f * p.chapter.Pages)))); } - public async Task GetKavitaPlusMetadataBreakdown() - { - // We need to count number of Series that have an external series record - // Then count how many series are blacklisted - // Then get total count of series that are Kavita+ eligible - var plusLibraries = await _context.Library - .Where(l => !ExternalMetadataService.NonEligibleLibraryTypes.Contains(l.Type)) - .Select(l => l.Id) - .ToListAsync(); - - var countOfBlacklisted = await _context.SeriesBlacklist.CountAsync(); - var totalSeries = await _context.Series.Where(s => plusLibraries.Contains(s.LibraryId)).CountAsync(); - var seriesWithMetadata = await _context.ExternalSeriesMetadata.CountAsync(); - - return new KavitaPlusMetadataBreakdownDto() - { - TotalSeries = totalSeries, - ErroredSeries = countOfBlacklisted, - SeriesCompleted = seriesWithMetadata - }; - - } - public async Task> GetFilesByExtension(string fileExtension) { var query = _context.MangaFile diff --git a/API/Services/StreamService.cs b/API/Services/StreamService.cs index f12f10a8a..1f2e55579 100644 --- a/API/Services/StreamService.cs +++ b/API/Services/StreamService.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using API.Data; @@ -11,6 +12,7 @@ using API.Helpers; using API.SignalR; using Kavita.Common; using Kavita.Common.Helpers; +using Microsoft.Extensions.Logging; namespace API.Services; @@ -33,6 +35,9 @@ public interface IStreamService Task CreateExternalSource(int userId, ExternalSourceDto dto); Task UpdateExternalSource(int userId, ExternalSourceDto dto); Task DeleteExternalSource(int userId, int externalSourceId); + Task DeleteSideNavSmartFilterStream(int userId, int sideNavStreamId); + Task DeleteDashboardSmartFilterStream(int userId, int dashboardStreamId); + Task RenameSmartFilterStreams(AppUserSmartFilter smartFilter); } public class StreamService : IStreamService @@ -40,12 +45,14 @@ public class StreamService : IStreamService private readonly IUnitOfWork _unitOfWork; private readonly IEventHub _eventHub; private readonly ILocalizationService _localizationService; + private readonly ILogger _logger; - public StreamService(IUnitOfWork unitOfWork, IEventHub eventHub, ILocalizationService localizationService) + public StreamService(IUnitOfWork unitOfWork, IEventHub eventHub, ILocalizationService localizationService, ILogger logger) { _unitOfWork = unitOfWork; _eventHub = eventHub; _localizationService = localizationService; + _logger = logger; } public async Task> GetDashboardStreams(int userId, bool visibleOnly = true) @@ -91,6 +98,7 @@ public class StreamService : IStreamService var ret = new DashboardStreamDto() { + Id = createdStream.Id, Name = createdStream.Name, IsProvided = createdStream.IsProvided, Visible = createdStream.Visible, @@ -123,7 +131,10 @@ public class StreamService : IStreamService AppUserIncludes.DashboardStreams); var stream = user?.DashboardStreams.FirstOrDefault(d => d.Id == dto.Id); if (stream == null) + { throw new KavitaException(await _localizationService.Translate(userId, "dashboard-stream-doesnt-exist")); + } + if (stream.Order == dto.ToPosition) return; var list = user!.DashboardStreams.OrderBy(s => s.Order).ToList(); @@ -179,6 +190,7 @@ public class StreamService : IStreamService var ret = new SideNavStreamDto() { + Id = createdStream.Id, Name = createdStream.Name, IsProvided = createdStream.IsProvided, Visible = createdStream.Visible, @@ -341,4 +353,72 @@ public class StreamService : IStreamService await _unitOfWork.CommitAsync(); } + + public async Task DeleteSideNavSmartFilterStream(int userId, int sideNavStreamId) + { + try + { + var stream = await _unitOfWork.UserRepository.GetSideNavStream(sideNavStreamId); + if (stream == null) throw new KavitaException("sidenav-stream-doesnt-exist"); + + if (stream.AppUserId != userId) throw new KavitaException("sidenav-stream-doesnt-exist"); + + + if (stream.StreamType != SideNavStreamType.SmartFilter) + { + throw new KavitaException("sidenav-stream-only-delete-smart-filter"); + } + + _unitOfWork.UserRepository.Delete(stream); + + await _unitOfWork.CommitAsync(); + } + catch (Exception ex) + { + _logger.LogError(ex, "There was an exception deleting SideNav Smart Filter Stream: {FilterId}", sideNavStreamId); + throw; + } + } + + public async Task DeleteDashboardSmartFilterStream(int userId, int dashboardStreamId) + { + try + { + var stream = await _unitOfWork.UserRepository.GetDashboardStream(dashboardStreamId); + if (stream == null) throw new KavitaException("dashboard-stream-doesnt-exist"); + + if (stream.AppUserId != userId) throw new KavitaException("dashboard-stream-doesnt-exist"); + + if (stream.StreamType != DashboardStreamType.SmartFilter) + { + throw new KavitaException("dashboard-stream-only-delete-smart-filter"); + } + + _unitOfWork.UserRepository.Delete(stream); + + await _unitOfWork.CommitAsync(); + } catch (Exception ex) + { + _logger.LogError(ex, "There was an exception deleting Dashboard Smart Filter Stream: {FilterId}", dashboardStreamId); + throw; + } + } + + public async Task RenameSmartFilterStreams(AppUserSmartFilter smartFilter) + { + var sideNavStreams = await _unitOfWork.UserRepository.GetSideNavStreamWithFilter(smartFilter.Id); + var dashboardStreams = await _unitOfWork.UserRepository.GetDashboardStreamWithFilter(smartFilter.Id); + + foreach (var sideNavStream in sideNavStreams) + { + sideNavStream.Name = smartFilter.Name; + } + + foreach (var dashboardStream in dashboardStreams) + { + dashboardStream.Name = smartFilter.Name; + } + + await _unitOfWork.CommitAsync(); + } } diff --git a/API/Services/TaskScheduler.cs b/API/Services/TaskScheduler.cs index 2dbd4ed34..575f89b3b 100644 --- a/API/Services/TaskScheduler.cs +++ b/API/Services/TaskScheduler.cs @@ -6,6 +6,8 @@ using System.Threading.Tasks; using API.Data; using API.Data.Repositories; using API.Entities.Enums; +using API.Extensions; +using API.Helpers; using API.Helpers.Converters; using API.Services.Plus; using API.Services.Tasks; @@ -32,7 +34,6 @@ public interface ITaskScheduler void RefreshSeriesMetadata(int libraryId, int seriesId, bool forceUpdate = false, bool forceColorscape = false); Task ScanSeries(int libraryId, int seriesId, bool forceUpdate = false); void AnalyzeFilesForSeries(int libraryId, int seriesId, bool forceUpdate = false); - void AnalyzeFilesForLibrary(int libraryId, bool forceUpdate = false); void CancelStatsTasks(); Task RunStatCollection(); void CovertAllCoversToEncoding(); @@ -60,6 +61,7 @@ public class TaskScheduler : ITaskScheduler private readonly ILicenseService _licenseService; private readonly IExternalMetadataService _externalMetadataService; private readonly ISmartCollectionSyncService _smartCollectionSyncService; + private readonly IWantToReadSyncService _wantToReadSyncService; private readonly IEventHub _eventHub; public static BackgroundJobServer Client => new (); @@ -80,6 +82,7 @@ public class TaskScheduler : ITaskScheduler public const string LicenseCheckId = "license-check"; public const string KavitaPlusDataRefreshId = "kavita+-data-refresh"; public const string KavitaPlusStackSyncId = "kavita+-stack-sync"; + public const string KavitaPlusWantToReadSyncId = "kavita+-want-to-read-sync"; public static readonly ImmutableArray ScanTasks = ["ScannerService", "ScanLibrary", "ScanLibraries", "ScanFolder", "ScanSeries"]; @@ -98,7 +101,8 @@ public class TaskScheduler : ITaskScheduler ICleanupService cleanupService, IStatsService statsService, IVersionUpdaterService versionUpdaterService, IThemeService themeService, IWordCountAnalyzerService wordCountAnalyzerService, IStatisticService statisticService, IMediaConversionService mediaConversionService, IScrobblingService scrobblingService, ILicenseService licenseService, - IExternalMetadataService externalMetadataService, ISmartCollectionSyncService smartCollectionSyncService, IEventHub eventHub) + IExternalMetadataService externalMetadataService, ISmartCollectionSyncService smartCollectionSyncService, + IWantToReadSyncService wantToReadSyncService, IEventHub eventHub) { _cacheService = cacheService; _logger = logger; @@ -117,6 +121,7 @@ public class TaskScheduler : ITaskScheduler _licenseService = licenseService; _externalMetadataService = externalMetadataService; _smartCollectionSyncService = smartCollectionSyncService; + _wantToReadSyncService = wantToReadSyncService; _eventHub = eventHub; } @@ -204,23 +209,45 @@ public class TaskScheduler : ITaskScheduler RecurringJob.AddOrUpdate(CheckScrobblingTokensId, () => _scrobblingService.CheckExternalAccessTokens(), Cron.Daily, RecurringJobOptions); BackgroundJob.Enqueue(() => _scrobblingService.CheckExternalAccessTokens()); // We also kick off an immediate check on startup - RecurringJob.AddOrUpdate(LicenseCheckId, () => _licenseService.HasActiveLicense(true), + + // Get the License Info (and cache it) on first load. This will internally cache the Github releases for the Version Service + await _licenseService.GetLicenseInfo(true); // Kick this off first to cache it then let it refresh every 9 hours (8 hour cache) + RecurringJob.AddOrUpdate(LicenseCheckId, () => _licenseService.GetLicenseInfo(false), LicenseService.Cron, RecurringJobOptions); - // KavitaPlus Scrobbling (every 4 hours) + // KavitaPlus Scrobbling (every hour) - randomise minutes to spread requests out for K+ RecurringJob.AddOrUpdate(ProcessScrobblingEventsId, () => _scrobblingService.ProcessUpdatesSinceLastSync(), - "0 */4 * * *", RecurringJobOptions); + Cron.Hourly(Rnd.Next(0, 60)), RecurringJobOptions); RecurringJob.AddOrUpdate(ProcessProcessedScrobblingEventsId, () => _scrobblingService.ClearProcessedEvents(), Cron.Daily, RecurringJobOptions); // Backfilling/Freshening Reviews/Rating/Recommendations RecurringJob.AddOrUpdate(KavitaPlusDataRefreshId, - () => _externalMetadataService.FetchExternalDataTask(), Cron.Daily(Rnd.Next(1, 4)), + () => _externalMetadataService.FetchExternalDataTask(), Cron.Daily(Rnd.Next(1, 5)), RecurringJobOptions); + // This shouldn't be so close to fetching data due to Rate limit concerns RecurringJob.AddOrUpdate(KavitaPlusStackSyncId, - () => _smartCollectionSyncService.Sync(), Cron.Daily(Rnd.Next(1, 4)), + () => _smartCollectionSyncService.Sync(), Cron.Daily(Rnd.Next(6, 10)), RecurringJobOptions); + + RecurringJob.AddOrUpdate(KavitaPlusWantToReadSyncId, + () => _wantToReadSyncService.Sync(), Cron.Weekly(DayOfWeekHelper.Random()), + RecurringJobOptions); + } + + /// + /// Removes any Kavita+ Recurring Jobs + /// + public static void RemoveKavitaPlusTasks() + { + RecurringJob.RemoveIfExists(CheckScrobblingTokensId); + RecurringJob.RemoveIfExists(LicenseCheckId); + RecurringJob.RemoveIfExists(ProcessScrobblingEventsId); + RecurringJob.RemoveIfExists(ProcessProcessedScrobblingEventsId); + RecurringJob.RemoveIfExists(KavitaPlusDataRefreshId); + RecurringJob.RemoveIfExists(KavitaPlusStackSyncId); + RecurringJob.RemoveIfExists(KavitaPlusWantToReadSyncId); } #region StatsTasks @@ -239,11 +266,6 @@ public class TaskScheduler : ITaskScheduler RecurringJob.AddOrUpdate(ReportStatsTaskId, () => _statsService.Send(), Cron.Daily(Rnd.Next(0, 22)), RecurringJobOptions); } - public void AnalyzeFilesForLibrary(int libraryId, bool forceUpdate = false) - { - _logger.LogInformation("Enqueuing library file analysis for: {LibraryId}", libraryId); - BackgroundJob.Enqueue(() => _wordCountAnalyzerService.ScanLibrary(libraryId, forceUpdate)); - } /// /// Upon cancelling stat, we do report to the Stat service that we are no longer going to be reporting @@ -307,7 +329,7 @@ public class TaskScheduler : ITaskScheduler if (HasAlreadyEnqueuedTask(ScannerService.Name, "ScanFolder", [normalizedFolder, normalizedOriginal]) || HasAlreadyEnqueuedTask(ScannerService.Name, "ScanFolder", [normalizedFolder, string.Empty])) { - _logger.LogDebug("Skipped scheduling ScanFolder for {Folder} as a job already queued", + _logger.LogTrace("Skipped scheduling ScanFolder for {Folder} as a job already queued", normalizedFolder); return; } @@ -324,7 +346,7 @@ public class TaskScheduler : ITaskScheduler var normalizedFolder = Tasks.Scanner.Parser.Parser.NormalizePath(folderPath); if (HasAlreadyEnqueuedTask(ScannerService.Name, "ScanFolder", [normalizedFolder, string.Empty])) { - _logger.LogDebug("Skipped scheduling ScanFolder for {Folder} as a job already queued", + _logger.LogTrace("Skipped scheduling ScanFolder for {Folder} as a job already queued", normalizedFolder); return; } diff --git a/API/Services/Tasks/CleanupService.cs b/API/Services/Tasks/CleanupService.cs index 4faf59e6c..e39600c3f 100644 --- a/API/Services/Tasks/CleanupService.cs +++ b/API/Services/Tasks/CleanupService.cs @@ -8,8 +8,10 @@ using API.DTOs.Filtering; using API.Entities; using API.Entities.Enums; using API.Helpers; +using API.Services.Tasks.Scanner.Parser; using API.SignalR; using Hangfire; +using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; namespace API.Services.Tasks; @@ -33,6 +35,11 @@ public interface ICleanupService /// /// Task CleanupWantToRead(); + + Task ConsolidateProgress(); + + Task CleanupMediaErrors(); + } /// /// Cleans up after operations on reoccurring basis @@ -74,13 +81,23 @@ public class CleanupService : ICleanupService _logger.LogInformation("Starting Cleanup"); await SendProgress(0F, "Starting cleanup"); + _logger.LogInformation("Cleaning temp directory"); _directoryService.ClearDirectory(_directoryService.TempDirectory); + await SendProgress(0.1F, "Cleaning temp directory"); CleanupCacheAndTempDirectories(); + await SendProgress(0.25F, "Cleaning old database backups"); _logger.LogInformation("Cleaning old database backups"); await CleanupBackups(); + + await SendProgress(0.35F, "Consolidating Progress Events"); + await ConsolidateProgress(); + + await SendProgress(0.4F, "Consolidating Media Errors"); + await CleanupMediaErrors(); + await SendProgress(0.50F, "Cleaning deleted cover images"); _logger.LogInformation("Cleaning deleted cover images"); await DeleteSeriesCoverImages(); @@ -226,6 +243,108 @@ public class CleanupService : ICleanupService _logger.LogInformation("Finished cleanup of Database backups at {Time}", DateTime.Now); } + /// + /// Find any progress events that have duplicate, find the highest page read event, then copy over information from that and delete others, to leave one. + /// + public async Task ConsolidateProgress() + { + _logger.LogInformation("Consolidating Progress Events"); + // AppUserProgress + var allProgress = await _unitOfWork.AppUserProgressRepository.GetAllProgress(); + + // Group by the unique identifiers that would make a progress entry unique + var duplicateGroups = allProgress + .GroupBy(p => new + { + p.AppUserId, + p.ChapterId, + }) + .Where(g => g.Count() > 1); + + foreach (var group in duplicateGroups) + { + // Find the entry with the highest pages read + var highestProgress = group + .OrderByDescending(p => p.PagesRead) + .ThenByDescending(p => p.LastModifiedUtc) + .First(); + + // Get the duplicate entries to remove (all except the highest progress) + var duplicatesToRemove = group + .Where(p => p.Id != highestProgress.Id) + .ToList(); + + // Copy over any non-null BookScrollId if the highest progress entry doesn't have one + if (string.IsNullOrEmpty(highestProgress.BookScrollId)) + { + var firstValidScrollId = duplicatesToRemove + .FirstOrDefault(p => !string.IsNullOrEmpty(p.BookScrollId)) + ?.BookScrollId; + + if (firstValidScrollId != null) + { + highestProgress.BookScrollId = firstValidScrollId; + highestProgress.MarkModified(); + } + } + + // Remove the duplicates + foreach (var duplicate in duplicatesToRemove) + { + _unitOfWork.AppUserProgressRepository.Remove(duplicate); + } + } + + // Save changes + await _unitOfWork.CommitAsync(); + } + + /// + /// Scans through Media Error and removes any entries that have been fixed and are within the DB (proper files where wordcount/pagecount > 0) + /// + public async Task CleanupMediaErrors() + { + try + { + List errorStrings = ["This archive cannot be read or not supported", "File format not supported"]; + var mediaErrors = await _unitOfWork.MediaErrorRepository.GetAllErrorsAsync(errorStrings); + _logger.LogInformation("Beginning consolidation of {Count} Media Errors", mediaErrors.Count); + + var pathToErrorMap = mediaErrors + .GroupBy(me => Parser.NormalizePath(me.FilePath)) + .ToDictionary( + group => group.Key, + group => group.ToList() // The same file can be duplicated (rare issue when network drives die out midscan) + ); + + var normalizedPaths = pathToErrorMap.Keys.ToList(); + + // Find all files that are valid + var validFiles = await _unitOfWork.DataContext.MangaFile + .Where(f => normalizedPaths.Contains(f.FilePath) && f.Pages > 0) + .Select(f => f.FilePath) + .ToListAsync(); + + var removalCount = 0; + foreach (var validFilePath in validFiles) + { + if (!pathToErrorMap.TryGetValue(validFilePath, out var mediaError)) continue; + + _unitOfWork.MediaErrorRepository.Remove(mediaError); + removalCount++; + } + + await _unitOfWork.CommitAsync(); + + _logger.LogInformation("Finished consolidation of {Count} Media Errors, Removed: {RemovalCount}", + mediaErrors.Count, removalCount); + } + catch (Exception ex) + { + _logger.LogError(ex, "There was an exception consolidating media errors"); + } + } + public async Task CleanupLogs() { _logger.LogInformation("Performing cleanup of logs directory"); diff --git a/API/Services/Tasks/Metadata/CoverDbService.cs b/API/Services/Tasks/Metadata/CoverDbService.cs index da83eebf6..015613965 100644 --- a/API/Services/Tasks/Metadata/CoverDbService.cs +++ b/API/Services/Tasks/Metadata/CoverDbService.cs @@ -4,10 +4,13 @@ using System.IO; using System.Linq; using System.Threading.Tasks; using API.Constants; +using API.Data; using API.Data.Repositories; using API.Entities; using API.Entities.Enums; +using API.Entities.Person; using API.Extensions; +using API.SignalR; using EasyCaching.Core; using Flurl; using Flurl.Http; @@ -17,13 +20,19 @@ using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using NetVips; + namespace API.Services.Tasks.Metadata; +#nullable enable public interface ICoverDbService { Task DownloadFaviconAsync(string url, EncodeFormat encodeFormat); Task DownloadPublisherImageAsync(string publisherName, EncodeFormat encodeFormat); Task DownloadPersonImageAsync(Person person, EncodeFormat encodeFormat); + Task DownloadPersonImageAsync(Person person, EncodeFormat encodeFormat, string url); + Task SetPersonCoverByUrl(Person person, string url, bool fromBase64 = true, bool checkNoImagePlaceholder = false); + Task SetSeriesCoverByUrl(Series series, string url, bool fromBase64 = true, bool chooseBetterImage = false); + Task SetChapterCoverByUrl(Chapter chapter, string url, bool fromBase64 = true, bool chooseBetterImage = false); } @@ -33,6 +42,10 @@ public class CoverDbService : ICoverDbService private readonly IDirectoryService _directoryService; private readonly IEasyCachingProviderFactory _cacheFactory; private readonly IHostEnvironment _env; + private readonly IImageService _imageService; + private readonly IUnitOfWork _unitOfWork; + private readonly IEventHub _eventHub; + private TimeSpan _cacheTime = TimeSpan.FromDays(10); private const string NewHost = "https://www.kavitareader.com/CoversDB/"; @@ -50,16 +63,40 @@ public class CoverDbService : ICoverDbService { ["https://app.plex.tv"] = "https://plex.tv" }; + /// + /// Cache of the publisher/favicon list + /// + private static readonly TimeSpan CacheDuration = TimeSpan.FromDays(1); public CoverDbService(ILogger logger, IDirectoryService directoryService, - IEasyCachingProviderFactory cacheFactory, IHostEnvironment env) + IEasyCachingProviderFactory cacheFactory, IHostEnvironment env, IImageService imageService, + IUnitOfWork unitOfWork, IEventHub eventHub) { _logger = logger; _directoryService = directoryService; _cacheFactory = cacheFactory; _env = env; + _imageService = imageService; + _unitOfWork = unitOfWork; + _eventHub = eventHub; } + /// + /// Downloads the favicon image from a given website URL, optionally falling back to a custom method if standard methods fail. + /// + /// The full URL of the website to extract the favicon from. + /// The desired image encoding format for saving the favicon (e.g., WebP, PNG). + /// + /// A string representing the filename of the downloaded favicon image, saved to the configured favicon directory. + /// + /// + /// Thrown when favicon retrieval fails or if a previously failed domain is detected in cache. + /// + /// + /// This method first checks for a cached failure to avoid re-requesting bad links. + /// It then attempts to parse HTML for `link` tags pointing to `.png` favicons and + /// falls back to an internal fallback method if needed. Valid results are saved to disk. + /// public async Task DownloadFaviconAsync(string url, EncodeFormat encodeFormat) { // Parse the URL to get the domain (including subdomain) @@ -77,7 +114,7 @@ public class CoverDbService : ICoverDbService throw new KavitaException($"Kavita has already tried to fetch from {sanitizedBaseUrl} and failed. Skipping duplicate check"); } - await provider.SetAsync(baseUrl, string.Empty, TimeSpan.FromDays(10)); + await provider.SetAsync(baseUrl, string.Empty, _cacheTime); if (FaviconUrlMapper.TryGetValue(baseUrl, out var value)) { url = value; @@ -136,23 +173,10 @@ public class CoverDbService : ICoverDbService // Create the destination file path using var image = Image.PngloadStream(faviconStream); var filename = ImageService.GetWebLinkFormat(baseUrl, encodeFormat); - switch (encodeFormat) - { - case EncodeFormat.PNG: - image.Pngsave(Path.Combine(_directoryService.FaviconDirectory, filename)); - break; - case EncodeFormat.WEBP: - image.Webpsave(Path.Combine(_directoryService.FaviconDirectory, filename)); - break; - case EncodeFormat.AVIF: - image.Heifsave(Path.Combine(_directoryService.FaviconDirectory, filename)); - break; - default: - throw new ArgumentOutOfRangeException(nameof(encodeFormat), encodeFormat, null); - } - + image.WriteToFile(Path.Combine(_directoryService.FaviconDirectory, filename)); _logger.LogDebug("Favicon for {Domain} downloaded and saved successfully", domain); + return filename; } catch (Exception ex) { @@ -165,38 +189,31 @@ public class CoverDbService : ICoverDbService { try { + // Sanitize user input + publisherName = publisherName.Replace(Environment.NewLine, string.Empty).Replace("\r", string.Empty).Replace("\n", string.Empty); + var provider = _cacheFactory.GetCachingProvider(EasyCacheProfiles.Publisher); + var res = await provider.GetAsync(publisherName); + if (res.HasValue) + { + _logger.LogInformation("Kavita has already tried to fetch Publisher: {PublisherName} and failed. Skipping duplicate check", publisherName); + throw new KavitaException($"Kavita has already tried to fetch Publisher: {publisherName} and failed. Skipping duplicate check"); + } + + await provider.SetAsync(publisherName, string.Empty, _cacheTime); var publisherLink = await FallbackToKavitaReaderPublisher(publisherName); if (string.IsNullOrEmpty(publisherLink)) { throw new KavitaException($"Could not grab publisher image for {publisherName}"); } - _logger.LogTrace("Fetching publisher image from {Url}", publisherLink.Sanitize()); - // Download the publisher file using Flurl - var publisherStream = await publisherLink - .AllowHttpStatus("2xx,304") - .GetStreamAsync(); - // Create the destination file path - using var image = Image.NewFromStream(publisherStream); var filename = ImageService.GetPublisherFormat(publisherName, encodeFormat); - switch (encodeFormat) - { - case EncodeFormat.PNG: - image.Pngsave(Path.Combine(_directoryService.PublisherDirectory, filename)); - break; - case EncodeFormat.WEBP: - image.Webpsave(Path.Combine(_directoryService.PublisherDirectory, filename)); - break; - case EncodeFormat.AVIF: - image.Heifsave(Path.Combine(_directoryService.PublisherDirectory, filename)); - break; - default: - throw new ArgumentOutOfRangeException(nameof(encodeFormat), encodeFormat, null); - } + _logger.LogTrace("Fetching publisher image from {Url}", publisherLink.Sanitize()); + await DownloadImageFromUrl(publisherName, encodeFormat, publisherLink, _directoryService.PublisherDirectory); _logger.LogDebug("Publisher image for {PublisherName} downloaded and saved successfully", publisherName.Sanitize()); + return filename; } catch (Exception ex) { @@ -220,36 +237,37 @@ public class CoverDbService : ICoverDbService { throw new KavitaException($"Could not grab person image for {person.Name}"); } + return await DownloadPersonImageAsync(person, encodeFormat, personImageLink); + } catch (Exception ex) + { + _logger.LogError(ex, "Error downloading image for {PersonName}", person.Name); + } - // Create the destination file path - var filename = ImageService.GetPersonFormat(person.Id) + encodeFormat.GetExtension(); - var targetFile = Path.Combine(_directoryService.CoverImageDirectory, filename); + return null; + } - // Ensure if file exists, we delete to overwrite - - - _logger.LogTrace("Fetching publisher image from {Url}", personImageLink.Sanitize()); - // Download the publisher file using Flurl - var personStream = await personImageLink - .AllowHttpStatus("2xx,304") - .GetStreamAsync(); - - using var image = Image.NewFromStream(personStream); - switch (encodeFormat) + /// + /// Attempts to download the Person cover image from a Url + /// + /// + /// + /// + /// + /// + /// + public async Task DownloadPersonImageAsync(Person person, EncodeFormat encodeFormat, string url) + { + try + { + var personImageLink = await GetCoverPersonImagePath(person); + if (string.IsNullOrEmpty(personImageLink)) { - case EncodeFormat.PNG: - image.Pngsave(targetFile); - break; - case EncodeFormat.WEBP: - image.Webpsave(targetFile); - break; - case EncodeFormat.AVIF: - image.Heifsave(targetFile); - break; - default: - throw new ArgumentOutOfRangeException(nameof(encodeFormat), encodeFormat, null); + throw new KavitaException($"Could not grab person image for {person.Name}"); } + + var filename = await DownloadImageFromUrl(ImageService.GetPersonFormat(person.Id), encodeFormat, personImageLink); + _logger.LogDebug("Person image for {PersonName} downloaded and saved successfully", person.Name); return filename; @@ -261,9 +279,52 @@ public class CoverDbService : ICoverDbService return null; } - private async Task GetCoverPersonImagePath(Person person) + private async Task DownloadImageFromUrl(string filenameWithoutExtension, EncodeFormat encodeFormat, string url, string? targetDirectory = null) { - var tempFile = Path.Join(_directoryService.TempDirectory, "people.yml"); + // TODO: I need to unit test this to ensure it works when overwriting, etc + + // Target Directory defaults to CoverImageDirectory, but can be temp for when comparison between images is used + targetDirectory ??= _directoryService.CoverImageDirectory; + + // Create the destination file path + var filename = filenameWithoutExtension + encodeFormat.GetExtension(); + var targetFile = Path.Combine(targetDirectory, filename); + + _logger.LogTrace("Fetching person image from {Url}", url.Sanitize()); + // Download the file using Flurl + var imageStream = await url + .AllowHttpStatus("2xx,304") + .GetStreamAsync(); + + using var image = Image.NewFromStream(imageStream); + try + { + image.WriteToFile(targetFile); + } + catch (Exception ex) + { + switch (encodeFormat) + { + case EncodeFormat.PNG: + image.Pngsave(Path.Combine(_directoryService.FaviconDirectory, filename)); + break; + case EncodeFormat.WEBP: + image.Webpsave(Path.Combine(_directoryService.FaviconDirectory, filename)); + break; + case EncodeFormat.AVIF: + image.Heifsave(Path.Combine(_directoryService.FaviconDirectory, filename)); + break; + default: + throw new ArgumentOutOfRangeException(nameof(encodeFormat), encodeFormat, null); + } + } + + return filename; + } + + private async Task GetCoverPersonImagePath(Person person) + { + var tempFile = Path.Join(_directoryService.LongTermCacheDirectory, "people.yml"); // Check if the file already exists and skip download in Development environment if (File.Exists(tempFile)) @@ -286,7 +347,7 @@ public class CoverDbService : ICoverDbService if (!File.Exists(tempFile)) { var masterPeopleFile = await $"{NewHost}people/people.yml" - .DownloadFileAsync(_directoryService.TempDirectory); + .DownloadFileAsync(_directoryService.LongTermCacheDirectory); if (!File.Exists(tempFile) || string.IsNullOrEmpty(masterPeopleFile)) { @@ -307,66 +368,373 @@ public class CoverDbService : ICoverDbService return $"{NewHost}{coverAuthor.ImagePath}"; } - private static async Task FallbackToKavitaReaderFavicon(string baseUrl) + private async Task FallbackToKavitaReaderFavicon(string baseUrl) { + const string urlsFileName = "publishers.txt"; var correctSizeLink = string.Empty; - // TODO: Pull this down and store it in temp/ to save on requests - var allOverrides = await $"{NewHost}favicons/urls.txt" - .GetStringAsync(); + var allOverrides = await GetCachedData(urlsFileName) ?? + await $"{NewHost}favicons/{urlsFileName}".GetStringAsync(); - if (!string.IsNullOrEmpty(allOverrides)) + // Cache immediately + await CacheDataAsync(urlsFileName, allOverrides); + + + if (string.IsNullOrEmpty(allOverrides)) return correctSizeLink; + + var cleanedBaseUrl = baseUrl.Replace("https://", string.Empty); + var externalFile = allOverrides + .Split("\n") + .FirstOrDefault(url => + cleanedBaseUrl.Equals(url.Replace(".png", string.Empty)) || + cleanedBaseUrl.Replace("www.", string.Empty).Equals(url.Replace(".png", string.Empty) + )); + + if (string.IsNullOrEmpty(externalFile)) { - var cleanedBaseUrl = baseUrl.Replace("https://", string.Empty); - var externalFile = allOverrides - .Split("\n") - .FirstOrDefault(url => - cleanedBaseUrl.Equals(url.Replace(".png", string.Empty)) || - cleanedBaseUrl.Replace("www.", string.Empty).Equals(url.Replace(".png", string.Empty) - )); - - if (string.IsNullOrEmpty(externalFile)) - { - throw new KavitaException($"Could not grab favicon from {baseUrl.Sanitize()}"); - } - - correctSizeLink = $"{NewHost}favicons/" + externalFile; + throw new KavitaException($"Could not grab favicon from {baseUrl.Sanitize()}"); } - return correctSizeLink; + return $"{NewHost}favicons/{externalFile}"; } - private static async Task FallbackToKavitaReaderPublisher(string publisherName) + private async Task FallbackToKavitaReaderPublisher(string publisherName) { - var externalLink = string.Empty; - // TODO: Pull this down and store it in temp/ to save on requests - var allOverrides = await $"{NewHost}publishers/publishers.txt".GetStringAsync(); + const string publisherFileName = "publishers.txt"; + var allOverrides = await GetCachedData(publisherFileName) ?? + await $"{NewHost}publishers/{publisherFileName}".GetStringAsync(); - if (!string.IsNullOrEmpty(allOverrides)) - { - var externalFile = allOverrides - .Split("\n") - .Select(publisherLine => - { - var tokens = publisherLine.Split("|"); - if (tokens.Length != 2) return null; - var aliases = tokens[0]; - // Multiple publisher aliases are separated by # - if (aliases.Split("#").Any(name => name.ToLowerInvariant().Trim().Equals(publisherName.ToLowerInvariant().Trim()))) - { - return tokens[1]; - } - return null; - }) - .FirstOrDefault(url => !string.IsNullOrEmpty(url)); + // Cache immediately + await CacheDataAsync(publisherFileName, allOverrides); - if (string.IsNullOrEmpty(externalFile)) + if (string.IsNullOrEmpty(allOverrides)) return string.Empty; + + var externalFile = allOverrides + .Split("\n") + .Select(publisherLine => { - throw new KavitaException($"Could not grab publisher image for {publisherName}"); - } + var tokens = publisherLine.Split("|"); + if (tokens.Length != 2) return null; + var aliases = tokens[0]; + // Multiple publisher aliases are separated by # + if (aliases.Split("#").Any(name => name.ToLowerInvariant().Trim().Equals(publisherName.ToLowerInvariant().Trim()))) + { + return tokens[1]; + } + return null; + }) + .FirstOrDefault(url => !string.IsNullOrEmpty(url)); - externalLink = $"{NewHost}publishers/" + externalFile; + if (string.IsNullOrEmpty(externalFile)) + { + throw new KavitaException($"Could not grab publisher image for {publisherName}"); } - return externalLink; + return $"{NewHost}publishers/{externalFile}"; + } + + private async Task CacheDataAsync(string fileName, string? content) + { + if (content == null) return; + + try + { + var filePath = _directoryService.FileSystem.Path.Join(_directoryService.LongTermCacheDirectory, fileName); + await File.WriteAllTextAsync(filePath, content); + } + catch (Exception ex) + { + _logger.LogError(ex, "Failed to cache {FileName}", fileName); + } + } + + + private async Task GetCachedData(string cacheFile) + { + // Form the full file path: + var filePath = _directoryService.FileSystem.Path.Join(_directoryService.LongTermCacheDirectory, cacheFile); + if (!File.Exists(filePath)) return null; + + var fileInfo = new FileInfo(filePath); + if (DateTime.UtcNow - fileInfo.LastWriteTimeUtc <= CacheDuration) + { + return await File.ReadAllTextAsync(filePath); + } + + return null; + } + + /// + /// + /// + /// + /// + /// + /// Will check against all known null image placeholders to avoid writing it + public async Task SetPersonCoverByUrl(Person person, string url, bool fromBase64 = true, bool checkNoImagePlaceholder = false) + { + if (!string.IsNullOrEmpty(url)) + { + var tempDir = _directoryService.TempDirectory; + var format = ImageService.GetPersonFormat(person.Id); + var finalFileName = format + ".webp"; + var tempFileName = format + "_new"; + var tempFilePath = await CreateThumbnail(url, tempFileName, fromBase64, tempDir); + + if (!string.IsNullOrEmpty(tempFilePath)) + { + var tempFullPath = Path.Combine(tempDir, tempFilePath); + var finalFullPath = Path.Combine(_directoryService.CoverImageDirectory, finalFileName); + + // Skip setting image if it's similar to a known placeholder + if (checkNoImagePlaceholder) + { + var placeholderPath = Path.Combine(_directoryService.AssetsDirectory, "anilist-no-image-placeholder.jpg"); + var similarity = placeholderPath.CalculateSimilarity(tempFullPath); + if (similarity >= 0.9f) + { + _logger.LogInformation("Skipped setting placeholder image for person {PersonId} due to high similarity ({Similarity})", person.Id, similarity); + _directoryService.DeleteFiles([tempFullPath]); + return; + } + } + + try + { + if (!string.IsNullOrEmpty(person.CoverImage)) + { + var existingPath = Path.Combine(_directoryService.CoverImageDirectory, person.CoverImage); + var betterImage = existingPath.GetBetterImage(tempFullPath)!; + + var choseNewImage = string.Equals(betterImage, tempFullPath, StringComparison.OrdinalIgnoreCase); + if (choseNewImage) + { + _directoryService.DeleteFiles([existingPath]); + _directoryService.CopyFile(tempFullPath, finalFullPath); + person.CoverImage = finalFileName; + } + else + { + _directoryService.DeleteFiles([tempFullPath]); + return; + } + } + else + { + _directoryService.CopyFile(tempFullPath, finalFullPath); + person.CoverImage = finalFileName; + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Error choosing better image for Person: {PersonId}", person.Id); + _directoryService.CopyFile(tempFullPath, finalFullPath); + person.CoverImage = finalFileName; + } + + _directoryService.DeleteFiles([tempFullPath]); + + person.CoverImageLocked = true; + _imageService.UpdateColorScape(person); + _unitOfWork.PersonRepository.Update(person); + } + } + else + { + person.CoverImage = string.Empty; + person.CoverImageLocked = false; + _imageService.UpdateColorScape(person); + _unitOfWork.PersonRepository.Update(person); + } + + if (_unitOfWork.HasChanges()) + { + await _unitOfWork.CommitAsync(); + await _eventHub.SendMessageAsync(MessageFactory.CoverUpdate, + MessageFactory.CoverUpdateEvent(person.Id, MessageFactoryEntityTypes.Person), false); + } + } + + /// + /// Sets the series cover by url + /// + /// + /// + /// + /// If images are similar, will choose the higher quality image + public async Task SetSeriesCoverByUrl(Series series, string url, bool fromBase64 = true, bool chooseBetterImage = false) + { + if (!string.IsNullOrEmpty(url)) + { + var tempDir = _directoryService.TempDirectory; + var format = ImageService.GetSeriesFormat(series.Id); + var finalFileName = format + ".webp"; + var tempFileName = format + "_new"; + var tempFilePath = await CreateThumbnail(url, tempFileName, fromBase64, tempDir); + + if (!string.IsNullOrEmpty(tempFilePath)) + { + var tempFullPath = Path.Combine(tempDir, tempFilePath); + var finalFullPath = Path.Combine(_directoryService.CoverImageDirectory, finalFileName); + + if (chooseBetterImage && !string.IsNullOrEmpty(series.CoverImage)) + { + try + { + var existingPath = Path.Combine(_directoryService.CoverImageDirectory, series.CoverImage); + var betterImage = existingPath.GetBetterImage(tempFullPath)!; + + var choseNewImage = string.Equals(betterImage, tempFullPath, StringComparison.OrdinalIgnoreCase); + if (choseNewImage) + { + // Don't delete the Series cover unless it is an override, otherwise the first chapter will be null + if (existingPath.Contains(ImageService.GetSeriesFormat(series.Id))) + { + _directoryService.DeleteFiles([existingPath]); + } + + _directoryService.CopyFile(tempFullPath, finalFullPath); + series.CoverImage = finalFileName; + } + else + { + _directoryService.DeleteFiles([tempFullPath]); + return; + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Error choosing better image for Series: {SeriesId}", series.Id); + _directoryService.CopyFile(tempFullPath, finalFullPath); + series.CoverImage = finalFileName; + } + } + else + { + _directoryService.CopyFile(tempFullPath, finalFullPath); + series.CoverImage = finalFileName; + } + + _directoryService.DeleteFiles([tempFullPath]); + series.CoverImageLocked = true; + _imageService.UpdateColorScape(series); + _unitOfWork.SeriesRepository.Update(series); + } + } + else + { + series.CoverImage = null; + series.CoverImageLocked = false; + _logger.LogDebug("[SeriesCoverImageBug] Setting Series Cover Image to null"); + _imageService.UpdateColorScape(series); + _unitOfWork.SeriesRepository.Update(series); + } + + if (_unitOfWork.HasChanges()) + { + await _unitOfWork.CommitAsync(); + await _eventHub.SendMessageAsync(MessageFactory.CoverUpdate, + MessageFactory.CoverUpdateEvent(series.Id, MessageFactoryEntityTypes.Series), false); + } + } + + // TODO: Refactor this to IHasCoverImage instead of a hard entity type + public async Task SetChapterCoverByUrl(Chapter chapter, string url, bool fromBase64 = true, bool chooseBetterImage = false) + { + if (!string.IsNullOrEmpty(url)) + { + var tempDirectory = _directoryService.TempDirectory; + var finalFileName = ImageService.GetChapterFormat(chapter.Id, chapter.VolumeId) + ".webp"; + var tempFileName = ImageService.GetChapterFormat(chapter.Id, chapter.VolumeId) + "_new"; + + var tempFilePath = await CreateThumbnail(url, tempFileName, fromBase64, tempDirectory); + + if (!string.IsNullOrEmpty(tempFilePath)) + { + var tempFullPath = Path.Combine(tempDirectory, tempFilePath); + var finalFullPath = Path.Combine(_directoryService.CoverImageDirectory, finalFileName); + + if (chooseBetterImage && !string.IsNullOrEmpty(chapter.CoverImage)) + { + try + { + var existingPath = Path.Combine(_directoryService.CoverImageDirectory, chapter.CoverImage); + var betterImage = existingPath.GetBetterImage(tempFullPath)!; + var choseNewImage = string.Equals(betterImage, tempFullPath, StringComparison.OrdinalIgnoreCase); + + if (choseNewImage) + { + // This will fail if Cover gen is done just before this as there is a bug with files getting locked. + _directoryService.DeleteFiles([existingPath]); + _directoryService.CopyFile(tempFullPath, finalFullPath); + _directoryService.DeleteFiles([tempFullPath]); + } + else + { + _directoryService.DeleteFiles([tempFullPath]); + return; + } + + chapter.CoverImage = finalFileName; + } + catch (Exception ex) + { + _logger.LogError(ex, "There was an issue trying to choose a better cover image for Chapter: {FileName} ({ChapterId})", chapter.Range, chapter.Id); + } + } + else + { + // No comparison needed, just copy and rename to final + _directoryService.CopyFile(tempFullPath, finalFullPath); + _directoryService.DeleteFiles([tempFullPath]); + chapter.CoverImage = finalFileName; + } + + chapter.CoverImageLocked = true; + _imageService.UpdateColorScape(chapter); + _unitOfWork.ChapterRepository.Update(chapter); + } + } + else + { + chapter.CoverImage = null; + chapter.CoverImageLocked = false; + _imageService.UpdateColorScape(chapter); + _unitOfWork.ChapterRepository.Update(chapter); + } + + if (_unitOfWork.HasChanges()) + { + await _unitOfWork.CommitAsync(); + await _eventHub.SendMessageAsync( + MessageFactory.CoverUpdate, + MessageFactory.CoverUpdateEvent(chapter.Id, MessageFactoryEntityTypes.Chapter), + false + ); + } + } + + /// + /// + /// + /// + /// Filename without extension + /// + /// Not useable with fromBase64. Allows a different directory to be written to + /// + private async Task CreateThumbnail(string url, string filenameWithoutExtension, bool fromBase64 = true, string? targetDirectory = null) + { + targetDirectory ??= _directoryService.CoverImageDirectory; + + var settings = await _unitOfWork.SettingsRepository.GetSettingsDtoAsync(); + var encodeFormat = settings.EncodeMediaAs; + var coverImageSize = settings.CoverImageSize; + + if (fromBase64) + { + return _imageService.CreateThumbnailFromBase64(url, + filenameWithoutExtension, encodeFormat, coverImageSize.GetDimensions().Width); + } + + return await DownloadImageFromUrl(filenameWithoutExtension, encodeFormat, url, targetDirectory); } } diff --git a/API/Services/Tasks/Metadata/WordCountAnalyzerService.cs b/API/Services/Tasks/Metadata/WordCountAnalyzerService.cs index 89c43f827..bff7001bd 100644 --- a/API/Services/Tasks/Metadata/WordCountAnalyzerService.cs +++ b/API/Services/Tasks/Metadata/WordCountAnalyzerService.cs @@ -179,7 +179,7 @@ public class WordCountAnalyzerService : IWordCountAnalyzerService var pageCounter = 1; try { - using var book = await EpubReader.OpenBookAsync(filePath, BookService.BookReaderOptions); + using var book = await EpubReader.OpenBookAsync(filePath, BookService.LenientBookReaderOptions); var totalPages = book.Content.Html.Local; foreach (var bookPage in totalPages) diff --git a/API/Services/Tasks/Scanner/LibraryWatcher.cs b/API/Services/Tasks/Scanner/LibraryWatcher.cs index d2e6437a3..fec0304a8 100644 --- a/API/Services/Tasks/Scanner/LibraryWatcher.cs +++ b/API/Services/Tasks/Scanner/LibraryWatcher.cs @@ -310,7 +310,7 @@ public class LibraryWatcher : ILibraryWatcher if (rootFolder.Count == 0) return string.Empty; // Select the first folder and join with library folder, this should give us the folder to scan. - return Parser.Parser.NormalizePath(_directoryService.FileSystem.Path.Join(libraryFolder, rootFolder[rootFolder.Count - 1])); + return Parser.Parser.NormalizePath(_directoryService.FileSystem.Path.Join(libraryFolder, rootFolder[^1])); } diff --git a/API/Services/Tasks/Scanner/ParseScannedFiles.cs b/API/Services/Tasks/Scanner/ParseScannedFiles.cs index f4405165d..83558eaa0 100644 --- a/API/Services/Tasks/Scanner/ParseScannedFiles.cs +++ b/API/Services/Tasks/Scanner/ParseScannedFiles.cs @@ -32,6 +32,10 @@ public class ParsedSeries /// Format of the Series /// public required MangaFormat Format { get; init; } + /// + /// Has this Series changed or not aka do we need to process it or not. + /// + public bool HasChanged { get; set; } } public class ScanResult @@ -162,8 +166,10 @@ public class ParseScannedFiles // Don't process any folders where we've already scanned everything below if (processedDirs.Any(d => d.StartsWith(directory + Path.AltDirectorySeparatorChar) || d.Equals(directory))) { + var hasChanged = !HasSeriesFolderNotChangedSinceLastScan(library, seriesPaths, directory, forceCheck); // Skip this directory as we've already processed a parent unless there are loose files at that directory - CheckSurfaceFiles(result, directory, folderPath, fileExtensions, matcher); + // and they have changes + CheckSurfaceFiles(result, directory, folderPath, fileExtensions, matcher, hasChanged); continue; } @@ -178,7 +184,7 @@ public class ParseScannedFiles await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress, MessageFactory.FileScanProgressEvent(directory, library.Name, ProgressEventType.Updated)); - if (HasSeriesFolderNotChangedSinceLastScan(seriesPaths, directory, forceCheck)) + if (HasSeriesFolderNotChangedSinceLastScan(library, seriesPaths, directory, forceCheck)) { HandleUnchangedFolder(result, folderPath, directory); } @@ -196,12 +202,16 @@ public class ParseScannedFiles /// /// Checks against all folder paths on file if the last scanned is >= the directory's last write time, down to the second /// + /// /// /// This should be normalized /// /// - private bool HasSeriesFolderNotChangedSinceLastScan(IDictionary> seriesPaths, string directory, bool forceCheck) + private bool HasSeriesFolderNotChangedSinceLastScan(Library library, IDictionary> seriesPaths, string directory, bool forceCheck) { + // Reverting code from: https://github.com/Kareadita/Kavita/pull/3619/files#diff-0625df477047ab9d8e97a900201f2f29b2dc0599ba58eb75cfbbd073a9f3c72f + // This is to be able to release hotfix and tackle this in appropriate time + // With the bottom-up approach, this can report a false positive where a nested folder will get scanned even though a parent is the series // This can't really be avoided. This is more likely to happen on Image chapter folder library layouts. if (forceCheck || !seriesPaths.TryGetValue(directory, out var seriesList)) @@ -209,6 +219,18 @@ public class ParseScannedFiles return false; } + // if (forceCheck) + // { + // return false; + // } + + // TryGetSeriesList falls back to parent folders to match to seriesList + // var seriesList = TryGetSeriesList(library, seriesPaths, directory); + // if (seriesList == null) + // { + // return false; + // } + foreach (var series in seriesList) { var lastWriteTime = _directoryService.GetLastWriteTime(series.LowestFolderPath!).Truncate(TimeSpan.TicksPerSecond); @@ -222,6 +244,31 @@ public class ParseScannedFiles return true; } + private IList? TryGetSeriesList(Library library, IDictionary> seriesPaths, string directory) + { + if (seriesPaths.Count == 0) + { + return null; + } + + if (string.IsNullOrEmpty(directory)) + { + return null; + } + + if (library.Folders.Any(fp => fp.Path.Equals(directory))) + { + return null; + } + + if (seriesPaths.TryGetValue(directory, out var seriesList)) + { + return seriesList; + } + + return TryGetSeriesList(library, seriesPaths, _directoryService.GetParentDirectoryName(directory)); + } + /// /// Handles directories that haven't changed since the last scan. /// @@ -255,13 +302,15 @@ public class ParseScannedFiles /// /// Performs a full scan of the directory and adds it to the result. /// - private void CheckSurfaceFiles(List result, string directory, string folderPath, string fileExtensions, GlobMatcher matcher) + private void CheckSurfaceFiles(List result, string directory, string folderPath, string fileExtensions, GlobMatcher matcher, bool hasChanged) { var files = _directoryService.ScanFiles(directory, fileExtensions, matcher, SearchOption.TopDirectoryOnly); if (files.Count == 0) { return; } + // Revert of https://github.com/Kareadita/Kavita/pull/3629/files#diff-0625df477047ab9d8e97a900201f2f29b2dc0599ba58eb75cfbbd073a9f3c72f + // for Hotfix v0.8.5.x result.Add(CreateScanResult(directory, folderPath, true, files)); } @@ -280,7 +329,7 @@ public class ParseScannedFiles await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress, MessageFactory.FileScanProgressEvent(normalizedPath, library.Name, ProgressEventType.Updated)); - if (HasSeriesFolderNotChangedSinceLastScan(seriesPaths, normalizedPath, forceCheck)) + if (HasSeriesFolderNotChangedSinceLastScan(library, seriesPaths, normalizedPath, forceCheck)) { result.Add(CreateScanResult(folderPath, libraryRoot, false, ArraySegment.Empty)); } @@ -674,6 +723,12 @@ public class ParseScannedFiles private static void RemapSeries(IList scanResults, List allInfos, string localizedSeries, string nonLocalizedSeries) { + // If the series names are identical, no remapping is needed (rare but valid) + if (localizedSeries.ToNormalized().Equals(nonLocalizedSeries.ToNormalized())) + { + return; + } + // Find all infos that need to be remapped from the localized series to the non-localized series var normalizedLocalizedSeries = localizedSeries.ToNormalized(); var seriesToBeRemapped = allInfos.Where(i => i.Series.ToNormalized().Equals(normalizedLocalizedSeries)).ToList(); @@ -719,6 +774,11 @@ public class ParseScannedFiles .Select(fp => new ParserInfo { Series = fp.SeriesName, Format = fp.Format }) .ToList(); + // // We are certain TryGetSeriesList will return a valid result here, if the series wasn't present yet. It will have been changed. + // result.ParserInfos = TryGetSeriesList(library, seriesPaths, normalizedFolder)! + // .Select(fp => new ParserInfo { Series = fp.SeriesName, Format = fp.Format }) + // .ToList(); + _logger.LogDebug("[ScannerService] Skipped File Scan for {Folder} as it hasn't changed", normalizedFolder); await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress, MessageFactory.FileScanProgressEvent($"Skipped {normalizedFolder}", library.Name, ProgressEventType.Updated)); @@ -744,7 +804,7 @@ public class ParseScannedFiles { // Process files sequentially result.ParserInfos = files - .Select(file => _readingItemService.ParseFile(file, normalizedFolder, result.LibraryRoot, library.Type)) + .Select(file => _readingItemService.ParseFile(file, normalizedFolder, result.LibraryRoot, library.Type, library.EnableMetadata)) .Where(info => info != null) .ToList()!; } @@ -752,7 +812,7 @@ public class ParseScannedFiles { // Process files in parallel var tasks = files.Select(file => Task.Run(() => - _readingItemService.ParseFile(file, normalizedFolder, result.LibraryRoot, library.Type))); + _readingItemService.ParseFile(file, normalizedFolder, result.LibraryRoot, library.Type, library.EnableMetadata))); var infos = await Task.WhenAll(tasks); result.ParserInfos = infos.Where(info => info != null).ToList()!; @@ -811,7 +871,10 @@ public class ParseScannedFiles var prevIssue = string.Empty; foreach (var chapter in chapters) { - if (float.TryParse(chapter.Chapters, NumberStyles.Any, CultureInfo.InvariantCulture, out var parsedChapter)) + // Use MinNumber in case there is a range, as otherwise sort order will cause it to be processed last + var chapterNum = + $"{Parser.Parser.MinNumberFromRange(chapter.Chapters).ToString(CultureInfo.InvariantCulture)}"; + if (float.TryParse(chapterNum, NumberStyles.Any, CultureInfo.InvariantCulture, out var parsedChapter)) { // Parsed successfully, use the numeric value counter = parsedChapter; diff --git a/API/Services/Tasks/Scanner/Parser/BasicParser.cs b/API/Services/Tasks/Scanner/Parser/BasicParser.cs index 039e3acd6..168ca7f01 100644 --- a/API/Services/Tasks/Scanner/Parser/BasicParser.cs +++ b/API/Services/Tasks/Scanner/Parser/BasicParser.cs @@ -12,7 +12,7 @@ namespace API.Services.Tasks.Scanner.Parser; /// public class BasicParser(IDirectoryService directoryService, IDefaultParser imageParser) : DefaultParser(directoryService) { - public override ParserInfo? Parse(string filePath, string rootPath, string libraryRoot, LibraryType type, ComicInfo? comicInfo = null) + public override ParserInfo? Parse(string filePath, string rootPath, string libraryRoot, LibraryType type, bool enableMetadata = true, ComicInfo? comicInfo = null) { var fileName = directoryService.FileSystem.Path.GetFileNameWithoutExtension(filePath); // TODO: Potential Bug: This will return null, but on Image libraries, if all images, we would want to include this. @@ -20,7 +20,7 @@ public class BasicParser(IDirectoryService directoryService, IDefaultParser imag if (Parser.IsImage(filePath)) { - return imageParser.Parse(filePath, rootPath, libraryRoot, LibraryType.Image, comicInfo); + return imageParser.Parse(filePath, rootPath, libraryRoot, LibraryType.Image, enableMetadata, comicInfo); } var ret = new ParserInfo() @@ -86,7 +86,7 @@ public class BasicParser(IDirectoryService directoryService, IDefaultParser imag { ParseFromFallbackFolders(filePath, tempRootPath, type, ref ret); } - + ret.Title = Parser.CleanSpecialTitle(fileName); } if (string.IsNullOrEmpty(ret.Series)) @@ -101,7 +101,12 @@ public class BasicParser(IDirectoryService directoryService, IDefaultParser imag } // Patch in other information from ComicInfo - UpdateFromComicInfo(ret); + if (enableMetadata) + { + UpdateFromComicInfo(ret); + } + + if (ret.Volumes == Parser.LooseLeafVolume && ret.Chapters == Parser.DefaultChapter) { diff --git a/API/Services/Tasks/Scanner/Parser/BookParser.cs b/API/Services/Tasks/Scanner/Parser/BookParser.cs index 499e554ef..14f42c989 100644 --- a/API/Services/Tasks/Scanner/Parser/BookParser.cs +++ b/API/Services/Tasks/Scanner/Parser/BookParser.cs @@ -5,7 +5,7 @@ namespace API.Services.Tasks.Scanner.Parser; public class BookParser(IDirectoryService directoryService, IBookService bookService, BasicParser basicParser) : DefaultParser(directoryService) { - public override ParserInfo Parse(string filePath, string rootPath, string libraryRoot, LibraryType type, ComicInfo comicInfo = null) + public override ParserInfo Parse(string filePath, string rootPath, string libraryRoot, LibraryType type, bool enableMetadata = true, ComicInfo comicInfo = null) { var info = bookService.ParseInfo(filePath); if (info == null) return null; @@ -35,7 +35,7 @@ public class BookParser(IDirectoryService directoryService, IBookService bookSer } else { - var info2 = basicParser.Parse(filePath, rootPath, libraryRoot, LibraryType.Book, comicInfo); + var info2 = basicParser.Parse(filePath, rootPath, libraryRoot, LibraryType.Book, enableMetadata, comicInfo); info.Merge(info2); if (hasVolumeInSeries && info2 != null && Parser.ParseVolume(info2.Series, type) .Equals(Parser.LooseLeafVolume)) diff --git a/API/Services/Tasks/Scanner/Parser/ComicVineParser.cs b/API/Services/Tasks/Scanner/Parser/ComicVineParser.cs index b68596245..b60f28aee 100644 --- a/API/Services/Tasks/Scanner/Parser/ComicVineParser.cs +++ b/API/Services/Tasks/Scanner/Parser/ComicVineParser.cs @@ -19,7 +19,7 @@ public class ComicVineParser(IDirectoryService directoryService) : DefaultParser /// /// /// - public override ParserInfo? Parse(string filePath, string rootPath, string libraryRoot, LibraryType type, ComicInfo? comicInfo = null) + public override ParserInfo? Parse(string filePath, string rootPath, string libraryRoot, LibraryType type, bool enableMetadata = true, ComicInfo? comicInfo = null) { if (type != LibraryType.ComicVine) return null; @@ -81,7 +81,10 @@ public class ComicVineParser(IDirectoryService directoryService) : DefaultParser info.IsSpecial = Parser.IsSpecial(info.Filename, type) || Parser.IsSpecial(info.ComicInfo?.Format, type); // Patch in other information from ComicInfo - UpdateFromComicInfo(info); + if (enableMetadata) + { + UpdateFromComicInfo(info); + } if (string.IsNullOrEmpty(info.Series)) { diff --git a/API/Services/Tasks/Scanner/Parser/DefaultParser.cs b/API/Services/Tasks/Scanner/Parser/DefaultParser.cs index f59a3b66f..687617fd7 100644 --- a/API/Services/Tasks/Scanner/Parser/DefaultParser.cs +++ b/API/Services/Tasks/Scanner/Parser/DefaultParser.cs @@ -8,7 +8,7 @@ namespace API.Services.Tasks.Scanner.Parser; public interface IDefaultParser { - ParserInfo? Parse(string filePath, string rootPath, string libraryRoot, LibraryType type, ComicInfo? comicInfo = null); + ParserInfo? Parse(string filePath, string rootPath, string libraryRoot, LibraryType type, bool enableMetadata = true, ComicInfo? comicInfo = null); void ParseFromFallbackFolders(string filePath, string rootPath, LibraryType type, ref ParserInfo ret); bool IsApplicable(string filePath, LibraryType type); } @@ -26,8 +26,9 @@ public abstract class DefaultParser(IDirectoryService directoryService) : IDefau /// /// Root folder /// Allows different Regex to be used for parsing. + /// Allows overriding data from metadata (ComicInfo/pdf/epub) /// or null if Series was empty - public abstract ParserInfo? Parse(string filePath, string rootPath, string libraryRoot, LibraryType type, ComicInfo? comicInfo = null); + public abstract ParserInfo? Parse(string filePath, string rootPath, string libraryRoot, LibraryType type, bool enableMetadata = true, ComicInfo? comicInfo = null); /// /// Fills out by trying to parse volume, chapters, and series from folders @@ -130,9 +131,9 @@ public abstract class DefaultParser(IDirectoryService directoryService) : IDefau } // Patch is SeriesSort from ComicInfo - if (!string.IsNullOrEmpty(info.ComicInfo.TitleSort)) + if (!string.IsNullOrEmpty(info.ComicInfo.SeriesSort)) { - info.SeriesSort = info.ComicInfo.TitleSort.Trim(); + info.SeriesSort = info.ComicInfo.SeriesSort.Trim(); } } diff --git a/API/Services/Tasks/Scanner/Parser/ImageParser.cs b/API/Services/Tasks/Scanner/Parser/ImageParser.cs index 415533631..12f9f4d50 100644 --- a/API/Services/Tasks/Scanner/Parser/ImageParser.cs +++ b/API/Services/Tasks/Scanner/Parser/ImageParser.cs @@ -7,7 +7,7 @@ namespace API.Services.Tasks.Scanner.Parser; public class ImageParser(IDirectoryService directoryService) : DefaultParser(directoryService) { - public override ParserInfo? Parse(string filePath, string rootPath, string libraryRoot, LibraryType type, ComicInfo? comicInfo = null) + public override ParserInfo? Parse(string filePath, string rootPath, string libraryRoot, LibraryType type, bool enableMetadata = true, ComicInfo? comicInfo = null) { if (!IsApplicable(filePath, type)) return null; diff --git a/API/Services/Tasks/Scanner/Parser/Parser.cs b/API/Services/Tasks/Scanner/Parser/Parser.cs index 12374d67f..c0b130f91 100644 --- a/API/Services/Tasks/Scanner/Parser/Parser.cs +++ b/API/Services/Tasks/Scanner/Parser/Parser.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Immutable; -using System.Globalization; using System.IO; using System.Linq; using System.Text.RegularExpressions; @@ -25,7 +24,7 @@ public static partial class Parser public static readonly TimeSpan RegexTimeout = TimeSpan.FromMilliseconds(500); - public const string ImageFileExtensions = @"^(\.png|\.jpeg|\.jpg|\.webp|\.gif|\.avif)"; // Don't forget to update CoverChooser + public const string ImageFileExtensions = @"(\.png|\.jpeg|\.jpg|\.webp|\.gif|\.avif)"; // Don't forget to update CoverChooser public const string ArchiveFileExtensions = @"\.cbz|\.zip|\.rar|\.cbr|\.tar.gz|\.7zip|\.7z|\.cb7|\.cbt"; public const string EpubFileExtension = @"\.epub"; public const string PdfFileExtension = @"\.pdf"; @@ -44,87 +43,83 @@ public static partial class Parser "One Shot", "One-Shot", "Prologue", "TPB", "Trade Paper Back", "Omnibus", "Compendium", "Absolute", "Graphic Novel", "GN", "FCBD", "Giant Size"); - private static readonly char[] LeadingZeroesTrimChars = new[] { '0' }; + private static readonly char[] LeadingZeroesTrimChars = ['0']; - private static readonly char[] SpacesAndSeparators = { '\0', '\t', '\r', ' ', '-', ','}; + private static readonly char[] SpacesAndSeparators = ['\0', '\t', '\r', ' ', '-', ',']; private const string Number = @"\d+(\.\d)?"; private const string NumberRange = Number + @"(-" + Number + @")?"; /// - /// non greedy matching of a string where parenthesis are balanced + /// non-greedy matching of a string where parenthesis are balanced /// public const string BalancedParen = @"(?:[^()]|(?\()|(?<-open>\)))*?(?(open)(?!))"; /// - /// non greedy matching of a string where square brackets are balanced + /// non-greedy matching of a string where square brackets are balanced /// public const string BalancedBracket = @"(?:[^\[\]]|(?\[)|(?<-open>\]))*?(?(open)(?!))"; /// /// Matches [Complete], release tags like [kmts] but not [ Complete ] or [kmts ] /// private const string TagsInBrackets = $@"\[(?!\s){BalancedBracket}(? - /// Common regex patterns present in both Comics and Mangas - /// - private const string CommonSpecial = @"Specials?|One[- ]?Shot|Extra(?:\sChapter)?(?=\s)|Art Collection|Side Stories|Bonus"; /// /// Matches against font-family css syntax. Does not match if url import has data: starting, as that is binary data /// /// See here for some examples https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face - public static readonly Regex FontSrcUrlRegex = new Regex(@"(?(?:src:\s?)?(?:url|local)\((?!data:)" + "(?:[\"']?)" + @"(?!data:))" - + "(?(?!data:)[^\"']+?)" + "(?[\"']?" + @"\);?)", + public static readonly Regex FontSrcUrlRegex = new(@"(?(?:src:\s?)?(?:url|local)\((?!data:)" + "(?:[\"']?)" + @"(?!data:))" + + "(?(?!data:)[^\"']+?)" + "(?[\"']?" + @"\);?)", MatchOptions, RegexTimeout); /// /// https://developer.mozilla.org/en-US/docs/Web/CSS/@import /// - public static readonly Regex CssImportUrlRegex = new Regex("(@import\\s([\"|']|url\\([\"|']))(?[^'\"]+)([\"|']\\)?);", + public static readonly Regex CssImportUrlRegex = new("(@import\\s([\"|']|url\\([\"|']))(?[^'\"]+)([\"|']\\)?);", MatchOptions | RegexOptions.Multiline, RegexTimeout); /// /// Misc css image references, like background-image: url(), border-image, or list-style-image /// /// Original prepend: (background|border|list-style)-image:\s?)? - public static readonly Regex CssImageUrlRegex = new Regex(@"(url\((?!data:).(?!data:))" + "(?(?!data:)[^\"']*)" + @"(.\))", + public static readonly Regex CssImageUrlRegex = new(@"(url\((?!data:).(?!data:))" + "(?(?!data:)[^\"']*)" + @"(.\))", MatchOptions, RegexTimeout); - private static readonly Regex ImageRegex = new Regex(ImageFileExtensions, + private static readonly Regex ImageRegex = new(ImageFileExtensions, MatchOptions, RegexTimeout); - private static readonly Regex ArchiveFileRegex = new Regex(ArchiveFileExtensions, + private static readonly Regex ArchiveFileRegex = new(ArchiveFileExtensions, MatchOptions, RegexTimeout); - private static readonly Regex ComicInfoArchiveRegex = new Regex(@"\.cbz|\.cbr|\.cb7|\.cbt", + private static readonly Regex ComicInfoArchiveRegex = new(@"\.cbz|\.cbr|\.cb7|\.cbt", MatchOptions, RegexTimeout); - private static readonly Regex XmlRegex = new Regex(XmlRegexExtensions, + private static readonly Regex XmlRegex = new(XmlRegexExtensions, MatchOptions, RegexTimeout); - private static readonly Regex BookFileRegex = new Regex(BookFileExtensions, + private static readonly Regex BookFileRegex = new(BookFileExtensions, MatchOptions, RegexTimeout); - private static readonly Regex CoverImageRegex = new Regex(@"(? /// Normalize everything within Kavita. Some characters don't fall under Unicode, like full-width characters and need to be /// added on a case-by-case basis. /// - private static readonly Regex NormalizeRegex = new Regex(@"[^\p{L}0-9\+!＊！＋]", + private static readonly Regex NormalizeRegex = new(@"[^\p{L}0-9\+!＊！＋]", MatchOptions, RegexTimeout); /// /// Supports Batman (2020) or Batman (2) /// - private static readonly Regex SeriesAndYearRegex = new Regex(@"^\D+\s\((?\d+)\)$", + private static readonly Regex SeriesAndYearRegex = new(@"^\D+\s\((?\d+)\)$", MatchOptions, RegexTimeout); /// /// Recognizes the Special token only /// - private static readonly Regex SpecialTokenRegex = new Regex(@"SP\d+", + private static readonly Regex SpecialTokenRegex = new(@"SP\d+", MatchOptions, RegexTimeout); - private static readonly Regex[] MangaVolumeRegex = new[] - { + private static readonly Regex[] MangaVolumeRegex = + [ // Thai Volume: เล่ม n -> Volume n new Regex( @"(เล่ม|เล่มที่)(\s)?(\.?)(\s|_)?(?\d+(\-\d+)?(\.\d+)?)", @@ -170,9 +165,9 @@ public static partial class Parser new Regex( @"(卷|册)(?\d+)", MatchOptions, RegexTimeout), - // Korean Volume: 제n화|권|회|장 -> Volume n, n화|권|회|장 -> Volume n, 63권#200.zip -> Volume 63 (no chapter, #200 is just files inside) + // Korean Volume: 제n화|회|장 -> Volume n, n화|권|장 -> Volume n, 63권#200.zip -> Volume 63 (no chapter, #200 is just files inside) new Regex( - @"제?(?\d+(\.\d)?)(권|회|화|장)", + @"제?(?\d+(\.\d+)?)(권|화|장)", MatchOptions, RegexTimeout), // Korean Season: 시즌n -> Season n, new Regex( @@ -197,11 +192,11 @@ public static partial class Parser // Russian Volume: n Том -> Volume n new Regex( @"(\s|_)?(?\d+(?:(\-)\d+)?)(\s|_)Том(а?)", - MatchOptions, RegexTimeout), - }; + MatchOptions, RegexTimeout) + ]; - private static readonly Regex[] MangaSeriesRegex = new[] - { + private static readonly Regex[] MangaSeriesRegex = + [ // Thai Volume: เล่ม n -> Volume n new Regex( @"(?.+?)(เล่ม|เล่มที่)(\s)?(\.?)(\s|_)?(?\d+(\-\d+)?(\.\d+)?)", @@ -374,12 +369,12 @@ public static partial class Parser // Japanese Volume: n巻 -> Volume n new Regex( @"(?.+?)第(?\d+(?:(\-)\d+)?)巻", - MatchOptions, RegexTimeout), + MatchOptions, RegexTimeout) - }; + ]; - private static readonly Regex[] ComicSeriesRegex = new[] - { + private static readonly Regex[] ComicSeriesRegex = + [ // Thai Volume: เล่ม n -> Volume n new Regex( @"(?.+?)(เล่ม|เล่มที่)(\s)?(\.?)(\s|_)?(?\d+(\-\d+)?(\.\d+)?)", @@ -467,11 +462,11 @@ public static partial class Parser // MUST BE LAST: Batman & Daredevil - King of New York new Regex( @"^(?.*)", - MatchOptions, RegexTimeout), - }; + MatchOptions, RegexTimeout) + ]; - private static readonly Regex[] ComicVolumeRegex = new[] - { + private static readonly Regex[] ComicVolumeRegex = + [ // Thai Volume: เล่ม n -> Volume n new Regex( @"(เล่ม|เล่มที่)(\s)?(\.?)(\s|_)?(?\d+(\-\d+)?(\.\d+)?)", @@ -507,11 +502,11 @@ public static partial class Parser // Russian Volume: n Том -> Volume n new Regex( @"(\s|_)?(?\d+(?:(\-)\d+)?)(\s|_)Том(а?)", - MatchOptions, RegexTimeout), - }; + MatchOptions, RegexTimeout) + ]; - private static readonly Regex[] ComicChapterRegex = new[] - { + private static readonly Regex[] ComicChapterRegex = + [ // Thai Volume: บทที่ n -> Chapter n, ตอนที่ n -> Chapter n new Regex( @"(บทที่|ตอนที่)(\s)?(\.?)(\s|_)?(?\d+(\-\d+)?(\.\d+)?)", @@ -576,11 +571,11 @@ public static partial class Parser // spawn-123, spawn-chapter-123 (from https://github.com/Girbons/comics-downloader) new Regex( @"^(?.+?)-(chapter-)?(?\d+)", - MatchOptions, RegexTimeout), - }; + MatchOptions, RegexTimeout) + ]; - private static readonly Regex[] MangaChapterRegex = new[] - { + private static readonly Regex[] MangaChapterRegex = + [ // Thai Chapter: บทที่ n -> Chapter n, ตอนที่ n -> Chapter n, เล่ม n -> Volume n, เล่มที่ n -> Volume n new Regex( @"(?((เล่ม|เล่มที่))?(\s|_)?\.?\d+)(\s|_)(บทที่|ตอนที่)\.?(\s|_)?(?\d+)", @@ -645,8 +640,8 @@ public static partial class Parser // Russian Chapter: n Главa -> Chapter n new Regex( @"(?!Том)(?\d+(?:\.\d+|-\d+)?)(\s|_)(Глава|глава|Главы|Глава)", - MatchOptions, RegexTimeout), - }; + MatchOptions, RegexTimeout) + ]; private static readonly Regex MangaEditionRegex = new Regex( // Tenjo Tenge {Full Contact Edition} v01 (2011) (Digital) (ASTC).cbz @@ -661,25 +656,6 @@ public static partial class Parser MatchOptions, RegexTimeout ); - private static readonly Regex MangaSpecialRegex = new Regex( - // All Keywords, does not account for checking if contains volume/chapter identification. Parser.Parse() will handle. - $@"\b(?:{CommonSpecial}|Omake)\b", - MatchOptions, RegexTimeout - ); - - private static readonly Regex ComicSpecialRegex = new Regex( - // All Keywords, does not account for checking if contains volume/chapter identification. Parser.Parse() will handle. - $@"\b(?:{CommonSpecial}|\d.+?(\W|-|^)Annual|Annual(\W|-|$|\s#)|Book \d.+?|Compendium(\W|-|$|\s.+?)|Omnibus(\W|-|$|\s.+?)|FCBD \d.+?|Absolute(\W|-|$|\s.+?)|Preview(\W|-|$|\s.+?)|Hors[ -]S[ée]rie|TPB|HS|THS)\b", - MatchOptions, RegexTimeout - ); - - private static readonly Regex EuropeanComicRegex = new Regex( - // All Keywords, does not account for checking if contains volume/chapter identification. Parser.Parse() will handle. - @"\b(?:Bd[-\s]Fr)\b", - MatchOptions, RegexTimeout - ); - - // If SP\d+ is in the filename, we force treat it as a special regardless if volume or chapter might have been found. private static readonly Regex SpecialMarkerRegex = new Regex( @"SP\d+", @@ -732,21 +708,7 @@ public static partial class Parser return HasSpecialMarker(filePath); } - private static bool IsMangaSpecial(string? filePath) - { - if (string.IsNullOrEmpty(filePath)) return false; - return HasSpecialMarker(filePath); - } - - private static bool IsComicSpecial(string? filePath) - { - if (string.IsNullOrEmpty(filePath)) return false; - return HasSpecialMarker(filePath); - } - - - - public static string ParseMangaSeries(string filename) + private static string ParseMangaSeries(string filename) { foreach (var regex in MangaSeriesRegex) { @@ -754,6 +716,7 @@ public static partial class Parser var group = matches .Select(match => match.Groups["Series"]) .FirstOrDefault(group => group.Success && group != Match.Empty); + if (group != null) { return CleanTitle(group.Value); @@ -932,22 +895,6 @@ public static partial class Parser return title; } - private static string RemoveMangaSpecialTags(string title) - { - return MangaSpecialRegex.Replace(title, string.Empty); - } - - private static string RemoveEuropeanTags(string title) - { - return EuropeanComicRegex.Replace(title, string.Empty); - } - - private static string RemoveComicSpecialTags(string title) - { - return ComicSpecialRegex.Replace(title, string.Empty); - } - - /// /// Translates _ -> spaces, trims front and back of string, removes release groups @@ -966,20 +913,6 @@ public static partial class Parser title = RemoveEditionTagHolders(title); - // if (replaceSpecials) - // { - // if (isComic) - // { - // title = RemoveComicSpecialTags(title); - // title = RemoveEuropeanTags(title); - // } - // else - // { - // title = RemoveMangaSpecialTags(title); - // } - // } - - title = title.Trim(SpacesAndSeparators); title = EmptySpaceRegex.Replace(title, " "); @@ -1110,11 +1043,6 @@ public static partial class Parser { if (string.IsNullOrEmpty(name)) return name; var cleaned = SpecialTokenRegex.Replace(name.Replace('_', ' '), string.Empty).Trim(); - var lastIndex = cleaned.LastIndexOf('.'); - if (lastIndex > 0) - { - cleaned = cleaned.Substring(0, cleaned.LastIndexOf('.')).Trim(); - } return string.IsNullOrEmpty(cleaned) ? name : cleaned; } @@ -1132,7 +1060,7 @@ public static partial class Parser } /// - /// Validates that a Path doesn't start with certain blacklisted folders, like __MACOSX, @Recently-Snapshot, etc and that if a full path, the filename + /// Validates that a Path doesn't start with certain blacklisted folders, like __MACOSX, @Recently-Snapshot, etc. and that if a full path, the filename /// doesn't start with ._, which is a metadata file on MACOSX. /// /// @@ -1231,6 +1159,12 @@ public static partial class Parser return !string.IsNullOrEmpty(name) && SeriesAndYearRegex.IsMatch(name); } + /// + /// Parse a Year from a Comic Series: Series Name (YEAR) + /// + /// Harley Quinn (2024) returns 2024 + /// + /// public static string ParseYear(string? name) { if (string.IsNullOrEmpty(name)) return string.Empty; diff --git a/API/Services/Tasks/Scanner/Parser/PdfParser.cs b/API/Services/Tasks/Scanner/Parser/PdfParser.cs index 696a61867..80bfa9a48 100644 --- a/API/Services/Tasks/Scanner/Parser/PdfParser.cs +++ b/API/Services/Tasks/Scanner/Parser/PdfParser.cs @@ -6,7 +6,7 @@ namespace API.Services.Tasks.Scanner.Parser; public class PdfParser(IDirectoryService directoryService) : DefaultParser(directoryService) { - public override ParserInfo Parse(string filePath, string rootPath, string libraryRoot, LibraryType type, ComicInfo comicInfo = null) + public override ParserInfo Parse(string filePath, string rootPath, string libraryRoot, LibraryType type, bool enableMetadata = true, ComicInfo comicInfo = null) { var fileName = directoryService.FileSystem.Path.GetFileNameWithoutExtension(filePath); var ret = new ParserInfo @@ -68,6 +68,18 @@ public class PdfParser(IDirectoryService directoryService) : DefaultParser(direc ParseFromFallbackFolders(filePath, tempRootPath, type, ref ret); } + if (enableMetadata) + { + // Patch in other information from ComicInfo + UpdateFromComicInfo(ret); + + if (comicInfo != null && !string.IsNullOrEmpty(comicInfo.Title)) + { + ret.Title = comicInfo.Title.Trim(); + } + } + + if (ret.Chapters == Parser.DefaultChapter && ret.Volumes == Parser.LooseLeafVolume && type == LibraryType.Book) { ret.IsSpecial = true; @@ -76,6 +88,19 @@ public class PdfParser(IDirectoryService directoryService) : DefaultParser(direc ParseFromFallbackFolders(filePath, rootPath, type, ref ret); } + if (type == LibraryType.Book && comicInfo != null) + { + // For books, fall back to the Title for Series. + if (!string.IsNullOrEmpty(comicInfo.Series)) + { + ret.Series = comicInfo.Series.Trim(); + } + else if (!string.IsNullOrEmpty(comicInfo.Title)) + { + ret.Series = comicInfo.Title.Trim(); + } + } + if (string.IsNullOrEmpty(ret.Series)) { ret.Series = Parser.CleanTitle(fileName, type is LibraryType.Comic); diff --git a/API/Services/Tasks/Scanner/ProcessSeries.cs b/API/Services/Tasks/Scanner/ProcessSeries.cs index a36c8268a..307408adb 100644 --- a/API/Services/Tasks/Scanner/ProcessSeries.cs +++ b/API/Services/Tasks/Scanner/ProcessSeries.cs @@ -11,6 +11,7 @@ using API.Data.Repositories; using API.Entities; using API.Entities.Enums; using API.Entities.Metadata; +using API.Entities.Person; using API.Extensions; using API.Helpers; using API.Helpers.Builders; @@ -125,13 +126,17 @@ public class ProcessSeries : IProcessSeries series.Format = firstParsedInfo.Format; } + var removePrefix = library.RemovePrefixForSortName; + var sortName = removePrefix ? BookSortTitlePrefixHelper.GetSortTitle(series.Name) : series.Name; + if (string.IsNullOrEmpty(series.SortName)) { - series.SortName = series.Name; + series.SortName = sortName; } + if (!series.SortNameLocked) { - series.SortName = series.Name; + series.SortName = sortName; if (!string.IsNullOrEmpty(firstParsedInfo.SeriesSort)) { series.SortName = firstParsedInfo.SeriesSort; @@ -193,8 +198,8 @@ public class ProcessSeries : IProcessSeries if (seriesAdded) { // See if any recommendations can link up to the series and pre-fetch external metadata for the series - BackgroundJob.Enqueue(() => - _externalMetadataService.GetNewSeriesData(series.Id, series.Library.Type)); + // BackgroundJob.Enqueue(() => + // _externalMetadataService.FetchSeriesMetadata(series.Id, series.Library.Type)); await _eventHub.SendMessageAsync(MessageFactory.SeriesAdded, MessageFactory.SeriesAddedEvent(series.Id, series.Name, series.LibraryId), false); @@ -213,6 +218,10 @@ public class ProcessSeries : IProcessSeries return; } + if (seriesAdded) + { + await _externalMetadataService.FetchSeriesMetadata(series.Id, series.Library.Type); + } await _metadataService.GenerateCoversForSeries(series.LibraryId, series.Id, false, false); await _wordCountAnalyzerService.ScanSeries(series.LibraryId, series.Id, forceUpdate); } @@ -285,7 +294,7 @@ public class ProcessSeries : IProcessSeries var firstChapter = SeriesService.GetFirstChapterForMetadata(series); var firstFile = firstChapter?.Files.FirstOrDefault(); - if (firstFile == null || Parser.Parser.IsPdf(firstFile.FilePath)) return; + if (firstFile == null) return; var chapters = series.Volumes .SelectMany(volume => volume.Chapters) @@ -298,7 +307,19 @@ public class ProcessSeries : IProcessSeries } // Set the AgeRating as highest in all the comicInfos - if (!series.Metadata.AgeRatingLocked) series.Metadata.AgeRating = chapters.Max(chapter => chapter.AgeRating); + if (!series.Metadata.AgeRatingLocked) + { + series.Metadata.AgeRating = chapters.Max(chapter => chapter.AgeRating); + + // Get the MetadataSettings and apply Age Rating Mappings here + var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettingDto(); + var allTags = series.Metadata.Tags.Select(t => t.Title).Concat(series.Metadata.Genres.Select(g => g.Title)); + var updatedRating = ExternalMetadataService.DetermineAgeRating(allTags, metadataSettings.AgeRatingMappings); + if (updatedRating > series.Metadata.AgeRating) + { + series.Metadata.AgeRating = updatedRating; + } + } DeterminePublicationStatus(series, chapters); @@ -318,86 +339,124 @@ public class ProcessSeries : IProcessSeries await UpdateCollectionTags(series, firstChapter); } - #region PeopleAndTagsAndGenres - if (!series.Metadata.WriterLocked) - { - var personSw = Stopwatch.StartNew(); - var chapterPeople = chapters.SelectMany(c => c.People.Where(p => p.Role == PersonRole.Writer)).ToList(); - await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Writer); - _logger.LogDebug("[TIME] Kavita took {Time} ms to process writer on Series: {File} for {Count} people", personSw.ElapsedMilliseconds, series.Name, chapterPeople.Count); - } + if (!series.Metadata.WriterLocked) + { + var personSw = Stopwatch.StartNew(); + var chapterPeople = chapters.SelectMany(c => c.People.Where(p => p.Role == PersonRole.Writer)).ToList(); + if (ShouldUpdatePeopleForRole(series, chapterPeople, PersonRole.Writer)) + { + await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Writer); + } + _logger.LogTrace("[TIME] Kavita took {Time} ms to process writer on Series: {File} for {Count} people", personSw.ElapsedMilliseconds, series.Name, chapterPeople.Count); + } if (!series.Metadata.ColoristLocked) { var chapterPeople = chapters.SelectMany(c => c.People.Where(p => p.Role == PersonRole.Colorist)).ToList(); - await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Colorist); + if (ShouldUpdatePeopleForRole(series, chapterPeople, PersonRole.Colorist)) + { + await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Colorist); + } } if (!series.Metadata.PublisherLocked) { var chapterPeople = chapters.SelectMany(c => c.People.Where(p => p.Role == PersonRole.Publisher)).ToList(); - await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Publisher); + if (ShouldUpdatePeopleForRole(series, chapterPeople, PersonRole.Publisher)) + { + await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Publisher); + } } if (!series.Metadata.CoverArtistLocked) { var chapterPeople = chapters.SelectMany(c => c.People.Where(p => p.Role == PersonRole.CoverArtist)).ToList(); - await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.CoverArtist); + if (ShouldUpdatePeopleForRole(series, chapterPeople, PersonRole.CoverArtist)) + { + await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.CoverArtist); + } } if (!series.Metadata.CharacterLocked) { var chapterPeople = chapters.SelectMany(c => c.People.Where(p => p.Role == PersonRole.Character)).ToList(); - await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Character); + if (ShouldUpdatePeopleForRole(series, chapterPeople, PersonRole.Character)) + { + await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Character); + } } if (!series.Metadata.EditorLocked) { var chapterPeople = chapters.SelectMany(c => c.People.Where(p => p.Role == PersonRole.Editor)).ToList(); - await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Editor); + if (ShouldUpdatePeopleForRole(series, chapterPeople, PersonRole.Editor)) + { + await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Editor); + } } if (!series.Metadata.InkerLocked) { var chapterPeople = chapters.SelectMany(c => c.People.Where(p => p.Role == PersonRole.Inker)).ToList(); - await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Inker); + if (ShouldUpdatePeopleForRole(series, chapterPeople, PersonRole.Inker)) + { + await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Inker); + } } if (!series.Metadata.ImprintLocked) { var chapterPeople = chapters.SelectMany(c => c.People.Where(p => p.Role == PersonRole.Imprint)).ToList(); - await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Imprint); + if (ShouldUpdatePeopleForRole(series, chapterPeople, PersonRole.Imprint)) + { + await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Imprint); + } } if (!series.Metadata.TeamLocked) { var chapterPeople = chapters.SelectMany(c => c.People.Where(p => p.Role == PersonRole.Team)).ToList(); - await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Team); + if (ShouldUpdatePeopleForRole(series, chapterPeople, PersonRole.Team)) + { + await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Team); + } } - if (!series.Metadata.LocationLocked) + if (!series.Metadata.LocationLocked && !series.Metadata.AllKavitaPlus(PersonRole.Location)) { var chapterPeople = chapters.SelectMany(c => c.People.Where(p => p.Role == PersonRole.Location)).ToList(); - await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Location); + if (ShouldUpdatePeopleForRole(series, chapterPeople, PersonRole.Location)) + { + await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Location); + } } - if (!series.Metadata.LettererLocked) + if (!series.Metadata.LettererLocked && !series.Metadata.AllKavitaPlus(PersonRole.Letterer)) { var chapterPeople = chapters.SelectMany(c => c.People.Where(p => p.Role == PersonRole.Letterer)).ToList(); - await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Letterer); + if (ShouldUpdatePeopleForRole(series, chapterPeople, PersonRole.Location)) + { + await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Letterer); + } } - if (!series.Metadata.PencillerLocked) + if (!series.Metadata.PencillerLocked && !series.Metadata.AllKavitaPlus(PersonRole.Penciller)) { var chapterPeople = chapters.SelectMany(c => c.People.Where(p => p.Role == PersonRole.Penciller)).ToList(); - await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Penciller); + if (ShouldUpdatePeopleForRole(series, chapterPeople, PersonRole.Penciller)) + { + await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Penciller); + } } - if (!series.Metadata.TranslatorLocked) + if (!series.Metadata.TranslatorLocked && !series.Metadata.AllKavitaPlus(PersonRole.Translator)) { var chapterPeople = chapters.SelectMany(c => c.People.Where(p => p.Role == PersonRole.Translator)).ToList(); - await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Translator); + if (ShouldUpdatePeopleForRole(series, chapterPeople, PersonRole.Translator)) + { + await UpdateSeriesMetadataPeople(series.Metadata, series.Metadata.People, chapterPeople, PersonRole.Translator); + } } @@ -414,6 +473,35 @@ public class ProcessSeries : IProcessSeries } #endregion + + } + + /// + /// Ensure that we don't overwrite Person metadata when all metadata is coming from Kavita+ metadata match functionality + /// + /// + /// + /// + /// + private static bool ShouldUpdatePeopleForRole(Series series, List chapterPeople, PersonRole role) + { + if (chapterPeople.Count == 0) return false; + + // If metadata already has this role, but all entries are from KavitaPlus, we should retain them + if (series.Metadata.AnyOfRole(role)) + { + var existingPeople = series.Metadata.People.Where(p => p.Role == role); + + // If all existing people are KavitaPlus but new chapter people exist, we should still update + if (existingPeople.All(p => p.KavitaPlusConnection)) + { + return false; // Ensure we don't remove KavitaPlus people + } + + return true; // Default case: metadata exists, and it's okay to update + } + + return true; } private async Task UpdateCollectionTags(Series series, Chapter firstChapter) @@ -457,7 +545,7 @@ public class ProcessSeries : IProcessSeries await _unitOfWork.CollectionTagRepository.UpdateCollectionAgeRating(collectionTag); } - _logger.LogDebug("[TIME] Kavita took {Time} ms to process collections on Series: {Name}", sw.ElapsedMilliseconds, series.Name); + _logger.LogTrace("[TIME] Kavita took {Time} ms to process collections on Series: {Name}", sw.ElapsedMilliseconds, series.Name); } @@ -541,8 +629,8 @@ public class ProcessSeries : IProcessSeries .Where(v => v.MaxNumber.IsNot(Parser.Parser.SpecialVolumeNumber)) .ToList(); - var maxVolume = (int) (nonSpecialVolumes.Any() ? nonSpecialVolumes.Max(v => v.MaxNumber) : 0); - var maxChapter = (int) chapters.Max(c => c.MaxNumber); + var maxVolume = (int)(nonSpecialVolumes.Any() ? nonSpecialVolumes.Max(v => v.MaxNumber) : 0); + var maxChapter = (int)chapters.Max(c => c.MaxNumber); // Single books usually don't have a number in their Range (filename) if (series.Format == MangaFormat.Epub || series.Format == MangaFormat.Pdf && chapters.Count == 1) @@ -703,7 +791,7 @@ public class ProcessSeries : IProcessSeries chapter.SortOrder = info.IssueOrder; } - if (float.TryParse(chapter.Title, out _)) + if (float.TryParse(chapter.Title, CultureInfo.InvariantCulture, out _)) { // If we have float based chapters, first scan can have the chapter formatted as Chapter 0.2 - .2 as the title is wrong. chapter.Title = chapter.GetNumberTitle(); @@ -786,13 +874,18 @@ public class ProcessSeries : IProcessSeries var fileInfo = _directoryService.FileSystem.FileInfo.New(info.FullFilePath); if (existingFile != null) { + // TODO: I wonder if we can simplify this force check. existingFile.Format = info.Format; + if (!forceUpdate && !_fileService.HasFileBeenModifiedSince(existingFile.FilePath, existingFile.LastModified) && existingFile.Pages != 0) return; + existingFile.Pages = _readingItemService.GetNumberOfPages(info.FullFilePath, info.Format); existingFile.Extension = fileInfo.Extension.ToLowerInvariant(); existingFile.FileName = Parser.Parser.RemoveExtensionIfSupported(existingFile.FilePath); existingFile.FilePath = Parser.Parser.NormalizePath(existingFile.FilePath); existingFile.Bytes = fileInfo.Length; + existingFile.KoreaderHash = KoreaderHelper.HashContents(existingFile.FilePath); + // We skip updating DB here with last modified time so that metadata refresh can do it } else @@ -801,6 +894,7 @@ public class ProcessSeries : IProcessSeries var file = new MangaFileBuilder(info.FullFilePath, info.Format, _readingItemService.GetNumberOfPages(info.FullFilePath, info.Format)) .WithExtension(fileInfo.Extension) .WithBytes(fileInfo.Length) + .WithHash() .Build(); chapter.Files.Add(file); } @@ -894,82 +988,82 @@ public class ProcessSeries : IProcessSeries chapter.ReleaseDate = new DateTime(comicInfo.Year, month, day); } - if (!chapter.ColoristLocked) + if (!chapter.IsPersonRoleLocked(PersonRole.Colorist)) { var people = TagHelper.GetTagValues(comicInfo.Colorist); await UpdateChapterPeopleAsync(chapter, people, PersonRole.Colorist); } - if (!chapter.CharacterLocked) + if (!chapter.IsPersonRoleLocked(PersonRole.Character)) { var people = TagHelper.GetTagValues(comicInfo.Characters); await UpdateChapterPeopleAsync(chapter, people, PersonRole.Character); } - if (!chapter.TranslatorLocked) + if (!chapter.IsPersonRoleLocked(PersonRole.Translator)) { var people = TagHelper.GetTagValues(comicInfo.Translator); await UpdateChapterPeopleAsync(chapter, people, PersonRole.Translator); } - if (!chapter.WriterLocked) + if (!chapter.IsPersonRoleLocked(PersonRole.Writer)) { var personSw = Stopwatch.StartNew(); var people = TagHelper.GetTagValues(comicInfo.Writer); await UpdateChapterPeopleAsync(chapter, people, PersonRole.Writer); - _logger.LogDebug("[TIME] Kavita took {Time} ms to process writer on Chapter: {File} for {Count} people", personSw.ElapsedMilliseconds, chapter.Files.First().FileName, people.Count); + _logger.LogTrace("[TIME] Kavita took {Time} ms to process writer on Chapter: {File} for {Count} people", personSw.ElapsedMilliseconds, chapter.Files.First().FileName, people.Count); } - if (!chapter.EditorLocked) + if (!chapter.IsPersonRoleLocked(PersonRole.Editor)) { var people = TagHelper.GetTagValues(comicInfo.Editor); await UpdateChapterPeopleAsync(chapter, people, PersonRole.Editor); } - if (!chapter.InkerLocked) + if (!chapter.IsPersonRoleLocked(PersonRole.Inker)) { var people = TagHelper.GetTagValues(comicInfo.Inker); await UpdateChapterPeopleAsync(chapter, people, PersonRole.Inker); } - if (!chapter.LettererLocked) + if (!chapter.IsPersonRoleLocked(PersonRole.Letterer)) { var people = TagHelper.GetTagValues(comicInfo.Letterer); await UpdateChapterPeopleAsync(chapter, people, PersonRole.Letterer); } - if (!chapter.PencillerLocked) + if (!chapter.IsPersonRoleLocked(PersonRole.Penciller)) { var people = TagHelper.GetTagValues(comicInfo.Penciller); await UpdateChapterPeopleAsync(chapter, people, PersonRole.Penciller); } - if (!chapter.CoverArtistLocked) + if (!chapter.IsPersonRoleLocked(PersonRole.CoverArtist)) { var people = TagHelper.GetTagValues(comicInfo.CoverArtist); await UpdateChapterPeopleAsync(chapter, people, PersonRole.CoverArtist); } - if (!chapter.PublisherLocked) + if (!chapter.IsPersonRoleLocked(PersonRole.Publisher)) { var people = TagHelper.GetTagValues(comicInfo.Publisher); await UpdateChapterPeopleAsync(chapter, people, PersonRole.Publisher); } - if (!chapter.ImprintLocked) + if (!chapter.IsPersonRoleLocked(PersonRole.Imprint)) { var people = TagHelper.GetTagValues(comicInfo.Imprint); await UpdateChapterPeopleAsync(chapter, people, PersonRole.Imprint); } - if (!chapter.TeamLocked) + if (!chapter.IsPersonRoleLocked(PersonRole.Team)) { var people = TagHelper.GetTagValues(comicInfo.Teams); await UpdateChapterPeopleAsync(chapter, people, PersonRole.Team); } - if (!chapter.LocationLocked) + if (!chapter.IsPersonRoleLocked(PersonRole.Location)) { var people = TagHelper.GetTagValues(comicInfo.Locations); await UpdateChapterPeopleAsync(chapter, people, PersonRole.Location); @@ -987,7 +1081,7 @@ public class ProcessSeries : IProcessSeries await UpdateChapterTags(chapter, tags); } - _logger.LogDebug("[TIME] Kavita took {Time} ms to create/update Chapter: {File}", sw.ElapsedMilliseconds, chapter.Files.First().FileName); + _logger.LogTrace("[TIME] Kavita took {Time} ms to create/update Chapter: {File}", sw.ElapsedMilliseconds, chapter.Files.First().FileName); } private async Task UpdateChapterGenres(Chapter chapter, IEnumerable genreNames) diff --git a/API/Services/Tasks/ScannerService.cs b/API/Services/Tasks/ScannerService.cs index 3795ed8db..cb5f4302f 100644 --- a/API/Services/Tasks/ScannerService.cs +++ b/API/Services/Tasks/ScannerService.cs @@ -161,7 +161,7 @@ public class ScannerService : IScannerService { if (TaskScheduler.HasScanTaskRunningForSeries(series.Id)) { - _logger.LogDebug("[ScannerService] Scan folder invoked for {Folder} but a task is already queued for this series. Dropping request", folder); + _logger.LogTrace("[ScannerService] Scan folder invoked for {Folder} but a task is already queued for this series. Dropping request", folder); return; } @@ -186,7 +186,7 @@ public class ScannerService : IScannerService { if (TaskScheduler.HasScanTaskRunningForLibrary(library.Id)) { - _logger.LogDebug("[ScannerService] Scan folder invoked for {Folder} but a task is already queued for this library. Dropping request", folder); + _logger.LogTrace("[ScannerService] Scan folder invoked for {Folder} but a task is already queued for this library. Dropping request", folder); return; } BackgroundJob.Schedule(() => ScanLibrary(library.Id, false, true), TimeSpan.FromMinutes(1)); @@ -317,7 +317,7 @@ public class ScannerService : IScannerService // Process Series var seriesProcessStopWatch = Stopwatch.StartNew(); await _processSeries.ProcessSeriesAsync(parsedSeries[pSeries], library, seriesLeftToProcess, bypassFolderOptimizationChecks); - _logger.LogDebug("[TIME] Kavita took {Time} ms to process {SeriesName}", seriesProcessStopWatch.ElapsedMilliseconds, parsedSeries[pSeries][0].Series); + _logger.LogTrace("[TIME] Kavita took {Time} ms to process {SeriesName}", seriesProcessStopWatch.ElapsedMilliseconds, parsedSeries[pSeries][0].Series); seriesLeftToProcess--; } @@ -335,11 +335,21 @@ public class ScannerService : IScannerService private static Dictionary> TrackFoundSeriesAndFiles(IList seenSeries) { + // Why does this only grab things that have changed? var parsedSeries = new Dictionary>(); - foreach (var series in seenSeries.Where(s => s.ParsedInfos.Count > 0 && s.HasChanged)) + foreach (var series in seenSeries.Where(s => s.ParsedInfos.Count > 0)) // && s.HasChanged { var parsedFiles = series.ParsedInfos; - parsedSeries.Add(series.ParsedSeries, parsedFiles); + series.ParsedSeries.HasChanged = series.HasChanged; + + if (series.HasChanged) + { + parsedSeries.Add(series.ParsedSeries, parsedFiles); + } + else + { + parsedSeries.Add(series.ParsedSeries, []); + } } return parsedSeries; @@ -450,12 +460,12 @@ public class ScannerService : IScannerService // That way logging and UI informing is all in one place with full context _logger.LogError("[ScannerService] Some of the root folders for the library are empty. " + "Either your mount has been disconnected or you are trying to delete all series in the library. " + - "Scan has be aborted. " + + "Scan has been aborted. " + "Check that your mount is connected or change the library's root folder and rescan"); await _eventHub.SendMessageAsync(MessageFactory.Error, MessageFactory.ErrorEvent( $"Some of the root folders for the library, {libraryName}, are empty.", "Either your mount has been disconnected or you are trying to delete all series in the library. " + - "Scan has be aborted. " + + "Scan has been aborted. " + "Check that your mount is connected or change the library's root folder and rescan")); return false; @@ -511,11 +521,16 @@ public class ScannerService : IScannerService // Validations are done, now we can start actual scan _logger.LogInformation("[ScannerService] Beginning file scan on {LibraryName}", library.Name); + if (!library.EnableMetadata) + { + _logger.LogInformation("[ScannerService] Warning! {LibraryName} has metadata turned off", library.Name); + } + // This doesn't work for something like M:/Manga/ and a series has library folder as root var shouldUseLibraryScan = !(await _unitOfWork.LibraryRepository.DoAnySeriesFoldersMatch(libraryFolderPaths)); if (!shouldUseLibraryScan) { - _logger.LogError("[ScannerService] Library {LibraryName} consists of one or more Series folders, using series scan", library.Name); + _logger.LogError("[ScannerService] Library {LibraryName} consists of one or more Series folders as a library root, using series scan", library.Name); } @@ -601,6 +616,12 @@ public class ScannerService : IScannerService foreach (var series in parsedSeries) { + if (!series.Key.HasChanged) + { + _logger.LogDebug("{Series} hasn't changed", series.Key.Name); + continue; + } + // Filter out ParserInfos where FullFilePath is empty (i.e., folder not modified) var validInfos = series.Value.Where(info => !string.IsNullOrEmpty(info.Filename)).ToList(); @@ -644,7 +665,7 @@ public class ScannerService : IScannerService totalFiles += pSeries.Value.Count; var seriesProcessStopWatch = Stopwatch.StartNew(); await _processSeries.ProcessSeriesAsync(pSeries.Value, library, seriesLeftToProcess, forceUpdate); - _logger.LogDebug("[TIME] Kavita took {Time} ms to process {SeriesName}", seriesProcessStopWatch.ElapsedMilliseconds, pSeries.Value[0].Series); + _logger.LogTrace("[TIME] Kavita took {Time} ms to process {SeriesName}", seriesProcessStopWatch.ElapsedMilliseconds, pSeries.Value[0].Series); seriesLeftToProcess--; } diff --git a/API/Services/Tasks/SiteThemeService.cs b/API/Services/Tasks/SiteThemeService.cs index aaa06a846..3dca14ab9 100644 --- a/API/Services/Tasks/SiteThemeService.cs +++ b/API/Services/Tasks/SiteThemeService.cs @@ -2,12 +2,14 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using System.Text.Json.Serialization; using System.Threading.Tasks; using API.Data; using API.DTOs.Theme; using API.Entities; using API.Entities.Enums.Theme; using API.Extensions; +using API.Services.Tasks.Scanner.Parser; using API.SignalR; using Flurl.Http; using HtmlAgilityPack; @@ -32,6 +34,7 @@ internal class GitHubContent [JsonProperty("type")] public string Type { get; set; } + [JsonPropertyName("download_url")] [JsonProperty("download_url")] public string DownloadUrl { get; set; } @@ -151,6 +154,7 @@ public class ThemeService : IThemeService // Fetch contents of the theme directory var themeContents = await GetDirectoryContent(themeDir.Path); + // Find css and preview files var cssFile = themeContents.FirstOrDefault(c => c.Name.EndsWith(".css")); var previewUrls = GetPreviewUrls(themeContents); @@ -187,19 +191,22 @@ public class ThemeService : IThemeService return themeDtos; } - private static IList GetPreviewUrls(IEnumerable themeContents) + private static List GetPreviewUrls(IEnumerable themeContents) { - return themeContents.Where(c => c.Name.ToLower().EndsWith(".jpg") || c.Name.ToLower().EndsWith(".png") ) + return themeContents + .Where(c => Parser.IsImage(c.Name) ) .Select(p => p.DownloadUrl) .ToList(); } private static async Task> GetDirectoryContent(string path) { - return await $"{GithubBaseUrl}/repos/Kareadita/Themes/contents/{path}" + var json = await $"{GithubBaseUrl}/repos/Kareadita/Themes/contents/{path}" .WithHeader("Accept", "application/vnd.github+json") .WithHeader("User-Agent", "Kavita") - .GetJsonAsync>(); + .GetStringAsync(); + + return string.IsNullOrEmpty(json) ? [] : JsonConvert.DeserializeObject>(json); } /// @@ -295,7 +302,8 @@ public class ThemeService : IThemeService var existingThemes = _directoryService.ScanFiles(_directoryService.SiteThemeDirectory, string.Empty); if (existingThemes.Any(f => Path.GetFileName(f) == dto.CssFile)) { - throw new KavitaException("Cannot download file, file already on disk"); + // This can happen if you delete then immediately download (to refresh). We should just delete the old file and download. Users can always rollback their version with github directly + _directoryService.DeleteFiles(existingThemes.Where(f => Path.GetFileName(f) == dto.CssFile)); } var finalLocation = await DownloadSiteTheme(dto); diff --git a/API/Services/Tasks/StatsService.cs b/API/Services/Tasks/StatsService.cs index 4e6fcfb60..5d5df6647 100644 --- a/API/Services/Tasks/StatsService.cs +++ b/API/Services/Tasks/StatsService.cs @@ -13,14 +13,17 @@ using API.DTOs.Stats; using API.DTOs.Stats.V3; using API.Entities; using API.Entities.Enums; +using API.Extensions; using API.Services.Plus; using API.Services.Tasks.Scanner.Parser; using Flurl.Http; +using Kavita.Common; using Kavita.Common.EnvironmentInfo; using Kavita.Common.Helpers; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; namespace API.Services.Tasks; @@ -45,12 +48,12 @@ public class StatsService : IStatsService private readonly UserManager _userManager; private readonly IEmailService _emailService; private readonly ICacheService _cacheService; - private const string ApiUrl = "https://stats.kavitareader.com"; + private readonly string _apiUrl = ""; private const string ApiKey = "MsnvA2DfQqxSK5jh"; // It's not important this is public, just a way to keep bots from hitting the API willy-nilly public StatsService(ILogger logger, IUnitOfWork unitOfWork, DataContext context, ILicenseService licenseService, UserManager userManager, IEmailService emailService, - ICacheService cacheService) + ICacheService cacheService, IHostEnvironment environment) { _logger = logger; _unitOfWork = unitOfWork; @@ -60,8 +63,9 @@ public class StatsService : IStatsService _emailService = emailService; _cacheService = cacheService; - FlurlHttp.ConfigureClient(ApiUrl, cli => - cli.Settings.HttpClientFactory = new UntrustedCertClientFactory()); + FlurlConfiguration.ConfigureClientForUrl(Configuration.StatsApiUrl); + + _apiUrl = environment.IsDevelopment() ? "http://localhost:5001" : Configuration.StatsApiUrl; } /// @@ -99,13 +103,8 @@ public class StatsService : IStatsService try { - var response = await (ApiUrl + "/api/v3/stats") - .WithHeader("Accept", "application/json") - .WithHeader("User-Agent", "Kavita") - .WithHeader("x-api-key", ApiKey) - .WithHeader("x-kavita-version", BuildInfo.Version) - .WithHeader("Content-Type", "application/json") - .WithTimeout(TimeSpan.FromSeconds(30)) + var response = await (_apiUrl + "/api/v3/stats") + .WithBasicHeaders(ApiKey) .PostJsonAsync(data); if (response.StatusCode != StatusCodes.Status200OK) @@ -152,12 +151,8 @@ public class StatsService : IStatsService try { - var response = await (ApiUrl + "/api/v2/stats/opt-out?installId=" + installId) - .WithHeader("Accept", "application/json") - .WithHeader("User-Agent", "Kavita") - .WithHeader("x-api-key", ApiKey) - .WithHeader("x-kavita-version", BuildInfo.Version) - .WithHeader("Content-Type", "application/json") + var response = await (_apiUrl + "/api/v2/stats/opt-out?installId=" + installId) + .WithBasicHeaders(ApiKey) .WithTimeout(TimeSpan.FromSeconds(30)) .PostAsync(); @@ -181,13 +176,8 @@ public class StatsService : IStatsService try { var sw = Stopwatch.StartNew(); - var response = await (ApiUrl + "/api/health/") - .WithHeader("Accept", "application/json") - .WithHeader("User-Agent", "Kavita") - .WithHeader("x-api-key", ApiKey) - .WithHeader("x-kavita-version", BuildInfo.Version) - .WithHeader("Content-Type", "application/json") - .WithTimeout(TimeSpan.FromSeconds(30)) + var response = await (Configuration.StatsApiUrl + "/api/health/") + .WithBasicHeaders(ApiKey) .GetAsync(); if (response.StatusCode == StatusCodes.Status200OK) @@ -206,7 +196,7 @@ public class StatsService : IStatsService private async Task MaxSeriesInAnyLibrary() { - // If first time flow, just return 0 + // If first time flow, return 0 if (!await _context.Series.AnyAsync()) return 0; return await _context.Series .Select(s => _context.Library.Where(l => l.Id == s.LibraryId).SelectMany(l => l.Series!).Count()) @@ -245,6 +235,7 @@ public class StatsService : IStatsService private async Task GetStatV3Payload() { var serverSettings = await _unitOfWork.SettingsRepository.GetSettingsDtoAsync(); + var mediaSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings(); var dto = new ServerInfoV3Dto() { InstallId = serverSettings.InstallId, @@ -257,6 +248,7 @@ public class StatsService : IStatsService DotnetVersion = Environment.Version.ToString(), OpdsEnabled = serverSettings.EnableOpds, EncodeMediaAs = serverSettings.EncodeMediaAs, + MatchedMetadataEnabled = mediaSettings.Enabled }; dto.OsLocale = CultureInfo.CurrentCulture.EnglishName; diff --git a/API/Services/Tasks/VersionUpdaterService.cs b/API/Services/Tasks/VersionUpdaterService.cs index f1a6eb383..4ccf79abb 100644 --- a/API/Services/Tasks/VersionUpdaterService.cs +++ b/API/Services/Tasks/VersionUpdaterService.cs @@ -1,8 +1,13 @@ using System; using System.Collections.Generic; +using System.Globalization; +using System.IO; using System.Linq; +using System.Text.Json; +using System.Text.RegularExpressions; using System.Threading.Tasks; using API.DTOs.Update; +using API.Extensions; using API.SignalR; using Flurl.Http; using Kavita.Common.EnvironmentInfo; @@ -30,7 +35,7 @@ internal class GithubReleaseMetadata /// public required string Body { get; init; } /// - /// Url of the release on Github + /// Url of the release on GitHub /// // ReSharper disable once InconsistentNaming public required string Html_Url { get; init; } @@ -45,11 +50,13 @@ public interface IVersionUpdaterService { Task CheckForUpdate(); Task PushUpdate(UpdateNotificationDto update); - Task> GetAllReleases(); - Task GetNumberOfReleasesBehind(); + Task> GetAllReleases(int count = 0); + Task GetNumberOfReleasesBehind(bool stableOnly = false); + void BustGithubCache(); } -public class VersionUpdaterService : IVersionUpdaterService + +public partial class VersionUpdaterService : IVersionUpdaterService { private readonly ILogger _logger; private readonly IEventHub _eventHub; @@ -57,37 +64,253 @@ public class VersionUpdaterService : IVersionUpdaterService #pragma warning disable S1075 private const string GithubLatestReleasesUrl = "https://api.github.com/repos/Kareadita/Kavita/releases/latest"; private const string GithubAllReleasesUrl = "https://api.github.com/repos/Kareadita/Kavita/releases"; + private const string GithubPullsUrl = "https://api.github.com/repos/Kareadita/Kavita/pulls/"; + private const string GithubBranchCommitsUrl = "https://api.github.com/repos/Kareadita/Kavita/commits?sha=develop"; #pragma warning restore S1075 - public VersionUpdaterService(ILogger logger, IEventHub eventHub) + [GeneratedRegex(@"^\n*(.*?)\n+#{1,2}\s", RegexOptions.Singleline)] + private static partial Regex BlogPartRegex(); + private readonly string _cacheFilePath; + /// + /// The latest release cache + /// + private readonly string _cacheLatestReleaseFilePath; + private static readonly TimeSpan CacheDuration = TimeSpan.FromHours(1); + private static readonly JsonSerializerOptions JsonOptions = new() { WriteIndented = true }; + + public VersionUpdaterService(ILogger logger, IEventHub eventHub, IDirectoryService directoryService) { _logger = logger; _eventHub = eventHub; + _cacheFilePath = Path.Combine(directoryService.LongTermCacheDirectory, "github_releases_cache.json"); + _cacheLatestReleaseFilePath = Path.Combine(directoryService.LongTermCacheDirectory, "github_latest_release_cache.json"); - FlurlHttp.ConfigureClient(GithubLatestReleasesUrl, cli => - cli.Settings.HttpClientFactory = new UntrustedCertClientFactory()); - FlurlHttp.ConfigureClient(GithubAllReleasesUrl, cli => - cli.Settings.HttpClientFactory = new UntrustedCertClientFactory()); + FlurlConfiguration.ConfigureClientForUrl(GithubLatestReleasesUrl); + FlurlConfiguration.ConfigureClientForUrl(GithubAllReleasesUrl); } /// - /// Fetches the latest release from Github + /// Fetches the latest (stable) release from GitHub. Does not do any extra nightly release parsing. /// /// Latest update public async Task CheckForUpdate() { + // Attempt to fetch from cache + var cachedRelease = await TryGetCachedLatestRelease(); + if (cachedRelease != null) + { + return cachedRelease; + } + var update = await GetGithubRelease(); - return CreateDto(update); + var dto = CreateDto(update); + + if (dto != null) + { + await CacheLatestReleaseAsync(dto); + } + + return dto; } - public async Task> GetAllReleases() + /// + /// Will add any extra (nightly) updates from the latest stable. Does not back-fill anything prior to the latest stable. + /// + /// + private async Task EnrichWithNightlyInfo(List dtos) { + var dto = dtos[0]; // Latest version + try + { + var currentVersion = new Version(dto.CurrentVersion); + var nightlyReleases = await GetNightlyReleases(currentVersion, Version.Parse(dto.UpdateVersion)); + + if (nightlyReleases.Count == 0) return; + + // Create new DTOs for each nightly release and insert them at the beginning of the list + var nightlyDtos = new List(); + foreach (var nightly in nightlyReleases) + { + var prInfo = await FetchPullRequestInfo(nightly.PrNumber); + if (prInfo == null) continue; + + var sections = ParseReleaseBody(prInfo.Body); + var blogPart = ExtractBlogPart(prInfo.Body); + + var nightlyDto = new UpdateNotificationDto + { + // TODO: I should pass Title to the FE so that Nightly Release can be localized + UpdateTitle = $"Nightly Release {nightly.Version} - {prInfo.Title}", + UpdateVersion = nightly.Version, + CurrentVersion = dto.CurrentVersion, + UpdateUrl = prInfo.Html_Url, + PublishDate = prInfo.Merged_At, + IsDocker = true, // Nightlies are always Docker Only + IsReleaseEqual = IsVersionEqualToBuildVersion(Version.Parse(nightly.Version)), + IsReleaseNewer = true, // Since we already filtered these in GetNightlyReleases + IsPrerelease = true, // All Nightlies are considered prerelease + Added = sections.TryGetValue("Added", out var added) ? added : [], + Changed = sections.TryGetValue("Changed", out var changed) ? changed : [], + Fixed = sections.TryGetValue("Fixed", out var bugfixes) ? bugfixes : [], + Removed = sections.TryGetValue("Removed", out var removed) ? removed : [], + Theme = sections.TryGetValue("Theme", out var theme) ? theme : [], + Developer = sections.TryGetValue("Developer", out var developer) ? developer : [], + KnownIssues = sections.TryGetValue("KnownIssues", out var knownIssues) ? knownIssues : [], + Api = sections.TryGetValue("Api", out var api) ? api : [], + FeatureRequests = sections.TryGetValue("Feature Requests", out var frs) ? frs : [], + BlogPart = _markdown.Transform(blogPart.Trim()), + UpdateBody = _markdown.Transform(prInfo.Body.Trim()) + }; + + nightlyDtos.Add(nightlyDto); + } + + // Insert nightly releases at the beginning of the list + var sortedNightlyDtos = nightlyDtos.OrderByDescending(x => x.PublishDate).ToList(); + dtos.InsertRange(0, sortedNightlyDtos); + } + catch (Exception ex) + { + _logger.LogError(ex, "Failed to enrich nightly release information"); + } + } + + + private async Task FetchPullRequestInfo(int prNumber) + { + try + { + return await $"{GithubPullsUrl}{prNumber}" + .WithHeader("Accept", "application/json") + .WithHeader("User-Agent", "Kavita") + .GetJsonAsync(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Failed to fetch PR information for #{PrNumber}", prNumber); + return null; + } + } + + private async Task> GetNightlyReleases(Version currentVersion, Version latestStableVersion) + { + try + { + var nightlyReleases = new List(); + + var commits = await GithubBranchCommitsUrl + .WithHeader("Accept", "application/json") + .WithHeader("User-Agent", "Kavita") + .GetJsonAsync>(); + + var commitList = commits.ToList(); + bool foundLastStable = false; + + for (var i = 0; i < commitList.Count - 1; i++) + { + var commit = commitList[i]; + var message = commit.Commit.Message.Split('\n')[0]; // Take first line only + + // Skip [skip ci] commits + if (message.Contains("[skip ci]")) continue; + + // Check if this is a stable release + if (message.StartsWith('v')) + { + var stableMatch = Regex.Match(message, @"v(\d+\.\d+\.\d+\.\d+)"); + if (stableMatch.Success) + { + var stableVersion = new Version(stableMatch.Groups[1].Value); + // If we find a stable version lower than current, we've gone too far back + if (stableVersion <= currentVersion) + { + foundLastStable = true; + break; + } + } + continue; + } + + // Look for version bumps that follow PRs + if (!foundLastStable && message == "Bump versions by dotnet-bump-version.") + { + // Get the PR commit that triggered this version bump + if (i + 1 < commitList.Count) + { + var prCommit = commitList[i + 1]; + var prMessage = prCommit.Commit.Message.Split('\n')[0]; + + // Extract PR number using improved regex + var prMatch = Regex.Match(prMessage, @"(?:^|\s)\(#(\d+)\)|\s#(\d+)"); + if (!prMatch.Success) continue; + + var prNumber = int.Parse(prMatch.Groups[1].Value != "" ? + prMatch.Groups[1].Value : prMatch.Groups[2].Value); + + // Get the version from AssemblyInfo.cs in this commit + var version = await GetVersionFromCommit(commit.Sha); + if (version == null) continue; + + // Parse version and compare with current version + if (Version.TryParse(version, out var parsedVersion) && + parsedVersion > latestStableVersion) + { + nightlyReleases.Add(new NightlyInfo + { + Version = version, + PrNumber = prNumber, + Date = DateTime.Parse(commit.Commit.Author.Date, CultureInfo.InvariantCulture) + }); + } + } + } + } + + return nightlyReleases.OrderByDescending(x => x.Date).ToList(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Failed to get nightly releases"); + return []; + } + } + + public async Task> GetAllReleases(int count = 0) + { + // Attempt to fetch from cache + var cachedReleases = await TryGetCachedReleases(); + // If there is a cached release and the current version is within it, use it, otherwise regenerate + if (cachedReleases != null && cachedReleases.Any(r => IsVersionEqual(r.UpdateVersion, BuildInfo.Version.ToString()))) + { + if (count > 0) + { + // NOTE: We may want to allow the admin to clear Github cache + return cachedReleases.Take(count).ToList(); + } + + return cachedReleases; + } + var updates = await GetGithubReleases(); - var updateDtos = updates.Select(CreateDto) + var query = updates.Select(CreateDto) .Where(d => d != null) .OrderByDescending(d => d!.PublishDate) - .Select(d => d!) - .ToList(); + .Select(d => d!); + + var updateDtos = query.ToList(); + + // Sometimes a release can be 0.8.5.0 on disk, but 0.8.5 from Github + var versionParts = updateDtos[0].UpdateVersion.Split('.'); + if (versionParts.Length < 4) + { + updateDtos[0].UpdateVersion += ".0"; // Append missing parts + } + + // If we're on a nightly build, enrich the information + if (updateDtos.Count != 0) // && BuildInfo.Version > new Version(updateDtos[0].UpdateVersion) + { + await EnrichWithNightlyInfo(updateDtos); + } // Find the latest dto var latestRelease = updateDtos[0]!; @@ -103,30 +326,140 @@ public class VersionUpdaterService : IVersionUpdaterService latestRelease.IsOnNightlyInRelease = isNightly; + // Cache the fetched data + if (updateDtos.Count > 0) + { + await CacheReleasesAsync(updateDtos); + } + + if (count > 0) + { + return updateDtos.Take(count).ToList(); + } + return updateDtos; } + /// + /// Compares 2 versions and ensures that the minor is always there + /// + /// + /// + /// + private static bool IsVersionEqual(string v1, string v2) + { + var versionParts = v1.Split('.'); + if (versionParts.Length < 4) + { + v1 += ".0"; // Append missing parts + } + + versionParts = v2.Split('.'); + if (versionParts.Length < 4) + { + v2 += ".0"; // Append missing parts + } + + return string.Equals(v2, v2, StringComparison.OrdinalIgnoreCase); + } + + private async Task?> TryGetCachedReleases() + { + if (!File.Exists(_cacheFilePath)) return null; + + var fileInfo = new FileInfo(_cacheFilePath); + if (DateTime.UtcNow - fileInfo.LastWriteTimeUtc <= CacheDuration) + { + var cachedData = await File.ReadAllTextAsync(_cacheFilePath); + return JsonSerializer.Deserialize>(cachedData); + } + + return null; + } + + private async Task TryGetCachedLatestRelease() + { + if (!File.Exists(_cacheLatestReleaseFilePath)) return null; + + var fileInfo = new FileInfo(_cacheLatestReleaseFilePath); + if (DateTime.UtcNow - fileInfo.LastWriteTimeUtc <= CacheDuration) + { + var cachedData = await File.ReadAllTextAsync(_cacheLatestReleaseFilePath); + return JsonSerializer.Deserialize(cachedData); + } + + return null; + } + + private async Task CacheReleasesAsync(IList updates) + { + try + { + var json = JsonSerializer.Serialize(updates, JsonOptions); + await File.WriteAllTextAsync(_cacheFilePath, json); + } + catch (Exception ex) + { + _logger.LogError(ex, "Failed to cache releases"); + } + } + + private async Task CacheLatestReleaseAsync(UpdateNotificationDto update) + { + try + { + var json = JsonSerializer.Serialize(update, JsonOptions); + await File.WriteAllTextAsync(_cacheLatestReleaseFilePath, json); + } + catch (Exception ex) + { + _logger.LogError(ex, "Failed to cache latest release"); + } + } + + + private static bool IsVersionEqualToBuildVersion(Version updateVersion) { - return updateVersion.Revision < 0 && BuildInfo.Version.Revision == 0 && - CompareWithoutRevision(BuildInfo.Version, updateVersion); + return updateVersion == BuildInfo.Version || (updateVersion.Revision < 0 && BuildInfo.Version.Revision == 0 && + BuildInfo.Version.CompareWithoutRevision(updateVersion)); } - private static bool CompareWithoutRevision(Version v1, Version v2) - { - if (v1.Major != v2.Major) - return v1.Major == v2.Major; - if (v1.Minor != v2.Minor) - return v1.Minor == v2.Minor; - if (v1.Build != v2.Build) - return v1.Build == v2.Build; - return true; - } - public async Task GetNumberOfReleasesBehind() + /// + /// Returns the number of releases ahead of this install version. If this install version is on a nightly, + /// then include nightly releases, otherwise only count Stable releases. + /// + /// Only count Stable releases + /// + public async Task GetNumberOfReleasesBehind(bool stableOnly = false) { var updates = await GetAllReleases(); - return updates.TakeWhile(update => update.UpdateVersion != update.CurrentVersion).Count(); + + // If the user is on nightly, then we need to handle releases behind differently + if (!stableOnly && (updates[0].IsPrerelease || updates[0].IsOnNightlyInRelease)) + { + return updates.Count(u => u.IsReleaseNewer); + } + + return updates + .Where(update => !update.IsPrerelease) + .Count(u => u.IsReleaseNewer); + } + + /// + /// Clears the Github cache + /// + public void BustGithubCache() + { + try + { + File.Delete(_cacheFilePath); + File.Delete(_cacheLatestReleaseFilePath); + } catch (Exception ex) + { + _logger.LogError(ex, "Failed to clear Github cache"); + } } private UpdateNotificationDto? CreateDto(GithubReleaseMetadata? update) @@ -135,18 +468,33 @@ public class VersionUpdaterService : IVersionUpdaterService var updateVersion = new Version(update.Tag_Name.Replace("v", string.Empty)); var currentVersion = BuildInfo.Version.ToString(4); + var bodyHtml = _markdown.Transform(update.Body.Trim()); + var parsedSections = ParseReleaseBody(update.Body); + var blogPart = _markdown.Transform(ExtractBlogPart(update.Body).Trim()); return new UpdateNotificationDto() { CurrentVersion = currentVersion, UpdateVersion = updateVersion.ToString(), - UpdateBody = _markdown.Transform(update.Body.Trim()), + UpdateBody = bodyHtml, UpdateTitle = update.Name, UpdateUrl = update.Html_Url, IsDocker = OsInfo.IsDocker, PublishDate = update.Published_At, IsReleaseEqual = IsVersionEqualToBuildVersion(updateVersion), IsReleaseNewer = BuildInfo.Version < updateVersion, + IsPrerelease = false, + + Added = parsedSections.TryGetValue("Added", out var added) ? added : [], + Removed = parsedSections.TryGetValue("Removed", out var removed) ? removed : [], + Changed = parsedSections.TryGetValue("Changed", out var changed) ? changed : [], + Fixed = parsedSections.TryGetValue("Fixed", out var fixes) ? fixes : [], + Theme = parsedSections.TryGetValue("Theme", out var theme) ? theme : [], + Developer = parsedSections.TryGetValue("Developer", out var developer) ? developer : [], + KnownIssues = parsedSections.TryGetValue("Known Issues", out var knownIssues) ? knownIssues : [], + Api = parsedSections.TryGetValue("Api", out var api) ? api : [], + FeatureRequests = parsedSections.TryGetValue("Feature Requests", out var frs) ? frs : [], + BlogPart = blogPart }; } @@ -165,6 +513,26 @@ public class VersionUpdaterService : IVersionUpdaterService } } + private async Task GetVersionFromCommit(string commitSha) + { + try + { + // Use the raw GitHub URL format for the csproj file + var content = await $"https://raw.githubusercontent.com/Kareadita/Kavita/{commitSha}/Kavita.Common/Kavita.Common.csproj" + .WithHeader("User-Agent", "Kavita") + .GetStringAsync(); + + var versionMatch = Regex.Match(content, @"([0-9\.]+)"); + return versionMatch.Success ? versionMatch.Groups[1].Value : null; + } + catch (Exception ex) + { + _logger.LogError(ex, "Failed to get version from commit {Sha}: {Message}", commitSha, ex.Message); + return null; + } + } + + private static async Task GetGithubRelease() { @@ -176,13 +544,109 @@ public class VersionUpdaterService : IVersionUpdaterService return update; } - private static async Task> GetGithubReleases() + private static async Task> GetGithubReleases() { var update = await GithubAllReleasesUrl .WithHeader("Accept", "application/json") .WithHeader("User-Agent", "Kavita") - .GetJsonAsync>(); + .GetJsonAsync>(); return update; } + + private static string ExtractBlogPart(string body) + { + if (body.StartsWith('#')) return string.Empty; + var match = BlogPartRegex().Match(body); + return match.Success ? match.Groups[1].Value.Trim() : body.Trim(); + } + + private static Dictionary> ParseReleaseBody(string body) + { + var sections = new Dictionary>(StringComparer.OrdinalIgnoreCase); + var lines = body.Split('\n'); + string? currentSection = null; + + foreach (var line in lines) + { + var trimmedLine = line.Trim(); + + // Check for section headers (case-insensitive) + if (trimmedLine.StartsWith('#')) + { + currentSection = trimmedLine.TrimStart('#').Trim(); + sections[currentSection] = []; + continue; + } + + // Parse items under a section + if (currentSection != null && + trimmedLine.StartsWith("- ") && + !string.IsNullOrWhiteSpace(trimmedLine)) + { + // Remove "Fixed:", "Added:" etc. if present + var cleanedItem = CleanSectionItem(trimmedLine); + + // Some sections like API/Developer/Removed don't have the title repeated, so we need to check for an additional cleaning + if (cleanedItem.StartsWith("- ")) + { + cleanedItem = trimmedLine.Substring(2); + } + + // Only add non-empty items + if (!string.IsNullOrWhiteSpace(cleanedItem)) + { + sections[currentSection].Add(cleanedItem); + } + } + } + + return sections; + } + + private static string CleanSectionItem(string item) + { + // Remove everything up to and including the first ":" + var colonIndex = item.IndexOf(':'); + if (colonIndex != -1) + { + item = item.Substring(colonIndex + 1).Trim(); + } + + return item; + } + + private sealed class PullRequestInfo + { + public required string Title { get; init; } + public required string Body { get; init; } + public required string Html_Url { get; init; } + public required string Merged_At { get; init; } + public required int Number { get; init; } + } + + private sealed class CommitInfo + { + public required string Sha { get; init; } + public required CommitDetail Commit { get; init; } + public required string Html_Url { get; init; } + } + + private sealed class CommitDetail + { + public required string Message { get; init; } + public required CommitAuthor Author { get; init; } + } + + private sealed class CommitAuthor + { + public required string Date { get; init; } + } + + private sealed class NightlyInfo + { + public required string Version { get; init; } + public required int PrNumber { get; init; } + public required DateTime Date { get; init; } + } } diff --git a/API/Services/TokenService.cs b/API/Services/TokenService.cs index cc998de3d..720d97663 100644 --- a/API/Services/TokenService.cs +++ b/API/Services/TokenService.cs @@ -4,10 +4,12 @@ using System.IdentityModel.Tokens.Jwt; using System.Linq; using System.Security.Claims; using System.Text; +using System.Threading; using System.Threading.Tasks; using API.Data; using API.DTOs.Account; using API.Entities; +using API.Helpers; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; @@ -35,6 +37,7 @@ public class TokenService : ITokenService private readonly IUnitOfWork _unitOfWork; private readonly SymmetricSecurityKey _key; private const string RefreshTokenName = "RefreshToken"; + private static readonly SemaphoreSlim _refreshTokenLock = new SemaphoreSlim(1, 1); public TokenService(IConfiguration config, UserManager userManager, ILogger logger, IUnitOfWork unitOfWork) { @@ -80,6 +83,8 @@ public class TokenService : ITokenService public async Task ValidateRefreshToken(TokenRequestDto request) { + await _refreshTokenLock.WaitAsync(); + try { var tokenHandler = new JwtSecurityTokenHandler(); @@ -90,6 +95,7 @@ public class TokenService : ITokenService _logger.LogDebug("[RefreshToken] failed to validate due to not finding user in RefreshToken"); return null; } + var user = await _userManager.FindByNameAsync(username); if (user == null) { @@ -97,13 +103,19 @@ public class TokenService : ITokenService return null; } - var validated = await _userManager.VerifyUserTokenAsync(user, TokenOptions.DefaultProvider, RefreshTokenName, request.RefreshToken); + var validated = await _userManager.VerifyUserTokenAsync(user, TokenOptions.DefaultProvider, + RefreshTokenName, request.RefreshToken); if (!validated && tokenContent.ValidTo <= DateTime.UtcNow.Add(TimeSpan.FromHours(1))) { _logger.LogDebug("[RefreshToken] failed to validate due to invalid refresh token"); return null; } + // Remove the old refresh token first + await _userManager.RemoveAuthenticationTokenAsync(user, + TokenOptions.DefaultProvider, + RefreshTokenName); + try { user.UpdateLastActive(); @@ -120,7 +132,8 @@ public class TokenService : ITokenService Token = await CreateToken(user), RefreshToken = await CreateRefreshToken(user) }; - } catch (SecurityTokenExpiredException ex) + } + catch (SecurityTokenExpiredException ex) { // Handle expired token _logger.LogError(ex, "Failed to validate refresh token"); @@ -132,6 +145,10 @@ public class TokenService : ITokenService _logger.LogError(ex, "Failed to validate refresh token"); return null; } + finally + { + _refreshTokenLock.Release(); + } } public async Task GetJwtFromUser(AppUser user) @@ -143,12 +160,12 @@ public class TokenService : ITokenService public static bool HasTokenExpired(string? token) { - if (string.IsNullOrEmpty(token)) return true; + return !JwtHelper.IsTokenValid(token); + } - var tokenHandler = new JwtSecurityTokenHandler(); - var tokenContent = tokenHandler.ReadJwtToken(token); - var validToUtc = tokenContent.ValidTo.ToUniversalTime(); - return validToUtc < DateTime.UtcNow; + public static DateTime GetTokenExpiry(string? token) + { + return JwtHelper.GetTokenExpiry(token); } } diff --git a/API/SignalR/MessageFactory.cs b/API/SignalR/MessageFactory.cs index de9818b79..87a464e6a 100644 --- a/API/SignalR/MessageFactory.cs +++ b/API/SignalR/MessageFactory.cs @@ -1,5 +1,6 @@ using System; using API.DTOs.Update; +using API.Entities.Person; using API.Extensions; using API.Services.Plus; @@ -147,6 +148,14 @@ public static class MessageFactory /// Volume is removed from server /// public const string VolumeRemoved = "VolumeRemoved"; + /// + /// A Person merged has been merged into another + /// + public const string PersonMerged = "PersonMerged"; + /// + /// A Rate limit error was hit when matching a series with Kavita+ + /// + public const string ExternalMatchRateLimitError = "ExternalMatchRateLimitError"; public static SignalRMessage DashboardUpdateEvent(int userId) { @@ -661,4 +670,29 @@ public static class MessageFactory EventType = ProgressEventType.Single, }; } + + public static SignalRMessage PersonMergedMessage(Person dst, Person src) + { + return new SignalRMessage() + { + Name = PersonMerged, + Body = new + { + srcId = src.Id, + dstName = dst.Name, + }, + }; + } + public static SignalRMessage ExternalMatchRateLimitErrorEvent(int seriesId, string seriesName) + { + return new SignalRMessage() + { + Name = ExternalMatchRateLimitError, + Body = new + { + seriesId = seriesId, + seriesName = seriesName, + }, + }; + } } diff --git a/API/Startup.cs b/API/Startup.cs index cf6c7ccfd..f57cb7d01 100644 --- a/API/Startup.cs +++ b/API/Startup.cs @@ -41,6 +41,7 @@ using Microsoft.Extensions.Logging; using Microsoft.Net.Http.Headers; using Microsoft.OpenApi.Models; using Serilog; +using Swashbuckle.AspNetCore.SwaggerGen; using TaskScheduler = API.Services.TaskScheduler; namespace API; @@ -54,6 +55,9 @@ public class Startup { _config = config; _env = env; + + // Disable Hangfire Automatic Retry + GlobalJobFilters.Filters.Add(new AutomaticRetryAttribute { Attempts = 0 }); } // This method gets called by the runtime. Use this method to add services to the container. @@ -137,9 +141,9 @@ public class Startup { c.SwaggerDoc("v1", new OpenApiInfo { - Version = "3.1.0", - Title = "Kavita", - Description = $"Kavita provides a set of APIs that are authenticated by JWT. JWT token can be copied from local storage. Assume all fields of a payload are required. Built against v{BuildInfo.Version.ToString()}", + Version = BuildInfo.Version.ToString(), + Title = $"Kavita", + Description = $"Kavita provides a set of APIs that are authenticated by JWT. JWT token can be copied from local storage. Assume all fields of a payload are required. Built against v{BuildInfo.Version}", License = new OpenApiLicense { Name = "GPL-3.0", @@ -222,7 +226,7 @@ public class Startup // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. public void Configure(IApplicationBuilder app, IBackgroundJobClient backgroundJobs, IWebHostEnvironment env, IHostApplicationLifetime applicationLifetime, IServiceProvider serviceProvider, ICacheService cacheService, - IDirectoryService directoryService, IUnitOfWork unitOfWork, IBackupService backupService, IImageService imageService) + IDirectoryService directoryService, IUnitOfWork unitOfWork, IBackupService backupService, IImageService imageService, IVersionUpdaterService versionService) { var logger = serviceProvider.GetRequiredService>(); @@ -234,9 +238,10 @@ public class Startup // Apply all migrations on startup var dataContext = serviceProvider.GetRequiredService(); - logger.LogInformation("Running Migrations"); + #region Migrations + // v0.7.9 await MigrateUserLibrarySideNavStream.Migrate(unitOfWork, dataContext, logger); @@ -277,13 +282,37 @@ public class Startup await MigrateDuplicateDarkTheme.Migrate(dataContext, logger); await ManualMigrateUnscrobbleBookLibraries.Migrate(dataContext, logger); + // v0.8.5 + await ManualMigrateBlacklistTableToSeries.Migrate(dataContext, logger); + await ManualMigrateInvalidBlacklistSeries.Migrate(dataContext, logger); + await ManualMigrateScrobbleErrors.Migrate(dataContext, logger); + await ManualMigrateNeedsManualMatch.Migrate(dataContext, logger); + await MigrateProgressExportForV085.Migrate(dataContext, directoryService, logger); + + // v0.8.6 + await ManualMigrateScrobbleSpecials.Migrate(dataContext, logger); + await ManualMigrateScrobbleEventGen.Migrate(dataContext, logger); + + // v0.8.7 + await ManualMigrateReadingProfiles.Migrate(dataContext, logger); + + #endregion + // Update the version in the DB after all migrations are run var installVersion = await unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.InstallVersion); + var isVersionDifferent = installVersion.Value != BuildInfo.Version.ToString(); installVersion.Value = BuildInfo.Version.ToString(); unitOfWork.SettingsRepository.Update(installVersion); await unitOfWork.CommitAsync(); logger.LogInformation("Running Migrations - complete"); + + if (isVersionDifferent) + { + // Clear the Github cache so update stuff shows correctly + versionService.BustGithubCache(); + } + }).GetAwaiter() .GetResult(); } diff --git a/API/config/appsettings.Development.json b/API/config/appsettings.Development.json index 83a13e7ce..ad2d89fa5 100644 --- a/API/config/appsettings.Development.json +++ b/API/config/appsettings.Development.json @@ -1,8 +1,8 @@ { "TokenKey": "super secret unguessable key that is longer because we require it", "Port": 5000, - "IpAddresses": "0.0.0.0,::", - "BaseUrl": "/test/", + "IpAddresses": "", + "BaseUrl": "/", "Cache": 75, "AllowIFraming": false } \ No newline at end of file diff --git a/API/config/appsettings.json b/API/config/appsettings.json index 3eeee1c18..c77ff6a30 100644 --- a/API/config/appsettings.json +++ b/API/config/appsettings.json @@ -3,5 +3,5 @@ "Port": 5000, "IpAddresses": "", "BaseUrl": "/", - "Cache": 50 + "Cache": 75 } diff --git a/API/config/templates/EmailPasswordReset.html b/API/config/templates/EmailPasswordReset.html index 2486d3a60..7ac7dc315 100644 --- a/API/config/templates/EmailPasswordReset.html +++ b/API/config/templates/EmailPasswordReset.html @@ -199,7 +199,7 @@
-
Email confirmation is required for continued access. Click the button to confirm your email.
+
{{Preheader}}
+ + + + + + + Kavita - [Plain HTML] + + + + + + + + + + + + + + + + + + + + + + +
+ +
{{Preheader}}
+ + + +
+ + + diff --git a/API/config/templates/TokenExpiringSoon.html b/API/config/templates/TokenExpiringSoon.html new file mode 100644 index 000000000..eac990260 --- /dev/null +++ b/API/config/templates/TokenExpiringSoon.html @@ -0,0 +1,344 @@ + + + + + + + + + + + + + Kavita - [Plain HTML] + + + + + + + + + + + + + + + + + + + + + + +
+ +
{{Preheader}}
+ + + +
+ + + diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 43cd2e208..292217862 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,7 +13,7 @@ Setup guides, FAQ, the more information we have on the [wiki](https://wiki.kavit - HTML/Javascript editor of choice (VS Code/Sublime Text/Webstorm/Atom/etc) - [Git](https://git-scm.com/downloads) - [NodeJS](https://nodejs.org/en/download/) (Node 18.13.X or higher) -- .NET 8.0+ +- .NET 9.0+ - dotnet tool install -g Swashbuckle.AspNetCore.Cli ### Getting started ### diff --git a/Dockerfile b/Dockerfile index 6d52acaba..bfc253c0e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,8 @@ RUN mkdir /files COPY _output/*.tar.gz /files/ COPY UI/Web/dist/browser /files/wwwroot COPY copy_runtime.sh /copy_runtime.sh + +RUN chmod +x /copy_runtime.sh RUN /copy_runtime.sh RUN chmod +x /Kavita/Kavita @@ -34,6 +36,7 @@ WORKDIR /kavita HEALTHCHECK --interval=30s --timeout=15s --start-period=30s --retries=3 CMD curl -fsS http://localhost:5000/api/health || exit 1 +# Enable detection of running in a container ENV DOTNET_RUNNING_IN_CONTAINER=true ENTRYPOINT [ "/bin/bash" ] diff --git a/Kavita.Common/Configuration.cs b/Kavita.Common/Configuration.cs index ca0fc40ec..ba4fd09b7 100644 --- a/Kavita.Common/Configuration.cs +++ b/Kavita.Common/Configuration.cs @@ -16,7 +16,9 @@ public static class Configuration public const long DefaultCacheMemory = 75; private static readonly string AppSettingsFilename = Path.Join("config", GetAppSettingFilename()); - public static string KavitaPlusApiUrl = "https://plus.kavitareader.com"; + public static readonly string KavitaPlusApiUrl = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") == Environments.Development + ? "https://plus.kavitareader.com" : "https://plus.kavitareader.com"; // http://localhost:5020 + public static readonly string StatsApiUrl = "https://stats.kavitareader.com"; public static int Port { @@ -314,6 +316,7 @@ public static class Configuration { public string TokenKey { get; set; } // ReSharper disable once MemberHidesStaticFromOuterClass +#pragma warning disable S3218 public int Port { get; set; } = DefaultHttpPort; // ReSharper disable once MemberHidesStaticFromOuterClass public string IpAddresses { get; set; } = string.Empty; @@ -322,6 +325,7 @@ public static class Configuration // ReSharper disable once MemberHidesStaticFromOuterClass public long Cache { get; set; } = DefaultCacheMemory; // ReSharper disable once MemberHidesStaticFromOuterClass - public bool AllowIFraming { get; set; } = false; + public bool AllowIFraming { get; init; } = false; +#pragma warning restore S3218 } } diff --git a/Kavita.Common/Helpers/CronHelper.cs b/Kavita.Common/Helpers/CronHelper.cs index 77a4e934e..0b40113ce 100644 --- a/Kavita.Common/Helpers/CronHelper.cs +++ b/Kavita.Common/Helpers/CronHelper.cs @@ -13,7 +13,7 @@ public static class CronHelper CronExpression.Parse(cronExpression); return true; } - catch (Exception ex) + catch (Exception) { /* Swallow */ return false; diff --git a/Kavita.Common/Helpers/FlurlConfiguration.cs b/Kavita.Common/Helpers/FlurlConfiguration.cs new file mode 100644 index 000000000..b80dff8d9 --- /dev/null +++ b/Kavita.Common/Helpers/FlurlConfiguration.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections.Generic; +using System.Threading; +using Flurl.Http; + +namespace Kavita.Common.Helpers; + +/// +/// Helper class for configuring Flurl client for a specific URL. +/// +public static class FlurlConfiguration +{ + private static readonly List ConfiguredClients = new List(); + private static readonly Lock Lock = new Lock(); + + /// + /// Configures the Flurl client for the specified URL. + /// + /// The URL to configure the client for. + public static void ConfigureClientForUrl(string url) + { + //Important client are mapped without path, per example two urls pointing to the same host:port but different path, will use the same client. + lock (Lock) + { + var ur = new Uri(url); + //key is host:port + var host = ur.Host + ":" + ur.Port; + if (ConfiguredClients.Contains(host)) return; + + FlurlHttp.ConfigureClientForUrl(url).ConfigureInnerHandler(cli => +#pragma warning disable S4830 + cli.ServerCertificateCustomValidationCallback = (_, _, _, _) => true); +#pragma warning restore S4830 + + ConfiguredClients.Add(host); + } + } +} diff --git a/Kavita.Common/Helpers/UntrustedCertClientFactory.cs b/Kavita.Common/Helpers/UntrustedCertClientFactory.cs deleted file mode 100644 index 6ddb2a9f3..000000000 --- a/Kavita.Common/Helpers/UntrustedCertClientFactory.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Net.Http; -using Flurl.Http.Configuration; - -namespace Kavita.Common.Helpers; - -public class UntrustedCertClientFactory : DefaultHttpClientFactory -{ - public override HttpMessageHandler CreateMessageHandler() { - return new HttpClientHandler { - ServerCertificateCustomValidationCallback = (_, _, _, _) => true - }; - } -} diff --git a/Kavita.Common/Kavita.Common.csproj b/Kavita.Common/Kavita.Common.csproj index 514944aa9..c7dd0ab94 100644 --- a/Kavita.Common/Kavita.Common.csproj +++ b/Kavita.Common/Kavita.Common.csproj @@ -1,23 +1,23 @@ - net8.0 + net9.0 kavitareader.com Kavita - 0.8.4.4 + 0.8.7.1 en true - + - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + \ No newline at end of file diff --git a/Kavita.sln.DotSettings b/Kavita.sln.DotSettings index 92adaa72f..b46c328cd 100644 --- a/Kavita.sln.DotSettings +++ b/Kavita.sln.DotSettings @@ -2,9 +2,13 @@ ExplicitlyExcluded True True + True + True + True True True True + True True True True diff --git a/README.md b/README.md index 0c083b900..ffff8d831 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ your reading collection with your friends and family! - Rich web readers supporting webtoon, continuous reading mode (continue without leaving the reader), virtual pages (epub), etc - Ability to customize your dashboard and side nav with smart filters, custom order and visibility toggles - Full Localization Support +- Ability to download metadata (available via [Kavita+](https://wiki.kavitareader.com/kavita+)) ## Support @@ -40,7 +41,7 @@ your reading collection with your friends and family! ## Demo If you want to try out Kavita, a demo is available: -[https://demo.kavitareader.com/](https://demo.kavitareader.com/) +[https://demo.kavitareader.com/](https://demo.kavitareader.com/login?apiKey=9003cf99-9213-4206-a787-af2fe4cc5f1f) ``` Username: demouser Password: Demouser64 @@ -49,7 +50,7 @@ Password: Demouser64 ## Setup The easiest way to get started is to visit our Wiki which has up-to-date information on a variety of install methods and platforms. -[https://wiki.kavitareader.com/installation/getting-started](https://wiki.kavitareader.com/installation/getting-started) +[https://wiki.kavitareader.com/getting-started](https://wiki.kavitareader.com/getting-started) ## Feature Requests Got a great idea? Throw it up on [Discussions](https://github.com/Kareadita/Kavita/discussions/2529) or vote on another idea. Many great features in Kavita are driven by our community. @@ -106,13 +107,10 @@ Support this project by becoming a sponsor. Your logo will show up here with a l ## Mega Sponsors -## JetBrains -Thank you to [ JetBrains](http://www.jetbrains.com/) for providing us with free licenses to their great tools. - -* [ Rider](http://www.jetbrains.com/rider/) +## Powered By +[![JetBrains logo.](https://resources.jetbrains.com/storage/products/company/brand/logos/jetbrains.svg)](https://jb.gg/OpenSource) ### License - * [GNU GPL v3](http://www.gnu.org/licenses/gpl.html) * Copyright 2020-2024 diff --git a/TestData b/TestData deleted file mode 160000 index 4f5750025..000000000 --- a/TestData +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4f5750025a1c0b48cd72eaa6f1b61642c41f147f diff --git a/UI/Web/.editorconfig b/UI/Web/.editorconfig index 2c6908b84..28045b9af 100644 --- a/UI/Web/.editorconfig +++ b/UI/Web/.editorconfig @@ -8,6 +8,12 @@ indent_size = 4 insert_final_newline = true trim_trailing_whitespace = true +[*.json] +indent_size = 2 + +[en.json] +indent_size = 4 + [*.html] indent_size = 2 diff --git a/UI/Web/.gitignore b/UI/Web/.gitignore index 92096907b..8132126c9 100644 --- a/UI/Web/.gitignore +++ b/UI/Web/.gitignore @@ -2,6 +2,4 @@ node_modules/ test-results/ playwright-report/ i18n-cache-busting.json -/playwright-report/ -/blob-report/ -/playwright/.cache/ +e2e-tests/environments/environment.local.ts diff --git a/UI/Web/angular.json b/UI/Web/angular.json index a45f8d9bf..1ce56fa2e 100644 --- a/UI/Web/angular.json +++ b/UI/Web/angular.json @@ -56,7 +56,12 @@ }, "extractLicenses": false, "optimization": false, - "namedChunks": true + "namedChunks": true, + "stylePreprocessorOptions": { + "sass": { + "silenceDeprecations": ["mixed-decls", "color-functions", "global-builtin", "import"] + } + } }, "configurations": { "production": { diff --git a/UI/Web/e2e-tests/environment.ts b/UI/Web/e2e-tests/environment.ts deleted file mode 100644 index 0c16ed522..000000000 --- a/UI/Web/e2e-tests/environment.ts +++ /dev/null @@ -1,8 +0,0 @@ -/** - * This is public information - create a environment.local.ts file and use admin account there - */ -export const environment = { - baseUrl: 'https://demo.kavitareader.com/', - username: 'demouser', - password: 'Demouser64', -}; diff --git a/UI/Web/e2e-tests/example.spec.ts b/UI/Web/e2e-tests/example.spec.ts deleted file mode 100644 index 54a906a4e..000000000 --- a/UI/Web/e2e-tests/example.spec.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { test, expect } from '@playwright/test'; - -test('has title', async ({ page }) => { - await page.goto('https://playwright.dev/'); - - // Expect a title "to contain" a substring. - await expect(page).toHaveTitle(/Playwright/); -}); - -test('get started link', async ({ page }) => { - await page.goto('https://playwright.dev/'); - - // Click the get started link. - await page.getByRole('link', { name: 'Get started' }).click(); - - // Expects page to have a heading with the name of Installation. - await expect(page.getByRole('heading', { name: 'Installation' })).toBeVisible(); -}); diff --git a/UI/Web/e2e-tests/pages/login-page.ts b/UI/Web/e2e-tests/pages/login-page.ts deleted file mode 100644 index 9501081e7..000000000 --- a/UI/Web/e2e-tests/pages/login-page.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { Page } from '@playwright/test'; - -export class LoginPage { - readonly page: Page; - - constructor(page: Page) { - this.page = page; - } - - async navigate() { - await this.page.goto('/login'); - } - - async login(username: string, password: string) { - await this.page.fill('input[formControlName="username"]', username); - await this.page.fill('input[formControlName="password"]', password); - await this.page.click('button[type="submit"]'); - } -} diff --git a/UI/Web/e2e-tests/tests/Login/login.spec.ts b/UI/Web/e2e-tests/tests/Login/login.spec.ts deleted file mode 100644 index fc5ce626c..000000000 --- a/UI/Web/e2e-tests/tests/Login/login.spec.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { test, expect } from '@playwright/test'; -import { LoginPage } from 'e2e-tests/pages/login-page'; -import {environment} from "../../environment"; - - -test('has title', async ({ page }) => { - await page.goto(environment.baseUrl); - - // Expect a title "to contain" a substring. - await expect(page).toHaveTitle(/Kavita/); -}); - -test('login functionality', async ({ page }) => { - // Navigate to the login page - await page.goto(environment.baseUrl); - - // Verify the page title - await expect(page).toHaveTitle(/Kavita/); - - const loginPage = new LoginPage(page); - //await loginPage.navigate(); - await loginPage.login(environment.username, environment.password); - - // Verify successful login by checking for Home on side nav - await expect(page.locator('#null')).toBeVisible(); -}); diff --git a/UI/Web/package-lock.json b/UI/Web/package-lock.json index 35486bc5c..cfce8cded 100644 --- a/UI/Web/package-lock.json +++ b/UI/Web/package-lock.json @@ -8,66 +8,66 @@ "name": "kavita-webui", "version": "0.7.12.1", "dependencies": { - "@angular-slider/ngx-slider": "^18.0.0", - "@angular/animations": "^18.2.9", - "@angular/cdk": "^18.2.10", - "@angular/common": "^18.2.9", - "@angular/compiler": "^18.2.9", - "@angular/core": "^18.2.9", - "@angular/forms": "^18.2.9", - "@angular/localize": "^18.2.9", - "@angular/platform-browser": "^18.2.9", - "@angular/platform-browser-dynamic": "^18.2.9", - "@angular/router": "^18.2.9", - "@fortawesome/fontawesome-free": "^6.6.0", - "@iharbeck/ngx-virtual-scroller": "^17.0.2", - "@iplab/ngx-file-upload": "^18.0.0", - "@jsverse/transloco": "^7.5.0", + "@angular-slider/ngx-slider": "^19.0.0", + "@angular/animations": "^19.2.5", + "@angular/cdk": "^19.2.8", + "@angular/common": "^19.2.5", + "@angular/compiler": "^19.2.5", + "@angular/core": "^19.2.5", + "@angular/forms": "^19.2.5", + "@angular/localize": "^19.2.5", + "@angular/platform-browser": "^19.2.5", + "@angular/platform-browser-dynamic": "^19.2.5", + "@angular/router": "^19.2.5", + "@fortawesome/fontawesome-free": "^6.7.2", + "@iharbeck/ngx-virtual-scroller": "^19.0.1", + "@iplab/ngx-file-upload": "^19.0.3", + "@jsverse/transloco": "^7.6.1", "@jsverse/transloco-locale": "^7.0.1", "@jsverse/transloco-persist-lang": "^7.0.2", "@jsverse/transloco-persist-translations": "^7.0.1", "@jsverse/transloco-preload-langs": "^7.0.1", "@microsoft/signalr": "^8.0.7", - "@ng-bootstrap/ng-bootstrap": "^17.0.1", + "@ng-bootstrap/ng-bootstrap": "^18.0.0", "@popperjs/core": "^2.11.7", - "@swimlane/ngx-charts": "^20.5.0", - "@tweenjs/tween.js": "^23.1.3", + "@siemens/ngx-datatable": "^22.4.1", + "@swimlane/ngx-charts": "^22.0.0-alpha.0", + "@tweenjs/tween.js": "^25.0.0", "bootstrap": "^5.3.2", "charts.css": "^1.1.0", "file-saver": "^2.0.5", - "luxon": "^3.5.0", + "luxon": "^3.6.1", "ng-circle-progress": "^1.7.1", "ng-lazyload-image": "^9.1.3", - "ng-select2-component": "^14.0.1", - "ngx-color-picker": "^17.0.0", - "ngx-extended-pdf-viewer": "^21.4.6", + "ng-select2-component": "^17.2.4", + "ngx-color-picker": "^19.0.0", + "ngx-extended-pdf-viewer": "^23.0.0-alpha.7", "ngx-file-drop": "^16.0.0", "ngx-stars": "^1.6.5", "ngx-toastr": "^19.0.0", "nosleep.js": "^0.12.0", - "rxjs": "^7.8.0", + "rxjs": "^7.8.2", "screenfull": "^6.0.2", "swiper": "^8.4.6", - "tslib": "^2.8.0", - "zone.js": "^0.14.10" + "tslib": "^2.8.1", + "zone.js": "^0.15.0" }, "devDependencies": { - "@angular-eslint/builder": "^18.4.0", - "@angular-eslint/eslint-plugin": "^18.4.0", - "@angular-eslint/eslint-plugin-template": "^18.4.0", - "@angular-eslint/schematics": "^18.4.0", - "@angular-eslint/template-parser": "^18.4.0", - "@angular/build": "^18.2.10", - "@angular/cli": "^18.2.10", - "@angular/compiler-cli": "^18.2.9", - "@playwright/test": "^1.49.0", + "@angular-eslint/builder": "^19.3.0", + "@angular-eslint/eslint-plugin": "^19.3.0", + "@angular-eslint/eslint-plugin-template": "^19.3.0", + "@angular-eslint/schematics": "^19.3.0", + "@angular-eslint/template-parser": "^19.3.0", + "@angular/build": "^19.2.6", + "@angular/cli": "^19.2.6", + "@angular/compiler-cli": "^19.2.5", "@types/d3": "^7.4.3", "@types/file-saver": "^2.0.7", - "@types/luxon": "^3.4.0", - "@types/node": "^22.8.0", - "@typescript-eslint/eslint-plugin": "^8.11.0", - "@typescript-eslint/parser": "^8.11.0", - "eslint": "^8.57.0", + "@types/luxon": "^3.6.2", + "@types/node": "^22.13.13", + "@typescript-eslint/eslint-plugin": "^8.28.0", + "@typescript-eslint/parser": "^8.28.0", + "eslint": "^9.23.0", "jsonminify": "^0.4.2", "karma-coverage": "~2.2.0", "ts-node": "~10.9.1", @@ -97,12 +97,12 @@ } }, "node_modules/@angular-devkit/architect": { - "version": "0.1802.10", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.10.tgz", - "integrity": "sha512-/xudcHK2s4J/GcL6qyobmGaWMHQcYLSMqCaWMT+nK6I6tu9VEAj/p3R83Tzx8B/eKi31Pz499uHw9pmqdtbafg==", + "version": "0.1902.6", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1902.6.tgz", + "integrity": "sha512-Dx6yPxpaE5AhP6UtrVRDCc9Ihq9B65LAbmIh3dNOyeehratuaQS0TYNKjbpaevevJojW840DTg80N+CrlfYp9g==", "dev": true, "dependencies": { - "@angular-devkit/core": "18.2.10", + "@angular-devkit/core": "19.2.6", "rxjs": "7.8.1" }, "engines": { @@ -111,10 +111,19 @@ "yarn": ">= 1.13.0" } }, + "node_modules/@angular-devkit/architect/node_modules/rxjs": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", + "dev": true, + "dependencies": { + "tslib": "^2.1.0" + } + }, "node_modules/@angular-devkit/core": { - "version": "18.2.10", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.10.tgz", - "integrity": "sha512-LFqiNdraBujg8e1lhuB0bkFVAoIbVbeXXwfoeROKH60OPbP8tHdgV6sFTqU7UGBKA+b+bYye70KFTG2Ys8QzKQ==", + "version": "19.2.6", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-19.2.6.tgz", + "integrity": "sha512-WFgiYhrDMq83UNaGRAneIM7CYYdBozD+yYA9BjoU8AgBLKtrvn6S8ZcjKAk5heoHtY/u8pEb0mwDTz9gxFmJZQ==", "dev": true, "dependencies": { "ajv": "8.17.1", @@ -130,7 +139,7 @@ "yarn": ">= 1.13.0" }, "peerDependencies": { - "chokidar": "^3.5.2" + "chokidar": "^4.0.0" }, "peerDependenciesMeta": { "chokidar": { @@ -138,32 +147,24 @@ } } }, - "node_modules/@angular-devkit/core/node_modules/ajv-formats": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz", - "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==", + "node_modules/@angular-devkit/core/node_modules/rxjs": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "dev": true, "dependencies": { - "ajv": "^8.0.0" - }, - "peerDependencies": { - "ajv": "^8.0.0" - }, - "peerDependenciesMeta": { - "ajv": { - "optional": true - } + "tslib": "^2.1.0" } }, "node_modules/@angular-devkit/schematics": { - "version": "18.2.10", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.10.tgz", - "integrity": "sha512-EIm/yCYg3ZYPsPYJxXRX5F6PofJCbNQ5rZEuQEY09vy+ZRTqGezH0qoUP5WxlYeJrjiRLYqADI9WtVNzDyaD4w==", + "version": "19.2.6", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-19.2.6.tgz", + "integrity": "sha512-YTAxNnT++5eflx19OUHmOWu597/TbTel+QARiZCv1xQw99+X8DCKKOUXtqBRd53CAHlREDI33Rn/JLY3NYgMLQ==", "dev": true, "dependencies": { - "@angular-devkit/core": "18.2.10", + "@angular-devkit/core": "19.2.6", "jsonc-parser": "3.3.1", - "magic-string": "0.30.11", + "magic-string": "0.30.17", "ora": "5.4.1", "rxjs": "7.8.1" }, @@ -173,30 +174,43 @@ "yarn": ">= 1.13.0" } }, - "node_modules/@angular-eslint/builder": { - "version": "18.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-18.4.0.tgz", - "integrity": "sha512-FOzGHX/nHSV1wSduSsabsx3aqC1nfde0opEpEDSOJhxExDxKCwoS1XPy1aERGyKip4ZVA6phC3dLtoBH3QMkVQ==", + "node_modules/@angular-devkit/schematics/node_modules/rxjs": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "dev": true, + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@angular-eslint/builder": { + "version": "19.3.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-19.3.0.tgz", + "integrity": "sha512-j9xNrzZJq29ONSG6EaeQHve0Squkm6u6Dm8fZgWP7crTFOrtLXn7Wxgxuyl9eddpbWY1Ov1gjFuwBVnxIdyAqg==", + "dev": true, + "dependencies": { + "@angular-devkit/architect": ">= 0.1900.0 < 0.2000.0", + "@angular-devkit/core": ">= 19.0.0 < 20.0.0" + }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0", "typescript": "*" } }, "node_modules/@angular-eslint/bundled-angular-compiler": { - "version": "18.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-18.4.0.tgz", - "integrity": "sha512-HlFHt2qgdd+jqyVIkCXmrjHauXo/XY3Rp0UNabk83ejGi/raM/6lEFI7iFWzHxLyiAKk4OgGI5W26giSQw991A==", + "version": "19.3.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-19.3.0.tgz", + "integrity": "sha512-63Zci4pvnUR1iSkikFlNbShF1tO5HOarYd8fvNfmOZwFfZ/1T3j3bCy9YbE+aM5SYrWqPaPP/OcwZ3wJ8WNvqA==", "dev": true }, "node_modules/@angular-eslint/eslint-plugin": { - "version": "18.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-18.4.0.tgz", - "integrity": "sha512-Saz9lkWPN3da7ZKW17UsOSN7DeY+TPh+wz/6GCNZCh67Uw2wvMC9agb+4hgpZNXYCP5+u7erqzxQmBoWnS/A+A==", + "version": "19.3.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-19.3.0.tgz", + "integrity": "sha512-nBLslLI20KnVbqlfNW7GcnI9R6cYCvRGjOE2QYhzxM316ciAQ62tvQuXP9ZVnRBLSKDAVnMeC0eTq9O4ysrxrQ==", "dev": true, "dependencies": { - "@angular-eslint/bundled-angular-compiler": "18.4.0", - "@angular-eslint/utils": "18.4.0" + "@angular-eslint/bundled-angular-compiler": "19.3.0", + "@angular-eslint/utils": "19.3.0" }, "peerDependencies": { "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", @@ -205,13 +219,13 @@ } }, "node_modules/@angular-eslint/eslint-plugin-template": { - "version": "18.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-18.4.0.tgz", - "integrity": "sha512-n3uZFCy76DnggPqjSVFV3gYD1ik7jCG28o2/HO4kobcMNKnwW8XAlFUagQ4TipNQh7fQiAefsEqvv2quMsYDVw==", + "version": "19.3.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-19.3.0.tgz", + "integrity": "sha512-WyouppTpOYut+wvv13wlqqZ8EHoDrCZxNfGKuEUYK1BPmQlTB8EIZfQH4iR1rFVS28Rw+XRIiXo1x3oC0SOfnA==", "dev": true, "dependencies": { - "@angular-eslint/bundled-angular-compiler": "18.4.0", - "@angular-eslint/utils": "18.4.0", + "@angular-eslint/bundled-angular-compiler": "19.3.0", + "@angular-eslint/utils": "19.3.0", "aria-query": "5.3.2", "axobject-query": "4.1.0" }, @@ -222,58 +236,37 @@ "typescript": "*" } }, - "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@angular-eslint/utils": { - "version": "18.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-18.4.0.tgz", - "integrity": "sha512-At1yS8GRviGBoaupiQwEOL4/IcZJCE/+2vpXdItMWPGB1HWetxlKAUZTMmIBX/r5Z7CoXxl+LbqpGhrhyzIQAg==", - "dev": true, - "dependencies": { - "@angular-eslint/bundled-angular-compiler": "18.4.0" - }, - "peerDependencies": { - "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", - "eslint": "^8.57.0 || ^9.0.0", - "typescript": "*" - } - }, - "node_modules/@angular-eslint/eslint-plugin/node_modules/@angular-eslint/utils": { - "version": "18.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-18.4.0.tgz", - "integrity": "sha512-At1yS8GRviGBoaupiQwEOL4/IcZJCE/+2vpXdItMWPGB1HWetxlKAUZTMmIBX/r5Z7CoXxl+LbqpGhrhyzIQAg==", - "dev": true, - "dependencies": { - "@angular-eslint/bundled-angular-compiler": "18.4.0" - }, - "peerDependencies": { - "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", - "eslint": "^8.57.0 || ^9.0.0", - "typescript": "*" - } - }, "node_modules/@angular-eslint/schematics": { - "version": "18.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-18.4.0.tgz", - "integrity": "sha512-ssqe+0YCfekbWIXNdCrHfoPK/bPZAWybs0Bn/b99dfd8h8uyXkERo9AzIOx4Uyj/08SkP9aPL/0uOOEHDsRGwQ==", + "version": "19.3.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-19.3.0.tgz", + "integrity": "sha512-Wl5sFQ4t84LUb8mJ2iVfhYFhtF55IugXu7rRhPHtgIu9Ty5s1v3HGUx4LKv51m2kWhPPeFOTmjeBv1APzFlmnQ==", "dev": true, "dependencies": { - "@angular-eslint/eslint-plugin": "18.4.0", - "@angular-eslint/eslint-plugin-template": "18.4.0", - "ignore": "5.3.2", - "semver": "7.6.3", + "@angular-devkit/core": ">= 19.0.0 < 20.0.0", + "@angular-devkit/schematics": ">= 19.0.0 < 20.0.0", + "@angular-eslint/eslint-plugin": "19.3.0", + "@angular-eslint/eslint-plugin-template": "19.3.0", + "ignore": "7.0.3", + "semver": "7.7.1", "strip-json-comments": "3.1.1" - }, - "peerDependencies": { - "@angular-devkit/core": ">= 18.0.0 < 19.0.0", - "@angular-devkit/schematics": ">= 18.0.0 < 19.0.0" + } + }, + "node_modules/@angular-eslint/schematics/node_modules/ignore": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.3.tgz", + "integrity": "sha512-bAH5jbK/F3T3Jls4I0SO1hmPR0dKU0a7+SY6n1yzRtG54FLO8d6w/nxLFX2Nb7dBu6cCWXPaAME6cYqFUMmuCA==", + "dev": true, + "engines": { + "node": ">= 4" } }, "node_modules/@angular-eslint/template-parser": { - "version": "18.4.0", - "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-18.4.0.tgz", - "integrity": "sha512-VTep3Xd3IOaRIPL+JN/TV4/2DqUPbjtF3TNY15diD/llnrEhqFnmsvMihexbQyTqzOG+zU554oK44YfvAtHOrw==", + "version": "19.3.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-19.3.0.tgz", + "integrity": "sha512-VxMNgsHXMWbbmZeBuBX5i8pzsSSEaoACVpaE+j8Muk60Am4Mxc0PytJm4n3znBSvI3B7Kq2+vStSRYPkOER4lA==", "dev": true, "dependencies": { - "@angular-eslint/bundled-angular-compiler": "18.4.0", + "@angular-eslint/bundled-angular-compiler": "19.3.0", "eslint-scope": "^8.0.2" }, "peerDependencies": { @@ -281,25 +274,39 @@ "typescript": "*" } }, + "node_modules/@angular-eslint/utils": { + "version": "19.3.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-19.3.0.tgz", + "integrity": "sha512-ovvbQh96FIJfepHqLCMdKFkPXr3EbcvYc9kMj9hZyIxs/9/VxwPH7x25mMs4VsL6rXVgH2FgG5kR38UZlcTNNw==", + "dev": true, + "dependencies": { + "@angular-eslint/bundled-angular-compiler": "19.3.0" + }, + "peerDependencies": { + "@typescript-eslint/utils": "^7.11.0 || ^8.0.0", + "eslint": "^8.57.0 || ^9.0.0", + "typescript": "*" + } + }, "node_modules/@angular-slider/ngx-slider": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/@angular-slider/ngx-slider/-/ngx-slider-18.0.0.tgz", - "integrity": "sha512-QR5zP3B++cLCqUkfg7j65y+4wrt5xPrua6mANoClj2iaoHaAzf3qi+/ANgYTeZ9StoFu22r35uy5Qg0GigjhxQ==", + "version": "19.0.0", + "resolved": "https://registry.npmjs.org/@angular-slider/ngx-slider/-/ngx-slider-19.0.0.tgz", + "integrity": "sha512-VVJ+Fij5SKnbltxh6TdoBAUAKWfCnSLRPZ7e+r2uO88t8qte5/KHqVOdK4DWCjBr3rEr4YrPR4ylqBCuAWPsKQ==", "dependencies": { "detect-passive-events": "^2.0.3", "rxjs": "^7.8.1", "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/common": "^18.0.0", - "@angular/core": "^18.0.0", - "@angular/forms": "^18.0.0" + "@angular/common": "^19.0.0", + "@angular/core": "^19.0.0", + "@angular/forms": "^19.0.0" } }, "node_modules/@angular/animations": { - "version": "18.2.9", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.2.9.tgz", - "integrity": "sha512-GAsTKENoTRVKgXX4ACBMMTp8SW4rW8u637uLag+ttJV2XBzC3YJlw5m6b/W4cdrmqZjztoEwUjR6CUTjBqMujQ==", + "version": "19.2.5", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-19.2.5.tgz", + "integrity": "sha512-m4RtY3z1JuHFCh6OrOHxo25oKEigBDdR/XmdCfXIwfTiObZzNA7VQhysgdrb9IISO99kXbjZUYKDtLzgWT8Klg==", "dependencies": { "tslib": "^2.3.0" }, @@ -307,55 +314,64 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/core": "18.2.9" + "@angular/common": "19.2.5", + "@angular/core": "19.2.5" } }, "node_modules/@angular/build": { - "version": "18.2.10", - "resolved": "https://registry.npmjs.org/@angular/build/-/build-18.2.10.tgz", - "integrity": "sha512-YFBKvAyC5sH17yRYcx7VHCtJ4KUg7xCjCQ4Pe16kiTvW6vuYsgU6Btyti0Qgewd7XaWpTM8hk8N6hE4Z0hpflw==", + "version": "19.2.6", + "resolved": "https://registry.npmjs.org/@angular/build/-/build-19.2.6.tgz", + "integrity": "sha512-+VBLb4ZPLswwJmgfsTFzGex+Sq/WveNc+uaIWyHYjwnuI17NXe1qAAg1rlp72CqGn0cirisfOyAUwPc/xZAgTg==", "dev": true, "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "0.1802.10", - "@babel/core": "7.25.2", - "@babel/helper-annotate-as-pure": "7.24.7", + "@angular-devkit/architect": "0.1902.6", + "@babel/core": "7.26.10", + "@babel/helper-annotate-as-pure": "7.25.9", "@babel/helper-split-export-declaration": "7.24.7", - "@babel/plugin-syntax-import-attributes": "7.24.7", - "@inquirer/confirm": "3.1.22", - "@vitejs/plugin-basic-ssl": "1.1.0", + "@babel/plugin-syntax-import-attributes": "7.26.0", + "@inquirer/confirm": "5.1.6", + "@vitejs/plugin-basic-ssl": "1.2.0", + "beasties": "0.2.0", "browserslist": "^4.23.0", - "critters": "0.0.24", - "esbuild": "0.23.0", - "fast-glob": "3.3.2", - "https-proxy-agent": "7.0.5", - "listr2": "8.2.4", - "lmdb": "3.0.13", - "magic-string": "0.30.11", - "mrmime": "2.0.0", + "esbuild": "0.25.1", + "fast-glob": "3.3.3", + "https-proxy-agent": "7.0.6", + "istanbul-lib-instrument": "6.0.3", + "listr2": "8.2.5", + "magic-string": "0.30.17", + "mrmime": "2.0.1", "parse5-html-rewriting-stream": "7.0.0", "picomatch": "4.0.2", - "piscina": "4.6.1", - "rollup": "4.22.4", - "sass": "1.77.6", - "semver": "7.6.3", - "vite": "5.4.6", - "watchpack": "2.4.1" + "piscina": "4.8.0", + "rollup": "4.34.8", + "sass": "1.85.0", + "semver": "7.7.1", + "source-map-support": "0.5.21", + "vite": "6.2.4", + "watchpack": "2.4.2" }, "engines": { "node": "^18.19.1 || ^20.11.1 || >=22.0.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" }, + "optionalDependencies": { + "lmdb": "3.2.6" + }, "peerDependencies": { - "@angular/compiler-cli": "^18.0.0", - "@angular/localize": "^18.0.0", - "@angular/platform-server": "^18.0.0", - "@angular/service-worker": "^18.0.0", + "@angular/compiler": "^19.0.0 || ^19.2.0-next.0", + "@angular/compiler-cli": "^19.0.0 || ^19.2.0-next.0", + "@angular/localize": "^19.0.0 || ^19.2.0-next.0", + "@angular/platform-server": "^19.0.0 || ^19.2.0-next.0", + "@angular/service-worker": "^19.0.0 || ^19.2.0-next.0", + "@angular/ssr": "^19.2.6", + "karma": "^6.4.0", "less": "^4.2.0", + "ng-packagr": "^19.0.0 || ^19.2.0-next.0", "postcss": "^8.4.0", - "tailwindcss": "^2.0.0 || ^3.0.0", - "typescript": ">=5.4 <5.6" + "tailwindcss": "^2.0.0 || ^3.0.0 || ^4.0.0", + "typescript": ">=5.5 <5.9" }, "peerDependenciesMeta": { "@angular/localize": { @@ -367,9 +383,18 @@ "@angular/service-worker": { "optional": true }, + "@angular/ssr": { + "optional": true + }, + "karma": { + "optional": true + }, "less": { "optional": true }, + "ng-packagr": { + "optional": true + }, "postcss": { "optional": true }, @@ -378,43 +403,102 @@ } } }, - "node_modules/@angular/cdk": { - "version": "18.2.10", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-18.2.10.tgz", - "integrity": "sha512-Weh0slrfWNp5N6UO4m3tXzs2QBFexNsnJf1dq0oaLDBgfkuqUmxdCkurSv5+lWZRkTPLYmd/hQeJpvrhxMCleg==", + "node_modules/@angular/build/node_modules/@babel/core": { + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz", + "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==", + "dev": true, "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.26.2", + "@babel/generator": "^7.26.10", + "@babel/helper-compilation-targets": "^7.26.5", + "@babel/helper-module-transforms": "^7.26.0", + "@babel/helpers": "^7.26.10", + "@babel/parser": "^7.26.10", + "@babel/template": "^7.26.9", + "@babel/traverse": "^7.26.10", + "@babel/types": "^7.26.10", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@angular/build/node_modules/@babel/core/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@angular/build/node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true + }, + "node_modules/@angular/build/node_modules/istanbul-lib-instrument": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", + "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", + "dev": true, + "dependencies": { + "@babel/core": "^7.23.9", + "@babel/parser": "^7.23.9", + "@istanbuljs/schema": "^0.1.3", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^7.5.4" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@angular/cdk": { + "version": "19.2.8", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-19.2.8.tgz", + "integrity": "sha512-ZZqWVYFF80TdjWkk2sc9Pn2luhiYeC78VH3Yjeln4wXMsTGDsvKPBcuOxSxxpJ31saaVBehDjBUuXMqGRj8KuA==", + "dependencies": { + "parse5": "^7.1.2", "tslib": "^2.3.0" }, - "optionalDependencies": { - "parse5": "^7.1.2" - }, "peerDependencies": { - "@angular/common": "^18.0.0 || ^19.0.0", - "@angular/core": "^18.0.0 || ^19.0.0", + "@angular/common": "^19.0.0 || ^20.0.0", + "@angular/core": "^19.0.0 || ^20.0.0", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/cli": { - "version": "18.2.10", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-18.2.10.tgz", - "integrity": "sha512-qW/F3XVZMzzenFzbn+7FGpw8GOt9qW8UxBtYya7gUNdWlcsgGUk+ZaGC2OLbfI5gX6pchW4TOPMsDSMeaCEI2Q==", + "version": "19.2.6", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-19.2.6.tgz", + "integrity": "sha512-eZhFOSsDUHKaciwcWdU5C54ViAvPPdZJf42So93G2vZWDtEq6Uk47huocn1FY9cMhDvURfYLNrrLMpUDtUSsSA==", "dev": true, "dependencies": { - "@angular-devkit/architect": "0.1802.10", - "@angular-devkit/core": "18.2.10", - "@angular-devkit/schematics": "18.2.10", - "@inquirer/prompts": "5.3.8", - "@listr2/prompt-adapter-inquirer": "2.0.15", - "@schematics/angular": "18.2.10", + "@angular-devkit/architect": "0.1902.6", + "@angular-devkit/core": "19.2.6", + "@angular-devkit/schematics": "19.2.6", + "@inquirer/prompts": "7.3.2", + "@listr2/prompt-adapter-inquirer": "2.0.18", + "@schematics/angular": "19.2.6", "@yarnpkg/lockfile": "1.1.0", - "ini": "4.1.3", + "ini": "5.0.0", "jsonc-parser": "3.3.1", - "listr2": "8.2.4", - "npm-package-arg": "11.0.3", - "npm-pick-manifest": "9.1.0", - "pacote": "18.0.6", - "resolve": "1.22.8", - "semver": "7.6.3", + "listr2": "8.2.5", + "npm-package-arg": "12.0.2", + "npm-pick-manifest": "10.0.0", + "pacote": "20.0.0", + "resolve": "1.22.10", + "semver": "7.7.1", "symbol-observable": "4.0.0", "yargs": "17.7.2" }, @@ -428,9 +512,9 @@ } }, "node_modules/@angular/common": { - "version": "18.2.9", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.9.tgz", - "integrity": "sha512-Opi6DVaU0aGyJqLk5jPmeYx559fp3afj4wuxM5aDzV4KEVGDVbNCpO0hMuwHZ6rtCjHhv1fQthgS48qoiQ6LKw==", + "version": "19.2.5", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-19.2.5.tgz", + "integrity": "sha512-vFCBdas4C5PxP6ts/4TlRddWD3DUmI3aaO0QZdZvqyLHy428t84ruYdsJXKaeD8ie2U4/9F3a1tsklclRG/BBA==", "dependencies": { "tslib": "^2.3.0" }, @@ -438,35 +522,28 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/core": "18.2.9", + "@angular/core": "19.2.5", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/compiler": { - "version": "18.2.9", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.2.9.tgz", - "integrity": "sha512-fchbcbsyTOd/qHGy+yPEmE1p10OTNEjGrWHQzUbf3xdlm23EvxHTitHh8i6EBdwYnM5zz0IIBhltP8tt89oeYw==", + "version": "19.2.5", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-19.2.5.tgz", + "integrity": "sha512-34J+HubQjwkbZ0AUtU5sa4Zouws9XtP/fKaysMQecoYJTZ3jewzLSRu3aAEZX1Y4gIrcVVKKIxM6oWoXKwYMOA==", "dependencies": { "tslib": "^2.3.0" }, "engines": { "node": "^18.19.1 || ^20.11.1 || >=22.0.0" - }, - "peerDependencies": { - "@angular/core": "18.2.9" - }, - "peerDependenciesMeta": { - "@angular/core": { - "optional": true - } } }, "node_modules/@angular/compiler-cli": { - "version": "18.2.9", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-18.2.9.tgz", - "integrity": "sha512-4iMoRvyMmq/fdI/4Gob9HKjL/jvTlCjbS4kouAYHuGO9w9dmUhi1pY1z+mALtCEl9/Q8CzU2W8e5cU2xtV4nVg==", + "version": "19.2.5", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-19.2.5.tgz", + "integrity": "sha512-b2cG41r6lilApXLlvja1Ra2D00dM3BxmQhoElKC1tOnpD6S3/krlH1DOnBB2I55RBn9iv4zdmPz1l8zPUSh7DQ==", + "dev": true, "dependencies": { - "@babel/core": "7.25.2", + "@babel/core": "7.26.9", "@jridgewell/sourcemap-codec": "^1.4.14", "chokidar": "^4.0.0", "convert-source-map": "^1.5.1", @@ -484,14 +561,15 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/compiler": "18.2.9", - "typescript": ">=5.4 <5.6" + "@angular/compiler": "19.2.5", + "typescript": ">=5.5 <5.9" } }, "node_modules/@angular/compiler-cli/node_modules/chokidar": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz", "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==", + "dev": true, "dependencies": { "readdirp": "^4.0.1" }, @@ -506,6 +584,7 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz", "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==", + "dev": true, "engines": { "node": ">= 14.16.0" }, @@ -515,9 +594,9 @@ } }, "node_modules/@angular/core": { - "version": "18.2.9", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.9.tgz", - "integrity": "sha512-h9/Bzo/7LTPzzh9I/1Gk8TWOXPGeHt3jLlnYrCh2KbrWbTErNtW0V3ad5I3Zv+K2Z7RSl9Z3D3Y6ILH796N4ZA==", + "version": "19.2.5", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-19.2.5.tgz", + "integrity": "sha512-NNEz1sEZz1mBpgf6Tz3aJ9b8KjqpTiMYhHfCYA9h9Ipe4D8gUmOsvPHPK2M755OX7p7PmUmzp1XCUHYrZMVHRw==", "dependencies": { "tslib": "^2.3.0" }, @@ -526,13 +605,13 @@ }, "peerDependencies": { "rxjs": "^6.5.3 || ^7.4.0", - "zone.js": "~0.14.10" + "zone.js": "~0.15.0" } }, "node_modules/@angular/forms": { - "version": "18.2.9", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.2.9.tgz", - "integrity": "sha512-yyN5dG60CXH6MRte8rv4aGUTeNOMz/pUV7rVxittpjN7tPHfGEL9Xz89Or90Aa1QiHuBmHFk+9A39s03aO1rDQ==", + "version": "19.2.5", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-19.2.5.tgz", + "integrity": "sha512-2Zvy3qK1kOxiAX9fdSaeG48q7oyO/4RlMYlg1w+ra9qX1SrgwF3OQ2P2Vs+ojg1AxN3z9xFp4aYaaID/G2LZAw==", "dependencies": { "tslib": "^2.3.0" }, @@ -540,20 +619,20 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "18.2.9", - "@angular/core": "18.2.9", - "@angular/platform-browser": "18.2.9", + "@angular/common": "19.2.5", + "@angular/core": "19.2.5", + "@angular/platform-browser": "19.2.5", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/localize": { - "version": "18.2.9", - "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-18.2.9.tgz", - "integrity": "sha512-CcqyVqV/GyyBe6Cndm2WRM5dyJwjDQ0F7QRGwO3jYWFSYF0h/f0ZjZVH4ra1IX+AwEEicOXW1ig3FBbeOqHPug==", + "version": "19.2.5", + "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-19.2.5.tgz", + "integrity": "sha512-oAc19bubk6Z/2Vv6OkV0MsjdgC8cUaUwBmwdc6blFVe1NCX1KjdaqDyC2EQAO3nWfcdV4uvOOuu8myxB64bamw==", "dependencies": { - "@babel/core": "7.25.2", + "@babel/core": "7.26.9", "@types/babel__core": "7.20.5", - "fast-glob": "3.3.2", + "fast-glob": "3.3.3", "yargs": "^17.2.1" }, "bin": { @@ -565,14 +644,14 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/compiler": "18.2.9", - "@angular/compiler-cli": "18.2.9" + "@angular/compiler": "19.2.5", + "@angular/compiler-cli": "19.2.5" } }, "node_modules/@angular/platform-browser": { - "version": "18.2.9", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.9.tgz", - "integrity": "sha512-UNu6XjK0SV35FFe55yd1yefZI8tzflVKzev/RzC31XngrczhlH0+WCbae4rG1XJULzJwJ1R1p7gqq4+ktEczRQ==", + "version": "19.2.5", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-19.2.5.tgz", + "integrity": "sha512-Lshy++X16cvl6OPvfzMySpsqEaCPKEJmDjz7q7oSt96oxlh6LvOeOUVLjsNyrNaIt9NadpWoqjlu/I9RTPJkpw==", "dependencies": { "tslib": "^2.3.0" }, @@ -580,9 +659,9 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/animations": "18.2.9", - "@angular/common": "18.2.9", - "@angular/core": "18.2.9" + "@angular/animations": "19.2.5", + "@angular/common": "19.2.5", + "@angular/core": "19.2.5" }, "peerDependenciesMeta": { "@angular/animations": { @@ -591,9 +670,9 @@ } }, "node_modules/@angular/platform-browser-dynamic": { - "version": "18.2.9", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.2.9.tgz", - "integrity": "sha512-cUTB8Jc3I/fu2UKv/PJmNGQGvKyyTo8ln4GUX3EJ4wUHzgkrU0s4x7DNok0Ql8FZKs5dLR8C0xVbG7Dv/ViPdw==", + "version": "19.2.5", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-19.2.5.tgz", + "integrity": "sha512-15in8u4552EcdWNTXY2h0MKuJbk3AuXwWr0zVTum4CfB/Ss2tNTrDEdWhgAbhnUI0e9jZQee/fhBbA1rleMYrA==", "dependencies": { "tslib": "^2.3.0" }, @@ -601,16 +680,16 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "18.2.9", - "@angular/compiler": "18.2.9", - "@angular/core": "18.2.9", - "@angular/platform-browser": "18.2.9" + "@angular/common": "19.2.5", + "@angular/compiler": "19.2.5", + "@angular/core": "19.2.5", + "@angular/platform-browser": "19.2.5" } }, "node_modules/@angular/router": { - "version": "18.2.9", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.9.tgz", - "integrity": "sha512-D0rSrMf/sbhr5yQgz+LNBxdv1BR3S4pYDj1Exq6yVRKX8HSbjc5hxe/44VaOEKBh8StJ6GRiNOMoIcDt73Jang==", + "version": "19.2.5", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-19.2.5.tgz", + "integrity": "sha512-9pSfmdNXLjaOKj0kd4UxBC7sFdCFOnRGbftp397G3KWqsLsGSKmNFzqhXNeA5QHkaVxnpmpm8HzXU+zYV5JwSg==", "dependencies": { "tslib": "^2.3.0" }, @@ -618,16 +697,16 @@ "node": "^18.19.1 || ^20.11.1 || >=22.0.0" }, "peerDependencies": { - "@angular/common": "18.2.9", - "@angular/core": "18.2.9", - "@angular/platform-browser": "18.2.9", + "@angular/common": "19.2.5", + "@angular/core": "19.2.5", + "@angular/platform-browser": "19.2.5", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@babel/code-frame": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.0.tgz", - "integrity": "sha512-INCKxTtbXtcNbUZ3YXutwMpEleqttcswhAdee7dhuoVrD2cnuc3PqtERBtxkX5nziX9vnBL8WXmSGwv8CuPV6g==", + "version": "7.26.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz", + "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==", "dependencies": { "@babel/helper-validator-identifier": "^7.25.9", "js-tokens": "^4.0.0", @@ -638,28 +717,28 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.0.tgz", - "integrity": "sha512-qETICbZSLe7uXv9VE8T/RWOdIE5qqyTucOt4zLYMafj2MRO271VGgLd4RACJMeBO37UPWhXiKMBk7YlJ0fOzQA==", + "version": "7.26.8", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz", + "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz", - "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==", + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.9.tgz", + "integrity": "sha512-lWBYIrF7qK5+GjY5Uy+/hEgp8OJWOD/rpy74GplYRhEauvbHDeFB8t5hPOZxCZ0Oxf4Cc36tK51/l3ymJysrKw==", "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.24.7", - "@babel/generator": "^7.25.0", - "@babel/helper-compilation-targets": "^7.25.2", - "@babel/helper-module-transforms": "^7.25.2", - "@babel/helpers": "^7.25.0", - "@babel/parser": "^7.25.0", - "@babel/template": "^7.25.0", - "@babel/traverse": "^7.25.2", - "@babel/types": "^7.25.2", + "@babel/code-frame": "^7.26.2", + "@babel/generator": "^7.26.9", + "@babel/helper-compilation-targets": "^7.26.5", + "@babel/helper-module-transforms": "^7.26.0", + "@babel/helpers": "^7.26.9", + "@babel/parser": "^7.26.9", + "@babel/template": "^7.26.9", + "@babel/traverse": "^7.26.9", + "@babel/types": "^7.26.9", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -688,37 +767,38 @@ } }, "node_modules/@babel/generator": { - "version": "7.25.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.0.tgz", - "integrity": "sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.10.tgz", + "integrity": "sha512-rRHT8siFIXQrAYOYqZQVsAr8vJ+cBNqcVAY6m5V8/4QqzaPl+zDBe6cLEPRDuNOUf3ww8RfJVlOyQMoSI+5Ang==", "dependencies": { - "@babel/types": "^7.25.0", + "@babel/parser": "^7.26.10", + "@babel/types": "^7.26.10", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", - "jsesc": "^2.5.1" + "jsesc": "^3.0.2" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-annotate-as-pure": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz", - "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==", + "version": "7.25.9", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz", + "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==", "dev": true, "dependencies": { - "@babel/types": "^7.24.7" + "@babel/types": "^7.25.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz", - "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz", + "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==", "dependencies": { - "@babel/compat-data": "^7.25.9", + "@babel/compat-data": "^7.26.5", "@babel/helper-validator-option": "^7.25.9", "browserslist": "^4.24.0", "lru-cache": "^5.1.1", @@ -765,9 +845,9 @@ } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz", - "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==", + "version": "7.26.5", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz", + "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==", "dev": true, "engines": { "node": ">=6.9.0" @@ -810,23 +890,23 @@ } }, "node_modules/@babel/helpers": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz", - "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.10.tgz", + "integrity": "sha512-UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g==", "dependencies": { - "@babel/template": "^7.25.9", - "@babel/types": "^7.26.0" + "@babel/template": "^7.26.9", + "@babel/types": "^7.26.10" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.0.tgz", - "integrity": "sha512-aP8x5pIw3xvYr/sXT+SEUwyhrXT8rUJRZltK/qN3Db80dcKpTett8cJxHyjk+xYSVXvNnl2SfcJVjbwxpOSscA==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.10.tgz", + "integrity": "sha512-6aQR2zGE/QFi8JpDLjUZEPYOs7+mhKXm86VaKFiLP35JQwQb6bwUE+XbvkH0EptsYhbNBSUGaUBLKqxH1xSgsA==", "dependencies": { - "@babel/types": "^7.26.0" + "@babel/types": "^7.26.10" }, "bin": { "parser": "bin/babel-parser.js" @@ -836,12 +916,12 @@ } }, "node_modules/@babel/plugin-syntax-import-attributes": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz", - "integrity": "sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==", + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz", + "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.24.7" + "@babel/helper-plugin-utils": "^7.25.9" }, "engines": { "node": ">=6.9.0" @@ -851,28 +931,28 @@ } }, "node_modules/@babel/template": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz", - "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==", + "version": "7.26.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz", + "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==", "dependencies": { - "@babel/code-frame": "^7.25.9", - "@babel/parser": "^7.25.9", - "@babel/types": "^7.25.9" + "@babel/code-frame": "^7.26.2", + "@babel/parser": "^7.26.9", + "@babel/types": "^7.26.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.25.9", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz", - "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.10.tgz", + "integrity": "sha512-k8NuDrxr0WrPH5Aupqb2LCVURP/S0vBEn5mK6iH+GIYob66U5EtoZvcdudR2jQ4cmTwhEwW1DLB+Yyas9zjF6A==", "dependencies": { - "@babel/code-frame": "^7.25.9", - "@babel/generator": "^7.25.9", - "@babel/parser": "^7.25.9", - "@babel/template": "^7.25.9", - "@babel/types": "^7.25.9", + "@babel/code-frame": "^7.26.2", + "@babel/generator": "^7.26.10", + "@babel/parser": "^7.26.10", + "@babel/template": "^7.26.9", + "@babel/types": "^7.26.10", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -880,36 +960,10 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/traverse/node_modules/@babel/generator": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.0.tgz", - "integrity": "sha512-/AIkAmInnWwgEAJGQr9vY0c66Mj6kjkE2ZPB1PurTRaRAh3U+J45sAQMjQDJdh4WbR3l0x5xkimXBKyBXXAu2w==", - "dependencies": { - "@babel/parser": "^7.26.0", - "@babel/types": "^7.26.0", - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.25", - "jsesc": "^3.0.2" - }, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/traverse/node_modules/jsesc": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", - "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", - "bin": { - "jsesc": "bin/jsesc" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/@babel/types": { - "version": "7.26.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz", - "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==", + "version": "7.26.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.10.tgz", + "integrity": "sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==", "dependencies": { "@babel/helper-string-parser": "^7.25.9", "@babel/helper-validator-identifier": "^7.25.9" @@ -950,9 +1004,9 @@ } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.0.tgz", - "integrity": "sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.1.tgz", + "integrity": "sha512-kfYGy8IdzTGy+z0vFGvExZtxkFlA4zAxgKEahG9KE1ScBjpQnFsNOX8KTU5ojNru5ed5CVoJYXFtoxaq5nFbjQ==", "cpu": [ "ppc64" ], @@ -966,9 +1020,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.0.tgz", - "integrity": "sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.1.tgz", + "integrity": "sha512-dp+MshLYux6j/JjdqVLnMglQlFu+MuVeNrmT5nk6q07wNhCdSnB7QZj+7G8VMUGh1q+vj2Bq8kRsuyA00I/k+Q==", "cpu": [ "arm" ], @@ -982,9 +1036,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.0.tgz", - "integrity": "sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.1.tgz", + "integrity": "sha512-50tM0zCJW5kGqgG7fQ7IHvQOcAn9TKiVRuQ/lN0xR+T2lzEFvAi1ZcS8DiksFcEpf1t/GYOeOfCAgDHFpkiSmA==", "cpu": [ "arm64" ], @@ -998,9 +1052,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.0.tgz", - "integrity": "sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.1.tgz", + "integrity": "sha512-GCj6WfUtNldqUzYkN/ITtlhwQqGWu9S45vUXs7EIYf+7rCiiqH9bCloatO9VhxsL0Pji+PF4Lz2XXCES+Q8hDw==", "cpu": [ "x64" ], @@ -1014,9 +1068,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.0.tgz", - "integrity": "sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.1.tgz", + "integrity": "sha512-5hEZKPf+nQjYoSr/elb62U19/l1mZDdqidGfmFutVUjjUZrOazAtwK+Kr+3y0C/oeJfLlxo9fXb1w7L+P7E4FQ==", "cpu": [ "arm64" ], @@ -1030,9 +1084,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.0.tgz", - "integrity": "sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.1.tgz", + "integrity": "sha512-hxVnwL2Dqs3fM1IWq8Iezh0cX7ZGdVhbTfnOy5uURtao5OIVCEyj9xIzemDi7sRvKsuSdtCAhMKarxqtlyVyfA==", "cpu": [ "x64" ], @@ -1046,9 +1100,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.0.tgz", - "integrity": "sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.1.tgz", + "integrity": "sha512-1MrCZs0fZa2g8E+FUo2ipw6jw5qqQiH+tERoS5fAfKnRx6NXH31tXBKI3VpmLijLH6yriMZsxJtaXUyFt/8Y4A==", "cpu": [ "arm64" ], @@ -1062,9 +1116,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.0.tgz", - "integrity": "sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.1.tgz", + "integrity": "sha512-0IZWLiTyz7nm0xuIs0q1Y3QWJC52R8aSXxe40VUxm6BB1RNmkODtW6LHvWRrGiICulcX7ZvyH6h5fqdLu4gkww==", "cpu": [ "x64" ], @@ -1078,9 +1132,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.0.tgz", - "integrity": "sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.1.tgz", + "integrity": "sha512-NdKOhS4u7JhDKw9G3cY6sWqFcnLITn6SqivVArbzIaf3cemShqfLGHYMx8Xlm/lBit3/5d7kXvriTUGa5YViuQ==", "cpu": [ "arm" ], @@ -1094,9 +1148,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.0.tgz", - "integrity": "sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.1.tgz", + "integrity": "sha512-jaN3dHi0/DDPelk0nLcXRm1q7DNJpjXy7yWaWvbfkPvI+7XNSc/lDOnCLN7gzsyzgu6qSAmgSvP9oXAhP973uQ==", "cpu": [ "arm64" ], @@ -1110,9 +1164,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.0.tgz", - "integrity": "sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.1.tgz", + "integrity": "sha512-OJykPaF4v8JidKNGz8c/q1lBO44sQNUQtq1KktJXdBLn1hPod5rE/Hko5ugKKZd+D2+o1a9MFGUEIUwO2YfgkQ==", "cpu": [ "ia32" ], @@ -1126,9 +1180,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.0.tgz", - "integrity": "sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.1.tgz", + "integrity": "sha512-nGfornQj4dzcq5Vp835oM/o21UMlXzn79KobKlcs3Wz9smwiifknLy4xDCLUU0BWp7b/houtdrgUz7nOGnfIYg==", "cpu": [ "loong64" ], @@ -1142,9 +1196,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.0.tgz", - "integrity": "sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.1.tgz", + "integrity": "sha512-1osBbPEFYwIE5IVB/0g2X6i1qInZa1aIoj1TdL4AaAb55xIIgbg8Doq6a5BzYWgr+tEcDzYH67XVnTmUzL+nXg==", "cpu": [ "mips64el" ], @@ -1158,9 +1212,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.0.tgz", - "integrity": "sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.1.tgz", + "integrity": "sha512-/6VBJOwUf3TdTvJZ82qF3tbLuWsscd7/1w+D9LH0W/SqUgM5/JJD0lrJ1fVIfZsqB6RFmLCe0Xz3fmZc3WtyVg==", "cpu": [ "ppc64" ], @@ -1174,9 +1228,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.0.tgz", - "integrity": "sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.1.tgz", + "integrity": "sha512-nSut/Mx5gnilhcq2yIMLMe3Wl4FK5wx/o0QuuCLMtmJn+WeWYoEGDN1ipcN72g1WHsnIbxGXd4i/MF0gTcuAjQ==", "cpu": [ "riscv64" ], @@ -1190,9 +1244,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.0.tgz", - "integrity": "sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.1.tgz", + "integrity": "sha512-cEECeLlJNfT8kZHqLarDBQso9a27o2Zd2AQ8USAEoGtejOrCYHNtKP8XQhMDJMtthdF4GBmjR2au3x1udADQQQ==", "cpu": [ "s390x" ], @@ -1206,9 +1260,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.0.tgz", - "integrity": "sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.1.tgz", + "integrity": "sha512-xbfUhu/gnvSEg+EGovRc+kjBAkrvtk38RlerAzQxvMzlB4fXpCFCeUAYzJvrnhFtdeyVCDANSjJvOvGYoeKzFA==", "cpu": [ "x64" ], @@ -1221,10 +1275,26 @@ "node": ">=18" } }, + "node_modules/@esbuild/netbsd-arm64": { + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.1.tgz", + "integrity": "sha512-O96poM2XGhLtpTh+s4+nP7YCCAfb4tJNRVZHfIE7dgmax+yMP2WgMd2OecBuaATHKTHsLWHQeuaxMRnCsH8+5g==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.0.tgz", - "integrity": "sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.1.tgz", + "integrity": "sha512-X53z6uXip6KFXBQ+Krbx25XHV/NCbzryM6ehOAeAil7X7oa4XIq+394PWGnwaSQ2WRA0KI6PUO6hTO5zeF5ijA==", "cpu": [ "x64" ], @@ -1238,9 +1308,9 @@ } }, "node_modules/@esbuild/openbsd-arm64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.0.tgz", - "integrity": "sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.1.tgz", + "integrity": "sha512-Na9T3szbXezdzM/Kfs3GcRQNjHzM6GzFBeU1/6IV/npKP5ORtp9zbQjvkDJ47s6BCgaAZnnnu/cY1x342+MvZg==", "cpu": [ "arm64" ], @@ -1254,9 +1324,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.0.tgz", - "integrity": "sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.1.tgz", + "integrity": "sha512-T3H78X2h1tszfRSf+txbt5aOp/e7TAz3ptVKu9Oyir3IAOFPGV6O9c2naym5TOriy1l0nNf6a4X5UXRZSGX/dw==", "cpu": [ "x64" ], @@ -1270,9 +1340,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.0.tgz", - "integrity": "sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.1.tgz", + "integrity": "sha512-2H3RUvcmULO7dIE5EWJH8eubZAI4xw54H1ilJnRNZdeo8dTADEZ21w6J22XBkXqGJbe0+wnNJtw3UXRoLJnFEg==", "cpu": [ "x64" ], @@ -1286,9 +1356,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.0.tgz", - "integrity": "sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.1.tgz", + "integrity": "sha512-GE7XvrdOzrb+yVKB9KsRMq+7a2U/K5Cf/8grVFRAGJmfADr/e/ODQ134RK2/eeHqYV5eQRFxb1hY7Nr15fv1NQ==", "cpu": [ "arm64" ], @@ -1302,9 +1372,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.0.tgz", - "integrity": "sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.1.tgz", + "integrity": "sha512-uOxSJCIcavSiT6UnBhBzE8wy3n0hOkJsBOzy7HDAuTDE++1DJMRRVCPGisULScHL+a/ZwdXPpXD3IyFKjA7K8A==", "cpu": [ "ia32" ], @@ -1318,9 +1388,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.0.tgz", - "integrity": "sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.1.tgz", + "integrity": "sha512-Y1EQdcfwMSeQN/ujR5VayLOJ1BHaK+ssyk0AEzPjC+t1lITgsnccPqFjb6V+LsTp/9Iov4ysfjxLaGJ9RPtkVg==", "cpu": [ "x64" ], @@ -1349,24 +1419,81 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", - "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "version": "4.12.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", + "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, + "node_modules/@eslint/config-array": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz", + "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==", + "dev": true, + "dependencies": { + "@eslint/object-schema": "^2.1.6", + "debug": "^4.3.1", + "minimatch": "^3.1.2" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/config-array/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@eslint/config-array/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@eslint/config-helpers": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.0.tgz", + "integrity": "sha512-yJLLmLexii32mGrhW29qvU3QBVTu0GUmEf/J4XsBtVhp4JkIUFN/BjWqTF63yRvGApIDpZm5fa97LtYtINmfeQ==", + "dev": true, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/core": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz", + "integrity": "sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==", + "dev": true, + "dependencies": { + "@types/json-schema": "^7.0.15" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, "node_modules/@eslint/eslintrc": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", - "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz", + "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==", "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", + "espree": "^10.0.1", + "globals": "^14.0.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", @@ -1374,7 +1501,7 @@ "strip-json-comments": "^3.1.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" @@ -1396,12 +1523,6 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/@eslint/eslintrc/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -1413,32 +1534,17 @@ } }, "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", + "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, "engines": { - "node": ">=8" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@eslint/eslintrc/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -1457,69 +1563,78 @@ "node": "*" } }, - "node_modules/@eslint/eslintrc/node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "node_modules/@eslint/js": { + "version": "9.23.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.23.0.tgz", + "integrity": "sha512-35MJ8vCPU0ZMxo7zfev2pypqTwWTofFZO6m4KAtdoFhRpLJUpHTZZ+KB3C7Hb1d7bULYwO4lJXGCi5Se+8OMbw==", "dev": true, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, - "node_modules/@eslint/js": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", - "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", + "node_modules/@eslint/object-schema": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz", + "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==", "dev": true, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/plugin-kit": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.7.tgz", + "integrity": "sha512-JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g==", + "dev": true, + "dependencies": { + "@eslint/core": "^0.12.0", + "levn": "^0.4.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/@fortawesome/fontawesome-free": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.6.0.tgz", - "integrity": "sha512-60G28ke/sXdtS9KZCpZSHHkCbdsOGEhIUGlwq6yhY74UpTiToIh8np7A8yphhM4BWsvNFtIvLpi4co+h9Mr9Ow==", + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz", + "integrity": "sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==", "engines": { "node": ">=6" } }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.11.14", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", - "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", + "node_modules/@humanfs/core": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", + "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", "dev": true, - "dependencies": { - "@humanwhocodes/object-schema": "^2.0.2", - "debug": "^4.3.1", - "minimatch": "^3.0.5" - }, "engines": { - "node": ">=10.10.0" + "node": ">=18.18.0" } }, - "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "node_modules/@humanfs/node": { + "version": "0.16.6", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", + "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", "dev": true, "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/@humanwhocodes/config-array/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" + "@humanfs/core": "^0.19.1", + "@humanwhocodes/retry": "^0.3.0" }, "engines": { - "node": "*" + "node": ">=18.18.0" + } + }, + "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", + "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", + "dev": true, + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" } }, "node_modules/@humanwhocodes/module-importer": { @@ -1535,254 +1650,346 @@ "url": "https://github.com/sponsors/nzakas" } }, - "node_modules/@humanwhocodes/object-schema": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", - "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", - "dev": true + "node_modules/@humanwhocodes/retry": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz", + "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==", + "dev": true, + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } }, "node_modules/@iharbeck/ngx-virtual-scroller": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/@iharbeck/ngx-virtual-scroller/-/ngx-virtual-scroller-17.0.2.tgz", - "integrity": "sha512-ixB4NZ4kwboYC/prWNkO7MohTx9pEilcBMQOmSxBn92P4GGbu5+HjiCDe+v5fj31bGIDiya2xXWouWkcuG/Y+w==", + "version": "19.0.1", + "resolved": "https://registry.npmjs.org/@iharbeck/ngx-virtual-scroller/-/ngx-virtual-scroller-19.0.1.tgz", + "integrity": "sha512-dtn4CpbEY92H9nd1A48WNhsyUgtFBjC83xcsc9VzlSQT/KN2fEx0oBs0Obnn6ZdPanDP/IQdlBgmANmlds/wHA==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@tweenjs/tween.js": "^23.1.1" + "@tweenjs/tween.js": "^25.0.0" } }, "node_modules/@inquirer/checkbox": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-2.5.0.tgz", - "integrity": "sha512-sMgdETOfi2dUHT8r7TT1BTKOwNvdDGFDXYWtQ2J69SvlYNntk9I/gJe7r5yvMwwsuKnYbuRs3pNhx4tgNck5aA==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-4.1.4.tgz", + "integrity": "sha512-d30576EZdApjAMceijXA5jDzRQHT/MygbC+J8I7EqA6f/FRpYxlRtRJbHF8gHeWYeSdOuTEJqonn7QLB1ELezA==", "dev": true, "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/figures": "^1.0.5", - "@inquirer/type": "^1.5.3", + "@inquirer/core": "^10.1.9", + "@inquirer/figures": "^1.0.11", + "@inquirer/type": "^3.0.5", "ansi-escapes": "^4.3.2", "yoctocolors-cjs": "^2.1.2" }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@inquirer/confirm": { - "version": "3.1.22", - "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.1.22.tgz", - "integrity": "sha512-gsAKIOWBm2Q87CDfs9fEo7wJT3fwWIJfnDGMn9Qy74gBnNFOACDNfhUzovubbJjWnKLGBln7/NcSmZwj5DuEXg==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-5.1.6.tgz", + "integrity": "sha512-6ZXYK3M1XmaVBZX6FCfChgtponnL0R6I7k8Nu+kaoNkT828FVZTcca1MqmWQipaW2oNREQl5AaPCUOOCVNdRMw==", "dev": true, "dependencies": { - "@inquirer/core": "^9.0.10", - "@inquirer/type": "^1.5.2" + "@inquirer/core": "^10.1.7", + "@inquirer/type": "^3.0.4" }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@inquirer/core": { - "version": "9.2.1", - "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.2.1.tgz", - "integrity": "sha512-F2VBt7W/mwqEU4bL0RnHNZmC/OxzNx9cOYxHqnXX3MP6ruYvZUZAW9imgN9+h/uBT/oP8Gh888J2OZSbjSeWcg==", + "version": "10.1.9", + "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-10.1.9.tgz", + "integrity": "sha512-sXhVB8n20NYkUBfDYgizGHlpRVaCRjtuzNZA6xpALIUbkgfd2Hjz+DfEN6+h1BRnuxw0/P4jCIMjMsEOAMwAJw==", "dev": true, "dependencies": { - "@inquirer/figures": "^1.0.6", - "@inquirer/type": "^2.0.0", - "@types/mute-stream": "^0.0.4", - "@types/node": "^22.5.5", - "@types/wrap-ansi": "^3.0.0", + "@inquirer/figures": "^1.0.11", + "@inquirer/type": "^3.0.5", "ansi-escapes": "^4.3.2", "cli-width": "^4.1.0", - "mute-stream": "^1.0.0", + "mute-stream": "^2.0.0", "signal-exit": "^4.1.0", - "strip-ansi": "^6.0.1", "wrap-ansi": "^6.2.0", "yoctocolors-cjs": "^2.1.2" }, "engines": { "node": ">=18" - } - }, - "node_modules/@inquirer/core/node_modules/@inquirer/type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-2.0.0.tgz", - "integrity": "sha512-XvJRx+2KR3YXyYtPUUy+qd9i7p+GO9Ko6VIIpWlBrpWwXDv8WLFeHTxz35CfQFUiBMLXlGHhGzys7lqit9gWag==", - "dev": true, - "dependencies": { - "mute-stream": "^1.0.0" }, - "engines": { - "node": ">=18" + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@inquirer/editor": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-2.2.0.tgz", - "integrity": "sha512-9KHOpJ+dIL5SZli8lJ6xdaYLPPzB8xB9GZItg39MBybzhxA16vxmszmQFrRwbOA918WA2rvu8xhDEg/p6LXKbw==", + "version": "4.2.9", + "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-4.2.9.tgz", + "integrity": "sha512-8HjOppAxO7O4wV1ETUlJFg6NDjp/W2NP5FB9ZPAcinAlNT4ZIWOLe2pUVwmmPRSV0NMdI5r/+lflN55AwZOKSw==", "dev": true, "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/type": "^1.5.3", + "@inquirer/core": "^10.1.9", + "@inquirer/type": "^3.0.5", "external-editor": "^3.1.0" }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@inquirer/expand": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-2.3.0.tgz", - "integrity": "sha512-qnJsUcOGCSG1e5DTOErmv2BPQqrtT6uzqn1vI/aYGiPKq+FgslGZmtdnXbhuI7IlT7OByDoEEqdnhUnVR2hhLw==", + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-4.0.11.tgz", + "integrity": "sha512-OZSUW4hFMW2TYvX/Sv+NnOZgO8CHT2TU1roUCUIF2T+wfw60XFRRp9MRUPCT06cRnKL+aemt2YmTWwt7rOrNEA==", "dev": true, "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/type": "^1.5.3", + "@inquirer/core": "^10.1.9", + "@inquirer/type": "^3.0.5", "yoctocolors-cjs": "^2.1.2" }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@inquirer/figures": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.7.tgz", - "integrity": "sha512-m+Trk77mp54Zma6xLkLuY+mvanPxlE4A7yNKs2HBiyZ4UkVs28Mv5c/pgWrHeInx+USHeX/WEPzjrWrcJiQgjw==", + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.11.tgz", + "integrity": "sha512-eOg92lvrn/aRUqbxRyvpEWnrvRuTYRifixHkYVpJiygTgVSBIHDqLh0SrMQXkafvULg3ck11V7xvR+zcgvpHFw==", "dev": true, "engines": { "node": ">=18" } }, "node_modules/@inquirer/input": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-2.3.0.tgz", - "integrity": "sha512-XfnpCStx2xgh1LIRqPXrTNEEByqQWoxsWYzNRSEUxJ5c6EQlhMogJ3vHKu8aXuTacebtaZzMAHwEL0kAflKOBw==", + "version": "4.1.8", + "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-4.1.8.tgz", + "integrity": "sha512-WXJI16oOZ3/LiENCAxe8joniNp8MQxF6Wi5V+EBbVA0ZIOpFcL4I9e7f7cXse0HJeIPCWO8Lcgnk98juItCi7Q==", "dev": true, "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/type": "^1.5.3" + "@inquirer/core": "^10.1.9", + "@inquirer/type": "^3.0.5" }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@inquirer/number": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-1.1.0.tgz", - "integrity": "sha512-ilUnia/GZUtfSZy3YEErXLJ2Sljo/mf9fiKc08n18DdwdmDbOzRcTv65H1jjDvlsAuvdFXf4Sa/aL7iw/NanVA==", + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-3.0.11.tgz", + "integrity": "sha512-pQK68CsKOgwvU2eA53AG/4npRTH2pvs/pZ2bFvzpBhrznh8Mcwt19c+nMO7LHRr3Vreu1KPhNBF3vQAKrjIulw==", "dev": true, "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/type": "^1.5.3" + "@inquirer/core": "^10.1.9", + "@inquirer/type": "^3.0.5" }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@inquirer/password": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-2.2.0.tgz", - "integrity": "sha512-5otqIpgsPYIshqhgtEwSspBQE40etouR8VIxzpJkv9i0dVHIpyhiivbkH9/dGiMLdyamT54YRdGJLfl8TFnLHg==", + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-4.0.11.tgz", + "integrity": "sha512-dH6zLdv+HEv1nBs96Case6eppkRggMe8LoOTl30+Gq5Wf27AO/vHFgStTVz4aoevLdNXqwE23++IXGw4eiOXTg==", "dev": true, "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/type": "^1.5.3", + "@inquirer/core": "^10.1.9", + "@inquirer/type": "^3.0.5", "ansi-escapes": "^4.3.2" }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@inquirer/prompts": { - "version": "5.3.8", - "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-5.3.8.tgz", - "integrity": "sha512-b2BudQY/Si4Y2a0PdZZL6BeJtl8llgeZa7U2j47aaJSCeAl1e4UI7y8a9bSkO3o/ZbZrgT5muy/34JbsjfIWxA==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-7.3.2.tgz", + "integrity": "sha512-G1ytyOoHh5BphmEBxSwALin3n1KGNYB6yImbICcRQdzXfOGbuJ9Jske/Of5Sebk339NSGGNfUshnzK8YWkTPsQ==", "dev": true, "dependencies": { - "@inquirer/checkbox": "^2.4.7", - "@inquirer/confirm": "^3.1.22", - "@inquirer/editor": "^2.1.22", - "@inquirer/expand": "^2.1.22", - "@inquirer/input": "^2.2.9", - "@inquirer/number": "^1.0.10", - "@inquirer/password": "^2.1.22", - "@inquirer/rawlist": "^2.2.4", - "@inquirer/search": "^1.0.7", - "@inquirer/select": "^2.4.7" + "@inquirer/checkbox": "^4.1.2", + "@inquirer/confirm": "^5.1.6", + "@inquirer/editor": "^4.2.7", + "@inquirer/expand": "^4.0.9", + "@inquirer/input": "^4.1.6", + "@inquirer/number": "^3.0.9", + "@inquirer/password": "^4.0.9", + "@inquirer/rawlist": "^4.0.9", + "@inquirer/search": "^3.0.9", + "@inquirer/select": "^4.0.9" }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@inquirer/rawlist": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-2.3.0.tgz", - "integrity": "sha512-zzfNuINhFF7OLAtGHfhwOW2TlYJyli7lOUoJUXw/uyklcwalV6WRXBXtFIicN8rTRK1XTiPWB4UY+YuW8dsnLQ==", + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-4.0.11.tgz", + "integrity": "sha512-uAYtTx0IF/PqUAvsRrF3xvnxJV516wmR6YVONOmCWJbbt87HcDHLfL9wmBQFbNJRv5kCjdYKrZcavDkH3sVJPg==", "dev": true, "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/type": "^1.5.3", + "@inquirer/core": "^10.1.9", + "@inquirer/type": "^3.0.5", "yoctocolors-cjs": "^2.1.2" }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@inquirer/search": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-1.1.0.tgz", - "integrity": "sha512-h+/5LSj51dx7hp5xOn4QFnUaKeARwUCLs6mIhtkJ0JYPBLmEYjdHSYh7I6GrLg9LwpJ3xeX0FZgAG1q0QdCpVQ==", + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-3.0.11.tgz", + "integrity": "sha512-9CWQT0ikYcg6Ls3TOa7jljsD7PgjcsYEM0bYE+Gkz+uoW9u8eaJCRHJKkucpRE5+xKtaaDbrND+nPDoxzjYyew==", "dev": true, "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/figures": "^1.0.5", - "@inquirer/type": "^1.5.3", + "@inquirer/core": "^10.1.9", + "@inquirer/figures": "^1.0.11", + "@inquirer/type": "^3.0.5", "yoctocolors-cjs": "^2.1.2" }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@inquirer/select": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-2.5.0.tgz", - "integrity": "sha512-YmDobTItPP3WcEI86GvPo+T2sRHkxxOq/kXmsBjHS5BVXUgvgZ5AfJjkvQvZr03T81NnI3KrrRuMzeuYUQRFOA==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-4.1.0.tgz", + "integrity": "sha512-z0a2fmgTSRN+YBuiK1ROfJ2Nvrpij5lVN3gPDkQGhavdvIVGHGW29LwYZfM/j42Ai2hUghTI/uoBuTbrJk42bA==", "dev": true, "dependencies": { - "@inquirer/core": "^9.1.0", - "@inquirer/figures": "^1.0.5", - "@inquirer/type": "^1.5.3", + "@inquirer/core": "^10.1.9", + "@inquirer/figures": "^1.0.11", + "@inquirer/type": "^3.0.5", "ansi-escapes": "^4.3.2", "yoctocolors-cjs": "^2.1.2" }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@inquirer/type": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.5.tgz", - "integrity": "sha512-MzICLu4yS7V8AA61sANROZ9vT1H3ooca5dSmI1FjZkzq7o/koMsRfQSzRtFo+F3Ao4Sf1C0bpLKejpKB/+j6MA==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-3.0.5.tgz", + "integrity": "sha512-ZJpeIYYueOz/i/ONzrfof8g89kNdO2hjGuvULROo3O8rlB2CRtSseE5KeirnyE4t/thAn/EwvS/vuQeJCn+NZg==", "dev": true, - "dependencies": { - "mute-stream": "^1.0.0" - }, "engines": { "node": ">=18" + }, + "peerDependencies": { + "@types/node": ">=18" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/@iplab/ngx-file-upload": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/@iplab/ngx-file-upload/-/ngx-file-upload-18.0.0.tgz", - "integrity": "sha512-Uz+011ZOGtVeFAPuOcFHBB/hyLZrV3RNOqT21J13YMqWr5jadba0t67towrQ7VTHLMYt1Du/UHDmv5wV/h7/sg==", + "version": "19.0.3", + "resolved": "https://registry.npmjs.org/@iplab/ngx-file-upload/-/ngx-file-upload-19.0.3.tgz", + "integrity": "sha512-PXQroFbMrQwg69b/j6Im9R8DkLz15YxiA0ATlFpOTPRtDhAWQMIRNdxbcqRLmBLdPvrsXpH/gN30f0GyC1k/fw==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/animations": "^18.0.0", - "@angular/common": "^18.0.0", - "@angular/core": "^18.0.0", - "@angular/forms": "^18.0.0", + "@angular/animations": "^19.0.0", + "@angular/common": "^19.0.0", + "@angular/core": "^19.0.0", + "@angular/forms": "^19.0.0", "rxjs": "^7.0.0" } }, @@ -1875,6 +2082,18 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, + "node_modules/@isaacs/fs-minipass": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", + "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==", + "dev": true, + "dependencies": { + "minipass": "^7.0.4" + }, + "engines": { + "node": ">=18.0.0" + } + }, "node_modules/@istanbuljs/schema": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", @@ -1928,12 +2147,11 @@ } }, "node_modules/@jsverse/transloco": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@jsverse/transloco/-/transloco-7.5.0.tgz", - "integrity": "sha512-OnK8y84TWxWeNH+Qw0kHPECpmLOrwMRP+NMcUXm3lEqRrd13qe9XkhbAysAHGJ6kfZqgIiAMS9rqnFf6JTSc5g==", + "version": "7.6.1", + "resolved": "https://registry.npmjs.org/@jsverse/transloco/-/transloco-7.6.1.tgz", + "integrity": "sha512-hFFKJ1pVFYeW2E4UFETQpOeOn0tuncCSUdRewbq3LiV+qS9x4Z2XVuCaAaFPdiNhy4nUKHWFX1pWjpZ5XjUPaQ==", "dependencies": { "@jsverse/transloco-utils": "^7.0.0", - "flat": "6.0.1", "fs-extra": "^11.0.0", "glob": "^10.0.0", "lodash.kebabcase": "^4.1.1", @@ -2007,24 +2225,45 @@ } }, "node_modules/@listr2/prompt-adapter-inquirer": { - "version": "2.0.15", - "resolved": "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-2.0.15.tgz", - "integrity": "sha512-MZrGem/Ujjd4cPTLYDfCZK2iKKeiO/8OX13S6jqxldLs0Prf2aGqVlJ77nMBqMv7fzqgXEgjrNHLXcKR8l9lOg==", + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-2.0.18.tgz", + "integrity": "sha512-0hz44rAcrphyXcA8IS7EJ2SCoaBZD2u5goE8S/e+q/DL+dOGpqpcLidVOFeLG3VgML62SXmfRLAhWt0zL1oW4Q==", "dev": true, "dependencies": { - "@inquirer/type": "^1.5.1" + "@inquirer/type": "^1.5.5" }, "engines": { "node": ">=18.0.0" }, "peerDependencies": { - "@inquirer/prompts": ">= 3 < 6" + "@inquirer/prompts": ">= 3 < 8" + } + }, + "node_modules/@listr2/prompt-adapter-inquirer/node_modules/@inquirer/type": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.5.tgz", + "integrity": "sha512-MzICLu4yS7V8AA61sANROZ9vT1H3ooca5dSmI1FjZkzq7o/koMsRfQSzRtFo+F3Ao4Sf1C0bpLKejpKB/+j6MA==", + "dev": true, + "dependencies": { + "mute-stream": "^1.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@listr2/prompt-adapter-inquirer/node_modules/mute-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz", + "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==", + "dev": true, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, "node_modules/@lmdb/lmdb-darwin-arm64": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-3.0.13.tgz", - "integrity": "sha512-uiKPB0Fv6WEEOZjruu9a6wnW/8jrjzlZbxXscMB8kuCJ1k6kHpcBnuvaAWcqhbI7rqX5GKziwWEdD+wi2gNLfA==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-3.2.6.tgz", + "integrity": "sha512-yF/ih9EJJZc72psFQbwnn8mExIWfTnzWJg+N02hnpXtDPETYLmQswIMBn7+V88lfCaFrMozJsUvcEQIkEPU0Gg==", "cpu": [ "arm64" ], @@ -2035,9 +2274,9 @@ ] }, "node_modules/@lmdb/lmdb-darwin-x64": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-3.0.13.tgz", - "integrity": "sha512-bEVIIfK5mSQoG1R19qA+fJOvCB+0wVGGnXHT3smchBVahYBdlPn2OsZZKzlHWfb1E+PhLBmYfqB5zQXFP7hJig==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-3.2.6.tgz", + "integrity": "sha512-5BbCumsFLbCi586Bb1lTWQFkekdQUw8/t8cy++Uq251cl3hbDIGEwD9HAwh8H6IS2F6QA9KdKmO136LmipRNkg==", "cpu": [ "x64" ], @@ -2048,9 +2287,9 @@ ] }, "node_modules/@lmdb/lmdb-linux-arm": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-3.0.13.tgz", - "integrity": "sha512-Yml1KlMzOnXj/tnW7yX8U78iAzTk39aILYvCPbqeewAq1kSzl+w59k/fiVkTBfvDi/oW/5YRxL+Fq+Y1Fr1r2Q==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-3.2.6.tgz", + "integrity": "sha512-+6XgLpMb7HBoWxXj+bLbiiB4s0mRRcDPElnRS3LpWRzdYSe+gFk5MT/4RrVNqd2MESUDmb53NUXw1+BP69bjiQ==", "cpu": [ "arm" ], @@ -2061,9 +2300,9 @@ ] }, "node_modules/@lmdb/lmdb-linux-arm64": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-3.0.13.tgz", - "integrity": "sha512-afbVrsMgZ9dUTNUchFpj5VkmJRxvht/u335jUJ7o23YTbNbnpmXif3VKQGCtnjSh+CZaqm6N3CPG8KO3zwyZ1Q==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-3.2.6.tgz", + "integrity": "sha512-l5VmJamJ3nyMmeD1ANBQCQqy7do1ESaJQfKPSm2IG9/ADZryptTyCj8N6QaYgIWewqNUrcbdMkJajRQAt5Qjfg==", "cpu": [ "arm64" ], @@ -2074,9 +2313,9 @@ ] }, "node_modules/@lmdb/lmdb-linux-x64": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-3.0.13.tgz", - "integrity": "sha512-vOtxu0xC0SLdQ2WRXg8Qgd8T32ak4SPqk5zjItRszrJk2BdeXqfGxBJbP7o4aOvSPSmSSv46Lr1EP4HXU8v7Kg==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-3.2.6.tgz", + "integrity": "sha512-nDYT8qN9si5+onHYYaI4DiauDMx24OAiuZAUsEqrDy+ja/3EbpXPX/VAkMV8AEaQhy3xc4dRC+KcYIvOFefJ4Q==", "cpu": [ "x64" ], @@ -2087,9 +2326,9 @@ ] }, "node_modules/@lmdb/lmdb-win32-x64": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-3.0.13.tgz", - "integrity": "sha512-UCrMJQY/gJnOl3XgbWRZZUvGGBuKy6i0YNSptgMzHBjs+QYDYR1Mt/RLTOPy4fzzves65O1EDmlL//OzEqoLlA==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-3.2.6.tgz", + "integrity": "sha512-XlqVtILonQnG+9fH2N3Aytria7P/1fwDgDhl29rde96uH2sLB8CHORIf2PfuLVzFQJ7Uqp8py9AYwr3ZUCFfWg==", "cpu": [ "x64" ], @@ -2189,18 +2428,306 @@ "win32" ] }, + "node_modules/@napi-rs/nice": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice/-/nice-1.0.1.tgz", + "integrity": "sha512-zM0mVWSXE0a0h9aKACLwKmD6nHcRiKrPpCfvaKqG1CqDEyjEawId0ocXxVzPMCAm6kkWr2P025msfxXEnt8UGQ==", + "dev": true, + "optional": true, + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + }, + "optionalDependencies": { + "@napi-rs/nice-android-arm-eabi": "1.0.1", + "@napi-rs/nice-android-arm64": "1.0.1", + "@napi-rs/nice-darwin-arm64": "1.0.1", + "@napi-rs/nice-darwin-x64": "1.0.1", + "@napi-rs/nice-freebsd-x64": "1.0.1", + "@napi-rs/nice-linux-arm-gnueabihf": "1.0.1", + "@napi-rs/nice-linux-arm64-gnu": "1.0.1", + "@napi-rs/nice-linux-arm64-musl": "1.0.1", + "@napi-rs/nice-linux-ppc64-gnu": "1.0.1", + "@napi-rs/nice-linux-riscv64-gnu": "1.0.1", + "@napi-rs/nice-linux-s390x-gnu": "1.0.1", + "@napi-rs/nice-linux-x64-gnu": "1.0.1", + "@napi-rs/nice-linux-x64-musl": "1.0.1", + "@napi-rs/nice-win32-arm64-msvc": "1.0.1", + "@napi-rs/nice-win32-ia32-msvc": "1.0.1", + "@napi-rs/nice-win32-x64-msvc": "1.0.1" + } + }, + "node_modules/@napi-rs/nice-android-arm-eabi": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-android-arm-eabi/-/nice-android-arm-eabi-1.0.1.tgz", + "integrity": "sha512-5qpvOu5IGwDo7MEKVqqyAxF90I6aLj4n07OzpARdgDRfz8UbBztTByBp0RC59r3J1Ij8uzYi6jI7r5Lws7nn6w==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-android-arm64": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-android-arm64/-/nice-android-arm64-1.0.1.tgz", + "integrity": "sha512-GqvXL0P8fZ+mQqG1g0o4AO9hJjQaeYG84FRfZaYjyJtZZZcMjXW5TwkL8Y8UApheJgyE13TQ4YNUssQaTgTyvA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-darwin-arm64": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-darwin-arm64/-/nice-darwin-arm64-1.0.1.tgz", + "integrity": "sha512-91k3HEqUl2fsrz/sKkuEkscj6EAj3/eZNCLqzD2AA0TtVbkQi8nqxZCZDMkfklULmxLkMxuUdKe7RvG/T6s2AA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-darwin-x64": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-darwin-x64/-/nice-darwin-x64-1.0.1.tgz", + "integrity": "sha512-jXnMleYSIR/+TAN/p5u+NkCA7yidgswx5ftqzXdD5wgy/hNR92oerTXHc0jrlBisbd7DpzoaGY4cFD7Sm5GlgQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-freebsd-x64": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-freebsd-x64/-/nice-freebsd-x64-1.0.1.tgz", + "integrity": "sha512-j+iJ/ezONXRQsVIB/FJfwjeQXX7A2tf3gEXs4WUGFrJjpe/z2KB7sOv6zpkm08PofF36C9S7wTNuzHZ/Iiccfw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-linux-arm-gnueabihf": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm-gnueabihf/-/nice-linux-arm-gnueabihf-1.0.1.tgz", + "integrity": "sha512-G8RgJ8FYXYkkSGQwywAUh84m946UTn6l03/vmEXBYNJxQJcD+I3B3k5jmjFG/OPiU8DfvxutOP8bi+F89MCV7Q==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-linux-arm64-gnu": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm64-gnu/-/nice-linux-arm64-gnu-1.0.1.tgz", + "integrity": "sha512-IMDak59/W5JSab1oZvmNbrms3mHqcreaCeClUjwlwDr0m3BoR09ZiN8cKFBzuSlXgRdZ4PNqCYNeGQv7YMTjuA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-linux-arm64-musl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-arm64-musl/-/nice-linux-arm64-musl-1.0.1.tgz", + "integrity": "sha512-wG8fa2VKuWM4CfjOjjRX9YLIbysSVV1S3Kgm2Fnc67ap/soHBeYZa6AGMeR5BJAylYRjnoVOzV19Cmkco3QEPw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-linux-ppc64-gnu": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-ppc64-gnu/-/nice-linux-ppc64-gnu-1.0.1.tgz", + "integrity": "sha512-lxQ9WrBf0IlNTCA9oS2jg/iAjQyTI6JHzABV664LLrLA/SIdD+I1i3Mjf7TsnoUbgopBcCuDztVLfJ0q9ubf6Q==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-linux-riscv64-gnu": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-riscv64-gnu/-/nice-linux-riscv64-gnu-1.0.1.tgz", + "integrity": "sha512-3xs69dO8WSWBb13KBVex+yvxmUeEsdWexxibqskzoKaWx9AIqkMbWmE2npkazJoopPKX2ULKd8Fm9veEn0g4Ig==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-linux-s390x-gnu": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-s390x-gnu/-/nice-linux-s390x-gnu-1.0.1.tgz", + "integrity": "sha512-lMFI3i9rlW7hgToyAzTaEybQYGbQHDrpRkg+1gJWEpH0PLAQoZ8jiY0IzakLfNWnVda1eTYYlxxFYzW8Rqczkg==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-linux-x64-gnu": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-x64-gnu/-/nice-linux-x64-gnu-1.0.1.tgz", + "integrity": "sha512-XQAJs7DRN2GpLN6Fb+ZdGFeYZDdGl2Fn3TmFlqEL5JorgWKrQGRUrpGKbgZ25UeZPILuTKJ+OowG2avN8mThBA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-linux-x64-musl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-linux-x64-musl/-/nice-linux-x64-musl-1.0.1.tgz", + "integrity": "sha512-/rodHpRSgiI9o1faq9SZOp/o2QkKQg7T+DK0R5AkbnI/YxvAIEHf2cngjYzLMQSQgUhxym+LFr+UGZx4vK4QdQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-win32-arm64-msvc": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-arm64-msvc/-/nice-win32-arm64-msvc-1.0.1.tgz", + "integrity": "sha512-rEcz9vZymaCB3OqEXoHnp9YViLct8ugF+6uO5McifTedjq4QMQs3DHz35xBEGhH3gJWEsXMUbzazkz5KNM5YUg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-win32-ia32-msvc": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-ia32-msvc/-/nice-win32-ia32-msvc-1.0.1.tgz", + "integrity": "sha512-t7eBAyPUrWL8su3gDxw9xxxqNwZzAqKo0Szv3IjVQd1GpXXVkb6vBBQUuxfIYaXMzZLwlxRQ7uzM2vdUE9ULGw==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@napi-rs/nice-win32-x64-msvc": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@napi-rs/nice-win32-x64-msvc/-/nice-win32-x64-msvc-1.0.1.tgz", + "integrity": "sha512-JlF+uDcatt3St2ntBG8H02F1mM45i5SF9W+bIKiReVE6wiy3o16oBP/yxt+RZ+N6LbCImJXJ6bXNO2kn9AXicg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, "node_modules/@ng-bootstrap/ng-bootstrap": { - "version": "17.0.1", - "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-17.0.1.tgz", - "integrity": "sha512-utbm8OXIoqVVYGVzQkOS773ymbjc+UMkXv8lyi7hTqLhCQs0rZ0yA74peqVZRuOGXLHgcSTA7fnJhA80iQOblw==", + "version": "18.0.0", + "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-18.0.0.tgz", + "integrity": "sha512-GeSAz4yiGq49psdte8kcf+Y562wB3jK/qKRAkh6iA32lcXmy2sfQXVAmlHdjZ3AyP+E8lf3yMwuPdSKiYcDgSg==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/common": "^18.0.0", - "@angular/core": "^18.0.0", - "@angular/forms": "^18.0.0", - "@angular/localize": "^18.0.0", + "@angular/common": "^19.0.0", + "@angular/core": "^19.0.0", + "@angular/forms": "^19.0.0", + "@angular/localize": "^19.0.0", "@popperjs/core": "^2.11.8", "rxjs": "^6.5.3 || ^7.4.0" } @@ -2238,9 +2765,9 @@ } }, "node_modules/@npmcli/agent": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz", - "integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-3.0.0.tgz", + "integrity": "sha512-S79NdEgDQd/NGCay6TCoVzXSj74skRZIKJcpJjC5lOq34SZzyI6MqtiiWoiVWoVrTcGjNeC4ipbh1VIHlpfF5Q==", "dev": true, "dependencies": { "agent-base": "^7.1.0", @@ -2250,7 +2777,7 @@ "socks-proxy-agent": "^8.0.3" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/agent/node_modules/lru-cache": { @@ -2260,35 +2787,34 @@ "dev": true }, "node_modules/@npmcli/fs": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", - "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-4.0.0.tgz", + "integrity": "sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q==", "dev": true, "dependencies": { "semver": "^7.3.5" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/git": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.8.tgz", - "integrity": "sha512-liASfw5cqhjNW9UFd+ruwwdEf/lbOAQjLL2XY2dFW/bkJheXDYZgOyul/4gVvEV4BWkTXjYGmDqMw9uegdbJNQ==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-6.0.3.tgz", + "integrity": "sha512-GUYESQlxZRAdhs3UhbB6pVRNUELQOHXwK9ruDkwmCv2aZ5y0SApQzUJCg02p3A7Ue2J5hxvlk1YI53c00NmRyQ==", "dev": true, "dependencies": { - "@npmcli/promise-spawn": "^7.0.0", - "ini": "^4.1.3", + "@npmcli/promise-spawn": "^8.0.0", + "ini": "^5.0.0", "lru-cache": "^10.0.1", - "npm-pick-manifest": "^9.0.0", - "proc-log": "^4.0.0", - "promise-inflight": "^1.0.1", + "npm-pick-manifest": "^10.0.0", + "proc-log": "^5.0.0", "promise-retry": "^2.0.1", "semver": "^7.3.5", - "which": "^4.0.0" + "which": "^5.0.0" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/git/node_modules/isexe": { @@ -2307,9 +2833,9 @@ "dev": true }, "node_modules/@npmcli/git/node_modules/which": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", - "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz", + "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==", "dev": true, "dependencies": { "isexe": "^3.1.1" @@ -2318,62 +2844,62 @@ "node-which": "bin/which.js" }, "engines": { - "node": "^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/installed-package-contents": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz", - "integrity": "sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-3.0.0.tgz", + "integrity": "sha512-fkxoPuFGvxyrH+OQzyTkX2LUEamrF4jZSmxjAtPPHHGO0dqsQ8tTKjnIS8SAnPHdk2I03BDtSMR5K/4loKg79Q==", "dev": true, "dependencies": { - "npm-bundled": "^3.0.0", - "npm-normalize-package-bin": "^3.0.0" + "npm-bundled": "^4.0.0", + "npm-normalize-package-bin": "^4.0.0" }, "bin": { "installed-package-contents": "bin/index.js" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/node-gyp": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz", - "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-4.0.0.tgz", + "integrity": "sha512-+t5DZ6mO/QFh78PByMq1fGSAub/agLJZDRfJRMeOSNCt8s9YVlTjmGpIPwPhvXTGUIJk+WszlT0rQa1W33yzNA==", "dev": true, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/package-json": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.2.1.tgz", - "integrity": "sha512-f7zYC6kQautXHvNbLEWgD/uGu1+xCn9izgqBfgItWSx22U0ZDekxN08A1vM8cTxj/cRVe0Q94Ode+tdoYmIOOQ==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-6.1.1.tgz", + "integrity": "sha512-d5qimadRAUCO4A/Txw71VM7UrRZzV+NPclxz/dc+M6B2oYwjWTjqh8HA/sGQgs9VZuJ6I/P7XIAlJvgrl27ZOw==", "dev": true, "dependencies": { - "@npmcli/git": "^5.0.0", + "@npmcli/git": "^6.0.0", "glob": "^10.2.2", - "hosted-git-info": "^7.0.0", - "json-parse-even-better-errors": "^3.0.0", - "normalize-package-data": "^6.0.0", - "proc-log": "^4.0.0", - "semver": "^7.5.3" + "hosted-git-info": "^8.0.0", + "json-parse-even-better-errors": "^4.0.0", + "proc-log": "^5.0.0", + "semver": "^7.5.3", + "validate-npm-package-license": "^3.0.4" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/promise-spawn": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-7.0.2.tgz", - "integrity": "sha512-xhfYPXoV5Dy4UkY0D+v2KkwvnDfiA/8Mt3sWCGI/hM03NsYIH8ZaG6QzS9x7pje5vHZBZJ2v6VRFVTWACnqcmQ==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-8.0.2.tgz", + "integrity": "sha512-/bNJhjc+o6qL+Dwz/bqfTQClkEO5nTQ1ZEcdCkAQjhkZMHIh22LPG7fNh1enJP1NKWDqYiiABnjFCY7E0zHYtQ==", "dev": true, "dependencies": { - "which": "^4.0.0" + "which": "^5.0.0" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/promise-spawn/node_modules/isexe": { @@ -2386,9 +2912,9 @@ } }, "node_modules/@npmcli/promise-spawn/node_modules/which": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", - "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz", + "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==", "dev": true, "dependencies": { "isexe": "^3.1.1" @@ -2397,33 +2923,33 @@ "node-which": "bin/which.js" }, "engines": { - "node": "^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/redact": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-2.0.1.tgz", - "integrity": "sha512-YgsR5jCQZhVmTJvjduTOIHph0L73pK8xwMVaDY0PatySqVM9AZj93jpoXYSJqfHFxFkN9dmqTw6OiqExsS3LPw==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-3.1.1.tgz", + "integrity": "sha512-3Hc2KGIkrvJWJqTbvueXzBeZlmvoOxc2jyX00yzr3+sNFquJg0N8hH4SAPLPVrkWIRQICVpVgjrss971awXVnA==", "dev": true, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/run-script": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-8.1.0.tgz", - "integrity": "sha512-y7efHHwghQfk28G2z3tlZ67pLG0XdfYbcVG26r7YIXALRsrVQcTq4/tdenSmdOrEsNahIYA/eh8aEVROWGFUDg==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-9.1.0.tgz", + "integrity": "sha512-aoNSbxtkePXUlbZB+anS1LqsJdctG5n3UVhfU47+CDdwMi6uNTBMF9gPcQRnqghQd2FGzcwwIFBruFMxjhBewg==", "dev": true, "dependencies": { - "@npmcli/node-gyp": "^3.0.0", - "@npmcli/package-json": "^5.0.0", - "@npmcli/promise-spawn": "^7.0.0", - "node-gyp": "^10.0.0", - "proc-log": "^4.0.0", - "which": "^4.0.0" + "@npmcli/node-gyp": "^4.0.0", + "@npmcli/package-json": "^6.0.0", + "@npmcli/promise-spawn": "^8.0.0", + "node-gyp": "^11.0.0", + "proc-log": "^5.0.0", + "which": "^5.0.0" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@npmcli/run-script/node_modules/isexe": { @@ -2436,9 +2962,9 @@ } }, "node_modules/@npmcli/run-script/node_modules/which": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", - "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz", + "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==", "dev": true, "dependencies": { "isexe": "^3.1.1" @@ -2447,9 +2973,325 @@ "node-which": "bin/which.js" }, "engines": { - "node": "^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, + "node_modules/@parcel/watcher": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz", + "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "dependencies": { + "detect-libc": "^1.0.3", + "is-glob": "^4.0.3", + "micromatch": "^4.0.5", + "node-addon-api": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + }, + "optionalDependencies": { + "@parcel/watcher-android-arm64": "2.5.1", + "@parcel/watcher-darwin-arm64": "2.5.1", + "@parcel/watcher-darwin-x64": "2.5.1", + "@parcel/watcher-freebsd-x64": "2.5.1", + "@parcel/watcher-linux-arm-glibc": "2.5.1", + "@parcel/watcher-linux-arm-musl": "2.5.1", + "@parcel/watcher-linux-arm64-glibc": "2.5.1", + "@parcel/watcher-linux-arm64-musl": "2.5.1", + "@parcel/watcher-linux-x64-glibc": "2.5.1", + "@parcel/watcher-linux-x64-musl": "2.5.1", + "@parcel/watcher-win32-arm64": "2.5.1", + "@parcel/watcher-win32-ia32": "2.5.1", + "@parcel/watcher-win32-x64": "2.5.1" + } + }, + "node_modules/@parcel/watcher-android-arm64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz", + "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-arm64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz", + "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-x64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz", + "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-freebsd-x64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz", + "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm-glibc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz", + "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm-musl": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz", + "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm64-glibc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz", + "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm64-musl": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz", + "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-x64-glibc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz", + "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-x64-musl": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz", + "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-arm64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz", + "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-ia32": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz", + "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-x64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz", + "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher/node_modules/detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", + "dev": true, + "optional": true, + "bin": { + "detect-libc": "bin/detect-libc.js" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/@parcel/watcher/node_modules/node-addon-api": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", + "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", + "dev": true, + "optional": true + }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -2459,21 +3301,6 @@ "node": ">=14" } }, - "node_modules/@playwright/test": { - "version": "1.49.0", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.49.0.tgz", - "integrity": "sha512-DMulbwQURa8rNIQrf94+jPJQ4FmOVdpE5ZppRNvWVjvhC+6sOeo28r8MgIpQRYouXRtt/FCCXU7zn20jnHR4Qw==", - "dev": true, - "dependencies": { - "playwright": "1.49.0" - }, - "bin": { - "playwright": "cli.js" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/@polka/url": { "version": "1.0.0-next.25", "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.25.tgz", @@ -2490,9 +3317,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz", - "integrity": "sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.34.8.tgz", + "integrity": "sha512-q217OSE8DTp8AFHuNHXo0Y86e1wtlfVrXiAlwkIvGRQv9zbc6mE3sjIVfwI8sYUyNxwOg0j/Vm1RKM04JcWLJw==", "cpu": [ "arm" ], @@ -2503,9 +3330,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz", - "integrity": "sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.34.8.tgz", + "integrity": "sha512-Gigjz7mNWaOL9wCggvoK3jEIUUbGul656opstjaUSGC3eT0BM7PofdAJaBfPFWWkXNVAXbaQtC99OCg4sJv70Q==", "cpu": [ "arm64" ], @@ -2516,9 +3343,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz", - "integrity": "sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.34.8.tgz", + "integrity": "sha512-02rVdZ5tgdUNRxIUrFdcMBZQoaPMrxtwSb+/hOfBdqkatYHR3lZ2A2EGyHq2sGOd0Owk80oV3snlDASC24He3Q==", "cpu": [ "arm64" ], @@ -2529,9 +3356,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz", - "integrity": "sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.34.8.tgz", + "integrity": "sha512-qIP/elwR/tq/dYRx3lgwK31jkZvMiD6qUtOycLhTzCvrjbZ3LjQnEM9rNhSGpbLXVJYQ3rq39A6Re0h9tU2ynw==", "cpu": [ "x64" ], @@ -2541,10 +3368,36 @@ "darwin" ] }, + "node_modules/@rollup/rollup-freebsd-arm64": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.34.8.tgz", + "integrity": "sha512-IQNVXL9iY6NniYbTaOKdrlVP3XIqazBgJOVkddzJlqnCpRi/yAeSOa8PLcECFSQochzqApIOE1GHNu3pCz+BDA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-freebsd-x64": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.34.8.tgz", + "integrity": "sha512-TYXcHghgnCqYFiE3FT5QwXtOZqDj5GmaFNTNt3jNC+vh22dc/ukG2cG+pi75QO4kACohZzidsq7yKTKwq/Jq7Q==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ] + }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz", - "integrity": "sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.34.8.tgz", + "integrity": "sha512-A4iphFGNkWRd+5m3VIGuqHnG3MVnqKe7Al57u9mwgbyZ2/xF9Jio72MaY7xxh+Y87VAHmGQr73qoKL9HPbXj1g==", "cpu": [ "arm" ], @@ -2555,9 +3408,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz", - "integrity": "sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.34.8.tgz", + "integrity": "sha512-S0lqKLfTm5u+QTxlFiAnb2J/2dgQqRy/XvziPtDd1rKZFXHTyYLoVL58M/XFwDI01AQCDIevGLbQrMAtdyanpA==", "cpu": [ "arm" ], @@ -2568,9 +3421,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz", - "integrity": "sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.34.8.tgz", + "integrity": "sha512-jpz9YOuPiSkL4G4pqKrus0pn9aYwpImGkosRKwNi+sJSkz+WU3anZe6hi73StLOQdfXYXC7hUfsQlTnjMd3s1A==", "cpu": [ "arm64" ], @@ -2581,9 +3434,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz", - "integrity": "sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.34.8.tgz", + "integrity": "sha512-KdSfaROOUJXgTVxJNAZ3KwkRc5nggDk+06P6lgi1HLv1hskgvxHUKZ4xtwHkVYJ1Rep4GNo+uEfycCRRxht7+Q==", "cpu": [ "arm64" ], @@ -2593,10 +3446,23 @@ "linux" ] }, + "node_modules/@rollup/rollup-linux-loongarch64-gnu": { + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.34.8.tgz", + "integrity": "sha512-NyF4gcxwkMFRjgXBM6g2lkT58OWztZvw5KkV2K0qqSnUEqCVcqdh2jN4gQrTn/YUpAcNKyFHfoOZEer9nwo6uQ==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz", - "integrity": "sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.34.8.tgz", + "integrity": "sha512-LMJc999GkhGvktHU85zNTDImZVUCJ1z/MbAJTnviiWmmjyckP5aQsHtcujMjpNdMZPT2rQEDBlJfubhs3jsMfw==", "cpu": [ "ppc64" ], @@ -2607,9 +3473,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz", - "integrity": "sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.34.8.tgz", + "integrity": "sha512-xAQCAHPj8nJq1PI3z8CIZzXuXCstquz7cIOL73HHdXiRcKk8Ywwqtx2wrIy23EcTn4aZ2fLJNBB8d0tQENPCmw==", "cpu": [ "riscv64" ], @@ -2620,9 +3486,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz", - "integrity": "sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.34.8.tgz", + "integrity": "sha512-DdePVk1NDEuc3fOe3dPPTb+rjMtuFw89gw6gVWxQFAuEqqSdDKnrwzZHrUYdac7A7dXl9Q2Vflxpme15gUWQFA==", "cpu": [ "s390x" ], @@ -2633,9 +3499,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz", - "integrity": "sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.8.tgz", + "integrity": "sha512-8y7ED8gjxITUltTUEJLQdgpbPh1sUQ0kMTmufRF/Ns5tI9TNMNlhWtmPKKHCU0SilX+3MJkZ0zERYYGIVBYHIA==", "cpu": [ "x64" ], @@ -2646,9 +3512,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz", - "integrity": "sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.8.tgz", + "integrity": "sha512-SCXcP0ZpGFIe7Ge+McxY5zKxiEI5ra+GT3QRxL0pMMtxPfpyLAKleZODi1zdRHkz5/BhueUrYtYVgubqe9JBNQ==", "cpu": [ "x64" ], @@ -2659,9 +3525,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz", - "integrity": "sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.34.8.tgz", + "integrity": "sha512-YHYsgzZgFJzTRbth4h7Or0m5O74Yda+hLin0irAIobkLQFRQd1qWmnoVfwmKm9TXIZVAD0nZ+GEb2ICicLyCnQ==", "cpu": [ "arm64" ], @@ -2672,9 +3538,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz", - "integrity": "sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.34.8.tgz", + "integrity": "sha512-r3NRQrXkHr4uWy5TOjTpTYojR9XmF0j/RYgKCef+Ag46FWUTltm5ziticv8LdNsDMehjJ543x/+TJAek/xBA2w==", "cpu": [ "ia32" ], @@ -2685,9 +3551,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz", - "integrity": "sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.34.8.tgz", + "integrity": "sha512-U0FaE5O1BCpZSeE6gBl3c5ObhePQSfk9vDRToMmTkbhCOgW4jqvtS5LGyQ76L1fH8sM0keRp4uDTsbjiUyjk0g==", "cpu": [ "x64" ], @@ -2698,13 +3564,13 @@ ] }, "node_modules/@schematics/angular": { - "version": "18.2.10", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.2.10.tgz", - "integrity": "sha512-2pDHT4aSzfs8Up4RQmHHuFd5FeuUebS1ZJwyt46MfXzRMFtzUZV/JKsIvDqyMwnkvFfLvgJyTCkl8JGw5jQObg==", + "version": "19.2.6", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-19.2.6.tgz", + "integrity": "sha512-fmbF9ONmEZqxHocCwOSWG2mHp4a22d1uW+DZUBUgZSBUFIrnFw42deOxDq8mkZOZ1Tc73UpLN2GKI7iJeUqS2A==", "dev": true, "dependencies": { - "@angular-devkit/core": "18.2.10", - "@angular-devkit/schematics": "18.2.10", + "@angular-devkit/core": "19.2.6", + "@angular-devkit/schematics": "19.2.6", "jsonc-parser": "3.3.1" }, "engines": { @@ -2713,110 +3579,124 @@ "yarn": ">= 1.13.0" } }, + "node_modules/@siemens/ngx-datatable": { + "version": "22.4.1", + "resolved": "https://registry.npmjs.org/@siemens/ngx-datatable/-/ngx-datatable-22.4.1.tgz", + "integrity": "sha512-Z19zaxu7tpwMHWc1h5Om9/sZJ39MWTQypju6T6WH7QIkelKgZE7DbYk3siD41vkR/62vT+q0Z1voC2OyxgRX9g==", + "dependencies": { + "tslib": "^2.3.0" + }, + "peerDependencies": { + "@angular/common": ">=17.0.0", + "@angular/core": ">=17.0.0", + "@angular/platform-browser": ">=17.0.0", + "rxjs": "^7.8.0" + } + }, "node_modules/@sigstore/bundle": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.3.2.tgz", - "integrity": "sha512-wueKWDk70QixNLB363yHc2D2ItTgYiMTdPwK8D9dKQMR3ZQ0c35IxP5xnwQ8cNLoCgCRcHf14kE+CLIvNX1zmA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-3.1.0.tgz", + "integrity": "sha512-Mm1E3/CmDDCz3nDhFKTuYdB47EdRFRQMOE/EAbiG1MJW77/w1b3P7Qx7JSrVJs8PfwOLOVcKQCHErIwCTyPbag==", "dev": true, "dependencies": { - "@sigstore/protobuf-specs": "^0.3.2" + "@sigstore/protobuf-specs": "^0.4.0" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@sigstore/core": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-1.1.0.tgz", - "integrity": "sha512-JzBqdVIyqm2FRQCulY6nbQzMpJJpSiJ8XXWMhtOX9eKgaXXpfNOF53lzQEjIydlStnd/eFtuC1dW4VYdD93oRg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-2.0.0.tgz", + "integrity": "sha512-nYxaSb/MtlSI+JWcwTHQxyNmWeWrUXJJ/G4liLrGG7+tS4vAz6LF3xRXqLH6wPIVUoZQel2Fs4ddLx4NCpiIYg==", "dev": true, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@sigstore/protobuf-specs": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.2.tgz", - "integrity": "sha512-c6B0ehIWxMI8wiS/bj6rHMPqeFvngFV7cDU/MY+B16P9Z3Mp9k8L93eYZ7BYzSickzuqAQqAq0V956b3Ju6mLw==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.4.0.tgz", + "integrity": "sha512-o09cLSIq9EKyRXwryWDOJagkml9XgQCoCSRjHOnHLnvsivaW7Qznzz6yjfV7PHJHhIvyp8OH7OX8w0Dc5bQK7A==", "dev": true, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@sigstore/sign": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-2.3.2.tgz", - "integrity": "sha512-5Vz5dPVuunIIvC5vBb0APwo7qKA4G9yM48kPWJT+OEERs40md5GoUR1yedwpekWZ4m0Hhw44m6zU+ObsON+iDA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-3.1.0.tgz", + "integrity": "sha512-knzjmaOHOov1Ur7N/z4B1oPqZ0QX5geUfhrVaqVlu+hl0EAoL4o+l0MSULINcD5GCWe3Z0+YJO8ues6vFlW0Yw==", "dev": true, "dependencies": { - "@sigstore/bundle": "^2.3.2", - "@sigstore/core": "^1.0.0", - "@sigstore/protobuf-specs": "^0.3.2", - "make-fetch-happen": "^13.0.1", - "proc-log": "^4.2.0", + "@sigstore/bundle": "^3.1.0", + "@sigstore/core": "^2.0.0", + "@sigstore/protobuf-specs": "^0.4.0", + "make-fetch-happen": "^14.0.2", + "proc-log": "^5.0.0", "promise-retry": "^2.0.1" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@sigstore/tuf": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.3.4.tgz", - "integrity": "sha512-44vtsveTPUpqhm9NCrbU8CWLe3Vck2HO1PNLw7RIajbB7xhtn5RBPm1VNSCMwqGYHhDsBJG8gDF0q4lgydsJvw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-3.1.0.tgz", + "integrity": "sha512-suVMQEA+sKdOz5hwP9qNcEjX6B45R+hFFr4LAWzbRc5O+U2IInwvay/bpG5a4s+qR35P/JK/PiKiRGjfuLy1IA==", "dev": true, "dependencies": { - "@sigstore/protobuf-specs": "^0.3.2", - "tuf-js": "^2.2.1" + "@sigstore/protobuf-specs": "^0.4.0", + "tuf-js": "^3.0.1" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@sigstore/verify": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-1.2.1.tgz", - "integrity": "sha512-8iKx79/F73DKbGfRf7+t4dqrc0bRr0thdPrxAtCKWRm/F0tG71i6O1rvlnScncJLLBZHn3h8M3c1BSUAb9yu8g==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-2.1.0.tgz", + "integrity": "sha512-kAAM06ca4CzhvjIZdONAL9+MLppW3K48wOFy1TbuaWFW/OMfl8JuTgW0Bm02JB1WJGT/ET2eqav0KTEKmxqkIA==", "dev": true, "dependencies": { - "@sigstore/bundle": "^2.3.2", - "@sigstore/core": "^1.1.0", - "@sigstore/protobuf-specs": "^0.3.2" + "@sigstore/bundle": "^3.1.0", + "@sigstore/core": "^2.0.0", + "@sigstore/protobuf-specs": "^0.4.0" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@swimlane/ngx-charts": { - "version": "20.5.0", - "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-20.5.0.tgz", - "integrity": "sha512-PNBIHdu/R3ceD7jnw1uCBVOj4k3T6IxfdW6xsDsglGkZyoWMEEq4tLoEurjLEKzmDtRv9c35kVNOXy0lkOuXeA==", + "version": "22.0.0-alpha.0", + "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-22.0.0-alpha.0.tgz", + "integrity": "sha512-sauI4QcfpuKXmRWajpeVtAoT7z8uI3u1+hvfcsJ796LRr06C676dkjoZsk7aX3EU+6uF8mJpXClOT/JcfnZrEA==", "dependencies": { - "d3-array": "^3.1.1", + "d3-array": "^3.2.0", "d3-brush": "^3.0.0", "d3-color": "^3.1.0", "d3-ease": "^3.0.1", "d3-format": "^3.1.0", - "d3-hierarchy": "^3.1.0", + "d3-hierarchy": "^3.1.2", "d3-interpolate": "^3.0.1", "d3-sankey": "^0.12.3", "d3-scale": "^4.0.2", "d3-selection": "^3.0.0", "d3-shape": "^3.2.0", - "d3-time-format": "^3.0.0", + "d3-time-format": "^4.1.0", "d3-transition": "^3.0.1", - "rfdc": "^1.3.0", - "tslib": "^2.0.0" + "gradient-path": "^2.3.0", + "tslib": "^2.3.1" }, "peerDependencies": { - "@angular/animations": ">=12.0.0", - "@angular/cdk": ">=12.0.0", - "@angular/common": ">=12.0.0", - "@angular/core": ">=12.0.0", - "@angular/forms": ">=12.0.0", - "@angular/platform-browser": ">=12.0.0", - "@angular/platform-browser-dynamic": ">=12.0.0", - "rxjs": "^6.5.3 || ^7.4.0" + "@angular/animations": "17.x || 18.x || 19.x", + "@angular/cdk": "17.x || 18.x || 19.x", + "@angular/common": "17.x || 18.x || 19.x", + "@angular/core": "17.x || 18.x || 19.x", + "@angular/forms": "17.x || 18.x || 19.x", + "@angular/platform-browser": "17.x || 18.x || 19.x", + "@angular/platform-browser-dynamic": "17.x || 18.x || 19.x", + "rxjs": "7.x" } }, "node_modules/@tsconfig/node10": { @@ -2853,22 +3733,22 @@ } }, "node_modules/@tufjs/models": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-2.0.1.tgz", - "integrity": "sha512-92F7/SFyufn4DXsha9+QfKnN03JGqtMFMXgSHbZOo8JG59WkTni7UzAouNQDf7AuP9OAMxVOPQcqG3sB7w+kkg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-3.0.1.tgz", + "integrity": "sha512-UUYHISyhCU3ZgN8yaear3cGATHb3SMuKHsQ/nVbHXcmnBf+LzQ/cQfhNG+rfaSHgqGKNEm2cOCLVLELStUQ1JA==", "dev": true, "dependencies": { "@tufjs/canonical-json": "2.0.0", - "minimatch": "^9.0.4" + "minimatch": "^9.0.5" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/@tweenjs/tween.js": { - "version": "23.1.3", - "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-23.1.3.tgz", - "integrity": "sha512-vJmvvwFxYuGnF2axRtPYocag6Clbb5YS7kLL+SO/TeVFzHqDIWrNKYtcsPMibjDx9O+bu+psAy9NKfWklassUA==" + "version": "25.0.0", + "resolved": "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-25.0.0.tgz", + "integrity": "sha512-XKLA6syeBUaPzx4j3qwMqzzq+V4uo72BnlbOjmuljLrRqdsd3qnzvZZoxvMHZ23ndsRS4aufU6JOZYpCbU6T1A==" }, "node_modules/@types/babel__core": { "version": "7.20.5", @@ -3161,9 +4041,9 @@ } }, "node_modules/@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", + "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", "dev": true }, "node_modules/@types/file-saver": { @@ -3178,51 +4058,47 @@ "integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==", "dev": true }, - "node_modules/@types/luxon": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.4.2.tgz", - "integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA==", + "node_modules/@types/json-schema": { + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", "dev": true }, - "node_modules/@types/mute-stream": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/@types/mute-stream/-/mute-stream-0.0.4.tgz", - "integrity": "sha512-CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==", - "dev": true, - "dependencies": { - "@types/node": "*" - } + "node_modules/@types/luxon": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.6.2.tgz", + "integrity": "sha512-R/BdP7OxEMc44l2Ex5lSXHoIXTB2JLNa3y2QISIbr58U/YcsffyQrYW//hZSdrfxrjRZj3GcUoxMPGdO8gSYuw==", + "dev": true }, "node_modules/@types/node": { - "version": "22.8.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.8.0.tgz", - "integrity": "sha512-84rafSBHC/z1i1E3p0cJwKA+CfYDNSXX9WSZBRopjIzLET8oNt6ht2tei4C7izwDeEiLLfdeSVBv1egOH916hg==", + "version": "22.13.13", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.13.tgz", + "integrity": "sha512-ClsL5nMwKaBRwPcCvH8E7+nU4GxHVx1axNvMZTFHMEfNI7oahimt26P5zjVCRrjiIWj6YFXfE1v3dEp94wLcGQ==", "dev": true, "dependencies": { - "undici-types": "~6.19.8" + "undici-types": "~6.20.0" } }, - "node_modules/@types/wrap-ansi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz", - "integrity": "sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==", - "dev": true + "node_modules/@types/tinycolor2": { + "version": "1.4.6", + "resolved": "https://registry.npmjs.org/@types/tinycolor2/-/tinycolor2-1.4.6.tgz", + "integrity": "sha512-iEN8J0BoMnsWBqjVbWH/c0G0Hh7O21lpR2/+PrvAVgWdzL7eexIFm4JN/Wn10PTcmNdtS6U67r499mlWMXOxNw==" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.11.0.tgz", - "integrity": "sha512-KhGn2LjW1PJT2A/GfDpiyOfS4a8xHQv2myUagTM5+zsormOmBlYsnQ6pobJ8XxJmh6hnHwa2Mbe3fPrDJoDhbA==", + "version": "8.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.28.0.tgz", + "integrity": "sha512-lvFK3TCGAHsItNdWZ/1FkvpzCxTHUVuFrdnOGLMa0GGCFIbCgQWVk3CzCGdA7kM3qGVc+dfW9tr0Z/sHnGDFyg==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.11.0", - "@typescript-eslint/type-utils": "8.11.0", - "@typescript-eslint/utils": "8.11.0", - "@typescript-eslint/visitor-keys": "8.11.0", + "@typescript-eslint/scope-manager": "8.28.0", + "@typescript-eslint/type-utils": "8.28.0", + "@typescript-eslint/utils": "8.28.0", + "@typescript-eslint/visitor-keys": "8.28.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", - "ts-api-utils": "^1.3.0" + "ts-api-utils": "^2.0.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3233,24 +4109,20 @@ }, "peerDependencies": { "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0", - "eslint": "^8.57.0 || ^9.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/parser": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.11.0.tgz", - "integrity": "sha512-lmt73NeHdy1Q/2ul295Qy3uninSqi6wQI18XwSpm8w0ZbQXUpjCAWP1Vlv/obudoBiIjJVjlztjQ+d/Md98Yxg==", + "version": "8.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.28.0.tgz", + "integrity": "sha512-LPcw1yHD3ToaDEoljFEfQ9j2xShY367h7FZ1sq5NJT9I3yj4LHer1Xd1yRSOdYy9BpsrxU7R+eoDokChYM53lQ==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "8.11.0", - "@typescript-eslint/types": "8.11.0", - "@typescript-eslint/typescript-estree": "8.11.0", - "@typescript-eslint/visitor-keys": "8.11.0", + "@typescript-eslint/scope-manager": "8.28.0", + "@typescript-eslint/types": "8.28.0", + "@typescript-eslint/typescript-estree": "8.28.0", + "@typescript-eslint/visitor-keys": "8.28.0", "debug": "^4.3.4" }, "engines": { @@ -3261,22 +4133,18 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.11.0.tgz", - "integrity": "sha512-Uholz7tWhXmA4r6epo+vaeV7yjdKy5QFCERMjs1kMVsLRKIrSdM6o21W2He9ftp5PP6aWOVpD5zvrvuHZC0bMQ==", + "version": "8.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.28.0.tgz", + "integrity": "sha512-u2oITX3BJwzWCapoZ/pXw6BCOl8rJP4Ij/3wPoGvY8XwvXflOzd1kLrDUUUAIEdJSFh+ASwdTHqtan9xSg8buw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "8.11.0", - "@typescript-eslint/visitor-keys": "8.11.0" + "@typescript-eslint/types": "8.28.0", + "@typescript-eslint/visitor-keys": "8.28.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3287,15 +4155,15 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.11.0.tgz", - "integrity": "sha512-ItiMfJS6pQU0NIKAaybBKkuVzo6IdnAhPFZA/2Mba/uBjuPQPet/8+zh5GtLHwmuFRShZx+8lhIs7/QeDHflOg==", + "version": "8.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.28.0.tgz", + "integrity": "sha512-oRoXu2v0Rsy/VoOGhtWrOKDiIehvI+YNrDk5Oqj40Mwm0Yt01FC/Q7nFqg088d3yAsR1ZcZFVfPCTTFCe/KPwg==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "8.11.0", - "@typescript-eslint/utils": "8.11.0", + "@typescript-eslint/typescript-estree": "8.28.0", + "@typescript-eslint/utils": "8.28.0", "debug": "^4.3.4", - "ts-api-utils": "^1.3.0" + "ts-api-utils": "^2.0.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3304,16 +4172,15 @@ "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/types": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.11.0.tgz", - "integrity": "sha512-tn6sNMHf6EBAYMvmPUaKaVeYvhUsrE6x+bXQTxjQRp360h1giATU0WvgeEys1spbvb5R+VpNOZ+XJmjD8wOUHw==", + "version": "8.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.28.0.tgz", + "integrity": "sha512-bn4WS1bkKEjx7HqiwG2JNB3YJdC1q6Ue7GyGlwPHyt0TnVq6TtD/hiOdTZt71sq0s7UzqBFXD8t8o2e63tXgwA==", "dev": true, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3324,19 +4191,19 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.11.0.tgz", - "integrity": "sha512-yHC3s1z1RCHoCz5t06gf7jH24rr3vns08XXhfEqzYpd6Hll3z/3g23JRi0jM8A47UFKNc3u/y5KIMx8Ynbjohg==", + "version": "8.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.28.0.tgz", + "integrity": "sha512-H74nHEeBGeklctAVUvmDkxB1mk+PAZ9FiOMPFncdqeRBXxk1lWSYraHw8V12b7aa6Sg9HOBNbGdSHobBPuQSuA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "8.11.0", - "@typescript-eslint/visitor-keys": "8.11.0", + "@typescript-eslint/types": "8.28.0", + "@typescript-eslint/visitor-keys": "8.28.0", "debug": "^4.3.4", "fast-glob": "^3.3.2", "is-glob": "^4.0.3", "minimatch": "^9.0.4", "semver": "^7.6.0", - "ts-api-utils": "^1.3.0" + "ts-api-utils": "^2.0.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3345,22 +4212,20 @@ "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "peerDependencies": { + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/utils": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.11.0.tgz", - "integrity": "sha512-CYiX6WZcbXNJV7UNB4PLDIBtSdRmRI/nb0FMyqHPTQD1rMjA0foPLaPUV39C/MxkTd/QKSeX+Gb34PPsDVC35g==", + "version": "8.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.28.0.tgz", + "integrity": "sha512-OELa9hbTYciYITqgurT1u/SzpQVtDLmQMFzy/N8pQE+tefOyCWT79jHsav294aTqV1q1u+VzqDGbuujvRYaeSQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.11.0", - "@typescript-eslint/types": "8.11.0", - "@typescript-eslint/typescript-estree": "8.11.0" + "@typescript-eslint/scope-manager": "8.28.0", + "@typescript-eslint/types": "8.28.0", + "@typescript-eslint/typescript-estree": "8.28.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3370,17 +4235,18 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^8.57.0 || ^9.0.0" + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <5.9.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.11.0.tgz", - "integrity": "sha512-EaewX6lxSjRJnc+99+dqzTeoDZUfyrA52d2/HRrkI830kgovWsmIiTfmr0NZorzqic7ga+1bS60lRBUgR3n/Bw==", + "version": "8.28.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.28.0.tgz", + "integrity": "sha512-hbn8SZ8w4u2pRwgQ1GlUrPKE+t2XvcCW5tTRF7j6SMYIuYG37XuzIW44JCZPa36evi0Oy2SnM664BlIaAuQcvg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "8.11.0", - "eslint-visitor-keys": "^3.4.3" + "@typescript-eslint/types": "8.28.0", + "eslint-visitor-keys": "^4.2.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3390,22 +4256,28 @@ "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@ungap/structured-clone": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", - "dev": true - }, - "node_modules/@vitejs/plugin-basic-ssl": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz", - "integrity": "sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==", + "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", "dev": true, "engines": { - "node": ">=14.6.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@vitejs/plugin-basic-ssl": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.2.0.tgz", + "integrity": "sha512-mkQnxTkcldAzIsomk1UuLfAu9n+kpQ3JbHcpCp7d2Oo6ITtji8pHS3QToOWjhPFvNQSnhlkAjmGbhv2QvwO/7Q==", + "dev": true, + "engines": { + "node": ">=14.21.3" }, "peerDependencies": { - "vite": "^3.0.0 || ^4.0.0 || ^5.0.0" + "vite": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0" } }, "node_modules/@yarnpkg/lockfile": { @@ -3415,12 +4287,12 @@ "dev": true }, "node_modules/abbrev": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", - "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-3.0.0.tgz", + "integrity": "sha512-+/kfrslGQ7TNV2ecmQwMJj/B65g5KVq1/L3SGVZ3tCYGqlzFuFCGBZJtMP99wH3NpEUyAjn0zPdPUg0D+DwrOA==", "dev": true, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/abort-controller": { @@ -3435,9 +4307,9 @@ } }, "node_modules/acorn": { - "version": "8.11.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", - "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", + "version": "8.14.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", + "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -3465,30 +4337,14 @@ } }, "node_modules/agent-base": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz", - "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", + "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==", "dev": true, - "dependencies": { - "debug": "^4.3.4" - }, "engines": { "node": ">= 14" } }, - "node_modules/aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "dependencies": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/ajv": { "version": "8.17.1", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", @@ -3505,6 +4361,23 @@ "url": "https://github.com/sponsors/epoberezkin" } }, + "node_modules/ajv-formats": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz", + "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==", + "dev": true, + "dependencies": { + "ajv": "^8.0.0" + }, + "peerDependencies": { + "ajv": "^8.0.0" + }, + "peerDependenciesMeta": { + "ajv": { + "optional": true + } + } + }, "node_modules/ansi-escapes": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", @@ -3542,37 +4415,17 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "dev": true, - "dependencies": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/anymatch/node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, "node_modules/arg": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", "dev": true }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + }, "node_modules/aria-query": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz", @@ -3615,16 +4468,23 @@ } ] }, - "node_modules/binary-extensions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", - "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "node_modules/beasties": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/beasties/-/beasties-0.2.0.tgz", + "integrity": "sha512-Ljqskqx/tbZagIglYoJIMzH5zgssyp+in9+9sAyh15N22AornBeIDnb8EZ6Rk+6ShfMxd92uO3gfpT0NtZbpow==", "dev": true, - "engines": { - "node": ">=8" + "dependencies": { + "css-select": "^5.1.0", + "css-what": "^6.1.0", + "dom-serializer": "^2.0.0", + "domhandler": "^5.0.3", + "htmlparser2": "^9.1.0", + "picocolors": "^1.1.1", + "postcss": "^8.4.49", + "postcss-media-query-parser": "^0.2.3" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "engines": { + "node": ">=14.0.0" } }, "node_modules/bl": { @@ -3734,13 +4594,19 @@ "ieee754": "^1.1.13" } }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true + }, "node_modules/cacache": { - "version": "18.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz", - "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==", + "version": "19.0.1", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-19.0.1.tgz", + "integrity": "sha512-hdsUxulXCi5STId78vRVYEtDAjq99ICAUktLTeTYsLoTE6Z8dS0c8pWNCxwdrk9YfJeobDZc2Y186hD/5ZQgFQ==", "dev": true, "dependencies": { - "@npmcli/fs": "^3.1.0", + "@npmcli/fs": "^4.0.0", "fs-minipass": "^3.0.0", "glob": "^10.2.2", "lru-cache": "^10.0.1", @@ -3748,13 +4614,22 @@ "minipass-collect": "^2.0.1", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", - "p-map": "^4.0.0", - "ssri": "^10.0.0", - "tar": "^6.1.11", - "unique-filename": "^3.0.0" + "p-map": "^7.0.2", + "ssri": "^12.0.0", + "tar": "^7.4.3", + "unique-filename": "^4.0.0" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" + } + }, + "node_modules/cacache/node_modules/chownr": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", + "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==", + "dev": true, + "engines": { + "node": ">=18" } }, "node_modules/cacache/node_modules/lru-cache": { @@ -3763,6 +4638,47 @@ "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", "dev": true }, + "node_modules/cacache/node_modules/mkdirp": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", + "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==", + "dev": true, + "bin": { + "mkdirp": "dist/cjs/src/bin.js" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/cacache/node_modules/tar": { + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz", + "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==", + "dev": true, + "dependencies": { + "@isaacs/fs-minipass": "^4.0.0", + "chownr": "^3.0.0", + "minipass": "^7.1.2", + "minizlib": "^3.0.1", + "mkdirp": "^3.0.1", + "yallist": "^5.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/cacache/node_modules/yallist": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", + "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==", + "dev": true, + "engines": { + "node": ">=18" + } + }, "node_modules/callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -3772,9 +4688,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001669", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz", - "integrity": "sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==", + "version": "1.0.30001707", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001707.tgz", + "integrity": "sha512-3qtRjw/HQSMlDWf+X79N206fepf4SOOU6SQLMaq/0KkZLmSjPxAkBOQQ+FxbHKfHmYLZFfdWsO3KA90ceHPSnw==", "funding": [ { "type": "opencollective", @@ -3816,30 +4732,6 @@ "resolved": "https://registry.npmjs.org/charts.css/-/charts.css-1.1.0.tgz", "integrity": "sha512-K1Qyb8ZKsu5cDrVbZeHECk/xSq6iOl8IDTR35uaMdhr/Vyyxvg9nYQy3KNB3aidxJ2E251afX5q2725N0uL3Vw==" }, - "node_modules/chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", - "dev": true, - "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - }, - "engines": { - "node": ">= 8.10.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, "node_modules/chownr": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", @@ -3849,15 +4741,6 @@ "node": ">=10" } }, - "node_modules/clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/cli-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", @@ -4023,7 +4906,8 @@ "node_modules/convert-source-map": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true }, "node_modules/cosmiconfig": { "version": "8.3.6", @@ -4050,47 +4934,16 @@ } } }, - "node_modules/cosmiconfig/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" - }, - "node_modules/cosmiconfig/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, "node_modules/create-require": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", "dev": true }, - "node_modules/critters": { - "version": "0.0.24", - "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.24.tgz", - "integrity": "sha512-Oyqew0FGM0wYUSNqR0L6AteO5MpMoUU0rhKRieXeiKs+PmRTxiJMyaunYB2KF6fQ3dzChXKCpbFOEJx3OQ1v/Q==", - "dev": true, - "dependencies": { - "chalk": "^4.1.0", - "css-select": "^5.1.0", - "dom-serializer": "^2.0.0", - "domhandler": "^5.0.2", - "htmlparser2": "^8.0.2", - "postcss": "^8.4.23", - "postcss-media-query-parser": "^0.2.3" - } - }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -4306,34 +5159,16 @@ } }, "node_modules/d3-time-format": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz", - "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz", + "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==", "dependencies": { - "d3-time": "1 - 2" + "d3-time": "1 - 3" + }, + "engines": { + "node": ">=12" } }, - "node_modules/d3-time-format/node_modules/d3-array": { - "version": "2.12.1", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz", - "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==", - "dependencies": { - "internmap": "^1.0.0" - } - }, - "node_modules/d3-time-format/node_modules/d3-time": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz", - "integrity": "sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==", - "dependencies": { - "d3-array": "2" - } - }, - "node_modules/d3-time-format/node_modules/internmap": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz", - "integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==" - }, "node_modules/d3-timer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz", @@ -4409,6 +5244,7 @@ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz", "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==", "dev": true, + "optional": true, "engines": { "node": ">=8" } @@ -4430,18 +5266,6 @@ "node": ">=0.3.1" } }, - "node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/dom-serializer": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", @@ -4492,9 +5316,9 @@ } }, "node_modules/domutils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", - "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz", + "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==", "dev": true, "dependencies": { "dom-serializer": "^2.0.0", @@ -4530,6 +5354,7 @@ "version": "0.1.13", "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", + "dev": true, "optional": true, "dependencies": { "iconv-lite": "^0.6.2" @@ -4539,6 +5364,7 @@ "version": "0.6.3", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dev": true, "optional": true, "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" @@ -4551,7 +5377,6 @@ "version": "4.5.0", "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", - "devOptional": true, "engines": { "node": ">=0.12" }, @@ -4595,9 +5420,9 @@ } }, "node_modules/esbuild": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.0.tgz", - "integrity": "sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA==", + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.1.tgz", + "integrity": "sha512-BGO5LtrGC7vxnqucAe/rmvKdJllfGaYWdyABvyMoXQlfYMb2bbRuReWR5tEGE//4LcNJj9XrkovTqNYRFZHAMQ==", "dev": true, "hasInstallScript": true, "bin": { @@ -4607,30 +5432,31 @@ "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.23.0", - "@esbuild/android-arm": "0.23.0", - "@esbuild/android-arm64": "0.23.0", - "@esbuild/android-x64": "0.23.0", - "@esbuild/darwin-arm64": "0.23.0", - "@esbuild/darwin-x64": "0.23.0", - "@esbuild/freebsd-arm64": "0.23.0", - "@esbuild/freebsd-x64": "0.23.0", - "@esbuild/linux-arm": "0.23.0", - "@esbuild/linux-arm64": "0.23.0", - "@esbuild/linux-ia32": "0.23.0", - "@esbuild/linux-loong64": "0.23.0", - "@esbuild/linux-mips64el": "0.23.0", - "@esbuild/linux-ppc64": "0.23.0", - "@esbuild/linux-riscv64": "0.23.0", - "@esbuild/linux-s390x": "0.23.0", - "@esbuild/linux-x64": "0.23.0", - "@esbuild/netbsd-x64": "0.23.0", - "@esbuild/openbsd-arm64": "0.23.0", - "@esbuild/openbsd-x64": "0.23.0", - "@esbuild/sunos-x64": "0.23.0", - "@esbuild/win32-arm64": "0.23.0", - "@esbuild/win32-ia32": "0.23.0", - "@esbuild/win32-x64": "0.23.0" + "@esbuild/aix-ppc64": "0.25.1", + "@esbuild/android-arm": "0.25.1", + "@esbuild/android-arm64": "0.25.1", + "@esbuild/android-x64": "0.25.1", + "@esbuild/darwin-arm64": "0.25.1", + "@esbuild/darwin-x64": "0.25.1", + "@esbuild/freebsd-arm64": "0.25.1", + "@esbuild/freebsd-x64": "0.25.1", + "@esbuild/linux-arm": "0.25.1", + "@esbuild/linux-arm64": "0.25.1", + "@esbuild/linux-ia32": "0.25.1", + "@esbuild/linux-loong64": "0.25.1", + "@esbuild/linux-mips64el": "0.25.1", + "@esbuild/linux-ppc64": "0.25.1", + "@esbuild/linux-riscv64": "0.25.1", + "@esbuild/linux-s390x": "0.25.1", + "@esbuild/linux-x64": "0.25.1", + "@esbuild/netbsd-arm64": "0.25.1", + "@esbuild/netbsd-x64": "0.25.1", + "@esbuild/openbsd-arm64": "0.25.1", + "@esbuild/openbsd-x64": "0.25.1", + "@esbuild/sunos-x64": "0.25.1", + "@esbuild/win32-arm64": "0.25.1", + "@esbuild/win32-ia32": "0.25.1", + "@esbuild/win32-x64": "0.25.1" } }, "node_modules/escalade": { @@ -4642,64 +5468,69 @@ } }, "node_modules/eslint": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", - "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", + "version": "9.23.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.23.0.tgz", + "integrity": "sha512-jV7AbNoFPAY1EkFYpLq5bslU9NLNO8xnEeQXwErNibVryjk67wHVmddTBilc5srIttJDBrB0eMHKZBFbSIABCw==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.0", - "@humanwhocodes/config-array": "^0.11.14", + "@eslint-community/regexpp": "^4.12.1", + "@eslint/config-array": "^0.19.2", + "@eslint/config-helpers": "^0.2.0", + "@eslint/core": "^0.12.0", + "@eslint/eslintrc": "^3.3.1", + "@eslint/js": "9.23.0", + "@eslint/plugin-kit": "^0.2.7", + "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "@ungap/structured-clone": "^1.2.0", + "@humanwhocodes/retry": "^0.4.2", + "@types/estree": "^1.0.6", + "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", + "cross-spawn": "^7.0.6", "debug": "^4.3.2", - "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.3", - "espree": "^9.6.1", - "esquery": "^1.4.2", + "eslint-scope": "^8.3.0", + "eslint-visitor-keys": "^4.2.0", + "espree": "^10.3.0", + "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", + "file-entry-cache": "^8.0.0", "find-up": "^5.0.0", "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "graphemer": "^1.4.0", "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", - "text-table": "^0.2.0" + "optionator": "^0.9.3" }, "bin": { "eslint": "bin/eslint.js" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { - "url": "https://opencollective.com/eslint" + "url": "https://eslint.org/donate" + }, + "peerDependencies": { + "jiti": "*" + }, + "peerDependenciesMeta": { + "jiti": { + "optional": true + } } }, "node_modules/eslint-scope": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.1.0.tgz", - "integrity": "sha512-14dSvlhaVhKKsa9Fx1l8A17s7ah7Ef7wCakJ10LYk6+GYmP9yDti2oq2SEwcyndt6knfcZyhyxwY3i9yL78EQw==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz", + "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==", "dev": true, "dependencies": { "esrecurse": "^4.3.0", @@ -4740,12 +5571,6 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/eslint/node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, "node_modules/eslint/node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -4768,17 +5593,13 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/eslint/node_modules/eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "node_modules/eslint/node_modules/eslint-visitor-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" @@ -4812,33 +5633,6 @@ "node": ">=10.13.0" } }, - "node_modules/eslint/node_modules/globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", - "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, "node_modules/eslint/node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -4902,30 +5696,30 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/eslint/node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/espree": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", + "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", "dev": true, "dependencies": { - "acorn": "^8.9.0", + "acorn": "^8.14.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.1" + "eslint-visitor-keys": "^4.2.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree/node_modules/eslint-visitor-keys": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", + "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "dev": true, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" @@ -4981,6 +5775,12 @@ "node": ">=6" } }, + "node_modules/eventemitter3": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", + "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==", + "dev": true + }, "node_modules/eventsource": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz", @@ -4990,9 +5790,9 @@ } }, "node_modules/exponential-backoff": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz", - "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz", + "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==", "dev": true }, "node_modules/external-editor": { @@ -5009,18 +5809,6 @@ "node": ">=4" } }, - "node_modules/external-editor/node_modules/tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "dependencies": { - "os-tmpdir": "~1.0.2" - }, - "engines": { - "node": ">=0.6.0" - } - }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -5028,15 +5816,15 @@ "dev": true }, "node_modules/fast-glob": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", - "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", + "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", "glob-parent": "^5.1.2", "merge2": "^1.3.0", - "micromatch": "^4.0.4" + "micromatch": "^4.0.8" }, "engines": { "node": ">=8.6.0" @@ -5078,15 +5866,15 @@ } }, "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", + "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", "dev": true, "dependencies": { - "flat-cache": "^3.0.4" + "flat-cache": "^4.0.0" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=16.0.0" } }, "node_modules/file-saver": { @@ -5105,35 +5893,23 @@ "node": ">=8" } }, - "node_modules/flat": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/flat/-/flat-6.0.1.tgz", - "integrity": "sha512-/3FfIa8mbrg3xE7+wAhWeV+bd7L2Mof+xtZb5dRDKZ+wDvYJK4WDYeIOuOhre5Yv5aQObZrlbRmk3RTSiuQBtw==", - "bin": { - "flat": "cli.js" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/flat-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", - "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", + "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", "dev": true, "dependencies": { "flatted": "^3.2.9", - "keyv": "^4.5.3", - "rimraf": "^3.0.2" + "keyv": "^4.5.4" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=16" } }, "node_modules/flatted": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", + "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", "dev": true }, "node_modules/foreground-child": { @@ -5283,6 +6059,14 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" }, + "node_modules/gradient-path": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/gradient-path/-/gradient-path-2.3.0.tgz", + "integrity": "sha512-vZdF/Z0EpqUztzWXFjFC16lqcialHacYoRonslk/bC6CuujkuIrqx7etlzdYHY4SnUU94LRWESamZKfkGh7yYQ==", + "dependencies": { + "tinygradient": "^1.0.0" + } + }, "node_modules/graphemer": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", @@ -5325,15 +6109,15 @@ } }, "node_modules/hosted-git-info": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz", - "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-8.0.2.tgz", + "integrity": "sha512-sYKnA7eGln5ov8T8gnYlkSOxFJvywzEx9BueN6xo/GKO8PGiI6uK6xx+DIGe45T3bdVjLAQDQW1aicT8z8JwQg==", "dev": true, "dependencies": { "lru-cache": "^10.0.1" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/hosted-git-info/node_modules/lru-cache": { @@ -5349,9 +6133,9 @@ "dev": true }, "node_modules/htmlparser2": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz", - "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz", + "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==", "dev": true, "funding": [ "https://github.com/fb55/htmlparser2?sponsor=1", @@ -5363,8 +6147,8 @@ "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.3", - "domutils": "^3.0.1", - "entities": "^4.4.0" + "domutils": "^3.1.0", + "entities": "^4.5.0" } }, "node_modules/http-cache-semantics": { @@ -5387,12 +6171,12 @@ } }, "node_modules/https-proxy-agent": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", - "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", + "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", "dev": true, "dependencies": { - "agent-base": "^7.0.2", + "agent-base": "^7.1.2", "debug": "4" }, "engines": { @@ -5440,21 +6224,21 @@ } }, "node_modules/ignore-walk": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.5.tgz", - "integrity": "sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-7.0.0.tgz", + "integrity": "sha512-T4gbf83A4NH95zvhVYZc+qWocBBGlpzUXLPGurJggw/WIOwicfXJChLDP/iBZnN5WqROSu5Bm3hhle4z8a8YGQ==", "dev": true, "dependencies": { "minimatch": "^9.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/immutable": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz", - "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz", + "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==", "dev": true }, "node_modules/import-fresh": { @@ -5489,15 +6273,6 @@ "node": ">=0.8.19" } }, - "node_modules/indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -5513,12 +6288,12 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "node_modules/ini": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz", - "integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ini/-/ini-5.0.0.tgz", + "integrity": "sha512-+N0ngpO3e7cRUWOJAS7qw0IZIVc6XPrW4MlFBdD066F2L4k1L6ker3hLqSq7iXxU5tgS4WGkIUElWn5vogAEnw==", "dev": true, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/internmap": { @@ -5542,36 +6317,21 @@ "node": ">= 12" } }, - "node_modules/ip-address/node_modules/sprintf-js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", - "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", - "dev": true - }, "node_modules/is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==" }, - "node_modules/is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "node_modules/is-core-module": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", + "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", "dev": true, "dependencies": { - "binary-extensions": "^2.0.0" + "hasown": "^2.0.2" }, "engines": { - "node": ">=8" - } - }, - "node_modules/is-core-module": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", - "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", - "dev": true, - "dependencies": { - "hasown": "^2.0.0" + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5612,12 +6372,6 @@ "node": ">=8" } }, - "node_modules/is-lambda": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", - "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", - "dev": true - }, "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -5626,15 +6380,6 @@ "node": ">=0.12.0" } }, - "node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/is-unicode-supported": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", @@ -5757,6 +6502,17 @@ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, "node_modules/jsbn": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", @@ -5764,14 +6520,14 @@ "dev": true }, "node_modules/jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", + "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", "bin": { "jsesc": "bin/jsesc" }, "engines": { - "node": ">=4" + "node": ">=6" } }, "node_modules/json-buffer": { @@ -5781,12 +6537,12 @@ "dev": true }, "node_modules/json-parse-even-better-errors": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz", - "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-4.0.0.tgz", + "integrity": "sha512-lR4MXjGNgkJc7tkQ97kb2nuEMnNCyU//XYVH0MKTGcXEiSudQ5MKGKen3C5QubYy0vmq+JGitUg92uuywGEwIA==", "dev": true, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/json-schema-traverse": { @@ -5910,9 +6666,9 @@ } }, "node_modules/listr2": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.4.tgz", - "integrity": "sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==", + "version": "8.2.5", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.5.tgz", + "integrity": "sha512-iyAZCeyD+c1gPyE9qpFu8af0Y+MRtmKOncdGoA2S5EY8iFq99dmmvkNnHiWo+pj0s7yH7l3KPIgee77tKpXPWQ==", "dev": true, "dependencies": { "cli-truncate": "^4.0.0", @@ -5956,12 +6712,6 @@ "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==", "dev": true }, - "node_modules/listr2/node_modules/eventemitter3": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz", - "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==", - "dev": true - }, "node_modules/listr2/node_modules/string-width": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", @@ -6012,28 +6762,29 @@ } }, "node_modules/lmdb": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/lmdb/-/lmdb-3.0.13.tgz", - "integrity": "sha512-UGe+BbaSUQtAMZobTb4nHvFMrmvuAQKSeaqAX2meTEQjfsbpl5sxdHD8T72OnwD4GU9uwNhYXIVe4QGs8N9Zyw==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/lmdb/-/lmdb-3.2.6.tgz", + "integrity": "sha512-SuHqzPl7mYStna8WRotY8XX/EUZBjjv3QyKIByeCLFfC9uXT/OIHByEcA07PzbMfQAM0KYJtLgtpMRlIe5dErQ==", "dev": true, "hasInstallScript": true, + "optional": true, "dependencies": { - "msgpackr": "^1.10.2", + "msgpackr": "^1.11.2", "node-addon-api": "^6.1.0", "node-gyp-build-optional-packages": "5.2.2", - "ordered-binary": "^1.4.1", + "ordered-binary": "^1.5.3", "weak-lru-cache": "^1.2.2" }, "bin": { "download-lmdb-prebuilds": "bin/download-prebuilds.js" }, "optionalDependencies": { - "@lmdb/lmdb-darwin-arm64": "3.0.13", - "@lmdb/lmdb-darwin-x64": "3.0.13", - "@lmdb/lmdb-linux-arm": "3.0.13", - "@lmdb/lmdb-linux-arm64": "3.0.13", - "@lmdb/lmdb-linux-x64": "3.0.13", - "@lmdb/lmdb-win32-x64": "3.0.13" + "@lmdb/lmdb-darwin-arm64": "3.2.6", + "@lmdb/lmdb-darwin-x64": "3.2.6", + "@lmdb/lmdb-linux-arm": "3.2.6", + "@lmdb/lmdb-linux-arm64": "3.2.6", + "@lmdb/lmdb-linux-x64": "3.2.6", + "@lmdb/lmdb-win32-x64": "3.2.6" } }, "node_modules/lodash.kebabcase": { @@ -6261,17 +7012,17 @@ } }, "node_modules/luxon": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.5.0.tgz", - "integrity": "sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==", + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.6.1.tgz", + "integrity": "sha512-tJLxrKJhO2ukZ5z0gyjY1zPh3Rh88Ej9P7jNrZiHMUXHae1yvI2imgOZtL1TO8TW6biMMKfTtAOoEJANgtWBMQ==", "engines": { "node": ">=12" } }, "node_modules/magic-string": { - "version": "0.30.11", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz", - "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==", + "version": "0.30.17", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz", + "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==", "dev": true, "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0" @@ -6299,26 +7050,25 @@ "dev": true }, "node_modules/make-fetch-happen": { - "version": "13.0.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz", - "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==", + "version": "14.0.3", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-14.0.3.tgz", + "integrity": "sha512-QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ==", "dev": true, "dependencies": { - "@npmcli/agent": "^2.0.0", - "cacache": "^18.0.0", + "@npmcli/agent": "^3.0.0", + "cacache": "^19.0.1", "http-cache-semantics": "^4.1.1", - "is-lambda": "^1.0.1", "minipass": "^7.0.2", - "minipass-fetch": "^3.0.0", + "minipass-fetch": "^4.0.0", "minipass-flush": "^1.0.5", "minipass-pipeline": "^1.2.4", - "negotiator": "^0.6.3", - "proc-log": "^4.2.0", + "negotiator": "^1.0.0", + "proc-log": "^5.0.0", "promise-retry": "^2.0.1", - "ssri": "^10.0.0" + "ssri": "^12.0.0" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/merge2": { @@ -6373,9 +7123,9 @@ } }, "node_modules/minimatch": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", - "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -6387,9 +7137,9 @@ } }, "node_modules/minipass": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", - "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", "engines": { "node": ">=16 || 14 >=14.17" } @@ -6407,17 +7157,17 @@ } }, "node_modules/minipass-fetch": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", - "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-4.0.1.tgz", + "integrity": "sha512-j7U11C5HXigVuutxebFadoYBbd7VSdZWggSe64NVdvWNBqGAiXPL2QVCehjmw7lY1oF9gOllYbORh+hiNgfPgQ==", "dev": true, "dependencies": { "minipass": "^7.0.3", "minipass-sized": "^1.0.3", - "minizlib": "^2.1.2" + "minizlib": "^3.0.1" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" }, "optionalDependencies": { "encoding": "^0.1.13" @@ -6514,36 +7264,33 @@ "dev": true }, "node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.1.tgz", + "integrity": "sha512-umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==", "dev": true, "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" + "minipass": "^7.0.4", + "rimraf": "^5.0.5" }, "engines": { - "node": ">= 8" + "node": ">= 18" } }, - "node_modules/minizlib/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "node_modules/minizlib/node_modules/rimraf": { + "version": "5.0.10", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz", + "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==", "dev": true, "dependencies": { - "yallist": "^4.0.0" + "glob": "^10.3.7" }, - "engines": { - "node": ">=8" + "bin": { + "rimraf": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/minizlib/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/mkdirp": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", @@ -6557,9 +7304,9 @@ } }, "node_modules/mrmime": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz", - "integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.1.tgz", + "integrity": "sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==", "dev": true, "engines": { "node": ">=10" @@ -6571,10 +7318,11 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/msgpackr": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.0.tgz", - "integrity": "sha512-I8qXuuALqJe5laEBYoFykChhSXLikZmUhccjGsPuSJ/7uPip2TJ7lwdIQwWSAi0jGZDXv4WOP8Qg65QZRuXxXw==", + "version": "1.11.2", + "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.2.tgz", + "integrity": "sha512-F9UngXRlPyWCDEASDpTf6c9uNhGPTqnTeLVt7bN+bU1eajoR/8V9ys2BRaV5C/e5ihE6sJ9uPIKaYt6bFuO32g==", "dev": true, + "optional": true, "optionalDependencies": { "msgpackr-extract": "^3.0.2" } @@ -6602,18 +7350,18 @@ } }, "node_modules/mute-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-1.0.0.tgz", - "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-2.0.0.tgz", + "integrity": "sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==", "dev": true, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "version": "3.3.11", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", + "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", "dev": true, "funding": [ { @@ -6635,9 +7383,9 @@ "dev": true }, "node_modules/negotiator": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz", - "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", + "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==", "dev": true, "engines": { "node": ">= 0.6" @@ -6670,23 +7418,23 @@ } }, "node_modules/ng-select2-component": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/ng-select2-component/-/ng-select2-component-14.0.1.tgz", - "integrity": "sha512-eynfQXr2rtAfi6ex9E6LWOrPeG2YjoU7nzBpa0XFbxGgapXRInA+HJyASwjHN95kLY4UJs+lkG2LfBAoDXk1qg==", + "version": "17.2.4", + "resolved": "https://registry.npmjs.org/ng-select2-component/-/ng-select2-component-17.2.4.tgz", + "integrity": "sha512-pfRQg1gY1NsQkBNAYYeSYJjejKwz1z+9bKWor8/8toCNbvh9TYMOKpcz3FrNvhR6v/Hto/quddajaxjD81TOgg==", "dependencies": { - "ngx-infinite-scroll": ">=17.0.0", + "ngx-infinite-scroll": ">=18.0.0 || >=19.0.0", "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/cdk": ">=17.0.0", - "@angular/common": ">=17.0.0", - "@angular/core": ">=17.0.0" + "@angular/cdk": ">=18.1.0 || >=19.0.0", + "@angular/common": ">=18.1.0 || >=19.0.0", + "@angular/core": ">=18.1.0 || >=19.0.0" } }, "node_modules/ngx-color-picker": { - "version": "17.0.0", - "resolved": "https://registry.npmjs.org/ngx-color-picker/-/ngx-color-picker-17.0.0.tgz", - "integrity": "sha512-kHuhW4vErpb0LlBlgTnf1+cYWdaq0gOvDwiX9LeaFKNvhV5li+YEyk7tC3o1Sbhqd4lsFKb8zHyqi1teLWN4Zg==", + "version": "19.0.0", + "resolved": "https://registry.npmjs.org/ngx-color-picker/-/ngx-color-picker-19.0.0.tgz", + "integrity": "sha512-jZs7nk/DJB6FryElYnfkojWYCgpEc650s800g+39ebocVMZ18fAHf/CQd5+Bdm4E3zoRod0a0sErJ+c8tGQcCg==", "dependencies": { "tslib": "^2.3.0" }, @@ -6697,15 +7445,15 @@ } }, "node_modules/ngx-extended-pdf-viewer": { - "version": "21.4.6", - "resolved": "https://registry.npmjs.org/ngx-extended-pdf-viewer/-/ngx-extended-pdf-viewer-21.4.6.tgz", - "integrity": "sha512-+YlRznVS4tXdYYrWNRGCVY+9wJOi98giBxhYMMYFHt8FTLYPP+Fn1x3ovPnFngFYC47QEe1To3HqBVrF0Q/vZQ==", + "version": "23.0.0-alpha.7", + "resolved": "https://registry.npmjs.org/ngx-extended-pdf-viewer/-/ngx-extended-pdf-viewer-23.0.0-alpha.7.tgz", + "integrity": "sha512-S5jI9Z6p6wglLwvpf85MddxGKYUiJczb02nZcFWztDSZ7BlKXkjdtssW+chBOc/sg46p2kTDoa0M/R07yqRFcA==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/common": ">=16.0.0 <19.0.0 || ~18.1.0-rc.0", - "@angular/core": ">=16.0.0 <19.0.0 || ~18.1.0-rc.0" + "@angular/common": ">=17.0.0 <20.0.0", + "@angular/core": ">=17.0.0 <20.0.0" } }, "node_modules/ngx-file-drop": { @@ -6725,15 +7473,15 @@ } }, "node_modules/ngx-infinite-scroll": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/ngx-infinite-scroll/-/ngx-infinite-scroll-18.0.0.tgz", - "integrity": "sha512-D183TDwpsd9Zl56UmItsl3RzHdN25srAISfg6lc3A8mEKkEgOq0s7ZzRAYcx8DHsAkMgtZqjIPEvMifD3DOB/g==", + "version": "19.0.0", + "resolved": "https://registry.npmjs.org/ngx-infinite-scroll/-/ngx-infinite-scroll-19.0.0.tgz", + "integrity": "sha512-Ft4xNNDLXoDGi2hF6ylehjxbG8JIgfoL6qDWWcebGMcbh1CEfEsh0HGkDuFlX/cBBMenRh2HFbXlYq8BAtbvLw==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/common": ">=18.0.0 <19.0.0", - "@angular/core": ">=18.0.0 <19.0.0" + "@angular/common": ">=19.0.0 <20.0.0", + "@angular/core": ">=19.0.0 <20.0.0" } }, "node_modules/ngx-stars": { @@ -6761,33 +7509,12 @@ "@angular/platform-browser": ">=16.0.0-0" } }, - "node_modules/nice-napi": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz", - "integrity": "sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "!win32" - ], - "dependencies": { - "node-addon-api": "^3.0.0", - "node-gyp-build": "^4.2.2" - } - }, - "node_modules/nice-napi/node_modules/node-addon-api": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", - "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", - "dev": true, - "optional": true - }, "node_modules/node-addon-api": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz", "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==", - "dev": true + "dev": true, + "optional": true }, "node_modules/node-fetch": { "version": "2.7.0", @@ -6809,39 +7536,27 @@ } }, "node_modules/node-gyp": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz", - "integrity": "sha512-sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-11.1.0.tgz", + "integrity": "sha512-/+7TuHKnBpnMvUQnsYEb0JOozDZqarQbfNuSGLXIjhStMT0fbw7IdSqWgopOP5xhRZE+lsbIvAHcekddruPZgQ==", "dev": true, "dependencies": { "env-paths": "^2.2.0", "exponential-backoff": "^3.1.1", "glob": "^10.3.10", "graceful-fs": "^4.2.6", - "make-fetch-happen": "^13.0.0", - "nopt": "^7.0.0", - "proc-log": "^4.1.0", + "make-fetch-happen": "^14.0.3", + "nopt": "^8.0.0", + "proc-log": "^5.0.0", "semver": "^7.3.5", - "tar": "^6.2.1", - "which": "^4.0.0" + "tar": "^7.4.3", + "which": "^5.0.0" }, "bin": { "node-gyp": "bin/node-gyp.js" }, "engines": { - "node": "^16.14.0 || >=18.0.0" - } - }, - "node_modules/node-gyp-build": { - "version": "4.8.2", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz", - "integrity": "sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==", - "dev": true, - "optional": true, - "bin": { - "node-gyp-build": "bin.js", - "node-gyp-build-optional": "optional.js", - "node-gyp-build-test": "build-test.js" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/node-gyp-build-optional-packages": { @@ -6849,6 +7564,7 @@ "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.2.2.tgz", "integrity": "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==", "dev": true, + "optional": true, "dependencies": { "detect-libc": "^2.0.1" }, @@ -6858,6 +7574,15 @@ "node-gyp-build-optional-packages-test": "build-test.js" } }, + "node_modules/node-gyp/node_modules/chownr": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", + "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==", + "dev": true, + "engines": { + "node": ">=18" + } + }, "node_modules/node-gyp/node_modules/isexe": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", @@ -6867,10 +7592,42 @@ "node": ">=16" } }, + "node_modules/node-gyp/node_modules/mkdirp": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", + "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==", + "dev": true, + "bin": { + "mkdirp": "dist/cjs/src/bin.js" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/node-gyp/node_modules/tar": { + "version": "7.4.3", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz", + "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==", + "dev": true, + "dependencies": { + "@isaacs/fs-minipass": "^4.0.0", + "chownr": "^3.0.0", + "minipass": "^7.1.2", + "minizlib": "^3.0.1", + "mkdirp": "^3.0.1", + "yallist": "^5.0.0" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/node-gyp/node_modules/which": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", - "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz", + "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==", "dev": true, "dependencies": { "isexe": "^3.1.1" @@ -6879,7 +7636,16 @@ "node-which": "bin/which.js" }, "engines": { - "node": "^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" + } + }, + "node_modules/node-gyp/node_modules/yallist": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", + "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==", + "dev": true, + "engines": { + "node": ">=18" } }, "node_modules/node-releases": { @@ -6888,41 +7654,18 @@ "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==" }, "node_modules/nopt": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", - "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-8.1.0.tgz", + "integrity": "sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A==", "dev": true, "dependencies": { - "abbrev": "^2.0.0" + "abbrev": "^3.0.0" }, "bin": { "nopt": "bin/nopt.js" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" - } - }, - "node_modules/normalize-package-data": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz", - "integrity": "sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==", - "dev": true, - "dependencies": { - "hosted-git-info": "^7.0.0", - "semver": "^7.3.5", - "validate-npm-package-license": "^3.0.4" - }, - "engines": { - "node": "^16.14.0 || >=18.0.0" - } - }, - "node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true, - "engines": { - "node": ">=0.10.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/nosleep.js": { @@ -6931,97 +7674,97 @@ "integrity": "sha512-9d1HbpKLh3sdWlhXMhU6MMH+wQzKkrgfRkYV0EBdvt99YJfj0ilCJrWRDYG2130Tm4GXbEoTCx5b34JSaP+HhA==" }, "node_modules/npm-bundled": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz", - "integrity": "sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-4.0.0.tgz", + "integrity": "sha512-IxaQZDMsqfQ2Lz37VvyyEtKLe8FsRZuysmedy/N06TU1RyVppYKXrO4xIhR0F+7ubIBox6Q7nir6fQI3ej39iA==", "dev": true, "dependencies": { - "npm-normalize-package-bin": "^3.0.0" + "npm-normalize-package-bin": "^4.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/npm-install-checks": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz", - "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-7.1.1.tgz", + "integrity": "sha512-u6DCwbow5ynAX5BdiHQ9qvexme4U3qHW3MWe5NqH+NeBm0LbiH6zvGjNNew1fY+AZZUtVHbOPF3j7mJxbUzpXg==", "dev": true, "dependencies": { "semver": "^7.1.1" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/npm-normalize-package-bin": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", - "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-4.0.0.tgz", + "integrity": "sha512-TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w==", "dev": true, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/npm-package-arg": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.3.tgz", - "integrity": "sha512-sHGJy8sOC1YraBywpzQlIKBE4pBbGbiF95U6Auspzyem956E0+FtDtsx1ZxlOJkQCZ1AFXAY/yuvtFYrOxF+Bw==", + "version": "12.0.2", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-12.0.2.tgz", + "integrity": "sha512-f1NpFjNI9O4VbKMOlA5QoBq/vSQPORHcTZ2feJpFkTHJ9eQkdlmZEKSjcAhxTGInC7RlEyScT9ui67NaOsjFWA==", "dev": true, "dependencies": { - "hosted-git-info": "^7.0.0", - "proc-log": "^4.0.0", + "hosted-git-info": "^8.0.0", + "proc-log": "^5.0.0", "semver": "^7.3.5", - "validate-npm-package-name": "^5.0.0" + "validate-npm-package-name": "^6.0.0" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/npm-packlist": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-8.0.2.tgz", - "integrity": "sha512-shYrPFIS/JLP4oQmAwDyk5HcyysKW8/JLTEA32S0Z5TzvpaeeX2yMFfoK1fjEBnCBvVyIB/Jj/GBFdm0wsgzbA==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-9.0.0.tgz", + "integrity": "sha512-8qSayfmHJQTx3nJWYbbUmflpyarbLMBc6LCAjYsiGtXxDB68HaZpb8re6zeaLGxZzDuMdhsg70jryJe+RrItVQ==", "dev": true, "dependencies": { - "ignore-walk": "^6.0.4" + "ignore-walk": "^7.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/npm-pick-manifest": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.1.0.tgz", - "integrity": "sha512-nkc+3pIIhqHVQr085X9d2JzPzLyjzQS96zbruppqC9aZRm/x8xx6xhI98gHtsfELP2bE+loHq8ZaHFHhe+NauA==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-10.0.0.tgz", + "integrity": "sha512-r4fFa4FqYY8xaM7fHecQ9Z2nE9hgNfJR+EmoKv0+chvzWkBcORX3r0FpTByP+CbOVJDladMXnPQGVN8PBLGuTQ==", "dev": true, "dependencies": { - "npm-install-checks": "^6.0.0", - "npm-normalize-package-bin": "^3.0.0", - "npm-package-arg": "^11.0.0", + "npm-install-checks": "^7.1.0", + "npm-normalize-package-bin": "^4.0.0", + "npm-package-arg": "^12.0.0", "semver": "^7.3.5" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/npm-registry-fetch": { - "version": "17.1.0", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-17.1.0.tgz", - "integrity": "sha512-5+bKQRH0J1xG1uZ1zMNvxW0VEyoNWgJpY9UDuluPFLKDfJ9u2JmmjmTJV1srBGQOROfdBMiVvnH2Zvpbm+xkVA==", + "version": "18.0.2", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-18.0.2.tgz", + "integrity": "sha512-LeVMZBBVy+oQb5R6FDV9OlJCcWDU+al10oKpe+nsvcHnG24Z3uM3SvJYKfGJlfGjVU8v9liejCrUR/M5HO5NEQ==", "dev": true, "dependencies": { - "@npmcli/redact": "^2.0.0", + "@npmcli/redact": "^3.0.0", "jsonparse": "^1.3.1", - "make-fetch-happen": "^13.0.0", + "make-fetch-happen": "^14.0.0", "minipass": "^7.0.2", - "minipass-fetch": "^3.0.0", - "minizlib": "^2.1.2", - "npm-package-arg": "^11.0.0", - "proc-log": "^4.0.0" + "minipass-fetch": "^4.0.0", + "minizlib": "^3.0.1", + "npm-package-arg": "^12.0.0", + "proc-log": "^5.0.0" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/nth-check": { @@ -7107,10 +7850,11 @@ } }, "node_modules/ordered-binary": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.5.2.tgz", - "integrity": "sha512-JTo+4+4Fw7FreyAvlSLjb1BBVaxEQAacmjD3jjuyPZclpbEghTvQZbXBb2qPd2LeIMxiHwXBZUcpmG2Gl/mDEA==", - "dev": true + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.5.3.tgz", + "integrity": "sha512-oGFr3T+pYdTGJ+YFEILMpS3es+GiIbs9h/XQrclBXUtd44ey7XwfsMzM31f64I1SQOawDoDr/D823kNCADI8TA==", + "dev": true, + "optional": true }, "node_modules/os-tmpdir": { "version": "1.0.2", @@ -7122,49 +7866,46 @@ } }, "node_modules/p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.3.tgz", + "integrity": "sha512-VkndIv2fIB99swvQoA65bm+fsmt6UNdGeIB0oxBs+WhAhdh08QA04JXpI7rbB9r08/nkbysKoya9rtDERYOYMA==", "dev": true, - "dependencies": { - "aggregate-error": "^3.0.0" - }, "engines": { - "node": ">=10" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/pacote": { - "version": "18.0.6", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-18.0.6.tgz", - "integrity": "sha512-+eK3G27SMwsB8kLIuj4h1FUhHtwiEUo21Tw8wNjmvdlpOEr613edv+8FUsTj/4F/VN5ywGE19X18N7CC2EJk6A==", + "version": "20.0.0", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-20.0.0.tgz", + "integrity": "sha512-pRjC5UFwZCgx9kUFDVM9YEahv4guZ1nSLqwmWiLUnDbGsjs+U5w7z6Uc8HNR1a6x8qnu5y9xtGE6D1uAuYz+0A==", "dev": true, "dependencies": { - "@npmcli/git": "^5.0.0", - "@npmcli/installed-package-contents": "^2.0.1", - "@npmcli/package-json": "^5.1.0", - "@npmcli/promise-spawn": "^7.0.0", - "@npmcli/run-script": "^8.0.0", - "cacache": "^18.0.0", + "@npmcli/git": "^6.0.0", + "@npmcli/installed-package-contents": "^3.0.0", + "@npmcli/package-json": "^6.0.0", + "@npmcli/promise-spawn": "^8.0.0", + "@npmcli/run-script": "^9.0.0", + "cacache": "^19.0.0", "fs-minipass": "^3.0.0", "minipass": "^7.0.2", - "npm-package-arg": "^11.0.0", - "npm-packlist": "^8.0.0", - "npm-pick-manifest": "^9.0.0", - "npm-registry-fetch": "^17.0.0", - "proc-log": "^4.0.0", + "npm-package-arg": "^12.0.0", + "npm-packlist": "^9.0.0", + "npm-pick-manifest": "^10.0.0", + "npm-registry-fetch": "^18.0.0", + "proc-log": "^5.0.0", "promise-retry": "^2.0.1", - "sigstore": "^2.2.0", - "ssri": "^10.0.0", + "sigstore": "^3.0.0", + "ssri": "^12.0.0", "tar": "^6.1.11" }, "bin": { "pacote": "bin/index.js" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/parent-module": { @@ -7209,7 +7950,6 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", - "devOptional": true, "dependencies": { "entities": "^4.4.0" }, @@ -7252,15 +7992,6 @@ "node": ">=8" } }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/path-key": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", @@ -7324,62 +8055,18 @@ } }, "node_modules/piscina": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.6.1.tgz", - "integrity": "sha512-z30AwWGtQE+Apr+2WBZensP2lIvwoaMcOPkQlIEmSGMJNUvaYACylPYrQM6wSdUNJlnDVMSpLv7xTMJqlVshOA==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.8.0.tgz", + "integrity": "sha512-EZJb+ZxDrQf3dihsUL7p42pjNyrNIFJCrRHPMgxu/svsj+P3xS3fuEWp7k2+rfsavfl1N0G29b1HGs7J0m8rZA==", "dev": true, "optionalDependencies": { - "nice-napi": "^1.0.2" - } - }, - "node_modules/playwright": { - "version": "1.49.0", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.49.0.tgz", - "integrity": "sha512-eKpmys0UFDnfNb3vfsf8Vx2LEOtflgRebl0Im2eQQnYMA4Aqd+Zw8bEOB+7ZKvN76901mRnqdsiOGKxzVTbi7A==", - "dev": true, - "dependencies": { - "playwright-core": "1.49.0" - }, - "bin": { - "playwright": "cli.js" - }, - "engines": { - "node": ">=18" - }, - "optionalDependencies": { - "fsevents": "2.3.2" - } - }, - "node_modules/playwright-core": { - "version": "1.49.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.49.0.tgz", - "integrity": "sha512-R+3KKTQF3npy5GTiKH/T+kdhoJfJojjHESR1YEWhYuEKRVfVaxH3+4+GvXE5xyCngCxhxnykk0Vlah9v8fs3jA==", - "dev": true, - "bin": { - "playwright-core": "cli.js" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/playwright/node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + "@napi-rs/nice": "^1.0.1" } }, "node_modules/postcss": { - "version": "8.4.41", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz", - "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==", + "version": "8.5.3", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz", + "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==", "dev": true, "funding": [ { @@ -7396,9 +8083,9 @@ } ], "dependencies": { - "nanoid": "^3.3.7", - "picocolors": "^1.0.1", - "source-map-js": "^1.2.0" + "nanoid": "^3.3.8", + "picocolors": "^1.1.1", + "source-map-js": "^1.2.1" }, "engines": { "node": "^10 || ^12 || >=14" @@ -7420,20 +8107,14 @@ } }, "node_modules/proc-log": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz", - "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-5.0.0.tgz", + "integrity": "sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==", "dev": true, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, - "node_modules/promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", - "dev": true - }, "node_modules/promise-retry": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", @@ -7497,34 +8178,11 @@ "node": ">= 6" } }, - "node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, - "dependencies": { - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=8.10.0" - } - }, - "node_modules/readdirp/node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, "node_modules/reflect-metadata": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz", - "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==" + "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==", + "dev": true }, "node_modules/replace-in-file": { "version": "7.1.0", @@ -7594,18 +8252,21 @@ "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==" }, "node_modules/resolve": { - "version": "1.22.8", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", - "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", + "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", "dev": true, "dependencies": { - "is-core-module": "^2.13.0", + "is-core-module": "^2.16.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, "bin": { "resolve": "bin/resolve" }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -7648,72 +8309,16 @@ "node_modules/rfdc": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz", - "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==" - }, - "node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/rimraf/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/rimraf/node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/rimraf/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } + "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==", + "dev": true }, "node_modules/rollup": { - "version": "4.22.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.4.tgz", - "integrity": "sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==", + "version": "4.34.8", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.34.8.tgz", + "integrity": "sha512-489gTVMzAYdiZHFVA/ig/iYFllCcWFHMvUHI1rpFmkoUtRlQxqh6/yiNqnYibjMZ2b/+FUQwldG+aLsEt6bglQ==", "dev": true, "dependencies": { - "@types/estree": "1.0.5" + "@types/estree": "1.0.6" }, "bin": { "rollup": "dist/bin/rollup" @@ -7723,22 +8328,25 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.22.4", - "@rollup/rollup-android-arm64": "4.22.4", - "@rollup/rollup-darwin-arm64": "4.22.4", - "@rollup/rollup-darwin-x64": "4.22.4", - "@rollup/rollup-linux-arm-gnueabihf": "4.22.4", - "@rollup/rollup-linux-arm-musleabihf": "4.22.4", - "@rollup/rollup-linux-arm64-gnu": "4.22.4", - "@rollup/rollup-linux-arm64-musl": "4.22.4", - "@rollup/rollup-linux-powerpc64le-gnu": "4.22.4", - "@rollup/rollup-linux-riscv64-gnu": "4.22.4", - "@rollup/rollup-linux-s390x-gnu": "4.22.4", - "@rollup/rollup-linux-x64-gnu": "4.22.4", - "@rollup/rollup-linux-x64-musl": "4.22.4", - "@rollup/rollup-win32-arm64-msvc": "4.22.4", - "@rollup/rollup-win32-ia32-msvc": "4.22.4", - "@rollup/rollup-win32-x64-msvc": "4.22.4", + "@rollup/rollup-android-arm-eabi": "4.34.8", + "@rollup/rollup-android-arm64": "4.34.8", + "@rollup/rollup-darwin-arm64": "4.34.8", + "@rollup/rollup-darwin-x64": "4.34.8", + "@rollup/rollup-freebsd-arm64": "4.34.8", + "@rollup/rollup-freebsd-x64": "4.34.8", + "@rollup/rollup-linux-arm-gnueabihf": "4.34.8", + "@rollup/rollup-linux-arm-musleabihf": "4.34.8", + "@rollup/rollup-linux-arm64-gnu": "4.34.8", + "@rollup/rollup-linux-arm64-musl": "4.34.8", + "@rollup/rollup-linux-loongarch64-gnu": "4.34.8", + "@rollup/rollup-linux-powerpc64le-gnu": "4.34.8", + "@rollup/rollup-linux-riscv64-gnu": "4.34.8", + "@rollup/rollup-linux-s390x-gnu": "4.34.8", + "@rollup/rollup-linux-x64-gnu": "4.34.8", + "@rollup/rollup-linux-x64-musl": "4.34.8", + "@rollup/rollup-win32-arm64-msvc": "4.34.8", + "@rollup/rollup-win32-ia32-msvc": "4.34.8", + "@rollup/rollup-win32-x64-msvc": "4.34.8", "fsevents": "~2.3.2" } }, @@ -7765,9 +8373,9 @@ } }, "node_modules/rxjs": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", - "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", + "version": "7.8.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz", + "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==", "dependencies": { "tslib": "^2.1.0" } @@ -7795,16 +8403,16 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "devOptional": true + "dev": true }, "node_modules/sass": { - "version": "1.77.6", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.6.tgz", - "integrity": "sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==", + "version": "1.85.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.85.0.tgz", + "integrity": "sha512-3ToiC1xZ1Y8aU7+CkgCI/tqyuPXEmYGJXO7H4uqp0xkLXUqp88rQQ4j1HmP37xSJLbCJPaIiv+cT1y+grssrww==", "dev": true, "dependencies": { - "chokidar": ">=3.0.0 <4.0.0", - "immutable": "^4.0.0", + "chokidar": "^4.0.0", + "immutable": "^5.0.2", "source-map-js": ">=0.6.2 <2.0.0" }, "bin": { @@ -7812,6 +8420,37 @@ }, "engines": { "node": ">=14.0.0" + }, + "optionalDependencies": { + "@parcel/watcher": "^2.4.1" + } + }, + "node_modules/sass/node_modules/chokidar": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", + "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", + "dev": true, + "dependencies": { + "readdirp": "^4.0.1" + }, + "engines": { + "node": ">= 14.16.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/sass/node_modules/readdirp": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", + "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", + "dev": true, + "engines": { + "node": ">= 14.18.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" } }, "node_modules/screenfull": { @@ -7826,9 +8465,10 @@ } }, "node_modules/semver": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", - "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "dev": true, "bin": { "semver": "bin/semver.js" }, @@ -7872,20 +8512,20 @@ } }, "node_modules/sigstore": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-2.3.1.tgz", - "integrity": "sha512-8G+/XDU8wNsJOQS5ysDVO0Etg9/2uA5gR9l4ZwijjlwxBcrU6RPfwi2+jJmbP+Ap1Hlp/nVAaEO4Fj22/SL2gQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-3.1.0.tgz", + "integrity": "sha512-ZpzWAFHIFqyFE56dXqgX/DkDRZdz+rRcjoIk/RQU4IX0wiCv1l8S7ZrXDHcCc+uaf+6o7w3h2l3g6GYG5TKN9Q==", "dev": true, "dependencies": { - "@sigstore/bundle": "^2.3.2", - "@sigstore/core": "^1.0.0", - "@sigstore/protobuf-specs": "^0.3.2", - "@sigstore/sign": "^2.3.2", - "@sigstore/tuf": "^2.3.4", - "@sigstore/verify": "^1.2.1" + "@sigstore/bundle": "^3.1.0", + "@sigstore/core": "^2.0.0", + "@sigstore/protobuf-specs": "^0.4.0", + "@sigstore/sign": "^3.1.0", + "@sigstore/tuf": "^3.1.0", + "@sigstore/verify": "^2.1.0" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/sirv": { @@ -7953,9 +8593,9 @@ } }, "node_modules/socks": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz", - "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==", + "version": "2.8.4", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.4.tgz", + "integrity": "sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==", "dev": true, "dependencies": { "ip-address": "^9.0.5", @@ -7967,12 +8607,12 @@ } }, "node_modules/socks-proxy-agent": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz", - "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==", + "version": "8.0.5", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz", + "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==", "dev": true, "dependencies": { - "agent-base": "^7.1.1", + "agent-base": "^7.1.2", "debug": "^4.3.4", "socks": "^2.8.3" }, @@ -7998,6 +8638,25 @@ "node": ">=0.10.0" } }, + "node_modules/source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/source-map-support/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/spdx-correct": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", @@ -8025,9 +8684,15 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.20", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz", - "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==", + "version": "3.0.21", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz", + "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==", + "dev": true + }, + "node_modules/sprintf-js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", "dev": true }, "node_modules/ssr-window": { @@ -8036,15 +8701,15 @@ "integrity": "sha512-ISv/Ch+ig7SOtw7G2+qkwfVASzazUnvlDTwypdLoPoySv+6MqlOV10VwPSE6EWkGjhW50lUmghPmpYZXMu/+AQ==" }, "node_modules/ssri": { - "version": "10.0.6", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", - "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", + "version": "12.0.0", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-12.0.0.tgz", + "integrity": "sha512-S7iGNosepx9RadX82oimUkvr0Ct7IjJbEbs4mJcTxst8um95J3sDYU1RBEOvdu6oL1Wek2ODI5i4MAw+dZ6cAQ==", "dev": true, "dependencies": { "minipass": "^7.0.3" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/string_decoder": { @@ -8222,17 +8887,62 @@ "node": ">=8" } }, + "node_modules/tar/node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "dev": true, + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/tar/node_modules/minizlib/node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/tar/node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true + "node_modules/tinycolor2": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz", + "integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==" + }, + "node_modules/tinygradient": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/tinygradient/-/tinygradient-1.1.5.tgz", + "integrity": "sha512-8nIfc2vgQ4TeLnk2lFj4tRLvvJwEfQuabdsmvDdQPT0xlk9TaNtpGd6nNRxXoK6vQhN6RSzj+Cnp5tTQmpxmbw==", + "dependencies": { + "@types/tinycolor2": "^1.4.0", + "tinycolor2": "^1.0.0" + } + }, + "node_modules/tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, + "dependencies": { + "os-tmpdir": "~1.0.2" + }, + "engines": { + "node": ">=0.6.0" + } }, "node_modules/to-regex-range": { "version": "5.0.1", @@ -8282,15 +8992,15 @@ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "node_modules/ts-api-utils": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz", - "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz", + "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==", "dev": true, "engines": { - "node": ">=16" + "node": ">=18.12" }, "peerDependencies": { - "typescript": ">=4.2.0" + "typescript": ">=4.8.4" } }, "node_modules/ts-node": { @@ -8337,22 +9047,22 @@ } }, "node_modules/tslib": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz", - "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==" + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==" }, "node_modules/tuf-js": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-2.2.1.tgz", - "integrity": "sha512-GwIJau9XaA8nLVbUXsN3IlFi7WmQ48gBUrl3FTkkL/XLu/POhBzfmX9hd33FNMX1qAsfl6ozO1iMmW9NC8YniA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-3.0.1.tgz", + "integrity": "sha512-+68OP1ZzSF84rTckf3FA95vJ1Zlx/uaXyiiKyPd1pA4rZNkpEvDAKmsu1xUSmbF/chCRYgZ6UZkDwC7PmzmAyA==", "dev": true, "dependencies": { - "@tufjs/models": "2.0.1", - "debug": "^4.3.4", - "make-fetch-happen": "^13.0.1" + "@tufjs/models": "3.0.1", + "debug": "^4.3.6", + "make-fetch-happen": "^14.0.1" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/type-check": { @@ -8383,6 +9093,7 @@ "version": "5.5.4", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", + "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -8392,33 +9103,33 @@ } }, "node_modules/undici-types": { - "version": "6.19.8", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", - "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", "dev": true }, "node_modules/unique-filename": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", - "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-4.0.0.tgz", + "integrity": "sha512-XSnEewXmQ+veP7xX2dS5Q4yZAvO40cBN2MWkJ7D/6sW4Dg6wYBNwM1Vrnz1FhH5AdeLIlUXRI9e28z1YZi71NQ==", "dev": true, "dependencies": { - "unique-slug": "^4.0.0" + "unique-slug": "^5.0.0" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/unique-slug": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", - "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-5.0.0.tgz", + "integrity": "sha512-9OdaqO5kwqR+1kVgHAhsp5vPNU0hnxRa26rBFNfNgM7M6pNtgzeBn3s/xbyCQL3dcjzOatcef6UUHpB/6MaETg==", "dev": true, "dependencies": { "imurmurhash": "^0.1.4" }, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/universalify": { @@ -8498,29 +9209,29 @@ } }, "node_modules/validate-npm-package-name": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz", - "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-6.0.0.tgz", + "integrity": "sha512-d7KLgL1LD3U3fgnvWEY1cQXoO/q6EQ1BSz48Sa149V/5zVTAbgmZIpyI8TRi6U9/JNyeYLlTKsEMPtLC27RFUg==", "dev": true, "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" + "node": "^18.17.0 || >=20.5.0" } }, "node_modules/vite": { - "version": "5.4.6", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.6.tgz", - "integrity": "sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==", + "version": "6.2.4", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.4.tgz", + "integrity": "sha512-veHMSew8CcRzhL5o8ONjy8gkfmFJAd5Ac16oxBUjlwgX3Gq2Wqr+qNC3TjPIpy7TPV/KporLga5GT9HqdrCizw==", "dev": true, "dependencies": { - "esbuild": "^0.21.3", - "postcss": "^8.4.43", - "rollup": "^4.20.0" + "esbuild": "^0.25.0", + "postcss": "^8.5.3", + "rollup": "^4.30.1" }, "bin": { "vite": "bin/vite.js" }, "engines": { - "node": "^18.0.0 || >=20.0.0" + "node": "^18.0.0 || ^20.0.0 || >=22.0.0" }, "funding": { "url": "https://github.com/vitejs/vite?sponsor=1" @@ -8529,19 +9240,25 @@ "fsevents": "~2.3.3" }, "peerDependencies": { - "@types/node": "^18.0.0 || >=20.0.0", + "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", + "jiti": ">=1.21.0", "less": "*", "lightningcss": "^1.21.0", "sass": "*", "sass-embedded": "*", "stylus": "*", "sugarss": "*", - "terser": "^5.4.0" + "terser": "^5.16.0", + "tsx": "^4.8.1", + "yaml": "^2.4.2" }, "peerDependenciesMeta": { "@types/node": { "optional": true }, + "jiti": { + "optional": true + }, "less": { "optional": true }, @@ -8562,447 +9279,19 @@ }, "terser": { "optional": true - } - } - }, - "node_modules/vite/node_modules/@esbuild/aix-ppc64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz", - "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "aix" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/android-arm": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz", - "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/android-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz", - "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/android-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz", - "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/darwin-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz", - "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/darwin-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz", - "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/freebsd-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz", - "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/freebsd-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz", - "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-arm": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz", - "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz", - "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-ia32": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz", - "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-loong64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz", - "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==", - "cpu": [ - "loong64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-mips64el": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz", - "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==", - "cpu": [ - "mips64el" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-ppc64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz", - "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-riscv64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz", - "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==", - "cpu": [ - "riscv64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-s390x": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz", - "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==", - "cpu": [ - "s390x" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/linux-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz", - "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/netbsd-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz", - "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/openbsd-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz", - "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/sunos-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz", - "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/win32-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz", - "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/win32-ia32": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz", - "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/@esbuild/win32-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz", - "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite/node_modules/esbuild": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz", - "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==", - "dev": true, - "hasInstallScript": true, - "bin": { - "esbuild": "bin/esbuild" - }, - "engines": { - "node": ">=12" - }, - "optionalDependencies": { - "@esbuild/aix-ppc64": "0.21.5", - "@esbuild/android-arm": "0.21.5", - "@esbuild/android-arm64": "0.21.5", - "@esbuild/android-x64": "0.21.5", - "@esbuild/darwin-arm64": "0.21.5", - "@esbuild/darwin-x64": "0.21.5", - "@esbuild/freebsd-arm64": "0.21.5", - "@esbuild/freebsd-x64": "0.21.5", - "@esbuild/linux-arm": "0.21.5", - "@esbuild/linux-arm64": "0.21.5", - "@esbuild/linux-ia32": "0.21.5", - "@esbuild/linux-loong64": "0.21.5", - "@esbuild/linux-mips64el": "0.21.5", - "@esbuild/linux-ppc64": "0.21.5", - "@esbuild/linux-riscv64": "0.21.5", - "@esbuild/linux-s390x": "0.21.5", - "@esbuild/linux-x64": "0.21.5", - "@esbuild/netbsd-x64": "0.21.5", - "@esbuild/openbsd-x64": "0.21.5", - "@esbuild/sunos-x64": "0.21.5", - "@esbuild/win32-arm64": "0.21.5", - "@esbuild/win32-ia32": "0.21.5", - "@esbuild/win32-x64": "0.21.5" - } - }, - "node_modules/vite/node_modules/postcss": { - "version": "8.4.47", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz", - "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" + "tsx": { + "optional": true }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" + "yaml": { + "optional": true } - ], - "dependencies": { - "nanoid": "^3.3.7", - "picocolors": "^1.1.0", - "source-map-js": "^1.2.1" - }, - "engines": { - "node": "^10 || ^12 || >=14" } }, "node_modules/watchpack": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz", - "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz", + "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==", "dev": true, "dependencies": { "glob-to-regexp": "^0.4.1", @@ -9024,7 +9313,8 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz", "integrity": "sha512-DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw==", - "dev": true + "dev": true, + "optional": true }, "node_modules/webidl-conversions": { "version": "3.0.1", @@ -9229,9 +9519,9 @@ } }, "node_modules/zone.js": { - "version": "0.14.10", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.14.10.tgz", - "integrity": "sha512-YGAhaO7J5ywOXW6InXNlLmfU194F8lVgu7bRntUF3TiG8Y3nBK0x1UJJuHUP/e8IyihkjCYqhCScpSwnlaSRkQ==" + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.15.0.tgz", + "integrity": "sha512-9oxn0IIjbCZkJ67L+LkhYWRyAy7axphb3VgE2MBDlOqnmHMPWGYMxJxBYFueFq/JGY2GMwS0rU+UCLunEmy5UA==" } } } diff --git a/UI/Web/package.json b/UI/Web/package.json index c6913319f..05d539aed 100644 --- a/UI/Web/package.json +++ b/UI/Web/package.json @@ -12,70 +12,70 @@ "prod": "npm run cache-locale-prime && ng build --configuration production && npm run minify-langs && npm run cache-locale", "explore": "ng build --stats-json && webpack-bundle-analyzer dist/stats.json", "lint": "ng lint", - "e2e": "npx playwright test --ui" + "e2e": "ng e2e" }, "private": true, "dependencies": { - "@angular-slider/ngx-slider": "^18.0.0", - "@angular/animations": "^18.2.9", - "@angular/cdk": "^18.2.10", - "@angular/common": "^18.2.9", - "@angular/compiler": "^18.2.9", - "@angular/core": "^18.2.9", - "@angular/forms": "^18.2.9", - "@angular/localize": "^18.2.9", - "@angular/platform-browser": "^18.2.9", - "@angular/platform-browser-dynamic": "^18.2.9", - "@angular/router": "^18.2.9", - "@fortawesome/fontawesome-free": "^6.6.0", - "@iharbeck/ngx-virtual-scroller": "^17.0.2", - "@iplab/ngx-file-upload": "^18.0.0", - "@jsverse/transloco": "^7.5.0", + "@angular-slider/ngx-slider": "^19.0.0", + "@angular/animations": "^19.2.5", + "@angular/cdk": "^19.2.8", + "@angular/common": "^19.2.5", + "@angular/compiler": "^19.2.5", + "@angular/core": "^19.2.5", + "@angular/forms": "^19.2.5", + "@angular/localize": "^19.2.5", + "@angular/platform-browser": "^19.2.5", + "@angular/platform-browser-dynamic": "^19.2.5", + "@angular/router": "^19.2.5", + "@fortawesome/fontawesome-free": "^6.7.2", + "@iharbeck/ngx-virtual-scroller": "^19.0.1", + "@iplab/ngx-file-upload": "^19.0.3", + "@jsverse/transloco": "^7.6.1", "@jsverse/transloco-locale": "^7.0.1", "@jsverse/transloco-persist-lang": "^7.0.2", "@jsverse/transloco-persist-translations": "^7.0.1", "@jsverse/transloco-preload-langs": "^7.0.1", "@microsoft/signalr": "^8.0.7", - "@ng-bootstrap/ng-bootstrap": "^17.0.1", + "@ng-bootstrap/ng-bootstrap": "^18.0.0", "@popperjs/core": "^2.11.7", - "@swimlane/ngx-charts": "^20.5.0", - "@tweenjs/tween.js": "^23.1.3", + "@siemens/ngx-datatable": "^22.4.1", + "@swimlane/ngx-charts": "^22.0.0-alpha.0", + "@tweenjs/tween.js": "^25.0.0", "bootstrap": "^5.3.2", "charts.css": "^1.1.0", "file-saver": "^2.0.5", - "luxon": "^3.5.0", + "luxon": "^3.6.1", "ng-circle-progress": "^1.7.1", "ng-lazyload-image": "^9.1.3", - "ng-select2-component": "^14.0.1", - "ngx-color-picker": "^17.0.0", - "ngx-extended-pdf-viewer": "^21.4.6", + "ng-select2-component": "^17.2.4", + "ngx-color-picker": "^19.0.0", + "ngx-extended-pdf-viewer": "^23.0.0-alpha.7", "ngx-file-drop": "^16.0.0", "ngx-stars": "^1.6.5", "ngx-toastr": "^19.0.0", "nosleep.js": "^0.12.0", - "rxjs": "^7.8.0", + "rxjs": "^7.8.2", "screenfull": "^6.0.2", "swiper": "^8.4.6", - "tslib": "^2.8.0", - "zone.js": "^0.14.10" + "tslib": "^2.8.1", + "zone.js": "^0.15.0" }, "devDependencies": { - "@angular-eslint/builder": "^18.4.0", - "@angular-eslint/eslint-plugin": "^18.4.0", - "@angular-eslint/eslint-plugin-template": "^18.4.0", - "@angular-eslint/schematics": "^18.4.0", - "@angular-eslint/template-parser": "^18.4.0", - "@angular/build": "^18.2.10", - "@angular/cli": "^18.2.10", - "@angular/compiler-cli": "^18.2.9", - "@playwright/test": "^1.49.0", + "@angular-eslint/builder": "^19.3.0", + "@angular-eslint/eslint-plugin": "^19.3.0", + "@angular-eslint/eslint-plugin-template": "^19.3.0", + "@angular-eslint/schematics": "^19.3.0", + "@angular-eslint/template-parser": "^19.3.0", + "@angular/build": "^19.2.6", + "@angular/cli": "^19.2.6", + "@angular/compiler-cli": "^19.2.5", "@types/d3": "^7.4.3", "@types/file-saver": "^2.0.7", - "@types/luxon": "^3.4.0", - "@types/node": "^22.8.0", - "@typescript-eslint/eslint-plugin": "^8.11.0", - "@typescript-eslint/parser": "^8.11.0", - "eslint": "^8.57.0", + "@types/luxon": "^3.6.2", + "@types/node": "^22.13.13", + "@typescript-eslint/eslint-plugin": "^8.28.0", + "@typescript-eslint/parser": "^8.28.0", + "eslint": "^9.23.0", "jsonminify": "^0.4.2", "karma-coverage": "~2.2.0", "ts-node": "~10.9.1", diff --git a/UI/Web/playwright.config.ts b/UI/Web/playwright.config.ts deleted file mode 100644 index 86297eba9..000000000 --- a/UI/Web/playwright.config.ts +++ /dev/null @@ -1,79 +0,0 @@ -import { defineConfig, devices } from '@playwright/test'; - -/** - * Read environment variables from file. - * https://github.com/motdotla/dotenv - */ -// import dotenv from 'dotenv'; -// import path from 'path'; -// dotenv.config({ path: path.resolve(__dirname, '.env') }); - -/** - * See https://playwright.dev/docs/test-configuration. - */ -export default defineConfig({ - testDir: './e2e-tests', - /* Run tests in files in parallel */ - fullyParallel: true, - /* Fail the build on CI if you accidentally left test.only in the source code. */ - forbidOnly: !!process.env.CI, - /* Retry on CI only */ - retries: process.env.CI ? 2 : 0, - /* Opt out of parallel tests on CI. */ - workers: process.env.CI ? 1 : undefined, - /* Reporter to use. See https://playwright.dev/docs/test-reporters */ - reporter: 'html', - /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */ - use: { - /* Base URL to use in actions like `await page.goto('/')`. */ - // baseURL: 'http://127.0.0.1:3000', - - /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */ - trace: 'on-first-retry', - }, - - /* Configure projects for major browsers */ - projects: [ - { - name: 'chromium', - use: { ...devices['Desktop Chrome'] }, - }, - - { - name: 'firefox', - use: { ...devices['Desktop Firefox'] }, - }, - - { - name: 'webkit', - use: { ...devices['Desktop Safari'] }, - }, - - /* Test against mobile viewports. */ - // { - // name: 'Mobile Chrome', - // use: { ...devices['Pixel 5'] }, - // }, - // { - // name: 'Mobile Safari', - // use: { ...devices['iPhone 12'] }, - // }, - - /* Test against branded browsers. */ - // { - // name: 'Microsoft Edge', - // use: { ...devices['Desktop Edge'], channel: 'msedge' }, - // }, - // { - // name: 'Google Chrome', - // use: { ...devices['Desktop Chrome'], channel: 'chrome' }, - // }, - ], - - /* Run your local dev server before starting the tests */ - // webServer: { - // command: 'npm run start', - // url: 'http://127.0.0.1:3000', - // reuseExistingServer: !process.env.CI, - // }, -}); diff --git a/UI/Web/src/_card-item-common.scss b/UI/Web/src/_card-item-common.scss index f27a8768b..1c6f916f3 100644 --- a/UI/Web/src/_card-item-common.scss +++ b/UI/Web/src/_card-item-common.scss @@ -163,11 +163,15 @@ $image-width: 160px; align-items: center; padding: 0 5px; + :first-child { + min-width: 22px; + } + .card-title { font-size: 0.8rem; margin: 0; text-align: center; - max-width: 98px; + max-width: 90px; a { overflow: hidden; diff --git a/UI/Web/src/_series-detail-common.scss b/UI/Web/src/_series-detail-common.scss index 214047a93..efb54f860 100644 --- a/UI/Web/src/_series-detail-common.scss +++ b/UI/Web/src/_series-detail-common.scss @@ -1,4 +1,4 @@ -@import './theme/variables'; +@use './theme/variables' as theme; .title { color: white; @@ -13,7 +13,7 @@ } .subtitle { - color: lightgrey; + color: var(--detail-subtitle-color); font-weight: bold; font-size: 0.8rem; } @@ -149,7 +149,7 @@ object-fit: contain; } -@media (max-width: $grid-breakpoints-lg) { +@media (max-width: theme.$grid-breakpoints-lg) { .carousel-tabs-container { mask-image: linear-gradient(transparent, black 0%, black 90%, transparent 100%); -webkit-mask-image: linear-gradient(to right, transparent, black 0%, black 90%, transparent 100%); @@ -162,7 +162,7 @@ } /* col-lg */ -@media (max-width: $grid-breakpoints-lg) { +@media (max-width: theme.$grid-breakpoints-lg) { .image-container.mobile-bg{ width: 100vw; top: calc(var(--nav-offset) - 20px); @@ -201,7 +201,7 @@ font-size: 0.9rem; } -@media (max-width: $grid-breakpoints-lg) { +@media (max-width: theme.$grid-breakpoints-lg) { .carousel-tabs-container { mask-image: linear-gradient(to right, transparent, black 0%, black 90%, transparent 100%); -webkit-mask-image: linear-gradient(to right, transparent, black 0%, black 90%, transparent 100%); diff --git a/UI/Web/src/_tag-card-common.scss b/UI/Web/src/_tag-card-common.scss new file mode 100644 index 000000000..39a1e87fd --- /dev/null +++ b/UI/Web/src/_tag-card-common.scss @@ -0,0 +1,35 @@ +.tag-card { + background-color: var(--bs-card-color, #2c2c2c); + padding: 1rem; + border-radius: 12px; + box-shadow: 0 2px 5px rgba(0,0,0,0.2); + transition: transform 0.2s ease, background 0.3s ease; + cursor: pointer; + + &.not-selectable:hover { + cursor: not-allowed; + background-color: var(--bs-card-color, #2c2c2c) !important; + } +} + +.tag-card:hover { + background-color: #3a3a3a; + //transform: translateY(-3px); // Cool effect but has a weird background issue. ROBBIE: Fix this +} + +.tag-name { + font-size: 1.1rem; + font-weight: 600; + margin-bottom: 0.5rem; + max-height: 8rem; + height: 8rem; + overflow: hidden; + text-overflow: ellipsis; +} + +.tag-meta { + font-size: 0.85rem; + display: flex; + justify-content: space-between; + color: var(--text-muted-color, #bbb); +} diff --git a/UI/Web/src/app/_directives/dbl-click.directive.ts b/UI/Web/src/app/_directives/dbl-click.directive.ts index 98fabf843..ab1d0bcde 100644 --- a/UI/Web/src/app/_directives/dbl-click.directive.ts +++ b/UI/Web/src/app/_directives/dbl-click.directive.ts @@ -6,21 +6,30 @@ import {Directive, EventEmitter, HostListener, Output} from '@angular/core'; }) export class DblClickDirective { + @Output() singleClick = new EventEmitter(); @Output() doubleClick = new EventEmitter(); private lastTapTime = 0; private tapTimeout = 300; // Time threshold for a double tap (in milliseconds) + private singleClickTimeout: any; @HostListener('click', ['$event']) handleClick(event: Event): void { - event.stopPropagation(); - event.preventDefault(); - const currentTime = new Date().getTime(); + if (currentTime - this.lastTapTime < this.tapTimeout) { // Detected a double click/tap + clearTimeout(this.singleClickTimeout); // Prevent single-click emission + event.stopPropagation(); + event.preventDefault(); this.doubleClick.emit(event); + } else { + // Delay single-click emission to check if a double-click occurs + this.singleClickTimeout = setTimeout(() => { + this.singleClick.emit(event); // Optional: emit single-click if no double-click follows + }, this.tapTimeout); } + this.lastTapTime = currentTime; } diff --git a/UI/Web/src/app/_directives/enter-blur.directive.ts b/UI/Web/src/app/_directives/enter-blur.directive.ts new file mode 100644 index 000000000..30329f724 --- /dev/null +++ b/UI/Web/src/app/_directives/enter-blur.directive.ts @@ -0,0 +1,13 @@ +import { Directive, HostListener } from '@angular/core'; + +@Directive({ + selector: '[appEnterBlur]', + standalone: true, +}) +export class EnterBlurDirective { + @HostListener('keydown.enter', ['$event']) + onEnter(event: KeyboardEvent): void { + event.preventDefault(); + document.body.click(); + } +} diff --git a/UI/Web/src/app/_helpers/browser.ts b/UI/Web/src/app/_helpers/browser.ts new file mode 100644 index 000000000..4d92e207c --- /dev/null +++ b/UI/Web/src/app/_helpers/browser.ts @@ -0,0 +1,62 @@ +export const isSafari = [ + 'iPad Simulator', + 'iPhone Simulator', + 'iPod Simulator', + 'iPad', + 'iPhone', + 'iPod' + ].includes(navigator.platform) + // iPad on iOS 13 detection + || (navigator.userAgent.includes("Mac") && "ontouchend" in document); + +/** + * Represents a Version for a browser + */ +export class Version { + major: number; + minor: number; + patch: number; + + constructor(major: number, minor: number, patch: number) { + this.major = major; + this.minor = minor; + this.patch = patch; + } + + isLessThan(other: Version): boolean { + if (this.major < other.major) return true; + if (this.major > other.major) return false; + if (this.minor < other.minor) return true; + if (this.minor > other.minor) return false; + return this.patch < other.patch; + } + + isGreaterThan(other: Version): boolean { + if (this.major > other.major) return true; + if (this.major < other.major) return false; + if (this.minor > other.minor) return true; + if (this.minor < other.minor) return false; + return this.patch > other.patch; + } + + isEqualTo(other: Version): boolean { + return ( + this.major === other.major && + this.minor === other.minor && + this.patch === other.patch + ); + } +} + + +export const getIosVersion = () => { + const match = navigator.userAgent.match(/OS (\d+)_(\d+)_?(\d+)?/); + if (match) { + const major = parseInt(match[1], 10); + const minor = parseInt(match[2], 10); + const patch = parseInt(match[3] || '0', 10); + + return new Version(major, minor, patch); + } + return null; +} diff --git a/UI/Web/src/app/_helpers/form-debug.ts b/UI/Web/src/app/_helpers/form-debug.ts new file mode 100644 index 000000000..4ad70ac87 --- /dev/null +++ b/UI/Web/src/app/_helpers/form-debug.ts @@ -0,0 +1,120 @@ +import {AbstractControl, FormArray, FormControl, FormGroup} from '@angular/forms'; + +interface ValidationIssue { + path: string; + controlType: string; + value: any; + errors: { [key: string]: any } | null; + status: string; + disabled: boolean; +} + +export function analyzeFormGroupValidation(formGroup: FormGroup, basePath: string = ''): ValidationIssue[] { + const issues: ValidationIssue[] = []; + + function analyzeControl(control: AbstractControl, path: string): void { + // Determine control type for better debugging + let controlType = 'AbstractControl'; + if (control instanceof FormGroup) { + controlType = 'FormGroup'; + } else if (control instanceof FormArray) { + controlType = 'FormArray'; + } else if (control instanceof FormControl) { + controlType = 'FormControl'; + } + + // Add issue if control has validation errors or is invalid + if (control.invalid || control.errors || control.disabled) { + issues.push({ + path: path || 'root', + controlType, + value: control.value, + errors: control.errors, + status: control.status, + disabled: control.disabled + }); + } + + // Recursively check nested controls + if (control instanceof FormGroup) { + Object.keys(control.controls).forEach(key => { + const childPath = path ? `${path}.${key}` : key; + analyzeControl(control.controls[key], childPath); + }); + } else if (control instanceof FormArray) { + control.controls.forEach((childControl, index) => { + const childPath = path ? `${path}[${index}]` : `[${index}]`; + analyzeControl(childControl, childPath); + }); + } + } + + analyzeControl(formGroup, basePath); + return issues; +} + +export function printFormGroupValidation(formGroup: FormGroup, basePath: string = ''): void { + const issues = analyzeFormGroupValidation(formGroup, basePath); + + console.group(`🔍 FormGroup Validation Analysis (${basePath || 'root'})`); + console.log(`Overall Status: ${formGroup.status}`); + console.log(`Overall Valid: ${formGroup.valid}`); + console.log(`Total Issues Found: ${issues.length}`); + + if (issues.length === 0) { + console.log('✅ No validation issues found!'); + } else { + console.log('\n📋 Detailed Issues:'); + issues.forEach((issue, index) => { + console.group(`${index + 1}. ${issue.path} (${issue.controlType})`); + console.log(`Status: ${issue.status}`); + console.log(`Value:`, issue.value); + console.log(`Disabled: ${issue.disabled}`); + + if (issue.errors) { + console.log('Validation Errors:'); + Object.entries(issue.errors).forEach(([errorKey, errorValue]) => { + console.log(` • ${errorKey}:`, errorValue); + }); + } else { + console.log('No specific validation errors (but control is invalid)'); + } + console.groupEnd(); + }); + } + + console.groupEnd(); +} + +// Alternative function that returns a formatted string instead of console logging +export function getFormGroupValidationReport(formGroup: FormGroup, basePath: string = ''): string { + const issues = analyzeFormGroupValidation(formGroup, basePath); + + let report = `FormGroup Validation Report (${basePath || 'root'})\n`; + report += `Overall Status: ${formGroup.status}\n`; + report += `Overall Valid: ${formGroup.valid}\n`; + report += `Total Issues Found: ${issues.length}\n\n`; + + if (issues.length === 0) { + report += '✅ No validation issues found!'; + } else { + report += 'Detailed Issues:\n'; + issues.forEach((issue, index) => { + report += `\n${index + 1}. ${issue.path} (${issue.controlType})\n`; + report += ` Status: ${issue.status}\n`; + report += ` Value: ${JSON.stringify(issue.value)}\n`; + report += ` Disabled: ${issue.disabled}\n`; + + if (issue.errors) { + report += ' Validation Errors:\n'; + Object.entries(issue.errors).forEach(([errorKey, errorValue]) => { + report += ` • ${errorKey}: ${JSON.stringify(errorValue)}\n`; + }); + } else { + report += ' No specific validation errors (but control is invalid)\n'; + } + }); + } + + return report; +} diff --git a/UI/Web/src/app/_models/auth/member.ts b/UI/Web/src/app/_models/auth/member.ts index 31238c68b..aaa45f332 100644 --- a/UI/Web/src/app/_models/auth/member.ts +++ b/UI/Web/src/app/_models/auth/member.ts @@ -1,16 +1,16 @@ -import { AgeRestriction } from '../metadata/age-restriction'; -import { Library } from '../library/library'; +import {AgeRestriction} from '../metadata/age-restriction'; +import {Library} from '../library/library'; export interface Member { - id: number; - username: string; - email: string; - lastActive: string; // datetime - lastActiveUtc: string; // datetime - created: string; // datetime - createdUtc: string; // datetime - roles: string[]; - libraries: Library[]; - ageRestriction: AgeRestriction; - isPending: boolean; + id: number; + username: string; + email: string; + lastActive: string; // datetime + lastActiveUtc: string; // datetime + created: string; // datetime + createdUtc: string; // datetime + roles: string[]; + libraries: Library[]; + ageRestriction: AgeRestriction; + isPending: boolean; } diff --git a/UI/Web/src/app/_models/chapter-detail-plus.ts b/UI/Web/src/app/_models/chapter-detail-plus.ts new file mode 100644 index 000000000..2a17089e1 --- /dev/null +++ b/UI/Web/src/app/_models/chapter-detail-plus.ts @@ -0,0 +1,9 @@ +import {UserReview} from "../_single-module/review-card/user-review"; +import {Rating} from "./rating"; + +export type ChapterDetailPlus = { + rating: number; + hasBeenRated: boolean; + reviews: UserReview[]; + ratings: Rating[]; +}; diff --git a/UI/Web/src/app/_models/email-history.ts b/UI/Web/src/app/_models/email-history.ts new file mode 100644 index 000000000..0805704fb --- /dev/null +++ b/UI/Web/src/app/_models/email-history.ts @@ -0,0 +1,7 @@ +export interface EmailHistory { + sent: boolean; + sendDate: string; + emailTemplate: string; + errorMessage: string; + toUserName: string; +} diff --git a/UI/Web/src/app/_models/events/external-match-rate-limit-error-event.ts b/UI/Web/src/app/_models/events/external-match-rate-limit-error-event.ts new file mode 100644 index 000000000..3695651d6 --- /dev/null +++ b/UI/Web/src/app/_models/events/external-match-rate-limit-error-event.ts @@ -0,0 +1,4 @@ +export interface ExternalMatchRateLimitErrorEvent { + seriesId: number; + seriesName: string; +} diff --git a/UI/Web/src/app/_models/events/update-version-event.ts b/UI/Web/src/app/_models/events/update-version-event.ts index c74e49af6..4e7e82ce6 100644 --- a/UI/Web/src/app/_models/events/update-version-event.ts +++ b/UI/Web/src/app/_models/events/update-version-event.ts @@ -1,12 +1,26 @@ export interface UpdateVersionEvent { - currentVersion: string; - updateVersion: string; - updateBody: string; - updateTitle: string; - updateUrl: string; - isDocker: boolean; - publishDate: string; - isOnNightlyInRelease: boolean; - isReleaseNewer: boolean; - isReleaseEqual: boolean; + currentVersion: string; + updateVersion: string; + updateBody: string; + updateTitle: string; + updateUrl: string; + isDocker: boolean; + publishDate: string; + isOnNightlyInRelease: boolean; + isReleaseNewer: boolean; + isReleaseEqual: boolean; + + added: Array; + removed: Array; + changed: Array; + fixed: Array; + theme: Array; + developer: Array; + api: Array; + featureRequests: Array; + knownIssues: Array; + /** + * The part above the changelog part + */ + blogPart: string; } diff --git a/UI/Web/src/app/_models/kavitaplus/license-info.ts b/UI/Web/src/app/_models/kavitaplus/license-info.ts new file mode 100644 index 000000000..4a724b3ff --- /dev/null +++ b/UI/Web/src/app/_models/kavitaplus/license-info.ts @@ -0,0 +1,9 @@ +export interface LicenseInfo { + expirationDate: string; + isActive: boolean; + isCancelled: boolean; + isValidVersion: boolean; + registeredEmail: string; + totalMonthsSubbed: number; + hasLicense: boolean; +} diff --git a/UI/Web/src/app/_models/kavitaplus/manage-match-filter.ts b/UI/Web/src/app/_models/kavitaplus/manage-match-filter.ts new file mode 100644 index 000000000..05a4041c8 --- /dev/null +++ b/UI/Web/src/app/_models/kavitaplus/manage-match-filter.ts @@ -0,0 +1,8 @@ +import {MatchStateOption} from "./match-state-option"; +import {LibraryType} from "../library/library"; + +export interface ManageMatchFilter { + matchStateOption: MatchStateOption; + libraryType: LibraryType | -1; + searchTerm: string; +} diff --git a/UI/Web/src/app/_models/kavitaplus/manage-match-series.ts b/UI/Web/src/app/_models/kavitaplus/manage-match-series.ts new file mode 100644 index 000000000..4138279e6 --- /dev/null +++ b/UI/Web/src/app/_models/kavitaplus/manage-match-series.ts @@ -0,0 +1,7 @@ +import {Series} from "../series"; + +export interface ManageMatchSeries { + series: Series; + isMatched: boolean; + validUntilUtc: string; +} diff --git a/UI/Web/src/app/_models/kavitaplus/match-state-option.ts b/UI/Web/src/app/_models/kavitaplus/match-state-option.ts new file mode 100644 index 000000000..a52c5efad --- /dev/null +++ b/UI/Web/src/app/_models/kavitaplus/match-state-option.ts @@ -0,0 +1,11 @@ +export enum MatchStateOption { + All = 0, + Matched = 1, + NotMatched = 2, + Error = 3, + DontMatch = 4 +} + +export const allMatchStates = [ + MatchStateOption.Matched, MatchStateOption.NotMatched, MatchStateOption.Error, MatchStateOption.DontMatch +]; diff --git a/UI/Web/src/app/_models/kavitaplus/user-token-info.ts b/UI/Web/src/app/_models/kavitaplus/user-token-info.ts new file mode 100644 index 000000000..1dcab9c91 --- /dev/null +++ b/UI/Web/src/app/_models/kavitaplus/user-token-info.ts @@ -0,0 +1,8 @@ +export interface UserTokenInfo { + userId: number; + username: string; + isAniListTokenSet: boolean; + aniListValidUntilUtc: string; + isAniListTokenValid: boolean; + isMalTokenSet: boolean; +} diff --git a/UI/Web/src/app/_models/library/library.ts b/UI/Web/src/app/_models/library/library.ts index f834f23b1..bcbf9b447 100644 --- a/UI/Web/src/app/_models/library/library.ts +++ b/UI/Web/src/app/_models/library/library.ts @@ -1,5 +1,4 @@ import {FileTypeGroup} from "./file-type-group.enum"; -import {IHasCover} from "../common/i-has-cover"; export enum LibraryType { Manga = 0, @@ -7,9 +6,16 @@ export enum LibraryType { Book = 2, Images = 3, LightNovel = 4, + /** + * Comic (Legacy) + */ ComicVine = 5 } +export const allLibraryTypes = [LibraryType.Manga, LibraryType.ComicVine, LibraryType.Comic, LibraryType.Book, LibraryType.LightNovel, LibraryType.Images]; +export const allKavitaPlusMetadataApplicableTypes = [LibraryType.Manga, LibraryType.LightNovel, LibraryType.ComicVine, LibraryType.Comic]; +export const allKavitaPlusScrobbleEligibleTypes = [LibraryType.Manga, LibraryType.LightNovel]; + export interface Library { id: number; name: string; @@ -24,6 +30,9 @@ export interface Library { manageCollections: boolean; manageReadingLists: boolean; allowScrobbling: boolean; + allowMetadataMatching: boolean; + enableMetadata: boolean; + removePrefixForSortName: boolean; collapseSeriesRelationships: boolean; libraryFileTypes: Array; excludePatterns: Array; diff --git a/UI/Web/src/app/_models/metadata/browse/browse-genre.ts b/UI/Web/src/app/_models/metadata/browse/browse-genre.ts new file mode 100644 index 000000000..e7bb0d915 --- /dev/null +++ b/UI/Web/src/app/_models/metadata/browse/browse-genre.ts @@ -0,0 +1,6 @@ +import {Genre} from "../genre"; + +export interface BrowseGenre extends Genre { + seriesCount: number; + chapterCount: number; +} diff --git a/UI/Web/src/app/_models/person/browse-person.ts b/UI/Web/src/app/_models/metadata/browse/browse-person.ts similarity index 52% rename from UI/Web/src/app/_models/person/browse-person.ts rename to UI/Web/src/app/_models/metadata/browse/browse-person.ts index aeddac7cd..886f9455b 100644 --- a/UI/Web/src/app/_models/person/browse-person.ts +++ b/UI/Web/src/app/_models/metadata/browse/browse-person.ts @@ -1,6 +1,6 @@ -import {Person} from "../metadata/person"; +import {Person} from "../person"; export interface BrowsePerson extends Person { seriesCount: number; - issueCount: number; + chapterCount: number; } diff --git a/UI/Web/src/app/_models/metadata/browse/browse-tag.ts b/UI/Web/src/app/_models/metadata/browse/browse-tag.ts new file mode 100644 index 000000000..4d87370ee --- /dev/null +++ b/UI/Web/src/app/_models/metadata/browse/browse-tag.ts @@ -0,0 +1,6 @@ +import {Tag} from "../../tag"; + +export interface BrowseTag extends Tag { + seriesCount: number; + chapterCount: number; +} diff --git a/UI/Web/src/app/_models/metadata/language.ts b/UI/Web/src/app/_models/metadata/language.ts index e8f606bec..28ab2b598 100644 --- a/UI/Web/src/app/_models/metadata/language.ts +++ b/UI/Web/src/app/_models/metadata/language.ts @@ -3,3 +3,13 @@ export interface Language { title: string; } +export interface KavitaLocale { + /** + * isoCode aka what maps to the file on disk and what transloco loads + */ + fileName: string; + renderName: string; + translationCompletion: number; + isRtL: boolean; + hash: string; +} diff --git a/UI/Web/src/app/_models/metadata/person.ts b/UI/Web/src/app/_models/metadata/person.ts index c8a4c566e..efc8df914 100644 --- a/UI/Web/src/app/_models/metadata/person.ts +++ b/UI/Web/src/app/_models/metadata/person.ts @@ -2,7 +2,6 @@ import {IHasCover} from "../common/i-has-cover"; export enum PersonRole { Other = 1, - Artist = 2, Writer = 3, Penciller = 4, Inker = 5, @@ -22,6 +21,7 @@ export interface Person extends IHasCover { id: number; name: string; description: string; + aliases: Array; coverImage?: string; coverImageLocked: boolean; malId?: number; @@ -31,3 +31,22 @@ export interface Person extends IHasCover { primaryColor: string; secondaryColor: string; } + +/** + * Excludes Other as it's not in use + */ +export const allPeopleRoles = [ + PersonRole.Writer, + PersonRole.Penciller, + PersonRole.Inker, + PersonRole.Colorist, + PersonRole.Letterer, + PersonRole.CoverArtist, + PersonRole.Editor, + PersonRole.Publisher, + PersonRole.Character, + PersonRole.Translator, + PersonRole.Imprint, + PersonRole.Team, + PersonRole.Location +] diff --git a/UI/Web/src/app/_models/metadata/series-filter.ts b/UI/Web/src/app/_models/metadata/series-filter.ts index bfaee4f3f..7875732b7 100644 --- a/UI/Web/src/app/_models/metadata/series-filter.ts +++ b/UI/Web/src/app/_models/metadata/series-filter.ts @@ -1,6 +1,5 @@ -import { MangaFormat } from "../manga-format"; -import { SeriesFilterV2 } from "./v2/series-filter-v2"; -import {FilterField} from "./v2/filter-field"; +import {MangaFormat} from "../manga-format"; +import {FilterV2} from "./v2/filter-v2"; export interface FilterItem { title: string; @@ -8,10 +7,6 @@ export interface FilterItem { selected: boolean; } -export interface SortOptions { - sortField: SortField; - isAscending: boolean; -} export enum SortField { SortName = 1, @@ -28,35 +23,35 @@ export enum SortField { Random = 9 } -export const allSortFields = Object.keys(SortField) +export const allSeriesSortFields = Object.keys(SortField) .filter(key => !isNaN(Number(key)) && parseInt(key, 10) >= 0) .map(key => parseInt(key, 10)) as SortField[]; export const mangaFormatFilters = [ { - title: 'Images', + title: 'images', value: MangaFormat.IMAGE, selected: false }, { - title: 'EPUB', + title: 'epub', value: MangaFormat.EPUB, selected: false }, { - title: 'PDF', + title: 'pdf', value: MangaFormat.PDF, selected: false }, { - title: 'ARCHIVE', + title: 'archive', value: MangaFormat.ARCHIVE, selected: false } ]; -export interface FilterEvent { - filterV2: SeriesFilterV2; +export interface FilterEvent { + filterV2: FilterV2; isFirst: boolean; } diff --git a/UI/Web/src/app/_models/metadata/v2/browse-person-filter.ts b/UI/Web/src/app/_models/metadata/v2/browse-person-filter.ts new file mode 100644 index 000000000..bb5edc9ce --- /dev/null +++ b/UI/Web/src/app/_models/metadata/v2/browse-person-filter.ts @@ -0,0 +1,8 @@ +import {PersonRole} from "../person"; +import {PersonSortOptions} from "./sort-options"; + +export interface BrowsePersonFilter { + roles: Array; + query?: string; + sortOptions?: PersonSortOptions; +} diff --git a/UI/Web/src/app/_models/metadata/v2/filter-field.ts b/UI/Web/src/app/_models/metadata/v2/filter-field.ts index 08005d5c8..eeb8c7853 100644 --- a/UI/Web/src/app/_models/metadata/v2/filter-field.ts +++ b/UI/Web/src/app/_models/metadata/v2/filter-field.ts @@ -48,7 +48,7 @@ const enumArray = Object.keys(FilterField) enumArray.sort((a, b) => a.value.localeCompare(b.value)); -export const allFields = enumArray +export const allSeriesFilterFields = enumArray .map(key => parseInt(key.key, 10))as FilterField[]; export const allPeople = [ @@ -66,7 +66,6 @@ export const allPeople = [ export const personRoleForFilterField = (role: PersonRole) => { switch (role) { - case PersonRole.Artist: return FilterField.CoverArtist; case PersonRole.Character: return FilterField.Characters; case PersonRole.Colorist: return FilterField.Colorist; case PersonRole.CoverArtist: return FilterField.CoverArtist; diff --git a/UI/Web/src/app/_models/metadata/v2/filter-statement.ts b/UI/Web/src/app/_models/metadata/v2/filter-statement.ts index d031927a2..b14fe564d 100644 --- a/UI/Web/src/app/_models/metadata/v2/filter-statement.ts +++ b/UI/Web/src/app/_models/metadata/v2/filter-statement.ts @@ -1,8 +1,7 @@ -import { FilterComparison } from "./filter-comparison"; -import { FilterField } from "./filter-field"; +import {FilterComparison} from "./filter-comparison"; -export interface FilterStatement { +export interface FilterStatement { comparison: FilterComparison; - field: FilterField; + field: T; value: string; -} \ No newline at end of file +} diff --git a/UI/Web/src/app/_models/metadata/v2/filter-v2.ts b/UI/Web/src/app/_models/metadata/v2/filter-v2.ts new file mode 100644 index 000000000..77c064450 --- /dev/null +++ b/UI/Web/src/app/_models/metadata/v2/filter-v2.ts @@ -0,0 +1,11 @@ +import {FilterStatement} from "./filter-statement"; +import {FilterCombination} from "./filter-combination"; +import {SortOptions} from "./sort-options"; + +export interface FilterV2 { + name?: string; + statements: Array>; + combination: FilterCombination; + sortOptions?: SortOptions; + limitTo: number; +} diff --git a/UI/Web/src/app/_models/metadata/v2/person-filter-field.ts b/UI/Web/src/app/_models/metadata/v2/person-filter-field.ts new file mode 100644 index 000000000..6bfb5a0c1 --- /dev/null +++ b/UI/Web/src/app/_models/metadata/v2/person-filter-field.ts @@ -0,0 +1,12 @@ +export enum PersonFilterField { + Role = 1, + Name = 2, + SeriesCount = 3, + ChapterCount = 4, +} + + +export const allPersonFilterFields = Object.keys(PersonFilterField) + .filter(key => !isNaN(Number(key)) && parseInt(key, 10) >= 0) + .map(key => parseInt(key, 10)) as PersonFilterField[]; + diff --git a/UI/Web/src/app/_models/metadata/v2/person-sort-field.ts b/UI/Web/src/app/_models/metadata/v2/person-sort-field.ts new file mode 100644 index 000000000..6bcb66925 --- /dev/null +++ b/UI/Web/src/app/_models/metadata/v2/person-sort-field.ts @@ -0,0 +1,9 @@ +export enum PersonSortField { + Name = 1, + SeriesCount = 2, + ChapterCount = 3 +} + +export const allPersonSortFields = Object.keys(PersonSortField) + .filter(key => !isNaN(Number(key)) && parseInt(key, 10) >= 0) + .map(key => parseInt(key, 10)) as PersonSortField[]; diff --git a/UI/Web/src/app/_models/metadata/v2/series-filter-v2.ts b/UI/Web/src/app/_models/metadata/v2/series-filter-v2.ts deleted file mode 100644 index c13244644..000000000 --- a/UI/Web/src/app/_models/metadata/v2/series-filter-v2.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { SortOptions } from "../series-filter"; -import {FilterStatement} from "./filter-statement"; -import {FilterCombination} from "./filter-combination"; - -export interface SeriesFilterV2 { - name?: string; - statements: Array; - combination: FilterCombination; - sortOptions?: SortOptions; - limitTo: number; -} diff --git a/UI/Web/src/app/_models/metadata/v2/sort-options.ts b/UI/Web/src/app/_models/metadata/v2/sort-options.ts new file mode 100644 index 000000000..ed68d6b9d --- /dev/null +++ b/UI/Web/src/app/_models/metadata/v2/sort-options.ts @@ -0,0 +1,17 @@ +import {PersonSortField} from "./person-sort-field"; + +/** + * Series-based Sort options + */ +export interface SortOptions { + sortField: TSort; + isAscending: boolean; +} + +/** + * Person-based Sort Options + */ +export interface PersonSortOptions { + sortField: PersonSortField; + isAscending: boolean; +} diff --git a/UI/Web/src/app/_models/preferences/book-theme.ts b/UI/Web/src/app/_models/preferences/book-theme.ts index b6e37f6e4..cb321c110 100644 --- a/UI/Web/src/app/_models/preferences/book-theme.ts +++ b/UI/Web/src/app/_models/preferences/book-theme.ts @@ -1,7 +1,7 @@ -import { ThemeProvider } from "./site-theme"; +import {ThemeProvider} from "./site-theme"; /** - * Theme for the the book reader contents + * Theme for the book reader contents */ export interface BookTheme { name: string; diff --git a/UI/Web/src/app/_models/preferences/preferences.ts b/UI/Web/src/app/_models/preferences/preferences.ts index b6e364056..886c570e2 100644 --- a/UI/Web/src/app/_models/preferences/preferences.ts +++ b/UI/Web/src/app/_models/preferences/preferences.ts @@ -1,68 +1,20 @@ - -import { LayoutMode } from 'src/app/manga-reader/_models/layout-mode'; -import { BookPageLayoutMode } from '../readers/book-page-layout-mode'; -import { PageLayoutMode } from '../page-layout-mode'; -import { PageSplitOption } from './page-split-option'; -import { ReaderMode } from './reader-mode'; -import { ReadingDirection } from './reading-direction'; -import { ScalingOption } from './scaling-option'; -import { SiteTheme } from './site-theme'; -import {WritingStyle} from "./writing-style"; -import {PdfTheme} from "./pdf-theme"; -import {PdfScrollMode} from "./pdf-scroll-mode"; -import {PdfLayoutMode} from "./pdf-layout-mode"; -import {PdfSpreadMode} from "./pdf-spread-mode"; +import {PageLayoutMode} from '../page-layout-mode'; +import {SiteTheme} from './site-theme'; export interface Preferences { - // Manga Reader - readingDirection: ReadingDirection; - scalingOption: ScalingOption; - pageSplitOption: PageSplitOption; - readerMode: ReaderMode; - autoCloseMenu: boolean; - layoutMode: LayoutMode; - backgroundColor: string; - showScreenHints: boolean; - emulateBook: boolean; - swipeToPaginate: boolean; - // Book Reader - bookReaderMargin: number; - bookReaderLineSpacing: number; - bookReaderFontSize: number; - bookReaderFontFamily: string; - bookReaderTapToPaginate: boolean; - bookReaderReadingDirection: ReadingDirection; - bookReaderWritingStyle: WritingStyle; - bookReaderThemeName: string; - bookReaderLayoutMode: BookPageLayoutMode; - bookReaderImmersiveMode: boolean; + // Global + theme: SiteTheme; + globalPageLayoutMode: PageLayoutMode; + blurUnreadSummaries: boolean; + promptForDownloadSize: boolean; + noTransitions: boolean; + collapseSeriesRelationships: boolean; + shareReviews: boolean; + locale: string; - // PDF Reader - pdfTheme: PdfTheme; - pdfScrollMode: PdfScrollMode; - pdfSpreadMode: PdfSpreadMode; - - // Global - theme: SiteTheme; - globalPageLayoutMode: PageLayoutMode; - blurUnreadSummaries: boolean; - promptForDownloadSize: boolean; - noTransitions: boolean; - collapseSeriesRelationships: boolean; - shareReviews: boolean; - locale: string; + // Kavita+ + aniListScrobblingEnabled: boolean; + wantToReadSync: boolean; } -export const readingDirections = [{text: 'left-to-right', value: ReadingDirection.LeftToRight}, {text: 'right-to-left', value: ReadingDirection.RightToLeft}]; -export const bookWritingStyles = [{text: 'horizontal', value: WritingStyle.Horizontal}, {text: 'vertical', value: WritingStyle.Vertical}]; -export const scalingOptions = [{text: 'automatic', value: ScalingOption.Automatic}, {text: 'fit-to-height', value: ScalingOption.FitToHeight}, {text: 'fit-to-width', value: ScalingOption.FitToWidth}, {text: 'original', value: ScalingOption.Original}]; -export const pageSplitOptions = [{text: 'fit-to-screen', value: PageSplitOption.FitSplit}, {text: 'right-to-left', value: PageSplitOption.SplitRightToLeft}, {text: 'left-to-right', value: PageSplitOption.SplitLeftToRight}, {text: 'no-split', value: PageSplitOption.NoSplit}]; -export const readingModes = [{text: 'left-to-right', value: ReaderMode.LeftRight}, {text: 'up-to-down', value: ReaderMode.UpDown}, {text: 'webtoon', value: ReaderMode.Webtoon}]; -export const layoutModes = [{text: 'single', value: LayoutMode.Single}, {text: 'double', value: LayoutMode.Double}, {text: 'double-manga', value: LayoutMode.DoubleReversed}]; // TODO: Build this, {text: 'Double (No Cover)', value: LayoutMode.DoubleNoCover} -export const bookLayoutModes = [{text: 'scroll', value: BookPageLayoutMode.Default}, {text: '1-column', value: BookPageLayoutMode.Column1}, {text: '2-column', value: BookPageLayoutMode.Column2}]; -export const pageLayoutModes = [{text: 'cards', value: PageLayoutMode.Cards}, {text: 'list', value: PageLayoutMode.List}]; -export const pdfLayoutModes = [{text: 'pdf-multiple', value: PdfLayoutMode.Multiple}, {text: 'pdf-book', value: PdfLayoutMode.Book}]; -export const pdfScrollModes = [{text: 'pdf-vertical', value: PdfScrollMode.Vertical}, {text: 'pdf-horizontal', value: PdfScrollMode.Horizontal}, {text: 'pdf-page', value: PdfScrollMode.Page}]; -export const pdfSpreadModes = [{text: 'pdf-none', value: PdfSpreadMode.None}, {text: 'pdf-odd', value: PdfSpreadMode.Odd}, {text: 'pdf-even', value: PdfSpreadMode.Even}]; -export const pdfThemes = [{text: 'pdf-light', value: PdfTheme.Light}, {text: 'pdf-dark', value: PdfTheme.Dark}]; diff --git a/UI/Web/src/app/_models/preferences/reading-profiles.ts b/UI/Web/src/app/_models/preferences/reading-profiles.ts new file mode 100644 index 000000000..dad02946f --- /dev/null +++ b/UI/Web/src/app/_models/preferences/reading-profiles.ts @@ -0,0 +1,80 @@ +import {LayoutMode} from 'src/app/manga-reader/_models/layout-mode'; +import {BookPageLayoutMode} from '../readers/book-page-layout-mode'; +import {PageLayoutMode} from '../page-layout-mode'; +import {PageSplitOption} from './page-split-option'; +import {ReaderMode} from './reader-mode'; +import {ReadingDirection} from './reading-direction'; +import {ScalingOption} from './scaling-option'; +import {WritingStyle} from "./writing-style"; +import {PdfTheme} from "./pdf-theme"; +import {PdfScrollMode} from "./pdf-scroll-mode"; +import {PdfLayoutMode} from "./pdf-layout-mode"; +import {PdfSpreadMode} from "./pdf-spread-mode"; +import {Series} from "../series"; +import {Library} from "../library/library"; +import {UserBreakpoint} from "../../shared/_services/utility.service"; + +export enum ReadingProfileKind { + Default = 0, + User = 1, + Implicit = 2, +} + +export interface ReadingProfile { + + id: number; + name: string; + normalizedName: string; + kind: ReadingProfileKind; + + // Manga Reader + readingDirection: ReadingDirection; + scalingOption: ScalingOption; + pageSplitOption: PageSplitOption; + readerMode: ReaderMode; + autoCloseMenu: boolean; + layoutMode: LayoutMode; + backgroundColor: string; + showScreenHints: boolean; + emulateBook: boolean; + swipeToPaginate: boolean; + allowAutomaticWebtoonReaderDetection: boolean; + widthOverride?: number; + disableWidthOverride: UserBreakpoint; + + // Book Reader + bookReaderMargin: number; + bookReaderLineSpacing: number; + bookReaderFontSize: number; + bookReaderFontFamily: string; + bookReaderTapToPaginate: boolean; + bookReaderReadingDirection: ReadingDirection; + bookReaderWritingStyle: WritingStyle; + bookReaderThemeName: string; + bookReaderLayoutMode: BookPageLayoutMode; + bookReaderImmersiveMode: boolean; + + // PDF Reader + pdfTheme: PdfTheme; + pdfScrollMode: PdfScrollMode; + pdfSpreadMode: PdfSpreadMode; + + // relations + seriesIds: number[]; + libraryIds: number[]; + +} + +export const readingDirections = [{text: 'left-to-right', value: ReadingDirection.LeftToRight}, {text: 'right-to-left', value: ReadingDirection.RightToLeft}]; +export const bookWritingStyles = [{text: 'horizontal', value: WritingStyle.Horizontal}, {text: 'vertical', value: WritingStyle.Vertical}]; +export const scalingOptions = [{text: 'automatic', value: ScalingOption.Automatic}, {text: 'fit-to-height', value: ScalingOption.FitToHeight}, {text: 'fit-to-width', value: ScalingOption.FitToWidth}, {text: 'original', value: ScalingOption.Original}]; +export const pageSplitOptions = [{text: 'fit-to-screen', value: PageSplitOption.FitSplit}, {text: 'right-to-left', value: PageSplitOption.SplitRightToLeft}, {text: 'left-to-right', value: PageSplitOption.SplitLeftToRight}, {text: 'no-split', value: PageSplitOption.NoSplit}]; +export const readingModes = [{text: 'left-to-right', value: ReaderMode.LeftRight}, {text: 'up-to-down', value: ReaderMode.UpDown}, {text: 'webtoon', value: ReaderMode.Webtoon}]; +export const layoutModes = [{text: 'single', value: LayoutMode.Single}, {text: 'double', value: LayoutMode.Double}, {text: 'double-manga', value: LayoutMode.DoubleReversed}]; // TODO: Build this, {text: 'Double (No Cover)', value: LayoutMode.DoubleNoCover} +export const bookLayoutModes = [{text: 'scroll', value: BookPageLayoutMode.Default}, {text: '1-column', value: BookPageLayoutMode.Column1}, {text: '2-column', value: BookPageLayoutMode.Column2}]; +export const pageLayoutModes = [{text: 'cards', value: PageLayoutMode.Cards}, {text: 'list', value: PageLayoutMode.List}]; +export const pdfLayoutModes = [{text: 'pdf-multiple', value: PdfLayoutMode.Multiple}, {text: 'pdf-book', value: PdfLayoutMode.Book}]; +export const pdfScrollModes = [{text: 'pdf-vertical', value: PdfScrollMode.Vertical}, {text: 'pdf-horizontal', value: PdfScrollMode.Horizontal}, {text: 'pdf-page', value: PdfScrollMode.Page}]; +export const pdfSpreadModes = [{text: 'pdf-none', value: PdfSpreadMode.None}, {text: 'pdf-odd', value: PdfSpreadMode.Odd}, {text: 'pdf-even', value: PdfSpreadMode.Even}]; +export const pdfThemes = [{text: 'pdf-light', value: PdfTheme.Light}, {text: 'pdf-dark', value: PdfTheme.Dark}]; +export const breakPoints = [UserBreakpoint.Never, UserBreakpoint.Mobile, UserBreakpoint.Tablet, UserBreakpoint.Desktop] diff --git a/UI/Web/src/app/_models/rating.ts b/UI/Web/src/app/_models/rating.ts index a4c4b79ed..7132706f9 100644 --- a/UI/Web/src/app/_models/rating.ts +++ b/UI/Web/src/app/_models/rating.ts @@ -1,9 +1,15 @@ import {ScrobbleProvider} from "../_services/scrobbling.service"; +export enum RatingAuthority { + User = 0, + Critic = 1, +} + export interface Rating { averageScore: number; meanScore: number; favoriteCount: number; provider: ScrobbleProvider; providerUrl: string | undefined; + authority: RatingAuthority; } diff --git a/UI/Web/src/app/_models/reading-list.ts b/UI/Web/src/app/_models/reading-list.ts index d5b115ad0..646360153 100644 --- a/UI/Web/src/app/_models/reading-list.ts +++ b/UI/Web/src/app/_models/reading-list.ts @@ -1,6 +1,9 @@ -import { LibraryType } from "./library/library"; -import { MangaFormat } from "./manga-format"; +import {LibraryType} from "./library/library"; +import {MangaFormat} from "./manga-format"; import {IHasCover} from "./common/i-has-cover"; +import {AgeRating} from "./metadata/age-rating"; +import {IHasReadingTime} from "./common/i-has-reading-time"; +import {IHasCast} from "./common/i-has-cast"; export interface ReadingListItem { pagesRead: number; @@ -30,13 +33,25 @@ export interface ReadingList extends IHasCover { items: Array; /** * If this is empty or null, the cover image isn't set. Do not use this externally. - */ - coverImage?: string; - primaryColor: string; - secondaryColor: string; - startingYear: number; - startingMonth: number; - endingYear: number; - endingMonth: number; + */ + coverImage?: string; + primaryColor: string; + secondaryColor: string; + startingYear: number; + startingMonth: number; + endingYear: number; + endingMonth: number; itemCount: number; + ageRating: AgeRating; } + +export interface ReadingListInfo extends IHasReadingTime, IHasReadingTime { + pages: number; + wordCount: number; + isAllEpub: boolean; + minHoursToRead: number; + maxHoursToRead: number; + avgHoursToRead: number; +} + +export interface ReadingListCast extends IHasCast {} diff --git a/UI/Web/src/app/_models/scrobbling/scrobble-event-filter.ts b/UI/Web/src/app/_models/scrobbling/scrobble-event-filter.ts index 102cf89d1..c0ea95d64 100644 --- a/UI/Web/src/app/_models/scrobbling/scrobble-event-filter.ts +++ b/UI/Web/src/app/_models/scrobbling/scrobble-event-filter.ts @@ -4,7 +4,8 @@ export enum ScrobbleEventSortField { LastModified = 2, Type= 3, Series = 4, - IsProcessed = 5 + IsProcessed = 5, + ScrobbleEvent = 6 } export interface ScrobbleEventFilter { diff --git a/UI/Web/src/app/_models/scrobbling/scrobble-event.ts b/UI/Web/src/app/_models/scrobbling/scrobble-event.ts index 48a75afda..7db1ceeaa 100644 --- a/UI/Web/src/app/_models/scrobbling/scrobble-event.ts +++ b/UI/Web/src/app/_models/scrobbling/scrobble-event.ts @@ -7,6 +7,7 @@ export enum ScrobbleEventType { } export interface ScrobbleEvent { + id: number; seriesName: string; seriesId: number; libraryId: number; diff --git a/UI/Web/src/app/_models/series-detail/external-series-detail.ts b/UI/Web/src/app/_models/series-detail/external-series-detail.ts index 85d89c760..db25782ca 100644 --- a/UI/Web/src/app/_models/series-detail/external-series-detail.ts +++ b/UI/Web/src/app/_models/series-detail/external-series-detail.ts @@ -27,8 +27,9 @@ export interface MetadataTagDto { export interface ExternalSeriesDetail { name: string; - aniListId?: number; - malId?: number; + aniListId?: number | null; + malId?: number | null; + cbrId?: number | null; synonyms: Array; plusMediaFormat: PlusMediaFormat; siteUrl?: string; @@ -37,6 +38,11 @@ export interface ExternalSeriesDetail { summary?: string; volumeCount?: number; chapterCount?: number; + /** + * These are duplicated with volumeCount based on where it's being invoked. + */ + volumes?: number; + chapters?: number; staff: Array; tags: Array; provider: ScrobbleProvider; diff --git a/UI/Web/src/app/_models/series-detail/external-series-match.ts b/UI/Web/src/app/_models/series-detail/external-series-match.ts new file mode 100644 index 000000000..28afea18a --- /dev/null +++ b/UI/Web/src/app/_models/series-detail/external-series-match.ts @@ -0,0 +1,6 @@ +import {ExternalSeriesDetail} from "./external-series-detail"; + +export interface ExternalSeriesMatch { + series: ExternalSeriesDetail; + matchRating: number; +} diff --git a/UI/Web/src/app/_models/series-detail/hour-estimate-range.ts b/UI/Web/src/app/_models/series-detail/hour-estimate-range.ts index f94ac569b..805a71178 100644 --- a/UI/Web/src/app/_models/series-detail/hour-estimate-range.ts +++ b/UI/Web/src/app/_models/series-detail/hour-estimate-range.ts @@ -1,6 +1,5 @@ -export interface HourEstimateRange{ +export interface HourEstimateRange { minHours: number; maxHours: number; avgHours: number; - //hasProgress: boolean; -} \ No newline at end of file +} diff --git a/UI/Web/src/app/_models/series.ts b/UI/Web/src/app/_models/series.ts index 8d4f773bb..29d4aed7f 100644 --- a/UI/Web/src/app/_models/series.ts +++ b/UI/Web/src/app/_models/series.ts @@ -5,70 +5,78 @@ import {IHasReadingTime} from "./common/i-has-reading-time"; import {IHasProgress} from "./common/i-has-progress"; export interface Series extends IHasCover, IHasReadingTime, IHasProgress { - id: number; - name: string; - /** - * This is not shown to user - */ - originalName: string; - localizedName: string; - sortName: string; - coverImageLocked: boolean; - sortNameLocked: boolean; - localizedNameLocked: boolean; - nameLocked: boolean; - volumes: Volume[]; - /** - * Total pages in series - */ - pages: number; - /** - * Total pages the logged in user has read - */ - pagesRead: number; - /** - * User's rating (0-5) - */ - userRating: number; - hasUserRated: boolean; - libraryId: number; - /** - * DateTime the entity was created - */ - created: string; - /** - * Format of the Series - */ - format: MangaFormat; - /** - * DateTime that represents last time the logged in user read this series - */ - latestReadDate: string; - /** - * DateTime representing last time a chapter was added to the Series - */ - lastChapterAdded: string; - /** - * DateTime representing last time the series folder was scanned - */ - lastFolderScanned: string; - /** - * Number of words in the series - */ - wordCount: number; - minHoursToRead: number; - maxHoursToRead: number; - avgHoursToRead: number; - /** - * Highest level folder containing this series - */ - folderPath: string; - lowestFolderPath: string; - /** - * This is currently only used on Series detail page for recommendations - */ - summary?: string; - coverImage?: string; - primaryColor: string; - secondaryColor: string; + id: number; + name: string; + /** + * This is not shown to user + */ + originalName: string; + localizedName: string; + sortName: string; + coverImageLocked: boolean; + sortNameLocked: boolean; + localizedNameLocked: boolean; + nameLocked: boolean; + volumes: Volume[]; + /** + * Total pages in series + */ + pages: number; + /** + * Total pages the logged in user has read + */ + pagesRead: number; + /** + * User's rating (0-5) + */ + userRating: number; + hasUserRated: boolean; + libraryId: number; + /** + * DateTime the entity was created + */ + created: string; + /** + * Format of the Series + */ + format: MangaFormat; + /** + * DateTime that represents last time the logged in user read this series + */ + latestReadDate: string; + /** + * DateTime representing last time a chapter was added to the Series + */ + lastChapterAdded: string; + /** + * DateTime representing last time the series folder was scanned + */ + lastFolderScanned: string; + /** + * Number of words in the series + */ + wordCount: number; + minHoursToRead: number; + maxHoursToRead: number; + avgHoursToRead: number; + /** + * Highest level folder containing this series + */ + folderPath: string; + lowestFolderPath: string; + /** + * This is currently only used on Series detail page for recommendations + */ + summary?: string; + coverImage?: string; + primaryColor: string; + secondaryColor: string; + /** + * Kavita+ only. Will not perform any matching from Kavita+ + */ + dontMatch: boolean; + /** + * Kavita+ only. Did this series not match and won't without manual match + */ + isBlacklisted: boolean; } diff --git a/UI/Web/src/app/_models/user.ts b/UI/Web/src/app/_models/user.ts index e5a74dbcf..c94a9485d 100644 --- a/UI/Web/src/app/_models/user.ts +++ b/UI/Web/src/app/_models/user.ts @@ -1,14 +1,16 @@ -import { AgeRestriction } from './metadata/age-restriction'; -import { Preferences } from './preferences/preferences'; +import {AgeRestriction} from './metadata/age-restriction'; +import {Preferences} from './preferences/preferences'; // This interface is only used for login and storing/retrieving JWT from local storage export interface User { - username: string; - token: string; - refreshToken: string; - roles: string[]; - preferences: Preferences; - apiKey: string; - email: string; - ageRestriction: AgeRestriction; + username: string; + token: string; + refreshToken: string; + roles: string[]; + preferences: Preferences; + apiKey: string; + email: string; + ageRestriction: AgeRestriction; + hasRunScrobbleEventGeneration: boolean; + scrobbleEventGenerationRan: string; // datetime } diff --git a/UI/Web/src/app/_models/wiki.ts b/UI/Web/src/app/_models/wiki.ts index 381a38638..a01267cf3 100644 --- a/UI/Web/src/app/_models/wiki.ts +++ b/UI/Web/src/app/_models/wiki.ts @@ -6,9 +6,9 @@ export enum WikiLink { SeriesRelationships = 'https://wiki.kavitareader.com/guides/features/relationships', Bookmarks = 'https://wiki.kavitareader.com/guides/features/bookmarks', DataCollection = 'https://wiki.kavitareader.com/troubleshooting/faq#q-does-kavita-collect-any-data-on-me', - MediaIssues = 'https://wiki.kavitareader.com/guides/admin-settings/media#media-issues', + MediaIssues = 'https://wiki.kavitareader.com/guides/admin-settings/mediaissues/', KavitaPlusDiscordId = 'https://wiki.kavitareader.com/guides/admin-settings/kavita+#discord-id', - KavitaPlus = 'https://wiki.kavitareader.com/guides/admin-settings/kavita+', + KavitaPlus = 'https://wiki.kavitareader.com/kavita+', KavitaPlusFAQ = 'https://wiki.kavitareader.com/kavita+/faq', ReadingListCBL = 'https://wiki.kavitareader.com/guides/features/readinglists#creating-a-reading-list-via-cbl', Donation = 'https://wiki.kavitareader.com/donating', @@ -19,6 +19,7 @@ export enum WikiLink { Library = 'https://wiki.kavitareader.com/guides/admin-settings/libraries', UpdateNative = 'https://wiki.kavitareader.com/guides/updating/updating-native', UpdateDocker = 'https://wiki.kavitareader.com/guides/updating/updating-docker', - OpdsClients = 'https://wiki.kavitareader.com/guides/opds#opds-capable-clients', - Guides = 'https://wiki.kavitareader.com/guides' + OpdsClients = 'https://wiki.kavitareader.com/guides/features/opds/#opds-capable-clients', + Guides = 'https://wiki.kavitareader.com/guides', + ReadingProfiles = "https://wiki.kavitareader.com/guides/user-settings/reading-profiles/", } diff --git a/UI/Web/src/app/_pipes/age-rating.pipe.ts b/UI/Web/src/app/_pipes/age-rating.pipe.ts index 15554cf05..f99a77f72 100644 --- a/UI/Web/src/app/_pipes/age-rating.pipe.ts +++ b/UI/Web/src/app/_pipes/age-rating.pipe.ts @@ -1,22 +1,22 @@ import {inject, Pipe, PipeTransform} from '@angular/core'; -import { Observable, of } from 'rxjs'; -import { AgeRating } from '../_models/metadata/age-rating'; -import { AgeRatingDto } from '../_models/metadata/age-rating-dto'; +import {AgeRating} from '../_models/metadata/age-rating'; +import {AgeRatingDto} from '../_models/metadata/age-rating-dto'; import {TranslocoService} from "@jsverse/transloco"; @Pipe({ name: 'ageRating', - standalone: true + standalone: true, + pure: true }) export class AgeRatingPipe implements PipeTransform { - translocoService = inject(TranslocoService); + private readonly translocoService = inject(TranslocoService); - transform(value: AgeRating | AgeRatingDto | undefined): Observable { - if (value === undefined || value === null) return of(this.translocoService.translate('age-rating-pipe.unknown') as string); + transform(value: AgeRating | AgeRatingDto | undefined): string { + if (value === undefined || value === null) return this.translocoService.translate('age-rating-pipe.unknown'); if (value.hasOwnProperty('title')) { - return of((value as AgeRatingDto).title); + return (value as AgeRatingDto).title; } switch (value) { @@ -54,7 +54,7 @@ export class AgeRatingPipe implements PipeTransform { return this.translocoService.translate('age-rating-pipe.r18-plus'); } - return of(this.translocoService.translate('age-rating-pipe.unknown') as string); + return this.translocoService.translate('age-rating-pipe.unknown'); } } diff --git a/UI/Web/src/app/_pipes/breakpoint.pipe.ts b/UI/Web/src/app/_pipes/breakpoint.pipe.ts new file mode 100644 index 000000000..1897b773c --- /dev/null +++ b/UI/Web/src/app/_pipes/breakpoint.pipe.ts @@ -0,0 +1,25 @@ +import {Pipe, PipeTransform} from '@angular/core'; +import {translate} from "@jsverse/transloco"; +import {UserBreakpoint} from "../shared/_services/utility.service"; + +@Pipe({ + name: 'breakpoint' +}) +export class BreakpointPipe implements PipeTransform { + + transform(value: UserBreakpoint): string { + const v = parseInt(value + '', 10) as UserBreakpoint; + switch (v) { + case UserBreakpoint.Never: + return translate('breakpoint-pipe.never'); + case UserBreakpoint.Mobile: + return translate('breakpoint-pipe.mobile'); + case UserBreakpoint.Tablet: + return translate('breakpoint-pipe.tablet'); + case UserBreakpoint.Desktop: + return translate('breakpoint-pipe.desktop'); + } + throw new Error("unknown breakpoint value: " + value); + } + +} diff --git a/UI/Web/src/app/_pipes/browse-title.pipe.ts b/UI/Web/src/app/_pipes/browse-title.pipe.ts new file mode 100644 index 000000000..0495e8b8a --- /dev/null +++ b/UI/Web/src/app/_pipes/browse-title.pipe.ts @@ -0,0 +1,78 @@ +import {Pipe, PipeTransform} from '@angular/core'; +import {FilterField} from "../_models/metadata/v2/filter-field"; +import {translate} from "@jsverse/transloco"; + +/** + * Responsible for taking a filter field and value (as a string) and translating into a "Browse X" heading for All Series page + * Example: Genre & "Action" -> Browse Action + * Example: Artist & "Joe Shmo" -> Browse Joe Shmo Works + */ +@Pipe({ + name: 'browseTitle' +}) +export class BrowseTitlePipe implements PipeTransform { + + transform(field: FilterField, value: string): string { + switch (field) { + case FilterField.PublicationStatus: + return translate('browse-title-pipe.publication-status', {value}); + case FilterField.AgeRating: + return translate('browse-title-pipe.age-rating', {value}); + case FilterField.UserRating: + return translate('browse-title-pipe.user-rating', {value}); + case FilterField.Tags: + return translate('browse-title-pipe.tag', {value}); + case FilterField.Translators: + return translate('browse-title-pipe.translator', {value}); + case FilterField.Characters: + return translate('browse-title-pipe.character', {value}); + case FilterField.Publisher: + return translate('browse-title-pipe.publisher', {value}); + case FilterField.Editor: + return translate('browse-title-pipe.editor', {value}); + case FilterField.CoverArtist: + return translate('browse-title-pipe.artist', {value}); + case FilterField.Letterer: + return translate('browse-title-pipe.letterer', {value}); + case FilterField.Colorist: + return translate('browse-title-pipe.colorist', {value}); + case FilterField.Inker: + return translate('browse-title-pipe.inker', {value}); + case FilterField.Penciller: + return translate('browse-title-pipe.penciller', {value}); + case FilterField.Writers: + return translate('browse-title-pipe.writer', {value}); + case FilterField.Genres: + return translate('browse-title-pipe.genre', {value}); + case FilterField.Libraries: + return translate('browse-title-pipe.library', {value}); + case FilterField.Formats: + return translate('browse-title-pipe.format', {value}); + case FilterField.ReleaseYear: + return translate('browse-title-pipe.release-year', {value}); + case FilterField.Imprint: + return translate('browse-title-pipe.imprint', {value}); + case FilterField.Team: + return translate('browse-title-pipe.team', {value}); + case FilterField.Location: + return translate('browse-title-pipe.location', {value}); + + // These have no natural links in the app to demand a richer title experience + case FilterField.Languages: + case FilterField.CollectionTags: + case FilterField.ReadProgress: + case FilterField.ReadTime: + case FilterField.Path: + case FilterField.FilePath: + case FilterField.WantToRead: + case FilterField.ReadingDate: + case FilterField.AverageRating: + case FilterField.ReadLast: + case FilterField.Summary: + case FilterField.SeriesName: + default: + return ''; + } + } + +} diff --git a/UI/Web/src/app/_pipes/confirm-translate.pipe.ts b/UI/Web/src/app/_pipes/confirm-translate.pipe.ts new file mode 100644 index 000000000..008f28849 --- /dev/null +++ b/UI/Web/src/app/_pipes/confirm-translate.pipe.ts @@ -0,0 +1,20 @@ +import { Pipe, PipeTransform } from '@angular/core'; +import { translate } from '@jsverse/transloco'; + +@Pipe({ + name: 'confirmTranslate', + standalone: true +}) +export class ConfirmTranslatePipe implements PipeTransform { + + transform(value: string | undefined | null): string | undefined | null { + if (!value) return value; + + if (value.startsWith('confirm.')) { + return translate(value); + } + + return value; + } + +} diff --git a/UI/Web/src/app/_pipes/encode-format.pipe.ts b/UI/Web/src/app/_pipes/encode-format.pipe.ts index 9485f80f8..f082c0495 100644 --- a/UI/Web/src/app/_pipes/encode-format.pipe.ts +++ b/UI/Web/src/app/_pipes/encode-format.pipe.ts @@ -1,4 +1,4 @@ -import { Pipe, PipeTransform } from '@angular/core'; +import {Pipe, PipeTransform} from '@angular/core'; import {EncodeFormat} from "../admin/_models/encode-format"; @Pipe({ diff --git a/UI/Web/src/app/_pipes/generic-filter-field.pipe.ts b/UI/Web/src/app/_pipes/generic-filter-field.pipe.ts new file mode 100644 index 000000000..f342c0034 --- /dev/null +++ b/UI/Web/src/app/_pipes/generic-filter-field.pipe.ts @@ -0,0 +1,108 @@ +import {Pipe, PipeTransform} from '@angular/core'; +import {FilterField} from "../_models/metadata/v2/filter-field"; +import {translate} from "@jsverse/transloco"; +import {ValidFilterEntity} from "../metadata-filter/filter-settings"; +import {PersonFilterField} from "../_models/metadata/v2/person-filter-field"; + +@Pipe({ + name: 'genericFilterField' +}) +export class GenericFilterFieldPipe implements PipeTransform { + + transform(value: T, entityType: ValidFilterEntity): string { + + switch (entityType) { + case "series": + return this.translateFilterField(value as FilterField); + case "person": + return this.translatePersonFilterField(value as PersonFilterField); + } + } + + private translatePersonFilterField(value: PersonFilterField) { + switch (value) { + case PersonFilterField.Role: + return translate('generic-filter-field-pipe.person-role'); + case PersonFilterField.Name: + return translate('generic-filter-field-pipe.person-name'); + case PersonFilterField.SeriesCount: + return translate('generic-filter-field-pipe.person-series-count'); + case PersonFilterField.ChapterCount: + return translate('generic-filter-field-pipe.person-chapter-count'); + } + } + + private translateFilterField(value: FilterField) { + switch (value) { + case FilterField.AgeRating: + return translate('filter-field-pipe.age-rating'); + case FilterField.Characters: + return translate('filter-field-pipe.characters'); + case FilterField.CollectionTags: + return translate('filter-field-pipe.collection-tags'); + case FilterField.Colorist: + return translate('filter-field-pipe.colorist'); + case FilterField.CoverArtist: + return translate('filter-field-pipe.cover-artist'); + case FilterField.Editor: + return translate('filter-field-pipe.editor'); + case FilterField.Formats: + return translate('filter-field-pipe.formats'); + case FilterField.Genres: + return translate('filter-field-pipe.genres'); + case FilterField.Inker: + return translate('filter-field-pipe.inker'); + case FilterField.Imprint: + return translate('filter-field-pipe.imprint'); + case FilterField.Team: + return translate('filter-field-pipe.team'); + case FilterField.Location: + return translate('filter-field-pipe.location'); + case FilterField.Languages: + return translate('filter-field-pipe.languages'); + case FilterField.Libraries: + return translate('filter-field-pipe.libraries'); + case FilterField.Letterer: + return translate('filter-field-pipe.letterer'); + case FilterField.PublicationStatus: + return translate('filter-field-pipe.publication-status'); + case FilterField.Penciller: + return translate('filter-field-pipe.penciller'); + case FilterField.Publisher: + return translate('filter-field-pipe.publisher'); + case FilterField.ReadProgress: + return translate('filter-field-pipe.read-progress'); + case FilterField.ReadTime: + return translate('filter-field-pipe.read-time'); + case FilterField.ReleaseYear: + return translate('filter-field-pipe.release-year'); + case FilterField.SeriesName: + return translate('filter-field-pipe.series-name'); + case FilterField.Summary: + return translate('filter-field-pipe.summary'); + case FilterField.Tags: + return translate('filter-field-pipe.tags'); + case FilterField.Translators: + return translate('filter-field-pipe.translators'); + case FilterField.UserRating: + return translate('filter-field-pipe.user-rating'); + case FilterField.Writers: + return translate('filter-field-pipe.writers'); + case FilterField.Path: + return translate('filter-field-pipe.path'); + case FilterField.FilePath: + return translate('filter-field-pipe.file-path'); + case FilterField.WantToRead: + return translate('filter-field-pipe.want-to-read'); + case FilterField.ReadingDate: + return translate('filter-field-pipe.read-date'); + case FilterField.ReadLast: + return translate('filter-field-pipe.read-last'); + case FilterField.AverageRating: + return translate('filter-field-pipe.average-rating'); + default: + throw new Error(`Invalid FilterField value: ${value}`); + } + } + +} diff --git a/UI/Web/src/app/_pipes/library-name.pipe.ts b/UI/Web/src/app/_pipes/library-name.pipe.ts new file mode 100644 index 000000000..c34f50166 --- /dev/null +++ b/UI/Web/src/app/_pipes/library-name.pipe.ts @@ -0,0 +1,16 @@ +import {inject, Pipe, PipeTransform} from '@angular/core'; +import {LibraryService} from "../_services/library.service"; +import {Observable} from "rxjs"; + +@Pipe({ + name: 'libraryName', + standalone: true +}) +export class LibraryNamePipe implements PipeTransform { + private readonly libraryService = inject(LibraryService); + + transform(libraryId: number): Observable { + return this.libraryService.getLibraryName(libraryId); + } + +} diff --git a/UI/Web/src/app/_pipes/library-type.pipe.ts b/UI/Web/src/app/_pipes/library-type.pipe.ts index 74a62647f..1881b64d5 100644 --- a/UI/Web/src/app/_pipes/library-type.pipe.ts +++ b/UI/Web/src/app/_pipes/library-type.pipe.ts @@ -11,7 +11,7 @@ import {TranslocoService} from "@jsverse/transloco"; }) export class LibraryTypePipe implements PipeTransform { - translocoService = inject(TranslocoService); + private readonly translocoService = inject(TranslocoService); transform(libraryType: LibraryType): string { switch (libraryType) { case LibraryType.Book: diff --git a/UI/Web/src/app/_pipes/log-level.pipe.ts b/UI/Web/src/app/_pipes/log-level.pipe.ts new file mode 100644 index 000000000..1a1c7c19a --- /dev/null +++ b/UI/Web/src/app/_pipes/log-level.pipe.ts @@ -0,0 +1,17 @@ +import {Pipe, PipeTransform} from '@angular/core'; +import {translate} from "@jsverse/transloco"; + +/** + * Transforms the log level string into a localized string + */ +@Pipe({ + name: 'logLevel', + standalone: true, + pure: true +}) +export class LogLevelPipe implements PipeTransform { + transform(value: string): string { + return translate('log-level-pipe.' + value.toLowerCase()); + } + +} diff --git a/UI/Web/src/app/_pipes/match-state.pipe.ts b/UI/Web/src/app/_pipes/match-state.pipe.ts new file mode 100644 index 000000000..9f0cb00ae --- /dev/null +++ b/UI/Web/src/app/_pipes/match-state.pipe.ts @@ -0,0 +1,27 @@ +import { Pipe, PipeTransform } from '@angular/core'; +import {MatchStateOption} from "../_models/kavitaplus/match-state-option"; +import {translate} from "@jsverse/transloco"; + +@Pipe({ + name: 'matchStateOption', + standalone: true +}) +export class MatchStateOptionPipe implements PipeTransform { + + transform(value: MatchStateOption): string { + switch (value) { + case MatchStateOption.DontMatch: + return translate('manage-matched-metadata.dont-match-label'); + case MatchStateOption.All: + return translate('manage-matched-metadata.all-status-label'); + case MatchStateOption.Matched: + return translate('manage-matched-metadata.matched-status-label'); + case MatchStateOption.NotMatched: + return translate('manage-matched-metadata.unmatched-status-label'); + case MatchStateOption.Error: + return translate('manage-matched-metadata.blacklist-status-label'); + + } + } + +} diff --git a/UI/Web/src/app/_pipes/metadata-setting-filed.pipe.ts b/UI/Web/src/app/_pipes/metadata-setting-filed.pipe.ts new file mode 100644 index 000000000..dcaed4f69 --- /dev/null +++ b/UI/Web/src/app/_pipes/metadata-setting-filed.pipe.ts @@ -0,0 +1,45 @@ +import {Pipe, PipeTransform} from '@angular/core'; +import {MetadataSettingField} from "../admin/_models/metadata-setting-field"; +import {translate} from "@jsverse/transloco"; + +@Pipe({ + name: 'metadataSettingFiled', + standalone: true +}) +export class MetadataSettingFiledPipe implements PipeTransform { + + transform(value: MetadataSettingField): string { + switch (value) { + case MetadataSettingField.ChapterTitle: + return translate('metadata-setting-field-pipe.chapter-title'); + case MetadataSettingField.ChapterSummary: + return translate('metadata-setting-field-pipe.chapter-summary'); + case MetadataSettingField.ChapterReleaseDate: + return translate('metadata-setting-field-pipe.chapter-release-date'); + case MetadataSettingField.ChapterPublisher: + return translate('metadata-setting-field-pipe.chapter-publisher'); + case MetadataSettingField.ChapterCovers: + return translate('metadata-setting-field-pipe.chapter-covers'); + case MetadataSettingField.AgeRating: + return translate('metadata-setting-field-pipe.age-rating'); + case MetadataSettingField.People: + return translate('metadata-setting-field-pipe.people'); + case MetadataSettingField.Covers: + return translate('metadata-setting-field-pipe.covers'); + case MetadataSettingField.Summary: + return translate('metadata-setting-field-pipe.summary'); + case MetadataSettingField.PublicationStatus: + return translate('metadata-setting-field-pipe.publication-status'); + case MetadataSettingField.StartDate: + return translate('metadata-setting-field-pipe.start-date'); + case MetadataSettingField.Genres: + return translate('metadata-setting-field-pipe.genres'); + case MetadataSettingField.Tags: + return translate('metadata-setting-field-pipe.tags'); + case MetadataSettingField.LocalizedName: + return translate('metadata-setting-field-pipe.localized-name'); + + } + } + +} diff --git a/UI/Web/src/app/_pipes/person-role.pipe.ts b/UI/Web/src/app/_pipes/person-role.pipe.ts index c1395ae5b..1b9ee2163 100644 --- a/UI/Web/src/app/_pipes/person-role.pipe.ts +++ b/UI/Web/src/app/_pipes/person-role.pipe.ts @@ -1,6 +1,6 @@ -import {inject, Pipe, PipeTransform} from '@angular/core'; -import { PersonRole } from '../_models/metadata/person'; -import {translate, TranslocoService} from "@jsverse/transloco"; +import {Pipe, PipeTransform} from '@angular/core'; +import {PersonRole} from '../_models/metadata/person'; +import {translate} from "@jsverse/transloco"; @Pipe({ name: 'personRole', @@ -10,8 +10,6 @@ export class PersonRolePipe implements PipeTransform { transform(value: PersonRole): string { switch (value) { - case PersonRole.Artist: - return translate('person-role-pipe.artist'); case PersonRole.Character: return translate('person-role-pipe.character'); case PersonRole.Colorist: diff --git a/UI/Web/src/app/_pipes/plus-media-format.pipe.ts b/UI/Web/src/app/_pipes/plus-media-format.pipe.ts new file mode 100644 index 000000000..b72822e33 --- /dev/null +++ b/UI/Web/src/app/_pipes/plus-media-format.pipe.ts @@ -0,0 +1,25 @@ +import {Pipe, PipeTransform} from '@angular/core'; +import {PlusMediaFormat} from "../_models/series-detail/external-series-detail"; +import {translate} from "@jsverse/transloco"; + +@Pipe({ + name: 'plusMediaFormat', + standalone: true +}) +export class PlusMediaFormatPipe implements PipeTransform { + + transform(value: PlusMediaFormat): string { + switch (value) { + case PlusMediaFormat.Manga: + return translate('library-type-pipe.manga'); + case PlusMediaFormat.Comic: + return translate('library-type-pipe.comicVine'); + case PlusMediaFormat.LightNovel: + return translate('library-type-pipe.lightNovel'); + case PlusMediaFormat.Book: + return translate('library-type-pipe.book'); + + } + } + +} diff --git a/UI/Web/src/app/_pipes/provider-image.pipe.ts b/UI/Web/src/app/_pipes/provider-image.pipe.ts index 80574ef3b..5d845a672 100644 --- a/UI/Web/src/app/_pipes/provider-image.pipe.ts +++ b/UI/Web/src/app/_pipes/provider-image.pipe.ts @@ -17,6 +17,8 @@ export class ProviderImagePipe implements PipeTransform { return `assets/images/ExternalServices/GoogleBooks${large ? '-lg' : ''}.png`; case ScrobbleProvider.Kavita: return `assets/images/logo-${large ? '64' : '32'}.png`; + case ScrobbleProvider.Cbr: + return `assets/images/ExternalServices/ComicBookRoundup.png`; } } diff --git a/UI/Web/src/app/_pipes/provider-name.pipe.ts b/UI/Web/src/app/_pipes/provider-name.pipe.ts deleted file mode 100644 index 1947b3f5f..000000000 --- a/UI/Web/src/app/_pipes/provider-name.pipe.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { Pipe, PipeTransform } from '@angular/core'; -import {ScrobbleProvider} from "../_services/scrobbling.service"; - -@Pipe({ - name: 'providerName', - standalone: true -}) -export class ProviderNamePipe implements PipeTransform { - - transform(value: ScrobbleProvider): string { - switch (value) { - case ScrobbleProvider.AniList: - return 'AniList'; - case ScrobbleProvider.Mal: - return 'MAL'; - case ScrobbleProvider.Kavita: - return 'Kavita'; - case ScrobbleProvider.GoogleBooks: - return 'Google Books'; - } - } - -} diff --git a/UI/Web/src/app/_pipes/role-localized.pipe.ts b/UI/Web/src/app/_pipes/role-localized.pipe.ts new file mode 100644 index 000000000..1890962dd --- /dev/null +++ b/UI/Web/src/app/_pipes/role-localized.pipe.ts @@ -0,0 +1,15 @@ +import {Pipe, PipeTransform} from '@angular/core'; +import {Role} from "../_services/account.service"; +import {translate} from "@jsverse/transloco"; + +@Pipe({ + name: 'roleLocalized' +}) +export class RoleLocalizedPipe implements PipeTransform { + + transform(value: Role | string): string { + const key = (value + '').toLowerCase().replace(' ', '-'); + return translate(`role-localized-pipe.${key}`); + } + +} diff --git a/UI/Web/src/app/_pipes/scrobble-provider-name.pipe.ts b/UI/Web/src/app/_pipes/scrobble-provider-name.pipe.ts index 7617f04ec..cc6e01449 100644 --- a/UI/Web/src/app/_pipes/scrobble-provider-name.pipe.ts +++ b/UI/Web/src/app/_pipes/scrobble-provider-name.pipe.ts @@ -12,6 +12,7 @@ export class ScrobbleProviderNamePipe implements PipeTransform { case ScrobbleProvider.AniList: return 'AniList'; case ScrobbleProvider.Mal: return 'MAL'; case ScrobbleProvider.Kavita: return 'Kavita'; + case ScrobbleProvider.Cbr: return 'Comicbook Roundup'; case ScrobbleProvider.GoogleBooks: return 'Google Books'; } } diff --git a/UI/Web/src/app/_pipes/sort-field.pipe.ts b/UI/Web/src/app/_pipes/sort-field.pipe.ts index 13ff4f758..d032de9c8 100644 --- a/UI/Web/src/app/_pipes/sort-field.pipe.ts +++ b/UI/Web/src/app/_pipes/sort-field.pipe.ts @@ -1,6 +1,8 @@ -import { Pipe, PipeTransform } from '@angular/core'; +import {Pipe, PipeTransform} from '@angular/core'; import {SortField} from "../_models/metadata/series-filter"; import {TranslocoService} from "@jsverse/transloco"; +import {ValidFilterEntity} from "../metadata-filter/filter-settings"; +import {PersonSortField} from "../_models/metadata/v2/person-sort-field"; @Pipe({ name: 'sortField', @@ -11,7 +13,30 @@ export class SortFieldPipe implements PipeTransform { constructor(private translocoService: TranslocoService) { } - transform(value: SortField): string { + transform(value: T, entityType: ValidFilterEntity): string { + + switch (entityType) { + case 'series': + return this.seriesSortFields(value as SortField); + case 'person': + return this.personSortFields(value as PersonSortField); + + } + } + + private personSortFields(value: PersonSortField) { + switch (value) { + case PersonSortField.Name: + return this.translocoService.translate('sort-field-pipe.person-name'); + case PersonSortField.SeriesCount: + return this.translocoService.translate('sort-field-pipe.person-series-count'); + case PersonSortField.ChapterCount: + return this.translocoService.translate('sort-field-pipe.person-chapter-count'); + + } + } + + private seriesSortFields(value: SortField) { switch (value) { case SortField.SortName: return this.translocoService.translate('sort-field-pipe.sort-name'); @@ -32,7 +57,6 @@ export class SortFieldPipe implements PipeTransform { case SortField.Random: return this.translocoService.translate('sort-field-pipe.random'); } - } } diff --git a/UI/Web/src/app/_pipes/time-ago.pipe.ts b/UI/Web/src/app/_pipes/time-ago.pipe.ts index 99039126c..9940d4bb7 100644 --- a/UI/Web/src/app/_pipes/time-ago.pipe.ts +++ b/UI/Web/src/app/_pipes/time-ago.pipe.ts @@ -39,9 +39,8 @@ export class TimeAgoPipe implements PipeTransform, OnDestroy { constructor(private readonly changeDetectorRef: ChangeDetectorRef, private ngZone: NgZone, private translocoService: TranslocoService) {} - transform(value: string) { - - if (value === '' || value === null || value === undefined || value.split('T')[0] === '0001-01-01') { + transform(value: string | Date | null) { + if (value === '' || value === null || value === undefined || (typeof value === 'string' && value.split('T')[0] === '0001-01-01')) { return this.translocoService.translate('time-ago-pipe.never'); } diff --git a/UI/Web/src/app/_pipes/utc-to-locale-date.pipe.ts b/UI/Web/src/app/_pipes/utc-to-locale-date.pipe.ts new file mode 100644 index 000000000..0a25eefdc --- /dev/null +++ b/UI/Web/src/app/_pipes/utc-to-locale-date.pipe.ts @@ -0,0 +1,24 @@ +import { Pipe, PipeTransform } from '@angular/core'; +import {DateTime} from "luxon"; + +@Pipe({ + name: 'utcToLocaleDate', + standalone: true +}) +/** + * This is the same as the UtcToLocalTimePipe but returning a timezone aware DateTime object rather than a string. + * Use this when the next operation needs a Date object (like the TimeAgoPipe) + */ +export class UtcToLocaleDatePipe implements PipeTransform { + + transform(utcDate: string | undefined | null): Date | null { + if (utcDate === '' || utcDate === null || utcDate === undefined || utcDate.split('T')[0] === '0001-01-01') { + return null; + } + + const browserLanguage = navigator.language; + const dateTime = DateTime.fromISO(utcDate, { zone: 'utc' }).toLocal().setLocale(browserLanguage); + return dateTime.toJSDate() + } + +} diff --git a/UI/Web/src/app/_resolvers/reading-profile.resolver.ts b/UI/Web/src/app/_resolvers/reading-profile.resolver.ts new file mode 100644 index 000000000..1d28adf95 --- /dev/null +++ b/UI/Web/src/app/_resolvers/reading-profile.resolver.ts @@ -0,0 +1,18 @@ +import {Injectable} from '@angular/core'; +import {ActivatedRouteSnapshot, Resolve, RouterStateSnapshot} from '@angular/router'; +import {Observable} from 'rxjs'; +import {ReadingProfileService} from "../_services/reading-profile.service"; + +@Injectable({ + providedIn: 'root' +}) +export class ReadingProfileResolver implements Resolve { + + constructor(private readingProfileService: ReadingProfileService) {} + + resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { + // Extract seriesId from route params or parent route + const seriesId = route.params['seriesId'] || route.parent?.params['seriesId']; + return this.readingProfileService.getForSeries(seriesId); + } +} diff --git a/UI/Web/src/app/_resolvers/url-filter.resolver.ts b/UI/Web/src/app/_resolvers/url-filter.resolver.ts new file mode 100644 index 000000000..16bc5c752 --- /dev/null +++ b/UI/Web/src/app/_resolvers/url-filter.resolver.ts @@ -0,0 +1,22 @@ +import {Injectable} from "@angular/core"; +import {ActivatedRouteSnapshot, Resolve, RouterStateSnapshot} from "@angular/router"; +import {Observable, of} from "rxjs"; +import {FilterV2} from "../_models/metadata/v2/filter-v2"; +import {FilterUtilitiesService} from "../shared/_services/filter-utilities.service"; + +/** + * Checks the url for a filter and resolves one if applicable, otherwise returns null. + * It is up to the consumer to cast appropriately. + */ +@Injectable({ + providedIn: 'root' +}) +export class UrlFilterResolver implements Resolve { + + constructor(private filterUtilitiesService: FilterUtilitiesService) {} + + resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable { + if (!state.url.includes('?')) return of(null); + return this.filterUtilitiesService.decodeFilter(state.url.split('?')[1]); + } +} diff --git a/UI/Web/src/app/_routes/all-series-routing.module.ts b/UI/Web/src/app/_routes/all-series-routing.module.ts index d9dfaaf96..5c4804251 100644 --- a/UI/Web/src/app/_routes/all-series-routing.module.ts +++ b/UI/Web/src/app/_routes/all-series-routing.module.ts @@ -1,7 +1,13 @@ -import { Routes } from "@angular/router"; -import { AllSeriesComponent } from "../all-series/_components/all-series/all-series.component"; +import {Routes} from "@angular/router"; +import {AllSeriesComponent} from "../all-series/_components/all-series/all-series.component"; +import {UrlFilterResolver} from "../_resolvers/url-filter.resolver"; export const routes: Routes = [ - {path: '', component: AllSeriesComponent, pathMatch: 'full'}, + {path: '', component: AllSeriesComponent, pathMatch: 'full', + runGuardsAndResolvers: 'always', + resolve: { + filter: UrlFilterResolver + } + }, ]; diff --git a/UI/Web/src/app/_routes/book-reader.router.module.ts b/UI/Web/src/app/_routes/book-reader.router.module.ts index 5083c2d4a..c9d6262ad 100644 --- a/UI/Web/src/app/_routes/book-reader.router.module.ts +++ b/UI/Web/src/app/_routes/book-reader.router.module.ts @@ -1,10 +1,14 @@ -import { Routes } from '@angular/router'; -import { BookReaderComponent } from '../book-reader/_components/book-reader/book-reader.component'; +import {Routes} from '@angular/router'; +import {BookReaderComponent} from '../book-reader/_components/book-reader/book-reader.component'; +import {ReadingProfileResolver} from "../_resolvers/reading-profile.resolver"; export const routes: Routes = [ { path: ':chapterId', component: BookReaderComponent, + resolve: { + readingProfile: ReadingProfileResolver + } } ]; diff --git a/UI/Web/src/app/_routes/bookmark-routing.module.ts b/UI/Web/src/app/_routes/bookmark-routing.module.ts index 6da971e08..2c7c52036 100644 --- a/UI/Web/src/app/_routes/bookmark-routing.module.ts +++ b/UI/Web/src/app/_routes/bookmark-routing.module.ts @@ -1,6 +1,12 @@ -import { Routes } from "@angular/router"; -import { BookmarksComponent } from "../bookmark/_components/bookmarks/bookmarks.component"; +import {Routes} from "@angular/router"; +import {BookmarksComponent} from "../bookmark/_components/bookmarks/bookmarks.component"; +import {UrlFilterResolver} from "../_resolvers/url-filter.resolver"; export const routes: Routes = [ - {path: '', component: BookmarksComponent, pathMatch: 'full'}, + {path: '', component: BookmarksComponent, pathMatch: 'full', + resolve: { + filter: UrlFilterResolver + }, + runGuardsAndResolvers: 'always', + }, ]; diff --git a/UI/Web/src/app/_routes/browse-authors-routing.module.ts b/UI/Web/src/app/_routes/browse-authors-routing.module.ts deleted file mode 100644 index e7aab1b57..000000000 --- a/UI/Web/src/app/_routes/browse-authors-routing.module.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { Routes } from "@angular/router"; -import { AllSeriesComponent } from "../all-series/_components/all-series/all-series.component"; -import {BrowseAuthorsComponent} from "../browse-people/browse-authors.component"; - - -export const routes: Routes = [ - {path: '', component: BrowseAuthorsComponent, pathMatch: 'full'}, -]; diff --git a/UI/Web/src/app/_routes/browse-routing.module.ts b/UI/Web/src/app/_routes/browse-routing.module.ts new file mode 100644 index 000000000..be96e8193 --- /dev/null +++ b/UI/Web/src/app/_routes/browse-routing.module.ts @@ -0,0 +1,24 @@ +import {Routes} from "@angular/router"; +import {BrowsePeopleComponent} from "../browse/browse-people/browse-people.component"; +import {BrowseGenresComponent} from "../browse/browse-genres/browse-genres.component"; +import {BrowseTagsComponent} from "../browse/browse-tags/browse-tags.component"; +import {UrlFilterResolver} from "../_resolvers/url-filter.resolver"; + + +export const routes: Routes = [ + // Legacy route + {path: 'authors', component: BrowsePeopleComponent, pathMatch: 'full', + resolve: { + filter: UrlFilterResolver + }, + runGuardsAndResolvers: 'always', + }, + {path: 'people', component: BrowsePeopleComponent, pathMatch: 'full', + resolve: { + filter: UrlFilterResolver + }, + runGuardsAndResolvers: 'always', + }, + {path: 'genres', component: BrowseGenresComponent, pathMatch: 'full'}, + {path: 'tags', component: BrowseTagsComponent, pathMatch: 'full'}, +]; diff --git a/UI/Web/src/app/_routes/collections-routing.module.ts b/UI/Web/src/app/_routes/collections-routing.module.ts index 80510c8f6..2b3b0ffd7 100644 --- a/UI/Web/src/app/_routes/collections-routing.module.ts +++ b/UI/Web/src/app/_routes/collections-routing.module.ts @@ -1,9 +1,15 @@ -import { Routes } from '@angular/router'; -import { AllCollectionsComponent } from '../collections/_components/all-collections/all-collections.component'; -import { CollectionDetailComponent } from '../collections/_components/collection-detail/collection-detail.component'; +import {Routes} from '@angular/router'; +import {AllCollectionsComponent} from '../collections/_components/all-collections/all-collections.component'; +import {CollectionDetailComponent} from '../collections/_components/collection-detail/collection-detail.component'; +import {UrlFilterResolver} from "../_resolvers/url-filter.resolver"; export const routes: Routes = [ {path: '', component: AllCollectionsComponent, pathMatch: 'full'}, - {path: ':id', component: CollectionDetailComponent}, + {path: ':id', component: CollectionDetailComponent, + resolve: { + filter: UrlFilterResolver + }, + runGuardsAndResolvers: 'always', + }, ]; diff --git a/UI/Web/src/app/_routes/library-detail-routing.module.ts b/UI/Web/src/app/_routes/library-detail-routing.module.ts index 04cb3c9dd..3c09a71ee 100644 --- a/UI/Web/src/app/_routes/library-detail-routing.module.ts +++ b/UI/Web/src/app/_routes/library-detail-routing.module.ts @@ -1,7 +1,8 @@ -import { Routes } from '@angular/router'; -import { AuthGuard } from '../_guards/auth.guard'; -import { LibraryAccessGuard } from '../_guards/library-access.guard'; -import { LibraryDetailComponent } from '../library-detail/library-detail.component'; +import {Routes} from '@angular/router'; +import {AuthGuard} from '../_guards/auth.guard'; +import {LibraryAccessGuard} from '../_guards/library-access.guard'; +import {LibraryDetailComponent} from '../library-detail/library-detail.component'; +import {UrlFilterResolver} from "../_resolvers/url-filter.resolver"; export const routes: Routes = [ @@ -9,12 +10,18 @@ export const routes: Routes = [ path: ':libraryId', runGuardsAndResolvers: 'always', canActivate: [AuthGuard, LibraryAccessGuard], - component: LibraryDetailComponent + component: LibraryDetailComponent, + resolve: { + filter: UrlFilterResolver + }, }, { path: '', runGuardsAndResolvers: 'always', canActivate: [AuthGuard, LibraryAccessGuard], - component: LibraryDetailComponent - } + component: LibraryDetailComponent, + resolve: { + filter: UrlFilterResolver + }, + }, ]; diff --git a/UI/Web/src/app/_routes/manga-reader.router.module.ts b/UI/Web/src/app/_routes/manga-reader.router.module.ts index 04ff77b3c..e479e8ae6 100644 --- a/UI/Web/src/app/_routes/manga-reader.router.module.ts +++ b/UI/Web/src/app/_routes/manga-reader.router.module.ts @@ -1,15 +1,22 @@ -import { Routes } from '@angular/router'; -import { MangaReaderComponent } from '../manga-reader/_components/manga-reader/manga-reader.component'; +import {Routes} from '@angular/router'; +import {MangaReaderComponent} from '../manga-reader/_components/manga-reader/manga-reader.component'; +import {ReadingProfileResolver} from "../_resolvers/reading-profile.resolver"; export const routes: Routes = [ { path: ':chapterId', - component: MangaReaderComponent + component: MangaReaderComponent, + resolve: { + readingProfile: ReadingProfileResolver + } }, { // This will allow the MangaReader to have a list to use for next/prev chapters rather than natural sort order path: ':chapterId/list/:listId', - component: MangaReaderComponent + component: MangaReaderComponent, + resolve: { + readingProfile: ReadingProfileResolver + } } ]; diff --git a/UI/Web/src/app/_routes/pdf-reader.router.module.ts b/UI/Web/src/app/_routes/pdf-reader.router.module.ts index a55699280..7cb9f68e2 100644 --- a/UI/Web/src/app/_routes/pdf-reader.router.module.ts +++ b/UI/Web/src/app/_routes/pdf-reader.router.module.ts @@ -1,9 +1,13 @@ -import { Routes } from '@angular/router'; -import { PdfReaderComponent } from '../pdf-reader/_components/pdf-reader/pdf-reader.component'; +import {Routes} from '@angular/router'; +import {PdfReaderComponent} from '../pdf-reader/_components/pdf-reader/pdf-reader.component'; +import {ReadingProfileResolver} from "../_resolvers/reading-profile.resolver"; export const routes: Routes = [ { path: ':chapterId', component: PdfReaderComponent, + resolve: { + readingProfile: ReadingProfileResolver + } } ]; diff --git a/UI/Web/src/app/_routes/want-to-read-routing.module.ts b/UI/Web/src/app/_routes/want-to-read-routing.module.ts index b3301d9f9..b593172c0 100644 --- a/UI/Web/src/app/_routes/want-to-read-routing.module.ts +++ b/UI/Web/src/app/_routes/want-to-read-routing.module.ts @@ -1,6 +1,10 @@ -import { Routes } from '@angular/router'; -import { WantToReadComponent } from '../want-to-read/_components/want-to-read/want-to-read.component'; +import {Routes} from '@angular/router'; +import {WantToReadComponent} from '../want-to-read/_components/want-to-read/want-to-read.component'; +import {UrlFilterResolver} from "../_resolvers/url-filter.resolver"; export const routes: Routes = [ - {path: '', component: WantToReadComponent, pathMatch: 'full'}, + {path: '', component: WantToReadComponent, pathMatch: 'full', runGuardsAndResolvers: 'always', resolve: { + filter: UrlFilterResolver + } + }, ]; diff --git a/UI/Web/src/app/_services/account.service.ts b/UI/Web/src/app/_services/account.service.ts index 54b54931f..f1f91143f 100644 --- a/UI/Web/src/app/_services/account.service.ts +++ b/UI/Web/src/app/_services/account.service.ts @@ -1,20 +1,22 @@ -import { HttpClient } from '@angular/common/http'; -import {DestroyRef, inject, Injectable } from '@angular/core'; -import {catchError, Observable, of, ReplaySubject, shareReplay, throwError} from 'rxjs'; +import {HttpClient} from '@angular/common/http'; +import {DestroyRef, inject, Injectable} from '@angular/core'; +import {Observable, of, ReplaySubject, shareReplay} from 'rxjs'; import {filter, map, switchMap, tap} from 'rxjs/operators'; -import { environment } from 'src/environments/environment'; -import { Preferences } from '../_models/preferences/preferences'; -import { User } from '../_models/user'; -import { Router } from '@angular/router'; -import { EVENTS, MessageHubService } from './message-hub.service'; -import { ThemeService } from './theme.service'; -import { InviteUserResponse } from '../_models/auth/invite-user-response'; -import { UserUpdateEvent } from '../_models/events/user-update-event'; -import { AgeRating } from '../_models/metadata/age-rating'; -import { AgeRestriction } from '../_models/metadata/age-restriction'; -import { TextResonse } from '../_types/text-response'; +import {environment} from 'src/environments/environment'; +import {Preferences} from '../_models/preferences/preferences'; +import {User} from '../_models/user'; +import {Router} from '@angular/router'; +import {EVENTS, MessageHubService} from './message-hub.service'; +import {ThemeService} from './theme.service'; +import {InviteUserResponse} from '../_models/auth/invite-user-response'; +import {UserUpdateEvent} from '../_models/events/user-update-event'; +import {AgeRating} from '../_models/metadata/age-rating'; +import {AgeRestriction} from '../_models/metadata/age-restriction'; +import {TextResonse} from '../_types/text-response'; import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; import {Action} from "./action-factory.service"; +import {LicenseService} from "./license.service"; +import {LocalizationService} from "./localization.service"; export enum Role { Admin = 'Admin', @@ -27,12 +29,25 @@ export enum Role { Promote = 'Promote', } +export const allRoles = [ + Role.Admin, + Role.ChangePassword, + Role.Bookmark, + Role.Download, + Role.ChangeRestriction, + Role.ReadOnly, + Role.Login, + Role.Promote, +] + @Injectable({ providedIn: 'root' }) export class AccountService { private readonly destroyRef = inject(DestroyRef); + private readonly licenseService = inject(LicenseService); + private readonly localizationService = inject(LocalizationService); baseUrl = environment.apiUrl; userKey = 'kavita-user'; @@ -42,17 +57,13 @@ export class AccountService { // Stores values, when someone subscribes gives (1) of last values seen. private currentUserSource = new ReplaySubject(1); - public currentUser$ = this.currentUserSource.asObservable(); + public currentUser$ = this.currentUserSource.asObservable().pipe(takeUntilDestroyed(this.destroyRef), shareReplay({bufferSize: 1, refCount: true})); public isAdmin$: Observable = this.currentUser$.pipe(takeUntilDestroyed(this.destroyRef), map(u => { if (!u) return false; return this.hasAdminRole(u); }), shareReplay({bufferSize: 1, refCount: true})); - private hasValidLicenseSource = new ReplaySubject(1); - /** - * Does the user have an active license - */ - public hasValidLicense$ = this.hasValidLicenseSource.asObservable(); + /** * SetTimeout handler for keeping track of refresh token call @@ -91,17 +102,63 @@ export class AccountService { return true; } - hasAnyRole(user: User, roles: Array) { + /** + * If the user has any role in the restricted roles array or is an Admin + * @param user + * @param roles + * @param restrictedRoles + */ + hasAnyRole(user: User, roles: Array, restrictedRoles: Array = []) { if (!user || !user.roles) { return false; } + + // If the user is an admin, they have the role + if (this.hasAdminRole(user)) { + return true; + } + + // If restricted roles are provided and the user has any of them, deny access + if (restrictedRoles.length > 0 && restrictedRoles.some(role => user.roles.includes(role))) { + return false; + } + + // If roles are empty, allow access (no restrictions by roles) if (roles.length === 0) { return true; } + // Allow access if the user has any of the allowed roles return roles.some(role => user.roles.includes(role)); } + /** + * If User or Admin, will return false + * @param user + * @param restrictedRoles + */ + hasAnyRestrictedRole(user: User, restrictedRoles: Array = []) { + if (!user || !user.roles) { + return true; + } + + if (restrictedRoles.length === 0) { + return false; + } + + // If the user is an admin, they have the role + if (this.hasAdminRole(user)) { + return false; + } + + + if (restrictedRoles.length > 0 && restrictedRoles.some(role => user.roles.includes(role))) { + return true; + } + + return false; + } + hasAdminRole(user: User) { return user && user.roles.includes(Role.Admin); } @@ -111,7 +168,7 @@ export class AccountService { } hasChangeAgeRestrictionRole(user: User) { - return user && user.roles.includes(Role.ChangeRestriction); + return user && !user.roles.includes(Role.Admin) && user.roles.includes(Role.ChangeRestriction); } hasDownloadRole(user: User) { @@ -134,40 +191,7 @@ export class AccountService { return this.httpClient.get(this.baseUrl + 'account/roles'); } - deleteLicense() { - return this.httpClient.delete(this.baseUrl + 'license', TextResonse); - } - resetLicense(license: string, email: string) { - return this.httpClient.post(this.baseUrl + 'license/reset', {license, email}, TextResonse); - } - - hasValidLicense(forceCheck: boolean = false) { - console.log('hasValidLicense being called: ', forceCheck); - return this.httpClient.get(this.baseUrl + 'license/valid-license?forceCheck=' + forceCheck, TextResonse) - .pipe( - map(res => res === "true"), - tap(res => { - this.hasValidLicenseSource.next(res) - }), - catchError(error => { - this.hasValidLicenseSource.next(false); - return throwError(error); // Rethrow the error to propagate it further - }) - ); - } - - hasAnyLicense() { - return this.httpClient.get(this.baseUrl + 'license/has-license', TextResonse) - .pipe( - map(res => res === "true"), - ); - } - - updateUserLicense(license: string, email: string, discordId?: string) { - return this.httpClient.post(this.baseUrl + 'license', {license, email, discordId}, TextResonse) - .pipe(map(res => res === "true")); - } login(model: {username: string, password: string, apiKey?: string}) { return this.httpClient.post(this.baseUrl + 'account/login', model).pipe( @@ -182,6 +206,8 @@ export class AccountService { } setCurrentUser(user?: User, refreshConnections = true) { + + const isSameUser = this.currentUser === user; if (user) { user.roles = []; const roles = this.getDecodedToken(user.token).role; @@ -209,9 +235,11 @@ export class AccountService { if (this.currentUser) { // BUG: StopHubConnection has a promise in it, this needs to be async // But that really messes everything up - this.messageHub.stopHubConnection(); - this.messageHub.createHubConnection(this.currentUser); - this.hasValidLicense().subscribe(); + if (!isSameUser) { + this.messageHub.stopHubConnection(); + this.messageHub.createHubConnection(this.currentUser); + this.licenseService.hasValidLicense().subscribe(); + } this.startRefreshTokenTimer(); } } @@ -330,6 +358,8 @@ export class AccountService { // Update the locale on disk (for logout and compact-number pipe) localStorage.setItem(AccountService.localeKey, this.currentUser.preferences.locale); + this.localizationService.refreshTranslations(this.currentUser.preferences.locale); + } return settings; }), takeUntilDestroyed(this.destroyRef)); diff --git a/UI/Web/src/app/_services/action-factory.service.ts b/UI/Web/src/app/_services/action-factory.service.ts index 24ca2a76a..e5967bf24 100644 --- a/UI/Web/src/app/_services/action-factory.service.ts +++ b/UI/Web/src/app/_services/action-factory.service.ts @@ -1,18 +1,19 @@ -import { Injectable } from '@angular/core'; -import { map, Observable, shareReplay } from 'rxjs'; -import { Chapter } from '../_models/chapter'; +import {Injectable} from '@angular/core'; +import {map, Observable, shareReplay} from 'rxjs'; +import {Chapter} from '../_models/chapter'; import {UserCollection} from '../_models/collection-tag'; -import { Device } from '../_models/device/device'; -import { Library } from '../_models/library/library'; -import { ReadingList } from '../_models/reading-list'; -import { Series } from '../_models/series'; -import { Volume } from '../_models/volume'; -import { AccountService } from './account.service'; -import { DeviceService } from './device.service'; +import {Device} from '../_models/device/device'; +import {Library} from '../_models/library/library'; +import {ReadingList} from '../_models/reading-list'; +import {Series} from '../_models/series'; +import {Volume} from '../_models/volume'; +import {AccountService, Role} from './account.service'; +import {DeviceService} from './device.service'; import {SideNavStream} from "../_models/sidenav/sidenav-stream"; import {SmartFilter} from "../_models/metadata/v2/smart-filter"; import {translate} from "@jsverse/transloco"; import {Person} from "../_models/metadata/person"; +import {User} from '../_models/user'; export enum Action { Submenu = -1, @@ -106,26 +107,49 @@ export enum Action { Promote = 24, UnPromote = 25, /** - * Invoke a refresh covers as false to generate colorscapes + * Invoke refresh covers as false to generate colorscapes */ GenerateColorScape = 26, /** * Copy settings from one entity to another */ - CopySettings = 27 + CopySettings = 27, + /** + * Match an entity with an upstream system + */ + Match = 28, + /** + * Merge two (or more?) entities + */ + Merge = 29, + /** + * Add to a reading profile + */ + SetReadingProfile = 30, + /** + * Remove the reading profile from the entity + */ + ClearReadingProfile = 31, } /** * Callback for an action */ -export type ActionCallback = (action: ActionItem, data: T) => void; -export type ActionAllowedCallback = (action: ActionItem) => boolean; +export type ActionCallback = (action: ActionItem, entity: T) => void; +export type ActionShouldRenderFunc = (action: ActionItem, entity: T, user: User) => boolean; export interface ActionItem { title: string; description: string; action: Action; callback: ActionCallback; + /** + * Roles required to be present for ActionItem to show. If empty, assumes anyone can see. At least one needs to apply. + */ + requiredRoles: Role[]; + /** + * @deprecated Use required Roles instead + */ requiresAdmin: boolean; children: Array>; /** @@ -141,88 +165,98 @@ export interface ActionItem { * Extra data that needs to be sent back from the card item. Used mainly for dynamicList. This will be the item from dyanamicList return */ _extra?: {title: string, data: any}; + /** + * Will call on each action to determine if it should show for the appropriate entity based on state and user + */ + shouldRender: ActionShouldRenderFunc; } +/** + * Entities that can be actioned upon + */ +export type ActionableEntity = Volume | Series | Chapter | ReadingList | UserCollection | Person | Library | SideNavStream | SmartFilter | null; + @Injectable({ providedIn: 'root', }) export class ActionFactoryService { - libraryActions: Array> = []; - - seriesActions: Array> = []; - - volumeActions: Array> = []; - - chapterActions: Array> = []; - - collectionTagActions: Array> = []; - - readingListActions: Array> = []; - - bookmarkActions: Array> = []; - + private libraryActions: Array> = []; + private seriesActions: Array> = []; + private volumeActions: Array> = []; + private chapterActions: Array> = []; + private collectionTagActions: Array> = []; + private readingListActions: Array> = []; + private bookmarkActions: Array> = []; private personActions: Array> = []; - - sideNavStreamActions: Array> = []; - smartFilterActions: Array> = []; - - isAdmin = false; - + private sideNavStreamActions: Array> = []; + private smartFilterActions: Array> = []; + private sideNavHomeActions: Array> = []; constructor(private accountService: AccountService, private deviceService: DeviceService) { - this.accountService.currentUser$.subscribe((user) => { - if (user) { - this.isAdmin = this.accountService.hasAdminRole(user); - } else { - this._resetActions(); - return; // If user is logged out, we don't need to do anything - } - + this.accountService.currentUser$.subscribe((_) => { this._resetActions(); }); } - getLibraryActions(callback: ActionCallback) { - return this.applyCallbackToList(this.libraryActions, callback); + getLibraryActions(callback: ActionCallback, shouldRenderFunc: ActionShouldRenderFunc = this.dummyShouldRender) { + return this.applyCallbackToList(this.libraryActions, callback, shouldRenderFunc) as ActionItem[]; } - getSeriesActions(callback: ActionCallback) { - return this.applyCallbackToList(this.seriesActions, callback); + getSeriesActions(callback: ActionCallback, shouldRenderFunc: ActionShouldRenderFunc = this.basicReadRender) { + return this.applyCallbackToList(this.seriesActions, callback, shouldRenderFunc); } - getSideNavStreamActions(callback: ActionCallback) { - return this.applyCallbackToList(this.sideNavStreamActions, callback); + getSideNavStreamActions(callback: ActionCallback, shouldRenderFunc: ActionShouldRenderFunc = this.dummyShouldRender) { + return this.applyCallbackToList(this.sideNavStreamActions, callback, shouldRenderFunc); } - getSmartFilterActions(callback: ActionCallback) { - return this.applyCallbackToList(this.smartFilterActions, callback); + getSmartFilterActions(callback: ActionCallback, shouldRenderFunc: ActionShouldRenderFunc = this.dummyShouldRender) { + return this.applyCallbackToList(this.smartFilterActions, callback, shouldRenderFunc); } - getVolumeActions(callback: ActionCallback) { - return this.applyCallbackToList(this.volumeActions, callback); + getVolumeActions(callback: ActionCallback, shouldRenderFunc: ActionShouldRenderFunc = this.basicReadRender) { + return this.applyCallbackToList(this.volumeActions, callback, shouldRenderFunc); } - getChapterActions(callback: ActionCallback) { - return this.applyCallbackToList(this.chapterActions, callback); + getChapterActions(callback: ActionCallback, shouldRenderFunc: ActionShouldRenderFunc = this.basicReadRender) { + return this.applyCallbackToList(this.chapterActions, callback, shouldRenderFunc); } - getCollectionTagActions(callback: ActionCallback) { - return this.applyCallbackToList(this.collectionTagActions, callback); + getCollectionTagActions(callback: ActionCallback, shouldRenderFunc: ActionShouldRenderFunc = this.dummyShouldRender) { + return this.applyCallbackToList(this.collectionTagActions, callback, shouldRenderFunc); } - getReadingListActions(callback: ActionCallback) { - return this.applyCallbackToList(this.readingListActions, callback); + getReadingListActions(callback: ActionCallback, shouldRenderFunc: ActionShouldRenderFunc = this.dummyShouldRender) { + return this.applyCallbackToList(this.readingListActions, callback, shouldRenderFunc); } - getBookmarkActions(callback: ActionCallback) { - return this.applyCallbackToList(this.bookmarkActions, callback); + getBookmarkActions(callback: ActionCallback, shouldRenderFunc: ActionShouldRenderFunc = this.dummyShouldRender) { + return this.applyCallbackToList(this.bookmarkActions, callback, shouldRenderFunc); } - getPersonActions(callback: ActionCallback) { - return this.applyCallbackToList(this.personActions, callback); + getPersonActions(callback: ActionCallback, shouldRenderFunc: ActionShouldRenderFunc = this.dummyShouldRender) { + return this.applyCallbackToList(this.personActions, callback, shouldRenderFunc); } - dummyCallback(action: ActionItem, data: any) {} + getSideNavHomeActions(callback: ActionCallback, shouldRenderFunc: ActionShouldRenderFunc = this.dummyShouldRender) { + return this.applyCallbackToList(this.sideNavHomeActions, callback, shouldRenderFunc); + } + + dummyCallback(action: ActionItem, entity: any) {} + dummyShouldRender(action: ActionItem, entity: any, user: User) {return true;} + basicReadRender(action: ActionItem, entity: any, user: User) { + if (entity === null || entity === undefined) return true; + if (!entity.hasOwnProperty('pagesRead') && !entity.hasOwnProperty('pages')) return true; + + switch (action.action) { + case(Action.MarkAsRead): + return entity.pagesRead < entity.pages; + case(Action.MarkAsUnread): + return entity.pagesRead !== 0; + default: + return true; + } + } filterSendToAction(actions: Array>, chapter: Chapter) { // if (chapter.files.filter(f => f.format === MangaFormat.EPUB || f.format === MangaFormat.PDF).length !== chapter.files.length) { @@ -265,7 +299,7 @@ export class ActionFactoryService { return tasks.filter(t => !blacklist.includes(t.action)); } - getBulkLibraryActions(callback: ActionCallback) { + getBulkLibraryActions(callback: ActionCallback, shouldRenderFunc: ActionShouldRenderFunc = this.dummyShouldRender) { // Scan is currently not supported due to the backend not being able to handle it yet const actions = this.flattenActions(this.libraryActions).filter(a => { @@ -279,11 +313,13 @@ export class ActionFactoryService { dynamicList: undefined, action: Action.CopySettings, callback: this.dummyCallback, + shouldRender: shouldRenderFunc, children: [], + requiredRoles: [Role.Admin], requiresAdmin: true, title: 'copy-settings' }) - return this.applyCallbackToList(actions, callback); + return this.applyCallbackToList(actions, callback, shouldRenderFunc) as ActionItem[]; } flattenActions(actions: Array>): Array> { @@ -309,22 +345,59 @@ export class ActionFactoryService { title: 'scan-library', description: 'scan-library-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: true, + requiredRoles: [Role.Admin], children: [], }, + { + action: Action.Submenu, + title: 'reading-profiles', + description: '', + callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, + requiresAdmin: false, + requiredRoles: [], + children: [ + { + action: Action.SetReadingProfile, + title: 'set-reading-profile', + description: 'set-reading-profile-tooltip', + callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, + requiresAdmin: false, + requiredRoles: [], + children: [], + }, + { + action: Action.ClearReadingProfile, + title: 'clear-reading-profile', + description: 'clear-reading-profile-tooltip', + callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, + requiresAdmin: false, + requiredRoles: [], + children: [], + }, + ], + }, { action: Action.Submenu, title: 'others', description: '', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: true, + requiredRoles: [Role.Admin], children: [ { action: Action.RefreshMetadata, title: 'refresh-covers', description: 'refresh-covers-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: true, + requiredRoles: [Role.Admin], children: [], }, { @@ -332,7 +405,9 @@ export class ActionFactoryService { title: 'generate-colorscape', description: 'generate-colorscape-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: true, + requiredRoles: [Role.Admin], children: [], }, { @@ -340,7 +415,9 @@ export class ActionFactoryService { title: 'analyze-files', description: 'analyze-files-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: true, + requiredRoles: [Role.Admin], children: [], }, { @@ -348,7 +425,9 @@ export class ActionFactoryService { title: 'delete', description: 'delete-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: true, + requiredRoles: [Role.Admin], children: [], }, ], @@ -358,7 +437,9 @@ export class ActionFactoryService { title: 'settings', description: 'settings-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: true, + requiredRoles: [Role.Admin], children: [], }, ]; @@ -369,7 +450,9 @@ export class ActionFactoryService { title: 'edit', description: 'edit-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, { @@ -377,7 +460,9 @@ export class ActionFactoryService { title: 'delete', description: 'delete-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], class: 'danger', children: [], }, @@ -386,7 +471,9 @@ export class ActionFactoryService { title: 'promote', description: 'promote-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, { @@ -394,7 +481,9 @@ export class ActionFactoryService { title: 'unpromote', description: 'unpromote-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, ]; @@ -405,7 +494,9 @@ export class ActionFactoryService { title: 'mark-as-read', description: 'mark-as-read-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, { @@ -413,7 +504,9 @@ export class ActionFactoryService { title: 'mark-as-unread', description: 'mark-as-unread-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, { @@ -421,7 +514,9 @@ export class ActionFactoryService { title: 'scan-series', description: 'scan-series-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: true, + requiredRoles: [Role.Admin], children: [], }, { @@ -429,14 +524,18 @@ export class ActionFactoryService { title: 'add-to', description: '', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [ { action: Action.AddToWantToReadList, title: 'add-to-want-to-read', description: 'add-to-want-to-read-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, { @@ -444,7 +543,9 @@ export class ActionFactoryService { title: 'remove-from-want-to-read', description: 'remove-to-want-to-read-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, { @@ -452,7 +553,9 @@ export class ActionFactoryService { title: 'add-to-reading-list', description: 'add-to-reading-list-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, { @@ -460,25 +563,11 @@ export class ActionFactoryService { title: 'add-to-collection', description: 'add-to-collection-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], - }, - // { - // action: Action.AddToScrobbleHold, - // title: 'add-to-scrobble-hold', - // description: 'add-to-scrobble-hold-tooltip', - // callback: this.dummyCallback, - // requiresAdmin: true, - // children: [], - // }, - // { - // action: Action.RemoveFromScrobbleHold, - // title: 'remove-from-scrobble-hold', - // description: 'remove-from-scrobble-hold-tooltip', - // callback: this.dummyCallback, - // requiresAdmin: true, - // children: [], - // }, + } ], }, { @@ -486,14 +575,18 @@ export class ActionFactoryService { title: 'send-to', description: 'send-to-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [ { action: Action.SendTo, title: '', description: '', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], dynamicList: this.deviceService.devices$.pipe(map((devices: Array) => devices.map(d => { return {'title': d.name, 'data': d}; }), shareReplay())), @@ -501,19 +594,54 @@ export class ActionFactoryService { } ], }, + { + action: Action.Submenu, + title: 'reading-profiles', + description: '', + callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, + requiresAdmin: false, + requiredRoles: [], + children: [ + { + action: Action.SetReadingProfile, + title: 'set-reading-profile', + description: 'set-reading-profile-tooltip', + callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, + requiresAdmin: false, + requiredRoles: [], + children: [], + }, + { + action: Action.ClearReadingProfile, + title: 'clear-reading-profile', + description: 'clear-reading-profile-tooltip', + callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, + requiresAdmin: false, + requiredRoles: [], + children: [], + }, + ], + }, { action: Action.Submenu, title: 'others', description: '', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: true, + requiredRoles: [], children: [ { action: Action.RefreshMetadata, title: 'refresh-covers', description: 'refresh-covers-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: true, + requiredRoles: [Role.Admin], children: [], }, { @@ -521,7 +649,9 @@ export class ActionFactoryService { title: 'generate-colorscape', description: 'generate-colorscape-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: true, + requiredRoles: [Role.Admin], children: [], }, { @@ -529,7 +659,9 @@ export class ActionFactoryService { title: 'analyze-files', description: 'analyze-files-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: true, + requiredRoles: [Role.Admin], children: [], }, { @@ -537,18 +669,32 @@ export class ActionFactoryService { title: 'delete', description: 'delete-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: true, + requiredRoles: [Role.Admin], class: 'danger', children: [], }, ], }, + { + action: Action.Match, + title: 'match', + description: 'match-tooltip', + callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, + requiresAdmin: true, + requiredRoles: [Role.Admin], + children: [], + }, { action: Action.Download, title: 'download', description: 'download-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [Role.Download], children: [], }, { @@ -556,7 +702,9 @@ export class ActionFactoryService { title: 'edit', description: 'edit-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: true, + requiredRoles: [Role.Admin], children: [], }, ]; @@ -567,7 +715,9 @@ export class ActionFactoryService { title: 'read-incognito', description: 'read-incognito-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, { @@ -575,7 +725,9 @@ export class ActionFactoryService { title: 'mark-as-read', description: 'mark-as-read-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, { @@ -583,7 +735,9 @@ export class ActionFactoryService { title: 'mark-as-unread', description: 'mark-as-unread-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, { @@ -591,14 +745,18 @@ export class ActionFactoryService { title: 'add-to', description: '=', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [ { action: Action.AddToReadingList, title: 'add-to-reading-list', description: 'add-to-reading-list-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], } ] @@ -608,14 +766,18 @@ export class ActionFactoryService { title: 'send-to', description: 'send-to-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [ { action: Action.SendTo, title: '', description: '', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], dynamicList: this.deviceService.devices$.pipe(map((devices: Array) => devices.map(d => { return {'title': d.name, 'data': d}; }), shareReplay())), @@ -628,14 +790,18 @@ export class ActionFactoryService { title: 'others', description: '', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [ { action: Action.Delete, title: 'delete', description: 'delete-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: true, + requiredRoles: [Role.Admin], children: [], }, { @@ -643,7 +809,9 @@ export class ActionFactoryService { title: 'download', description: 'download-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, ] @@ -653,7 +821,9 @@ export class ActionFactoryService { title: 'details', description: 'edit-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, ]; @@ -664,7 +834,9 @@ export class ActionFactoryService { title: 'read-incognito', description: 'read-incognito-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, { @@ -672,7 +844,9 @@ export class ActionFactoryService { title: 'mark-as-read', description: 'mark-as-read-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, { @@ -680,7 +854,9 @@ export class ActionFactoryService { title: 'mark-as-unread', description: 'mark-as-unread-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, { @@ -688,14 +864,18 @@ export class ActionFactoryService { title: 'add-to', description: '', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [ { action: Action.AddToReadingList, title: 'add-to-reading-list', description: 'add-to-reading-list-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], } ] @@ -705,14 +885,18 @@ export class ActionFactoryService { title: 'send-to', description: 'send-to-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [ { action: Action.SendTo, title: '', description: '', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], dynamicList: this.deviceService.devices$.pipe(map((devices: Array) => devices.map(d => { return {'title': d.name, 'data': d}; }), shareReplay())), @@ -726,14 +910,18 @@ export class ActionFactoryService { title: 'others', description: '', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [ { action: Action.Delete, title: 'delete', description: 'delete-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: true, + requiredRoles: [Role.Admin], children: [], }, { @@ -741,7 +929,9 @@ export class ActionFactoryService { title: 'download', description: 'download-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [Role.Download], children: [], }, ] @@ -751,7 +941,9 @@ export class ActionFactoryService { title: 'edit', description: 'edit-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, ]; @@ -762,7 +954,9 @@ export class ActionFactoryService { title: 'edit', description: 'edit-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, { @@ -770,7 +964,9 @@ export class ActionFactoryService { title: 'delete', description: 'delete-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], class: 'danger', children: [], }, @@ -779,7 +975,9 @@ export class ActionFactoryService { title: 'promote', description: 'promote-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, { @@ -787,7 +985,9 @@ export class ActionFactoryService { title: 'unpromote', description: 'unpromote-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, ]; @@ -798,7 +998,19 @@ export class ActionFactoryService { title: 'edit', description: 'edit-person-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: true, + requiredRoles: [Role.Admin], + children: [], + }, + { + action: Action.Merge, + title: 'merge', + description: 'merge-person-tooltip', + callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, + requiresAdmin: true, + requiredRoles: [Role.Admin], children: [], } ]; @@ -809,7 +1021,9 @@ export class ActionFactoryService { title: 'view-series', description: 'view-series-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, { @@ -817,7 +1031,9 @@ export class ActionFactoryService { title: 'download', description: 'download-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, { @@ -825,8 +1041,10 @@ export class ActionFactoryService { title: 'clear', description: 'delete-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, class: 'danger', requiresAdmin: false, + requiredRoles: [], children: [], }, ]; @@ -837,7 +1055,9 @@ export class ActionFactoryService { title: 'mark-visible', description: 'mark-visible-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, { @@ -845,38 +1065,76 @@ export class ActionFactoryService { title: 'mark-invisible', description: 'mark-invisible-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, ]; this.smartFilterActions = [ + { + action: Action.Edit, + title: 'rename', + description: 'rename-tooltip', + callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, + requiresAdmin: false, + requiredRoles: [], + children: [], + }, { action: Action.Delete, title: 'delete', description: 'delete-tooltip', callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, requiresAdmin: false, + requiredRoles: [], children: [], }, ]; + + this.sideNavHomeActions = [ + { + action: Action.Edit, + title: 'reorder', + description: '', + callback: this.dummyCallback, + shouldRender: this.dummyShouldRender, + requiresAdmin: false, + requiredRoles: [], + children: [], + } + ] + + } - private applyCallback(action: ActionItem, callback: (action: ActionItem, data: any) => void) { + private applyCallback(action: ActionItem, callback: ActionCallback, shouldRenderFunc: ActionShouldRenderFunc) { action.callback = callback; + action.shouldRender = shouldRenderFunc; if (action.children === null || action.children?.length === 0) return; - action.children?.forEach((childAction) => { - this.applyCallback(childAction, callback); + // Ensure action children are a copy of the parent (since parent does a shallow mapping) + action.children = action.children.map(d => { return {...d}; }); + + action.children.forEach((childAction) => { + this.applyCallback(childAction, callback, shouldRenderFunc); }); } - public applyCallbackToList(list: Array>, callback: (action: ActionItem, data: any) => void): Array> { + public applyCallbackToList(list: Array>, + callback: ActionCallback, + shouldRenderFunc: ActionShouldRenderFunc = this.dummyShouldRender): Array> { + // Create a clone of the list to ensure we aren't affecting the default state const actions = list.map((a) => { return { ...a }; }); - actions.forEach((action) => this.applyCallback(action, callback)); + + actions.forEach((action) => this.applyCallback(action, callback, shouldRenderFunc)); + return actions; } diff --git a/UI/Web/src/app/_services/action.service.ts b/UI/Web/src/app/_services/action.service.ts index 27e38f82f..2328bf72e 100644 --- a/UI/Web/src/app/_services/action.service.ts +++ b/UI/Web/src/app/_services/action.service.ts @@ -1,23 +1,27 @@ import {inject, Injectable} from '@angular/core'; -import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { ToastrService } from 'ngx-toastr'; -import { take } from 'rxjs/operators'; -import { BulkAddToCollectionComponent } from '../cards/_modals/bulk-add-to-collection/bulk-add-to-collection.component'; -import { AddToListModalComponent, ADD_FLOW } from '../reading-list/_modals/add-to-list-modal/add-to-list-modal.component'; -import { EditReadingListModalComponent } from '../reading-list/_modals/edit-reading-list-modal/edit-reading-list-modal.component'; -import { ConfirmService } from '../shared/confirm.service'; -import { LibrarySettingsModalComponent } from '../sidenav/_modals/library-settings-modal/library-settings-modal.component'; -import { Chapter } from '../_models/chapter'; -import { Device } from '../_models/device/device'; -import { Library } from '../_models/library/library'; -import { ReadingList } from '../_models/reading-list'; -import { Series } from '../_models/series'; -import { Volume } from '../_models/volume'; -import { DeviceService } from './device.service'; -import { LibraryService } from './library.service'; -import { MemberService } from './member.service'; -import { ReaderService } from './reader.service'; -import { SeriesService } from './series.service'; +import {NgbModal, NgbModalRef} from '@ng-bootstrap/ng-bootstrap'; +import {ToastrService} from 'ngx-toastr'; +import {take} from 'rxjs/operators'; +import {BulkAddToCollectionComponent} from '../cards/_modals/bulk-add-to-collection/bulk-add-to-collection.component'; +import {ADD_FLOW, AddToListModalComponent} from '../reading-list/_modals/add-to-list-modal/add-to-list-modal.component'; +import { + EditReadingListModalComponent +} from '../reading-list/_modals/edit-reading-list-modal/edit-reading-list-modal.component'; +import {ConfirmService} from '../shared/confirm.service'; +import { + LibrarySettingsModalComponent +} from '../sidenav/_modals/library-settings-modal/library-settings-modal.component'; +import {Chapter} from '../_models/chapter'; +import {Device} from '../_models/device/device'; +import {Library} from '../_models/library/library'; +import {ReadingList} from '../_models/reading-list'; +import {Series} from '../_models/series'; +import {Volume} from '../_models/volume'; +import {DeviceService} from './device.service'; +import {LibraryService} from './library.service'; +import {MemberService} from './member.service'; +import {ReaderService} from './reader.service'; +import {SeriesService} from './series.service'; import {translate} from "@jsverse/transloco"; import {UserCollection} from "../_models/collection-tag"; import {CollectionTagService} from "./collection-tag.service"; @@ -26,6 +30,11 @@ import {ReadingListService} from "./reading-list.service"; import {ChapterService} from "./chapter.service"; import {VolumeService} from "./volume.service"; import {DefaultModalOptions} from "../_models/default-modal-options"; +import {MatchSeriesModalComponent} from "../_single-module/match-series-modal/match-series-modal.component"; +import { + BulkSetReadingProfileModalComponent +} from "../cards/_modals/bulk-set-reading-profile-modal/bulk-set-reading-profile-modal.component"; + export type LibraryActionCallback = (library: Partial) => void; export type SeriesActionCallback = (series: Series) => void; @@ -466,8 +475,18 @@ export class ActionService { }); } + async deleteMultipleVolumes(volumes: Array, callback?: BooleanActionCallback) { + if (!await this.confirmService.confirm(translate('toasts.confirm-delete-multiple-volumes', {count: volumes.length}))) return; + + this.volumeService.deleteMultipleVolumes(volumes.map(v => v.id)).subscribe((success) => { + if (callback) { + callback(success); + } + }) + } + async deleteMultipleChapters(seriesId: number, chapterIds: Array, callback?: BooleanActionCallback) { - if (!await this.confirmService.confirm(translate('toasts.confirm-delete-multiple-chapters'))) return; + if (!await this.confirmService.confirm(translate('toasts.confirm-delete-multiple-chapters', {count: chapterIds.length}))) return; this.chapterService.deleteMultipleChapters(seriesId, chapterIds.map(c => c.id)).subscribe(() => { if (callback) { @@ -519,7 +538,7 @@ export class ActionService { addMultipleSeriesToWantToReadList(seriesIds: Array, callback?: VoidActionCallback) { this.memberService.addSeriesToWantToRead(seriesIds).subscribe(() => { - this.toastr.success('Series added to Want to Read list'); + this.toastr.success(translate('toasts.series-added-want-to-read')); if (callback) { callback(); } @@ -650,7 +669,7 @@ export class ActionService { } editReadingList(readingList: ReadingList, callback?: ReadingListActionCallback) { - const readingListModalRef = this.modalService.open(EditReadingListModalComponent, { scrollable: true, size: 'lg', fullscreen: 'md' }); + const readingListModalRef = this.modalService.open(EditReadingListModalComponent, DefaultModalOptions); readingListModalRef.componentInstance.readingList = readingList; readingListModalRef.closed.pipe(take(1)).subscribe((list) => { if (callback && list !== undefined) { @@ -770,6 +789,16 @@ export class ActionService { }); } + matchSeries(series: Series, callback?: BooleanActionCallback) { + const ref = this.modalService.open(MatchSeriesModalComponent, DefaultModalOptions); + ref.componentInstance.series = series; + ref.closed.subscribe(saved => { + if (callback) { + callback(saved); + } + }); + } + async deleteFilter(filterId: number, callback?: BooleanActionCallback) { if (!await this.confirmService.confirm(translate('toasts.confirm-delete-smart-filter'))) { if (callback) { @@ -787,4 +816,56 @@ export class ActionService { }); } + /** + * Sets the reading profile for multiple series + * @param series + * @param callback + */ + setReadingProfileForMultiple(series: Array, callback?: BooleanActionCallback) { + if (this.readingListModalRef != null) { return; } + + this.readingListModalRef = this.modalService.open(BulkSetReadingProfileModalComponent, { scrollable: true, size: 'md', fullscreen: 'md' }); + this.readingListModalRef.componentInstance.seriesIds = series.map(s => s.id) + this.readingListModalRef.componentInstance.title = "" + + this.readingListModalRef.closed.pipe(take(1)).subscribe(() => { + this.readingListModalRef = null; + if (callback) { + callback(true); + } + }); + this.readingListModalRef.dismissed.pipe(take(1)).subscribe(() => { + this.readingListModalRef = null; + if (callback) { + callback(false); + } + }); + } + + /** + * Sets the reading profile for multiple series + * @param library + * @param callback + */ + setReadingProfileForLibrary(library: Library, callback?: BooleanActionCallback) { + if (this.readingListModalRef != null) { return; } + + this.readingListModalRef = this.modalService.open(BulkSetReadingProfileModalComponent, { scrollable: true, size: 'md', fullscreen: 'md' }); + this.readingListModalRef.componentInstance.libraryId = library.id; + this.readingListModalRef.componentInstance.title = "" + + this.readingListModalRef.closed.pipe(take(1)).subscribe(() => { + this.readingListModalRef = null; + if (callback) { + callback(true); + } + }); + this.readingListModalRef.dismissed.pipe(take(1)).subscribe(() => { + this.readingListModalRef = null; + if (callback) { + callback(false); + } + }); + } + } diff --git a/UI/Web/src/app/_services/chapter.service.ts b/UI/Web/src/app/_services/chapter.service.ts index c722031bd..6a6f7a600 100644 --- a/UI/Web/src/app/_services/chapter.service.ts +++ b/UI/Web/src/app/_services/chapter.service.ts @@ -1,8 +1,9 @@ -import { Injectable } from '@angular/core'; +import {Injectable} from '@angular/core'; import {environment} from "../../environments/environment"; -import { HttpClient } from "@angular/common/http"; +import {HttpClient} from "@angular/common/http"; import {Chapter} from "../_models/chapter"; import {TextResonse} from "../_types/text-response"; +import {ChapterDetailPlus} from "../_models/chapter-detail-plus"; @Injectable({ providedIn: 'root' @@ -29,4 +30,8 @@ export class ChapterService { return this.httpClient.post(this.baseUrl + 'chapter/update', chapter, TextResonse); } + chapterDetailPlus(seriesId: number, chapterId: number) { + return this.httpClient.get(this.baseUrl + `chapter/chapter-detail-plus?chapterId=${chapterId}&seriesId=${seriesId}`); + } + } diff --git a/UI/Web/src/app/_services/dashboard.service.ts b/UI/Web/src/app/_services/dashboard.service.ts index 7ece274bb..493fae370 100644 --- a/UI/Web/src/app/_services/dashboard.service.ts +++ b/UI/Web/src/app/_services/dashboard.service.ts @@ -1,6 +1,6 @@ -import { Injectable } from '@angular/core'; +import {Injectable} from '@angular/core'; import {TextResonse} from "../_types/text-response"; -import { HttpClient } from "@angular/common/http"; +import {HttpClient} from "@angular/common/http"; import {environment} from "../../environments/environment"; import {DashboardStream} from "../_models/dashboard/dashboard-stream"; @@ -26,4 +26,8 @@ export class DashboardService { createDashboardStream(smartFilterId: number) { return this.httpClient.post(this.baseUrl + 'stream/add-dashboard-stream?smartFilterId=' + smartFilterId, {}); } + + deleteSmartFilterStream(streamId: number) { + return this.httpClient.delete(this.baseUrl + 'stream/smart-filter-dashboard-stream?dashboardStreamId=' + streamId, {}); + } } diff --git a/UI/Web/src/app/_services/email.service.ts b/UI/Web/src/app/_services/email.service.ts new file mode 100644 index 000000000..5afb62ca7 --- /dev/null +++ b/UI/Web/src/app/_services/email.service.ts @@ -0,0 +1,16 @@ +import { Injectable } from '@angular/core'; +import {environment} from "../../environments/environment"; +import {HttpClient} from "@angular/common/http"; +import {EmailHistory} from "../_models/email-history"; + +@Injectable({ + providedIn: 'root' +}) +export class EmailService { + baseUrl = environment.apiUrl; + constructor(private httpClient: HttpClient) { } + + getEmailHistory() { + return this.httpClient.get(`${this.baseUrl}email/all`); + } +} diff --git a/UI/Web/src/app/_services/filter.service.ts b/UI/Web/src/app/_services/filter.service.ts index 2c47ff95d..2b9681e90 100644 --- a/UI/Web/src/app/_services/filter.service.ts +++ b/UI/Web/src/app/_services/filter.service.ts @@ -1,8 +1,7 @@ -import { Injectable } from '@angular/core'; -import {SeriesFilterV2} from "../_models/metadata/v2/series-filter-v2"; +import {Injectable} from '@angular/core'; +import {FilterV2} from "../_models/metadata/v2/filter-v2"; import {environment} from "../../environments/environment"; -import { HttpClient } from "@angular/common/http"; -import {JumpKey} from "../_models/jumpbar/jump-key"; +import {HttpClient} from "@angular/common/http"; import {SmartFilter} from "../_models/metadata/v2/smart-filter"; @Injectable({ @@ -13,7 +12,7 @@ export class FilterService { baseUrl = environment.apiUrl; constructor(private httpClient: HttpClient) { } - saveFilter(filter: SeriesFilterV2) { + saveFilter(filter: FilterV2) { return this.httpClient.post(this.baseUrl + 'filter/update', filter); } getAllFilters() { @@ -23,4 +22,7 @@ export class FilterService { return this.httpClient.delete(this.baseUrl + 'filter?filterId=' + filterId); } + renameSmartFilter(filter: SmartFilter) { + return this.httpClient.post(this.baseUrl + `filter/rename?filterId=${filter.id}&name=${filter.name.trim()}`, {}); + } } diff --git a/UI/Web/src/app/_services/jumpbar.service.ts b/UI/Web/src/app/_services/jumpbar.service.ts index d9919ff57..48ca08705 100644 --- a/UI/Web/src/app/_services/jumpbar.service.ts +++ b/UI/Web/src/app/_services/jumpbar.service.ts @@ -1,5 +1,5 @@ -import { Injectable } from '@angular/core'; -import { JumpKey } from '../_models/jumpbar/jump-key'; +import {Injectable} from '@angular/core'; +import {JumpKey} from '../_models/jumpbar/jump-key'; const keySize = 25; // Height of the JumpBar button @@ -105,14 +105,18 @@ export class JumpbarService { getJumpKeys(data :Array, keySelector: (data: any) => string) { const keys: {[key: string]: number} = {}; data.forEach(obj => { - let ch = keySelector(obj).charAt(0).toUpperCase(); - if (/\d|\#|!|%|@|\(|\)|\^|\.|_|\*/g.test(ch)) { - ch = '#'; + try { + let ch = keySelector(obj).charAt(0).toUpperCase(); + if (/\d|\#|!|%|@|\(|\)|\^|\.|_|\*/g.test(ch)) { + ch = '#'; + } + if (!keys.hasOwnProperty(ch)) { + keys[ch] = 0; + } + keys[ch] += 1; + } catch (e) { + console.error('Failed to calculate jump key for ', obj, e); } - if (!keys.hasOwnProperty(ch)) { - keys[ch] = 0; - } - keys[ch] += 1; }); return Object.keys(keys).map(k => { k = k.toUpperCase(); diff --git a/UI/Web/src/app/_services/license.service.ts b/UI/Web/src/app/_services/license.service.ts new file mode 100644 index 000000000..a2e77f2fe --- /dev/null +++ b/UI/Web/src/app/_services/license.service.ts @@ -0,0 +1,83 @@ +import {inject, Injectable} from '@angular/core'; +import {HttpClient} from "@angular/common/http"; +import {catchError, map, ReplaySubject, tap, throwError} from "rxjs"; +import {environment} from "../../environments/environment"; +import {TextResonse} from '../_types/text-response'; +import {LicenseInfo} from "../_models/kavitaplus/license-info"; + +@Injectable({ + providedIn: 'root' +}) +export class LicenseService { + private readonly httpClient = inject(HttpClient); + + baseUrl = environment.apiUrl; + + private readonly hasValidLicenseSource = new ReplaySubject(1); + /** + * Does the user have an active license + */ + public readonly hasValidLicense$ = this.hasValidLicenseSource.asObservable(); + + + /** + * Delete the license from the server and update hasValidLicenseSource to false + */ + deleteLicense() { + return this.httpClient.delete(this.baseUrl + 'license', TextResonse).pipe( + map(res => res === "true"), + tap(_ => { + this.hasValidLicenseSource.next(false) + }), + catchError(error => { + this.hasValidLicenseSource.next(false); + return throwError(error); // Rethrow the error to propagate it further + }) + ); + } + + resetLicense(license: string, email: string) { + return this.httpClient.post(this.baseUrl + 'license/reset', {license, email}, TextResonse); + } + + /** + * Returns information about License and will internally cache if license is valid or not + */ + licenseInfo(forceCheck: boolean = false) { + return this.httpClient.get(this.baseUrl + `license/info?forceCheck=${forceCheck}`).pipe( + tap(res => { + this.hasValidLicenseSource.next(res?.isActive || false) + }), + catchError(error => { + this.hasValidLicenseSource.next(false); + return throwError(error); // Rethrow the error to propagate it further + }) + ); + } + + hasValidLicense(forceCheck: boolean = false) { + return this.httpClient.get(this.baseUrl + 'license/valid-license?forceCheck=' + forceCheck, TextResonse) + .pipe( + map(res => res === "true"), + tap(res => { + this.hasValidLicenseSource.next(res) + }), + catchError(error => { + this.hasValidLicenseSource.next(false); + return throwError(error); // Rethrow the error to propagate it further + }) + ); + } + + hasAnyLicense() { + return this.httpClient.get(this.baseUrl + 'license/has-license', TextResonse) + .pipe( + map(res => res === "true"), + ); + } + + updateUserLicense(license: string, email: string, discordId?: string) { + return this.httpClient.post(this.baseUrl + 'license', {license, email, discordId}, TextResonse) + .pipe(map(res => res === "true")); + } +} diff --git a/UI/Web/src/app/_services/localization.service.ts b/UI/Web/src/app/_services/localization.service.ts index 0c4e2bdbf..7519a9562 100644 --- a/UI/Web/src/app/_services/localization.service.ts +++ b/UI/Web/src/app/_services/localization.service.ts @@ -1,18 +1,36 @@ -import { Injectable } from '@angular/core'; +import {inject, Injectable} from '@angular/core'; import {environment} from "../../environments/environment"; import { HttpClient } from "@angular/common/http"; -import {Language} from "../_models/metadata/language"; +import {KavitaLocale, Language} from "../_models/metadata/language"; +import {ReplaySubject, tap} from "rxjs"; +import {TranslocoService} from "@jsverse/transloco"; @Injectable({ providedIn: 'root' }) export class LocalizationService { + private readonly translocoService = inject(TranslocoService); + baseUrl = environment.apiUrl; + private readonly localeSubject = new ReplaySubject(1); + public readonly locales$ = this.localeSubject.asObservable(); + constructor(private httpClient: HttpClient) { } getLocales() { - return this.httpClient.get(this.baseUrl + 'locale'); + return this.httpClient.get(this.baseUrl + 'locale').pipe(tap(locales => { + this.localeSubject.next(locales); + })); + } + + refreshTranslations(lang: string) { + + // Clear the cached translation + localStorage.removeItem(`@@TRANSLOCO_PERSIST_TRANSLATIONS/${lang}`); + + // Reload the translation + return this.translocoService.load(lang); } } diff --git a/UI/Web/src/app/_services/manage.service.ts b/UI/Web/src/app/_services/manage.service.ts new file mode 100644 index 000000000..781830caa --- /dev/null +++ b/UI/Web/src/app/_services/manage.service.ts @@ -0,0 +1,18 @@ +import {inject, Injectable} from '@angular/core'; +import {environment} from "../../environments/environment"; +import {HttpClient} from "@angular/common/http"; +import {ManageMatchSeries} from "../_models/kavitaplus/manage-match-series"; +import {ManageMatchFilter} from "../_models/kavitaplus/manage-match-filter"; + +@Injectable({ + providedIn: 'root' +}) +export class ManageService { + + baseUrl = environment.apiUrl; + private readonly httpClient = inject(HttpClient); + + getAllKavitaPlusSeries(filter: ManageMatchFilter) { + return this.httpClient.post>(this.baseUrl + `manage/series-metadata`, filter); + } +} diff --git a/UI/Web/src/app/_services/member.service.ts b/UI/Web/src/app/_services/member.service.ts index b6afbd8a9..d93098995 100644 --- a/UI/Web/src/app/_services/member.service.ts +++ b/UI/Web/src/app/_services/member.service.ts @@ -2,6 +2,7 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { environment } from 'src/environments/environment'; import { Member } from '../_models/auth/member'; +import {UserTokenInfo} from "../_models/kavitaplus/user-token-info"; @Injectable({ providedIn: 'root' @@ -20,6 +21,10 @@ export class MemberService { return this.httpClient.get(this.baseUrl + 'users/names'); } + getUserTokenInfo() { + return this.httpClient.get(this.baseUrl + 'users/tokens'); + } + adminExists() { return this.httpClient.get(this.baseUrl + 'admin/exists'); } @@ -37,11 +42,11 @@ export class MemberService { } addSeriesToWantToRead(seriesIds: Array) { - return this.httpClient.post>(this.baseUrl + 'want-to-read/add-series', {seriesIds}); + return this.httpClient.post(this.baseUrl + 'want-to-read/add-series', {seriesIds}); } removeSeriesToWantToRead(seriesIds: Array) { - return this.httpClient.post>(this.baseUrl + 'want-to-read/remove-series', {seriesIds}); + return this.httpClient.post(this.baseUrl + 'want-to-read/remove-series', {seriesIds}); } getMember() { diff --git a/UI/Web/src/app/_services/message-hub.service.ts b/UI/Web/src/app/_services/message-hub.service.ts index ea1819bd7..f870d1449 100644 --- a/UI/Web/src/app/_services/message-hub.service.ts +++ b/UI/Web/src/app/_services/message-hub.service.ts @@ -1,15 +1,16 @@ -import { Injectable } from '@angular/core'; -import { HubConnection, HubConnectionBuilder } from '@microsoft/signalr'; -import { BehaviorSubject, ReplaySubject } from 'rxjs'; -import { environment } from 'src/environments/environment'; -import { LibraryModifiedEvent } from '../_models/events/library-modified-event'; -import { NotificationProgressEvent } from '../_models/events/notification-progress-event'; -import { ThemeProgressEvent } from '../_models/events/theme-progress-event'; -import { UserUpdateEvent } from '../_models/events/user-update-event'; -import { User } from '../_models/user'; +import {Injectable} from '@angular/core'; +import {HubConnection, HubConnectionBuilder} from '@microsoft/signalr'; +import {BehaviorSubject, ReplaySubject} from 'rxjs'; +import {environment} from 'src/environments/environment'; +import {LibraryModifiedEvent} from '../_models/events/library-modified-event'; +import {NotificationProgressEvent} from '../_models/events/notification-progress-event'; +import {ThemeProgressEvent} from '../_models/events/theme-progress-event'; +import {UserUpdateEvent} from '../_models/events/user-update-event'; +import {User} from '../_models/user'; import {DashboardUpdateEvent} from "../_models/events/dashboard-update-event"; import {SideNavUpdateEvent} from "../_models/events/sidenav-update-event"; import {SiteThemeUpdatedEvent} from "../_models/events/site-theme-updated-event"; +import {ExternalMatchRateLimitErrorEvent} from "../_models/events/external-match-rate-limit-error-event"; export enum EVENTS { UpdateAvailable = 'UpdateAvailable', @@ -109,7 +110,15 @@ export enum EVENTS { /** * A Progress event when a smart collection is synchronizing */ - SmartCollectionSync = 'SmartCollectionSync' + SmartCollectionSync = 'SmartCollectionSync', + /** + * A Person merged has been merged into another + */ + PersonMerged = 'PersonMerged', + /** + * A Rate limit error was hit when matching a series with Kavita+ + */ + ExternalMatchRateLimitError = 'ExternalMatchRateLimitError' } export interface Message { @@ -232,6 +241,13 @@ export class MessageHubService { }); }); + this.hubConnection.on(EVENTS.ExternalMatchRateLimitError, resp => { + this.messagesSource.next({ + event: EVENTS.ExternalMatchRateLimitError, + payload: resp.body as ExternalMatchRateLimitErrorEvent + }); + }); + this.hubConnection.on(EVENTS.NotificationProgress, (resp: NotificationProgressEvent) => { this.messagesSource.next({ event: EVENTS.NotificationProgress, @@ -336,6 +352,13 @@ export class MessageHubService { payload: resp.body }); }); + + this.hubConnection.on(EVENTS.PersonMerged, resp => { + this.messagesSource.next({ + event: EVENTS.PersonMerged, + payload: resp.body + }); + }) } stopHubConnection() { diff --git a/UI/Web/src/app/_services/metadata.service.ts b/UI/Web/src/app/_services/metadata.service.ts index 314e5c37b..fe0702219 100644 --- a/UI/Web/src/app/_services/metadata.service.ts +++ b/UI/Web/src/app/_services/metadata.service.ts @@ -1,33 +1,54 @@ -import {HttpClient} from '@angular/common/http'; -import {Injectable} from '@angular/core'; +import {HttpClient, HttpParams} from '@angular/common/http'; +import {inject, Injectable} from '@angular/core'; import {tap} from 'rxjs/operators'; -import {of} from 'rxjs'; +import {map, of} from 'rxjs'; import {environment} from 'src/environments/environment'; import {Genre} from '../_models/metadata/genre'; import {AgeRatingDto} from '../_models/metadata/age-rating-dto'; import {Language} from '../_models/metadata/language'; import {PublicationStatusDto} from '../_models/metadata/publication-status-dto'; -import {Person, PersonRole} from '../_models/metadata/person'; +import {allPeopleRoles, Person, PersonRole} from '../_models/metadata/person'; import {Tag} from '../_models/tag'; import {FilterComparison} from '../_models/metadata/v2/filter-comparison'; import {FilterField} from '../_models/metadata/v2/filter-field'; -import {SortField} from "../_models/metadata/series-filter"; +import {mangaFormatFilters, SortField} from "../_models/metadata/series-filter"; import {FilterCombination} from "../_models/metadata/v2/filter-combination"; -import {SeriesFilterV2} from "../_models/metadata/v2/series-filter-v2"; +import {FilterV2} from "../_models/metadata/v2/filter-v2"; import {FilterStatement} from "../_models/metadata/v2/filter-statement"; import {SeriesDetailPlus} from "../_models/series-detail/series-detail-plus"; import {LibraryType} from "../_models/library/library"; import {IHasCast} from "../_models/common/i-has-cast"; import {TextResonse} from "../_types/text-response"; import {QueryContext} from "../_models/metadata/v2/query-context"; +import {AgeRatingPipe} from "../_pipes/age-rating.pipe"; +import {MangaFormatPipe} from "../_pipes/manga-format.pipe"; +import {TranslocoService} from "@jsverse/transloco"; +import {LibraryService} from './library.service'; +import {CollectionTagService} from "./collection-tag.service"; +import {PaginatedResult} from "../_models/pagination"; +import {UtilityService} from "../shared/_services/utility.service"; +import {BrowseGenre} from "../_models/metadata/browse/browse-genre"; +import {BrowseTag} from "../_models/metadata/browse/browse-tag"; +import {ValidFilterEntity} from "../metadata-filter/filter-settings"; +import {PersonFilterField} from "../_models/metadata/v2/person-filter-field"; +import {PersonRolePipe} from "../_pipes/person-role.pipe"; +import {PersonSortField} from "../_models/metadata/v2/person-sort-field"; @Injectable({ providedIn: 'root' }) export class MetadataService { + private readonly translocoService = inject(TranslocoService); + private readonly libraryService = inject(LibraryService); + private readonly collectionTagService = inject(CollectionTagService); + private readonly utilityService = inject(UtilityService); + baseUrl = environment.apiUrl; private validLanguages: Array = []; + private ageRatingPipe = new AgeRatingPipe(); + private mangaFormatPipe = new MangaFormatPipe(this.translocoService); + private personRolePipe = new PersonRolePipe(); constructor(private httpClient: HttpClient) { } @@ -74,6 +95,28 @@ export class MetadataService { return this.httpClient.get>(this.baseUrl + method); } + getGenreWithCounts(pageNum?: number, itemsPerPage?: number) { + let params = new HttpParams(); + params = this.utilityService.addPaginationIfExists(params, pageNum, itemsPerPage); + + return this.httpClient.post>(this.baseUrl + 'metadata/genres-with-counts', {}, {observe: 'response', params}).pipe( + map((response: any) => { + return this.utilityService.createPaginatedResult(response) as PaginatedResult; + }) + ); + } + + getTagWithCounts(pageNum?: number, itemsPerPage?: number) { + let params = new HttpParams(); + params = this.utilityService.addPaginationIfExists(params, pageNum, itemsPerPage); + + return this.httpClient.post>(this.baseUrl + 'metadata/tags-with-counts', {}, {observe: 'response', params}).pipe( + map((response: any) => { + return this.utilityService.createPaginatedResult(response) as PaginatedResult; + }) + ); + } + getAllLanguages(libraries?: Array) { let method = 'metadata/languages' if (libraries != undefined && libraries.length > 0) { @@ -110,19 +153,28 @@ export class MetadataService { return this.httpClient.get>(this.baseUrl + 'metadata/people-by-role?role=' + role); } - createDefaultFilterDto(): SeriesFilterV2 { + createDefaultFilterDto(entityType: ValidFilterEntity): FilterV2 { return { - statements: [] as FilterStatement[], + statements: [] as FilterStatement[], combination: FilterCombination.And, limitTo: 0, sortOptions: { isAscending: true, - sortField: SortField.SortName + sortField: (entityType === 'series' ? SortField.SortName : PersonSortField.Name) as TSort } }; } - createDefaultFilterStatement(field: FilterField = FilterField.SeriesName, comparison = FilterComparison.Equal, value = '') { + createDefaultFilterStatement(entityType: ValidFilterEntity) { + switch (entityType) { + case 'series': + return this.createFilterStatement(FilterField.SeriesName); + case 'person': + return this.createFilterStatement(PersonFilterField.Role, FilterComparison.Contains, `${PersonRole.CoverArtist},${PersonRole.Writer}`); + } + } + + createFilterStatement(field: T, comparison = FilterComparison.Equal, value = '') { return { comparison: comparison, field: field, @@ -130,7 +182,7 @@ export class MetadataService { }; } - updateFilter(arr: Array, index: number, filterStmt: FilterStatement) { + updateFilter(arr: Array>, index: number, filterStmt: FilterStatement) { arr[index].comparison = filterStmt.comparison; arr[index].field = filterStmt.field; arr[index].value = filterStmt.value ? filterStmt.value + '' : ''; @@ -140,8 +192,6 @@ export class MetadataService { switch (role) { case PersonRole.Other: break; - case PersonRole.Artist: - break; case PersonRole.CoverArtist: entity.coverArtists = persons; break; @@ -183,4 +233,85 @@ export class MetadataService { break; } } + + /** + * Used to get the underlying Options (for Metadata Filter Dropdowns) + * @param filterField + * @param entityType + */ + getOptionsForFilterField(filterField: T, entityType: ValidFilterEntity) { + + switch (entityType) { + case 'series': + return this.getSeriesOptionsForFilterField(filterField as FilterField); + case 'person': + return this.getPersonOptionsForFilterField(filterField as PersonFilterField); + } + } + + private getPersonOptionsForFilterField(field: PersonFilterField) { + switch (field) { + case PersonFilterField.Role: + return of(allPeopleRoles.map(r => {return {value: r, label: this.personRolePipe.transform(r)}})); + } + return of([]) + } + + private getSeriesOptionsForFilterField(field: FilterField) { + switch (field) { + case FilterField.PublicationStatus: + return this.getAllPublicationStatus().pipe(map(pubs => pubs.map(pub => { + return {value: pub.value, label: pub.title} + }))); + case FilterField.AgeRating: + return this.getAllAgeRatings().pipe(map(ratings => ratings.map(rating => { + return {value: rating.value, label: this.ageRatingPipe.transform(rating.value)} + }))); + case FilterField.Genres: + return this.getAllGenres().pipe(map(genres => genres.map(genre => { + return {value: genre.id, label: genre.title} + }))); + case FilterField.Languages: + return this.getAllLanguages().pipe(map(statuses => statuses.map(status => { + return {value: status.isoCode, label: status.title + ` (${status.isoCode})`} + }))); + case FilterField.Formats: + return of(mangaFormatFilters).pipe(map(statuses => statuses.map(status => { + return {value: status.value, label: this.mangaFormatPipe.transform(status.value)} + }))); + case FilterField.Libraries: + return this.libraryService.getLibraries().pipe(map(libs => libs.map(lib => { + return {value: lib.id, label: lib.name} + }))); + case FilterField.Tags: + return this.getAllTags().pipe(map(statuses => statuses.map(status => { + return {value: status.id, label: status.title} + }))); + case FilterField.CollectionTags: + return this.collectionTagService.allCollections().pipe(map(statuses => statuses.map(status => { + return {value: status.id, label: status.title} + }))); + case FilterField.Characters: return this.getPersonOptions(PersonRole.Character); + case FilterField.Colorist: return this.getPersonOptions(PersonRole.Colorist); + case FilterField.CoverArtist: return this.getPersonOptions(PersonRole.CoverArtist); + case FilterField.Editor: return this.getPersonOptions(PersonRole.Editor); + case FilterField.Inker: return this.getPersonOptions(PersonRole.Inker); + case FilterField.Letterer: return this.getPersonOptions(PersonRole.Letterer); + case FilterField.Penciller: return this.getPersonOptions(PersonRole.Penciller); + case FilterField.Publisher: return this.getPersonOptions(PersonRole.Publisher); + case FilterField.Imprint: return this.getPersonOptions(PersonRole.Imprint); + case FilterField.Team: return this.getPersonOptions(PersonRole.Team); + case FilterField.Location: return this.getPersonOptions(PersonRole.Location); + case FilterField.Translators: return this.getPersonOptions(PersonRole.Translator); + case FilterField.Writers: return this.getPersonOptions(PersonRole.Writer); + } + + return of([]); + } + + private getPersonOptions(role: PersonRole) { + return this.getAllPeopleByRole(role).pipe(map(people => people.map(person => { + return {value: person.id, label: person.name} + }))); + } } diff --git a/UI/Web/src/app/_services/nav.service.ts b/UI/Web/src/app/_services/nav.service.ts index 7b1e4dd8c..0aad76ef7 100644 --- a/UI/Web/src/app/_services/nav.service.ts +++ b/UI/Web/src/app/_services/nav.service.ts @@ -1,7 +1,7 @@ import {DOCUMENT} from '@angular/common'; import {DestroyRef, inject, Inject, Injectable, Renderer2, RendererFactory2, RendererStyleFlags2} from '@angular/core'; -import {distinctUntilChanged, filter, ReplaySubject, take} from 'rxjs'; -import { HttpClient } from "@angular/common/http"; +import {filter, ReplaySubject, take} from 'rxjs'; +import {HttpClient} from "@angular/common/http"; import {environment} from "../../environments/environment"; import {SideNavStream} from "../_models/sidenav/sidenav-stream"; import {TextResonse} from "../_types/text-response"; @@ -9,6 +9,24 @@ import {AccountService} from "./account.service"; import {map} from "rxjs/operators"; import {NavigationEnd, Router} from "@angular/router"; import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; +import {SettingsTabId} from "../sidenav/preference-nav/preference-nav.component"; +import {WikiLink} from "../_models/wiki"; + +/** + * NavItem used to construct the dropdown or NavLinkModal on mobile + * Priority construction + * @param routerLink A link to a page on the web app, takes priority + * @param fragment Optional fragment for routerLink + * @param href A link to an external page, must set noopener noreferrer + * @param click Callback, lowest priority. Should only be used if routerLink and href or not set + */ +interface NavItem { + transLocoKey: string; + href?: string; + fragment?: string; + routerLink?: string; + click?: () => void; +} @Injectable({ providedIn: 'root' @@ -21,6 +39,33 @@ export class NavService { public localStorageSideNavKey = 'kavita--sidenav--expanded'; + public navItems: NavItem[] = [ + { + transLocoKey: 'all-filters', + routerLink: '/all-filters/', + }, + { + transLocoKey: 'browse-genres', + routerLink: '/browse/genres', + }, + { + transLocoKey: 'browse-tags', + routerLink: '/browse/tags', + }, + { + transLocoKey: 'announcements', + routerLink: '/announcements/', + }, + { + transLocoKey: 'help', + href: WikiLink.Guides, + }, + { + transLocoKey: 'logout', + click: () => this.logout(), + } + ] + private navbarVisibleSource = new ReplaySubject(1); /** * If the top Nav bar is rendered or not @@ -93,6 +138,10 @@ export class NavService { return this.httpClient.post(this.baseUrl + 'stream/bulk-sidenav-stream-visibility', {ids: streamIds, visibility: targetVisibility}); } + deleteSideNavSmartFilter(streamId: number) { + return this.httpClient.delete(this.baseUrl + 'stream/smart-filter-side-nav-stream?sideNavStreamId=' + streamId, {}); + } + /** * Shows the top nav bar. This should be visible on all pages except the reader. */ @@ -123,6 +172,13 @@ export class NavService { }, 10); } + logout() { + this.accountService.logout(); + this.hideNavBar(); + this.hideSideNav(); + this.router.navigateByUrl('/login'); + } + /** * Shows the side nav. When being visible, the side nav will automatically return to previous collapsed state. */ diff --git a/UI/Web/src/app/_services/person.service.ts b/UI/Web/src/app/_services/person.service.ts index 676aa6e71..fc9148135 100644 --- a/UI/Web/src/app/_services/person.service.ts +++ b/UI/Web/src/app/_services/person.service.ts @@ -1,16 +1,17 @@ -import { Injectable } from '@angular/core'; -import { HttpClient, HttpParams } from "@angular/common/http"; +import {Injectable} from '@angular/core'; +import {HttpClient, HttpParams} from "@angular/common/http"; import {environment} from "../../environments/environment"; import {Person, PersonRole} from "../_models/metadata/person"; -import {SeriesFilterV2} from "../_models/metadata/v2/series-filter-v2"; import {PaginatedResult} from "../_models/pagination"; import {Series} from "../_models/series"; import {map} from "rxjs/operators"; import {UtilityService} from "../shared/_services/utility.service"; -import {BrowsePerson} from "../_models/person/browse-person"; -import {Chapter} from "../_models/chapter"; +import {BrowsePerson} from "../_models/metadata/browse/browse-person"; import {StandaloneChapter} from "../_models/standalone-chapter"; import {TextResonse} from "../_types/text-response"; +import {FilterV2} from "../_models/metadata/v2/filter-v2"; +import {PersonFilterField} from "../_models/metadata/v2/person-filter-field"; +import {PersonSortField} from "../_models/metadata/v2/person-sort-field"; @Injectable({ providedIn: 'root' @@ -29,6 +30,10 @@ export class PersonService { return this.httpClient.get(this.baseUrl + `person?name=${name}`); } + searchPerson(name: string) { + return this.httpClient.get>(this.baseUrl + `person/search?queryString=${encodeURIComponent(name)}`); + } + getRolesForPerson(personId: number) { return this.httpClient.get>(this.baseUrl + `person/roles?personId=${personId}`); } @@ -41,18 +46,40 @@ export class PersonService { return this.httpClient.get>(this.baseUrl + `person/chapters-by-role?personId=${personId}&role=${role}`); } - getAuthorsToBrowse(pageNum?: number, itemsPerPage?: number) { + getAuthorsToBrowse(filter: FilterV2, pageNum?: number, itemsPerPage?: number) { let params = new HttpParams(); params = this.utilityService.addPaginationIfExists(params, pageNum, itemsPerPage); - return this.httpClient.post>(this.baseUrl + 'person/all', {}, {observe: 'response', params}).pipe( + return this.httpClient.post>(this.baseUrl + `person/all`, filter, {observe: 'response', params}).pipe( map((response: any) => { return this.utilityService.createPaginatedResult(response) as PaginatedResult; }) ); } + // getAuthorsToBrowse(filter: BrowsePersonFilter, pageNum?: number, itemsPerPage?: number) { + // let params = new HttpParams(); + // params = this.utilityService.addPaginationIfExists(params, pageNum, itemsPerPage); + // + // return this.httpClient.post>(this.baseUrl + `person/all`, filter, {observe: 'response', params}).pipe( + // map((response: any) => { + // return this.utilityService.createPaginatedResult(response) as PaginatedResult; + // }) + // ); + // } + downloadCover(personId: number) { return this.httpClient.post(this.baseUrl + 'person/fetch-cover?personId=' + personId, {}, TextResonse); } + + isValidAlias(personId: number, alias: string) { + return this.httpClient.get(this.baseUrl + `person/valid-alias?personId=${personId}&alias=${alias}`, TextResonse).pipe( + map(valid => valid + '' === 'true') + ); + } + + mergePerson(destId: number, srcId: number) { + return this.httpClient.post(this.baseUrl + 'person/merge', {destId, srcId}); + } + } diff --git a/UI/Web/src/app/_services/reader.service.ts b/UI/Web/src/app/_services/reader.service.ts index 991a37bdb..52aef2a4a 100644 --- a/UI/Web/src/app/_services/reader.service.ts +++ b/UI/Web/src/app/_services/reader.service.ts @@ -1,28 +1,29 @@ -import { HttpClient, HttpParams } from '@angular/common/http'; +import {HttpClient} from '@angular/common/http'; import {DestroyRef, Inject, inject, Injectable} from '@angular/core'; import {DOCUMENT, Location} from '@angular/common'; -import { Router } from '@angular/router'; -import { environment } from 'src/environments/environment'; -import { ChapterInfo } from '../manga-reader/_models/chapter-info'; -import { Chapter } from '../_models/chapter'; -import { HourEstimateRange } from '../_models/series-detail/hour-estimate-range'; -import { MangaFormat } from '../_models/manga-format'; -import { BookmarkInfo } from '../_models/manga-reader/bookmark-info'; -import { PageBookmark } from '../_models/readers/page-bookmark'; -import { ProgressBookmark } from '../_models/readers/progress-bookmark'; -import { FileDimension } from '../manga-reader/_models/file-dimension'; +import {Router} from '@angular/router'; +import {environment} from 'src/environments/environment'; +import {ChapterInfo} from '../manga-reader/_models/chapter-info'; +import {Chapter} from '../_models/chapter'; +import {HourEstimateRange} from '../_models/series-detail/hour-estimate-range'; +import {MangaFormat} from '../_models/manga-format'; +import {BookmarkInfo} from '../_models/manga-reader/bookmark-info'; +import {PageBookmark} from '../_models/readers/page-bookmark'; +import {ProgressBookmark} from '../_models/readers/progress-bookmark'; +import {FileDimension} from '../manga-reader/_models/file-dimension'; import screenfull from 'screenfull'; -import { TextResonse } from '../_types/text-response'; -import { AccountService } from './account.service'; +import {TextResonse} from '../_types/text-response'; +import {AccountService} from './account.service'; import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; import {PersonalToC} from "../_models/readers/personal-toc"; -import {SeriesFilterV2} from "../_models/metadata/v2/series-filter-v2"; +import {FilterV2} from "../_models/metadata/v2/filter-v2"; import NoSleep from 'nosleep.js'; import {FullProgress} from "../_models/readers/full-progress"; import {Volume} from "../_models/volume"; import {UtilityService} from "../shared/_services/utility.service"; import {translate} from "@jsverse/transloco"; import {ToastrService} from "ngx-toastr"; +import {FilterField} from "../_models/metadata/v2/filter-field"; export const CHAPTER_ID_DOESNT_EXIST = -1; @@ -46,7 +47,8 @@ export class ReaderService { // Override background color for reader and restore it onDestroy private originalBodyColor!: string; - private noSleep = new NoSleep(); + + private noSleep: NoSleep = new NoSleep(); constructor(private httpClient: HttpClient, @Inject(DOCUMENT) private document: Document) { this.accountService.currentUser$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(user => { @@ -56,17 +58,18 @@ export class ReaderService { }); } + enableWakeLock(element?: Element | Document) { // Enable wake lock. // (must be wrapped in a user input event handler e.g. a mouse or touch handler) if (!element) element = this.document; - const enableNoSleepHandler = () => { + const enableNoSleepHandler = async () => { element!.removeEventListener('click', enableNoSleepHandler, false); element!.removeEventListener('touchmove', enableNoSleepHandler, false); element!.removeEventListener('mousemove', enableNoSleepHandler, false); - this.noSleep!.enable(); + await this.noSleep.enable(); }; // Enable wake lock. @@ -105,7 +108,7 @@ export class ReaderService { return this.httpClient.post(this.baseUrl + 'reader/unbookmark', {seriesId, volumeId, chapterId, page}); } - getAllBookmarks(filter: SeriesFilterV2 | undefined) { + getAllBookmarks(filter: FilterV2 | undefined) { return this.httpClient.post(this.baseUrl + 'reader/all-bookmarks', filter); } @@ -263,13 +266,13 @@ export class ReaderService { getQueryParamsObject(incognitoMode: boolean = false, readingListMode: boolean = false, readingListId: number = -1) { - let params: {[key: string]: any} = {}; - if (incognitoMode) { - params['incognitoMode'] = true; - } + const params: {[key: string]: any} = {}; + params['incognitoMode'] = incognitoMode; + if (readingListMode) { params['readingListId'] = readingListId; } + return params; } diff --git a/UI/Web/src/app/_services/reading-list.service.ts b/UI/Web/src/app/_services/reading-list.service.ts index 04d97060f..088263a33 100644 --- a/UI/Web/src/app/_services/reading-list.service.ts +++ b/UI/Web/src/app/_services/reading-list.service.ts @@ -1,13 +1,13 @@ -import { HttpClient, HttpParams } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { map } from 'rxjs/operators'; -import { environment } from 'src/environments/environment'; -import { UtilityService } from '../shared/_services/utility.service'; -import { Person } from '../_models/metadata/person'; -import { PaginatedResult } from '../_models/pagination'; -import { ReadingList, ReadingListItem } from '../_models/reading-list'; -import { CblImportSummary } from '../_models/reading-list/cbl/cbl-import-summary'; -import { TextResonse } from '../_types/text-response'; +import {HttpClient, HttpParams} from '@angular/common/http'; +import {Injectable} from '@angular/core'; +import {map} from 'rxjs/operators'; +import {environment} from 'src/environments/environment'; +import {UtilityService} from '../shared/_services/utility.service'; +import {Person, PersonRole} from '../_models/metadata/person'; +import {PaginatedResult} from '../_models/pagination'; +import {ReadingList, ReadingListCast, ReadingListInfo, ReadingListItem} from '../_models/reading-list'; +import {CblImportSummary} from '../_models/reading-list/cbl/cbl-import-summary'; +import {TextResonse} from '../_types/text-response'; import {Action, ActionItem} from './action-factory.service'; @Injectable({ @@ -20,7 +20,7 @@ export class ReadingListService { constructor(private httpClient: HttpClient, private utilityService: UtilityService) { } getReadingList(readingListId: number) { - return this.httpClient.get(this.baseUrl + 'readinglist?readingListId=' + readingListId); + return this.httpClient.get(this.baseUrl + 'readinglist?readingListId=' + readingListId); } getReadingLists(includePromoted: boolean = true, sortByLastModified: boolean = false, pageNum?: number, itemsPerPage?: number) { @@ -114,10 +114,20 @@ export class ReadingListService { return this.httpClient.post(this.baseUrl + `cbl/import?dryRun=${dryRun}&useComicVineMatching=${useComicVineMatching}`, form); } - getCharacters(readingListId: number) { - return this.httpClient.get>(this.baseUrl + 'readinglist/characters?readingListId=' + readingListId); + getPeople(readingListId: number, role: PersonRole) { + return this.httpClient.get>(this.baseUrl + `readinglist/people?readingListId=${readingListId}&role=${role}`); } + getAllPeople(readingListId: number) { + return this.httpClient.get(this.baseUrl + `readinglist/all-people?readingListId=${readingListId}`); + } + + + getReadingListInfo(readingListId: number) { + return this.httpClient.get(this.baseUrl + `readinglist/info?readingListId=${readingListId}`); + } + + promoteMultipleReadingLists(listIds: Array, promoted: boolean) { return this.httpClient.post(this.baseUrl + 'readinglist/promote-multiple', {readingListIds: listIds, promoted}, TextResonse); } diff --git a/UI/Web/src/app/_services/reading-profile.service.ts b/UI/Web/src/app/_services/reading-profile.service.ts new file mode 100644 index 000000000..e8be8b6ab --- /dev/null +++ b/UI/Web/src/app/_services/reading-profile.service.ts @@ -0,0 +1,70 @@ +import {inject, Injectable} from '@angular/core'; +import {HttpClient} from "@angular/common/http"; +import {environment} from "../../environments/environment"; +import {ReadingProfile} from "../_models/preferences/reading-profiles"; + +@Injectable({ + providedIn: 'root' +}) +export class ReadingProfileService { + + private readonly httpClient = inject(HttpClient); + baseUrl = environment.apiUrl; + + getForSeries(seriesId: number, skipImplicit: boolean = false) { + return this.httpClient.get(this.baseUrl + `reading-profile/${seriesId}?skipImplicit=${skipImplicit}`); + } + + getForLibrary(libraryId: number) { + return this.httpClient.get(this.baseUrl + `reading-profile/library?libraryId=${libraryId}`); + } + + updateProfile(profile: ReadingProfile) { + return this.httpClient.post(this.baseUrl + 'reading-profile', profile); + } + + updateParentProfile(seriesId: number, profile: ReadingProfile) { + return this.httpClient.post(this.baseUrl + `reading-profile/update-parent?seriesId=${seriesId}`, profile); + } + + createProfile(profile: ReadingProfile) { + return this.httpClient.post(this.baseUrl + 'reading-profile/create', profile); + } + + promoteProfile(profileId: number) { + return this.httpClient.post(this.baseUrl + "reading-profile/promote?profileId=" + profileId, {}); + } + + updateImplicit(profile: ReadingProfile, seriesId: number) { + return this.httpClient.post(this.baseUrl + "reading-profile/series?seriesId="+seriesId, profile); + } + + getAllProfiles() { + return this.httpClient.get(this.baseUrl + 'reading-profile/all'); + } + + delete(id: number) { + return this.httpClient.delete(this.baseUrl + `reading-profile?profileId=${id}`); + } + + addToSeries(id: number, seriesId: number) { + return this.httpClient.post(this.baseUrl + `reading-profile/series/${seriesId}?profileId=${id}`, {}); + } + + clearSeriesProfiles(seriesId: number) { + return this.httpClient.delete(this.baseUrl + `reading-profile/series/${seriesId}`, {}); + } + + addToLibrary(id: number, libraryId: number) { + return this.httpClient.post(this.baseUrl + `reading-profile/library/${libraryId}?profileId=${id}`, {}); + } + + clearLibraryProfiles(libraryId: number) { + return this.httpClient.delete(this.baseUrl + `reading-profile/library/${libraryId}`, {}); + } + + bulkAddToSeries(id: number, seriesIds: number[]) { + return this.httpClient.post(this.baseUrl + `reading-profile/bulk?profileId=${id}`, seriesIds); + } + +} diff --git a/UI/Web/src/app/_services/review.service.ts b/UI/Web/src/app/_services/review.service.ts new file mode 100644 index 000000000..b8635bcf8 --- /dev/null +++ b/UI/Web/src/app/_services/review.service.ts @@ -0,0 +1,56 @@ +import { Injectable } from '@angular/core'; +import {UserReview} from "../_single-module/review-card/user-review"; +import {environment} from "../../environments/environment"; +import {HttpClient} from "@angular/common/http"; +import {Rating} from "../_models/rating"; + +@Injectable({ + providedIn: 'root' +}) +export class ReviewService { + + private baseUrl = environment.apiUrl; + + constructor(private httpClient: HttpClient) { } + + deleteReview(seriesId: number, chapterId?: number) { + if (chapterId) { + return this.httpClient.delete(this.baseUrl + `review/chapter?chapterId=${chapterId}`); + } + + return this.httpClient.delete(this.baseUrl + `review/series?seriesId=${seriesId}`); + } + + updateReview(seriesId: number, body: string, chapterId?: number) { + if (chapterId) { + return this.httpClient.post(this.baseUrl + `review/chapter`, { + seriesId, chapterId, body + }); + } + + return this.httpClient.post(this.baseUrl + 'review/series', { + seriesId, body + }); + } + + updateRating(seriesId: number, userRating: number, chapterId?: number) { + if (chapterId) { + return this.httpClient.post(this.baseUrl + 'rating/chapter', { + seriesId, chapterId, userRating + }) + } + + return this.httpClient.post(this.baseUrl + 'rating/series', { + seriesId, userRating + }) + } + + overallRating(seriesId: number, chapterId?: number) { + if (chapterId) { + return this.httpClient.get(this.baseUrl + `rating/overall-chapter?chapterId=${chapterId}`); + } + + return this.httpClient.get(this.baseUrl + `rating/overall-series?seriesId=${seriesId}`); + } + +} diff --git a/UI/Web/src/app/_services/scrobbling.service.ts b/UI/Web/src/app/_services/scrobbling.service.ts index fa2942ce8..cfc7b34ac 100644 --- a/UI/Web/src/app/_services/scrobbling.service.ts +++ b/UI/Web/src/app/_services/scrobbling.service.ts @@ -1,8 +1,8 @@ -import { HttpClient, HttpParams } from '@angular/common/http'; +import {HttpClient, HttpParams} from '@angular/common/http'; import {Injectable} from '@angular/core'; -import { map } from 'rxjs/operators'; -import { environment } from 'src/environments/environment'; -import { TextResonse } from '../_types/text-response'; +import {map} from 'rxjs/operators'; +import {environment} from 'src/environments/environment'; +import {TextResonse} from '../_types/text-response'; import {ScrobbleError} from "../_models/scrobbling/scrobble-error"; import {ScrobbleEvent} from "../_models/scrobbling/scrobble-event"; import {ScrobbleHold} from "../_models/scrobbling/scrobble-hold"; @@ -12,9 +12,10 @@ import {UtilityService} from "../shared/_services/utility.service"; export enum ScrobbleProvider { Kavita = 0, - AniList= 1, + AniList = 1, Mal = 2, - GoogleBooks = 3 + GoogleBooks = 3, + Cbr = 4 } @Injectable({ @@ -32,12 +33,20 @@ export class ScrobblingService { .pipe(map(r => r === "true")); } + /** + * Returns if the token was new or not + */ updateAniListToken(token: string) { - return this.httpClient.post(this.baseUrl + 'scrobbling/update-anilist-token', {token}); + return this.httpClient.post(this.baseUrl + 'scrobbling/update-anilist-token', {token}, TextResonse) + .pipe(map(r => r + '' === 'true')); } + /** + * Returns if the token was new or not + */ updateMalToken(username: string, accessToken: string) { - return this.httpClient.post(this.baseUrl + 'scrobbling/update-mal-token', {username, accessToken}); + return this.httpClient.post(this.baseUrl + 'scrobbling/update-mal-token', {username, accessToken}, TextResonse) + .pipe(map(r => r + '' === 'true')); } getAniListToken() { @@ -48,6 +57,11 @@ export class ScrobblingService { return this.httpClient.get<{username: string, accessToken: string}>(this.baseUrl + 'scrobbling/mal-token'); } + + hasRunScrobbleGen() { + return this.httpClient.get(this.baseUrl + 'scrobbling/has-ran-scrobble-gen ', TextResonse).pipe(map(r => r === 'true')); + } + getScrobbleErrors() { return this.httpClient.get>(this.baseUrl + 'scrobbling/scrobble-errors'); } @@ -87,4 +101,13 @@ export class ScrobblingService { removeHold(seriesId: number) { return this.httpClient.delete(this.baseUrl + 'scrobbling/remove-hold?seriesId=' + seriesId, TextResonse); } + + triggerScrobbleEventGeneration() { + return this.httpClient.post(this.baseUrl + 'scrobbling/generate-scrobble-events', TextResonse); + } + + bulkRemoveEvents(eventIds: number[]) { + return this.httpClient.post(this.baseUrl + "scrobbling/bulk-remove-events", eventIds) + } + } diff --git a/UI/Web/src/app/_services/series.service.ts b/UI/Web/src/app/_services/series.service.ts index ba3fadde1..9c436e636 100644 --- a/UI/Web/src/app/_services/series.service.ts +++ b/UI/Web/src/app/_services/series.service.ts @@ -1,26 +1,26 @@ -import { HttpClient, HttpParams } from '@angular/common/http'; -import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; -import { environment } from 'src/environments/environment'; -import { UtilityService } from '../shared/_services/utility.service'; -import { Chapter } from '../_models/chapter'; -import { PaginatedResult } from '../_models/pagination'; -import { Series } from '../_models/series'; -import { RelatedSeries } from '../_models/series-detail/related-series'; -import { SeriesDetail } from '../_models/series-detail/series-detail'; -import { SeriesGroup } from '../_models/series-group'; -import { SeriesMetadata } from '../_models/metadata/series-metadata'; -import { Volume } from '../_models/volume'; -import { ImageService } from './image.service'; -import { TextResonse } from '../_types/text-response'; -import { SeriesFilterV2 } from '../_models/metadata/v2/series-filter-v2'; -import {UserReview} from "../_single-module/review-card/user-review"; +import {HttpClient, HttpParams} from '@angular/common/http'; +import {Injectable} from '@angular/core'; +import {Observable} from 'rxjs'; +import {map} from 'rxjs/operators'; +import {environment} from 'src/environments/environment'; +import {UtilityService} from '../shared/_services/utility.service'; +import {Chapter} from '../_models/chapter'; +import {PaginatedResult} from '../_models/pagination'; +import {Series} from '../_models/series'; +import {RelatedSeries} from '../_models/series-detail/related-series'; +import {SeriesDetail} from '../_models/series-detail/series-detail'; +import {SeriesGroup} from '../_models/series-group'; +import {SeriesMetadata} from '../_models/metadata/series-metadata'; +import {Volume} from '../_models/volume'; +import {TextResonse} from '../_types/text-response'; +import {FilterV2} from '../_models/metadata/v2/filter-v2'; import {Rating} from "../_models/rating"; import {Recommendation} from "../_models/series-detail/recommendation"; import {ExternalSeriesDetail} from "../_models/series-detail/external-series-detail"; import {NextExpectedChapter} from "../_models/series-detail/next-expected-chapter"; import {QueryContext} from "../_models/metadata/v2/query-context"; +import {ExternalSeriesMatch} from "../_models/series-detail/external-series-match"; +import {FilterField} from "../_models/metadata/v2/filter-field"; @Injectable({ providedIn: 'root' @@ -31,10 +31,9 @@ export class SeriesService { paginatedResults: PaginatedResult = new PaginatedResult(); paginatedSeriesForTagsResults: PaginatedResult = new PaginatedResult(); - constructor(private httpClient: HttpClient, private imageService: ImageService, - private utilityService: UtilityService) { } + constructor(private httpClient: HttpClient, private utilityService: UtilityService) { } - getAllSeriesV2(pageNum?: number, itemsPerPage?: number, filter?: SeriesFilterV2, context: QueryContext = QueryContext.None) { + getAllSeriesV2(pageNum?: number, itemsPerPage?: number, filter?: FilterV2, context: QueryContext = QueryContext.None) { let params = new HttpParams(); params = this.utilityService.addPaginationIfExists(params, pageNum, itemsPerPage); const data = filter || {}; @@ -46,7 +45,7 @@ export class SeriesService { ); } - getSeriesForLibraryV2(pageNum?: number, itemsPerPage?: number, filter?: SeriesFilterV2) { + getSeriesForLibraryV2(pageNum?: number, itemsPerPage?: number, filter?: FilterV2) { let params = new HttpParams(); params = this.utilityService.addPaginationIfExists(params, pageNum, itemsPerPage); const data = filter || {}; @@ -82,10 +81,6 @@ export class SeriesService { return this.httpClient.post(this.baseUrl + 'series/delete-multiple', {seriesIds}, TextResonse).pipe(map(s => s === "true")); } - updateRating(seriesId: number, userRating: number) { - return this.httpClient.post(this.baseUrl + 'series/update-rating', {seriesId, userRating}); - } - updateSeries(model: any) { return this.httpClient.post(this.baseUrl + 'series/update', model); } @@ -98,7 +93,7 @@ export class SeriesService { return this.httpClient.post(this.baseUrl + 'reader/mark-unread', {seriesId}); } - getRecentlyAdded(pageNum?: number, itemsPerPage?: number, filter?: SeriesFilterV2) { + getRecentlyAdded(pageNum?: number, itemsPerPage?: number, filter?: FilterV2) { let params = new HttpParams(); params = this.utilityService.addPaginationIfExists(params, pageNum, itemsPerPage); @@ -114,7 +109,7 @@ export class SeriesService { return this.httpClient.post(this.baseUrl + 'series/recently-updated-series', {}); } - getWantToRead(pageNum?: number, itemsPerPage?: number, filter?: SeriesFilterV2): Observable> { + getWantToRead(pageNum?: number, itemsPerPage?: number, filter?: FilterV2): Observable> { let params = new HttpParams(); params = this.utilityService.addPaginationIfExists(params, pageNum, itemsPerPage); const data = filter || {}; @@ -132,7 +127,7 @@ export class SeriesService { })); } - getOnDeck(libraryId: number = 0, pageNum?: number, itemsPerPage?: number, filter?: SeriesFilterV2) { + getOnDeck(libraryId: number = 0, pageNum?: number, itemsPerPage?: number, filter?: FilterV2) { let params = new HttpParams(); params = this.utilityService.addPaginationIfExists(params, pageNum, itemsPerPage); const data = filter || {}; @@ -201,27 +196,9 @@ export class SeriesService { return this.httpClient.get(this.baseUrl + 'series/series-detail?seriesId=' + seriesId); } - - - deleteReview(seriesId: number) { - return this.httpClient.delete(this.baseUrl + 'review?seriesId=' + seriesId); - } - updateReview(seriesId: number, body: string) { - return this.httpClient.post(this.baseUrl + 'review', { - seriesId, body - }); - } - - getReviews(seriesId: number) { - return this.httpClient.get>(this.baseUrl + 'review?seriesId=' + seriesId); - } - getRatings(seriesId: number) { return this.httpClient.get>(this.baseUrl + 'rating?seriesId=' + seriesId); } - getOverallRating(seriesId: number) { - return this.httpClient.get(this.baseUrl + 'rating/overall?seriesId=' + seriesId); - } removeFromOnDeck(seriesId: number) { return this.httpClient.post(this.baseUrl + 'series/remove-from-on-deck?seriesId=' + seriesId, {}); @@ -235,4 +212,15 @@ export class SeriesService { return this.httpClient.get(this.baseUrl + 'series/next-expected?seriesId=' + seriesId); } + matchSeries(model: any) { + return this.httpClient.post>(this.baseUrl + 'series/match', model); + } + + updateMatch(seriesId: number, series: ExternalSeriesDetail) { + return this.httpClient.post(this.baseUrl + `series/update-match?seriesId=${seriesId}&aniListId=${series.aniListId || 0}&malId=${series.malId || 0}&cbrId=${series.cbrId || 0}`, {}, TextResonse); + } + + updateDontMatch(seriesId: number, dontMatch: boolean) { + return this.httpClient.post(this.baseUrl + `series/dont-match?seriesId=${seriesId}&dontMatch=${dontMatch}`, {}, TextResonse); + } } diff --git a/UI/Web/src/app/_services/server.service.ts b/UI/Web/src/app/_services/server.service.ts index 6e635c472..4a71e836e 100644 --- a/UI/Web/src/app/_services/server.service.ts +++ b/UI/Web/src/app/_services/server.service.ts @@ -41,10 +41,6 @@ export class ServerService { return this.http.post(this.baseUrl + 'server/backup-db', {}); } - analyzeFiles() { - return this.http.post(this.baseUrl + 'server/analyze-files', {}); - } - syncThemes() { return this.http.post(this.baseUrl + 'server/sync-themes', {}); } @@ -53,17 +49,13 @@ export class ServerService { return this.http.get(this.baseUrl + 'server/check-update'); } - checkHowOutOfDate() { - return this.http.get(this.baseUrl + 'server/checkHowOutOfDate', TextResonse) + checkHowOutOfDate(stableOnly: boolean = true) { + return this.http.get(this.baseUrl + `server/check-out-of-date?stableOnly=${stableOnly}`, TextResonse) .pipe(map(r => parseInt(r, 10))); } - checkForUpdates() { - return this.http.get(this.baseUrl + 'server/check-for-updates', {}); - } - - getChangelog() { - return this.http.get(this.baseUrl + 'server/changelog', {}); + getChangelog(count: number = 0) { + return this.http.get(this.baseUrl + 'server/changelog?count=' + count, {}); } getRecurringJobs() { diff --git a/UI/Web/src/app/_services/statistics.service.ts b/UI/Web/src/app/_services/statistics.service.ts index 1a0984f2b..cf80765f2 100644 --- a/UI/Web/src/app/_services/statistics.service.ts +++ b/UI/Web/src/app/_services/statistics.service.ts @@ -1,20 +1,19 @@ -import { HttpClient } from '@angular/common/http'; +import {HttpClient, HttpParams} from '@angular/common/http'; import {Inject, inject, Injectable} from '@angular/core'; -import { environment } from 'src/environments/environment'; -import { UserReadStatistics } from '../statistics/_models/user-read-statistics'; -import { PublicationStatusPipe } from '../_pipes/publication-status.pipe'; -import {asyncScheduler, finalize, map, tap} from 'rxjs'; -import { MangaFormatPipe } from '../_pipes/manga-format.pipe'; -import { FileExtensionBreakdown } from '../statistics/_models/file-breakdown'; -import { TopUserRead } from '../statistics/_models/top-reads'; -import { ReadHistoryEvent } from '../statistics/_models/read-history-event'; -import { ServerStatistics } from '../statistics/_models/server-statistics'; -import { StatCount } from '../statistics/_models/stat-count'; -import { PublicationStatus } from '../_models/metadata/publication-status'; -import { MangaFormat } from '../_models/manga-format'; -import { TextResonse } from '../_types/text-response'; +import {environment} from 'src/environments/environment'; +import {UserReadStatistics} from '../statistics/_models/user-read-statistics'; +import {PublicationStatusPipe} from '../_pipes/publication-status.pipe'; +import {asyncScheduler, map} from 'rxjs'; +import {MangaFormatPipe} from '../_pipes/manga-format.pipe'; +import {FileExtensionBreakdown} from '../statistics/_models/file-breakdown'; +import {TopUserRead} from '../statistics/_models/top-reads'; +import {ReadHistoryEvent} from '../statistics/_models/read-history-event'; +import {ServerStatistics} from '../statistics/_models/server-statistics'; +import {StatCount} from '../statistics/_models/stat-count'; +import {PublicationStatus} from '../_models/metadata/publication-status'; +import {MangaFormat} from '../_models/manga-format'; +import {TextResonse} from '../_types/text-response'; import {TranslocoService} from "@jsverse/transloco"; -import {KavitaPlusMetadataBreakdown} from "../statistics/_models/kavitaplus-metadata-breakdown"; import {throttleTime} from "rxjs/operators"; import {DEBOUNCE_TIME} from "../shared/_services/download.service"; import {download} from "../shared/_models/download"; @@ -44,11 +43,14 @@ export class StatisticsService { constructor(private httpClient: HttpClient, @Inject(SAVER) private save: Saver) { } getUserStatistics(userId: number, libraryIds: Array = []) { - // TODO: Convert to httpParams object - let url = 'stats/user/' + userId + '/read'; - if (libraryIds.length > 0) url += '?libraryIds=' + libraryIds.join(','); + const url = `${this.baseUrl}stats/user/${userId}/read`; - return this.httpClient.get(this.baseUrl + url); + let params = new HttpParams(); + if (libraryIds.length > 0) { + params = params.set('libraryIds', libraryIds.join(',')); + } + + return this.httpClient.get(url, { params }); } getServerStatistics() { @@ -59,7 +61,7 @@ export class StatisticsService { return this.httpClient.get[]>(this.baseUrl + 'stats/server/count/year').pipe( map(spreads => spreads.map(spread => { return {name: spread.value + '', value: spread.count}; - }))); + }))); } getTopYears() { @@ -134,8 +136,4 @@ export class StatisticsService { getDayBreakdown( userId = 0) { return this.httpClient.get>>(this.baseUrl + 'stats/day-breakdown?userId=' + userId); } - - getKavitaPlusMetadataBreakdown() { - return this.httpClient.get(this.baseUrl + 'stats/kavitaplus-metadata-breakdown'); - } } diff --git a/UI/Web/src/app/_services/theme.service.ts b/UI/Web/src/app/_services/theme.service.ts index 95293baea..3e186f8ac 100644 --- a/UI/Web/src/app/_services/theme.service.ts +++ b/UI/Web/src/app/_services/theme.service.ts @@ -44,6 +44,9 @@ export class ThemeService { private themesSource = new ReplaySubject(1); public themes$ = this.themesSource.asObservable(); + + private darkModeSource = new ReplaySubject(1); + public isDarkMode$ = this.darkModeSource.asObservable(); /** * Maintain a cache of themes. SignalR will inform us if we need to refresh cache @@ -237,9 +240,11 @@ export class ThemeService { } this.currentThemeSource.next(theme); + this.darkModeSource.next(this.isDarkTheme()); }); } else { this.currentThemeSource.next(theme); + this.darkModeSource.next(this.isDarkTheme()); } } else { // Only time themes isn't already loaded is on first load diff --git a/UI/Web/src/app/_services/toggle.service.ts b/UI/Web/src/app/_services/toggle.service.ts index 8b335394a..0ad9813e3 100644 --- a/UI/Web/src/app/_services/toggle.service.ts +++ b/UI/Web/src/app/_services/toggle.service.ts @@ -1,6 +1,6 @@ -import { Injectable } from '@angular/core'; -import { NavigationStart, Router } from '@angular/router'; -import { filter, ReplaySubject, take } from 'rxjs'; +import {Injectable} from '@angular/core'; +import {NavigationStart, Router} from '@angular/router'; +import {filter, ReplaySubject, take} from 'rxjs'; @Injectable({ providedIn: 'root' @@ -29,7 +29,7 @@ export class ToggleService { this.toggleState = !state; this.toggleStateSource.next(this.toggleState); }); - + } set(state: boolean) { diff --git a/UI/Web/src/app/_services/version.service.ts b/UI/Web/src/app/_services/version.service.ts new file mode 100644 index 000000000..ed9d8bac6 --- /dev/null +++ b/UI/Web/src/app/_services/version.service.ts @@ -0,0 +1,250 @@ +import {inject, Injectable, OnDestroy} from '@angular/core'; +import {interval, Subscription, switchMap} from 'rxjs'; +import {ServerService} from "./server.service"; +import {AccountService} from "./account.service"; +import {filter, take} from "rxjs/operators"; +import {NgbModal} from "@ng-bootstrap/ng-bootstrap"; +import {NewUpdateModalComponent} from "../announcements/_components/new-update-modal/new-update-modal.component"; +import {OutOfDateModalComponent} from "../announcements/_components/out-of-date-modal/out-of-date-modal.component"; +import {Router} from "@angular/router"; + +@Injectable({ + providedIn: 'root' +}) +export class VersionService implements OnDestroy{ + + private readonly serverService = inject(ServerService); + private readonly accountService = inject(AccountService); + private readonly modalService = inject(NgbModal); + private readonly router = inject(Router); + + public static readonly SERVER_VERSION_KEY = 'kavita--version'; + public static readonly CLIENT_REFRESH_KEY = 'kavita--client-refresh-last-shown'; + public static readonly NEW_UPDATE_KEY = 'kavita--new-update-last-shown'; + public static readonly OUT_OF_BAND_KEY = 'kavita--out-of-band-last-shown'; + + // Notification intervals + private readonly CLIENT_REFRESH_INTERVAL = 0; // Show immediately (once) + private readonly NEW_UPDATE_INTERVAL = 7 * 24 * 60 * 60 * 1000; // 1 week in milliseconds + private readonly OUT_OF_BAND_INTERVAL = 30 * 24 * 60 * 60 * 1000; // 1 month in milliseconds + + // Check intervals + private readonly VERSION_CHECK_INTERVAL = 30 * 60 * 1000; // 30 minutes + private readonly OUT_OF_DATE_CHECK_INTERVAL = 2 * 60 * 60 * 1000; // 2 hours + private readonly OUT_Of_BAND_AMOUNT = 3; // How many releases before we show "You're X releases out of date" + + // Routes where version update modals should not be shown + private readonly EXCLUDED_ROUTES = [ + '/manga/', + '/book/', + '/pdf/', + '/reader/' + ]; + + + private versionCheckSubscription?: Subscription; + private outOfDateCheckSubscription?: Subscription; + private modalOpen = false; + + constructor() { + this.startInitialVersionCheck(); + this.startVersionCheck(); + this.startOutOfDateCheck(); + } + + ngOnDestroy() { + this.versionCheckSubscription?.unsubscribe(); + this.outOfDateCheckSubscription?.unsubscribe(); + } + + /** + * Initial version check to ensure localStorage is populated on first load + */ + private startInitialVersionCheck(): void { + this.accountService.currentUser$ + .pipe( + filter(user => !!user), + take(1), + switchMap(user => this.serverService.getVersion(user!.apiKey)) + ) + .subscribe(serverVersion => { + const cachedVersion = localStorage.getItem(VersionService.SERVER_VERSION_KEY); + + // Always update localStorage on first load + localStorage.setItem(VersionService.SERVER_VERSION_KEY, serverVersion); + + console.log('Initial version check - Server version:', serverVersion, 'Cached version:', cachedVersion); + }); + } + + /** + * Periodic check for server version to detect client refreshes and new updates + */ + private startVersionCheck(): void { + console.log('Starting version checker'); + this.versionCheckSubscription = interval(this.VERSION_CHECK_INTERVAL) + .pipe( + switchMap(() => this.accountService.currentUser$), + filter(user => !!user && !this.modalOpen), + switchMap(user => this.serverService.getVersion(user!.apiKey)), + filter(update => !!update), + ).subscribe(version => this.handleVersionUpdate(version)); + } + + /** + * Checks if the server is out of date compared to the latest release + */ + private startOutOfDateCheck() { + console.log('Starting out-of-date checker'); + this.outOfDateCheckSubscription = interval(this.OUT_OF_DATE_CHECK_INTERVAL) + .pipe( + switchMap(() => this.accountService.currentUser$), + filter(u => u !== undefined && this.accountService.hasAdminRole(u) && !this.modalOpen), + switchMap(_ => this.serverService.checkHowOutOfDate(true)), + filter(versionsOutOfDate => !isNaN(versionsOutOfDate) && versionsOutOfDate > this.OUT_Of_BAND_AMOUNT), + ) + .subscribe(versionsOutOfDate => this.handleOutOfDateNotification(versionsOutOfDate)); + } + + /** + * Checks if the current route is in the excluded routes list + */ + private isExcludedRoute(): boolean { + const currentUrl = this.router.url; + return this.EXCLUDED_ROUTES.some(route => currentUrl.includes(route)); + } + + /** + * Handles the version check response to determine if client refresh or new update notification is needed + */ + private handleVersionUpdate(serverVersion: string) { + if (this.modalOpen) return; + + // Validate if we are on a reader route and if so, suppress + if (this.isExcludedRoute()) { + console.log('Version update blocked due to user reading'); + return; + } + + const cachedVersion = localStorage.getItem(VersionService.SERVER_VERSION_KEY); + console.log('Server version:', serverVersion, 'Cached version:', cachedVersion); + + const isNewServerVersion = cachedVersion !== null && cachedVersion !== serverVersion; + + // Case 1: Client Refresh needed (server has updated since last client load) + if (isNewServerVersion) { + this.showClientRefreshNotification(serverVersion); + } + // Case 2: Check for new updates (for server admin) + else { + this.checkForNewUpdates(); + } + + // Always update the cached version + localStorage.setItem(VersionService.SERVER_VERSION_KEY, serverVersion); + } + + /** + * Shows a notification that client refresh is needed due to server update + */ + private showClientRefreshNotification(newVersion: string): void { + this.pauseChecks(); + + // Client refresh notifications should always show (once) + this.modalOpen = true; + + this.serverService.getChangelog(1).subscribe(changelog => { + const ref = this.modalService.open(NewUpdateModalComponent, { + size: 'lg', + keyboard: false, + backdrop: 'static' // Prevent closing by clicking outside + }); + + ref.componentInstance.version = newVersion; + ref.componentInstance.update = changelog[0]; + ref.componentInstance.requiresRefresh = true; + + // Update the last shown timestamp + localStorage.setItem(VersionService.CLIENT_REFRESH_KEY, Date.now().toString()); + + ref.closed.subscribe(_ => this.onModalClosed()); + ref.dismissed.subscribe(_ => this.onModalClosed()); + }); + } + + /** + * Checks for new server updates and shows notification if appropriate + */ + private checkForNewUpdates(): void { + this.accountService.currentUser$ + .pipe( + take(1), + filter(user => user !== undefined && this.accountService.hasAdminRole(user)), + switchMap(_ => this.serverService.checkHowOutOfDate()), + filter(versionsOutOfDate => !isNaN(versionsOutOfDate) && versionsOutOfDate > 0 && versionsOutOfDate <= this.OUT_Of_BAND_AMOUNT) + ) + .subscribe(versionsOutOfDate => { + const lastShown = Number(localStorage.getItem(VersionService.NEW_UPDATE_KEY) || '0'); + const currentTime = Date.now(); + + // Show notification if it hasn't been shown in the last week + if (currentTime - lastShown >= this.NEW_UPDATE_INTERVAL) { + this.pauseChecks(); + this.modalOpen = true; + + this.serverService.getChangelog(1).subscribe(changelog => { + const ref = this.modalService.open(NewUpdateModalComponent, { size: 'lg' }); + ref.componentInstance.versionsOutOfDate = versionsOutOfDate; + ref.componentInstance.update = changelog[0]; + ref.componentInstance.requiresRefresh = false; + + // Update the last shown timestamp + localStorage.setItem(VersionService.NEW_UPDATE_KEY, currentTime.toString()); + + ref.closed.subscribe(_ => this.onModalClosed()); + ref.dismissed.subscribe(_ => this.onModalClosed()); + }); + } + }); + } + + /** + * Handles the notification for servers that are significantly out of date + */ + private handleOutOfDateNotification(versionsOutOfDate: number): void { + const lastShown = Number(localStorage.getItem(VersionService.OUT_OF_BAND_KEY) || '0'); + const currentTime = Date.now(); + + // Show notification if it hasn't been shown in the last month + if (currentTime - lastShown >= this.OUT_OF_BAND_INTERVAL) { + this.pauseChecks(); + this.modalOpen = true; + + const ref = this.modalService.open(OutOfDateModalComponent, { size: 'xl', fullscreen: 'md' }); + ref.componentInstance.versionsOutOfDate = versionsOutOfDate; + + // Update the last shown timestamp + localStorage.setItem(VersionService.OUT_OF_BAND_KEY, currentTime.toString()); + + ref.closed.subscribe(_ => this.onModalClosed()); + ref.dismissed.subscribe(_ => this.onModalClosed()); + } + } + + /** + * Pauses all version checks while modals are open + */ + private pauseChecks(): void { + this.versionCheckSubscription?.unsubscribe(); + this.outOfDateCheckSubscription?.unsubscribe(); + } + + /** + * Resumes all checks when modals are closed + */ + private onModalClosed(): void { + this.modalOpen = false; + this.startVersionCheck(); + this.startOutOfDateCheck(); + } +} diff --git a/UI/Web/src/app/_services/volume.service.ts b/UI/Web/src/app/_services/volume.service.ts index 16857b3d2..8c9f9e17e 100644 --- a/UI/Web/src/app/_services/volume.service.ts +++ b/UI/Web/src/app/_services/volume.service.ts @@ -21,7 +21,12 @@ export class VolumeService { return this.httpClient.delete(this.baseUrl + 'volume?volumeId=' + volumeId); } + deleteMultipleVolumes(volumeIds: number[]) { + return this.httpClient.post(this.baseUrl + "volume/multiple", volumeIds) + } + updateVolume(volume: any) { return this.httpClient.post(this.baseUrl + 'volume/update', volume, TextResonse); } + } diff --git a/UI/Web/src/app/_single-module/actionable-modal/actionable-modal.component.html b/UI/Web/src/app/_single-module/actionable-modal/actionable-modal.component.html index 067dc5fb2..7573c554a 100644 --- a/UI/Web/src/app/_single-module/actionable-modal/actionable-modal.component.html +++ b/UI/Web/src/app/_single-module/actionable-modal/actionable-modal.component.html @@ -1,7 +1,9 @@
-

{{t('title')}}

+

+ {{t('title')}} +

@@ -12,10 +14,8 @@ }
- - @for (action of currentItems; track action.title) { - @if (willRenderAction(action)) { + @if (willRenderAction(action, user!)) { - } @else { -
- -
- + } @else { +
+ +
+ +
-
- - @for(action of list; track action.title) { - - @if (action.children === undefined || action?.children?.length === 0 || action.dynamicList !== undefined) { - @if (action.dynamicList !== undefined && (action.dynamicList | async | dynamicList); as dList) { - @for(dynamicItem of dList; track dynamicItem.title) { - - } - } @else if (willRenderAction(action)) { - - } - } @else { - @if (shouldRenderSubMenu(action, action.children?.[0].dynamicList | async)) { - -
- @if (willRenderAction(action)) { - + + @for(action of list; track action.title) { + + @if (action.children === undefined || action?.children?.length === 0 || action.dynamicList !== undefined) { + @if (action.dynamicList !== undefined && (action.dynamicList | async | dynamicList); as dList) { + @for(dynamicItem of dList; track dynamicItem.title) { + } -
- + } @else if (willRenderAction(action, this.currentUser!)) { + + } + } @else { + @if (shouldRenderSubMenu(action, action.children?.[0].dynamicList | async) && hasRenderableChildren(action, this.currentUser!)) { + +
+ + + @if (willRenderAction(action, this.currentUser!)) { + + } + +
+ +
-
+ } } } - } - + + } } - } - + diff --git a/UI/Web/src/app/_single-module/card-actionables/card-actionables.component.scss b/UI/Web/src/app/_single-module/card-actionables/card-actionables.component.scss index 6f1d105e0..19a986986 100644 --- a/UI/Web/src/app/_single-module/card-actionables/card-actionables.component.scss +++ b/UI/Web/src/app/_single-module/card-actionables/card-actionables.component.scss @@ -2,6 +2,22 @@ content: none !important; } +.submenu-wrapper { + position: relative; + + &::after { + content: ''; + position: absolute; + top: 0; + right: -10px; + width: 10px; + height: 100%; + background: transparent; + cursor: pointer; + pointer-events: auto; + } +} + .submenu-toggle { display: block; width: 100%; @@ -30,9 +46,3 @@ .btn { padding: 5px; } - -// Robbie added this but it broke most of the uses -//.dropdown-toggle { -// padding-top: 0; -// padding-bottom: 0; -//} diff --git a/UI/Web/src/app/_single-module/card-actionables/card-actionables.component.ts b/UI/Web/src/app/_single-module/card-actionables/card-actionables.component.ts index 998aeeb73..3e3522d5f 100644 --- a/UI/Web/src/app/_single-module/card-actionables/card-actionables.component.ts +++ b/UI/Web/src/app/_single-module/card-actionables/card-actionables.component.ts @@ -1,32 +1,39 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, - Component, DestroyRef, + Component, + DestroyRef, EventEmitter, inject, Input, + OnChanges, + OnDestroy, OnInit, Output } from '@angular/core'; import {NgbDropdown, NgbDropdownItem, NgbDropdownMenu, NgbDropdownToggle, NgbModal} from '@ng-bootstrap/ng-bootstrap'; -import { AccountService } from 'src/app/_services/account.service'; -import { Action, ActionItem } from 'src/app/_services/action-factory.service'; +import {AccountService} from 'src/app/_services/account.service'; +import {ActionableEntity, ActionItem} from 'src/app/_services/action-factory.service'; import {AsyncPipe, NgTemplateOutlet} from "@angular/common"; import {TranslocoDirective} from "@jsverse/transloco"; import {DynamicListPipe} from "./_pipes/dynamic-list.pipe"; import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; import {Breakpoint, UtilityService} from "../../shared/_services/utility.service"; import {ActionableModalComponent} from "../actionable-modal/actionable-modal.component"; +import {User} from "../../_models/user"; + @Component({ selector: 'app-card-actionables', - standalone: true, - imports: [NgbDropdown, NgbDropdownToggle, NgbDropdownMenu, NgbDropdownItem, DynamicListPipe, TranslocoDirective, AsyncPipe, NgTemplateOutlet], + imports: [ + NgbDropdown, NgbDropdownToggle, NgbDropdownMenu, NgbDropdownItem, + DynamicListPipe, TranslocoDirective, AsyncPipe, NgTemplateOutlet + ], templateUrl: './card-actionables.component.html', styleUrls: ['./card-actionables.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) -export class CardActionablesComponent implements OnInit { +export class CardActionablesComponent implements OnInit, OnChanges, OnDestroy { private readonly cdRef = inject(ChangeDetectorRef); private readonly accountService = inject(AccountService); @@ -38,58 +45,69 @@ export class CardActionablesComponent implements OnInit { @Input() iconClass = 'fa-ellipsis-v'; @Input() btnClass = ''; - @Input() actions: ActionItem[] = []; + @Input() inputActions: ActionItem[] = []; @Input() labelBy = 'card'; /** * Text to display as if actionable was a button */ @Input() label = ''; @Input() disabled: boolean = false; + + @Input() entity: ActionableEntity = null; + /** + * This will only emit when the action is clicked and the entity is null. Otherwise, the entity callback handler will be invoked. + */ @Output() actionHandler = new EventEmitter>(); - isAdmin: boolean = false; - canDownload: boolean = false; - canPromote: boolean = false; + actions: ActionItem[] = []; + currentUser: User | undefined = undefined; submenu: {[key: string]: NgbDropdown} = {}; + private closeTimeout: any = null; ngOnInit(): void { this.accountService.currentUser$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((user) => { if (!user) return; - this.isAdmin = this.accountService.hasAdminRole(user); - this.canDownload = this.accountService.hasDownloadRole(user); - this.canPromote = this.accountService.hasPromoteRole(user); - - // We want to avoid an empty menu when user doesn't have access to anything - if (!this.isAdmin && this.actions.filter(a => !a.requiresAdmin).length === 0) { - this.actions = []; - } - + this.currentUser = user; + this.actions = this.inputActions.filter(a => this.willRenderAction(a, user!)); this.cdRef.markForCheck(); }); } + ngOnChanges() { + this.actions = this.inputActions.filter(a => this.willRenderAction(a, this.currentUser!)); + this.cdRef.markForCheck(); + } + + ngOnDestroy() { + this.cancelCloseSubmenus(); + } + preventEvent(event: any) { event.stopPropagation(); event.preventDefault(); } - performAction(event: any, action: ActionItem) { + performAction(event: any, action: ActionItem) { this.preventEvent(event); if (typeof action.callback === 'function') { - this.actionHandler.emit(action); + if (this.entity === null) { + this.actionHandler.emit(action); + } else { + action.callback(action, this.entity); + } } } - willRenderAction(action: ActionItem) { - return (action.requiresAdmin && this.isAdmin) - || (action.action === Action.Download && (this.canDownload || this.isAdmin)) - || (!action.requiresAdmin && action.action !== Action.Download) - || (action.action === Action.Promote && (this.canPromote || this.isAdmin)) - || (action.action === Action.UnPromote && (this.canPromote || this.isAdmin)) - ; + /** + * The user has required roles (or no roles defined) and action shouldRender returns true + * @param action + * @param user + */ + willRenderAction(action: ActionItem, user: User) { + return (!action.requiredRoles?.length || this.accountService.hasAnyRole(user, action.requiredRoles)) && action.shouldRender(action, this.entity, user); } shouldRenderSubMenu(action: ActionItem, dynamicList: null | Array) { @@ -110,13 +128,41 @@ export class CardActionablesComponent implements OnInit { } closeAllSubmenus() { - Object.keys(this.submenu).forEach(key => { - this.submenu[key].close(); + // Clear any existing timeout to avoid race conditions + if (this.closeTimeout) { + clearTimeout(this.closeTimeout); + } + + // Set a new timeout to close submenus after a short delay + this.closeTimeout = setTimeout(() => { + Object.keys(this.submenu).forEach(key => { + this.submenu[key].close(); delete this.submenu[key]; - }); + }); + }, 100); // Small delay to prevent premature closing (dropdown tunneling) } - performDynamicClick(event: any, action: ActionItem, dynamicItem: any) { + cancelCloseSubmenus() { + if (this.closeTimeout) { + clearTimeout(this.closeTimeout); + this.closeTimeout = null; + } + } + + hasRenderableChildren(action: ActionItem, user: User): boolean { + if (!action.children || action.children.length === 0) return false; + + for (const child of action.children) { + const dynamicList = child.dynamicList; + if (dynamicList !== undefined) return true; // Dynamic list gets rendered if loaded + + if (this.willRenderAction(child, user)) return true; + if (child.children?.length && this.hasRenderableChildren(child, user)) return true; + } + return false; + } + + performDynamicClick(event: any, action: ActionItem, dynamicItem: any) { action._extra = dynamicItem; this.performAction(event, action); } @@ -125,6 +171,7 @@ export class CardActionablesComponent implements OnInit { this.preventEvent(event); const ref = this.modalService.open(ActionableModalComponent, {fullscreen: true, centered: true}); + ref.componentInstance.entity = this.entity; ref.componentInstance.actions = this.actions; ref.componentInstance.willRenderAction = this.willRenderAction.bind(this); ref.componentInstance.shouldRenderSubMenu = this.shouldRenderSubMenu.bind(this); diff --git a/UI/Web/src/app/_single-module/cover-image/cover-image.component.ts b/UI/Web/src/app/_single-module/cover-image/cover-image.component.ts index 233884223..fa8996428 100644 --- a/UI/Web/src/app/_single-module/cover-image/cover-image.component.ts +++ b/UI/Web/src/app/_single-module/cover-image/cover-image.component.ts @@ -9,19 +9,17 @@ import {IHasProgress} from "../../_models/common/i-has-progress"; * Used for the Series/Volume/Chapter Detail pages */ @Component({ - selector: 'app-cover-image', - standalone: true, - imports: [ - NgClass, - TranslocoDirective, - ImageComponent, - NgbProgressbar, - DecimalPipe, - NgbTooltip - ], - templateUrl: './cover-image.component.html', - styleUrl: './cover-image.component.scss', - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'app-cover-image', + imports: [ + TranslocoDirective, + ImageComponent, + NgbProgressbar, + DecimalPipe, + NgbTooltip + ], + templateUrl: './cover-image.component.html', + styleUrl: './cover-image.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush }) export class CoverImageComponent { diff --git a/UI/Web/src/app/_single-module/details-tab/details-tab.component.html b/UI/Web/src/app/_single-module/details-tab/details-tab.component.html index 0aa808939..1087f3d3b 100644 --- a/UI/Web/src/app/_single-module/details-tab/details-tab.component.html +++ b/UI/Web/src/app/_single-module/details-tab/details-tab.component.html @@ -28,42 +28,57 @@
} -
-

{{t('format-title')}}

-
- {{format | mangaFormat }} + @if (ageRating) { +
+

{{t('age-rating-title')}}

+
+ +
-
+ } - - - -
-

{{t('genres-title')}}

-
- - - {{item.title}} - - + @if (format) { +
+

{{t('format-title')}}

+
+ {{format | mangaFormat }} +
-
+ } -
-

{{t('tags-title')}}

-
- - - {{item.title}} - - + + @if (!suppressEmptyGenres || genres.length > 0) { + + +
+

{{t('genres-title')}}

+
+ + + {{item.title}} + + +
-
+ } + + @if (!suppressEmptyTags || tags.length > 0) { +
+

{{t('tags-title')}}

+
+ + + {{item.title}} + + +
+
+ }
- + diff --git a/UI/Web/src/app/_single-module/details-tab/details-tab.component.ts b/UI/Web/src/app/_single-module/details-tab/details-tab.component.ts index 48697b89c..096826964 100644 --- a/UI/Web/src/app/_single-module/details-tab/details-tab.component.ts +++ b/UI/Web/src/app/_single-module/details-tab/details-tab.component.ts @@ -9,37 +9,35 @@ import {FilterComparison} from "../../_models/metadata/v2/filter-comparison"; import {FilterUtilitiesService} from "../../shared/_services/filter-utilities.service"; import {Genre} from "../../_models/metadata/genre"; import {Tag} from "../../_models/tag"; -import {TagBadgeComponent} from "../../shared/tag-badge/tag-badge.component"; import {ImageComponent} from "../../shared/image/image.component"; -import {SafeHtmlPipe} from "../../_pipes/safe-html.pipe"; import {ImageService} from "../../_services/image.service"; import {BadgeExpanderComponent} from "../../shared/badge-expander/badge-expander.component"; import {IHasReadingTime} from "../../_models/common/i-has-reading-time"; import {ReadTimePipe} from "../../_pipes/read-time.pipe"; -import {SentenceCasePipe} from "../../_pipes/sentence-case.pipe"; import {MangaFormat} from "../../_models/manga-format"; import {SeriesFormatComponent} from "../../shared/series-format/series-format.component"; import {MangaFormatPipe} from "../../_pipes/manga-format.pipe"; import {LanguageNamePipe} from "../../_pipes/language-name.pipe"; import {AsyncPipe} from "@angular/common"; +import {SafeUrlPipe} from "../../_pipes/safe-url.pipe"; +import {AgeRating} from "../../_models/metadata/age-rating"; +import {AgeRatingImageComponent} from "../age-rating-image/age-rating-image.component"; @Component({ selector: 'app-details-tab', - standalone: true, imports: [ CarouselReelComponent, PersonBadgeComponent, TranslocoDirective, - TagBadgeComponent, ImageComponent, - SafeHtmlPipe, BadgeExpanderComponent, ReadTimePipe, - SentenceCasePipe, SeriesFormatComponent, MangaFormatPipe, LanguageNamePipe, - AsyncPipe + AsyncPipe, + SafeUrlPipe, + AgeRatingImageComponent ], templateUrl: './details-tab.component.html', styleUrl: './details-tab.component.scss', @@ -52,21 +50,23 @@ export class DetailsTabComponent { protected readonly PersonRole = PersonRole; protected readonly FilterField = FilterField; + protected readonly MangaFormat = MangaFormat; @Input({required: true}) metadata!: IHasCast; @Input() readingTime: IHasReadingTime | undefined; + @Input() ageRating: AgeRating | undefined; @Input() language: string | undefined; - @Input() format: MangaFormat = MangaFormat.UNKNOWN; + @Input() format: MangaFormat | undefined; @Input() releaseYear: number | undefined; @Input() genres: Array = []; @Input() tags: Array = []; @Input() webLinks: Array = []; + @Input() suppressEmptyGenres: boolean = false; + @Input() suppressEmptyTags: boolean = false; openGeneric(queryParamName: FilterField, filter: string | number) { if (queryParamName === FilterField.None) return; this.filterUtilityService.applyFilter(['all-series'], queryParamName, FilterComparison.Equal, `${filter}`).subscribe(); } - - protected readonly MangaFormat = MangaFormat; } diff --git a/UI/Web/src/app/_single-module/edit-chapter-modal/edit-chapter-modal.component.html b/UI/Web/src/app/_single-module/edit-chapter-modal/edit-chapter-modal.component.html index b9fa21953..979794d20 100644 --- a/UI/Web/src/app/_single-module/edit-chapter-modal/edit-chapter-modal.component.html +++ b/UI/Web/src/app/_single-module/edit-chapter-modal/edit-chapter-modal.component.html @@ -7,7 +7,9 @@
-
    +
      @if (user && accountService.hasAdminRole(user)) @@ -15,7 +17,7 @@
    • {{t(TabID.General)}} -
      +
      @@ -23,7 +25,7 @@
      + [class.is-invalid]="formControl.invalid && !formControl.untouched"> @if (formControl.errors; as errors) {
      @if (errors.required) { @@ -44,7 +46,7 @@
      + [class.is-invalid]="formControl.invalid && !formControl.untouched"> @if (formControl.errors; as errors) {
      @if (errors.required) { @@ -59,7 +61,7 @@
      -
      +
      @@ -67,7 +69,7 @@
      + [class.is-invalid]="formControl.invalid && !formControl.untouched"> @if (formControl.errors; as errors) {
      @if (errors.required) { @@ -99,23 +101,25 @@
      -
      +
      - - - - - {{item.title}} - - - {{item.title}} ({{item.isoCode}}) - - - - + @if (languageSettings) { + + + + + {{item.title}} + + + {{item.title}} ({{item.isoCode}}) + + + + + }
      @@ -137,7 +141,7 @@
      -
      +
      @@ -163,146 +167,161 @@ {{t(TabID.Tags)}} -
      +
      - - - - - {{item.title}} - - - {{item.title}} - - - - + @if (genreSettings) { + + + + + {{item.title}} + + + {{item.title}} + + + + + }
      - - - - - {{item.name}} - - - {{item.name}} - - - - + @if (tagsSettings) { + + + + + {{item.title}} + + + {{item.title}} + + + + + }
      -
      +
      - - - - - {{item.name}} - - - {{item.name}} - - - - + @if (getPersonsSettings(PersonRole.Imprint); as settings) { + + + + + {{item.name}} + + + {{item.name}} + + + + + }
      - - - - - {{item.name}} - - - {{item.name}} - - - - + @if (getPersonsSettings(PersonRole.Publisher); as settings) { + + + + + {{item.name}} + + + {{item.name}} + + + + + }
      -
      +
      - - - - - {{item.name}} - - - {{item.name}} - - - - + @if (getPersonsSettings(PersonRole.Team); as settings) { + + + + + {{item.name}} + + + {{item.name}} + + + + + }
      - - - - - {{item.name}} - - - {{item.name}} - - - - + @if (getPersonsSettings(PersonRole.Location); as settings) { + + + + + {{item.name}} + + + {{item.name}} + + + + + }
      -
      +
      - - - - - {{item.name}} - - - {{item.name}} - - - - + @if (getPersonsSettings(PersonRole.Character); as settings) { + + + + + {{item.name}} + + + {{item.name}} + + + + + }
      @@ -319,146 +338,160 @@ {{t(TabID.People)}} -
      +
      - - - - - {{item.name}} - - - {{item.name}} - - - - + @if (getPersonsSettings(PersonRole.Writer); as settings) { + + + + + {{item.name}} + + + {{item.name}} + + + + + }
      - - - - - {{item.name}} - - - {{item.name}} - - - - + @if (getPersonsSettings(PersonRole.CoverArtist); as settings) { + + + + + {{item.name}} + + + {{item.name}} + + + + + }
      -
      +
      - - - - - {{item.name}} - - - {{item.name}} - - - - + @if(getPersonsSettings(PersonRole.Penciller); as settings) { + + + + + {{item.name}} + + + {{item.name}} + + + + + }
      - - - - - {{item.name}} - - - {{item.name}} - - - - + @if(getPersonsSettings(PersonRole.Colorist); as settings) { + + + + + {{item.name}} + + + {{item.name}} + + + + + }
      -
      +
      - - - - - {{item.name}} - - - {{item.name}} - - - - + @if(getPersonsSettings(PersonRole.Inker); as settings) { + + + + + {{item.name}} + + + {{item.name}} + + + + + }
      - - - - - {{item.name}} - - - {{item.name}} - - - - + @if(getPersonsSettings(PersonRole.Letterer); as settings) { + + + + + {{item.name}} + + + {{item.name}} + + + + + }
      -
      +
      - - - - - {{item.name}} - - - {{item.name}} - - - - + @if(getPersonsSettings(PersonRole.Translator); as settings) { + + + + + {{item.name}} + + + {{item.name}} + + + + + }
      @@ -487,7 +520,7 @@
    • {{t(TabID.Info)}} -
      +
      @@ -508,7 +541,7 @@
      -
      +
      @@ -530,12 +563,12 @@
      -
      +
      - {{chapter.createdUtc | utcToLocalTime | translocoDate: {dateStyle: 'short', timeStyle: 'short' } | defaultDate}} + {{chapter.createdUtc | utcToLocalTime:'short' | defaultDate}}
      @@ -556,7 +589,7 @@
      -
      +
      {{t('links-label')}}
      @for(link of WebLinks; track link) { @@ -571,7 +604,7 @@ } @if (accountService.isAdmin$ | async) { -
      +
      @for (file of chapter.files; track file.id) { diff --git a/UI/Web/src/app/_single-module/edit-chapter-modal/edit-chapter-modal.component.ts b/UI/Web/src/app/_single-module/edit-chapter-modal/edit-chapter-modal.component.ts index 812ea6eb9..bda048341 100644 --- a/UI/Web/src/app/_single-module/edit-chapter-modal/edit-chapter-modal.component.ts +++ b/UI/Web/src/app/_single-module/edit-chapter-modal/edit-chapter-modal.component.ts @@ -1,23 +1,8 @@ import {ChangeDetectionStrategy, ChangeDetectorRef, Component, DestroyRef, inject, Input, OnInit} from '@angular/core'; import {Breakpoint, UtilityService} from "../../shared/_services/utility.service"; import {FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators} from "@angular/forms"; -import { - AsyncPipe, - DatePipe, - DecimalPipe, - NgClass, - NgTemplateOutlet, - TitleCasePipe -} from "@angular/common"; -import { - NgbActiveModal, - NgbInputDatepicker, - NgbNav, - NgbNavContent, - NgbNavItem, - NgbNavLink, - NgbNavOutlet -} from "@ng-bootstrap/ng-bootstrap"; +import {AsyncPipe, NgClass, NgTemplateOutlet, TitleCasePipe} from "@angular/common"; +import {NgbActiveModal, NgbNav, NgbNavContent, NgbNavItem, NgbNavLink, NgbNavOutlet} from "@ng-bootstrap/ng-bootstrap"; import {TranslocoDirective} from "@jsverse/transloco"; import {AccountService} from "../../_services/account.service"; import {Chapter} from "../../_models/chapter"; @@ -37,17 +22,15 @@ import {DownloadService} from "../../shared/_services/download.service"; import {SettingItemComponent} from "../../settings/_components/setting-item/setting-item.component"; import {TypeaheadComponent} from "../../typeahead/_components/typeahead.component"; import {forkJoin, Observable, of, tap} from "rxjs"; -import {map} from "rxjs/operators"; +import {map, switchMap} from "rxjs/operators"; import {EntityTitleComponent} from "../../cards/entity-title/entity-title.component"; import {SettingButtonComponent} from "../../settings/_components/setting-button/setting-button.component"; import {CoverImageChooserComponent} from "../../cards/cover-image-chooser/cover-image-chooser.component"; import {EditChapterProgressComponent} from "../../cards/edit-chapter-progress/edit-chapter-progress.component"; import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; import {CompactNumberPipe} from "../../_pipes/compact-number.pipe"; -import {IconAndTitleComponent} from "../../shared/icon-and-title/icon-and-title.component"; import {MangaFormat} from "../../_models/manga-format"; import {DefaultDatePipe} from "../../_pipes/default-date.pipe"; -import {TranslocoDatePipe} from "@jsverse/transloco-locale"; import {UtcToLocalTimePipe} from "../../_pipes/utc-to-local-time.pipe"; import {BytesPipe} from "../../_pipes/bytes.pipe"; import {ImageComponent} from "../../shared/image/image.component"; @@ -56,7 +39,6 @@ import {ReadTimePipe} from "../../_pipes/read-time.pipe"; import {ChapterService} from "../../_services/chapter.service"; import {AgeRating} from "../../_models/metadata/age-rating"; import {User} from "../../_models/user"; -import {SettingTitleComponent} from "../../settings/_components/setting-title/setting-title.component"; enum TabID { General = 'general-tab', @@ -79,44 +61,37 @@ export interface EditChapterModalCloseResult { const blackList = [Action.Edit, Action.IncognitoRead, Action.AddToReadingList]; @Component({ - selector: 'app-edit-chapter-modal', - standalone: true, - imports: [ - FormsModule, - NgbNav, - NgbNavContent, - NgbNavLink, - TranslocoDirective, - AsyncPipe, - NgbNavOutlet, - ReactiveFormsModule, - NgbNavItem, - SettingItemComponent, - NgTemplateOutlet, - NgClass, - TypeaheadComponent, - EntityTitleComponent, - TitleCasePipe, - SettingButtonComponent, - CoverImageChooserComponent, - EditChapterProgressComponent, - NgbInputDatepicker, - CompactNumberPipe, - IconAndTitleComponent, - DefaultDatePipe, - TranslocoDatePipe, - UtcToLocalTimePipe, - BytesPipe, - ImageComponent, - SafeHtmlPipe, - DecimalPipe, - DatePipe, - ReadTimePipe, - SettingTitleComponent - ], - templateUrl: './edit-chapter-modal.component.html', - styleUrl: './edit-chapter-modal.component.scss', - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'app-edit-chapter-modal', + imports: [ + FormsModule, + NgbNav, + NgbNavContent, + NgbNavLink, + TranslocoDirective, + AsyncPipe, + NgbNavOutlet, + ReactiveFormsModule, + NgbNavItem, + SettingItemComponent, + NgTemplateOutlet, + NgClass, + TypeaheadComponent, + EntityTitleComponent, + TitleCasePipe, + SettingButtonComponent, + CoverImageChooserComponent, + EditChapterProgressComponent, + CompactNumberPipe, + DefaultDatePipe, + UtcToLocalTimePipe, + BytesPipe, + ImageComponent, + SafeHtmlPipe, + ReadTimePipe, + ], + templateUrl: './edit-chapter-modal.component.html', + styleUrl: './edit-chapter-modal.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush }) export class EditChapterModalComponent implements OnInit { @@ -197,7 +172,12 @@ export class EditChapterModalComponent implements OnInit { this.editForm.addControl('language', new FormControl(this.chapter.language, [])); this.editForm.addControl('isbn', new FormControl(this.chapter.isbn, [])); this.editForm.addControl('ageRating', new FormControl(this.chapter.ageRating, [])); - this.editForm.addControl('releaseDate', new FormControl(this.chapter.releaseDate, [])); + + if (this.chapter.releaseDate !== '0001-01-01T00:00:00') { + this.editForm.addControl('releaseDate', new FormControl(this.chapter.releaseDate.substring(0, 10), [])); + } else { + this.editForm.addControl('releaseDate', new FormControl('', [])); + } this.editForm.addControl('genres', new FormControl(this.chapter.genres, [])); @@ -207,11 +187,13 @@ export class EditChapterModalComponent implements OnInit { this.editForm.addControl('coverImageIndex', new FormControl(0, [])); this.editForm.addControl('coverImageLocked', new FormControl(this.chapter.coverImageLocked, [])); - this.metadataService.getAllValidLanguages().subscribe(validLanguages => { - this.validLanguages = validLanguages; - this.setupLanguageTypeahead(); - this.cdRef.markForCheck(); - }); + this.metadataService.getAllValidLanguages().pipe( + tap(validLanguages => { + this.validLanguages = validLanguages; + this.cdRef.markForCheck(); + }), + switchMap(_ => this.setupLanguageTypeahead()) + ).subscribe(); this.metadataService.getAllAgeRatings().subscribe(ratings => { this.ageRatings = ratings; @@ -261,12 +243,15 @@ export class EditChapterModalComponent implements OnInit { const model = this.editForm.value; const selectedIndex = this.editForm.get('coverImageIndex')?.value || 0; - this.chapter.releaseDate = model.releaseDate; + // Patch in data from the model that is not typeahead (as those are updated during setting) + if (model.releaseDate === '') { + this.chapter.releaseDate = '0001-01-01T00:00:00'; + } else { + this.chapter.releaseDate = model.releaseDate + 'T00:00:00'; + } + this.chapter.ageRating = parseInt(model.ageRating + '', 10) as AgeRating; - this.chapter.genres = model.genres; - this.chapter.tags = model.tags; this.chapter.sortOrder = model.sortOrder; - this.chapter.language = model.language; this.chapter.titleName = model.titleName; this.chapter.summary = model.summary; this.chapter.isbn = model.isbn; @@ -358,6 +343,7 @@ export class EditChapterModalComponent implements OnInit { this.tagsSettings.compareFnForAdd = (options: Tag[], filter: string) => { return options.filter(m => this.utilityService.filterMatches(m.title, filter)); } + this.tagsSettings.trackByIdentityFn = (index, value) => value.title + (value.id + ''); if (this.chapter.tags) { this.tagsSettings.savedData = this.chapter.tags; @@ -389,6 +375,7 @@ export class EditChapterModalComponent implements OnInit { this.genreSettings.addTransformFn = ((title: string) => { return {id: 0, title: title }; }); + this.genreSettings.trackByIdentityFn = (index, value) => value.title + (value.id + ''); if (this.chapter.genres) { this.genreSettings.savedData = this.chapter.genres; @@ -415,6 +402,7 @@ export class EditChapterModalComponent implements OnInit { this.languageSettings.selectionCompareFn = (a: Language, b: Language) => { return a.isoCode == b.isoCode; } + this.languageSettings.trackByIdentityFn = (index, value) => value.isoCode; const l = this.validLanguages.find(l => l.isoCode === this.chapter.language); if (l !== undefined) { @@ -426,6 +414,7 @@ export class EditChapterModalComponent implements OnInit { updateFromPreset(id: string, presetField: Array | undefined, role: PersonRole) { const personSettings = this.createBlankPersonSettings(id, role) + if (presetField && presetField.length > 0) { const fetch = personSettings.fetchFn as ((filter: string) => Observable); return fetch('').pipe(map(people => { @@ -436,10 +425,11 @@ export class EditChapterModalComponent implements OnInit { this.cdRef.markForCheck(); return true; })); - } else { - this.peopleSettings[role] = personSettings; - return of(true); } + + this.peopleSettings[role] = personSettings; + return of(true); + } setupPersonTypeahead() { @@ -459,7 +449,7 @@ export class EditChapterModalComponent implements OnInit { this.updateFromPreset('translator', this.chapter.translators, PersonRole.Translator), this.updateFromPreset('teams', this.chapter.teams, PersonRole.Team), this.updateFromPreset('locations', this.chapter.locations, PersonRole.Location), - ]).pipe(map(results => { + ]).pipe(map(_ => { return of(true); })); } @@ -493,9 +483,11 @@ export class EditChapterModalComponent implements OnInit { }; personSettings.addTransformFn = ((title: string) => { - return {id: 0, name: title, role: role, description: '', coverImage: '', coverImageLocked: false, primaryColor: '', secondaryColor: '' }; + return {id: 0, name: title, aliases: [], role: role, description: '', coverImage: '', coverImageLocked: false, primaryColor: '', secondaryColor: '' }; }); + personSettings.trackByIdentityFn = (index, value) => value.name + (value.id + ''); + return personSettings; } diff --git a/UI/Web/src/app/_single-module/edit-volume-modal/edit-volume-modal.component.html b/UI/Web/src/app/_single-module/edit-volume-modal/edit-volume-modal.component.html index 81b8ade5e..b0f331b51 100644 --- a/UI/Web/src/app/_single-module/edit-volume-modal/edit-volume-modal.component.html +++ b/UI/Web/src/app/_single-module/edit-volume-modal/edit-volume-modal.component.html @@ -12,7 +12,7 @@
    • {{t(TabID.Info)}} -
      +
      @@ -33,7 +33,7 @@
      -
      +
      @@ -55,12 +55,12 @@
      -
      +
      - {{volume.createdUtc | utcToLocalTime | translocoDate: {dateStyle: 'short', timeStyle: 'short' } | defaultDate}} + {{volume.createdUtc | utcToLocalTime:'short' | defaultDate}}
      diff --git a/UI/Web/src/app/_single-module/edit-volume-modal/edit-volume-modal.component.ts b/UI/Web/src/app/_single-module/edit-volume-modal/edit-volume-modal.component.ts index 736118e84..3407afd83 100644 --- a/UI/Web/src/app/_single-module/edit-volume-modal/edit-volume-modal.component.ts +++ b/UI/Web/src/app/_single-module/edit-volume-modal/edit-volume-modal.component.ts @@ -1,30 +1,17 @@ import {ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, Input, OnInit} from '@angular/core'; import {FormControl, FormGroup, FormsModule, ReactiveFormsModule} from "@angular/forms"; -import { - NgbActiveModal, - NgbInputDatepicker, - NgbNav, - NgbNavContent, - NgbNavItem, - NgbNavLink, - NgbNavOutlet -} from "@ng-bootstrap/ng-bootstrap"; +import {NgbActiveModal, NgbNav, NgbNavContent, NgbNavItem, NgbNavLink, NgbNavOutlet} from "@ng-bootstrap/ng-bootstrap"; import {TranslocoDirective} from "@jsverse/transloco"; -import {AsyncPipe, DatePipe, DecimalPipe, NgClass, NgTemplateOutlet, TitleCasePipe} from "@angular/common"; +import {NgClass} from "@angular/common"; import {SettingItemComponent} from "../../settings/_components/setting-item/setting-item.component"; -import {TypeaheadComponent} from "../../typeahead/_components/typeahead.component"; import {EntityTitleComponent} from "../../cards/entity-title/entity-title.component"; import {SettingButtonComponent} from "../../settings/_components/setting-button/setting-button.component"; import {CoverImageChooserComponent} from "../../cards/cover-image-chooser/cover-image-chooser.component"; import {EditChapterProgressComponent} from "../../cards/edit-chapter-progress/edit-chapter-progress.component"; import {CompactNumberPipe} from "../../_pipes/compact-number.pipe"; -import {IconAndTitleComponent} from "../../shared/icon-and-title/icon-and-title.component"; import {DefaultDatePipe} from "../../_pipes/default-date.pipe"; -import {TranslocoDatePipe} from "@jsverse/transloco-locale"; import {UtcToLocalTimePipe} from "../../_pipes/utc-to-local-time.pipe"; import {BytesPipe} from "../../_pipes/bytes.pipe"; -import {ImageComponent} from "../../shared/image/image.component"; -import {SafeHtmlPipe} from "../../_pipes/safe-html.pipe"; import {ReadTimePipe} from "../../_pipes/read-time.pipe"; import {Action, ActionFactoryService, ActionItem} from "../../_services/action-factory.service"; import {Volume} from "../../_models/volume"; @@ -37,11 +24,10 @@ import {DownloadService} from "../../shared/_services/download.service"; import {LibraryType} from "../../_models/library/library"; import {PersonRole} from "../../_models/metadata/person"; import {forkJoin} from "rxjs"; -import { MangaFormat } from 'src/app/_models/manga-format'; +import {MangaFormat} from 'src/app/_models/manga-format'; import {MangaFile} from "../../_models/manga-file"; import {VolumeService} from "../../_services/volume.service"; import {User} from "../../_models/user"; -import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; enum TabID { General = 'general-tab', @@ -63,37 +49,25 @@ const blackList = [Action.Edit, Action.IncognitoRead, Action.AddToReadingList]; @Component({ selector: 'app-edit-volume-modal', - standalone: true, imports: [ FormsModule, NgbNav, NgbNavContent, NgbNavLink, TranslocoDirective, - AsyncPipe, NgbNavOutlet, ReactiveFormsModule, NgbNavItem, SettingItemComponent, - NgTemplateOutlet, NgClass, - TypeaheadComponent, EntityTitleComponent, - TitleCasePipe, SettingButtonComponent, CoverImageChooserComponent, EditChapterProgressComponent, - NgbInputDatepicker, CompactNumberPipe, - IconAndTitleComponent, DefaultDatePipe, - TranslocoDatePipe, UtcToLocalTimePipe, BytesPipe, - ImageComponent, - SafeHtmlPipe, - DecimalPipe, - DatePipe, ReadTimePipe ], templateUrl: './edit-volume-modal.component.html', diff --git a/UI/Web/src/app/_single-module/match-series-modal/match-series-modal.component.html b/UI/Web/src/app/_single-module/match-series-modal/match-series-modal.component.html new file mode 100644 index 000000000..5a9804d54 --- /dev/null +++ b/UI/Web/src/app/_single-module/match-series-modal/match-series-modal.component.html @@ -0,0 +1,68 @@ + +
      +
      + + +
      +
      + + +

      {{t('description')}}

      +
      +
      + + +
      + @if (formGroup.get('query'); as formControl) { + + @if (formControl.errors) { + @if (formControl.errors.required) { +
      {{t('required-field')}}
      + } + } + } +
      +       +       +
      +
      +
      + + +
      + +
      +       +       +
      +
      +
      +
      + +
      + + +
      + + @if (!formGroup.get('dontMatch')?.value) { + + @for(item of matches; track item.series.name) { + + } @empty { + @if (!isLoading) { +

      {{t('no-results')}}

      + } + } + } + +
      +
      + + +
      +
      +       + diff --git a/UI/Web/src/app/_single-module/match-series-modal/match-series-modal.component.scss b/UI/Web/src/app/_single-module/match-series-modal/match-series-modal.component.scss new file mode 100644 index 000000000..d3a1cb9a9 --- /dev/null +++ b/UI/Web/src/app/_single-module/match-series-modal/match-series-modal.component.scss @@ -0,0 +1,3 @@ +.setting-section-break { + margin: 0 !important; +} \ No newline at end of file diff --git a/UI/Web/src/app/_single-module/match-series-modal/match-series-modal.component.ts b/UI/Web/src/app/_single-module/match-series-modal/match-series-modal.component.ts new file mode 100644 index 000000000..793737923 --- /dev/null +++ b/UI/Web/src/app/_single-module/match-series-modal/match-series-modal.component.ts @@ -0,0 +1,99 @@ +import {ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, Input, OnInit} from '@angular/core'; +import {Series} from "../../_models/series"; +import {SeriesService} from "../../_services/series.service"; +import {FormControl, FormGroup, ReactiveFormsModule} from "@angular/forms"; +import {NgbActiveModal} from "@ng-bootstrap/ng-bootstrap"; +import {translate, TranslocoDirective} from "@jsverse/transloco"; +import {MatchSeriesResultItemComponent} from "../match-series-result-item/match-series-result-item.component"; +import {LoadingComponent} from "../../shared/loading/loading.component"; +import {ExternalSeriesMatch} from "../../_models/series-detail/external-series-match"; +import {ToastrService} from "ngx-toastr"; +import {SettingItemComponent} from "../../settings/_components/setting-item/setting-item.component"; +import {SettingSwitchComponent} from "../../settings/_components/setting-switch/setting-switch.component"; +import { ThemeService } from 'src/app/_services/theme.service'; +import { AsyncPipe } from '@angular/common'; + +@Component({ + selector: 'app-match-series-modal', + imports: [ + AsyncPipe, + TranslocoDirective, + MatchSeriesResultItemComponent, + LoadingComponent, + ReactiveFormsModule, + SettingItemComponent, + SettingSwitchComponent + ], + templateUrl: './match-series-modal.component.html', + styleUrl: './match-series-modal.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class MatchSeriesModalComponent implements OnInit { + private readonly cdRef = inject(ChangeDetectorRef); + private readonly seriesService = inject(SeriesService); + private readonly modalService = inject(NgbActiveModal); + private readonly toastr = inject(ToastrService); + protected readonly themeService = inject(ThemeService); + + @Input({required: true}) series!: Series; + + formGroup = new FormGroup({}); + matches: Array = []; + isLoading = true; + + ngOnInit() { + this.formGroup.addControl('query', new FormControl('', [])); + this.formGroup.addControl('dontMatch', new FormControl(this.series?.dontMatch || false, [])); + + this.search(); + } + + search() { + this.isLoading = true; + this.cdRef.markForCheck(); + + const model: any = this.formGroup.value; + model.seriesId = this.series.id; + + if (model.dontMatch) return; + + this.seriesService.matchSeries(model).subscribe(results => { + this.isLoading = false; + this.matches = results; + this.cdRef.markForCheck(); + }); + } + + close() { + this.modalService.close(false); + } + + save() { + + const model: any = this.formGroup.value; + model.seriesId = this.series.id; + + const dontMatchChanged = this.series.dontMatch !== model.dontMatch; + + // We need to update the dontMatch status + if (dontMatchChanged) { + this.seriesService.updateDontMatch(this.series.id, model.dontMatch).subscribe(_ => { + this.modalService.close(true); + }); + } else { + this.toastr.success(translate('toasts.match-success')); + this.modalService.close(true); + } + } + + selectMatch(item: ExternalSeriesMatch) { + const data = item.series; + data.tags = data.tags || []; + data.genres = data.genres || []; + + this.seriesService.updateMatch(this.series.id, item.series).subscribe(_ => { + this.save(); + }); + } + +} diff --git a/UI/Web/src/app/_single-module/match-series-result-item/match-series-result-item.component.html b/UI/Web/src/app/_single-module/match-series-result-item/match-series-result-item.component.html new file mode 100644 index 000000000..322a16bd8 --- /dev/null +++ b/UI/Web/src/app/_single-module/match-series-result-item/match-series-result-item.component.html @@ -0,0 +1,51 @@ + +
      +
      +
      + @if (item.series.coverUrl) { + + } +
      +
      +
      {{item.series.name}} ({{item.matchRating | translocoPercent}})
      +
      + @for(synm of item.series.synonyms; track synm; let last = $last) { + {{synm}} + @if (!last) { + , + } + } +
      + @if (item.series.summary) { + + } +
      +
      + + @if (isSelected) { +
      + + {{t('updating-metadata-status')}} +
      + } @else { +
      + @if ((item.series.volumes || 0) > 0 || (item.series.chapters || 0) > 0) { + @if (item.series.plusMediaFormat === PlusMediaFormat.Comic) { + {{t('issue-count', {num: item.series.chapters})}} + } @else { + {{t('volume-count', {num: item.series.volumes})}} + {{t('chapter-count', {num: item.series.chapters})}} + } + } @else { + {{t('releasing')}} + } + + {{item.series.plusMediaFormat | plusMediaFormat}} +
      + } + +
      +       diff --git a/UI/Web/src/app/_single-module/match-series-result-item/match-series-result-item.component.scss b/UI/Web/src/app/_single-module/match-series-result-item/match-series-result-item.component.scss new file mode 100644 index 000000000..5df806397 --- /dev/null +++ b/UI/Web/src/app/_single-module/match-series-result-item/match-series-result-item.component.scss @@ -0,0 +1,33 @@ +.search-result { + img { + max-width: 100px; + min-width: 100px; + } +} +.title { + font-size: 1.2rem; + font-weight: bold; + margin: 0; + padding: 0; +} + +.match-item-container { + &.dark { + background-color: var(--elevation-layer6-dark); + } + + &.light { + background-color: var(--elevation-layer6); + } + border-radius: 15px; + + &:hover { + &.dark { + background-color: var(--elevation-layer11-dark); + } + + &.light { + background-color: var(--elevation-layer11); + } + } +} \ No newline at end of file diff --git a/UI/Web/src/app/_single-module/match-series-result-item/match-series-result-item.component.ts b/UI/Web/src/app/_single-module/match-series-result-item/match-series-result-item.component.ts new file mode 100644 index 000000000..9e3044884 --- /dev/null +++ b/UI/Web/src/app/_single-module/match-series-result-item/match-series-result-item.component.ts @@ -0,0 +1,52 @@ +import { + ChangeDetectionStrategy, + ChangeDetectorRef, + Component, + EventEmitter, + inject, + Input, + Output +} from '@angular/core'; +import {ImageComponent} from "../../shared/image/image.component"; +import {ExternalSeriesMatch} from "../../_models/series-detail/external-series-match"; +import {TranslocoPercentPipe} from "@jsverse/transloco-locale"; +import {ReadMoreComponent} from "../../shared/read-more/read-more.component"; +import {TranslocoDirective} from "@jsverse/transloco"; +import {PlusMediaFormatPipe} from "../../_pipes/plus-media-format.pipe"; +import {LoadingComponent} from "../../shared/loading/loading.component"; +import {PlusMediaFormat} from "../../_models/series-detail/external-series-detail"; + +@Component({ + selector: 'app-match-series-result-item', + imports: [ + ImageComponent, + TranslocoPercentPipe, + ReadMoreComponent, + TranslocoDirective, + PlusMediaFormatPipe, + LoadingComponent + ], + templateUrl: './match-series-result-item.component.html', + styleUrl: './match-series-result-item.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class MatchSeriesResultItemComponent { + + private readonly cdRef = inject(ChangeDetectorRef); + + @Input({required: true}) item!: ExternalSeriesMatch; + @Input({required: true}) isDarkMode = true; + @Output() selected: EventEmitter = new EventEmitter(); + + isSelected = false; + + selectItem() { + if (this.isSelected) return; + + this.isSelected = true; + this.cdRef.markForCheck(); + this.selected.emit(this.item); + } + + protected readonly PlusMediaFormat = PlusMediaFormat; +} diff --git a/UI/Web/src/app/_single-module/publisher-flipper/publisher-flipper.component.ts b/UI/Web/src/app/_single-module/publisher-flipper/publisher-flipper.component.ts index 7649f4e1e..fe54cdaa1 100644 --- a/UI/Web/src/app/_single-module/publisher-flipper/publisher-flipper.component.ts +++ b/UI/Web/src/app/_single-module/publisher-flipper/publisher-flipper.component.ts @@ -20,14 +20,13 @@ import {Router} from "@angular/router"; const ANIMATION_TIME = 3000; @Component({ - selector: 'app-publisher-flipper', - standalone: true, - imports: [ - ImageComponent - ], - templateUrl: './publisher-flipper.component.html', - styleUrl: './publisher-flipper.component.scss', - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'app-publisher-flipper', + imports: [ + ImageComponent + ], + templateUrl: './publisher-flipper.component.html', + styleUrl: './publisher-flipper.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush }) export class PublisherFlipperComponent implements OnInit, OnDestroy, AfterViewInit, AfterViewChecked { diff --git a/UI/Web/src/app/_single-module/related-tab/related-tab.component.html b/UI/Web/src/app/_single-module/related-tab/related-tab.component.html index 17d40e515..8334eaf21 100644 --- a/UI/Web/src/app/_single-module/related-tab/related-tab.component.html +++ b/UI/Web/src/app/_single-module/related-tab/related-tab.component.html @@ -1,5 +1,5 @@ -
      +
      @if (relations.length > 0) { @@ -30,5 +30,18 @@ } + + @if (bookmarks.length > 0) { + + + + + + }
      diff --git a/UI/Web/src/app/_single-module/related-tab/related-tab.component.ts b/UI/Web/src/app/_single-module/related-tab/related-tab.component.ts index d61c0e04e..8d8a767d5 100644 --- a/UI/Web/src/app/_single-module/related-tab/related-tab.component.ts +++ b/UI/Web/src/app/_single-module/related-tab/related-tab.component.ts @@ -1,4 +1,4 @@ -import {ChangeDetectionStrategy, Component, inject, Input} from '@angular/core'; +import {ChangeDetectionStrategy, Component, inject, Input, OnInit} from '@angular/core'; import {ReadingList} from "../../_models/reading-list"; import {CardItemComponent} from "../../cards/card-item/card-item.component"; import {CarouselReelComponent} from "../../carousel/_components/carousel-reel/carousel-reel.component"; @@ -9,6 +9,7 @@ import {Router} from "@angular/router"; import {SeriesCardComponent} from "../../cards/series-card/series-card.component"; import {Series} from "../../_models/series"; import {RelationKind} from "../../_models/series-detail/relation-kind"; +import {PageBookmark} from "../../_models/readers/page-bookmark"; export interface RelatedSeriesPair { series: Series; @@ -16,17 +17,16 @@ export interface RelatedSeriesPair { } @Component({ - selector: 'app-related-tab', - standalone: true, - imports: [ - CardItemComponent, - CarouselReelComponent, - TranslocoDirective, - SeriesCardComponent - ], - templateUrl: './related-tab.component.html', - styleUrl: './related-tab.component.scss', - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'app-related-tab', + imports: [ + CardItemComponent, + CarouselReelComponent, + TranslocoDirective, + SeriesCardComponent + ], + templateUrl: './related-tab.component.html', + styleUrl: './related-tab.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush }) export class RelatedTabComponent { @@ -36,6 +36,8 @@ export class RelatedTabComponent { @Input() readingLists: Array = []; @Input() collections: Array = []; @Input() relations: Array = []; + @Input() bookmarks: Array = []; + @Input() libraryId!: number; openReadingList(readingList: ReadingList) { this.router.navigate(['lists', readingList.id]); @@ -45,4 +47,8 @@ export class RelatedTabComponent { this.router.navigate(['collections', collection.id]); } + viewBookmark(bookmark: PageBookmark) { + this.router.navigate(['library', this.libraryId, 'series', bookmark.seriesId, 'manga', 0], {queryParams: {incognitoMode: false, bookmarkMode: true}}); + } + } diff --git a/UI/Web/src/app/_single-module/review-card-modal/review-card-modal.component.ts b/UI/Web/src/app/_single-module/review-card-modal/review-card-modal.component.ts index 45f9e27bb..99ab421a5 100644 --- a/UI/Web/src/app/_single-module/review-card-modal/review-card-modal.component.ts +++ b/UI/Web/src/app/_single-module/review-card-modal/review-card-modal.component.ts @@ -1,9 +1,11 @@ import { AfterViewInit, ChangeDetectionStrategy, - Component, inject, + Component, + inject, Inject, - Input, ViewChild, + Input, + ViewChild, ViewContainerRef, ViewEncapsulation } from '@angular/core'; @@ -14,17 +16,15 @@ import {UserReview} from "../review-card/user-review"; import {SpoilerComponent} from "../spoiler/spoiler.component"; import {SafeHtmlPipe} from "../../_pipes/safe-html.pipe"; import {TranslocoDirective} from "@jsverse/transloco"; -import {DefaultValuePipe} from "../../_pipes/default-value.pipe"; import {ProviderImagePipe} from "../../_pipes/provider-image.pipe"; @Component({ selector: 'app-review-card-modal', - standalone: true, - imports: [ReactiveFormsModule, SpoilerComponent, SafeHtmlPipe, TranslocoDirective, DefaultValuePipe, NgOptimizedImage, ProviderImagePipe], + imports: [ReactiveFormsModule, SafeHtmlPipe, TranslocoDirective, NgOptimizedImage, ProviderImagePipe], templateUrl: './review-card-modal.component.html', styleUrls: ['./review-card-modal.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, - encapsulation: ViewEncapsulation.None, + encapsulation: ViewEncapsulation.None }) export class ReviewCardModalComponent implements AfterViewInit { @@ -45,7 +45,8 @@ export class ReviewCardModalComponent implements AfterViewInit { for (let i = 0; i < spoilers.length; i++) { const spoiler = spoilers[i]; - const componentRef = this.container.createComponent(SpoilerComponent); + const componentRef = this.container.createComponent(SpoilerComponent, + {projectableNodes: [[document.createTextNode('')]]}); componentRef.instance.html = spoiler.innerHTML; if (spoiler.parentNode != null) { spoiler.parentNode.replaceChild(componentRef.location.nativeElement, spoiler); diff --git a/UI/Web/src/app/_single-module/review-card/review-card.component.html b/UI/Web/src/app/_single-module/review-card/review-card.component.html index 99a788471..c5bade722 100644 --- a/UI/Web/src/app/_single-module/review-card/review-card.component.html +++ b/UI/Web/src/app/_single-module/review-card/review-card.component.html @@ -27,6 +27,9 @@ {{review.username}} } {{(isMyReview ? '' : review.username | defaultValue:'')}} + @if (review.authority === RatingAuthority.Critic) { + ({{t('critic')}}) + }
      @if (review.isExternal){ {{t('rating-percentage', {r: review.score})}} diff --git a/UI/Web/src/app/_single-module/review-card/review-card.component.ts b/UI/Web/src/app/_single-module/review-card/review-card.component.ts index 034173f55..f86bca966 100644 --- a/UI/Web/src/app/_single-module/review-card/review-card.component.ts +++ b/UI/Web/src/app/_single-module/review-card/review-card.component.ts @@ -13,21 +13,17 @@ import {UserReview} from "./user-review"; import {NgbModal} from "@ng-bootstrap/ng-bootstrap"; import {ReviewCardModalComponent} from "../review-card-modal/review-card-modal.component"; import {AccountService} from "../../_services/account.service"; -import { - ReviewSeriesModalCloseEvent, - ReviewSeriesModalComponent -} from "../review-series-modal/review-series-modal.component"; +import {ReviewModalCloseEvent, ReviewModalComponent} from "../review-modal/review-modal.component"; import {ReadMoreComponent} from "../../shared/read-more/read-more.component"; import {DefaultValuePipe} from "../../_pipes/default-value.pipe"; -import {ImageComponent} from "../../shared/image/image.component"; import {ProviderImagePipe} from "../../_pipes/provider-image.pipe"; import {TranslocoDirective} from "@jsverse/transloco"; import {ScrobbleProvider} from "../../_services/scrobbling.service"; +import {RatingAuthority} from "../../_models/rating"; @Component({ selector: 'app-review-card', - standalone: true, - imports: [ReadMoreComponent, DefaultValuePipe, ImageComponent, NgOptimizedImage, ProviderImagePipe, TranslocoDirective], + imports: [ReadMoreComponent, DefaultValuePipe, NgOptimizedImage, ProviderImagePipe, TranslocoDirective], templateUrl: './review-card.component.html', styleUrls: ['./review-card.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush @@ -37,7 +33,7 @@ export class ReviewCardComponent implements OnInit { protected readonly ScrobbleProvider = ScrobbleProvider; @Input({required: true}) review!: UserReview; - @Output() refresh = new EventEmitter(); + @Output() refresh = new EventEmitter(); isMyReview: boolean = false; @@ -46,7 +42,7 @@ export class ReviewCardComponent implements OnInit { ngOnInit() { this.accountService.currentUser$.subscribe(u => { if (u) { - this.isMyReview = this.review.username === u.username; + this.isMyReview = this.review.username === u.username && !this.review.isExternal; this.cdRef.markForCheck(); } }); @@ -55,16 +51,19 @@ export class ReviewCardComponent implements OnInit { showModal() { let component; if (this.isMyReview) { - component = ReviewSeriesModalComponent; + component = ReviewModalComponent; } else { component = ReviewCardModalComponent; } const ref = this.modalService.open(component, {size: 'lg', fullscreen: 'md'}); + ref.componentInstance.review = this.review; - ref.closed.subscribe((res: ReviewSeriesModalCloseEvent | undefined) => { + ref.closed.subscribe((res: ReviewModalCloseEvent | undefined) => { if (res) { this.refresh.emit(res); } }) } + + protected readonly RatingAuthority = RatingAuthority; } diff --git a/UI/Web/src/app/_single-module/review-card/user-review.ts b/UI/Web/src/app/_single-module/review-card/user-review.ts index 1b5771463..58af94dea 100644 --- a/UI/Web/src/app/_single-module/review-card/user-review.ts +++ b/UI/Web/src/app/_single-module/review-card/user-review.ts @@ -1,8 +1,11 @@ import {ScrobbleProvider} from "../../_services/scrobbling.service"; +import {RatingAuthority} from "../../_models/rating"; + export interface UserReview { seriesId: number; libraryId: number; + chapterId?: number; score: number; username: string; body: string; @@ -11,4 +14,5 @@ export interface UserReview { bodyJustText?: string; siteUrl?: string; provider: ScrobbleProvider; + authority: RatingAuthority; } diff --git a/UI/Web/src/app/_single-module/review-series-modal/review-series-modal.component.html b/UI/Web/src/app/_single-module/review-modal/review-modal.component.html similarity index 83% rename from UI/Web/src/app/_single-module/review-series-modal/review-series-modal.component.html rename to UI/Web/src/app/_single-module/review-modal/review-modal.component.html index 6539a4e41..582a538c3 100644 --- a/UI/Web/src/app/_single-module/review-series-modal/review-series-modal.component.html +++ b/UI/Web/src/app/_single-module/review-modal/review-modal.component.html @@ -1,4 +1,4 @@ - +
      @@ -8,6 +8,11 @@
      + + + +
      + + + } +
      + +
      + @if(settingsForm.get('whitelist'); as formControl) { + + + @let val = breakTags(formControl.value); + + @for(opt of val; track opt) { + {{opt.trim()}} + } @empty { + {{null | defaultValue}} + } + s + + + + + } +
      + +
      + +

      {{t('age-rating-mapping-title')}}

      +

      {{t('age-rating-mapping-description')}}

      + +
      + @for(mapping of ageRatingMappings.controls; track mapping; let i = $index) { +
      +
      + +
      +
      + +
      +
      + +
      +
      + + + @if($last) { + + } +
      +
      + } @empty { + + } + + +
      + +
      + + +

      {{t('field-mapping-title')}}

      +

      {{t('field-mapping-description')}}

      +
      + @for (mapping of fieldMappings.controls; track mapping; let i = $index) { +
      +
      + +
      +
      + +
      +
      + +
      +
      + +
      +
      +
      + + +
      +
      +
      + + + @if ($last) { + + } +
      +
      + } @empty { + + } + +
      + +
      + + @if (settingsForm.get('overrides')) { +
      {{t('overrides-label')}}
      +

      {{t('overrides-description')}}

      +
      + @for(field of allMetadataSettingFields; track field; let i = $index) { +
      +
      + + +
      +
      + } +
      + } + +
      + } + diff --git a/UI/Web/src/app/admin/manage-metadata-settings/manage-metadata-settings.component.scss b/UI/Web/src/app/admin/manage-metadata-settings/manage-metadata-settings.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/UI/Web/src/app/admin/manage-metadata-settings/manage-metadata-settings.component.ts b/UI/Web/src/app/admin/manage-metadata-settings/manage-metadata-settings.component.ts new file mode 100644 index 000000000..d84478e92 --- /dev/null +++ b/UI/Web/src/app/admin/manage-metadata-settings/manage-metadata-settings.component.ts @@ -0,0 +1,243 @@ +import {ChangeDetectionStrategy, ChangeDetectorRef, Component, DestroyRef, inject, OnInit} from '@angular/core'; +import {TranslocoDirective} from "@jsverse/transloco"; +import {FormArray, FormBuilder, FormControl, FormGroup, ReactiveFormsModule, Validators} from "@angular/forms"; +import {SettingSwitchComponent} from "../../settings/_components/setting-switch/setting-switch.component"; +import {SettingItemComponent} from "../../settings/_components/setting-item/setting-item.component"; +import {DefaultValuePipe} from "../../_pipes/default-value.pipe"; +import {TagBadgeComponent} from "../../shared/tag-badge/tag-badge.component"; +import {SettingsService} from "../settings.service"; +import {debounceTime, switchMap} from "rxjs"; +import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; +import {filter, map} from "rxjs/operators"; +import {AgeRatingPipe} from "../../_pipes/age-rating.pipe"; +import {AgeRating} from "../../_models/metadata/age-rating"; +import {MetadataService} from "../../_services/metadata.service"; +import {AgeRatingDto} from "../../_models/metadata/age-rating-dto"; +import {MetadataFieldMapping, MetadataFieldType} from "../_models/metadata-settings"; +import {PersonRole} from "../../_models/metadata/person"; +import {PersonRolePipe} from "../../_pipes/person-role.pipe"; +import {allMetadataSettingField, MetadataSettingField} from "../_models/metadata-setting-field"; +import {MetadataSettingFiledPipe} from "../../_pipes/metadata-setting-filed.pipe"; + + +@Component({ + selector: 'app-manage-metadata-settings', + imports: [ + TranslocoDirective, + ReactiveFormsModule, + SettingSwitchComponent, + SettingItemComponent, + DefaultValuePipe, + TagBadgeComponent, + AgeRatingPipe, + PersonRolePipe, + MetadataSettingFiledPipe, + + ], + templateUrl: './manage-metadata-settings.component.html', + styleUrl: './manage-metadata-settings.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class ManageMetadataSettingsComponent implements OnInit { + + protected readonly MetadataFieldType = MetadataFieldType; + + private readonly settingService = inject(SettingsService); + private readonly metadataService = inject(MetadataService); + private readonly cdRef = inject(ChangeDetectorRef); + private readonly destroyRef = inject(DestroyRef); + private readonly fb = inject(FormBuilder); + + settingsForm: FormGroup = new FormGroup({}); + ageRatings: Array = []; + ageRatingMappings = this.fb.array([]); + fieldMappings = this.fb.array([]); + personRoles: PersonRole[] = [PersonRole.Writer, PersonRole.CoverArtist, PersonRole.Character]; + isLoaded = false; + allMetadataSettingFields = allMetadataSettingField; + + ngOnInit(): void { + this.metadataService.getAllAgeRatings().subscribe(ratings => { + this.ageRatings = ratings; + this.cdRef.markForCheck(); + }); + + + this.settingsForm.addControl('ageRatingMappings', this.ageRatingMappings); + this.settingsForm.addControl('fieldMappings', this.fieldMappings); + + this.settingService.getMetadataSettings().subscribe(settings => { + this.settingsForm.addControl('enabled', new FormControl(settings.enabled, [])); + this.settingsForm.addControl('enableSummary', new FormControl(settings.enableSummary, [])); + this.settingsForm.addControl('enableLocalizedName', new FormControl(settings.enableLocalizedName, [])); + this.settingsForm.addControl('enablePublicationStatus', new FormControl(settings.enablePublicationStatus, [])); + this.settingsForm.addControl('enableRelations', new FormControl(settings.enableRelationships, [])); + this.settingsForm.addControl('enableGenres', new FormControl(settings.enableGenres, [])); + this.settingsForm.addControl('enableTags', new FormControl(settings.enableTags, [])); + this.settingsForm.addControl('enableRelationships', new FormControl(settings.enableRelationships, [])); + this.settingsForm.addControl('enablePeople', new FormControl(settings.enablePeople, [])); + this.settingsForm.addControl('enableStartDate', new FormControl(settings.enableStartDate, [])); + this.settingsForm.addControl('enableCoverImage', new FormControl(settings.enableCoverImage, [])); + + + this.settingsForm.addControl('enableChapterTitle', new FormControl(settings.enableChapterTitle, [])); + this.settingsForm.addControl('enableChapterSummary', new FormControl(settings.enableChapterSummary, [])); + this.settingsForm.addControl('enableChapterReleaseDate', new FormControl(settings.enableChapterReleaseDate, [])); + this.settingsForm.addControl('enableChapterPublisher', new FormControl(settings.enableChapterPublisher, [])); + this.settingsForm.addControl('enableChapterCoverImage', new FormControl(settings.enableChapterCoverImage, [])); + + this.settingsForm.addControl('blacklist', new FormControl((settings.blacklist || '').join(','), [])); + this.settingsForm.addControl('whitelist', new FormControl((settings.whitelist || '').join(','), [])); + this.settingsForm.addControl('firstLastPeopleNaming', new FormControl((settings.firstLastPeopleNaming), [])); + this.settingsForm.addControl('personRoles', this.fb.group( + Object.fromEntries( + this.personRoles.map((role, index) => [ + `personRole_${index}`, + this.fb.control((settings.personRoles || this.personRoles).includes(role)), + ]) + ) + )); + + this.settingsForm.addControl('overrides', this.fb.group( + Object.fromEntries( + this.allMetadataSettingFields.map((role: MetadataSettingField, index: number) => [ + `override_${index}`, + this.fb.control((settings.overrides || []).includes(role)), + ]) + ) + )); + + + if (settings.ageRatingMappings) { + Object.entries(settings.ageRatingMappings).forEach(([str, rating]) => { + this.addAgeRatingMapping(str, rating); + }); + } + + if (settings.fieldMappings) { + settings.fieldMappings.forEach(mapping => { + this.addFieldMapping(mapping); + }); + } + + this.settingsForm.get('enablePeople')?.valueChanges.subscribe(enabled => { + const firstLastControl = this.settingsForm.get('firstLastPeopleNaming'); + if (enabled) { + firstLastControl?.enable(); + } else { + firstLastControl?.disable(); + } + }); + + this.settingsForm.get('enablePeople')?.updateValueAndValidity(); + + // Disable personRoles checkboxes based on enablePeople state + this.settingsForm.get('enablePeople')?.valueChanges.subscribe(enabled => { + const personRolesArray = this.settingsForm.get('personRoles') as FormArray; + if (enabled) { + personRolesArray.enable(); + } else { + personRolesArray.disable(); + } + }); + + this.isLoaded = true; + this.cdRef.markForCheck(); + + + this.settingsForm.valueChanges.pipe( + debounceTime(300), + takeUntilDestroyed(this.destroyRef), + map(_ => this.packData()), + switchMap((data) => this.settingService.updateMetadataSettings(data)), + ).subscribe(); + + }); + + } + + breakTags(csString: string) { + if (csString) { + return csString.split(','); + } + + return []; + } + + + packData(withFieldMappings: boolean = true) { + const model = this.settingsForm.value; + + // Convert FormArray to dictionary + const ageRatingMappings = this.ageRatingMappings.controls.reduce((acc, control) => { + // @ts-ignore + const { str, rating } = control.value; + if (str && rating) { + // @ts-ignore + acc[str] = parseInt(rating + '', 10) as AgeRating; + } + return acc; + }, {}); + + const fieldMappings = this.fieldMappings.controls.map((control) => { + const value = control.value as MetadataFieldMapping; + + return { + id: value.id, + sourceType: parseInt(value.sourceType + '', 10), + destinationType: parseInt(value.destinationType + '', 10), + sourceValue: value.sourceValue, + destinationValue: value.destinationValue, + excludeFromSource: value.excludeFromSource + } + }).filter(m => m.sourceValue.length > 0 && m.destinationValue.length > 0); + + // Translate blacklist string -> Array + return { + ...model, + ageRatingMappings, + fieldMappings: withFieldMappings ? fieldMappings : [], + blacklist: (model.blacklist || '').split(',').map((item: string) => item.trim()).filter((tag: string) => tag.length > 0), + whitelist: (model.whitelist || '').split(',').map((item: string) => item.trim()).filter((tag: string) => tag.length > 0), + personRoles: Object.entries(this.settingsForm.get('personRoles')!.value) + .filter(([_, value]) => value) + .map(([key, _]) => this.personRoles[parseInt(key.split('_')[1], 10)]), + overrides: Object.entries(this.settingsForm.get('overrides')!.value) + .filter(([_, value]) => value) + .map(([key, _]) => this.allMetadataSettingFields[parseInt(key.split('_')[1], 10)]) + } + } + + addAgeRatingMapping(str: string = '', rating: AgeRating = AgeRating.Unknown) { + const mappingGroup = this.fb.group({ + str: [str, Validators.required], + rating: [rating, Validators.required] + }); + // @ts-ignore + this.ageRatingMappings.push(mappingGroup); + } + + removeAgeRatingMappingRow(index: number) { + this.ageRatingMappings.removeAt(index); + } + + addFieldMapping(mapping: MetadataFieldMapping | null = null) { + const mappingGroup = this.fb.group({ + id: [mapping?.id || 0], + sourceType: [mapping?.sourceType || MetadataFieldType.Genre, Validators.required], + destinationType: [mapping?.destinationType || MetadataFieldType.Genre, Validators.required], + sourceValue: [mapping?.sourceValue || '', Validators.required], + destinationValue: [mapping?.destinationValue || ''], + excludeFromSource: [mapping?.excludeFromSource || false] + }); + + //@ts-ignore + this.fieldMappings.push(mappingGroup); + } + + removeFieldMappingRow(index: number) { + this.fieldMappings.removeAt(index); + } + + +} diff --git a/UI/Web/src/app/admin/manage-scrobble-errors/manage-scrobble-errors.component.html b/UI/Web/src/app/admin/manage-scrobble-errors/manage-scrobble-errors.component.html index 80e15f5cf..59a45873e 100644 --- a/UI/Web/src/app/admin/manage-scrobble-errors/manage-scrobble-errors.component.html +++ b/UI/Web/src/app/admin/manage-scrobble-errors/manage-scrobble-errors.component.html @@ -8,58 +8,60 @@
      - +
      - - - - - - - - - - - @if (isLoading) { - - } @else { - @if(data | filter: filterList; as filteredData) { - @for(item of filteredData; track item.seriesId; let i = $index) { - - - - - - - } - @empty { - - } - } - } - -
      - {{t('series-header')}} - - {{t('created-header')}} - - {{t('comment-header')}} - - {{t('edit-header')}} -
      - {{item.details}} - - {{item.createdUtc | utcToLocalTime | defaultValue }} - - {{item.comment}} - - -
      {{t('no-data')}}
      + + + + + + {{t('series-header')}} + + + {{item.details}} + + + + + + + {{t('created-header')}} + + + {{item.created | utcToLocalTime | defaultValue }} + + + + + + {{t('comment-header')}} + + + {{item.comment}} + + + + + + {{t('edit-header')}} + + + + + +       diff --git a/UI/Web/src/app/admin/manage-scrobble-errors/manage-scrobble-errors.component.ts b/UI/Web/src/app/admin/manage-scrobble-errors/manage-scrobble-errors.component.ts index efdcc76c7..7efe74996 100644 --- a/UI/Web/src/app/admin/manage-scrobble-errors/manage-scrobble-errors.component.ts +++ b/UI/Web/src/app/admin/manage-scrobble-errors/manage-scrobble-errors.component.ts @@ -20,34 +20,36 @@ import {ScrobblingService} from "../../_services/scrobbling.service"; import {ScrobbleError} from "../../_models/scrobbling/scrobble-error"; import {SeriesService} from "../../_services/series.service"; -import {EditSeriesModalComponent} from "../../cards/_modals/edit-series-modal/edit-series-modal.component"; -import {NgbModal} from "@ng-bootstrap/ng-bootstrap"; import {FilterPipe} from "../../_pipes/filter.pipe"; -import {LoadingComponent} from "../../shared/loading/loading.component"; import {TranslocoModule} from "@jsverse/transloco"; -import {DefaultDatePipe} from "../../_pipes/default-date.pipe"; import {DefaultValuePipe} from "../../_pipes/default-value.pipe"; import {TranslocoLocaleModule} from "@jsverse/transloco-locale"; import {UtcToLocalTimePipe} from "../../_pipes/utc-to-local-time.pipe"; -import {DefaultModalOptions} from "../../_models/default-modal-options"; +import {ColumnMode, NgxDatatableModule} from "@siemens/ngx-datatable"; +import {ActionService} from "../../_services/action.service"; @Component({ - selector: 'app-manage-scrobble-errors', - standalone: true, - imports: [ReactiveFormsModule, FilterPipe, LoadingComponent, SortableHeader, TranslocoModule, DefaultDatePipe, DefaultValuePipe, TranslocoLocaleModule, UtcToLocalTimePipe], - templateUrl: './manage-scrobble-errors.component.html', - styleUrls: ['./manage-scrobble-errors.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'app-manage-scrobble-errors', + imports: [ReactiveFormsModule, FilterPipe, TranslocoModule, DefaultValuePipe, TranslocoLocaleModule, UtcToLocalTimePipe, NgxDatatableModule], + templateUrl: './manage-scrobble-errors.component.html', + styleUrls: ['./manage-scrobble-errors.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush }) export class ManageScrobbleErrorsComponent implements OnInit { - @Output() scrobbleCount = new EventEmitter(); - @ViewChildren(SortableHeader) headers!: QueryList>; + protected readonly filter = filter; + protected readonly ColumnMode = ColumnMode; + private readonly scrobbleService = inject(ScrobblingService); private readonly messageHub = inject(MessageHubService); private readonly cdRef = inject(ChangeDetectorRef); private readonly destroyRef = inject(DestroyRef); private readonly seriesService = inject(SeriesService); - private readonly modalService = inject(NgbModal); + private readonly actionService = inject(ActionService); + + + @Output() scrobbleCount = new EventEmitter(); + @ViewChildren(SortableHeader) headers!: QueryList>; + messageHubUpdate$ = this.messageHub.messages$.pipe(takeUntilDestroyed(this.destroyRef), filter(m => m.event === EVENTS.ScanSeries), shareReplay()); currentSort = new BehaviorSubject>({column: 'created', direction: 'asc'}); @@ -60,8 +62,6 @@ export class ManageScrobbleErrorsComponent implements OnInit { }); - constructor() {} - ngOnInit() { this.loadData(); @@ -110,12 +110,13 @@ export class ManageScrobbleErrorsComponent implements OnInit { return listItem.comment.toLowerCase().indexOf(query) >= 0 || listItem.details.toLowerCase().indexOf(query) >= 0; } - editSeries(seriesId: number) { + fixMatch(seriesId: number) { this.seriesService.getSeries(seriesId).subscribe(series => { - const modalRef = this.modalService.open(EditSeriesModalComponent, DefaultModalOptions); - modalRef.componentInstance.series = series; + this.actionService.matchSeries(series, (result) => { + if (!result) return; + this.data = [...this.data.filter(s => s.seriesId !== series.id)]; + this.cdRef.markForCheck(); + }); }); } - - protected readonly filter = filter; } diff --git a/UI/Web/src/app/admin/manage-scrobling/manage-scrobbling.component.html b/UI/Web/src/app/admin/manage-scrobling/manage-scrobbling.component.html index 851090528..ce662e6b0 100644 --- a/UI/Web/src/app/admin/manage-scrobling/manage-scrobbling.component.html +++ b/UI/Web/src/app/admin/manage-scrobling/manage-scrobbling.component.html @@ -1,9 +1,5 @@ -
      -
      - -
      @if(accountService.isAdmin$ | async) {
      diff --git a/UI/Web/src/app/admin/manage-scrobling/manage-scrobbling.component.ts b/UI/Web/src/app/admin/manage-scrobling/manage-scrobbling.component.ts index 60d632811..2650cc7cf 100644 --- a/UI/Web/src/app/admin/manage-scrobling/manage-scrobbling.component.ts +++ b/UI/Web/src/app/admin/manage-scrobling/manage-scrobbling.component.ts @@ -2,25 +2,21 @@ import {ChangeDetectionStrategy, ChangeDetectorRef, Component, DestroyRef, injec import {ManageScrobbleErrorsComponent} from "../manage-scrobble-errors/manage-scrobble-errors.component"; import {AsyncPipe} from "@angular/common"; import {AccountService} from "../../_services/account.service"; -import {map, shareReplay} from "rxjs"; -import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; import {ScrobblingHoldsComponent} from "../../user-settings/user-holds/scrobbling-holds.component"; import { UserScrobbleHistoryComponent } from "../../_single-module/user-scrobble-history/user-scrobble-history.component"; @Component({ - selector: 'app-manage-scrobling', - standalone: true, - imports: [ - ManageScrobbleErrorsComponent, - AsyncPipe, - ScrobblingHoldsComponent, - UserScrobbleHistoryComponent - ], - templateUrl: './manage-scrobbling.component.html', - styleUrl: './manage-scrobbling.component.scss', - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'app-manage-scrobling', + imports: [ + ManageScrobbleErrorsComponent, + AsyncPipe, + UserScrobbleHistoryComponent + ], + templateUrl: './manage-scrobbling.component.html', + styleUrl: './manage-scrobbling.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush }) export class ManageScrobblingComponent { diff --git a/UI/Web/src/app/admin/manage-settings/manage-settings.component.html b/UI/Web/src/app/admin/manage-settings/manage-settings.component.html index e4468ccc5..7e0b86f87 100644 --- a/UI/Web/src/app/admin/manage-settings/manage-settings.component.html +++ b/UI/Web/src/app/admin/manage-settings/manage-settings.component.html @@ -1,7 +1,7 @@
      - +
      @@ -17,13 +17,13 @@ @if (settingsForm.get('hostName'); as formControl) { - {{formControl.value}} + {{formControl.value | defaultValue}} + [class.is-invalid]="formControl.invalid && !formControl.untouched" appEnterBlur> - @if(settingsForm.dirty || settingsForm.touched) { + @if(settingsForm.dirty || !settingsForm.untouched) {
      @if (formControl.errors?.pattern) {
      {{t('host-name-validation')}}
      @@ -44,11 +44,11 @@
      + [class.is-invalid]="formControl.invalid && !formControl.untouched" appEnterBlur>
      - @if(settingsForm.dirty || settingsForm.touched) { + @if(settingsForm.dirty || !settingsForm.untouched) {
      @if (formControl.errors?.pattern) {
      {{t('base-url-validation')}}
      @@ -64,18 +64,18 @@ @if (settingsForm.get('ipAddresses'); as formControl) { - {{formControl.value}} + {{formControl.value | defaultValue}}
      + [class.is-invalid]="formControl.invalid && !formControl.untouched" appEnterBlur>
      - @if(settingsForm.dirty || settingsForm.touched) { + @if(settingsForm.dirty || !settingsForm.untouched) {
      - @if (formControl.errors?.pattern) { + @if (formControl.errors?.emptyOrPattern) {
      {{t('ip-address-validation')}}
      }
      @@ -94,7 +94,7 @@ + onkeypress="return event.charCode >= 48 && event.charCode <= 57" appEnterBlur>       } @@ -116,9 +116,9 @@ + [class.is-invalid]="formControl.invalid && !formControl.untouched" appEnterBlur> - @if(settingsForm.dirty || settingsForm.touched) { + @if(settingsForm.dirty || !settingsForm.untouched) {
      @if (formControl.errors?.required) {
      {{t('field-required')}}
      @@ -146,9 +146,9 @@ + [class.is-invalid]="formControl.invalid && !formControl.untouched" appEnterBlur> - @if(settingsForm.dirty || settingsForm.touched) { + @if(settingsForm.dirty || !settingsForm.untouched) {
      @if (formControl.errors?.required) {
      {{t('field-required')}}
      @@ -170,18 +170,18 @@ @if (settingsForm.get('loggingLevel'); as formControl) { - {{formControl.value | titlecase}} + {{formControl.value | logLevel}} - @if(settingsForm.dirty || settingsForm.touched) { + @if(settingsForm.dirty || !settingsForm.untouched) {
      @if (formControl.errors?.pattern) {
      {{t('host-name-validation')}}
      @@ -202,9 +202,9 @@ + [class.is-invalid]="formControl.invalid && !formControl.untouched" appEnterBlur> - @if(settingsForm.dirty || settingsForm.touched) { + @if(settingsForm.dirty || !settingsForm.untouched) {
      @if (formControl.errors?.required) {
      {{t('field-required')}}
      @@ -271,9 +271,9 @@ + [class.is-invalid]="formControl.invalid && !formControl.untouched" appEnterBlur> - @if(settingsForm.dirty || settingsForm.touched) { + @if(settingsForm.dirty || !settingsForm.untouched) {
      @if (formControl.errors?.required) {
      {{t('field-required')}}
      @@ -298,9 +298,9 @@ + [class.is-invalid]="formControl.invalid && !formControl.untouched" appEnterBlur> - @if(settingsForm.dirty || settingsForm.touched) { + @if(settingsForm.dirty || !settingsForm.untouched) {
      @if (formControl.errors?.required) {
      {{t('field-required')}}
      diff --git a/UI/Web/src/app/admin/manage-settings/manage-settings.component.ts b/UI/Web/src/app/admin/manage-settings/manage-settings.component.ts index ac1480009..8c5f3f17a 100644 --- a/UI/Web/src/app/admin/manage-settings/manage-settings.component.ts +++ b/UI/Web/src/app/admin/manage-settings/manage-settings.component.ts @@ -1,31 +1,29 @@ import {ChangeDetectionStrategy, ChangeDetectorRef, Component, DestroyRef, inject, OnInit} from '@angular/core'; -import {FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms'; +import {FormControl, FormGroup, ReactiveFormsModule, ValidatorFn, Validators} from '@angular/forms'; import {ToastrService} from 'ngx-toastr'; import {take} from 'rxjs/operators'; import {ServerService} from 'src/app/_services/server.service'; import {SettingsService} from '../settings.service'; import {ServerSettings} from '../_models/server-settings'; -import {NgbTooltip} from '@ng-bootstrap/ng-bootstrap'; -import {NgTemplateOutlet, TitleCasePipe} from '@angular/common'; import {translate, TranslocoModule, TranslocoService} from "@jsverse/transloco"; import {WikiLink} from "../../_models/wiki"; -import {PageLayoutModePipe} from "../../_pipes/page-layout-mode.pipe"; import {SettingItemComponent} from "../../settings/_components/setting-item/setting-item.component"; import {SettingSwitchComponent} from "../../settings/_components/setting-switch/setting-switch.component"; -import {SafeHtmlPipe} from "../../_pipes/safe-html.pipe"; import {ConfirmService} from "../../shared/confirm.service"; -import {debounceTime, distinctUntilChanged, filter, of, switchMap, tap} from "rxjs"; +import {catchError, debounceTime, distinctUntilChanged, filter, of, switchMap, tap} from "rxjs"; import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; +import {DefaultValuePipe} from "../../_pipes/default-value.pipe"; +import {EnterBlurDirective} from "../../_directives/enter-blur.directive"; +import {LogLevelPipe} from "../../_pipes/log-level.pipe"; const ValidIpAddress = /^(\s*((([12]?\d{1,2}\.){3}[12]?\d{1,2})|(([\da-f]{0,4}\:){0,7}([\da-f]{0,4})))\s*\,)*\s*((([12]?\d{1,2}\.){3}[12]?\d{1,2})|(([\da-f]{0,4}\:){0,7}([\da-f]{0,4})))\s*$/i; @Component({ - selector: 'app-manage-settings', - templateUrl: './manage-settings.component.html', - styleUrls: ['./manage-settings.component.scss'], - standalone: true, - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [ReactiveFormsModule, NgbTooltip, TitleCasePipe, TranslocoModule, NgTemplateOutlet, PageLayoutModePipe, SettingItemComponent, SettingSwitchComponent, SafeHtmlPipe] + selector: 'app-manage-settings', + templateUrl: './manage-settings.component.html', + styleUrls: ['./manage-settings.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ReactiveFormsModule, TranslocoModule, SettingItemComponent, SettingSwitchComponent, DefaultValuePipe, EnterBlurDirective, LogLevelPipe] }) export class ManageSettingsComponent implements OnInit { @@ -42,6 +40,7 @@ export class ManageSettingsComponent implements OnInit { settingsForm: FormGroup = new FormGroup({}); taskFrequencies: Array = []; logLevels: Array = []; + isDocker: boolean = false; allowStatsTooltip = translate('manage-settings.allow-stats-tooltip-part-1') + ' -
      - -
      + @if (serverInfo) { +

      {{t('title')}}

      -
      -
      {{t('version-title')}}
      -
      {{serverInfo.kavitaVersion}}
      -
      {{t('installId-title')}}
      -
      {{serverInfo.installId}}
      +
      +
      +
      {{t('version-title')}}
      +
      {{serverInfo.kavitaVersion}}
      +
      -
      {{t('first-install-version-title')}}
      -
      {{serverInfo.firstInstallVersion | defaultValue}}
      +
      +
      {{t('installId-title')}}
      +
      {{serverInfo.installId}}
      +
      +
      -
      {{t('first-install-date-title')}}
      -
      {{serverInfo.firstInstallDate | date:'shortDate'}}
      -
      -
      +
      +
      +
      {{t('first-install-version-title')}}
      +
      {{serverInfo.firstInstallVersion}}
      +
      -
      -

      {{t('more-info-title')}}

      -
      -
      {{t('home-page-title')}}
      -
      kavitareader.com
      -
      -
      -
      {{t('wiki-title')}}
      -
      wiki.kavitareader.com
      -
      -
      -
      {{t('discord-title')}}
      -
      discord.gg/b52wT37kt7
      -
      -
      -
      {{t('donations-title')}}
      -
      opencollective.com/kavita
      -
      -
      -
      {{t('source-title')}}
      -
      github.com/Kareadita/Kavita
      -
      -
      -
      {{t('localization-title')}}
      -
      Weblate
      -
      -
      -
      {{t('feature-request-title')}}
      -
      https://github.com/Kareadita/Kavita/discussions/
      +
      +
      {{t('first-install-date-title')}}
      +
      {{serverInfo.firstInstallDate | date:'shortDate'}}
      +
      -
      -

      {{t('updates-title')}}

      - -
      +
      + } +
      +

      {{t('more-info-title')}}

      +
      +
      {{t('home-page-title')}}
      +
      kavitareader.com
      +
      +
      +
      {{t('wiki-title')}}
      +
      wiki.kavitareader.com
      +
      +
      +
      {{t('discord-title')}}
      +
      discord.gg/b52wT37kt7
      +
      +
      +
      {{t('donations-title')}}
      +
      opencollective.com/kavita
      +
      +
      +
      {{t('source-title')}}
      +
      github.com/Kareadita/Kavita
      +
      +
      +
      {{t('localization-title')}}
      +
      Weblate
      +
      +
      +
      {{t('feature-request-title')}}
      +
      https://github.com/Kareadita/Kavita/discussions/
      +
      +
      + +
      +

      {{t('updates-title')}}

      + +
      diff --git a/UI/Web/src/app/admin/manage-system/manage-system.component.ts b/UI/Web/src/app/admin/manage-system/manage-system.component.ts index a5042fb6d..b61cc8aac 100644 --- a/UI/Web/src/app/admin/manage-system/manage-system.component.ts +++ b/UI/Web/src/app/admin/manage-system/manage-system.component.ts @@ -1,19 +1,16 @@ import {ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, OnInit} from '@angular/core'; import {ServerService} from 'src/app/_services/server.service'; import {ServerInfoSlim} from '../_models/server-info'; -import {DatePipe, NgIf} from '@angular/common'; +import {DatePipe} from '@angular/common'; import {TranslocoDirective} from "@jsverse/transloco"; import {ChangelogComponent} from "../../announcements/_components/changelog/changelog.component"; -import {DefaultDatePipe} from "../../_pipes/default-date.pipe"; -import {DefaultValuePipe} from "../../_pipes/default-value.pipe"; @Component({ selector: 'app-manage-system', templateUrl: './manage-system.component.html', styleUrls: ['./manage-system.component.scss'], - standalone: true, - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [NgIf, TranslocoDirective, ChangelogComponent, DefaultDatePipe, DefaultValuePipe, DatePipe] + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [TranslocoDirective, ChangelogComponent, DatePipe] }) export class ManageSystemComponent implements OnInit { diff --git a/UI/Web/src/app/admin/manage-tasks-settings/manage-tasks-settings.component.html b/UI/Web/src/app/admin/manage-tasks-settings/manage-tasks-settings.component.html index 28c2dd867..443047c2f 100644 --- a/UI/Web/src/app/admin/manage-tasks-settings/manage-tasks-settings.component.html +++ b/UI/Web/src/app/admin/manage-tasks-settings/manage-tasks-settings.component.html @@ -1,6 +1,6 @@ -
      -
      + @if (serverSettings) { +

      {{t('title')}}

      @@ -150,29 +150,43 @@

      {{t('recurring-tasks-title')}}

      - - - - - - - - - - @for(task of recurringTasks$ | async; track task; let idx = $index) { - - - - - - } - -
      {{t('job-title-header')}}{{t('last-executed-header')}}{{t('cron-header')}}
      - {{task.title | titlecase}} - - {{task.lastExecutionUtc | utcToLocalTime | defaultValue }} - {{task.cron}}
      - -
      + + + + {{t('job-title-header')}} + + + {{item.title | titlecase}} + + + + + + + {{t('last-executed-header')}} + + + {{item.lastExecutionUtc | utcToLocalTime | defaultValue }} + + + + + + {{t('cron-header')}} + + + {{item.cron}} + + + + + }       diff --git a/UI/Web/src/app/admin/manage-tasks-settings/manage-tasks-settings.component.ts b/UI/Web/src/app/admin/manage-tasks-settings/manage-tasks-settings.component.ts index acfbe89f4..acfce84ec 100644 --- a/UI/Web/src/app/admin/manage-tasks-settings/manage-tasks-settings.component.ts +++ b/UI/Web/src/app/admin/manage-tasks-settings/manage-tasks-settings.component.ts @@ -3,24 +3,35 @@ import {FormControl, FormGroup, ReactiveFormsModule, Validators} from '@angular/ import {ToastrService} from 'ngx-toastr'; import {SettingsService} from '../settings.service'; import {ServerSettings} from '../_models/server-settings'; -import {shareReplay, take} from 'rxjs/operators'; -import {debounceTime, defer, distinctUntilChanged, filter, forkJoin, Observable, of, switchMap, tap} from 'rxjs'; +import {shareReplay} from 'rxjs/operators'; +import { + catchError, + debounceTime, + defer, + distinctUntilChanged, + filter, + forkJoin, + Observable, + of, + switchMap, + tap +} from 'rxjs'; import {ServerService} from 'src/app/_services/server.service'; import {Job} from 'src/app/_models/job/job'; -import {UpdateNotificationModalComponent} from 'src/app/shared/update-notification/update-notification-modal.component'; -import {NgbModal, NgbTooltip} from '@ng-bootstrap/ng-bootstrap'; +import {UpdateNotificationModalComponent} from 'src/app/announcements/_components/update-notification/update-notification-modal.component'; +import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {DownloadService} from 'src/app/shared/_services/download.service'; import {DefaultValuePipe} from '../../_pipes/default-value.pipe'; -import {AsyncPipe, DatePipe, NgFor, NgIf, NgTemplateOutlet, TitleCasePipe} from '@angular/common'; +import {AsyncPipe, TitleCasePipe} from '@angular/common'; import {translate, TranslocoModule} from "@jsverse/transloco"; import {TranslocoLocaleModule} from "@jsverse/transloco-locale"; import {UtcToLocalTimePipe} from "../../_pipes/utc-to-local-time.pipe"; import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; import {SettingItemComponent} from "../../settings/_components/setting-item/setting-item.component"; -import {ConfirmService} from "../../shared/confirm.service"; import {SettingButtonComponent} from "../../settings/_components/setting-button/setting-button.component"; import {DefaultModalOptions} from "../../_models/default-modal-options"; +import {ColumnMode, NgxDatatableModule} from "@siemens/ngx-datatable"; interface AdhocTask { name: string; @@ -31,19 +42,18 @@ interface AdhocTask { } @Component({ - selector: 'app-manage-tasks-settings', - templateUrl: './manage-tasks-settings.component.html', - styleUrls: ['./manage-tasks-settings.component.scss'], - standalone: true, - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [NgIf, ReactiveFormsModule, NgbTooltip, NgFor, AsyncPipe, TitleCasePipe, DatePipe, DefaultValuePipe, - TranslocoModule, NgTemplateOutlet, TranslocoLocaleModule, UtcToLocalTimePipe, SettingItemComponent, SettingButtonComponent] + selector: 'app-manage-tasks-settings', + templateUrl: './manage-tasks-settings.component.html', + styleUrls: ['./manage-tasks-settings.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ReactiveFormsModule, AsyncPipe, TitleCasePipe, DefaultValuePipe, + TranslocoModule, TranslocoLocaleModule, UtcToLocalTimePipe, SettingItemComponent, + SettingButtonComponent, NgxDatatableModule] }) export class ManageTasksSettingsComponent implements OnInit { private readonly cdRef = inject(ChangeDetectorRef); private readonly destroyRef = inject(DestroyRef); - private readonly confirmService = inject(ConfirmService); private readonly settingsService = inject(SettingsService); private readonly toastr = inject(ToastrService); private readonly serverService = inject(ServerService); @@ -106,13 +116,6 @@ export class ManageTasksSettingsComponent implements OnInit { api: defer(() => of(this.downloadService.download('logs', undefined))), successMessage: '' }, - // TODO: Remove this in v0.9. Users should have all updated by then - { - name: 'analyze-files-task', - description: 'analyze-files-task-desc', - api: this.serverService.analyzeFiles(), - successMessage: 'analyze-files-task-success' - }, { name: 'sync-themes-task', description: 'sync-themes-task-desc', @@ -134,6 +137,7 @@ export class ManageTasksSettingsComponent implements OnInit { } }, ]; + customOption = 'custom'; @@ -180,9 +184,15 @@ export class ManageTasksSettingsComponent implements OnInit { // }), switchMap(_ => { const data = this.packData(); - return this.settingsService.updateServerSettings(data); + return this.settingsService.updateServerSettings(data).pipe(catchError(err => { + console.error(err); + return of(null); + })); }), tap(settings => { + if (!settings) { + return; + } this.serverSettings = settings; this.recurringTasks$ = this.serverService.getRecurringJobs().pipe(shareReplay()); @@ -305,7 +315,6 @@ export class ManageTasksSettingsComponent implements OnInit { modelSettings.taskCleanup = this.settingsForm.get('taskCleanupCustom')?.value; } - console.log('modelSettings: ', modelSettings); return modelSettings; } @@ -323,4 +332,5 @@ export class ManageTasksSettingsComponent implements OnInit { } + protected readonly ColumnMode = ColumnMode; } diff --git a/UI/Web/src/app/admin/manage-user-tokens/manage-user-tokens.component.html b/UI/Web/src/app/admin/manage-user-tokens/manage-user-tokens.component.html new file mode 100644 index 000000000..ad856dde6 --- /dev/null +++ b/UI/Web/src/app/admin/manage-user-tokens/manage-user-tokens.component.html @@ -0,0 +1,49 @@ + +

      {{t('description')}}

      + + + + + + + {{t('username-header')}} + + + {{item.username}} + + + + + + + {{t('anilist-header')}} + + + @if (item.isAniListTokenSet) { + {{t('token-set-label')}} {{t('expires-label', {date: item.aniListValidUntilUtc | utcToLocalTime})}} + } @else { + {{null | defaultValue}} + } + + + + + + {{t('mal-header')}} + + + @if (item.isMalTokenSet) { + {{t('token-set-label')}} + } @else { + {{null | defaultValue}} + } + + + +       diff --git a/UI/Web/src/app/admin/manage-user-tokens/manage-user-tokens.component.scss b/UI/Web/src/app/admin/manage-user-tokens/manage-user-tokens.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/UI/Web/src/app/admin/manage-user-tokens/manage-user-tokens.component.ts b/UI/Web/src/app/admin/manage-user-tokens/manage-user-tokens.component.ts new file mode 100644 index 000000000..e2b3ee3b0 --- /dev/null +++ b/UI/Web/src/app/admin/manage-user-tokens/manage-user-tokens.component.ts @@ -0,0 +1,47 @@ +import {ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, OnInit} from '@angular/core'; +import {TranslocoDirective} from "@jsverse/transloco"; +import {MemberService} from "../../_services/member.service"; +import {DefaultValuePipe} from "../../_pipes/default-value.pipe"; +import {UtcToLocalTimePipe} from "../../_pipes/utc-to-local-time.pipe"; +import {VirtualScrollerModule} from "@iharbeck/ngx-virtual-scroller"; +import {UserTokenInfo} from "../../_models/kavitaplus/user-token-info"; +import {ColumnMode, NgxDatatableModule} from "@siemens/ngx-datatable"; + +@Component({ + selector: 'app-manage-user-tokens', + imports: [ + TranslocoDirective, + DefaultValuePipe, + UtcToLocalTimePipe, + VirtualScrollerModule, + NgxDatatableModule + ], + templateUrl: './manage-user-tokens.component.html', + styleUrl: './manage-user-tokens.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class ManageUserTokensComponent implements OnInit { + + private readonly cdRef = inject(ChangeDetectorRef); + private readonly memberService = inject(MemberService); + + isLoading = true; + users: UserTokenInfo[] = []; + + ngOnInit() { + this.loadData(); + } + + loadData() { + this.isLoading = true; + this.cdRef.markForCheck(); + + this.memberService.getUserTokenInfo().subscribe(users => { + this.users = users; + this.isLoading = false; + this.cdRef.markForCheck(); + }); + } + + protected readonly ColumnMode = ColumnMode; +} diff --git a/UI/Web/src/app/admin/manage-users/manage-users.component.html b/UI/Web/src/app/admin/manage-users/manage-users.component.html index 56cf5e20a..72c345edd 100644 --- a/UI/Web/src/app/admin/manage-users/manage-users.component.html +++ b/UI/Web/src/app/admin/manage-users/manage-users.component.html @@ -1,10 +1,12 @@
      -
      + + @@ -29,18 +31,22 @@ @if ((messageHub.onlineUsers$ | async)?.includes(member.username)) { {{t('online-now-tooltip')}} } @else { - {{member.lastActiveUtc | utcToLocalTime | timeAgo | sentenceCase | defaultDate}} + {{member.lastActiveUtc | utcToLocaleDate | timeAgo | sentenceCase | defaultDate}} }
      - @if (!hasAdminRole(member) && member.libraries.length > 0) { - @if (member.libraries.length > 5) { - {{t('too-many-libraries')}} - } - @else { - @for(lib of member.libraries; track lib.name) { - {{lib.name}} + @if (member.libraries.length > 0) { + @if (hasAdminRole(member) || member.libraries.length === libraryCount) { + {{t('all-libraries')}} + } @else { + @if (member.libraries.length > 5) { + {{t('too-many-libraries')}} + } + @else { + @for(lib of member.libraries; track lib.name) { + {{lib.name}} + } } } } @else { @@ -54,10 +60,10 @@ {{null | defaultValue}} } @else { @if (hasAdminRole(member)) { - {{t('admin')}} + {{Role.Admin | roleLocalized}} } @else { @for (role of roles; track role) { - {{role}} + {{role | roleLocalized}} } } } diff --git a/UI/Web/src/app/admin/manage-users/manage-users.component.scss b/UI/Web/src/app/admin/manage-users/manage-users.component.scss index 07014a105..070521edf 100644 --- a/UI/Web/src/app/admin/manage-users/manage-users.component.scss +++ b/UI/Web/src/app/admin/manage-users/manage-users.component.scss @@ -1,4 +1,4 @@ -@import '../../../theme/variables'; +@use '../../../theme/variables' as theme; .presence { font-size: 12px; @@ -36,13 +36,13 @@ } .table { - @media (max-width: $grid-breakpoints-lg) { + @media (max-width: theme.$grid-breakpoints-lg) { overflow-x: auto; width: 100% !important; display: block; } .btn-container { - @media (max-width: $grid-breakpoints-lg) { + @media (max-width: theme.$grid-breakpoints-lg) { display: flex; flex-direction: row; flex-wrap: wrap; diff --git a/UI/Web/src/app/admin/manage-users/manage-users.component.ts b/UI/Web/src/app/admin/manage-users/manage-users.component.ts index ad60e391a..6b62d6dc1 100644 --- a/UI/Web/src/app/admin/manage-users/manage-users.component.ts +++ b/UI/Web/src/app/admin/manage-users/manage-users.component.ts @@ -3,7 +3,7 @@ import {NgbModal, NgbTooltip} from '@ng-bootstrap/ng-bootstrap'; import {take} from 'rxjs/operators'; import {MemberService} from 'src/app/_services/member.service'; import {Member} from 'src/app/_models/auth/member'; -import {AccountService} from 'src/app/_services/account.service'; +import {AccountService, Role} from 'src/app/_services/account.service'; import {ToastrService} from 'ngx-toastr'; import {ResetPasswordModalComponent} from '../_modals/reset-password-modal/reset-password-modal.component'; import {ConfirmService} from 'src/app/shared/confirm.service'; @@ -12,31 +12,30 @@ import {InviteUserComponent} from '../invite-user/invite-user.component'; import {EditUserComponent} from '../edit-user/edit-user.component'; import {Router} from '@angular/router'; import {TagBadgeComponent} from '../../shared/tag-badge/tag-badge.component'; -import {AsyncPipe, DatePipe, NgClass, NgIf, TitleCasePipe} from '@angular/common'; -import {translate, TranslocoModule, TranslocoService} from "@jsverse/transloco"; +import {AsyncPipe, NgClass, TitleCasePipe} from '@angular/common'; +import {TranslocoModule, TranslocoService} from "@jsverse/transloco"; import {DefaultDatePipe} from "../../_pipes/default-date.pipe"; import {DefaultValuePipe} from "../../_pipes/default-value.pipe"; -import {ReadMoreComponent} from "../../shared/read-more/read-more.component"; import {UtcToLocalTimePipe} from "../../_pipes/utc-to-local-time.pipe"; -import {makeBindingParser} from "@angular/compiler"; import {LoadingComponent} from "../../shared/loading/loading.component"; import {TimeAgoPipe} from "../../_pipes/time-ago.pipe"; import {SentenceCasePipe} from "../../_pipes/sentence-case.pipe"; import {DefaultModalOptions} from "../../_models/default-modal-options"; +import {UtcToLocaleDatePipe} from "../../_pipes/utc-to-locale-date.pipe"; +import {RoleLocalizedPipe} from "../../_pipes/role-localized.pipe"; @Component({ - selector: 'app-manage-users', - templateUrl: './manage-users.component.html', - styleUrls: ['./manage-users.component.scss'], - standalone: true, - changeDetection: ChangeDetectionStrategy.OnPush, - imports: [NgbTooltip, TagBadgeComponent, AsyncPipe, TitleCasePipe, DatePipe, TranslocoModule, DefaultDatePipe, NgClass, DefaultValuePipe, ReadMoreComponent, UtcToLocalTimePipe, LoadingComponent, NgIf, TimeAgoPipe, SentenceCasePipe] + selector: 'app-manage-users', + templateUrl: './manage-users.component.html', + styleUrls: ['./manage-users.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [NgbTooltip, TagBadgeComponent, AsyncPipe, TitleCasePipe, TranslocoModule, DefaultDatePipe, NgClass, + DefaultValuePipe, UtcToLocalTimePipe, LoadingComponent, TimeAgoPipe, SentenceCasePipe, UtcToLocaleDatePipe, + RoleLocalizedPipe] }) export class ManageUsersComponent implements OnInit { - members: Member[] = []; - loggedInUsername = ''; - loadingMembers = false; + protected readonly Role = Role; private readonly translocoService = inject(TranslocoService); private readonly cdRef = inject(ChangeDetectorRef); @@ -48,6 +47,12 @@ export class ManageUsersComponent implements OnInit { public readonly messageHub = inject(MessageHubService); private readonly router = inject(Router); + members: Member[] = []; + loggedInUsername = ''; + loadingMembers = false; + libraryCount: number = 0; + + constructor() { this.accountService.currentUser$.pipe(take(1)).subscribe((user) => { if (user) { @@ -77,7 +82,11 @@ export class ManageUsersComponent implements OnInit { if (nameA < nameB) return -1; if (nameA > nameB) return 1; return 0; - }) + }); + + // Get the admin and get their library count + this.libraryCount = this.members.filter(m => this.hasAdminRole(m))[0].libraries.length; + this.loadingMembers = false; this.cdRef.markForCheck(); }); @@ -138,21 +147,11 @@ export class ManageUsersComponent implements OnInit { modalRef.componentInstance.member = member; } - formatLibraries(member: Member) { - if (member.libraries.length === 0) { - return translate('manage-users.none'); - } - - return member.libraries.map(item => item.name).join(', '); - } - hasAdminRole(member: Member) { - return member.roles.indexOf('Admin') >= 0; + return member.roles.indexOf(Role.Admin) >= 0; } getRoles(member: Member) { return member.roles.filter(item => item != 'Pleb'); } - - protected readonly makeBindingParser = makeBindingParser; } diff --git a/UI/Web/src/app/admin/role-selector/role-selector.component.html b/UI/Web/src/app/admin/role-selector/role-selector.component.html index 31b46a13e..89199a4e6 100644 --- a/UI/Web/src/app/admin/role-selector/role-selector.component.html +++ b/UI/Web/src/app/admin/role-selector/role-selector.component.html @@ -20,7 +20,7 @@
      - +
      } diff --git a/UI/Web/src/app/admin/role-selector/role-selector.component.ts b/UI/Web/src/app/admin/role-selector/role-selector.component.ts index 54ffe4ca5..d793e55b3 100644 --- a/UI/Web/src/app/admin/role-selector/role-selector.component.ts +++ b/UI/Web/src/app/admin/role-selector/role-selector.component.ts @@ -8,21 +8,20 @@ import { OnInit, Output } from '@angular/core'; -import { Member } from 'src/app/_models/auth/member'; -import { User } from 'src/app/_models/user'; +import {Member} from 'src/app/_models/auth/member'; +import {User} from 'src/app/_models/user'; import {AccountService} from 'src/app/_services/account.service'; -import { ReactiveFormsModule, FormsModule } from '@angular/forms'; -import { NgFor } from '@angular/common'; +import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {TranslocoDirective,} from "@jsverse/transloco"; import {SelectionModel} from "../../typeahead/_models/selection-model"; +import {RoleLocalizedPipe} from "../../_pipes/role-localized.pipe"; @Component({ - selector: 'app-role-selector', - templateUrl: './role-selector.component.html', - styleUrls: ['./role-selector.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [NgFor, ReactiveFormsModule, FormsModule, TranslocoDirective] + selector: 'app-role-selector', + templateUrl: './role-selector.component.html', + styleUrls: ['./role-selector.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [ReactiveFormsModule, FormsModule, TranslocoDirective, RoleLocalizedPipe] }) export class RoleSelectorComponent implements OnInit { diff --git a/UI/Web/src/app/admin/settings.service.ts b/UI/Web/src/app/admin/settings.service.ts index 4b0d30b8d..dc490beb7 100644 --- a/UI/Web/src/app/admin/settings.service.ts +++ b/UI/Web/src/app/admin/settings.service.ts @@ -4,6 +4,7 @@ import {map, of} from 'rxjs'; import { environment } from 'src/environments/environment'; import { TextResonse } from '../_types/text-response'; import { ServerSettings } from './_models/server-settings'; +import {MetadataSettings} from "./_models/metadata-settings"; /** * Used only for the Test Email Service call @@ -27,6 +28,13 @@ export class SettingsService { return this.http.get(this.baseUrl + 'settings'); } + getMetadataSettings() { + return this.http.get(this.baseUrl + 'settings/metadata-settings'); + } + updateMetadataSettings(model: MetadataSettings) { + return this.http.post(this.baseUrl + 'settings/metadata-settings', model); + } + updateServerSettings(model: ServerSettings) { return this.http.post(this.baseUrl + 'settings', model); } diff --git a/UI/Web/src/app/all-filters/all-filters.component.html b/UI/Web/src/app/all-filters/all-filters.component.html index 2f487574a..7b502232b 100644 --- a/UI/Web/src/app/all-filters/all-filters.component.html +++ b/UI/Web/src/app/all-filters/all-filters.component.html @@ -9,9 +9,7 @@ {{t('count', {count: filters.length | number})}} {{t('create')}} - - diff --git a/UI/Web/src/app/all-filters/all-filters.component.ts b/UI/Web/src/app/all-filters/all-filters.component.ts index 365f24150..40da8e10b 100644 --- a/UI/Web/src/app/all-filters/all-filters.component.ts +++ b/UI/Web/src/app/all-filters/all-filters.component.ts @@ -1,29 +1,22 @@ import {ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, OnInit} from '@angular/core'; import {JumpKey} from "../_models/jumpbar/jump-key"; import {TranslocoDirective} from "@jsverse/transloco"; -import {CardItemComponent} from "../cards/card-item/card-item.component"; import { SideNavCompanionBarComponent } from "../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component"; import {SmartFilter} from "../_models/metadata/v2/smart-filter"; import {FilterService} from "../_services/filter.service"; -import {CardDetailLayoutComponent} from "../cards/card-detail-layout/card-detail-layout.component"; -import {SafeHtmlPipe} from "../_pipes/safe-html.pipe"; -import {Router, RouterLink} from "@angular/router"; +import {Router} from "@angular/router"; import {Series} from "../_models/series"; import {JumpbarService} from "../_services/jumpbar.service"; -import {Action, ActionFactoryService, ActionItem} from "../_services/action-factory.service"; -import {CardActionablesComponent} from "../_single-module/card-actionables/card-actionables.component"; +import {ActionFactoryService} from "../_services/action-factory.service"; import {ActionService} from "../_services/action.service"; -import {FilterPipe} from "../_pipes/filter.pipe"; -import {filter} from "rxjs"; import {ManageSmartFiltersComponent} from "../sidenav/_components/manage-smart-filters/manage-smart-filters.component"; import {DecimalPipe} from "@angular/common"; @Component({ selector: 'app-all-filters', - standalone: true, - imports: [TranslocoDirective, CardItemComponent, SideNavCompanionBarComponent, CardDetailLayoutComponent, SafeHtmlPipe, CardActionablesComponent, RouterLink, FilterPipe, ManageSmartFiltersComponent, DecimalPipe], + imports: [TranslocoDirective, SideNavCompanionBarComponent, ManageSmartFiltersComponent, DecimalPipe], templateUrl: './all-filters.component.html', styleUrl: './all-filters.component.scss', changeDetection: ChangeDetectionStrategy.OnPush @@ -36,7 +29,7 @@ export class AllFiltersComponent implements OnInit { private readonly actionFactory = inject(ActionFactoryService); private readonly actionService = inject(ActionService); - filterActions = this.actionFactory.getSmartFilterActions(this.handleAction.bind(this)); + jumpbarKeys: Array = []; filters: SmartFilter[] = []; isLoading = true; @@ -53,22 +46,4 @@ export class AllFiltersComponent implements OnInit { this.cdRef.markForCheck(); }); } - - async deleteFilter(filter: SmartFilter) { - await this.actionService.deleteFilter(filter.id, success => { - this.filters = this.filters.filter(f => f.id != filter.id); - this.jumpbarKeys = this.jumpbarService.getJumpKeys(this.filters, (s: Series) => s.name); - this.cdRef.markForCheck(); - }); - } - - async handleAction(action: ActionItem, filter: SmartFilter) { - switch (action.action) { - case(Action.Delete): - await this.deleteFilter(filter); - break; - default: - break; - } - } } diff --git a/UI/Web/src/app/all-series/_components/all-series/all-series.component.html b/UI/Web/src/app/all-series/_components/all-series/all-series.component.html index e1bdeb1ef..d573b0eb7 100644 --- a/UI/Web/src/app/all-series/_components/all-series/all-series.component.html +++ b/UI/Web/src/app/all-series/_components/all-series/all-series.component.html @@ -4,24 +4,29 @@

      {{title}}

      -
      {{t('series-count', {num: pagination.totalItems | number})}}
      + @if (pagination) { +
      {{t('series-count', {num: pagination.totalItems | number})}}
      + } - - - - - + @if (filter) { + + + + + + } + diff --git a/UI/Web/src/app/all-series/_components/all-series/all-series.component.ts b/UI/Web/src/app/all-series/_components/all-series/all-series.component.ts index 44b651875..ad4763b18 100644 --- a/UI/Web/src/app/all-series/_components/all-series/all-series.component.ts +++ b/UI/Web/src/app/all-series/_components/all-series/all-series.component.ts @@ -1,37 +1,45 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, - Component, DestroyRef, + Component, + DestroyRef, EventEmitter, - HostListener, inject, OnInit } from '@angular/core'; -import { Title } from '@angular/platform-browser'; -import { ActivatedRoute, Router } from '@angular/router'; -import { take, debounceTime } from 'rxjs/operators'; -import { BulkSelectionService } from 'src/app/cards/bulk-selection.service'; -import { FilterSettings } from 'src/app/metadata-filter/filter-settings'; -import { FilterUtilitiesService } from 'src/app/shared/_services/filter-utilities.service'; -import { UtilityService, KEY_CODES } from 'src/app/shared/_services/utility.service'; -import { JumpKey } from 'src/app/_models/jumpbar/jump-key'; -import { Pagination } from 'src/app/_models/pagination'; -import { Series } from 'src/app/_models/series'; -import { FilterEvent } from 'src/app/_models/metadata/series-filter'; -import { Action, ActionItem } from 'src/app/_services/action-factory.service'; -import { ActionService } from 'src/app/_services/action.service'; -import { JumpbarService } from 'src/app/_services/jumpbar.service'; -import { MessageHubService, Message, EVENTS } from 'src/app/_services/message-hub.service'; -import { SeriesService } from 'src/app/_services/series.service'; +import {Title} from '@angular/platform-browser'; +import {ActivatedRoute, Router} from '@angular/router'; +import {debounceTime, take} from 'rxjs/operators'; +import {BulkSelectionService} from 'src/app/cards/bulk-selection.service'; +import {FilterUtilitiesService} from 'src/app/shared/_services/filter-utilities.service'; +import {UtilityService} from 'src/app/shared/_services/utility.service'; +import {JumpKey} from 'src/app/_models/jumpbar/jump-key'; +import {Pagination} from 'src/app/_models/pagination'; +import {Series} from 'src/app/_models/series'; +import {FilterEvent, SortField} from 'src/app/_models/metadata/series-filter'; +import {Action, ActionItem} from 'src/app/_services/action-factory.service'; +import {ActionService} from 'src/app/_services/action.service'; +import {JumpbarService} from 'src/app/_services/jumpbar.service'; +import {EVENTS, Message, MessageHubService} from 'src/app/_services/message-hub.service'; +import {SeriesService} from 'src/app/_services/series.service'; import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; -import { SeriesCardComponent } from '../../../cards/series-card/series-card.component'; -import { CardDetailLayoutComponent } from '../../../cards/card-detail-layout/card-detail-layout.component'; -import { BulkOperationsComponent } from '../../../cards/bulk-operations/bulk-operations.component'; -import { NgIf, DecimalPipe } from '@angular/common'; -import { SideNavCompanionBarComponent } from '../../../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component'; +import {SeriesCardComponent} from '../../../cards/series-card/series-card.component'; +import {CardDetailLayoutComponent} from '../../../cards/card-detail-layout/card-detail-layout.component'; +import {BulkOperationsComponent} from '../../../cards/bulk-operations/bulk-operations.component'; +import {DecimalPipe} from '@angular/common'; +import { + SideNavCompanionBarComponent +} from '../../../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component'; import {translate, TranslocoDirective} from "@jsverse/transloco"; -import {SeriesFilterV2} from "../../../_models/metadata/v2/series-filter-v2"; - +import {FilterV2} from "../../../_models/metadata/v2/filter-v2"; +import {FilterComparison} from "../../../_models/metadata/v2/filter-comparison"; +import {BrowseTitlePipe} from "../../../_pipes/browse-title.pipe"; +import {MetadataService} from "../../../_services/metadata.service"; +import {Observable} from "rxjs"; +import {FilterField} from "../../../_models/metadata/v2/filter-field"; +import {SeriesFilterSettings} from "../../../metadata-filter/filter-settings"; +import {FilterStatement} from "../../../_models/metadata/v2/filter-statement"; +import {Select2Option} from "ng-select2-component"; @Component({ @@ -39,22 +47,36 @@ import {SeriesFilterV2} from "../../../_models/metadata/v2/series-filter-v2"; templateUrl: './all-series.component.html', styleUrls: ['./all-series.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, - standalone: true, - imports: [SideNavCompanionBarComponent, NgIf, BulkOperationsComponent, CardDetailLayoutComponent, SeriesCardComponent, DecimalPipe, TranslocoDirective] + imports: [SideNavCompanionBarComponent, BulkOperationsComponent, CardDetailLayoutComponent, SeriesCardComponent, + DecimalPipe, TranslocoDirective], }) export class AllSeriesComponent implements OnInit { + private readonly destroyRef = inject(DestroyRef); + private readonly router = inject(Router); + private readonly seriesService = inject(SeriesService); + private readonly titleService = inject(Title); + private readonly actionService = inject(ActionService); + private readonly hubService = inject(MessageHubService); + private readonly utilityService = inject(UtilityService); + private readonly route = inject(ActivatedRoute); + private readonly filterUtilityService = inject(FilterUtilitiesService); + private readonly jumpbarService = inject(JumpbarService); + private readonly cdRef = inject(ChangeDetectorRef); + protected readonly bulkSelectionService = inject(BulkSelectionService); + protected readonly metadataService = inject(MetadataService); + title: string = translate('side-nav.all-series'); series: Series[] = []; loadingSeries = false; pagination: Pagination = new Pagination(); - filter: SeriesFilterV2 | undefined = undefined; - filterSettings: FilterSettings = new FilterSettings(); + filter: FilterV2 | undefined = undefined; + filterSettings: SeriesFilterSettings = new SeriesFilterSettings(); filterOpen: EventEmitter = new EventEmitter(); - filterActiveCheck!: SeriesFilterV2; + filterActiveCheck!: FilterV2; filterActive: boolean = false; jumpbarKeys: Array = []; - private readonly destroyRef = inject(DestroyRef); + browseTitlePipe = new BrowseTitlePipe(); bulkActionCallback = (action: ActionItem, data: any) => { const selectedSeriesIndexies = this.bulkSelectionService.getSelectedCardsForSource('series'); @@ -104,23 +126,48 @@ export class AllSeriesComponent implements OnInit { } } - constructor(private router: Router, private seriesService: SeriesService, - private titleService: Title, private actionService: ActionService, - public bulkSelectionService: BulkSelectionService, private hubService: MessageHubService, - private utilityService: UtilityService, private route: ActivatedRoute, - private filterUtilityService: FilterUtilitiesService, private jumpbarService: JumpbarService, - private readonly cdRef: ChangeDetectorRef) { + + + constructor() { this.router.routeReuseStrategy.shouldReuseRoute = () => false; - console.log('url: ', this.route.snapshot); - this.filterUtilityService.filterPresetsFromUrl(this.route.snapshot).subscribe(filter => { - this.filter = filter; - this.title = this.route.snapshot.queryParamMap.get('title') || this.filter.name || this.title; + + this.route.data.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(data => { + this.filter = data['filter'] as FilterV2; + + if (this.filter == null) { + this.filter = this.metadataService.createDefaultFilterDto('series'); + this.filter.statements.push(this.metadataService.createDefaultFilterStatement('series') as FilterStatement); + } + + this.title = this.route.snapshot.queryParamMap.get('title') || this.filter!.name || this.title; this.titleService.setTitle('Kavita - ' + this.title); - this.filterActiveCheck = this.filterUtilityService.createSeriesV2Filter(); - this.filterActiveCheck!.statements.push(this.filterUtilityService.createSeriesV2DefaultStatement()); - this.filterSettings.presetsV2 = this.filter; + + // To provide a richer experience, when we are browsing just a Genre/Tag/etc, we regenerate the title (if not explicitly passed) to "Browse {GenreName}" + if (this.shouldRewriteTitle()) { + const field = this.filter!.statements[0].field; + + // This api returns value as string and number, it will complain without the casting + (this.metadataService.getOptionsForFilterField(field, 'series') as Observable).subscribe((opts: Select2Option[]) => { + + const matchingOpts = opts.filter(m => `${m.value}` === `${this.filter!.statements[0].value}`); + if (matchingOpts.length === 0) return; + + const value = matchingOpts[0].label; + const newTitle = this.browseTitlePipe.transform(field, value); + if (newTitle !== '') { + this.title = newTitle; + this.titleService.setTitle('Kavita - ' + this.title); + this.cdRef.markForCheck(); + } + }); + + } + + this.filterActiveCheck = this.metadataService.createDefaultFilterDto('series'); + this.filterActiveCheck.statements.push(this.metadataService.createDefaultFilterStatement('series') as FilterStatement); + this.filterSettings.presetsV2 = this.filter; this.cdRef.markForCheck(); }); @@ -133,7 +180,11 @@ export class AllSeriesComponent implements OnInit { }); } - updateFilter(data: FilterEvent) { + shouldRewriteTitle() { + return this.title === translate('side-nav.all-series') && this.filter && this.filter.statements.length === 1 && this.filter.statements[0].comparison === FilterComparison.Equal + } + + updateFilter(data: FilterEvent) { if (data.filterV2 === undefined) return; this.filter = data.filterV2; @@ -142,7 +193,7 @@ export class AllSeriesComponent implements OnInit { return; } - this.filterUtilityService.updateUrlFromFilter(this.filter).subscribe((encodedFilter) => { + this.filterUtilityService.updateUrlFromFilter(this.filter).subscribe((_) => { this.loadPage(); }); } @@ -165,5 +216,5 @@ export class AllSeriesComponent implements OnInit { }); } - trackByIdentity = (index: number, item: Series) => `${item.name}_${item.localizedName}_${item.pagesRead}`; + trackByIdentity = (_: number, item: Series) => `${item.name}_${item.localizedName}_${item.pagesRead}`; } diff --git a/UI/Web/src/app/announcements/_components/announcements/announcements.component.ts b/UI/Web/src/app/announcements/_components/announcements/announcements.component.ts index b8cafec9c..83ae61300 100644 --- a/UI/Web/src/app/announcements/_components/announcements/announcements.component.ts +++ b/UI/Web/src/app/announcements/_components/announcements/announcements.component.ts @@ -7,8 +7,7 @@ import {TranslocoDirective} from "@jsverse/transloco"; selector: 'app-announcements', templateUrl: './announcements.component.html', styleUrls: ['./announcements.component.scss'], - standalone: true, - imports: [SideNavCompanionBarComponent, ChangelogComponent, TranslocoDirective] + imports: [SideNavCompanionBarComponent, ChangelogComponent, TranslocoDirective] }) export class AnnouncementsComponent { diff --git a/UI/Web/src/app/announcements/_components/changelog-update-item/changelog-update-item.component.html b/UI/Web/src/app/announcements/_components/changelog-update-item/changelog-update-item.component.html new file mode 100644 index 000000000..6f8411870 --- /dev/null +++ b/UI/Web/src/app/announcements/_components/changelog-update-item/changelog-update-item.component.html @@ -0,0 +1,39 @@ + + @if (update) { +
      + @if (update.blogPart) { +
      + +
      + } + +
      + + + + + + + + + +
      + + @if (showExtras) { +
      + +
      + {{t('published-label')}}{{update.publishDate | date: 'short'}} + @if (!update.isDocker && (accountService.isAdmin$ | async)) { + @if (update.updateVersion === update.currentVersion) { + {{t('installed')}} + } @else { + {{t('download')}} + } + } +
      + } +
      + } +       + diff --git a/UI/Web/src/app/announcements/_components/changelog-update-item/changelog-update-item.component.scss b/UI/Web/src/app/announcements/_components/changelog-update-item/changelog-update-item.component.scss new file mode 100644 index 000000000..9c2e6d76f --- /dev/null +++ b/UI/Web/src/app/announcements/_components/changelog-update-item/changelog-update-item.component.scss @@ -0,0 +1,13 @@ +.update-details { + border-radius: 0.5rem; +} + +:host ::ng-deep .blog-content { + margin-bottom: 1.5rem; + line-height: 1.6; + word-wrap: break-word; + + img { + max-width: 100% !important; + } +} diff --git a/UI/Web/src/app/announcements/_components/changelog-update-item/changelog-update-item.component.ts b/UI/Web/src/app/announcements/_components/changelog-update-item/changelog-update-item.component.ts new file mode 100644 index 000000000..bc0e15ccd --- /dev/null +++ b/UI/Web/src/app/announcements/_components/changelog-update-item/changelog-update-item.component.ts @@ -0,0 +1,30 @@ +import {ChangeDetectionStrategy, Component, inject, Input} from '@angular/core'; +import {SafeHtmlPipe} from "../../../_pipes/safe-html.pipe"; +import {UpdateSectionComponent} from "../update-section/update-section.component"; +import {AsyncPipe, DatePipe} from "@angular/common"; +import {UpdateVersionEvent} from "../../../_models/events/update-version-event"; +import {TranslocoDirective} from "@jsverse/transloco"; +import {AccountService} from "../../../_services/account.service"; + +@Component({ + selector: 'app-changelog-update-item', + imports: [ + SafeHtmlPipe, + UpdateSectionComponent, + AsyncPipe, + DatePipe, + TranslocoDirective + ], + templateUrl: './changelog-update-item.component.html', + styleUrl: './changelog-update-item.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class ChangelogUpdateItemComponent { + + protected readonly accountService = inject(AccountService); + + @Input({required:true}) update: UpdateVersionEvent | null = null; + @Input() index: number = 0; + @Input() showExtras: boolean = true; + +} diff --git a/UI/Web/src/app/announcements/_components/changelog/changelog.component.html b/UI/Web/src/app/announcements/_components/changelog/changelog.component.html index 6a526a46d..67b451754 100644 --- a/UI/Web/src/app/announcements/_components/changelog/changelog.component.html +++ b/UI/Web/src/app/announcements/_components/changelog/changelog.component.html @@ -1,37 +1,31 @@
      -

      - {{t('description', {installed: ''})}} - {{t('installed')}} - {{t('description-continued', {installed: ''})}} -

      @for(update of updates; track update; let indx = $index) { -
      -
      -

      {{update.updateTitle}}  - @if (update.isOnNightlyInRelease) { - {{t('nightly', {version: update.currentVersion})}} - } @else if (update.isReleaseEqual) { - {{t('installed')}} - } @else if (update.isReleaseNewer && indx === 0) { - {{t('available')}} - } -

      -
      {{t('published-label')}}{{update.publishDate | date: 'short'}}
      - - 
      -              
-
      - @if (!update.isDocker && (accountService.isAdmin$ | async)) { - @if (update.updateVersion === update.currentVersion) { - {{t('installed')}} - } @else { - {{t('download')}} - } - } +
      +
      +

      + +

      +
      +
      + + + +
      +
      } diff --git a/UI/Web/src/app/announcements/_components/changelog/changelog.component.scss b/UI/Web/src/app/announcements/_components/changelog/changelog.component.scss index 2046a4625..b9434f558 100644 --- a/UI/Web/src/app/announcements/_components/changelog/changelog.component.scss +++ b/UI/Web/src/app/announcements/_components/changelog/changelog.component.scss @@ -1,25 +1,8 @@ -.update-body { - width: 100%; - word-wrap: break-word; - white-space: pre-wrap; +.update-details { + border-radius: 0.5rem; } - -::ng-deep .changelog { - - h1 { - font-size: 26px; - } - - p, ul { - margin-bottom: 0px; - } - - img { - max-width: 100% !important; - } - - +.changelog-header { + color: var(--body-text-color); } - diff --git a/UI/Web/src/app/announcements/_components/changelog/changelog.component.ts b/UI/Web/src/app/announcements/_components/changelog/changelog.component.ts index 2ac5212bc..a464576fb 100644 --- a/UI/Web/src/app/announcements/_components/changelog/changelog.component.ts +++ b/UI/Web/src/app/announcements/_components/changelog/changelog.component.ts @@ -2,18 +2,26 @@ import {ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, OnInit} f import {UpdateVersionEvent} from 'src/app/_models/events/update-version-event'; import {ServerService} from 'src/app/_services/server.service'; import {LoadingComponent} from '../../../shared/loading/loading.component'; -import {ReadMoreComponent} from '../../../shared/read-more/read-more.component'; -import {AsyncPipe, DatePipe} from '@angular/common'; import {TranslocoDirective} from "@jsverse/transloco"; import {AccountService} from "../../../_services/account.service"; +import { + NgbAccordionBody, + NgbAccordionButton, + NgbAccordionCollapse, + NgbAccordionDirective, + NgbAccordionHeader, + NgbAccordionItem +} from "@ng-bootstrap/ng-bootstrap"; +import {ChangelogUpdateItemComponent} from "../changelog-update-item/changelog-update-item.component"; + @Component({ - selector: 'app-changelog', - templateUrl: './changelog.component.html', - styleUrls: ['./changelog.component.scss'], - standalone: true, - imports: [ReadMoreComponent, LoadingComponent, DatePipe, TranslocoDirective, AsyncPipe], - changeDetection: ChangeDetectionStrategy.OnPush + selector: 'app-changelog', + templateUrl: './changelog.component.html', + styleUrls: ['./changelog.component.scss'], + imports: [LoadingComponent, TranslocoDirective, NgbAccordionDirective, + NgbAccordionItem, NgbAccordionButton, NgbAccordionHeader, NgbAccordionCollapse, NgbAccordionBody, ChangelogUpdateItemComponent], + changeDetection: ChangeDetectionStrategy.OnPush }) export class ChangelogComponent implements OnInit { @@ -25,7 +33,7 @@ export class ChangelogComponent implements OnInit { isLoading: boolean = true; ngOnInit(): void { - this.serverService.getChangelog().subscribe(updates => { + this.serverService.getChangelog(7).subscribe(updates => { this.updates = updates; this.isLoading = false; this.cdRef.markForCheck(); diff --git a/UI/Web/src/app/announcements/_components/new-update-modal/new-update-modal.component.html b/UI/Web/src/app/announcements/_components/new-update-modal/new-update-modal.component.html new file mode 100644 index 000000000..d5842315b --- /dev/null +++ b/UI/Web/src/app/announcements/_components/new-update-modal/new-update-modal.component.html @@ -0,0 +1,14 @@ + +
      + +
      +
      + @if (update) { + + } +
      +
      + +
      + +       diff --git a/UI/Web/src/app/announcements/_components/new-update-modal/new-update-modal.component.scss b/UI/Web/src/app/announcements/_components/new-update-modal/new-update-modal.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/UI/Web/src/app/announcements/_components/new-update-modal/new-update-modal.component.ts b/UI/Web/src/app/announcements/_components/new-update-modal/new-update-modal.component.ts new file mode 100644 index 000000000..39268577a --- /dev/null +++ b/UI/Web/src/app/announcements/_components/new-update-modal/new-update-modal.component.ts @@ -0,0 +1,61 @@ +import {ChangeDetectionStrategy, ChangeDetectorRef, Component, inject, Input, OnInit} from '@angular/core'; +import {TranslocoDirective, TranslocoService} from "@jsverse/transloco"; +import {NgbActiveModal} from "@ng-bootstrap/ng-bootstrap"; +import {UpdateVersionEvent} from "../../../_models/events/update-version-event"; +import {UpdateSectionComponent} from "../update-section/update-section.component"; +import {SafeHtmlPipe} from "../../../_pipes/safe-html.pipe"; +import {VersionService} from "../../../_services/version.service"; +import {ChangelogUpdateItemComponent} from "../changelog-update-item/changelog-update-item.component"; + +/** + * This modal is used when an update occurred and the UI needs to be refreshed to get the latest JS libraries + */ +@Component({ + selector: 'app-new-update-modal', + imports: [ + TranslocoDirective, + ChangelogUpdateItemComponent + ], + templateUrl: './new-update-modal.component.html', + styleUrl: './new-update-modal.component.scss', + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class NewUpdateModalComponent { + + private readonly ngbModal = inject(NgbActiveModal); + private readonly translocoService = inject(TranslocoService); + + @Input({required: true}) version: string = ''; + @Input({required: true}) update: UpdateVersionEvent | null = null; + + close() { + this.ngbModal.dismiss(); + } + + refresh() { + this.bustLocaleCache(); + this.applyUpdate(this.version); + // Refresh manually + location.reload(); + } + + private applyUpdate(version: string): void { + this.bustLocaleCache(); + location.reload(); + } + + private bustLocaleCache() { + localStorage.removeItem('@transloco/translations/timestamp'); + localStorage.removeItem('@transloco/translations'); + localStorage.removeItem('translocoLang'); + const locale = localStorage.getItem('kavita-locale') || 'en'; + (this.translocoService as any).cache.delete(locale); + (this.translocoService as any).cache.clear(); + + // Retrigger transloco + setTimeout(() => { + this.translocoService.setActiveLang(locale); + }, 10); + } + +} diff --git a/UI/Web/src/app/announcements/_components/out-of-date-modal/out-of-date-modal.component.ts b/UI/Web/src/app/announcements/_components/out-of-date-modal/out-of-date-modal.component.ts index e5258bb09..7602737a9 100644 --- a/UI/Web/src/app/announcements/_components/out-of-date-modal/out-of-date-modal.component.ts +++ b/UI/Web/src/app/announcements/_components/out-of-date-modal/out-of-date-modal.component.ts @@ -1,26 +1,14 @@ -import {Component, DestroyRef, inject, Input} from '@angular/core'; +import {Component, inject, Input} from '@angular/core'; import {FormsModule} from "@angular/forms"; -import {AsyncPipe, NgForOf, NgIf} from "@angular/common"; -import {NgbActiveModal, NgbHighlight, NgbModal, NgbTypeahead} from "@ng-bootstrap/ng-bootstrap"; +import {NgbActiveModal} from "@ng-bootstrap/ng-bootstrap"; import {TranslocoDirective} from "@jsverse/transloco"; -import {ServerService} from "../../../_services/server.service"; -import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; -import {map} from "rxjs/operators"; -import {ChangelogComponent} from "../changelog/changelog.component"; import {SafeHtmlPipe} from "../../../_pipes/safe-html.pipe"; @Component({ selector: 'app-out-of-date-modal', - standalone: true, imports: [ FormsModule, - NgForOf, - NgIf, - NgbHighlight, - NgbTypeahead, TranslocoDirective, - AsyncPipe, - ChangelogComponent, SafeHtmlPipe ], templateUrl: './out-of-date-modal.component.html', diff --git a/UI/Web/src/app/shared/update-notification/update-notification-modal.component.html b/UI/Web/src/app/announcements/_components/update-notification/update-notification-modal.component.html similarity index 65% rename from UI/Web/src/app/shared/update-notification/update-notification-modal.component.html rename to UI/Web/src/app/announcements/_components/update-notification/update-notification-modal.component.html index 8a1ccd412..497c1a35d 100644 --- a/UI/Web/src/app/shared/update-notification/update-notification-modal.component.html +++ b/UI/Web/src/app/announcements/_components/update-notification/update-notification-modal.component.html @@ -4,13 +4,16 @@
      -
      {{updateData.updateTitle}}
      - 
      
+    @if (updateData) {
+      
+    }
   
      
 
   
      
     {{t('help')}}
     
-    {{t('download')}}
+    @if(!updateData.isDocker) {
+      {{t('download')}}
+    }
   
      
 
diff --git a/UI/Web/src/app/shared/update-notification/update-notification-modal.component.scss b/UI/Web/src/app/announcements/_components/update-notification/update-notification-modal.component.scss
similarity index 100%
rename from UI/Web/src/app/shared/update-notification/update-notification-modal.component.scss
rename to UI/Web/src/app/announcements/_components/update-notification/update-notification-modal.component.scss
diff --git a/UI/Web/src/app/shared/update-notification/update-notification-modal.component.ts b/UI/Web/src/app/announcements/_components/update-notification/update-notification-modal.component.ts
similarity index 68%
rename from UI/Web/src/app/shared/update-notification/update-notification-modal.component.ts
rename to UI/Web/src/app/announcements/_components/update-notification/update-notification-modal.component.ts
index 3504e55e8..01f7321d6 100644
--- a/UI/Web/src/app/shared/update-notification/update-notification-modal.component.ts
+++ b/UI/Web/src/app/announcements/_components/update-notification/update-notification-modal.component.ts
@@ -1,16 +1,15 @@
 import {ChangeDetectionStrategy, Component, Input, OnInit} from '@angular/core';
 import {NgbActiveModal, NgbModalModule} from '@ng-bootstrap/ng-bootstrap';
-import { UpdateVersionEvent } from 'src/app/_models/events/update-version-event';
+import {UpdateVersionEvent} from 'src/app/_models/events/update-version-event';
 import {CommonModule} from "@angular/common";
-import {SafeHtmlPipe} from "../../_pipes/safe-html.pipe";
 import {TranslocoDirective} from "@jsverse/transloco";
-import {WikiLink} from "../../_models/wiki";
+import {WikiLink} from "../../../_models/wiki";
+import {ChangelogUpdateItemComponent} from "../changelog-update-item/changelog-update-item.component";
 
 
 @Component({
   selector: 'app-update-notification-modal',
-  standalone: true,
-  imports: [CommonModule, NgbModalModule, SafeHtmlPipe, TranslocoDirective],
+  imports: [CommonModule, NgbModalModule, TranslocoDirective, ChangelogUpdateItemComponent],
   templateUrl: './update-notification-modal.component.html',
   styleUrls: ['./update-notification-modal.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush
@@ -20,6 +19,8 @@ export class UpdateNotificationModalComponent implements OnInit {
   @Input({required: true}) updateData!: UpdateVersionEvent;
   updateUrl: string = WikiLink.UpdateNative;
 
+  // TODO: I think I can remove this and just use NewUpdateModalComponent instead which handles both Nightly/Stable
+
   constructor(public modal: NgbActiveModal) { }
 
   ngOnInit() {
diff --git a/UI/Web/src/app/announcements/_components/update-section/update-section.component.html b/UI/Web/src/app/announcements/_components/update-section/update-section.component.html
new file mode 100644
index 000000000..45db97bac
--- /dev/null
+++ b/UI/Web/src/app/announcements/_components/update-section/update-section.component.html
@@ -0,0 +1,10 @@
+@if (items.length > 0) {
+  
      {{ title }}
+    {{items.length}}
+  
      
+  
        
+    @for(item of items; track item;) {
+      
      • {{item}}
        • 
+    }
+  
      
+}
diff --git a/UI/Web/src/app/announcements/_components/update-section/update-section.component.scss b/UI/Web/src/app/announcements/_components/update-section/update-section.component.scss
new file mode 100644
index 000000000..0e3b37fac
--- /dev/null
+++ b/UI/Web/src/app/announcements/_components/update-section/update-section.component.scss
@@ -0,0 +1,2 @@
+.code {
+}
diff --git a/UI/Web/src/app/announcements/_components/update-section/update-section.component.ts b/UI/Web/src/app/announcements/_components/update-section/update-section.component.ts
new file mode 100644
index 000000000..129174424
--- /dev/null
+++ b/UI/Web/src/app/announcements/_components/update-section/update-section.component.ts
@@ -0,0 +1,13 @@
+import {ChangeDetectionStrategy, Component, Input} from '@angular/core';
+
+@Component({
+    selector: 'app-update-section',
+    imports: [],
+    templateUrl: './update-section.component.html',
+    styleUrl: './update-section.component.scss',
+    changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class UpdateSectionComponent {
+  @Input({required: true}) items: Array = [];
+  @Input({required: true}) title: string = '';
+}
diff --git a/UI/Web/src/app/app-routing.module.ts b/UI/Web/src/app/app-routing.module.ts
index 32eae3b87..35e11c0f0 100644
--- a/UI/Web/src/app/app-routing.module.ts
+++ b/UI/Web/src/app/app-routing.module.ts
@@ -1,8 +1,7 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule, PreloadAllModules } from '@angular/router';
-import { AuthGuard } from './_guards/auth.guard';
-import { LibraryAccessGuard } from './_guards/library-access.guard';
-import { AdminGuard } from './_guards/admin.guard';
+import {NgModule} from '@angular/core';
+import {PreloadAllModules, RouterModule, Routes} from '@angular/router';
+import {AuthGuard} from './_guards/auth.guard';
+import {LibraryAccessGuard} from './_guards/library-access.guard';
 
 const routes: Routes = [
   {
@@ -51,8 +50,8 @@ const routes: Routes = [
         loadChildren: () => import('./_routes/person-detail-routing.module').then(m => m.routes)
       },
       {
-        path: 'browse/authors',
-        loadChildren: () => import('./_routes/browse-authors-routing.module').then(m => m.routes)
+        path: 'browse',
+        loadChildren: () => import('./_routes/browse-routing.module').then(m => m.routes)
       },
       {
         path: 'library',
diff --git a/UI/Web/src/app/app.component.scss b/UI/Web/src/app/app.component.scss
index e5061412b..f5b3cfda3 100644
--- a/UI/Web/src/app/app.component.scss
+++ b/UI/Web/src/app/app.component.scss
@@ -1,4 +1,4 @@
-@import '../theme/variables';
+@use '../theme/variables' as theme;
 
 .content-wrapper {
     padding: 0 0 0 10px;
@@ -59,7 +59,7 @@
   margin-left: var(--side-nav-width);
 }
 
-@media (max-width: $grid-breakpoints-lg) {
+@media (max-width: theme.$grid-breakpoints-lg) {
     ::ng-deep html {
         height: 100dvh !important;
     }
@@ -123,6 +123,7 @@
   filter: blur(20px);
   object-fit: contain;
   transform: scale(1.1);
+  mix-blend-mode: color;
 
   .background-area {
     position: absolute;
diff --git a/UI/Web/src/app/app.component.ts b/UI/Web/src/app/app.component.ts
index ba9c46a49..b27e5d485 100644
--- a/UI/Web/src/app/app.component.ts
+++ b/UI/Web/src/app/app.component.ts
@@ -19,22 +19,24 @@ import {SideNavComponent} from './sidenav/_components/side-nav/side-nav.componen
 import {NavHeaderComponent} from "./nav/_components/nav-header/nav-header.component";
 import {takeUntilDestroyed} from "@angular/core/rxjs-interop";
 import {ServerService} from "./_services/server.service";
-import {OutOfDateModalComponent} from "./announcements/_components/out-of-date-modal/out-of-date-modal.component";
 import {PreferenceNavComponent} from "./sidenav/preference-nav/preference-nav.component";
 import {Breakpoint, UtilityService} from "./shared/_services/utility.service";
 import {TranslocoService} from "@jsverse/transloco";
+import {VersionService} from "./_services/version.service";
+import {LicenseService} from "./_services/license.service";
+import {LocalizationService} from "./_services/localization.service";
 
 @Component({
     selector: 'app-root',
     templateUrl: './app.component.html',
     styleUrls: ['./app.component.scss'],
-    standalone: true,
-  imports: [NgClass, SideNavComponent, RouterOutlet, AsyncPipe, NavHeaderComponent, PreferenceNavComponent],
-  changeDetection: ChangeDetectionStrategy.OnPush
+    imports: [NgClass, SideNavComponent, RouterOutlet, AsyncPipe, NavHeaderComponent, PreferenceNavComponent],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class AppComponent implements OnInit {
+  protected readonly Breakpoint = Breakpoint;
+
 
-  transitionState$!: Observable;
 
   private readonly destroyRef = inject(DestroyRef);
   private readonly offcanvas = inject(NgbOffcanvas);
@@ -48,13 +50,16 @@ export class AppComponent implements OnInit {
   private readonly themeService = inject(ThemeService);
   private readonly document = inject(DOCUMENT);
   private readonly translocoService = inject(TranslocoService);
+  private readonly versionService = inject(VersionService); // Needs to be injected to run background job
+  private readonly licenseService = inject(LicenseService);
+  private readonly localizationService = inject(LocalizationService);
 
-  protected readonly Breakpoint = Breakpoint;
+  transitionState$!: Observable;
 
 
   constructor(ratingConfig: NgbRatingConfig, modalConfig: NgbModalConfig) {
 
-    modalConfig.fullscreen = 'md';
+    modalConfig.fullscreen = 'lg';
 
     // Setup default rating config
     ratingConfig.max = 5;
@@ -91,6 +96,7 @@ export class AppComponent implements OnInit {
       return user.preferences.noTransitions;
     }), takeUntilDestroyed(this.destroyRef));
 
+    this.localizationService.getLocales().subscribe(); // This will cache the localizations on startup
 
   }
 
@@ -101,6 +107,7 @@ export class AppComponent implements OnInit {
     const vh = window.innerHeight * 0.01;
     this.document.documentElement.style.setProperty('--vh', `${vh}px`);
     this.utilityService.activeBreakpointSource.next(this.utilityService.getActiveBreakpoint());
+    this.utilityService.updateUserBreakpoint();
   }
 
   ngOnInit(): void {
@@ -119,46 +126,8 @@ export class AppComponent implements OnInit {
     // Bootstrap anything that's needed
     this.themeService.getThemes().subscribe();
     this.libraryService.getLibraryNames().pipe(take(1), shareReplay({refCount: true, bufferSize: 1})).subscribe();
-
-    // Get the server version, compare vs localStorage, and if different bust locale cache
-    const versionKey = 'kavita--version';
-    this.serverService.getVersion(user.apiKey).subscribe(version => {
-      const cachedVersion = localStorage.getItem(versionKey);
-      console.log('Kavita version: ', version, ' Running version: ', cachedVersion);
-
-      if (cachedVersion == null || cachedVersion != version) {
-        // Bust locale cache
-        this.bustLocaleCache();
-        localStorage.setItem(versionKey, version);
-        location.reload();
-      }
-      localStorage.setItem(versionKey, version);
-    });
-
-    // Every hour, have the UI check for an update. People seriously stay out of date
-    interval(2* 60 * 60 * 1000) // 2 hours in milliseconds
-      .pipe(
-        switchMap(() => this.accountService.currentUser$),
-        filter(u => u !== undefined && this.accountService.hasAdminRole(u)),
-        switchMap(_ => this.serverService.checkHowOutOfDate()),
-        filter(versionOutOfDate => {
-          return !isNaN(versionOutOfDate) && versionOutOfDate > 2;
-        }),
-        tap(versionOutOfDate => {
-          if (!this.ngbModal.hasOpenModals()) {
-            const ref = this.ngbModal.open(OutOfDateModalComponent, {size: 'xl', fullscreen: 'md'});
-            ref.componentInstance.versionsOutOfDate = versionOutOfDate;
-          }
-        })
-      )
-      .subscribe();
-  }
-
-  private bustLocaleCache() {
-    localStorage.removeItem('@transloco/translations/timestamp');
-    localStorage.removeItem('@transloco/translations');
-    localStorage.removeItem('translocoLang');
-    (this.translocoService as any).cache.delete(localStorage.getItem('kavita-locale') || 'en');
-    (this.translocoService as any).cache.clear();
+    if (this.accountService.hasAdminRole(user)) {
+      this.licenseService.licenseInfo().subscribe();
+    }
   }
 }
diff --git a/UI/Web/src/app/book-reader/_components/book-line-overlay/book-line-overlay.component.ts b/UI/Web/src/app/book-reader/_components/book-line-overlay/book-line-overlay.component.ts
index 67a56903f..000a7fad2 100644
--- a/UI/Web/src/app/book-reader/_components/book-line-overlay/book-line-overlay.component.ts
+++ b/UI/Web/src/app/book-reader/_components/book-line-overlay/book-line-overlay.component.ts
@@ -23,12 +23,11 @@ enum BookLineOverlayMode {
 }
 
 @Component({
-  selector: 'app-book-line-overlay',
-  standalone: true,
+    selector: 'app-book-line-overlay',
     imports: [CommonModule, ReactiveFormsModule, TranslocoDirective],
-  templateUrl: './book-line-overlay.component.html',
-  styleUrls: ['./book-line-overlay.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+    templateUrl: './book-line-overlay.component.html',
+    styleUrls: ['./book-line-overlay.component.scss'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class BookLineOverlayComponent implements OnInit {
   @Input({required: true}) libraryId!: number;
diff --git a/UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.html b/UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.html
index cc61b8e5c..69e4faf7b 100644
--- a/UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.html
+++ b/UI/Web/src/app/book-reader/_components/book-reader/book-reader.component.html
@@ -20,25 +20,26 @@
         
      
         
      
           
      
-            
+            
+            @if (layoutMode !== BookPageLayoutMode.Default) {
+              @let vp = getVirtualPage();
               
      
                 
      
                   {{t('page-label')}}
                 
      
-                
      
-                  
                   
      {{vp[0]}}
      
                   
      
-                    
+                     
                   
      
-                  
      {{vp[1]}}
      
+                  
      {{vp[1]}}
      
                   
                 
      
               
      
-                  
-
+            }
             
      
               {{t('pagination-header')}}
             
      
@@ -60,6 +61,8 @@
                 {{t('settings-header')}}
                 
                    true', animate('4000ms'))
         ])
     ],
-    standalone: true,
-  imports: [NgTemplateOutlet, DrawerComponent, NgIf, NgbProgressbar, NgbNav, NgbNavItem, NgbNavItemRole, NgbNavLink,
-    NgbNavContent, ReaderSettingsComponent, TableOfContentsComponent, NgbNavOutlet, NgStyle, NgClass, NgbTooltip,
-    BookLineOverlayComponent, PersonalTableOfContentsComponent, TranslocoDirective]
+    imports: [NgTemplateOutlet, DrawerComponent, NgIf, NgbProgressbar, NgbNav, NgbNavItem, NgbNavItemRole, NgbNavLink,
+        NgbNavContent, ReaderSettingsComponent, TableOfContentsComponent, NgbNavOutlet, NgStyle, NgClass, NgbTooltip,
+        BookLineOverlayComponent, PersonalTableOfContentsComponent, TranslocoDirective]
 })
 export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
 
   private readonly route = inject(ActivatedRoute);
   private readonly router = inject(Router);
-  private readonly accountService = inject(AccountService);
   private readonly seriesService = inject(SeriesService);
   private readonly readerService = inject(ReaderService);
   private readonly renderer = inject(Renderer2);
@@ -123,6 +132,7 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
   private readonly utilityService = inject(UtilityService);
   private readonly libraryService = inject(LibraryService);
   private readonly themeService = inject(ThemeService);
+  private readonly confirmService = inject(ConfirmService);
   private readonly cdRef = inject(ChangeDetectorRef);
 
   protected readonly BookPageLayoutMode = BookPageLayoutMode;
@@ -136,7 +146,7 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
   volumeId!: number;
   chapterId!: number;
   chapter!: Chapter;
-  user!: User;
+  readingProfile!: ReadingProfile;
 
   /**
    * Reading List id. Defaults to -1.
@@ -505,7 +515,10 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
         this.handleScrollEvent();
     });
 
-    fromEvent(this.bookContainerElemRef.nativeElement, 'mousemove')
+    const mouseMove$ = fromEvent(this.bookContainerElemRef.nativeElement, 'mousemove');
+    const touchMove$ = fromEvent(this.bookContainerElemRef.nativeElement, 'touchmove');
+
+    merge(mouseMove$, touchMove$)
       .pipe(
         takeUntilDestroyed(this.destroyRef),
         distinctUntilChanged(),
@@ -517,7 +530,10 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
       )
       .subscribe();
 
-    fromEvent(this.bookContainerElemRef.nativeElement, 'mouseup')
+    const mouseUp$ = fromEvent(this.bookContainerElemRef.nativeElement, 'mouseup');
+    const touchEnd$ = fromEvent(this.bookContainerElemRef.nativeElement, 'touchend');
+
+    merge(mouseUp$, touchEnd$)
       .pipe(
         takeUntilDestroyed(this.destroyRef),
         distinctUntilChanged(),
@@ -592,7 +608,6 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
       return;
     }
 
-
     this.libraryId = parseInt(libraryId, 10);
     this.seriesId = parseInt(seriesId, 10);
     this.chapterId = parseInt(chapterId, 10);
@@ -605,19 +620,23 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
     }
     this.cdRef.markForCheck();
 
+    this.route.data.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(data => {
+      this.readingProfile = data['readingProfile'];
+      this.cdRef.markForCheck();
 
-    this.memberService.hasReadingProgress(this.libraryId).pipe(take(1)).subscribe(hasProgress => {
-      if (!hasProgress) {
-        this.toggleDrawer();
-        this.toastr.info(translate('toasts.book-settings-info'));
+      if (this.readingProfile == null) {
+        this.router.navigateByUrl('/home');
+        return;
       }
-    });
 
-    this.accountService.currentUser$.pipe(take(1)).subscribe(user => {
-      if (user) {
-        this.user = user;
-        this.init();
-      }
+      this.memberService.hasReadingProgress(this.libraryId).pipe(take(1)).subscribe(hasProgress => {
+        if (!hasProgress) {
+          this.toggleDrawer();
+          this.toastr.info(translate('toasts.book-settings-info'));
+        }
+      });
+
+      this.init();
     });
   }
 
@@ -652,7 +671,10 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
         this.chapters = results.chapters;
         this.pageNum = results.progress.pageNum;
         this.cdRef.markForCheck();
-        if (results.progress.bookScrollId) this.lastSeenScrollPartPath = results.progress.bookScrollId;
+
+        if (results.progress.bookScrollId) {
+          this.lastSeenScrollPartPath = results.progress.bookScrollId;
+        }
 
         this.continuousChaptersStack.push(this.chapterId);
 
@@ -706,6 +728,7 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
     // Update the window Height
     this.updateWidthAndHeightCalcs();
     this.updateImageSizes();
+
     const resumeElement = this.getFirstVisibleElementXPath();
     if (this.layoutMode !== BookPageLayoutMode.Default && resumeElement !== null && resumeElement !== undefined) {
       this.scrollTo(resumeElement); // This works pretty well, but not perfect
@@ -713,7 +736,7 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
   @HostListener('window:keydown', ['$event'])
-  handleKeyPress(event: KeyboardEvent) {
+  async handleKeyPress(event: KeyboardEvent) {
     const activeElement = document.activeElement as HTMLElement;
     const isInputFocused = activeElement.tagName === 'INPUT' || activeElement.tagName === 'TEXTAREA';
     if (isInputFocused) return;
@@ -731,7 +754,7 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
       event.stopPropagation();
       event.preventDefault();
     } else if (event.key === KEY_CODES.G) {
-      this.goToPage();
+      await this.goToPage();
     } else if (event.key === KEY_CODES.F) {
       this.toggleFullscreen()
     }
@@ -752,6 +775,7 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
     this.readerService.closeReader(this.readingListMode, this.readingListId);
   }
 
+
   sortElements(a: Element, b: Element) {
     const aTop = a.getBoundingClientRect().top;
       const bTop = b.getBoundingClientRect().top;
@@ -888,33 +912,35 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 
 
-  promptForPage() {
-    const question = translate('book-reader.go-to-page-prompt', {totalPages: this.maxPages - 1});
-    const goToPageNum = window.prompt(question, '');
+  async promptForPage() {
+    const promptConfig = {...this.confirmService.defaultPrompt};
+    // Pages are called sections in the UI, manga reader uses the go-to-page string so we use a different one here
+    promptConfig.header = translate('book-reader.go-to-section');
+    promptConfig.content = translate('book-reader.go-to-section-prompt', {totalSections: this.maxPages - 1});
+
+    const goToPageNum = await this.confirmService.prompt(undefined, promptConfig);
+
     if (goToPageNum === null || goToPageNum.trim().length === 0) { return null; }
     return goToPageNum;
   }
 
-  goToPage(pageNum?: number) {
+  async goToPage(pageNum?: number) {
     let page = pageNum;
     if (pageNum === null || pageNum === undefined) {
-      const goToPageNum = this.promptForPage();
+      const goToPageNum = await this.promptForPage();
       if (goToPageNum === null) { return; }
+
       page = parseInt(goToPageNum.trim(), 10);
     }
 
     if (page === undefined || this.pageNum === page) { return; }
 
-    if (page > this.maxPages) {
-      page = this.maxPages;
+    if (page > this.maxPages - 1) {
+      page = this.maxPages - 1;
     } else if (page < 0) {
       page = 0;
     }
 
-    if (!(page === 0 || page === this.maxPages - 1)) {
-      page -= 1;
-    }
-
     this.pageNum = page;
     this.loadPage();
   }
@@ -928,10 +954,9 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
 
     this.bookService.getBookPage(this.chapterId, this.pageNum).pipe(take(1)).subscribe(content => {
       this.isSingleImagePage = this.checkSingleImagePage(content) // This needs be performed before we set this.page to avoid image jumping
-      this.updateSingleImagePageStyles()
+      this.updateSingleImagePageStyles();
       this.page = this.domSanitizer.bypassSecurityTrustHtml(content); // PERF: Potential optimization to prefetch next/prev page and store in localStorage
 
-
       this.cdRef.markForCheck();
 
       setTimeout(() => {
@@ -1029,7 +1054,8 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
 
     // Virtual Paging stuff
     this.updateWidthAndHeightCalcs();
-    this.updateLayoutMode(this.layoutMode || BookPageLayoutMode.Default);
+    this.updateLayoutMode(this.layoutMode);
+    this.addEmptyPageIfRequired();
 
     // Find all the part ids and their top offset
     this.setupPageAnchors();
@@ -1038,13 +1064,13 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
     if (part !== undefined && part !== '') {
       this.scrollTo(part);
     } else if (scrollTop !== undefined && scrollTop !== 0) {
-      this.scrollService.scrollTo(scrollTop, this.reader.nativeElement);
+      setTimeout(() => this.scrollService.scrollTo(scrollTop, this.reader.nativeElement));
     } else if ((this.writingStyle === WritingStyle.Vertical) && (this.layoutMode === BookPageLayoutMode.Default)) {
        setTimeout(()=> this.scrollService.scrollToX(this.bookContentElemRef.nativeElement.clientWidth, this.reader.nativeElement));
     } else {
 
       if (this.layoutMode === BookPageLayoutMode.Default) {
-        this.scrollService.scrollTo(0, this.reader.nativeElement);
+        setTimeout(() => this.scrollService.scrollTo(0, this.reader.nativeElement));
       } else if (this.writingStyle === WritingStyle.Vertical) {
         if (this.pagingDirection === PAGING_DIRECTION.BACKWARDS) {
             setTimeout(() => this.scrollService.scrollTo(this.bookContentElemRef.nativeElement.scrollHeight, this.bookContentElemRef.nativeElement, 'auto'));
@@ -1069,6 +1095,29 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
     this.cdRef.markForCheck();
   }
 
+  private addEmptyPageIfRequired(): void {
+    if (this.layoutMode !== BookPageLayoutMode.Column2 || this.isSingleImagePage) {
+      return;
+    }
+
+    const [,, pageWidth] = this.getVirtualPage();
+    const actualWidth = this.bookContentElemRef.nativeElement.scrollWidth;
+    const lastPageWidth = actualWidth % pageWidth;
+
+    if (lastPageWidth >= pageWidth / 2 || lastPageWidth === 0) {
+      // The last page needs more than one column, no pages will be duplicated
+      return;
+    }
+
+    // Need to adjust height with the column gap to ensure we don't have too much extra page
+    const columnHeight = this.getPageHeight() - COLUMN_GAP;
+    const emptyPage = this.renderer.createElement('div');
+
+    this.renderer.setStyle(emptyPage, 'height', columnHeight + 'px');
+    this.renderer.setStyle(emptyPage, 'width', this.ColumnWidth);
+    this.renderer.appendChild(this.bookContentElemRef.nativeElement, emptyPage);
+  }
+
 
   goBack() {
     if (!this.adhocPageHistory.isEmpty()) {
@@ -1222,7 +1271,7 @@ export class BookReaderComponent implements OnInit, AfterViewInit, OnDestroy {
 
   /**
    * currentVirtualPage starts at 1
-   * @returns
+   * @returns currentVirtualPage, totalVirtualPages, pageSize
    */
   getVirtualPage() {
     if (!this.bookContentElemRef || !this.readingSectionElemRef) return [1, 1, 0];
diff --git a/UI/Web/src/app/book-reader/_components/personal-table-of-contents/personal-table-of-contents.component.ts b/UI/Web/src/app/book-reader/_components/personal-table-of-contents/personal-table-of-contents.component.ts
index c5e7bbc87..d45dfb60e 100644
--- a/UI/Web/src/app/book-reader/_components/personal-table-of-contents/personal-table-of-contents.component.ts
+++ b/UI/Web/src/app/book-reader/_components/personal-table-of-contents/personal-table-of-contents.component.ts
@@ -21,12 +21,11 @@ export interface PersonalToCEvent {
 }
 
 @Component({
-  selector: 'app-personal-table-of-contents',
-  standalone: true,
-  imports: [NgbTooltip, TranslocoDirective],
-  templateUrl: './personal-table-of-contents.component.html',
-  styleUrls: ['./personal-table-of-contents.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+    selector: 'app-personal-table-of-contents',
+    imports: [NgbTooltip, TranslocoDirective],
+    templateUrl: './personal-table-of-contents.component.html',
+    styleUrls: ['./personal-table-of-contents.component.scss'],
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class PersonalTableOfContentsComponent implements OnInit {
 
diff --git a/UI/Web/src/app/book-reader/_components/reader-settings/reader-settings.component.html b/UI/Web/src/app/book-reader/_components/reader-settings/reader-settings.component.html
index 5e2602807..a4bc4cdfa 100644
--- a/UI/Web/src/app/book-reader/_components/reader-settings/reader-settings.component.html
+++ b/UI/Web/src/app/book-reader/_components/reader-settings/reader-settings.component.html
@@ -1,172 +1,190 @@
-
-  
-  
      
-    
      
-      
      
-        
      
-          
-        
      
-        
      
-          
      
-            
-              
      
-                
      
-                  
      
-                    
-                    
+@if (readingProfile !== null) {
+  
+    
+    
+      
      
+        
      
+          
      
+            
+          
      
+          
      
+            
      
+              
+                
      
+                  
      
+                    
      
+                      
+                      
+                    
      
                   
      
-                
      
-                
      
-                  
-                  
+                  
      
+                    
+                    
                             
                             
                             
                         
-                
      
+                  
      
 
-                
      
-                  
-                  
-                            1x
-                            
-                            2.5x
+                  
      
+                    
+                    
+                      {{t('line-spacing-min-label')}}
+                      
+                      {{t('line-spacing-max-label')}}
                         
-                
      
+                  
      
 
-                
      
-                  
-                  
+                  
      
+                    
+                    
                             
                             
                             
                         
-                
      
+                  
      
 
-                
      
-                  
+                  
      
+                    
+                  
      
                 
      
-              
      
-            
+              
+            
      
+
           
      
 
         
      
 
-      
      
+        
      
+          
      
+            
+          
      
+          
      
+            
      
+              
+                
      
+                  
+                  
+                
      
+                
      
+                  
+                  {{t('writing-style-tooltip')}}
+                  
+                  
 
-      
      
-        
      
-          
-        
      
-        
      
-          
      
-            
-              
      
-                
-                
-              
      
-              
      
-                
-                {{t('writing-style-tooltip')}}
-                
-                
-
-              
      
-              
      
-                
-                {{t('tap-to-paginate-tooltip')}}
-                
      
+                
      
+                  
+                  {{t('tap-to-paginate-tooltip')}}
+                  
-                
      
-                  
-                  
+                  
      
+                    
+                    
+                  
      
                 
      
-              
      
-              
      
-                
-                {{t('immersive-mode-tooltip')}}
-                
      
         
      
-      
      
 
-      
      
-        
      
-          
+          
      
+          
      
+            
      
+              
+                
      
+                  
+                    
+                  
+                
      
+                    
+            
      
+          
      
+        
      
+
+        
      
+          
+          
-        
-        
      
-          
      
-            
-              
      
-                
-                  
-                
-              
      
-                  
-          
      
         
      
-      
      
-    
      
-  
 
-
+
+      
      
+    
+
+  
+}
diff --git a/UI/Web/src/app/book-reader/_components/reader-settings/reader-settings.component.ts b/UI/Web/src/app/book-reader/_components/reader-settings/reader-settings.component.ts
index 7e3f3110f..52c067a16 100644
--- a/UI/Web/src/app/book-reader/_components/reader-settings/reader-settings.component.ts
+++ b/UI/Web/src/app/book-reader/_components/reader-settings/reader-settings.component.ts
@@ -1,32 +1,46 @@
-import { DOCUMENT, NgFor, NgTemplateOutlet, NgIf, NgClass, NgStyle, TitleCasePipe } from '@angular/common';
+import {DOCUMENT, NgClass, NgFor, NgIf, NgStyle, NgTemplateOutlet, TitleCasePipe} from '@angular/common';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
-  Component, DestroyRef,
+  Component,
+  DestroyRef,
   EventEmitter,
   inject,
   Inject,
+  Input,
   OnInit,
   Output
 } from '@angular/core';
-import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
-import { take } from 'rxjs';
-import { BookPageLayoutMode } from 'src/app/_models/readers/book-page-layout-mode';
-import { BookTheme } from 'src/app/_models/preferences/book-theme';
-import { ReadingDirection } from 'src/app/_models/preferences/reading-direction';
-import { WritingStyle } from 'src/app/_models/preferences/writing-style';
-import { ThemeProvider } from 'src/app/_models/preferences/site-theme';
-import { User } from 'src/app/_models/user';
-import { AccountService } from 'src/app/_services/account.service';
-import { ThemeService } from 'src/app/_services/theme.service';
-import { FontFamily, BookService } from '../../_services/book.service';
-import { BookBlackTheme } from '../../_models/book-black-theme';
-import { BookDarkTheme } from '../../_models/book-dark-theme';
-import { BookWhiteTheme } from '../../_models/book-white-theme';
-import { BookPaperTheme } from '../../_models/book-paper-theme';
+import {FormControl, FormGroup, ReactiveFormsModule} from '@angular/forms';
+import {skip, take} from 'rxjs';
+import {BookPageLayoutMode} from 'src/app/_models/readers/book-page-layout-mode';
+import {BookTheme} from 'src/app/_models/preferences/book-theme';
+import {ReadingDirection} from 'src/app/_models/preferences/reading-direction';
+import {WritingStyle} from 'src/app/_models/preferences/writing-style';
+import {ThemeProvider} from 'src/app/_models/preferences/site-theme';
+import {User} from 'src/app/_models/user';
+import {AccountService} from 'src/app/_services/account.service';
+import {ThemeService} from 'src/app/_services/theme.service';
+import {BookService, FontFamily} from '../../_services/book.service';
+import {BookBlackTheme} from '../../_models/book-black-theme';
+import {BookDarkTheme} from '../../_models/book-dark-theme';
+import {BookWhiteTheme} from '../../_models/book-white-theme';
+import {BookPaperTheme} from '../../_models/book-paper-theme';
 import {takeUntilDestroyed} from "@angular/core/rxjs-interop";
-import { NgbAccordionDirective, NgbAccordionItem, NgbAccordionHeader, NgbAccordionToggle, NgbAccordionButton, NgbCollapse, NgbAccordionCollapse, NgbAccordionBody, NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
-import {TranslocoDirective} from "@jsverse/transloco";
+import {
+  NgbAccordionBody,
+  NgbAccordionButton,
+  NgbAccordionCollapse,
+  NgbAccordionDirective,
+  NgbAccordionHeader,
+  NgbAccordionItem,
+  NgbTooltip
+} from '@ng-bootstrap/ng-bootstrap';
+import {translate, TranslocoDirective} from "@jsverse/transloco";
+import {ReadingProfileService} from "../../../_services/reading-profile.service";
+import {ReadingProfile, ReadingProfileKind} from "../../../_models/preferences/reading-profiles";
+import {debounceTime, distinctUntilChanged, tap} from "rxjs/operators";
+import {ToastrService} from "ngx-toastr";
 
 /**
  * Used for book reader. Do not use for other components
@@ -89,10 +103,13 @@ const mobileBreakpointMarginOverride = 700;
     templateUrl: './reader-settings.component.html',
     styleUrls: ['./reader-settings.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
-  imports: [ReactiveFormsModule, NgbAccordionDirective, NgbAccordionItem, NgbAccordionHeader, NgbAccordionToggle, NgbAccordionButton, NgbCollapse, NgbAccordionCollapse, NgbAccordionBody, NgFor, NgbTooltip, NgTemplateOutlet, NgIf, NgClass, NgStyle, TitleCasePipe, TranslocoDirective]
+    imports: [ReactiveFormsModule, NgbAccordionDirective, NgbAccordionItem, NgbAccordionHeader, NgbAccordionButton,
+      NgbAccordionCollapse, NgbAccordionBody, NgFor, NgbTooltip, NgTemplateOutlet, NgIf, NgClass, NgStyle,
+      TitleCasePipe, TranslocoDirective]
 })
 export class ReaderSettingsComponent implements OnInit {
+  @Input({required:true}) seriesId!: number;
+  @Input({required:true}) readingProfile!: ReadingProfile;
   /**
    * Outputs when clickToPaginate is changed
    */
@@ -148,6 +165,11 @@ export class ReaderSettingsComponent implements OnInit {
 
   settingsForm: FormGroup = new FormGroup({});
 
+  /**
+   * The reading profile itself, unless readingProfile is implicit
+   */
+  parentReadingProfile: ReadingProfile | null = null;
+
   /**
    * System provided themes
    */
@@ -167,136 +189,169 @@ export class ReaderSettingsComponent implements OnInit {
     return WritingStyle;
   }
 
-
-
   constructor(private bookService: BookService, private accountService: AccountService,
     @Inject(DOCUMENT) private document: Document, private themeService: ThemeService,
-    private readonly cdRef: ChangeDetectorRef) {}
+    private readonly cdRef: ChangeDetectorRef, private readingProfileService: ReadingProfileService,
+              private toastr: ToastrService) {}
 
   ngOnInit(): void {
+    if (this.readingProfile.kind === ReadingProfileKind.Implicit) {
+      this.readingProfileService.getForSeries(this.seriesId, true).subscribe(parent => {
+        this.parentReadingProfile = parent;
+        this.cdRef.markForCheck();
+      })
+    } else {
+      this.parentReadingProfile = this.readingProfile;
+      this.cdRef.markForCheck();
+    }
 
     this.fontFamilies = this.bookService.getFontFamilies();
     this.fontOptions = this.fontFamilies.map(f => f.title);
+
+
+
     this.cdRef.markForCheck();
 
+    this.setupSettings();
+
+    this.setTheme(this.readingProfile.bookReaderThemeName || this.themeService.defaultBookTheme, false);
+    this.cdRef.markForCheck();
+
+    // Emit first time so book reader gets the setting
+    this.readingDirection.emit(this.readingDirectionModel);
+    this.bookReaderWritingStyle.emit(this.writingStyleModel);
+    this.clickToPaginateChanged.emit(this.readingProfile.bookReaderTapToPaginate);
+    this.layoutModeUpdate.emit(this.readingProfile.bookReaderLayoutMode);
+    this.immersiveMode.emit(this.readingProfile.bookReaderImmersiveMode);
+
     this.accountService.currentUser$.pipe(take(1)).subscribe(user => {
       if (user) {
         this.user = user;
-
-        if (this.user.preferences.bookReaderFontFamily === undefined) {
-          this.user.preferences.bookReaderFontFamily = 'default';
-        }
-        if (this.user.preferences.bookReaderFontSize === undefined || this.user.preferences.bookReaderFontSize < 50) {
-          this.user.preferences.bookReaderFontSize = 100;
-        }
-        if (this.user.preferences.bookReaderLineSpacing === undefined || this.user.preferences.bookReaderLineSpacing < 100) {
-          this.user.preferences.bookReaderLineSpacing = 100;
-        }
-        if (this.user.preferences.bookReaderMargin === undefined) {
-          this.user.preferences.bookReaderMargin = 0;
-        }
-        if (this.user.preferences.bookReaderReadingDirection === undefined) {
-          this.user.preferences.bookReaderReadingDirection = ReadingDirection.LeftToRight;
-        }
-        if (this.user.preferences.bookReaderWritingStyle === undefined) {
-          this.user.preferences.bookReaderWritingStyle = WritingStyle.Horizontal;
-        }
-        this.readingDirectionModel = this.user.preferences.bookReaderReadingDirection;
-        this.writingStyleModel = this.user.preferences.bookReaderWritingStyle;
-
-
-
-        this.settingsForm.addControl('bookReaderFontFamily', new FormControl(this.user.preferences.bookReaderFontFamily, []));
-        this.settingsForm.get('bookReaderFontFamily')!.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(fontName => {
-          const familyName = this.fontFamilies.filter(f => f.title === fontName)[0].family;
-          if (familyName === 'default') {
-            this.pageStyles['font-family'] = 'inherit';
-          } else {
-            this.pageStyles['font-family'] = "'" + familyName + "'";
-          }
-
-          this.styleUpdate.emit(this.pageStyles);
-        });
-
-        this.settingsForm.addControl('bookReaderFontSize', new FormControl(this.user.preferences.bookReaderFontSize, []));
-        this.settingsForm.get('bookReaderFontSize')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(value => {
-          this.pageStyles['font-size'] = value + '%';
-          this.styleUpdate.emit(this.pageStyles);
-        });
-
-        this.settingsForm.addControl('bookReaderTapToPaginate', new FormControl(this.user.preferences.bookReaderTapToPaginate, []));
-        this.settingsForm.get('bookReaderTapToPaginate')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(value => {
-          this.clickToPaginateChanged.emit(value);
-        });
-
-        this.settingsForm.addControl('bookReaderLineSpacing', new FormControl(this.user.preferences.bookReaderLineSpacing, []));
-        this.settingsForm.get('bookReaderLineSpacing')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(value => {
-          this.pageStyles['line-height'] = value + '%';
-          this.styleUpdate.emit(this.pageStyles);
-        });
-
-        this.settingsForm.addControl('bookReaderMargin', new FormControl(this.user.preferences.bookReaderMargin, []));
-        this.settingsForm.get('bookReaderMargin')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(value => {
-          this.pageStyles['margin-left'] = value + 'vw';
-          this.pageStyles['margin-right'] = value + 'vw';
-          this.styleUpdate.emit(this.pageStyles);
-        });
-
-
-
-        this.settingsForm.addControl('layoutMode', new FormControl(this.user.preferences.bookReaderLayoutMode || BookPageLayoutMode.Default, []));
-        this.settingsForm.get('layoutMode')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((layoutMode: BookPageLayoutMode) => {
-          this.layoutModeUpdate.emit(layoutMode);
-        });
-
-        this.settingsForm.addControl('bookReaderImmersiveMode', new FormControl(this.user.preferences.bookReaderImmersiveMode, []));
-        this.settingsForm.get('bookReaderImmersiveMode')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((immersiveMode: boolean) => {
-          if (immersiveMode) {
-            this.settingsForm.get('bookReaderTapToPaginate')?.setValue(true);
-          }
-          this.immersiveMode.emit(immersiveMode);
-        });
-
-
-        this.setTheme(this.user.preferences.bookReaderThemeName || this.themeService.defaultBookTheme);
-        this.cdRef.markForCheck();
-
-        // Emit first time so book reader gets the setting
-        this.readingDirection.emit(this.readingDirectionModel);
-        this.bookReaderWritingStyle.emit(this.writingStyleModel);
-        this.clickToPaginateChanged.emit(this.user.preferences.bookReaderTapToPaginate);
-        this.layoutModeUpdate.emit(this.user.preferences.bookReaderLayoutMode);
-        this.immersiveMode.emit(this.user.preferences.bookReaderImmersiveMode);
-
-        this.resetSettings();
-      } else {
-        this.resetSettings();
       }
 
-
+      // User needs to be loaded before we call this
+      this.resetSettings();
     });
   }
 
+  setupSettings() {
+    if (!this.readingProfile) return;
+
+    if (this.readingProfile.bookReaderFontFamily === undefined) {
+      this.readingProfile.bookReaderFontFamily = 'default';
+    }
+    if (this.readingProfile.bookReaderFontSize === undefined || this.readingProfile.bookReaderFontSize < 50) {
+      this.readingProfile.bookReaderFontSize = 100;
+    }
+    if (this.readingProfile.bookReaderLineSpacing === undefined || this.readingProfile.bookReaderLineSpacing < 100) {
+      this.readingProfile.bookReaderLineSpacing = 100;
+    }
+    if (this.readingProfile.bookReaderMargin === undefined) {
+      this.readingProfile.bookReaderMargin = 0;
+    }
+    if (this.readingProfile.bookReaderReadingDirection === undefined) {
+      this.readingProfile.bookReaderReadingDirection = ReadingDirection.LeftToRight;
+    }
+    if (this.readingProfile.bookReaderWritingStyle === undefined) {
+      this.readingProfile.bookReaderWritingStyle = WritingStyle.Horizontal;
+    }
+    this.readingDirectionModel = this.readingProfile.bookReaderReadingDirection;
+    this.writingStyleModel = this.readingProfile.bookReaderWritingStyle;
+
+    this.settingsForm.addControl('bookReaderFontFamily', new FormControl(this.readingProfile.bookReaderFontFamily, []));
+    this.settingsForm.get('bookReaderFontFamily')!.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(fontName => {
+      const familyName = this.fontFamilies.filter(f => f.title === fontName)[0].family;
+      if (familyName === 'default') {
+        this.pageStyles['font-family'] = 'inherit';
+      } else {
+        this.pageStyles['font-family'] = "'" + familyName + "'";
+      }
+
+      this.styleUpdate.emit(this.pageStyles);
+    });
+
+    this.settingsForm.addControl('bookReaderFontSize', new FormControl(this.readingProfile.bookReaderFontSize, []));
+    this.settingsForm.get('bookReaderFontSize')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(value => {
+      this.pageStyles['font-size'] = value + '%';
+      this.styleUpdate.emit(this.pageStyles);
+    });
+
+    this.settingsForm.addControl('bookReaderTapToPaginate', new FormControl(this.readingProfile.bookReaderTapToPaginate, []));
+    this.settingsForm.get('bookReaderTapToPaginate')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(value => {
+      this.clickToPaginateChanged.emit(value);
+    });
+
+    this.settingsForm.addControl('bookReaderLineSpacing', new FormControl(this.readingProfile.bookReaderLineSpacing, []));
+    this.settingsForm.get('bookReaderLineSpacing')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(value => {
+      this.pageStyles['line-height'] = value + '%';
+      this.styleUpdate.emit(this.pageStyles);
+    });
+
+    this.settingsForm.addControl('bookReaderMargin', new FormControl(this.readingProfile.bookReaderMargin, []));
+    this.settingsForm.get('bookReaderMargin')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(value => {
+      this.pageStyles['margin-left'] = value + 'vw';
+      this.pageStyles['margin-right'] = value + 'vw';
+      this.styleUpdate.emit(this.pageStyles);
+    });
+
+    this.settingsForm.addControl('layoutMode', new FormControl(this.readingProfile.bookReaderLayoutMode, []));
+    this.settingsForm.get('layoutMode')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((layoutMode: BookPageLayoutMode) => {
+      this.layoutModeUpdate.emit(layoutMode);
+    });
+
+    this.settingsForm.addControl('bookReaderImmersiveMode', new FormControl(this.readingProfile.bookReaderImmersiveMode, []));
+    this.settingsForm.get('bookReaderImmersiveMode')?.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((immersiveMode: boolean) => {
+      if (immersiveMode) {
+        this.settingsForm.get('bookReaderTapToPaginate')?.setValue(true);
+      }
+      this.immersiveMode.emit(immersiveMode);
+    });
+
+    // Update implicit reading profile while changing settings
+    this.settingsForm.valueChanges.pipe(
+      debounceTime(300),
+      distinctUntilChanged(),
+      skip(1), // Skip the initial creation of the form, we do not want an implicit profile of this snapshot
+      takeUntilDestroyed(this.destroyRef),
+      tap(_ => this.updateImplicit())
+    ).subscribe();
+  }
+
   resetSettings() {
+    if (!this.readingProfile) return;
+
     if (this.user) {
-      this.setPageStyles(this.user.preferences.bookReaderFontFamily, this.user.preferences.bookReaderFontSize + '%', this.user.preferences.bookReaderMargin + 'vw', this.user.preferences.bookReaderLineSpacing + '%');
+      this.setPageStyles(this.readingProfile.bookReaderFontFamily, this.readingProfile.bookReaderFontSize + '%', this.readingProfile.bookReaderMargin + 'vw', this.readingProfile.bookReaderLineSpacing + '%');
     } else {
       this.setPageStyles();
     }
 
-    this.settingsForm.get('bookReaderFontFamily')?.setValue(this.user.preferences.bookReaderFontFamily);
-    this.settingsForm.get('bookReaderFontSize')?.setValue(this.user.preferences.bookReaderFontSize);
-    this.settingsForm.get('bookReaderLineSpacing')?.setValue(this.user.preferences.bookReaderLineSpacing);
-    this.settingsForm.get('bookReaderMargin')?.setValue(this.user.preferences.bookReaderMargin);
-    this.settingsForm.get('bookReaderReadingDirection')?.setValue(this.user.preferences.bookReaderReadingDirection);
-    this.settingsForm.get('bookReaderTapToPaginate')?.setValue(this.user.preferences.bookReaderTapToPaginate);
-    this.settingsForm.get('bookReaderLayoutMode')?.setValue(this.user.preferences.bookReaderLayoutMode);
-    this.settingsForm.get('bookReaderImmersiveMode')?.setValue(this.user.preferences.bookReaderImmersiveMode);
-    this.settingsForm.get('bookReaderWritingStyle')?.setValue(this.user.preferences.bookReaderWritingStyle);
+    this.settingsForm.get('bookReaderFontFamily')?.setValue(this.readingProfile.bookReaderFontFamily);
+    this.settingsForm.get('bookReaderFontSize')?.setValue(this.readingProfile.bookReaderFontSize);
+    this.settingsForm.get('bookReaderLineSpacing')?.setValue(this.readingProfile.bookReaderLineSpacing);
+    this.settingsForm.get('bookReaderMargin')?.setValue(this.readingProfile.bookReaderMargin);
+    this.settingsForm.get('bookReaderReadingDirection')?.setValue(this.readingProfile.bookReaderReadingDirection);
+    this.settingsForm.get('bookReaderTapToPaginate')?.setValue(this.readingProfile.bookReaderTapToPaginate);
+    this.settingsForm.get('bookReaderLayoutMode')?.setValue(this.readingProfile.bookReaderLayoutMode);
+    this.settingsForm.get('bookReaderImmersiveMode')?.setValue(this.readingProfile.bookReaderImmersiveMode);
+    this.settingsForm.get('bookReaderWritingStyle')?.setValue(this.readingProfile.bookReaderWritingStyle);
+
     this.cdRef.detectChanges();
     this.styleUpdate.emit(this.pageStyles);
   }
 
+  updateImplicit() {
+    this.readingProfileService.updateImplicit(this.packReadingProfile(), this.seriesId).subscribe({
+      next: newProfile => {
+        this.readingProfile = newProfile;
+        this.cdRef.markForCheck();
+      },
+      error: err => {
+        console.error(err);
+      }
+    })
+  }
+
   /**
    * Internal method to be used by resetSettings. Pass items in with quantifiers
    */
@@ -319,11 +374,15 @@ export class ReaderSettingsComponent implements OnInit {
     };
   }
 
-  setTheme(themeName: string) {
+  setTheme(themeName: string, update: boolean = true) {
     const theme = this.themes.find(t => t.name === themeName);
     this.activeTheme = theme;
     this.cdRef.markForCheck();
     this.colorThemeUpdate.emit(theme);
+
+    if (update) {
+      this.updateImplicit();
+    }
   }
 
   toggleReadingDirection() {
@@ -335,6 +394,7 @@ export class ReaderSettingsComponent implements OnInit {
 
     this.cdRef.markForCheck();
     this.readingDirection.emit(this.readingDirectionModel);
+    this.updateImplicit();
   }
 
   toggleWritingStyle() {
@@ -346,6 +406,7 @@ export class ReaderSettingsComponent implements OnInit {
 
     this.cdRef.markForCheck();
     this.bookReaderWritingStyle.emit(this.writingStyleModel);
+    this.updateImplicit();
   }
 
   toggleFullscreen() {
@@ -353,4 +414,53 @@ export class ReaderSettingsComponent implements OnInit {
     this.cdRef.markForCheck();
     this.fullscreen.emit();
   }
+
+  // menu only code
+  updateParentPref() {
+    if (this.readingProfile.kind !== ReadingProfileKind.Implicit) {
+      return;
+    }
+
+    this.readingProfileService.updateParentProfile(this.seriesId, this.packReadingProfile()).subscribe(newProfile => {
+      this.readingProfile = newProfile;
+      this.toastr.success(translate('manga-reader.reading-profile-updated'));
+      this.cdRef.markForCheck();
+    });
+  }
+
+  createNewProfileFromImplicit() {
+    if (this.readingProfile.kind !== ReadingProfileKind.Implicit) {
+      return;
+    }
+
+    this.readingProfileService.promoteProfile(this.readingProfile.id).subscribe(newProfile => {
+      this.readingProfile = newProfile;
+      this.parentReadingProfile = newProfile; // profile is no longer implicit
+      this.cdRef.markForCheck();
+
+      this.toastr.success(translate("manga-reader.reading-profile-promoted"));
+    });
+  }
+
+  private packReadingProfile(): ReadingProfile {
+    const modelSettings = this.settingsForm.getRawValue();
+    const data = {...this.readingProfile!};
+    data.bookReaderFontFamily = modelSettings.bookReaderFontFamily;
+    data.bookReaderFontSize = modelSettings.bookReaderFontSize
+    data.bookReaderLineSpacing = modelSettings.bookReaderLineSpacing;
+    data.bookReaderMargin = modelSettings.bookReaderMargin;
+    data.bookReaderTapToPaginate = modelSettings.bookReaderTapToPaginate;
+    data.bookReaderLayoutMode = modelSettings.layoutMode;
+    data.bookReaderImmersiveMode = modelSettings.bookReaderImmersiveMode;
+
+    data.bookReaderReadingDirection = this.readingDirectionModel;
+    data.bookReaderWritingStyle = this.writingStyleModel;
+    if (this.activeTheme) {
+      data.bookReaderThemeName = this.activeTheme.name;
+    }
+
+    return data;
+  }
+
+  protected readonly ReadingProfileKind = ReadingProfileKind;
 }
diff --git a/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.html b/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.html
index 1b6982af9..ead8b3540 100644
--- a/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.html
+++ b/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.html
@@ -1,26 +1,36 @@
 
   
      
-    
      
-      {{t('no-data')}}
-    
      
-    
      
-      
-    
      
-    
-      
        
-        
      • 
-          {{chapterGroup.title}}
-        
        • 
-        
          
-          
        • 
-            {{chapter.title}}
-          
          • 
+    @if (chapters.length === 0) {
+      
          
+        {{t('no-data')}}
+      
          
+    } @else if (chapters.length === 1) {
+      
          
+        
            
+          @for(chapter of chapters[0].children; track chapter.title) {
+            
          • 
+              {{chapter.title}}
+            
            • 
+          }
         
          
-      
        
-    
+      
      
+    } @else {
+      @for (chapterGroup of chapters; track chapterGroup.title + chapterGroup.children.length) {
+        
        
+          
      • 
+            {{chapterGroup.title}}
+          
        • 
+          @for(chapter of chapterGroup.children; track chapter.title + chapter.part) {
+            
+          }
+        
      
+      }
+
+    }
+
   
      
 
diff --git a/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.scss b/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.scss
index e556f0e78..ca8e747f4 100644
--- a/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.scss
+++ b/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.scss
@@ -3,9 +3,10 @@
 
     &.active {
         font-weight: bold;
+      color: var(--primary-color);
     }
 }
 
 .chapter-title {
     padding-inline-start: 1rem;
-}
\ No newline at end of file
+}
diff --git a/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.ts b/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.ts
index ecc6997c7..ce3a180ed 100644
--- a/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.ts
+++ b/UI/Web/src/app/book-reader/_components/table-of-contents/table-of-contents.component.ts
@@ -1,17 +1,27 @@
-import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
-import { BookChapterItem } from '../../_models/book-chapter-item';
-import { NgIf, NgFor } from '@angular/common';
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  inject,
+  Input,
+  OnChanges,
+  Output,
+  SimpleChanges
+} from '@angular/core';
+import {BookChapterItem} from '../../_models/book-chapter-item';
 import {TranslocoDirective} from "@jsverse/transloco";
 
 @Component({
-    selector: 'app-table-of-contents',
-    templateUrl: './table-of-contents.component.html',
-    styleUrls: ['./table-of-contents.component.scss'],
-    changeDetection: ChangeDetectionStrategy.Default,
-    standalone: true,
-  imports: [NgIf, NgFor, TranslocoDirective]
+  selector: 'app-table-of-contents',
+  templateUrl: './table-of-contents.component.html',
+  styleUrls: ['./table-of-contents.component.scss'],
+  imports: [TranslocoDirective],
+  changeDetection: ChangeDetectionStrategy.Default,
 })
-export class TableOfContentsComponent  {
+export class TableOfContentsComponent implements OnChanges {
+
+  private readonly cdRef = inject(ChangeDetectorRef);
 
   @Input({required: true}) chapterId!: number;
   @Input({required: true}) pageNum!: number;
@@ -20,7 +30,10 @@ export class TableOfContentsComponent  {
 
   @Output() loadChapter: EventEmitter<{pageNum: number, part: string}> = new EventEmitter();
 
-  constructor() {}
+  ngOnChanges(changes: SimpleChanges) {
+    //console.log('Current Page: ', this.pageNum, this.currentPageAnchor);
+    this.cdRef.markForCheck();
+  }
 
   cleanIdSelector(id: string) {
     const tokens = id.split('/');
@@ -33,4 +46,30 @@ export class TableOfContentsComponent  {
   loadChapterPage(pageNum: number, part: string) {
     this.loadChapter.emit({pageNum, part});
   }
+
+  isChapterSelected(chapterGroup: BookChapterItem) {
+    if (chapterGroup.page === this.pageNum) {
+      return true;
+    }
+
+    const idx = this.chapters.indexOf(chapterGroup);
+    if (idx < 0) {
+      return false; // should never happen
+    }
+
+    const nextIdx = idx + 1;
+    // Last chapter
+    if (nextIdx >= this.chapters.length) {
+      return chapterGroup.page < this.pageNum;
+    }
+
+    // Passed chapter, and next chapter has not been reached
+    const next = this.chapters[nextIdx];
+    return chapterGroup.page < this.pageNum && next.page > this.pageNum;
+  }
+
+  isAnchorSelected(chapter: BookChapterItem) {
+    return this.cleanIdSelector(chapter.part) === this.currentPageAnchor
+  }
+
 }
diff --git a/UI/Web/src/app/book-reader/_models/book-paper-theme.ts b/UI/Web/src/app/book-reader/_models/book-paper-theme.ts
index 69a6d4e5d..9b6a5d461 100644
--- a/UI/Web/src/app/book-reader/_models/book-paper-theme.ts
+++ b/UI/Web/src/app/book-reader/_models/book-paper-theme.ts
@@ -32,63 +32,66 @@ export const BookPaperTheme = `
     --accordion-active-body-bg-color: #F1E4D5;
 
     /* Buttons */
-      --btn-focus-boxshadow-color: rgb(255 255 255 / 50%);
-      --btn-primary-text-color: white;
-      --btn-primary-bg-color: var(--primary-color);
-      --btn-primary-border-color: var(--primary-color);
-      --btn-primary-hover-text-color: white;
-      --btn-primary-hover-bg-color: var(--primary-color-darker-shade);
-      --btn-primary-hover-border-color: var(--primary-color-darker-shade);
-      --btn-alt-bg-color: #424c72;
-      --btn-alt-border-color: #444f75;
-      --btn-alt-hover-bg-color: #3b4466;
-      --btn-alt-focus-bg-color: #343c59;
-      --btn-alt-focus-boxshadow-color: rgb(255 255 255 / 50%);
-      --btn-fa-icon-color: black;
-      --btn-disabled-bg-color: #343a40;
-      --btn-disabled-text-color: #efefef;
-      --btn-disabled-border-color: #6c757d;
+    --btn-focus-boxshadow-color: rgb(255 255 255 / 50%);
+    --btn-primary-text-color: white;
+    --btn-primary-bg-color: var(--primary-color);
+    --btn-primary-border-color: var(--primary-color);
+    --btn-primary-hover-text-color: white;
+    --btn-primary-hover-bg-color: var(--primary-color-darker-shade);
+    --btn-primary-hover-border-color: var(--primary-color-darker-shade);
+    --btn-alt-bg-color: #424c72;
+    --btn-alt-border-color: #444f75;
+    --btn-alt-hover-bg-color: #3b4466;
+    --btn-alt-focus-bg-color: #343c59;
+    --btn-alt-focus-boxshadow-color: rgb(255 255 255 / 50%);
+    --btn-fa-icon-color: black;
+    --btn-disabled-bg-color: #343a40;
+    --btn-disabled-text-color: #efefef;
+    --btn-disabled-border-color: #6c757d;
+    --btn-outline-primary-text-color: black;
 
-      /* Inputs */
-      --input-bg-color: white;
-      --input-bg-readonly-color: #F1E4D5;
-      --input-focused-border-color: #ccc;
-      --input-placeholder-color: black;
-      --input-border-color: #ccc;
-      --input-text-color: black;
-      --input-focus-boxshadow-color: rgb(255 255 255 / 50%);
+    /* Inputs */
+    --input-bg-color: white;
+    --input-bg-readonly-color: #F1E4D5;
+    --input-focused-border-color: #ccc;
+    --input-placeholder-color: black;
+    --input-border-color: #ccc;
+    --input-text-color: black;
+    --input-focus-boxshadow-color: rgb(255 255 255 / 50%);
 
-      /* Nav (Tabs) */
-      --nav-tab-border-color: rgba(44, 118, 88, 0.7);
-      --nav-tab-text-color: var(--body-text-color);
-      --nav-tab-bg-color: var(--primary-color);
-      --nav-tab-hover-border-color: var(--primary-color);
-      --nav-tab-active-text-color: white;
-      --nav-tab-border-hover-color: transparent;
-      --nav-tab-hover-text-color: var(--body-text-color);
-      --nav-tab-hover-bg-color: transparent;
-      --nav-tab-border-top: rgba(44, 118, 88, 0.7);
-      --nav-tab-border-left: rgba(44, 118, 88, 0.7);
-      --nav-tab-border-bottom: rgba(44, 118, 88, 0.7);
-      --nav-tab-border-right: rgba(44, 118, 88, 0.7);
-      --nav-tab-hover-border-top: rgba(44, 118, 88, 0.7);
-      --nav-tab-hover-border-left: rgba(44, 118, 88, 0.7);
-      --nav-tab-hover-border-bottom: var(--bs-body-bg);
-      --nav-tab-hover-border-right: rgba(44, 118, 88, 0.7);
-      --nav-tab-active-hover-bg-color: var(--primary-color);
-      --nav-link-bg-color: var(--primary-color);
-      --nav-link-active-text-color: white;
-      --nav-link-text-color: white;
+    /* Nav (Tabs) */
+    --nav-tab-border-color: rgba(44, 118, 88, 0.7);
+    --nav-tab-text-color: var(--body-text-color);
+    --nav-tab-bg-color: var(--primary-color);
+    --nav-tab-hover-border-color: var(--primary-color);
+    --nav-tab-active-text-color: white;
+    --nav-tab-border-hover-color: transparent;
+    --nav-tab-hover-text-color: var(--body-text-color);
+    --nav-tab-hover-bg-color: transparent;
+    --nav-tab-border-top: rgba(44, 118, 88, 0.7);
+    --nav-tab-border-left: rgba(44, 118, 88, 0.7);
+    --nav-tab-border-bottom: rgba(44, 118, 88, 0.7);
+    --nav-tab-border-right: rgba(44, 118, 88, 0.7);
+    --nav-tab-hover-border-top: rgba(44, 118, 88, 0.7);
+    --nav-tab-hover-border-left: rgba(44, 118, 88, 0.7);
+    --nav-tab-hover-border-bottom: var(--bs-body-bg);
+    --nav-tab-hover-border-right: rgba(44, 118, 88, 0.7);
+    --nav-tab-active-hover-bg-color: var(--primary-color);
+    --nav-link-bg-color: var(--primary-color);
+    --nav-link-active-text-color: white;
+    --nav-link-text-color: white;
 
-    /* Reading Bar */
-    --br-actionbar-button-hover-border-color: #6c757d;
-    --br-actionbar-bg-color: #F1E4D5;
+  /* Reading Bar */
+  --br-actionbar-button-hover-border-color: #6c757d;
+  --br-actionbar-bg-color: #F1E4D5;
 
-    /* Drawer */
-    --drawer-pagination-horizontal-rule: inset 0 -1px 0 rgb(0 0 0 / 13%);
+  /* Drawer */
+  --drawer-pagination-horizontal-rule: inset 0 -1px 0 rgb(0 0 0 / 13%);
 
-    /* Custom variables */
-    --theme-bg-color: #fff3c9;
+  /* Custom variables */
+  --theme-bg-color: #fff3c9;
+
+  --bs-secondary-bg: darkgrey;
 }
 
 .reader-container {
@@ -115,9 +118,8 @@ export const BookPaperTheme = `
 }
 
 .book-content img, .book-content img[src] {
-z-index: 1;
-filter: brightness(0.85) !important;
-background-color: initial !important;
+  z-index: 1;
+  background-color: initial !important;
 }
 
 
@@ -129,8 +131,12 @@ background-color: initial !important;
     color: #dcdcdc !important;
 }
 
-.book-content :visited, .book-content :visited *, .book-content :visited *[class] {color: rgb(240, 50, 50) !important}
-.book-content :link:not(cite), :link .book-content *:not(cite) {color: #00f !important}
+.book-content :visited, .book-content :visited *, .book-content :visited *[class] {
+  color: rgb(240, 50, 50) !important;
+}
+.book-content :link:not(cite), :link .book-content *:not(cite) {
+  color: #00f !important;
+}
 
 .btn-check:checked + .btn {
   color: white;
diff --git a/UI/Web/src/app/book-reader/_models/book-white-theme.ts b/UI/Web/src/app/book-reader/_models/book-white-theme.ts
index f25ab96a1..a209b954f 100644
--- a/UI/Web/src/app/book-reader/_models/book-white-theme.ts
+++ b/UI/Web/src/app/book-reader/_models/book-white-theme.ts
@@ -35,64 +35,65 @@ export const BookWhiteTheme = `
     --accordion-active-body-bg-color: white;
 
     /* Buttons */
-      --btn-focus-boxshadow-color: rgb(255 255 255 / 50%);
-      --btn-primary-text-color: white;
-      --btn-primary-bg-color: var(--primary-color);
-      --btn-primary-border-color: var(--primary-color);
-      --btn-primary-hover-text-color: white;
-      --btn-primary-hover-bg-color: var(--primary-color-darker-shade);
-      --btn-primary-hover-border-color: var(--primary-color-darker-shade);
-      --btn-alt-bg-color: #424c72;
-      --btn-alt-border-color: #444f75;
-      --btn-alt-hover-bg-color: #3b4466;
-      --btn-alt-focus-bg-color: #343c59;
-      --btn-alt-focus-boxshadow-color: rgb(255 255 255 / 50%);
-      --btn-fa-icon-color: black;
-      --btn-disabled-bg-color: #343a40;
-      --btn-disabled-text-color: #efefef;
-      --btn-disabled-border-color: #6c757d;
+    --btn-focus-boxshadow-color: rgb(255 255 255 / 50%);
+    --btn-primary-text-color: white;
+    --btn-primary-bg-color: var(--primary-color);
+    --btn-primary-border-color: var(--primary-color);
+    --btn-primary-hover-text-color: white;
+    --btn-primary-hover-bg-color: var(--primary-color-darker-shade);
+    --btn-primary-hover-border-color: var(--primary-color-darker-shade);
+    --btn-alt-bg-color: #424c72;
+    --btn-alt-border-color: #444f75;
+    --btn-alt-hover-bg-color: #3b4466;
+    --btn-alt-focus-bg-color: #343c59;
+    --btn-alt-focus-boxshadow-color: rgb(255 255 255 / 50%);
+    --btn-fa-icon-color: black;
+    --btn-disabled-bg-color: #343a40;
+    --btn-disabled-text-color: #efefef;
+    --btn-disabled-border-color: #6c757d;
+    --btn-outline-primary-text-color: black;
 
-      /* Inputs */
-      --input-bg-color: white;
-      --input-bg-readonly-color: white;
-      --input-focused-border-color: #ccc;
-      --input-text-color: black;
-      --input-placeholder-color: black;
-      --input-border-color: #ccc;
-      --input-focus-boxshadow-color: rgb(255 255 255 / 50%);
+    /* Inputs */
+    --input-bg-color: white;
+    --input-bg-readonly-color: white;
+    --input-focused-border-color: #ccc;
+    --input-text-color: black;
+    --input-placeholder-color: black;
+    --input-border-color: #ccc;
+    --input-focus-boxshadow-color: rgb(255 255 255 / 50%);
 
-      /* Nav (Tabs) */
-      --nav-tab-border-color: rgba(44, 118, 88, 0.7);
-      --nav-tab-text-color: var(--body-text-color);
-      --nav-tab-bg-color: var(--primary-color);
-      --nav-tab-hover-border-color: var(--primary-color);
-      --nav-tab-active-text-color: white;
-      --nav-tab-border-hover-color: transparent;
-      --nav-tab-hover-text-color: var(--body-text-color);
-      --nav-tab-hover-bg-color: transparent;
-      --nav-tab-border-top: rgba(44, 118, 88, 0.7);
-      --nav-tab-border-left: rgba(44, 118, 88, 0.7);
-      --nav-tab-border-bottom: rgba(44, 118, 88, 0.7);
-      --nav-tab-border-right: rgba(44, 118, 88, 0.7);
-      --nav-tab-hover-border-top: rgba(44, 118, 88, 0.7);
-      --nav-tab-hover-border-left: rgba(44, 118, 88, 0.7);
-      --nav-tab-hover-border-bottom: var(--bs-body-bg);
-      --nav-tab-hover-border-right: rgba(44, 118, 88, 0.7);
-      --nav-tab-active-hover-bg-color: var(--primary-color);
-      --nav-link-bg-color: var(--primary-color);
-      --nav-link-active-text-color: white;
-      --nav-link-text-color: white;
+    /* Nav (Tabs) */
+    --nav-tab-border-color: rgba(44, 118, 88, 0.7);
+    --nav-tab-text-color: var(--body-text-color);
+    --nav-tab-bg-color: var(--primary-color);
+    --nav-tab-hover-border-color: var(--primary-color);
+    --nav-tab-active-text-color: white;
+    --nav-tab-border-hover-color: transparent;
+    --nav-tab-hover-text-color: var(--body-text-color);
+    --nav-tab-hover-bg-color: transparent;
+    --nav-tab-border-top: rgba(44, 118, 88, 0.7);
+    --nav-tab-border-left: rgba(44, 118, 88, 0.7);
+    --nav-tab-border-bottom: rgba(44, 118, 88, 0.7);
+    --nav-tab-border-right: rgba(44, 118, 88, 0.7);
+    --nav-tab-hover-border-top: rgba(44, 118, 88, 0.7);
+    --nav-tab-hover-border-left: rgba(44, 118, 88, 0.7);
+    --nav-tab-hover-border-bottom: var(--bs-body-bg);
+    --nav-tab-hover-border-right: rgba(44, 118, 88, 0.7);
+    --nav-tab-active-hover-bg-color: var(--primary-color);
+    --nav-link-bg-color: var(--primary-color);
+    --nav-link-active-text-color: white;
+    --nav-link-text-color: white;
 
 
 
-    /* Reading Bar */
-    --br-actionbar-button-text-color: black;
-    --br-actionbar-button-hover-border-color: #6c757d;
-    --br-actionbar-bg-color: white;
+  /* Reading Bar */
+  --br-actionbar-button-text-color: black;
+  --br-actionbar-button-hover-border-color: #6c757d;
+  --br-actionbar-bg-color: white;
 
-    /* Drawer */
-    --drawer-pagination-horizontal-rule: inset 0 -1px 0 rgb(0 0 0 / 13%);
-    --drawer-pagination-border: 1px solid rgb(0 0 0 / 13%);
+  /* Drawer */
+  --drawer-pagination-horizontal-rule: inset 0 -1px 0 rgb(0 0 0 / 13%);
+  --drawer-pagination-border: 1px solid rgb(0 0 0 / 13%);
 }
 
 .reader-container {
@@ -103,7 +104,7 @@ export const BookWhiteTheme = `
 
 
 .book-content *:not(input), .book-content *:not(select), .book-content *:not(code), .book-content *:not(:link), .book-content *:not(.ngx-toastr) {
-  color: black !important;
+  color: black;
 }
 
 .book-content code {
@@ -115,22 +116,25 @@ export const BookWhiteTheme = `
 }
 
 .book-content img, .book-content img[src] {
-z-index: 1;
-filter: brightness(0.85) !important;
-background-color: initial !important;
+  z-index: 1;
+  background-color: initial !important;
 }
 
 
 .book-content *:not(code), .book-content *:not(a) {
-    background-color: white;
-    box-shadow: none;
-    text-shadow: none;
-    border-radius: unset;
-    color: #dcdcdc !important;
+  background-color: white;
+  box-shadow: none;
+  text-shadow: none;
+  border-radius: unset;
+  color: #dcdcdc;
 }
 
-.book-content :visited, .book-content :visited *, .book-content :visited *[class] {color: rgb(240, 50, 50) !important}
-.book-content :link:not(cite), :link .book-content *:not(cite) {color: #00f !important}
+.book-content :visited, .book-content :visited *, .book-content :visited *[class] {
+  color: rgb(240, 50, 50) !important;
+}
+.book-content :link:not(cite), :link .book-content *:not(cite) {
+  color: #00f !important;
+}
 
 .btn-check:checked + .btn {
   color: white;
diff --git a/UI/Web/src/app/book-reader/_services/book.service.ts b/UI/Web/src/app/book-reader/_services/book.service.ts
index 65549ab48..d98f09f38 100644
--- a/UI/Web/src/app/book-reader/_services/book.service.ts
+++ b/UI/Web/src/app/book-reader/_services/book.service.ts
@@ -28,7 +28,7 @@ export class BookService {
   getFontFamilies(): Array {
     return [{title: 'default', family: 'default'}, {title: 'EBGaramond', family: 'EBGaramond'}, {title: 'Fira Sans', family: 'Fira_Sans'},
     {title: 'Lato', family: 'Lato'}, {title: 'Libre Baskerville', family: 'Libre_Baskerville'}, {title: 'Merriweather', family: 'Merriweather'},
-    {title: 'Nanum Gothic', family: 'Nanum_Gothic'}, {title: 'RocknRoll One', family: 'RocknRoll_One'}, {title: 'Open Dyslexic', family: 'OpenDyslexic2'}];
+    {title: 'Nanum Gothic', family: 'Nanum_Gothic'}, {title: 'Open Dyslexic', family: 'OpenDyslexic2'}, {title: 'RocknRoll One', family: 'RocknRoll_One'}, {title: 'Fast Font Serif (Bionic)', family: 'FastFontSerif'}, {title: 'Fast Font Sans (Bionic)', family: 'FastFontSans'}];
   }
 
   getBookChapters(chapterId: number) {
diff --git a/UI/Web/src/app/bookmark/_components/bookmarks/bookmarks.component.html b/UI/Web/src/app/bookmark/_components/bookmarks/bookmarks.component.html
index cb4e9c890..8c167a2e5 100644
--- a/UI/Web/src/app/bookmark/_components/bookmarks/bookmarks.component.html
+++ b/UI/Web/src/app/bookmark/_components/bookmarks/bookmarks.component.html
@@ -7,27 +7,29 @@
       
      {{t('series-count', {num: series.length | number})}}
      
     
     
-    
-      
-        
-      
+    @if (filter) {
+      
+        
+          
+        
 
-      
-        {{t('no-data')}} {{t('no-data-2')}}
-      
-    
+        
+          {{t('no-data')}} {{t('no-data-2')}}
+        
+      
+    }
   
-
        
+
      
diff --git a/UI/Web/src/app/bookmark/_components/bookmarks/bookmarks.component.ts b/UI/Web/src/app/bookmark/_components/bookmarks/bookmarks.component.ts
index 878843464..3f76c9cf2 100644
--- a/UI/Web/src/app/bookmark/_components/bookmarks/bookmarks.component.ts
+++ b/UI/Web/src/app/bookmark/_components/bookmarks/bookmarks.component.ts
@@ -2,46 +2,50 @@ import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
+  DestroyRef,
   EventEmitter,
-  HostListener,
   inject,
   OnInit
 } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ToastrService } from 'ngx-toastr';
+import {ActivatedRoute, Router} from '@angular/router';
+import {ToastrService} from 'ngx-toastr';
 import {take} from 'rxjs';
-import { BulkSelectionService } from 'src/app/cards/bulk-selection.service';
-import { FilterSettings } from 'src/app/metadata-filter/filter-settings';
-import { ConfirmService } from 'src/app/shared/confirm.service';
+import {BulkSelectionService} from 'src/app/cards/bulk-selection.service';
+import {ConfirmService} from 'src/app/shared/confirm.service';
 import {DownloadService} from 'src/app/shared/_services/download.service';
-import { FilterUtilitiesService } from 'src/app/shared/_services/filter-utilities.service';
-import { KEY_CODES } from 'src/app/shared/_services/utility.service';
-import { JumpKey } from 'src/app/_models/jumpbar/jump-key';
-import { PageBookmark } from 'src/app/_models/readers/page-bookmark';
-import { Pagination } from 'src/app/_models/pagination';
-import { Series } from 'src/app/_models/series';
-import { FilterEvent } from 'src/app/_models/metadata/series-filter';
-import { Action, ActionFactoryService, ActionItem } from 'src/app/_services/action-factory.service';
-import { ImageService } from 'src/app/_services/image.service';
-import { JumpbarService } from 'src/app/_services/jumpbar.service';
-import { ReaderService } from 'src/app/_services/reader.service';
-import {DecimalPipe, NgIf} from '@angular/common';
-import { CardItemComponent } from '../../../cards/card-item/card-item.component';
-import { CardDetailLayoutComponent } from '../../../cards/card-detail-layout/card-detail-layout.component';
-import { BulkOperationsComponent } from '../../../cards/bulk-operations/bulk-operations.component';
-import { SideNavCompanionBarComponent } from '../../../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component';
+import {FilterUtilitiesService} from 'src/app/shared/_services/filter-utilities.service';
+import {JumpKey} from 'src/app/_models/jumpbar/jump-key';
+import {PageBookmark} from 'src/app/_models/readers/page-bookmark';
+import {Pagination} from 'src/app/_models/pagination';
+import {Series} from 'src/app/_models/series';
+import {FilterEvent, SortField} from 'src/app/_models/metadata/series-filter';
+import {Action, ActionFactoryService, ActionItem} from 'src/app/_services/action-factory.service';
+import {ImageService} from 'src/app/_services/image.service';
+import {JumpbarService} from 'src/app/_services/jumpbar.service';
+import {ReaderService} from 'src/app/_services/reader.service';
+import {DecimalPipe} from '@angular/common';
+import {CardItemComponent} from '../../../cards/card-item/card-item.component';
+import {CardDetailLayoutComponent} from '../../../cards/card-detail-layout/card-detail-layout.component';
+import {BulkOperationsComponent} from '../../../cards/bulk-operations/bulk-operations.component';
+import {
+  SideNavCompanionBarComponent
+} from '../../../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component';
 import {translate, TranslocoDirective, TranslocoService} from "@jsverse/transloco";
-import {SeriesFilterV2} from "../../../_models/metadata/v2/series-filter-v2";
+import {FilterV2} from "../../../_models/metadata/v2/filter-v2";
 import {Title} from "@angular/platform-browser";
 import {WikiLink} from "../../../_models/wiki";
+import {FilterField} from "../../../_models/metadata/v2/filter-field";
+import {SeriesFilterSettings} from "../../../metadata-filter/filter-settings";
+import {takeUntilDestroyed} from "@angular/core/rxjs-interop";
+import {FilterStatement} from "../../../_models/metadata/v2/filter-statement";
+import {MetadataService} from "../../../_services/metadata.service";
 
 @Component({
   selector: 'app-bookmarks',
   templateUrl: './bookmarks.component.html',
   styleUrls: ['./bookmarks.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
-  standalone: true,
-  imports: [SideNavCompanionBarComponent, BulkOperationsComponent, CardDetailLayoutComponent, CardItemComponent, DecimalPipe, TranslocoDirective, NgIf]
+  imports: [SideNavCompanionBarComponent, BulkOperationsComponent, CardDetailLayoutComponent, CardItemComponent, DecimalPipe, TranslocoDirective]
 })
 export class BookmarksComponent implements OnInit {
 
@@ -59,6 +63,8 @@ export class BookmarksComponent implements OnInit {
   private readonly titleService = inject(Title);
   public readonly bulkSelectionService = inject(BulkSelectionService);
   public readonly imageService = inject(ImageService);
+  public readonly metadataService = inject(MetadataService);
+  public readonly destroyRef = inject(DestroyRef);
 
   protected readonly WikiLink = WikiLink;
 
@@ -71,27 +77,34 @@ export class BookmarksComponent implements OnInit {
   jumpbarKeys: Array = [];
 
   pagination: Pagination = new Pagination();
-  filter: SeriesFilterV2 | undefined = undefined;
-  filterSettings: FilterSettings = new FilterSettings();
+  filter: FilterV2 | undefined = undefined;
+  filterSettings: SeriesFilterSettings = new SeriesFilterSettings();
   filterOpen: EventEmitter = new EventEmitter();
   filterActive: boolean = false;
-  filterActiveCheck!: SeriesFilterV2;
+  filterActiveCheck!: FilterV2;
 
   trackByIdentity = (index: number, item: Series) => `${item.name}_${item.localizedName}_${item.pagesRead}`;
   refresh: EventEmitter = new EventEmitter();
 
   constructor() {
-      this.filterUtilityService.filterPresetsFromUrl(this.route.snapshot).subscribe(filter => {
-        this.filter = filter;
 
-        this.filterActiveCheck = this.filterUtilityService.createSeriesV2Filter();
-        this.filterActiveCheck!.statements.push(this.filterUtilityService.createSeriesV2DefaultStatement());
+      this.route.data.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(data => {
+        this.filter = data['filter'] as FilterV2;
+
+        if (this.filter == null) {
+          this.filter = this.metadataService.createDefaultFilterDto('series');
+          this.filter.statements.push(this.metadataService.createDefaultFilterStatement('series') as FilterStatement);
+        }
+
+        this.filterActiveCheck = this.metadataService.createDefaultFilterDto('series');
+        this.filterActiveCheck.statements.push(this.metadataService.createDefaultFilterStatement('series') as FilterStatement);
         this.filterSettings.presetsV2 =  this.filter;
         this.filterSettings.statementLimit = 1;
 
         this.cdRef.markForCheck();
       });
 
+
       this.titleService.setTitle('Kavita - ' + translate('bookmarks.title'));
     }
 
@@ -103,13 +116,13 @@ export class BookmarksComponent implements OnInit {
   async handleAction(action: ActionItem, series: Series) {
     switch (action.action) {
       case(Action.Delete):
-        this.clearBookmarks(series);
+        await this.clearBookmarks(series);
         break;
       case(Action.DownloadBookmark):
         this.downloadBookmarks(series);
         break;
       case(Action.ViewSeries):
-        this.router.navigate(['library', series.libraryId, 'series', series.id]);
+        await this.router.navigate(['library', series.libraryId, 'series', series.id]);
         break;
       default:
         break;
@@ -198,7 +211,7 @@ export class BookmarksComponent implements OnInit {
     this.downloadService.download('bookmark', this.bookmarks.filter(bmk => bmk.seriesId === series.id));
   }
 
-  updateFilter(data: FilterEvent) {
+  updateFilter(data: FilterEvent) {
     if (data.filterV2 === undefined) return;
     this.filter = data.filterV2;
 
diff --git a/UI/Web/src/app/browse-people/browse-authors.component.ts b/UI/Web/src/app/browse-people/browse-authors.component.ts
deleted file mode 100644
index e9d1991e1..000000000
--- a/UI/Web/src/app/browse-people/browse-authors.component.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import {
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  DestroyRef,
-  EventEmitter,
-  inject,
-  OnInit
-} from '@angular/core';
-import {
-  SideNavCompanionBarComponent
-} from "../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component";
-import {CardDetailLayoutComponent} from "../cards/card-detail-layout/card-detail-layout.component";
-import {DecimalPipe} from "@angular/common";
-import {Series} from "../_models/series";
-import {Pagination} from "../_models/pagination";
-import {JumpKey} from "../_models/jumpbar/jump-key";
-import {ActivatedRoute, Router} from "@angular/router";
-import {Title} from "@angular/platform-browser";
-import {ActionFactoryService} from "../_services/action-factory.service";
-import {ActionService} from "../_services/action.service";
-import {MessageHubService} from "../_services/message-hub.service";
-import {UtilityService} from "../shared/_services/utility.service";
-import {PersonService} from "../_services/person.service";
-import {BrowsePerson} from "../_models/person/browse-person";
-import {CardItemComponent} from "../cards/card-item/card-item.component";
-import {JumpbarService} from "../_services/jumpbar.service";
-import {PersonCardComponent} from "../cards/person-card/person-card.component";
-import {ImageService} from "../_services/image.service";
-import {TranslocoDirective} from "@jsverse/transloco";
-import {CompactNumberPipe} from "../_pipes/compact-number.pipe";
-
-
-@Component({
-  selector: 'app-browse-authors',
-  standalone: true,
-  imports: [
-    SideNavCompanionBarComponent,
-    TranslocoDirective,
-    CardDetailLayoutComponent,
-    DecimalPipe,
-    CardItemComponent,
-    PersonCardComponent,
-    CompactNumberPipe,
-  ],
-  templateUrl: './browse-authors.component.html',
-  styleUrl: './browse-authors.component.scss',
-  changeDetection: ChangeDetectionStrategy.OnPush
-})
-export class BrowseAuthorsComponent implements OnInit {
-
-  private readonly destroyRef = inject(DestroyRef);
-  private readonly cdRef = inject(ChangeDetectorRef);
-  private readonly route = inject(ActivatedRoute);
-  private readonly router = inject(Router);
-  private readonly titleService = inject(Title);
-  private readonly actionFactoryService = inject(ActionFactoryService);
-  private readonly actionService = inject(ActionService);
-  private readonly hubService = inject(MessageHubService);
-  private readonly utilityService = inject(UtilityService);
-  private readonly personService = inject(PersonService);
-  private readonly jumpbarService = inject(JumpbarService);
-  protected readonly imageService = inject(ImageService);
-
-
-  series: Series[] = [];
-  isLoading = false;
-  authors: Array = [];
-  pagination: Pagination = {currentPage: 0, totalPages: 0, totalItems: 0, itemsPerPage: 0};
-  refresh: EventEmitter = new EventEmitter();
-  jumpKeys: Array = [];
-  trackByIdentity = (index: number, item: BrowsePerson) => `${item.id}`;
-
-  ngOnInit() {
-    this.isLoading = true;
-    this.cdRef.markForCheck();
-    this.personService.getAuthorsToBrowse(undefined, undefined).subscribe(d => {
-      this.authors = d.result;
-      this.pagination = d.pagination;
-      this.jumpKeys = this.jumpbarService.getJumpKeys(this.authors, d => d.name);
-      this.isLoading = false;
-      this.cdRef.markForCheck();
-    });
-  }
-
-  goToPerson(person: BrowsePerson) {
-    this.router.navigate(['person', person.name]);
-  }
-
-}
diff --git a/UI/Web/src/app/browse/browse-genres/browse-genres.component.html b/UI/Web/src/app/browse/browse-genres/browse-genres.component.html
new file mode 100644
index 000000000..8166ef12c
--- /dev/null
+++ b/UI/Web/src/app/browse/browse-genres/browse-genres.component.html
@@ -0,0 +1,34 @@
+
      
+  
+    
+      
      
+        {{t('title')}}
+      
      
+      
      {{t('genre-count', {num: pagination.totalItems | number})}} 
      
+
+          
+
+    
+      
+
+        
      
+          
      {{ item.title }}
      
+          
      
+            {{t('series-count', {num: item.seriesCount | compactNumber})}}
+            {{t('issue-count', {num: item.chapterCount | compactNumber})}}
+          
      
+        
      
+
+            
+          
+
+        
+
      
diff --git a/UI/Web/src/app/browse/browse-genres/browse-genres.component.scss b/UI/Web/src/app/browse/browse-genres/browse-genres.component.scss
new file mode 100644
index 000000000..90c313b37
--- /dev/null
+++ b/UI/Web/src/app/browse/browse-genres/browse-genres.component.scss
@@ -0,0 +1 @@
+@use '../../../tag-card-common';
diff --git a/UI/Web/src/app/browse/browse-genres/browse-genres.component.ts b/UI/Web/src/app/browse/browse-genres/browse-genres.component.ts
new file mode 100644
index 000000000..c46795e25
--- /dev/null
+++ b/UI/Web/src/app/browse/browse-genres/browse-genres.component.ts
@@ -0,0 +1,70 @@
+import {ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, inject, OnInit} from '@angular/core';
+import {CardDetailLayoutComponent} from "../../cards/card-detail-layout/card-detail-layout.component";
+import {DecimalPipe, NgClass} from "@angular/common";
+import {
+  SideNavCompanionBarComponent
+} from "../../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component";
+import {translate, TranslocoDirective} from "@jsverse/transloco";
+import {JumpbarService} from "../../_services/jumpbar.service";
+import {BrowsePerson} from "../../_models/metadata/browse/browse-person";
+import {Pagination} from "../../_models/pagination";
+import {JumpKey} from "../../_models/jumpbar/jump-key";
+import {MetadataService} from "../../_services/metadata.service";
+import {BrowseGenre} from "../../_models/metadata/browse/browse-genre";
+import {FilterField} from "../../_models/metadata/v2/filter-field";
+import {FilterComparison} from "../../_models/metadata/v2/filter-comparison";
+import {FilterUtilitiesService} from "../../shared/_services/filter-utilities.service";
+import {CompactNumberPipe} from "../../_pipes/compact-number.pipe";
+import {Title} from "@angular/platform-browser";
+
+@Component({
+  selector: 'app-browse-genres',
+  imports: [
+    CardDetailLayoutComponent,
+    DecimalPipe,
+    SideNavCompanionBarComponent,
+    TranslocoDirective,
+    CompactNumberPipe,
+    NgClass
+  ],
+  templateUrl: './browse-genres.component.html',
+  styleUrl: './browse-genres.component.scss',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class BrowseGenresComponent implements OnInit {
+
+  protected readonly FilterField = FilterField;
+
+  private readonly cdRef = inject(ChangeDetectorRef);
+  private readonly metadataService = inject(MetadataService);
+  private readonly jumpbarService = inject(JumpbarService);
+  private readonly filterUtilityService = inject(FilterUtilitiesService);
+  private readonly titleService = inject(Title);
+
+  isLoading = false;
+  genres: Array = [];
+  pagination: Pagination = {currentPage: 0, totalPages: 0, totalItems: 0, itemsPerPage: 0};
+  refresh: EventEmitter = new EventEmitter();
+  jumpKeys: Array = [];
+  trackByIdentity = (index: number, item: BrowsePerson) => `${item.id}`;
+
+  ngOnInit() {
+    this.isLoading = true;
+    this.cdRef.markForCheck();
+
+    this.titleService.setTitle('Kavita - ' + translate('browse-genres.title'));
+
+    this.metadataService.getGenreWithCounts(undefined, undefined).subscribe(d => {
+      this.genres = d.result;
+      this.pagination = d.pagination;
+      this.jumpKeys = this.jumpbarService.getJumpKeys(this.genres, (d: BrowseGenre) => d.title);
+      this.isLoading = false;
+      this.cdRef.markForCheck();
+    });
+  }
+
+  openFilter(field: FilterField, genre: BrowseGenre) {
+    if (genre.seriesCount === 0) return; // We don't yet have an issue page
+    this.filterUtilityService.applyFilter(['all-series'], field, FilterComparison.Equal, `${genre.id}`).subscribe();
+  }
+}
diff --git a/UI/Web/src/app/browse-people/browse-authors.component.html b/UI/Web/src/app/browse/browse-people/browse-people.component.html
similarity index 60%
rename from UI/Web/src/app/browse-people/browse-authors.component.html
rename to UI/Web/src/app/browse/browse-people/browse-people.component.html
index 600f7c71c..683a5c97b 100644
--- a/UI/Web/src/app/browse-people/browse-authors.component.html
+++ b/UI/Web/src/app/browse/browse-people/browse-people.component.html
@@ -1,6 +1,6 @@
 
      
-  
-    
+  
+    
       
      
         {{t('title')}}
       
      
@@ -16,13 +16,16 @@
       [jumpBarKeys]="jumpKeys"
       [filteringDisabled]="true"
       [refresh]="refresh"
+      [filterSettings]="filterSettings"
+      [filterOpen]="filterOpen"
+      (applyFilter)="updateFilter($event)"
     >
       
         
           
-            
      
-                
      {{item.seriesCount | compactNumber}} series
      
-                
      {{item.issueCount | compactNumber}} issues
      
+            
      
+                
      {{t('series-count', {num: item.seriesCount | compactNumber})}}
      
+                
      {{t('issue-count', {num: item.chapterCount | compactNumber})}}
      
             
      
           
         
diff --git a/UI/Web/src/app/browse-people/browse-authors.component.scss b/UI/Web/src/app/browse/browse-people/browse-people.component.scss
similarity index 64%
rename from UI/Web/src/app/browse-people/browse-authors.component.scss
rename to UI/Web/src/app/browse/browse-people/browse-people.component.scss
index dc52bc49c..e7dfb8d01 100644
--- a/UI/Web/src/app/browse-people/browse-authors.component.scss
+++ b/UI/Web/src/app/browse/browse-people/browse-people.component.scss
@@ -1,3 +1,5 @@
+@use '../../../tag-card-common';
+
 .main-container {
   margin-top: 10px;
   padding: 0 0 0 10px;
diff --git a/UI/Web/src/app/browse/browse-people/browse-people.component.ts b/UI/Web/src/app/browse/browse-people/browse-people.component.ts
new file mode 100644
index 000000000..182222879
--- /dev/null
+++ b/UI/Web/src/app/browse/browse-people/browse-people.component.ts
@@ -0,0 +1,128 @@
+import {ChangeDetectionStrategy, ChangeDetectorRef, Component, DestroyRef, EventEmitter, inject} from '@angular/core';
+import {
+  SideNavCompanionBarComponent
+} from "../../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component";
+import {CardDetailLayoutComponent} from "../../cards/card-detail-layout/card-detail-layout.component";
+import {DecimalPipe} from "@angular/common";
+import {Pagination} from "../../_models/pagination";
+import {JumpKey} from "../../_models/jumpbar/jump-key";
+import {ActivatedRoute, Router} from "@angular/router";
+import {PersonService} from "../../_services/person.service";
+import {BrowsePerson} from "../../_models/metadata/browse/browse-person";
+import {JumpbarService} from "../../_services/jumpbar.service";
+import {PersonCardComponent} from "../../cards/person-card/person-card.component";
+import {ImageService} from "../../_services/image.service";
+import {TranslocoDirective} from "@jsverse/transloco";
+import {CompactNumberPipe} from "../../_pipes/compact-number.pipe";
+import {ReactiveFormsModule} from "@angular/forms";
+import {PersonSortField} from "../../_models/metadata/v2/person-sort-field";
+import {PersonFilterField} from "../../_models/metadata/v2/person-filter-field";
+import {FilterUtilitiesService} from "../../shared/_services/filter-utilities.service";
+import {FilterV2} from "../../_models/metadata/v2/filter-v2";
+import {PersonFilterSettings} from "../../metadata-filter/filter-settings";
+import {FilterEvent} from "../../_models/metadata/series-filter";
+import {PersonRole} from "../../_models/metadata/person";
+import {FilterComparison} from "../../_models/metadata/v2/filter-comparison";
+import {takeUntilDestroyed} from "@angular/core/rxjs-interop";
+import {MetadataService} from "../../_services/metadata.service";
+import {FilterStatement} from "../../_models/metadata/v2/filter-statement";
+
+
+@Component({
+  selector: 'app-browse-people',
+  imports: [
+    SideNavCompanionBarComponent,
+    TranslocoDirective,
+    CardDetailLayoutComponent,
+    DecimalPipe,
+    PersonCardComponent,
+    CompactNumberPipe,
+    ReactiveFormsModule,
+
+  ],
+  templateUrl: './browse-people.component.html',
+  styleUrl: './browse-people.component.scss',
+  changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class BrowsePeopleComponent {
+  protected readonly PersonSortField = PersonSortField;
+
+  private readonly cdRef = inject(ChangeDetectorRef);
+  private readonly destroyRef = inject(DestroyRef);
+  private readonly router = inject(Router);
+  private readonly personService = inject(PersonService);
+  private readonly jumpbarService = inject(JumpbarService);
+  private readonly route = inject(ActivatedRoute);
+  private readonly filterUtilityService = inject(FilterUtilitiesService);
+  protected readonly imageService = inject(ImageService);
+  protected readonly metadataService = inject(MetadataService);
+
+  isLoading = false;
+  authors: Array = [];
+  pagination: Pagination = {currentPage: 0, totalPages: 0, totalItems: 0, itemsPerPage: 0};
+  refresh: EventEmitter = new EventEmitter();
+  jumpKeys: Array = [];
+  trackByIdentity = (index: number, item: BrowsePerson) => `${item.id}`;
+  filterSettings: PersonFilterSettings = new PersonFilterSettings();
+  filterActive: boolean = false;
+  filterOpen: EventEmitter = new EventEmitter();
+  filter: FilterV2 | undefined = undefined;
+  filterActiveCheck!: FilterV2;
+
+
+  constructor() {
+    this.isLoading = true;
+    this.cdRef.markForCheck();
+
+    this.route.data.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(data => {
+      this.filter = data['filter'] as FilterV2;
+
+      if (this.filter == null) {
+        this.filter = this.metadataService.createDefaultFilterDto('person');
+        this.filter.statements.push(this.metadataService.createDefaultFilterStatement('person') as FilterStatement);
+      }
+
+      this.filterActiveCheck = this.filterUtilityService.createPersonV2Filter();
+      this.filterActiveCheck!.statements.push({value: `${PersonRole.Writer},${PersonRole.CoverArtist}`, field: PersonFilterField.Role, comparison: FilterComparison.Contains});
+      this.filterSettings.presetsV2 = this.filter;
+
+      this.cdRef.markForCheck();
+      this.loadData();
+    });
+  }
+
+
+  loadData() {
+    if (!this.filter) {
+      this.filter = this.metadataService.createDefaultFilterDto('person');
+      this.filter.statements.push(this.metadataService.createDefaultFilterStatement('person') as FilterStatement);
+      this.cdRef.markForCheck();
+    }
+
+    this.personService.getAuthorsToBrowse(this.filter!).subscribe(d => {
+      this.authors = [...d.result];
+      this.pagination = d.pagination;
+      this.jumpKeys = this.jumpbarService.getJumpKeys(this.authors, d => d.name);
+      this.isLoading = false;
+      this.cdRef.markForCheck();
+    });
+  }
+
+  goToPerson(person: BrowsePerson) {
+    this.router.navigate(['person', person.name]);
+  }
+
+  updateFilter(data: FilterEvent) {
+    if (data.filterV2 === undefined) return;
+    this.filter = data.filterV2;
+
+    if (data.isFirst) {
+      this.loadData();
+      return;
+    }
+
+    this.filterUtilityService.updateUrlFromFilter(this.filter).subscribe((_) => {
+      this.loadData();
+    });
+  }
+}
diff --git a/UI/Web/src/app/browse/browse-tags/browse-tags.component.html b/UI/Web/src/app/browse/browse-tags/browse-tags.component.html
new file mode 100644
index 000000000..627e05584
--- /dev/null
+++ b/UI/Web/src/app/browse/browse-tags/browse-tags.component.html
@@ -0,0 +1,34 @@
+
      
+  
+    
+      
      
+        {{t('title')}}
+      
      
+      
      {{t('genre-count', {num: pagination.totalItems | number})}} 
      
+
+          
+
+    
+      
+
+        
      
+          
      {{ item.title }}
      
+          
      
+            {{t('series-count', {num: item.seriesCount | compactNumber})}}
+            {{t('issue-count', {num: item.chapterCount | compactNumber})}}
+          
      
+        
      
+
+            
+          
+
+        
+
      
diff --git a/UI/Web/src/app/browse/browse-tags/browse-tags.component.scss b/UI/Web/src/app/browse/browse-tags/browse-tags.component.scss
new file mode 100644
index 000000000..90c313b37
--- /dev/null
+++ b/UI/Web/src/app/browse/browse-tags/browse-tags.component.scss
@@ -0,0 +1 @@
+@use '../../../tag-card-common';
diff --git a/UI/Web/src/app/browse/browse-tags/browse-tags.component.ts b/UI/Web/src/app/browse/browse-tags/browse-tags.component.ts
new file mode 100644
index 000000000..05abb6300
--- /dev/null
+++ b/UI/Web/src/app/browse/browse-tags/browse-tags.component.ts
@@ -0,0 +1,69 @@
+import {ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, inject, OnInit} from '@angular/core';
+import {CardDetailLayoutComponent} from "../../cards/card-detail-layout/card-detail-layout.component";
+import {DecimalPipe, NgClass} from "@angular/common";
+import {
+  SideNavCompanionBarComponent
+} from "../../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component";
+import {translate, TranslocoDirective} from "@jsverse/transloco";
+import {MetadataService} from "../../_services/metadata.service";
+import {JumpbarService} from "../../_services/jumpbar.service";
+import {FilterUtilitiesService} from "../../shared/_services/filter-utilities.service";
+import {BrowseGenre} from "../../_models/metadata/browse/browse-genre";
+import {Pagination} from "../../_models/pagination";
+import {JumpKey} from "../../_models/jumpbar/jump-key";
+import {BrowsePerson} from "../../_models/metadata/browse/browse-person";
+import {FilterField} from "../../_models/metadata/v2/filter-field";
+import {FilterComparison} from "../../_models/metadata/v2/filter-comparison";
+import {BrowseTag} from "../../_models/metadata/browse/browse-tag";
+import {CompactNumberPipe} from "../../_pipes/compact-number.pipe";
+import {Title} from "@angular/platform-browser";
+
+@Component({
+  selector: 'app-browse-tags',
+  imports: [
+    CardDetailLayoutComponent,
+    DecimalPipe,
+    SideNavCompanionBarComponent,
+    TranslocoDirective,
+    CompactNumberPipe,
+    NgClass
+  ],
+  templateUrl: './browse-tags.component.html',
+  styleUrl: './browse-tags.component.scss',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class BrowseTagsComponent implements OnInit {
+  protected readonly FilterField = FilterField;
+
+  private readonly cdRef = inject(ChangeDetectorRef);
+  private readonly metadataService = inject(MetadataService);
+  private readonly jumpbarService = inject(JumpbarService);
+  protected readonly filterUtilityService = inject(FilterUtilitiesService);
+  private readonly titleService = inject(Title);
+
+  isLoading = false;
+  tags: Array = [];
+  pagination: Pagination = {currentPage: 0, totalPages: 0, totalItems: 0, itemsPerPage: 0};
+  refresh: EventEmitter = new EventEmitter();
+  jumpKeys: Array = [];
+  trackByIdentity = (index: number, item: BrowsePerson) => `${item.id}`;
+
+  ngOnInit() {
+    this.isLoading = true;
+    this.cdRef.markForCheck();
+    this.titleService.setTitle('Kavita - ' + translate('browse-tags.title'));
+
+    this.metadataService.getTagWithCounts(undefined, undefined).subscribe(d => {
+      this.tags = d.result;
+      this.pagination = d.pagination;
+      this.jumpKeys = this.jumpbarService.getJumpKeys(this.tags, (d: BrowseGenre) => d.title);
+      this.isLoading = false;
+      this.cdRef.markForCheck();
+    });
+  }
+
+  openFilter(field: FilterField, tag: BrowseTag) {
+    if (tag.seriesCount === 0) return; // We don't yet have an issue page
+    this.filterUtilityService.applyFilter(['all-series'], field, FilterComparison.Equal, `${tag.id}`).subscribe();
+  }
+}
diff --git a/UI/Web/src/app/cards/_modals/bulk-add-to-collection/bulk-add-to-collection.component.ts b/UI/Web/src/app/cards/_modals/bulk-add-to-collection/bulk-add-to-collection.component.ts
index 19fbb5257..da2742260 100644
--- a/UI/Web/src/app/cards/_modals/bulk-add-to-collection/bulk-add-to-collection.component.ts
+++ b/UI/Web/src/app/cards/_modals/bulk-add-to-collection/bulk-add-to-collection.component.ts
@@ -22,13 +22,12 @@ import {translate, TranslocoDirective} from "@jsverse/transloco";
 import {ScrobbleProvider} from "../../../_services/scrobbling.service";
 
 @Component({
-  selector: 'app-bulk-add-to-collection',
-  standalone: true,
-  imports: [CommonModule, ReactiveFormsModule, FilterPipe, NgbModalModule, TranslocoDirective],
-  templateUrl: './bulk-add-to-collection.component.html',
-  styleUrls: ['./bulk-add-to-collection.component.scss'],
-  encapsulation: ViewEncapsulation.None, // This is needed as per the bootstrap modal documentation to get styles to work.
-  changeDetection: ChangeDetectionStrategy.OnPush
+    selector: 'app-bulk-add-to-collection',
+    imports: [CommonModule, ReactiveFormsModule, FilterPipe, NgbModalModule, TranslocoDirective],
+    templateUrl: './bulk-add-to-collection.component.html',
+    styleUrls: ['./bulk-add-to-collection.component.scss'],
+    encapsulation: ViewEncapsulation.None, // This is needed as per the bootstrap modal documentation to get styles to work.
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class BulkAddToCollectionComponent implements OnInit, AfterViewInit {
 
diff --git a/UI/Web/src/app/cards/_modals/bulk-set-reading-profile-modal/bulk-set-reading-profile-modal.component.html b/UI/Web/src/app/cards/_modals/bulk-set-reading-profile-modal/bulk-set-reading-profile-modal.component.html
new file mode 100644
index 000000000..d9dbb0715
--- /dev/null
+++ b/UI/Web/src/app/cards/_modals/bulk-set-reading-profile-modal/bulk-set-reading-profile-modal.component.html
@@ -0,0 +1,56 @@
+
+
+  
      
+    
+    
+  
      
+  
      
+    
      
+      @if (profiles.length >= MaxItems) {
+        
      
+          
+          
      
+            
+            
+          
      
+        
      
+      }
+
+      
        
+        @for(profile of profiles | filter: filterList; let i = $index; track profile.name) {
+          
      • 
+            
        
+
+              
        {{profile.name | sentenceCase}}
        
+
+              @if (currentProfile && currentProfile.name === profile.name) {
+                {{t('bound')}}
+              }
+            
        
+          
        • 
+        }
+
+        @if (profiles.length === 0 && !isLoading) {
+          
      • {{t('no-data')}}
        • 
+        }
+
+        @if (isLoading) {
+          
      • 
+            
+          
        • 
+        }
+      
      
+    
      
+
+    
      
+      
+    
      
+  
      
+
+
+
+
+
+      
diff --git a/UI/Web/src/app/cards/_modals/bulk-set-reading-profile-modal/bulk-set-reading-profile-modal.component.scss b/UI/Web/src/app/cards/_modals/bulk-set-reading-profile-modal/bulk-set-reading-profile-modal.component.scss
new file mode 100644
index 000000000..0974b1867
--- /dev/null
+++ b/UI/Web/src/app/cards/_modals/bulk-set-reading-profile-modal/bulk-set-reading-profile-modal.component.scss
@@ -0,0 +1,14 @@
+.clickable:hover, .clickable:focus {
+  background-color: var(--list-group-hover-bg-color, --primary-color);
+}
+
+.pill {
+  font-size: .8rem;
+  background-color: var(--card-bg-color);
+  border-radius: 0.375rem;
+  color: var(--badge-text-color);
+
+  &.active {
+    background-color : var(--primary-color);
+  }
+}
diff --git a/UI/Web/src/app/cards/_modals/bulk-set-reading-profile-modal/bulk-set-reading-profile-modal.component.ts b/UI/Web/src/app/cards/_modals/bulk-set-reading-profile-modal/bulk-set-reading-profile-modal.component.ts
new file mode 100644
index 000000000..484fe7e75
--- /dev/null
+++ b/UI/Web/src/app/cards/_modals/bulk-set-reading-profile-modal/bulk-set-reading-profile-modal.component.ts
@@ -0,0 +1,120 @@
+import {AfterViewInit, ChangeDetectorRef, Component, ElementRef, inject, Input, OnInit, ViewChild} from '@angular/core';
+import {NgbActiveModal} from "@ng-bootstrap/ng-bootstrap";
+import {ToastrService} from "ngx-toastr";
+import {FormControl, FormGroup, ReactiveFormsModule} from "@angular/forms";
+import {translate, TranslocoDirective} from "@jsverse/transloco";
+import {ReadingProfileService} from "../../../_services/reading-profile.service";
+import {ReadingProfile, ReadingProfileKind} from "../../../_models/preferences/reading-profiles";
+import {FilterPipe} from "../../../_pipes/filter.pipe";
+import {SentenceCasePipe} from "../../../_pipes/sentence-case.pipe";
+
+@Component({
+  selector: 'app-bulk-set-reading-profile-modal',
+  imports: [
+    ReactiveFormsModule,
+    FilterPipe,
+    TranslocoDirective,
+    SentenceCasePipe
+  ],
+  templateUrl: './bulk-set-reading-profile-modal.component.html',
+  styleUrl: './bulk-set-reading-profile-modal.component.scss'
+})
+export class BulkSetReadingProfileModalComponent implements OnInit, AfterViewInit {
+  private readonly modal = inject(NgbActiveModal);
+  private readonly readingProfileService = inject(ReadingProfileService);
+  private readonly toastr = inject(ToastrService);
+  private readonly cdRef = inject(ChangeDetectorRef);
+  protected readonly MaxItems = 8;
+
+  /**
+   * Modal Header - since this code is used for multiple flows
+   */
+  @Input({required: true}) title!: string;
+  /**
+   * Series Ids to add to Reading Profile
+   */
+  @Input() seriesIds: Array = [];
+  @Input() libraryId: number | undefined;
+  @ViewChild('title') inputElem!: ElementRef;
+
+  currentProfile: ReadingProfile | null = null;
+  profiles: Array = [];
+  isLoading: boolean = false;
+  profileForm: FormGroup = new FormGroup({
+    filterQuery: new FormControl('', []), // Used for inline filtering when too many RPs
+  });
+
+  ngOnInit(): void {
+
+    this.profileForm.addControl('title', new FormControl(this.title, []));
+
+    this.isLoading = true;
+    this.cdRef.markForCheck();
+
+    if (this.libraryId !== undefined) {
+      this.readingProfileService.getForLibrary(this.libraryId).subscribe(profile => {
+        this.currentProfile = profile;
+        this.cdRef.markForCheck();
+      });
+    } else if (this.seriesIds.length === 1) {
+      this.readingProfileService.getForSeries(this.seriesIds[0], true).subscribe(profile => {
+        this.currentProfile = profile;
+        this.cdRef.markForCheck();
+      });
+    }
+
+
+    this.readingProfileService.getAllProfiles().subscribe(profiles => {
+      this.profiles = profiles;
+      this.isLoading = false;
+      this.cdRef.markForCheck();
+    });
+  }
+
+  ngAfterViewInit() {
+    // Shift focus to input
+    if (this.inputElem) {
+      this.inputElem.nativeElement.select();
+      this.cdRef.markForCheck();
+    }
+  }
+
+  close() {
+    this.modal.close();
+  }
+
+  addToProfile(profile: ReadingProfile) {
+    if (this.seriesIds.length == 1) {
+      this.readingProfileService.addToSeries(profile.id, this.seriesIds[0]).subscribe(() => {
+        this.toastr.success(translate('toasts.series-bound-to-reading-profile', {name: profile.name}));
+        this.modal.close();
+      });
+      return;
+    }
+
+    if (this.seriesIds.length > 1) {
+      this.readingProfileService.bulkAddToSeries(profile.id, this.seriesIds).subscribe(() => {
+        this.toastr.success(translate('toasts.series-bound-to-reading-profile', {name: profile.name}));
+        this.modal.close();
+      });
+      return;
+    }
+
+    if (this.libraryId) {
+      this.readingProfileService.addToLibrary(profile.id, this.libraryId).subscribe(() => {
+        this.toastr.success(translate('toasts.library-bound-to-reading-profile', {name: profile.name}));
+        this.modal.close();
+      });
+    }
+  }
+
+  filterList = (listItem: ReadingProfile) => {
+    return listItem.name.toLowerCase().indexOf((this.profileForm.value.filterQuery || '').toLowerCase()) >= 0;
+  }
+
+  clear() {
+    this.profileForm.get('filterQuery')?.setValue('');
+  }
+
+  protected readonly ReadingProfileKind = ReadingProfileKind;
+}
diff --git a/UI/Web/src/app/cards/_modals/edit-collection-tags/edit-collection-tags.component.html b/UI/Web/src/app/cards/_modals/edit-collection-tags/edit-collection-tags.component.html
index fd90cc8a0..e16cdff78 100644
--- a/UI/Web/src/app/cards/_modals/edit-collection-tags/edit-collection-tags.component.html
+++ b/UI/Web/src/app/cards/_modals/edit-collection-tags/edit-collection-tags.component.html
@@ -112,7 +112,7 @@
             
      
               
      
                 
      {{t('last-sync-title')}}
      
-                
      {{tag.lastSyncUtc | utcToLocalTime | date:'shortDate' | defaultDate}}
      
+                
      {{tag.lastSyncUtc | utcToLocalTime:'shortDate' | defaultDate}}
      
               
      
               
      
                 
      {{t('source-url-title')}}
      
diff --git a/UI/Web/src/app/cards/_modals/edit-collection-tags/edit-collection-tags.component.ts b/UI/Web/src/app/cards/_modals/edit-collection-tags/edit-collection-tags.component.ts
index 5f7708a5d..65ea8baa3 100644
--- a/UI/Web/src/app/cards/_modals/edit-collection-tags/edit-collection-tags.component.ts
+++ b/UI/Web/src/app/cards/_modals/edit-collection-tags/edit-collection-tags.component.ts
@@ -23,19 +23,15 @@ import {LibraryService} from 'src/app/_services/library.service';
 import {SeriesService} from 'src/app/_services/series.service';
 import {UploadService} from 'src/app/_services/upload.service';
 import {takeUntilDestroyed} from "@angular/core/rxjs-interop";
-import {DatePipe, DecimalPipe, NgIf, NgTemplateOutlet} from "@angular/common";
+import {DecimalPipe, NgTemplateOutlet} from "@angular/common";
 import {CoverImageChooserComponent} from "../../cover-image-chooser/cover-image-chooser.component";
 import {translate, TranslocoDirective} from "@jsverse/transloco";
 import {ScrobbleProvider} from "../../../_services/scrobbling.service";
 import {FilterPipe} from "../../../_pipes/filter.pipe";
 import {AccountService} from "../../../_services/account.service";
 import {DefaultDatePipe} from "../../../_pipes/default-date.pipe";
-import {ReadMoreComponent} from "../../../shared/read-more/read-more.component";
 import {SafeHtmlPipe} from "../../../_pipes/safe-html.pipe";
 import {SafeUrlPipe} from "../../../_pipes/safe-url.pipe";
-import {MangaFormatPipe} from "../../../_pipes/manga-format.pipe";
-import {SentenceCasePipe} from "../../../_pipes/sentence-case.pipe";
-import {TagBadgeComponent} from "../../../shared/tag-badge/tag-badge.component";
 import {SelectionModel} from "../../../typeahead/_models/selection-model";
 import {UtcToLocalTimePipe} from "../../../_pipes/utc-to-local-time.pipe";
 
@@ -49,9 +45,9 @@ enum TabID {
 
 @Component({
   selector: 'app-edit-collection-tags',
-  standalone: true,
   imports: [NgbNav, NgbNavItem, NgbNavLink, NgbNavContent, ReactiveFormsModule, FormsModule, NgbPagination,
-    CoverImageChooserComponent, NgbNavOutlet, NgbTooltip, TranslocoDirective, NgTemplateOutlet, FilterPipe, DatePipe, DefaultDatePipe, ReadMoreComponent, SafeHtmlPipe, SafeUrlPipe, MangaFormatPipe, NgIf, SentenceCasePipe, TagBadgeComponent, DecimalPipe, UtcToLocalTimePipe],
+    CoverImageChooserComponent, NgbNavOutlet, NgbTooltip, TranslocoDirective, NgTemplateOutlet, FilterPipe, DefaultDatePipe,
+    SafeHtmlPipe, SafeUrlPipe, DecimalPipe, UtcToLocalTimePipe],
   templateUrl: './edit-collection-tags.component.html',
   styleUrls: ['./edit-collection-tags.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush
diff --git a/UI/Web/src/app/cards/_modals/edit-series-modal/edit-series-modal.component.html b/UI/Web/src/app/cards/_modals/edit-series-modal/edit-series-modal.component.html
index 14067952b..710f99819 100644
--- a/UI/Web/src/app/cards/_modals/edit-series-modal/edit-series-modal.component.html
+++ b/UI/Web/src/app/cards/_modals/edit-series-modal/edit-series-modal.component.html
@@ -8,19 +8,20 @@
       
      
       
      
         
      
-          
        
+          
          
 
             
        • 
               {{t(tabs[TabID.General])}}
               
-                
          
+                
          
                   
          
                     
                       
                         
          
                           @if (editSeriesForm.get('name'); as formControl) {
                             
+                                   [class.is-invalid]="formControl.invalid && !formControl.untouched">
                             @if (formControl.errors) {
                               @if (formControl.errors.required) {
                                 
          {{t('required-field')}}
          
@@ -33,14 +34,14 @@
                   
          
                 
          
 
-                
          
+                
          
                   
          
                     @if (editSeriesForm.get('sortName'); as formControl) {
                       
                         
                           
          
                             
-                            
+                            
                             @if (formControl.errors) {
                               @if (formControl.errors.required) {
                                 
          {{t('required-field')}}
          
@@ -53,7 +54,7 @@
                   
          
                 
          
 
-                
          
+                
          
                   
          
                     
                       
@@ -69,7 +70,7 @@
                 
          
 
                 @if (metadata) {
-                  
          
+                  
          
                     
          
                       
                         
@@ -91,23 +92,25 @@
                 {{t(tabs[TabID.Metadata])}}
                 
 
-                  
          
+                  
          
                     
          
                       
          
-                        
-                          
-                            
-                              
-                                {{item.title}}
-                              
-                              
-                                {{item.title}} ({{item.isoCode}})
-                              
-                            
-                          
-                        
+                        @if (languageSettings) {
+                          
+                            
+                              
+                                
+                                  {{item.title}}
+                                
+                                
+                                  {{item.title}} ({{item.isoCode}})
+                                
+                              
+                            
+                          
+                        }
                       
          
                     
          
                     
          
@@ -131,49 +134,53 @@
                     
          
                   
          
 
-                  
          
+                  
          
                     
          
                       
          
-                        
-                          
-                            
-                              
-                                {{item.title}}
-                              
-                              
-                                {{item.title}}
-                              
-                            
-                          
-                        
+                        @if (genreSettings) {
+                          
+                            
+                              
+                                
+                                  {{item.title}}
+                                
+                                
+                                  {{item.title}}
+                                
+                              
+                            
+                          
+                        }
                       
          
                     
          
                   
          
 
-                  
          
+                  
          
                     
          
                       
          
-                        
-                          
-                            
-                              
-                                {{item.title}}
-                              
-                              
-                                {{item.title}}
-                              
-                            
-                          
-                        
+                        @if (tagsSettings) {
+                          
+                            
+                              
+                                
+                                  {{item.title}}
+                                
+                                
+                                  {{item.title}}
+                                
+                              
+                            
+                          
+                        }
                       
          
                     
          
                   
          
 
-                  
          
+                  
          
                     
          
                       
          
                         
@@ -215,251 +222,277 @@
             
        • 
               {{t(tabs[TabID.People])}}
               
-                
          
+                
          
                   
          
-                    
-                      
-                        
-                          
-                            {{item.name}}
-                          
-                          
-                            {{item.name}}
-                          
-                        
-                      
-                    
+                    @if (getPersonsSettings(PersonRole.Writer); as settings) {
+                      
+                        
+                          
+                            
+                              {{item.name}}
+                            
+                            
+                              {{item.name}}
+                            
+                          
+                        
+                      
+                    }
                   
          
                 
          
-                
          
+                
          
                   
          
-                    
-                      
-                        
-                          
-                            {{item.name}}
-                          
-                          
-                            {{item.name}}
-                          
-                        
-                      
-                    
+                    @if (getPersonsSettings(PersonRole.CoverArtist); as settings) {
+                      
+                        
+                          
+                            
+                              {{item.name}}
+                            
+                            
+                              {{item.name}}
+                            
+                          
+                        
+                      
+                    }
                   
          
                 
          
 
 
-                
          
+                
          
                   
          
-                    
-                      
-                        
-                          
-                            {{item.name}}
-                          
-                          
-                            {{item.name}}
-                          
-                        
-                      
-                    
+                    @if (getPersonsSettings(PersonRole.Publisher); as settings) {
+                      
+                        
+                          
+                            
+                              {{item.name}}
+                            
+                            
+                              {{item.name}}
+                            
+                          
+                        
+                      
+                    }
                   
          
                 
          
 
-                
          
+                
          
                   
          
-                    
-                      
-                        
-                          
-                            {{item.name}}
-                          
-                          
-                            {{item.name}}
-                          
-                        
-                      
-                    
+                    @if (getPersonsSettings(PersonRole.Imprint); as settings) {
+                      
+                        
+                          
+                            
+                              {{item.name}}
+                            
+                            
+                              {{item.name}}
+                            
+                          
+                        
+                      
+                    }
                   
          
                 
          
 
-                
          
+                
          
                   
          
-                    
-                      
-                        
-                          
-                            {{item.name}}
-                          
-                          
-                            {{item.name}}
-                          
-                        
-                      
-                    
+                    @if (getPersonsSettings(PersonRole.Penciller); as settings) {
+                      
+                        
+                          
+                            
+                              {{item.name}}
+                            
+                            
+                              {{item.name}}
+                            
+                          
+                        
+                      
+                    }
                   
          
                 
          
 
 
-                
          
+                
          
                   
          
-                    
-                      
-                        
-                          
-                            {{item.name}}
-                          
-                          
-                            {{item.name}}
-                          
-                        
-                      
-                    
+                    @if (getPersonsSettings(PersonRole.Letterer); as settings) {
+                      
+                        
+                          
+                            
+                              {{item.name}}
+                            
+                            
+                              {{item.name}}
+                            
+                          
+                        
+                      
+                    }
                   
          
                 
          
-                
          
+                
          
                   
          
-                    
-                      
-                        
-                          
-                            {{item.name}}
-                          
-                          
-                            {{item.name}}
-                          
-                        
-                      
-                    
+                    @if (getPersonsSettings(PersonRole.Inker); as settings) {
+                      
+                        
+                          
+                            
+                              {{item.name}}
+                            
+                            
+                              {{item.name}}
+                            
+                          
+                        
+                      
+                    }
                   
          
                 
          
 
 
 
-                
          
+                
          
                   
          
-                    
-                      
-                        
-                          
-                            {{item.name}}
-                          
-                          
-                            {{item.name}}
-                          
-                        
-                      
-                    
+                    @if (getPersonsSettings(PersonRole.Editor); as settings) {
+                      
+                        
+                          
+                            
+                              {{item.name}}
+                            
+                            
+                              {{item.name}}
+                            
+                          
+                        
+                      
+                    }
                   
          
                 
          
-                
          
+                
          
                   
          
-                    
-                      
-                        
-                          
-                            {{item.name}}
-                          
-                          
-                            {{item.name}}
-                          
-                        
-                      
-                    
+                    @if (getPersonsSettings(PersonRole.Colorist); as settings) {
+                      
+                        
+                          
+                            
+                              {{item.name}}
+                            
+                            
+                              {{item.name}}
+                            
+                          
+                        
+                      
+                    }
                   
          
                 
          
 
-                
          
+                
          
                   
          
-                    
-                      
-                        
-                          
-                            {{item.name}}
-                          
-                          
-                            {{item.name}}
-                          
-                        
-                      
-                    
+                    @if (getPersonsSettings(PersonRole.Translator); as settings) {
+                      
+                        
+                          
+                            
+                              {{item.name}}
+                            
+                            
+                              {{item.name}}
+                            
+                          
+                        
+                      
+                    }
                   
          
                 
          
 
-                
          
+                
          
                   
          
-                    
-                      
-                        
-                          
-                            {{item.name}}
-                          
-                          
-                            {{item.name}}
-                          
-                        
-                      
-                    
+                    @if (getPersonsSettings(PersonRole.Character); as settings) {
+                      
+                        
+                          
+                            
+                              {{item.name}}
+                            
+                            
+                              {{item.name}}
+                            
+                          
+                        
+                      
+                    }
                   
          
                 
          
 
-                
          
+                
          
                   
          
-                    
-                      
-                        
-                          
-                            {{item.name}}
-                          
-                          
-                            {{item.name}}
-                          
-                        
-                      
-                    
+                    @if (getPersonsSettings(PersonRole.Team); as settings) {
+                      
+                        
+                          
+                            
+                              {{item.name}}
+                            
+                            
+                              {{item.name}}
+                            
+                          
+                        
+                      
+                    }
                   
          
                 
          
 
-                
          
+                
          
                   
          
-                    
-                      
-                        
-                          
-                            {{item.name}}
-                          
-                          
-                            {{item.name}}
-                          
-                        
-                      
-                    
+                    @if (getPersonsSettings(PersonRole.Location); as settings) {
+                      
+                        
+                          
+                            
+                              {{item.name}}
+                            
+                            
+                              {{item.name}}
+                            
+                          
+                        
+                      
+                    }
                   
          
                 
          
 
@@ -498,7 +531,7 @@
               
                 
          {{t('info-title')}}
          
 
-                
          
+                
          
                   
          
                     
          
                       
@@ -519,7 +552,7 @@
                   
          
                 
          
 
-                
          
+                
          
                   
          
                     
          
                       
@@ -541,7 +574,7 @@
                 
          
 
                 @if (metadata) {
-                  
          
+                  
          
                     
          
                       
          
                         
@@ -562,7 +595,7 @@
                     
          
                   
          
 
-                  
          
+                  
          
                     
          
                       
          
                         
@@ -584,12 +617,12 @@
                   
          
                 }
 
-                
          
+                
          
                   
          
                     
          
                       
                         
-                          {{series.created | date:'shortDate'}}
+                          {{series.created | utcToLocalTime:'shortDate'}}
                         
                       
                     
          
@@ -605,7 +638,7 @@
                   
          
                 
          
 
-                
          
+                
          
                   
          
                     
          
                       
@@ -626,7 +659,7 @@
                   
          
                 
          
 
-                
          
+                
          
                   
          
                     
          
                       
@@ -649,7 +682,7 @@
 
                 
          {{t('volumes-title')}}
          
                 @if (isLoadingVolumes) {
-                  
          • 
           }
 
+          @if (volume.chapters.length === 1) {
+            
        • 
+              
+                {{t('reviews-tab')}}
+                {{userReviews.length + plusReviews.length}}
+              
+              
+                @defer (when activeTabId === TabID.Reviews; prefetch on idle) {
+                  
+                }
+              
+            
          • 
+          }
+
           
        • 
             {{t('details-tab')}}
             
diff --git a/UI/Web/src/app/volume-detail/volume-detail.component.ts b/UI/Web/src/app/volume-detail/volume-detail.component.ts
index 8baecad29..7460bdcab 100644
--- a/UI/Web/src/app/volume-detail/volume-detail.component.ts
+++ b/UI/Web/src/app/volume-detail/volume-detail.component.ts
@@ -8,7 +8,7 @@ import {
   OnInit,
   ViewChild
 } from '@angular/core';
-import {AsyncPipe, DOCUMENT, NgStyle, NgClass, Location} from "@angular/common";
+import {AsyncPipe, DOCUMENT, Location, NgClass, NgStyle} from "@angular/common";
 import {ActivatedRoute, Router, RouterLink} from "@angular/router";
 import {ImageService} from "../_services/image.service";
 import {SeriesService} from "../_services/series.service";
@@ -54,9 +54,7 @@ import {VirtualScrollerModule} from "@iharbeck/ngx-virtual-scroller";
 import {Action, ActionFactoryService, ActionItem} from "../_services/action-factory.service";
 import {Breakpoint, UtilityService} from "../shared/_services/utility.service";
 import {ChapterCardComponent} from "../cards/chapter-card/chapter-card.component";
-import {
-  EditVolumeModalComponent
-} from "../_single-module/edit-volume-modal/edit-volume-modal.component";
+import {EditVolumeModalComponent} from "../_single-module/edit-volume-modal/edit-volume-modal.component";
 import {Genre} from "../_models/metadata/genre";
 import {Tag} from "../_models/tag";
 import {RelatedTabComponent} from "../_single-module/related-tab/related-tab.component";
@@ -78,6 +76,11 @@ import {EditChapterModalComponent} from "../_single-module/edit-chapter-modal/ed
 import {BulkOperationsComponent} from "../cards/bulk-operations/bulk-operations.component";
 import {CoverImageComponent} from "../_single-module/cover-image/cover-image.component";
 import {DefaultModalOptions} from "../_models/default-modal-options";
+import {UserReview} from "../_single-module/review-card/user-review";
+import {ReviewsComponent} from "../_single-module/reviews/reviews.component";
+import {ExternalRatingComponent} from "../series-detail/_components/external-rating/external-rating.component";
+import {ChapterService} from "../_services/chapter.service";
+import {User} from "../_models/user";
 
 enum TabID {
 
@@ -118,41 +121,42 @@ interface VolumeCast extends IHasCast {
 }
 
 @Component({
-  selector: 'app-volume-detail',
-  standalone: true,
-    imports: [
-        LoadingComponent,
-        NgbNavOutlet,
-        DetailsTabComponent,
-        NgbNavItem,
-        NgbNavLink,
-        NgbNavContent,
-        NgbNav,
-        ReadMoreComponent,
-        AsyncPipe,
-        NgbDropdownItem,
-        NgbDropdownMenu,
-        NgbDropdown,
-        NgbDropdownToggle,
-        EntityTitleComponent,
-        RouterLink,
-        NgbTooltip,
-        NgStyle,
-        NgClass,
-        TranslocoDirective,
-        VirtualScrollerModule,
-        ChapterCardComponent,
-        RelatedTabComponent,
-        BadgeExpanderComponent,
-        MetadataDetailRowComponent,
-        DownloadButtonComponent,
-        CardActionablesComponent,
-        BulkOperationsComponent,
-        CoverImageComponent
-    ],
-  templateUrl: './volume-detail.component.html',
-  styleUrl: './volume-detail.component.scss',
-  changeDetection: ChangeDetectionStrategy.OnPush
+    selector: 'app-volume-detail',
+  imports: [
+    LoadingComponent,
+    NgbNavOutlet,
+    DetailsTabComponent,
+    NgbNavItem,
+    NgbNavLink,
+    NgbNavContent,
+    NgbNav,
+    ReadMoreComponent,
+    AsyncPipe,
+    NgbDropdownItem,
+    NgbDropdownMenu,
+    NgbDropdown,
+    NgbDropdownToggle,
+    EntityTitleComponent,
+    RouterLink,
+    NgbTooltip,
+    NgStyle,
+    NgClass,
+    TranslocoDirective,
+    VirtualScrollerModule,
+    ChapterCardComponent,
+    RelatedTabComponent,
+    BadgeExpanderComponent,
+    MetadataDetailRowComponent,
+    DownloadButtonComponent,
+    CardActionablesComponent,
+    BulkOperationsComponent,
+    CoverImageComponent,
+    ReviewsComponent,
+    ExternalRatingComponent
+  ],
+    templateUrl: './volume-detail.component.html',
+    styleUrl: './volume-detail.component.scss',
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class VolumeDetailComponent implements OnInit {
   private readonly document = inject(DOCUMENT);
@@ -177,12 +181,14 @@ export class VolumeDetailComponent implements OnInit {
   private readonly readingListService = inject(ReadingListService);
   private readonly messageHub = inject(MessageHubService);
   private readonly location = inject(Location);
+  private readonly chapterService = inject(ChapterService);
 
 
   protected readonly AgeRating = AgeRating;
   protected readonly TabID = TabID;
   protected readonly FilterField = FilterField;
   protected readonly Breakpoint = Breakpoint;
+  protected readonly encodeURIComponent = encodeURIComponent;
 
   @ViewChild('scrollingBlock') scrollingBlock: ElementRef | undefined;
   @ViewChild('companionBar') companionBar: ElementRef | undefined;
@@ -197,10 +203,17 @@ export class VolumeDetailComponent implements OnInit {
   libraryType: LibraryType | null = null;
   activeTabId = TabID.Chapters;
   readingLists: ReadingList[] = [];
+
+  // Only populated if the volume has exactly one chapter
+  userReviews: Array = [];
+  plusReviews: Array = [];
+  rating: number = 0;
+  hasBeenRated: boolean = false;
+
   mobileSeriesImgBackground: string | undefined;
   downloadInProgress: boolean = false;
 
-  volumeActions: Array> = this.actionFactoryService.getVolumeActions(this.handleVolumeAction.bind(this));
+  volumeActions: Array> = this.actionFactoryService.getVolumeActions(this.handleVolumeAction.bind(this), this.shouldRenderVolumeAction.bind(this));
   chapterActions: Array> = this.actionFactoryService.getChapterActions(this.handleChapterActionCallback.bind(this));
 
   bulkActionCallback = async (action: ActionItem, _: any) => {
@@ -375,7 +388,7 @@ export class VolumeDetailComponent implements OnInit {
     forkJoin({
       series: this.seriesService.getSeries(this.seriesId),
       volume: this.volumeService.getVolumeMetadata(this.volumeId),
-      libraryType: this.libraryService.getLibraryType(this.libraryId)
+      libraryType: this.libraryService.getLibraryType(this.libraryId),
     }).subscribe(results => {
 
       if (results.volume === null) {
@@ -387,6 +400,15 @@ export class VolumeDetailComponent implements OnInit {
       this.volume = results.volume;
       this.libraryType = results.libraryType;
 
+      if (this.volume.chapters.length === 1) {
+        this.chapterService.chapterDetailPlus(this.seriesId, this.volume.chapters[0].id).subscribe(detail => {
+          this.userReviews = detail.reviews.filter(r => !r.isExternal);
+          this.plusReviews = detail.reviews.filter(r => r.isExternal);
+          this.rating = detail.rating;
+          this.hasBeenRated = detail.hasBeenRated;
+        });
+      }
+
       this.themeService.setColorScape(this.volume!.primaryColor, this.volume!.secondaryColor);
 
       // Set up the download in progress
@@ -550,16 +572,6 @@ export class VolumeDetailComponent implements OnInit {
     this.location.replaceState(newUrl)
   }
 
-  openPerson(field: FilterField, value: number) {
-    this.filterUtilityService.applyFilter(['all-series'], field, FilterComparison.Equal, `${value}`).subscribe();
-  }
-
-  performAction(action: ActionItem) {
-    if (typeof action.callback === 'function') {
-      action.callback(action, this.volume!);
-    }
-  }
-
   async handleChapterActionCallback(action: ActionItem, chapter: Chapter) {
     switch (action.action) {
       case(Action.MarkAsRead):
@@ -590,6 +602,17 @@ export class VolumeDetailComponent implements OnInit {
     }
   }
 
+  shouldRenderVolumeAction(action: ActionItem, entity: Volume, user: User) {
+    switch (action.action) {
+      case(Action.MarkAsRead):
+        return entity.pagesRead < entity.pages;
+      case(Action.MarkAsUnread):
+        return entity.pagesRead !== 0;
+      default:
+        return true;
+    }
+  }
+
   async handleVolumeAction(action: ActionItem) {
     switch (action.action) {
       case Action.Delete:
@@ -613,6 +636,7 @@ export class VolumeDetailComponent implements OnInit {
         });
         break;
       case Action.AddToReadingList:
+        this.actionService.addVolumeToReadingList(this.volume!, this.seriesId);
         break;
       case Action.Download:
         if (this.downloadInProgress) return;
diff --git a/UI/Web/src/app/want-to-read/_components/want-to-read/want-to-read.component.ts b/UI/Web/src/app/want-to-read/_components/want-to-read/want-to-read.component.ts
index f917f7dc7..b16d1f9fc 100644
--- a/UI/Web/src/app/want-to-read/_components/want-to-read/want-to-read.component.ts
+++ b/UI/Web/src/app/want-to-read/_components/want-to-read/want-to-read.component.ts
@@ -1,43 +1,49 @@
-import { DOCUMENT, NgStyle, NgIf, DecimalPipe } from '@angular/common';
+import {DecimalPipe, DOCUMENT, NgStyle} from '@angular/common';
 import {
   AfterContentChecked,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
-  Component, DestroyRef,
+  Component,
+  DestroyRef,
   ElementRef,
   EventEmitter,
-  HostListener,
   inject,
   Inject,
   OnInit,
   ViewChild
 } from '@angular/core';
-import { Title } from '@angular/platform-browser';
-import { Router, ActivatedRoute } from '@angular/router';
-import { take, debounceTime } from 'rxjs';
-import { BulkSelectionService } from 'src/app/cards/bulk-selection.service';
-import { FilterSettings } from 'src/app/metadata-filter/filter-settings';
-import { FilterUtilitiesService } from 'src/app/shared/_services/filter-utilities.service';
-import { UtilityService, KEY_CODES } from 'src/app/shared/_services/utility.service';
-import { SeriesRemovedEvent } from 'src/app/_models/events/series-removed-event';
-import { JumpKey } from 'src/app/_models/jumpbar/jump-key';
-import { Pagination } from 'src/app/_models/pagination';
-import { Series } from 'src/app/_models/series';
-import { FilterEvent } from 'src/app/_models/metadata/series-filter';
-import { Action, ActionItem } from 'src/app/_services/action-factory.service';
-import { ActionService } from 'src/app/_services/action.service';
-import { ImageService } from 'src/app/_services/image.service';
-import { JumpbarService } from 'src/app/_services/jumpbar.service';
-import { MessageHubService, EVENTS } from 'src/app/_services/message-hub.service';
-import { ScrollService } from 'src/app/_services/scroll.service';
-import { SeriesService } from 'src/app/_services/series.service';
+import {Title} from '@angular/platform-browser';
+import {ActivatedRoute, Router} from '@angular/router';
+import {debounceTime, take} from 'rxjs';
+import {BulkSelectionService} from 'src/app/cards/bulk-selection.service';
+import {FilterUtilitiesService} from 'src/app/shared/_services/filter-utilities.service';
+import {UtilityService} from 'src/app/shared/_services/utility.service';
+import {SeriesRemovedEvent} from 'src/app/_models/events/series-removed-event';
+import {JumpKey} from 'src/app/_models/jumpbar/jump-key';
+import {Pagination} from 'src/app/_models/pagination';
+import {Series} from 'src/app/_models/series';
+import {FilterEvent, SortField} from 'src/app/_models/metadata/series-filter';
+import {Action, ActionItem} from 'src/app/_services/action-factory.service';
+import {ActionService} from 'src/app/_services/action.service';
+import {ImageService} from 'src/app/_services/image.service';
+import {JumpbarService} from 'src/app/_services/jumpbar.service';
+import {EVENTS, MessageHubService} from 'src/app/_services/message-hub.service';
+import {ScrollService} from 'src/app/_services/scroll.service';
+import {SeriesService} from 'src/app/_services/series.service';
 import {takeUntilDestroyed} from "@angular/core/rxjs-interop";
-import { SeriesCardComponent } from '../../../cards/series-card/series-card.component';
-import { CardDetailLayoutComponent } from '../../../cards/card-detail-layout/card-detail-layout.component';
-import { BulkOperationsComponent } from '../../../cards/bulk-operations/bulk-operations.component';
-import { SideNavCompanionBarComponent } from '../../../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component';
+import {SeriesCardComponent} from '../../../cards/series-card/series-card.component';
+import {CardDetailLayoutComponent} from '../../../cards/card-detail-layout/card-detail-layout.component';
+import {BulkOperationsComponent} from '../../../cards/bulk-operations/bulk-operations.component';
+import {
+  SideNavCompanionBarComponent
+} from '../../../sidenav/_components/side-nav-companion-bar/side-nav-companion-bar.component';
 import {translate, TranslocoDirective} from "@jsverse/transloco";
-import {SeriesFilterV2} from "../../../_models/metadata/v2/series-filter-v2";
+import {FilterV2} from "../../../_models/metadata/v2/filter-v2";
+import {FilterField} from "../../../_models/metadata/v2/filter-field";
+import {SeriesFilterSettings} from "../../../metadata-filter/filter-settings";
+import {MetadataService} from "../../../_services/metadata.service";
+import {FilterStatement} from "../../../_models/metadata/v2/filter-statement";
+import {FilterComparison} from "../../../_models/metadata/v2/filter-comparison";
 
 
 @Component({
@@ -45,7 +51,6 @@ import {SeriesFilterV2} from "../../../_models/metadata/v2/series-filter-v2";
     templateUrl: './want-to-read.component.html',
     styleUrls: ['./want-to-read.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
-    standalone: true,
     imports: [SideNavCompanionBarComponent, NgStyle, BulkOperationsComponent, CardDetailLayoutComponent, SeriesCardComponent, DecimalPipe, TranslocoDirective]
 })
 export class WantToReadComponent implements OnInit, AfterContentChecked {
@@ -53,15 +58,16 @@ export class WantToReadComponent implements OnInit, AfterContentChecked {
   @ViewChild('scrollingBlock') scrollingBlock: ElementRef | undefined;
   @ViewChild('companionBar') companionBar: ElementRef | undefined;
   private readonly destroyRef = inject(DestroyRef);
+  private readonly metadataService = inject(MetadataService);
 
   isLoading: boolean = true;
   series: Array = [];
   pagination: Pagination = new Pagination();
-  filter: SeriesFilterV2 | undefined = undefined;
-  filterSettings: FilterSettings = new FilterSettings();
+  filter: FilterV2 | undefined = undefined;
+  filterSettings: SeriesFilterSettings = new SeriesFilterSettings();
   refresh: EventEmitter = new EventEmitter();
 
-  filterActiveCheck!: SeriesFilterV2;
+  filterActiveCheck!: FilterV2;
   filterActive: boolean = false;
 
   jumpbarKeys: Array = [];
@@ -106,13 +112,23 @@ export class WantToReadComponent implements OnInit, AfterContentChecked {
       this.router.routeReuseStrategy.shouldReuseRoute = () => false;
       this.titleService.setTitle('Kavita - ' + translate('want-to-read.title'));
 
-      this.filterUtilityService.filterPresetsFromUrl(this.route.snapshot).subscribe(filter => {
-        this.filter = filter;
 
-        this.filterActiveCheck = this.filterUtilityService.createSeriesV2Filter();
-        this.filterActiveCheck!.statements.push(this.filterUtilityService.createSeriesV2DefaultStatement());
+      this.route.data.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(data => {
+        this.filter = data['filter'] as FilterV2;
+
+        const defaultStmt = {field: FilterField.WantToRead, value: 'true', comparison: FilterComparison.Equal} as FilterStatement;
+
+        if (this.filter == null) {
+          this.filter = this.metadataService.createDefaultFilterDto('series');
+          this.filter.statements.push(defaultStmt);
+        }
+
+
+        this.filterActiveCheck = this.metadataService.createDefaultFilterDto('series');
+        this.filterActiveCheck!.statements.push(defaultStmt);
         this.filterSettings.presetsV2 =  this.filter;
 
+
         this.cdRef.markForCheck();
       });
 
@@ -166,7 +182,7 @@ export class WantToReadComponent implements OnInit, AfterContentChecked {
     });
   }
 
-  updateFilter(data: FilterEvent) {
+  updateFilter(data: FilterEvent) {
     if (data.filterV2 === undefined) return;
     this.filter = data.filterV2;
 
diff --git a/UI/Web/src/assets/fonts/Fast_Font/Fast_Sans.woff2 b/UI/Web/src/assets/fonts/Fast_Font/Fast_Sans.woff2
new file mode 100644
index 000000000..cc0a8d06f
Binary files /dev/null and b/UI/Web/src/assets/fonts/Fast_Font/Fast_Sans.woff2 differ
diff --git a/UI/Web/src/assets/fonts/Fast_Font/Fast_Serif.woff2 b/UI/Web/src/assets/fonts/Fast_Font/Fast_Serif.woff2
new file mode 100644
index 000000000..45f7ccf9e
Binary files /dev/null and b/UI/Web/src/assets/fonts/Fast_Font/Fast_Serif.woff2 differ
diff --git a/UI/Web/src/assets/images/ExternalServices/ComicBookRoundup.png b/UI/Web/src/assets/images/ExternalServices/ComicBookRoundup.png
new file mode 100644
index 000000000..93d29c25e
Binary files /dev/null and b/UI/Web/src/assets/images/ExternalServices/ComicBookRoundup.png differ
diff --git a/UI/Web/src/assets/langs/ca.json b/UI/Web/src/assets/langs/ca.json
new file mode 100644
index 000000000..1b929cb53
--- /dev/null
+++ b/UI/Web/src/assets/langs/ca.json
@@ -0,0 +1,511 @@
+{
+    "login": {
+        "forgot-password": "Heu oblidat la contrasenya?"
+    },
+    "dashboard": {
+        "no-libraries": "Encara no s'ha configurat cap biblioteca. Creeu-ne una de nova a",
+        "server-settings-link": "Paràmetres del servidor",
+        "recently-updated-title": "Sèries actualitzades recentment",
+        "recently-added-title": "Sèries afegides recentment",
+        "not-granted": "No se us ha atorgat cap accés a biblioteques."
+    },
+    "edit-user": {
+        "update": "Actualitza",
+        "account-detail-title": "Detalls del compte",
+        "saving": "S'està desant…"
+    },
+    "user-scrobble-history": {
+        "last-modified-header": "Darrera modificació",
+        "type-header": "Tipus",
+        "series-header": "Sèrie",
+        "volume-and-chapter-num": "Volum {{v}}, capítol {{n}}",
+        "volume-num": "Volum {{num}}",
+        "chapter-num": "Capítol {{num}}",
+        "rating": "Valoració {{r}}",
+        "data-header": "Dades"
+    },
+    "want-to-read": {
+        "title": "Vull llegir"
+    },
+    "user-preferences": {
+        "success-toast": "S'han actualitzat les preferències d'ús",
+        "global-settings-title": "Paràmetres globals",
+        "locale-label": "Configuració local",
+        "locale-tooltip": "La llengua que ha d'usar el Kavita",
+        "prompt-on-download-label": "Pregunta en baixar",
+        "disable-animations-label": "Desactiva les animacions",
+        "clients-api-key-label": "Clau de l'API",
+        "clients-api-key-tooltip": "La clau de l'API és com una contrasenya. Reinicialitzar-la invalidarà tots els clients existents."
+    },
+    "theme-manager": {
+        "title": "Gestor de temes",
+        "site-themes": "Temes del lloc",
+        "default-theme": "Per defecte",
+        "upload-continued": "un fitxer CSS",
+        "active-theme": "Actiu",
+        "downloadable": "Baixables",
+        "downloaded": "Baixats",
+        "applied": "Aplicat",
+        "preview-default": "Seleccioneu un tema primer",
+        "preview-title": "Previsualització"
+    },
+    "theme": {
+        "theme-dark": "Fosc",
+        "theme-black": "Negre",
+        "theme-paper": "Paper",
+        "theme-white": "Blanc"
+    },
+    "manage-devices": {
+        "email-label": "Adreça electrònica",
+        "title": "Gestor de dispositius",
+        "platform-label": "Plataforma",
+        "devices-title": "Dispositius",
+        "no-devices": "Encara no s'ha configurat cap dispositiu",
+        "name-label": "Nom"
+    },
+    "changelog-update-item": {
+        "known-issues": "Problemes coneguts",
+        "api": "API",
+        "theme": "Tema"
+    },
+    "new-version-modal": {
+        "title": "S'ha actualitzat el Kavita.",
+        "refresh": "Actualitza"
+    },
+    "change-password": {
+        "current-password-label": "Contrasenya actual",
+        "confirm-password-label": "Confirmeu la contrasenya",
+        "new-password-label": "Contrasenya nova"
+    },
+    "change-email": {
+        "current-password-label": "Contrasenya actual",
+        "email-title": "Adreça electrònica",
+        "email-label": "Adreça electrònica nova"
+    },
+    "api-key": {
+        "show": "Mostra",
+        "hide": "Amaga",
+        "copy": "Copia"
+    },
+    "scrobbling-providers": {
+        "no-token-set": "No s'ha definit cap testimoni",
+        "anilist-first-later": "Més tard",
+        "anilist-first-now": "Ara",
+        "generate": "Genera",
+        "token-valid": "El testimoni és vàlid",
+        "token-set": "S'ha definit el testimoni",
+        "token-expired": "El testimoni ha caducat"
+    },
+    "directory-picker": {
+        "title": "Trieu una carpeta",
+        "path-label": "Camí",
+        "share": "Comparteix"
+    },
+    "library-access-modal": {
+        "title": "Accés a la biblioteca",
+        "no-data": "Encara no s'ha configurat cap biblioteca."
+    },
+    "time-periods": {
+        "last-year": "L'any passat",
+        "this-week": "Aquesta setmana"
+    },
+    "device-platform-pipe": {
+        "custom": "Personalitzat"
+    },
+    "time-duration-pipe": {
+        "minutes": "{{value}} minuts",
+        "months": "{{value}} mesos",
+        "days": "{{value}} dies",
+        "years": "{{value}} anys"
+    },
+    "time-ago-pipe": {
+        "just-now": "ara mateix",
+        "mins-ago": "fa {{value}} minuts",
+        "hour-ago": "fa una hora",
+        "hours-ago": "fa {{value}} hores",
+        "day-ago": "ahir",
+        "days-ago": "fa {{value}} dies",
+        "month-ago": "fa un mes",
+        "months-ago": "fa {{value}} mesos",
+        "year-ago": "fa un any",
+        "never": "Mai",
+        "min-ago": "fa un minut",
+        "years-ago": "fa {{value}} anys"
+    },
+    "relationship-pipe": {
+        "adaptation": "Adaptació",
+        "alternative-setting": "Ambientació alternativa",
+        "sequel": "Seqüela",
+        "prequel": "Preqüela",
+        "edition": "Edició",
+        "alternative-version": "Versió alternativa",
+        "character": "Personatge",
+        "contains": "Conté"
+    },
+    "person-role-pipe": {
+        "imprint": "Segell"
+    },
+    "manga-format-pipe": {
+        "epub": "EPUB",
+        "archive": "Arxiu",
+        "image": "Imatge",
+        "pdf": "PDF",
+        "unknown": "Desconegut"
+    },
+    "library-type-pipe": {
+        "image": "Imatge",
+        "book": "Llibre",
+        "comic": "Còmic",
+        "manga": "Manga",
+        "comicVine": "Comic Vine"
+    },
+    "book-reader": {
+        "settings-header": "Paràmetres",
+        "virtual-pages": "pàgines virtuals",
+        "toc-header": "Sumari",
+        "loading-book": "S'està carregant el llibre…",
+        "go-back": "Ves enrere",
+        "previous": "Anterior",
+        "go-to-page-prompt": "Hi ha {{totalPages}} pàgines. A quina pàgina voleu anar?",
+        "incognito-mode-label": "Mode incògnit",
+        "go-to-page": "Ves a la pàgina",
+        "pagination-header": "Secció",
+        "go-to-last-page": "Ves a l'última pàgina",
+        "next": "Següent",
+        "table-of-contents-header": "Sumari",
+        "prev-chapter": "Capítol/volum anterior",
+        "next-chapter": "Capítol/volum següent",
+        "page-label": "Pàgina",
+        "title": "Paràmetres del llibre"
+    },
+    "personal-table-of-contents": {
+        "page": "Pàgina {{value}}",
+        "delete": "Suprimeix {{bookmarkName}}"
+    },
+    "confirm-email": {
+        "error-label": "Error:"
+    },
+    "series-detail": {
+        "page-settings-title": "Paràmetres de pàgina",
+        "layout-mode-option-card": "Targeta",
+        "incognito": "Incògnit",
+        "continue-incognito": "Continua en incògnit",
+        "send-to": "S'ha enviat el fitxer a {{deviceName}}",
+        "no-chapters": "No hi ha capítols en aquest volum. No es pot llegir.",
+        "edit-series-alt": "Edita la informació",
+        "continue": "Continua",
+        "read-incognito": "Llegeix en incògnit",
+        "layout-mode-option-list": "Llista",
+        "weblinks-title": "Enllaços",
+        "more-alt": "Més",
+        "pages-count": "{{num}} pàgines",
+        "words-count": "{{num}} mots",
+        "publication-status-tooltip": "Estat de publicació"
+    },
+    "match-series-modal": {
+        "search": "Cerca"
+    },
+    "metadata-fields": {
+        "genres-title": "Gèneres",
+        "cover-artists-title": "Artistes",
+        "characters-title": "Personatges",
+        "imprints-title": "Segells",
+        "tags-title": "Etiquetes"
+    },
+    "side-nav": {
+        "want-to-read": "Vull llegir",
+        "collections": "Col·leccions"
+    },
+    "cover-image-chooser": {
+        "url": "URL",
+        "upload": "Carrega",
+        "upload-continued": "una imatge",
+        "enter-an-url-pre-title": "Introduïu un {{url}}",
+        "url-label": "URL"
+    },
+    "all-collections": {
+        "title": "Col·leccions"
+    },
+    "stream-list-item": {
+        "smart-filter": "Filtre intel·ligent",
+        "library": "Biblioteca",
+        "external-source": "Font externa"
+    },
+    "reading-list-detail": {
+        "page-settings-title": "Paràmetres de pàgina",
+        "continue": "Continua"
+    },
+    "events-widget": {
+        "title-alt": "Activitat"
+    },
+    "grouped-typeahead": {
+        "tags": "Etiquetes",
+        "files": "Fitxers",
+        "chapters": "Capítols",
+        "people": "Persones",
+        "libraries": "Biblioteques",
+        "collections": "Col·leccions"
+    },
+    "nav-header": {
+        "search-alt": "Cerca…",
+        "server-settings": "Paràmetres del servidor",
+        "settings": "Paràmetres",
+        "all-filters": "Filtres intel·ligents",
+        "nav-link-header": "Opcions de navegació",
+        "no-data": "No s'ha trobat cap resultat"
+    },
+    "pdf-reader": {
+        "incognito-mode": "Mode incògnit",
+        "light-theme-alt": "Tema clar",
+        "dark-theme-alt": "Tema fosc"
+    },
+    "metadata-filter": {
+        "descending-alt": "Descendent",
+        "collections-label": "Col·leccions",
+        "format-label": "Format",
+        "sort-by-label": "Ordena per",
+        "filter-name-label": "Nom del filtre",
+        "ascending-alt": "Ascendent",
+        "series-name-label": "Nom de la sèrie",
+        "publication-status-label": "Estat de publicació"
+    },
+    "edit-series-modal": {
+        "format-title": "Format",
+        "summary-label": "Resum",
+        "library-title": "Biblioteca",
+        "publication-status-title": "Estat de publicació"
+    },
+    "file-breakdown-stats": {
+        "format-title": "Format",
+        "format-header": "Format",
+        "total-files-header": "Fitxers totals"
+    },
+    "manga-format-stats": {
+        "data-table-label": "Taula de dades",
+        "count-header": "Recompte",
+        "title": "Format",
+        "visualisation-label": "Visualització",
+        "format-header": "Format"
+    },
+    "publication-status-stats": {
+        "visualisation-label": "Visualització",
+        "data-table-label": "Taula de dades",
+        "year-header": "Any",
+        "count-header": "Recompte",
+        "title": "Estat de publicació"
+    },
+    "server-stats": {
+        "total-series-label": "Sèries totals",
+        "total-series-tooltip": "Sèries totals: {{count}}",
+        "total-volumes-label": "Volums totals",
+        "total-volumes-tooltip": "Volums totals: {{count}}",
+        "total-size-label": "Mida total",
+        "total-genres-label": "Gèneres totals",
+        "total-genres-tooltip": "Gèneres totals: {{count}}",
+        "total-tags-label": "Etiquetes totals",
+        "total-tags-tooltip": "Etiquetes totals: {{count}}",
+        "total-people-label": "Persones totals",
+        "total-people-tooltip": "Persones totals: {{count}}",
+        "total-read-time-label": "Temps de lectura total",
+        "total-read-time-tooltip": "Temps de lectura total: {{count}}",
+        "series": "sèries",
+        "reads": "lectures",
+        "popular-series-title": "Sèries populars",
+        "series-count": "{{num}} sèries",
+        "volume-count": "{{num}} volums",
+        "file-count": "{{num}} fitxers",
+        "genre-count": "{{num}} gèneres",
+        "tag-count": "{{num}} etiquetes",
+        "people-count": "{{num}} persones",
+        "total-files-label": "Fitxers totals",
+        "total-files-tooltip": "Fitxers totals: {{count}}",
+        "popular-libraries-title": "Biblioteques populars"
+    },
+    "errors": {
+        "not-found": "Aquest URL no existeix"
+    },
+    "customize-sidenav-streams": {
+        "smart-filters-title": "Filtres intel·ligents"
+    },
+    "manage-external-sources": {
+        "add-source": "Afegeix",
+        "help-link": "Més informació",
+        "no-data": "No hi ha cap font externa"
+    },
+    "edit-external-source-item": {
+        "title": "Font externa nova",
+        "host-label": "Amfitrió",
+        "name-label": "Nom",
+        "api-key-label": "Clau de l'API",
+        "pattern": "L'amfitrió ha d'indicar-se com un URL http(s):// vàlid"
+    },
+    "filter-field-pipe": {
+        "collection-tags": "Etiquetes de la col·lecció",
+        "formats": "Formats",
+        "team": "Equip",
+        "location": "Ubicació",
+        "languages": "Llengües",
+        "libraries": "Biblioteques",
+        "publication-status": "Estat de publicació",
+        "imprint": "Segell",
+        "publisher": "Editorial",
+        "series-name": "Nom de la sèrie",
+        "summary": "Resum",
+        "want-to-read": "Vull llegir",
+        "path": "Camí",
+        "file-path": "Camí del fitxer"
+    },
+    "filter-comparison-pipe": {
+        "contains": "Conté",
+        "does-not-contain": "No conté",
+        "must-contains": "Ha de contenir"
+    },
+    "entity-type": {
+        "series": "sèrie",
+        "volume": "volum",
+        "logs": "registres",
+        "chapter": "capítol"
+    },
+    "tabs": {
+        "related-tab": "Relacionats",
+        "specials-tab": "Especials",
+        "details-tab": "Detalls",
+        "progress-tab": "Progrés",
+        "info-tab": "Informació",
+        "recommendations-tab": "Recomanacions",
+        "tasks-tab": "Tasques",
+        "advanced-tab": "Avançat",
+        "cover-tab": "Imatge de coberta",
+        "folder-tab": "Carpeta",
+        "general-tab": "Generals",
+        "tags-tab": "Etiquetes",
+        "account-tab": "Compte",
+        "stats-tab": "Estadístiques",
+        "devices-tab": "Dispositius",
+        "preferences-tab": "Preferències",
+        "series-tab": "Sèrie",
+        "people-tab": "Persones",
+        "theme-tab": "Tema",
+        "metadata-tab": "Metadades",
+        "weblink-tab": "Enllaços web",
+        "smart-filters-tab": "Filtres intel·ligents",
+        "volumes-tab": "Volums",
+        "books-tab": "Llibres"
+    },
+    "common": {
+        "close": "Tanca",
+        "save": "Desa",
+        "reset": "Reinicialitza",
+        "create": "Crea",
+        "cancel": "Cancel·la",
+        "filter": "Filtra",
+        "clear": "Neteja",
+        "remove": "Elimina",
+        "delete": "Suprimeix",
+        "apply": "Aplica",
+        "add": "Afegeix",
+        "help": "Ajuda",
+        "edit": "Edita",
+        "select-all": "Selecciona-ho tot",
+        "password": "Contrasenya",
+        "username": "Nom d'usuari",
+        "loading": "S'està carregant…",
+        "issue-num": "Número",
+        "issue-hash-num": "Número",
+        "series-count": "{{num}} sèries",
+        "author-count": "{{num}} autors",
+        "item-count": "{{num}} elements",
+        "book-num": "Llibre",
+        "chapter-num": "Capítol",
+        "chapter-num-shorthand": "Cap. {{num}}",
+        "book-num-shorthand": "Llibre {{num}}",
+        "volume-num": "Volum",
+        "book-nums": "Llibres",
+        "issue-nums": "Números",
+        "chapter-nums": "Capítols",
+        "volume-nums": "Volums",
+        "chapter-count": "{{num}} capítols"
+    },
+    "edit-device-modal": {
+        "device-platform-label": "Plataforma del dispositiu",
+        "title": "Edita el dispositiu"
+    },
+    "typeahead": {
+        "add-item": "Afegeix {{item}}…"
+    },
+    "user-stats-info-cards": {
+        "words-count": "{{num}} mots",
+        "pages-count": "{{num}} pàgines"
+    },
+    "confirm": {
+        "ok": "D'acord",
+        "info": "Informació"
+    },
+    "manage-smart-filters": {
+        "no-data": "No s'ha creat cap filtre intel·ligent",
+        "errored": "Hi ha un error de codificació en el filtre. Cal recrear-lo."
+    },
+    "customize-dashboard-modal": {
+        "smart-filters": "Filtres intel·ligents",
+        "title-smart-filters": "Filtres intel·ligents"
+    },
+    "import-cbl-modal": {
+        "restart": "Reinicia",
+        "next": "Següent"
+    },
+    "all-filters": {
+        "title": "Tots els filtres intel·ligents"
+    },
+    "toasts": {
+        "confirm-delete-smart-filter": "Segur que voleu suprimir aquest filtre intel·ligent?",
+        "smart-filter-deleted": "S'ha suprimit el filtre intel·ligent",
+        "no-updates": "No hi ha cap actualització disponible",
+        "confirm-delete-user": "Segur que voleu suprimir aquest compte?",
+        "copied-to-clipboard": "S'ha copiat al porta-retalls",
+        "delete-device": "Segur que voleu suprimir aquest dispositiu?",
+        "confirm-delete-series": "Segur que voleu suprimir aquesta sèrie? No es modificaran els fitxers al disc.",
+        "confirm-delete-volume": "Segur que voleu suprimir aquest volum? No es modificaran els fitxers al disc.",
+        "confirm-delete-chapter": "Segur que voleu suprimir aquest capítol? No es modificaran els fitxers al disc.",
+        "list-doesnt-exist": "Aquesta llista no existeix"
+    },
+    "infinite-scroller": {
+        "continuous-reading-next-chapter": "Capítol següent",
+        "continuous-reading-prev-chapter": "Capítol anterior"
+    },
+    "manga-reader": {
+        "incognito-title": "Mode incògnit:",
+        "next-page-tooltip": "Pàgina següent",
+        "back": "Enrere"
+    },
+    "pdf-scroll-mode-pipe": {
+        "vertical": "Vertical",
+        "horizontal": "Horitzontal"
+    },
+    "book-line-overlay": {
+        "copy": "Copia"
+    },
+    "manage-matched-metadata": {
+        "library-name-header": "Biblioteca"
+    },
+    "manage-metadata-settings": {
+        "summary-label": "Resum",
+        "derive-publication-status-label": "Estat de publicació"
+    },
+    "edit-collection-tags": {
+        "summary-label": "Resum"
+    },
+    "edit-reading-list-modal": {
+        "summary-label": "Resum",
+        "year-label": "Any",
+        "month-label": "Mes"
+    },
+    "scrobble-event-type-pipe": {
+        "chapter-read": "Progrés de lectura"
+    },
+    "site-theme-provider-pipe": {
+        "system": "Sistema"
+    },
+    "restriction-selector": {
+        "no-restriction": "Cap restricció"
+    }
+}
diff --git a/UI/Web/src/assets/langs/cs.json b/UI/Web/src/assets/langs/cs.json
index f745372ad..f7056c32f 100644
--- a/UI/Web/src/assets/langs/cs.json
+++ b/UI/Web/src/assets/langs/cs.json
@@ -11,7 +11,7 @@
         "no-libraries": "Zatím nejsou nastaveny žádné knihovny. Vytvořte některé v",
         "server-settings-link": "Nastavení serveru",
         "not-granted": "Nebyl vám udělen přístup k žádným knihovnám.",
-        "on-deck-title": "Na palubě",
+        "on-deck-title": "Rozečteno",
         "recently-updated-title": "Nedávno aktualizovaná série",
         "recently-added-title": "Nově přidaná série",
         "more-in-genre-title": "Více v {{genre}}"
@@ -22,11 +22,11 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "saving": "Ukládání…",
         "update": "Aktualizace",
-        "account-detail-title": "Detaily účtu"
+        "account-detail-title": "Detaily účtu",
+        "invalid-email-warning": "Neplatný e-mail zablokuje některé funkce systému Kavita"
     },
     "user-scrobble-history": {
         "title": "Scrobble historie",
@@ -38,7 +38,7 @@
         "series-header": "Série",
         "data-header": "Data",
         "is-processed-header": "Je zpracováno",
-        "no-data": "Žádná data",
+        "no-data": "{{common.no-data}}",
         "volume-and-chapter-num": "Svazek {{v}} Kapitola {{n}}",
         "volume-num": "Svazek {{num}}",
         "chapter-num": "Kapitola {{num}}",
@@ -46,7 +46,13 @@
         "not-applicable": "Nelze použít",
         "processed": "Zpracováno",
         "not-processed": "Nezpracováno",
-        "special": "{{entity-title.special}}"
+        "special": "{{entity-title.special}}",
+        "generate-scrobble-events": "Zpětné plnění Události",
+        "token-expired": "Platnost vašeho tokenu AniListu vypršela! Události Scrobbling nebudou zpracovány, dokud je neobnovíte na stránce Účty.",
+        "not-read-warning": "Upstream poskytovatelé si vždy ponechají nejvyšší počet",
+        "scrobbling-disabled": "Skroblování je v nastavení účtu zakázáno.",
+        "select-all-label": "Vybrat vše",
+        "delete-selected-label": "Odstranit vybrané"
     },
     "scrobble-event-type-pipe": {
         "chapter-read": "Pokrok ve čtení",
@@ -58,15 +64,6 @@
     "spoiler": {
         "click-to-show": "Spoiler, kliknutím zobrazíte"
     },
-    "review-series-modal": {
-        "title": "Upravit recenzi",
-        "review-label": "Recenze",
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "min-length": "Recenze musí mít alespoň {{count}} znaků",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}",
         "user-review": "{{username}}'s Recenze",
@@ -77,7 +74,8 @@
         "your-review": "Toto je vaše recenze",
         "external-review": "Externí recenze",
         "local-review": "Místní recenze",
-        "rating-percentage": "Hodnocení {{r}} %"
+        "rating-percentage": "Hodnocení {{r}} %",
+        "critic": "kritik"
     },
     "want-to-read": {
         "title": "Chci číst",
@@ -87,7 +85,7 @@
     },
     "user-preferences": {
         "title": "Uživatelský panel",
-        "pref-description": "Toto jsou globální nastavení, která jsou vázána na váš účet.",
+        "pref-description": "Jedná se o globální nastavení, která jsou vázána na váš účet. Nastavení čtečky se nachází v sekci Čtecí profily.",
         "account-tab": "{{tabs.account-tab}}",
         "preferences-tab": "{{tabs.preferences-tab}}",
         "theme-tab": "{{tabs.theme-tab}}",
@@ -111,56 +109,27 @@
         "collapse-series-relationships-tooltip": "Měla by Kavita ukázat seriály, které nemají žádné vztahy nebo jsou rodičem/prequelem",
         "share-series-reviews-label": "Sdílejte recenze Serií",
         "share-series-reviews-tooltip": "Má Kavita zahrnout vaše recenze na Series pro ostatní uživatele",
-        "image-reader-settings-title": "Čtečka obrázků",
-        "reading-direction-label": "Směr čtení",
-        "reading-direction-tooltip": "Kliknutím na směr přejdete na další stránku. Zprava doleva znamená, že kliknutím na levou stranu obrazovky přejdete na další stránku.",
-        "scaling-option-label": "Možnosti škálování",
-        "scaling-option-tooltip": "Jak změnit měřítko obrázku na obrazovku.",
-        "page-splitting-label": "Rozdělení stránky",
-        "page-splitting-tooltip": "Jak rozdělit obrázek v plné šířce (tj. oba obrázky jsou kombinovány)",
-        "reading-mode-label": "Režim čtení",
-        "reading-mode-tooltip": "Změna stránkování na vertikální, horizontální nebo nekonečné posunování",
-        "layout-mode-label": "Režim rozvržení",
-        "layout-mode-tooltip": "Vykreslení jednoho obrázku na obrazovku nebo dvou obrázků vedle sebe",
-        "background-color-label": "Barva pozadí",
-        "background-color-tooltip": "Barva pozadí čtečky obrázků",
-        "auto-close-menu-label": "Nabídka automatického zavření",
-        "auto-close-menu-tooltip": "Mělo by se menu automaticky zavřít",
-        "show-screen-hints-label": "Zobrazit tipy na obrazovce",
-        "show-screen-hints-tooltip": "Zobrazení překryvného okna pro lepší orientaci v oblasti a směru stránkování",
-        "emulate-comic-book-label": "Emulovat komiks",
-        "swipe-to-paginate-label": "Přejeďte prstem na stránkování",
-        "book-reader-settings-title": "Čtečka knih",
-        "tap-to-paginate-label": "Klepnutím můžete stránkovat",
-        "tap-to-paginate-tooltip": "Pokud strany obrazovky čtečky knih umožňují klepnutím na ni přejít na předchozí/další stránku",
-        "immersive-mode-label": "Imerzní režim",
-        "immersive-mode-tooltip": "Tím se nabídka skryje za kliknutí na dokument čtečky a otočením klepnutím zapněte stránkování",
-        "reading-direction-book-label": "Směr čtení",
-        "reading-direction-book-tooltip": "Směrem ke kliknutí se přesunete na další stránku. Zprava doleva znamená, že kliknutím na levou stranu obrazovky přejdete na další stránku.",
-        "font-family-label": "Rodina písem",
-        "font-family-tooltip": "Rodina písem k načtení. Výchozí načte výchozí písmo knihy",
-        "writing-style-label": "Styl psaní",
-        "writing-style-tooltip": "Změní směr textu. Vodorovně je zleva doprava, svisle shora dolů.",
-        "layout-mode-book-label": "Režim rozvržení",
-        "layout-mode-book-tooltip": "Jak by měl být obsah rozvržen. Scroll je takový, jak ho kniha balí. 1 nebo 2 sloupce se přizpůsobí výšce zařízení a vejdou se 1 nebo 2 sloupce textu na stránku",
-        "color-theme-book-label": "Barevný motiv",
-        "color-theme-book-tooltip": "Jaký barevný motiv použít na obsah a nabídku čtečky knih",
-        "font-size-book-label": "Velikost písma",
-        "line-height-book-label": "Řádkování",
-        "line-height-book-tooltip": "Kolik mezer mezi řádky knihy",
-        "margin-book-label": "Okraj",
-        "margin-book-tooltip": "Kolik mezer na každé straně obrazovky. To bude přepsáno na 0 na mobilních zařízeních bez ohledu na toto nastavení.",
         "clients-opds-alert": "OPDS není na tomto serveru povoleno. Toto nebude mít vliv na uživatele Tachiyomi.",
         "clients-opds-description": "Všichni klienti třetích stran budou používat klíč API nebo níže uvedenou adresu URL připojení. Jsou to jako hesla, udržujte je v soukromí.",
-        "clients-api-key-tooltip": "Klíč API je jako heslo. Udržujte to v tajnosti, Udržujte to v bezpečí.",
-        "clients-opds-url-tooltip": "OPDS URL",
+        "clients-api-key-tooltip": "Klíč API je jako heslo. Jeho resetováním dojde ke zneplatnění všech stávajících klientů.",
+        "clients-opds-url-tooltip": "Viz seznam podporovaných klientů OPDS: ",
         "reset": "{{common.reset}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "clients-opds-url-label": "URL OPDS",
+        "clients-api-key-label": "Klíč API",
+        "kavitaplus-settings-title": "Kavita+",
+        "anilist-scrobbling-label": "AniList Scrobblování",
+        "anilist-scrobbling-tooltip": "Povolit Kavitě Scrobble (jednosměrná synchronizace) průběhu čtení a hodnocení do AniListu",
+        "want-to-read-sync-label": "Chci číst Synchronizace",
+        "want-to-read-sync-tooltip": "Povolit Kavitě přidávat položky do seznamu Chci číst na základě AniListu a sérií MAL v seznamu čekajících čtení"
     },
     "user-holds": {
         "title": "Scrobble drží",
-        "description": "Toto je uživatelsky spravovaný seznam Sérií, který nebude scrobován na upstream poskytovatele. Sérii můžete kdykoli odstranit a další událost s možností scrobble (průběh čtení, hodnocení, stav chtít číst) spustí události.",
-        "no-data": "{{typeahead.no-data}}"
+        "description": "Toto je uživatelsky spravovaný seznam Sérií, který nebude scrobován na upstream poskytovatele. Sérii můžete kdykoli odstranit a další událost s možností scrobble (průběh čtení, hodnocení, stav chtít číst) spustí scrobblování.",
+        "no-data": "{{typeahead.no-data}}",
+        "series-name-header": "{{manage-matched-metadata.series-name-header}}",
+        "created-header": "{{manage-media-issues.created-header}}",
+        "delete-label": "{{common.remove}}"
     },
     "theme-manager": {
         "title": "Správce motivů",
@@ -174,7 +143,16 @@
         "delete": "{{common.delete}}",
         "drag-n-drop": "{{cover-image-chooser.drag-n-drop}}",
         "upload": "{{cover-image-chooser.upload}}",
-        "add": "{{common.add}}"
+        "add": "{{common.add}}",
+        "upload-continued": "soubor css",
+        "active-theme": "Aktivní",
+        "preview-default-admin": "Nejprve vyberte motiv nebo jej nahrajte ručně",
+        "description": "Kavita se dodává v mých barvách, najděte si barevné schéma, které vyhovuje vašim potřebám, nebo si ho sestavte sami a podělte se o něj. Motivy lze použít pro váš účet nebo použít pro všechny účty.",
+        "default-theme": "Výchozí",
+        "downloaded": "Staženo",
+        "downloadable": "Ke stažení",
+        "preview-default": "Nejprve vyberte motiv",
+        "preview-title": "Náhled"
     },
     "theme": {
         "theme-dark": "Temný",
@@ -200,14 +178,15 @@
         "description": "Tato část je určena k nastavení zařízení, která se nemohou připojit ke Kavitě prostřednictvím webového prohlížeče a místo toho mají e-mailovou adresu, která přijímá soubory.",
         "devices-title": "Zařízení",
         "no-devices": "Zatím nejsou nastavena žádná zařízení",
-        "platform-label": "Platforma: ",
-        "email-label": "Email: ",
+        "platform-label": "Platforma",
+        "email-label": "Email",
         "email-setup-alert": "Chcete odesílat soubory do svých zařízení? Nechte si od správce nejprve nastavit E-mail!",
         "add": "{{common.add}}",
         "delete": "{{common.delete}}",
         "edit": "{{common.edit}}",
         "no-data": "{{typeahead.no-data}}",
-        "actions-header": "{{manage-users.actions-header}}"
+        "actions-header": "{{manage-users.actions-header}}",
+        "name-label": "Název"
     },
     "edit-device-modal": {
         "device-name-label": "{{manage-devices.name-label}}",
@@ -217,7 +196,10 @@
         "close": "{{common.close}}",
         "cancel": "{{common.cancel}}",
         "required-field": "{{validation.required-field}}",
-        "valid-email": "{{validation.valid-email}}"
+        "valid-email": "{{validation.valid-email}}",
+        "title": "Upravit zařízení",
+        "email-tooltip": "Tento e-mail bude použit pro přijetí souboru prostřednictvím Odeslat do",
+        "device-platform-label": "Platforma zařízení"
     },
     "change-password": {
         "password-label": "{{common.password}}",
@@ -239,7 +221,7 @@
         "email-not-confirmed": "Tento e-mail není potvrzen",
         "email-confirmed": "Tento e-mail je potvrzen",
         "email-updated-title": "Email aktualizován",
-        "email-updated-description": "Pro potvrzení e-mailu pro váš účet můžete použít následující odkaz níže. Pokud je váš server externě přístupný, bude na e-mail odeslán e-mail a odkaz lze použít k potvrzení e-mailu.",
+        "email-updated-description": "Pro potvrzení e-mailu pro váš účet můžete použít následující odkaz. Pokud bylo nastavení e-mailu nakonfigurováno, byl e-mail odeslán a odkaz lze použít k potvrzení e-mailu.",
         "setup-user-account": "Nastavení uživatelského účtu",
         "invite-url-label": "Adresa URL pozvánky",
         "invite-url-tooltip": "Zkopírujte toto a vložte na novou kartu",
@@ -267,7 +249,8 @@
         "regen-warning": "Obnovení klíče API zruší platnost všech stávajících klientů.",
         "no-key": "CHYBA – KLÍČ NENÍ NASTAVEN",
         "confirm-reset": "Tím zrušíte platnost všech konfigurací OPDS, které jste nastavili. Jste si jistý, že chcete pokračovat?",
-        "key-reset": "Obnovení klíče API"
+        "key-reset": "Obnovení klíče API",
+        "reset": "Resetovat"
     },
     "scrobbling-providers": {
         "title": "Poskytovatelé scroblingu",
@@ -277,19 +260,30 @@
         "no-token-set": "Žádná sada tokenů",
         "token-set": "Sada tokenů",
         "generate": "Generovat",
-        "instructions": "First time users should click on \"{{scrobbling-providers.generate}}\" below to allow Kavita+ to talk with {{service}}. Once you authorize the program, copy and paste the token in the input below. You can regenerate your token at any time.",
+        "instructions": "Noví uživatelé by měli kliknout na „{{scrobbling-providers.generate}}“ níže, aby Kavita+ mohla komunikovat s {{service}}. Po autorizaci programu zkopírujte a vložte token do níže uvedeného vstupu. Token můžete kdykoli přegenerovat.",
         "token-input-label": "Token {{service}} je zde",
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
-        "loading": "{{common.loading}}"
+        "loading": "{{common.loading}}",
+        "mal-used-for": "Seznam MyAnimeList se používá pro synchronizaci Chytrých kolekcí a Chcete číst.",
+        "generic-instructions": "Vyplňte informace o různých externích službách, které máte, aby s nimi Kavita+ mohla komunikovat.",
+        "mal-token-input-label": "Id klienta MAL",
+        "mal-instructions": "Kavita používá k ověřování MAL Client Id. Vytvořte nového klienta pro Kavitu a po schválení zadejte ID klienta a své uživatelské jméno.",
+        "mal-username-input-label": "Přihlašovací jméno MAL",
+        "anilist-first-header": "Uložený token AniList",
+        "anilist-first-later": "Později",
+        "anilist-first-now": "Nyní",
+        "anilist-used-for": "AniList se používá pro scrobbling (synchronizaci dat) a chce synchronizovat čtení.",
+        "anilist-first-description": "Váš token AniListu je nyní nastaven. Tento token vydrží rok a Kavita vás bude před jeho vypršením informovat, abyste jej zde obnovili. Díky němu bude Kavita generovat události scrobble (synchronizace) z vaší historie čtení, chci číst a hodnocení. Můžete to spustit hned nebo později. Pokud máte nějaké série, které nechcete scrobblovat, vyberte je později a umístěte na ně Scrobble Hold. Tuto úlohu stačí spustit pouze jednou. Poté se Kavita postará o synchronizaci za vás.
           Pokud vyberete možnost „Později“, najdete tlačítko na stránce Scrobbling.",
+        "scrobbling-applicable-label": "Použitelný Scrobbling"
     },
     "typeahead": {
         "locked-field": "Pole je uzamčeno",
         "close": "{{common.close}}",
         "loading": "{{common.loading}}",
         "add-item": "Přidat {{item}}…",
-        "no-data": "Žádné údaje",
+        "no-data": "{{common.no-data}}",
         "add-custom-item": ", zadejte pro přidání vlastní položky"
     },
     "generic-list-modal": {
@@ -309,7 +303,11 @@
         "chapters-read-tooltip": "{{user-stats-info-cards.chapters-read-label}}: {{value}}",
         "avg-reading-per-week-label": "Průměrné čtení / týden",
         "last-active-label": "Poslední aktivní",
-        "chapters": "{{value}} kapitoly"
+        "chapters": "{{value}} kapitoly",
+        "pages-read-by-year-title": "Přečtené stránky podle roku",
+        "words-read-by-year-title": "Přečtená slova podle roku",
+        "words-count": "{{num}} slov",
+        "pages-count": "{{num}} stran"
     },
     "user-stats": {
         "library-read-progress-title": "Průběh čtení knihovny",
@@ -334,11 +332,11 @@
         "select-all": "{{common.select-all}}"
     },
     "directory-picker": {
-        "title": "Vyberte adresář",
+        "title": "Vyberte složku",
         "close": "{{common.close}}",
         "path-label": "Cesta",
         "path-placeholder": "Začněte psát nebo vyberte cestu",
-        "instructions": "Výběrem složky zobrazíte bodovou navigaci. Nevidíte svůj adresář? Zkuste nejprve zkontrolovat /.",
+        "instructions": "Výběrem složky do ní vstoupíte. Nevidíte svou složku? Zkuste nejprve zkontrolovat /.",
         "type-header": "Typ",
         "name-header": "Název",
         "cancel": "{{common.cancel}}",
@@ -426,7 +424,8 @@
         "side-story": "Vedlejší příběh",
         "spin-off": "Spin Off",
         "parent": "Rodič",
-        "edition": "Edice"
+        "edition": "Edice",
+        "annual": "Roční"
     },
     "publication-status-pipe": {
         "ongoing": "Pokračující",
@@ -439,7 +438,7 @@
         "artist": "Umělec",
         "character": "Charakter",
         "colorist": "Kolorista",
-        "cover-artist": "Autor obálky",
+        "cover-artist": "{{artist}}",
         "editor": "Editor",
         "inker": "Inker",
         "letterer": "Dopisovatel",
@@ -448,7 +447,9 @@
         "writer": "Spisovatel",
         "other": "Ostatní",
         "team": "{{filter-field-pipe.team}}",
-        "location": "{{filter-field-pipe.location}}"
+        "location": "{{filter-field-pipe.location}}",
+        "imprint": "Otisk",
+        "translator": "Překladatel"
     },
     "manga-format-pipe": {
         "epub": "EPUB",
@@ -459,8 +460,11 @@
     },
     "library-type-pipe": {
         "book": "Kniha",
-        "comic": "Komiks",
-        "manga": "Manga"
+        "comic": "Komiks (Odkaz)",
+        "manga": "Manga",
+        "image": "Obrázek",
+        "comicVine": "Komiks",
+        "lightNovel": "Lehký román"
     },
     "age-rating-pipe": {
         "unknown": "Neznámý",
@@ -482,7 +486,7 @@
     },
     "reset-password": {
         "title": "Resetovat heslo",
-        "description": "Zadejte e-mail svého účtu. Kavita vám pošle e-mail, pokud je v záznamech platný, jinak požádejte správce o odkaz z protokolů.",
+        "description": "Zadejte e-mail svého účtu. Kavita vám pošle e-mail, pokud je v souboru platný, v opačném případě požádejte správce o obnovení hesla.",
         "email-label": "{{common.email}}",
         "required-field": "{{validation.required-field}}",
         "valid-email": "{{validation.valid-email}}",
@@ -519,19 +523,17 @@
     "changelog": {
         "installed": "Instalováno",
         "download": "Stáhnout",
-        "published-label": "Publikováno: ",
         "available": "Dostupný",
-        "description": "Pokud nevidíte {{installed}}",
-        "description-continued": "tag, máte noční vydání. Jako dostupné se zobrazí pouze hlavní verze."
+        "nightly": "Noční: {{version}}"
     },
     "invite-user": {
         "title": "Pozvat uživatele",
         "close": "{{common.close}}",
-        "description": "Pozvěte uživatele na svůj server zadáním jeho e-mailu. Obdrží e-mail pro vytvoření účtu. Aby to fungovalo, musíte mít nastaveno pole Název hostitele na kartě E-mail nebo mít přístup k instanci prostřednictvím je to vzdálená URL. 

          Případně můžete použít uživatelské jméno, ale mějte na paměti, že obnovení hesla nebude dostupné pro účty založené na uživatelských jménech. Pokud nechcete používat naši e-mailovou službu, můžete hostovat svou vlastní e-mailovou službu.",
+        "description": "Pozvěte uživatele na svůj server zadáním jeho e-mailu. Obdrží e-mail pro vytvoření účtu. Aby to fungovalo, musíte mít nastaveno pole Název hostitele na kartě E-mail nebo mít přístup k instanci prostřednictvím je to vzdálená URL. 

          Případně můžete použít uživatelské jméno, ale mějte na paměti, že obnovení hesla nebude dostupné pro účty založené na uživatelských jménech. Pokud nechcete používat naši e-mailovou službu, můžete hostovat svou vlastní e-mailovou službu.",
         "email": "{{common.email}}",
         "required-field": "{{common.required-field}}",
         "setup-user-title": "Uživatel byl pozván",
-        "setup-user-description": "Pro nastavení účtu pro svého uživatele můžete použít následující odkaz níže nebo použít tlačítko kopírování. Před použitím odkazu k registraci nového uživatele se možná budete muset odhlásit. Pokud Kavita dokáže určit váš server jako externě přístupný (nebo je nastaven název hostitele), bude uživateli odeslán e-mail a uživatelé mohou použít odkazy k dokončení nastavení svého účtu. V opačném případě použijte odkaz níže nebo v protokolech k ručnímu odeslání nebo nastavení jejich účtu.",
+        "setup-user-description": "Účet pro svého uživatele můžete nastavit pomocí následujícího odkazu nebo pomocí tlačítka Kopírovat. Před použitím odkazu pro registraci nového uživatele se možná budete muset odhlásit.",
         "setup-user-account": "Nastavení uživatelského účtu",
         "setup-user-account-tooltip": "Zkopírujte toto a vložte na novou kartu. Možná se budete muset odhlásit.",
         "invite-url-label": "Adresa URL pozvánky",
@@ -568,9 +570,35 @@
         "activate-discordId-tooltip": "Propojte svůj účet Discord s Kavita+. Získáte tak přístup ke skrytým kanálům, které vám pomohou utvářet Kavitu.",
         "discord-validation": "Toto není platné ID uživatele služby Discord. Vaše uživatelské ID není vaše uživatelské jméno na Discordu.",
         "activate-delete": "{{common.delete}}",
-        "activate-reset": "{{common.reset}}",
-        "activate-reset-tooltip": "Aktivujte svou licenci s tímto serverem. Vyžaduje licenci a e-mail.",
-        "activate-save": "{{common.save}}"
+        "activate-reset": "Obnovení licence",
+        "activate-reset-tooltip": "Aktivujte svou licenci s tímto serverem. Vyžaduje licenci a e-mail",
+        "activate-save": "{{common.save}}",
+        "manage-tooltip": "Aktualizovat informace o platbě, zrušit/pozastavit předplatné atd",
+        "k+-license-overwrite": "Licence je registrována k jiné instanci systému Kavita. K tomu může dojít při přeinstalaci a zřídkakdy v důsledku aktualizace systému. Výběrem možnosti Přepsat vynutíte registraci této instance v systému Kavita+.",
+        "reset-tooltip": "Tím se resetuje instance serveru, ke které je vázána licence Kavita+. Vyžaduje e-mail a licenční klíč",
+        "k+-unlocked-description": "Vítejte v Kavitě+! Kavita bude generovat události Scrobble z vašeho pokroku, hodnocení a chcete číst, jakmile zaregistrujete své Scrobbling Providers pod účtem. Věnujte nějaký čas tomu, abyste se ujistili, že jste zadali Scrobbling Hold pro všechny série, které nechcete scrobblovat.",
+        "help-label": "{{common.help}}",
+        "kavita+-desc-part-2": "prémiové výhody",
+        "info-title": "Informace o licenci",
+        "actions-title": "Akce",
+        "license-active-label": "Aktivní licence",
+        "supported-version-label": "Na podporované verzi Kavita",
+        "expiration-label": "Vypršení platnosti",
+        "valid-tooltip": "Platný",
+        "invalid-tooltip": "Neplatný",
+        "reset-label": "Reset",
+        "delete-label": "Odebrání licence",
+        "delete-tooltip": "Tím se odebere Kavitě licence a Kavita přestane komunikovat s Kavitou+. Neodhlásí vás. Pro zrušení odběru použijte nejprve příkaz „spravovat“.",
+        "faq-title": "FAQ",
+        "total-subbed-months-label": "Celkový počet předplacených měsíců",
+        "email-label": "Registrovaný e-mail",
+        "license-mismatch": "Licence může být registrována na jinou instanci systému Kavita. Znovu se zaregistrujte a opravte to.",
+        "k+-already-registered-header": "Již zaregistrovaná licence",
+        "overwrite": "Přepsat",
+        "k+-unlocked": "Kavita+ odemčena!",
+        "kavita+-desc-part-1": "Kavita+ je prémiová předplacená služba, která zpřístupňuje funkce všem uživatelům této instance Kavity. Zakoupením předplatného ji odemknete ",
+        "kavita+-desc-part-3": "dnes!",
+        "kavita+-requirement": "Aplikace Kavita+ je navržena tak, aby fungovala pouze s nejnovějšími 3 verzemi. Cokoli mimo tuto verzi může být nefunkční."
     },
     "book-line-overlay": {
         "copy": "Kopírujte",
@@ -603,7 +631,10 @@
         "incognito-mode-label": "Režim inkognito",
         "next": "Další",
         "previous": "Předchozí",
-        "go-to-page-prompt": "Existuje {{totalPages}} stránek. Na kterou stránku chcete přejít?"
+        "go-to-page-prompt": "Existuje {{totalPages}} stránek. Na kterou stránku chcete přejít?",
+        "go-to-first-page": "Přejít na první stránku",
+        "go-to-section": "Přejít do sekce",
+        "go-to-section-prompt": "Je zde {{totalSections}} sekcí. Do které sekce chcete přejít?"
     },
     "personal-table-of-contents": {
         "no-data": "V záložkách zatím nic není",
@@ -619,7 +650,8 @@
         "required-field": "{{common.required-field}}",
         "valid-email": "{{common.valid-email}}",
         "password-validation": "{{validation.password-validation}}",
-        "register": "Registrace"
+        "register": "Registrace",
+        "error-label": "Chyba:"
     },
     "confirm-email-change": {
         "title": "Ověření změny e-mailu",
@@ -640,7 +672,7 @@
         "description": "Vyplňte formulář a zaregistrujte účet správce",
         "username-label": "{{common.username}}",
         "email-label": "{{common.email}}",
-        "email-tooltip": "E-mail nemusí být skutečná adresa, ale umožňuje přístup k zapomenutému heslu. Není odesílán mimo server, pokud není použito zapomenuté heslo bez vlastního hostitele e-mailové služby.",
+        "email-tooltip": "E-mail nemusí být skutečná adresa, ale umožňuje přístup k zapomenutému heslu. Není odesílán mimo server, pokud vám Kavita neodešle e-mail.",
         "password-label": "{{common.password}}",
         "required-field": "{{validation.required-field}}",
         "valid-email": "{{validation.valid-email}}",
@@ -650,7 +682,7 @@
     "series-detail": {
         "page-settings-title": "Nastavení stránky",
         "close": "{{common.close}}",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
         "layout-mode-option-card": "Karta",
         "layout-mode-option-list": "Seznam",
         "continue-from": "Pokračovat {{title}}",
@@ -662,7 +694,7 @@
         "incognito": "Inkognito",
         "remove-from-want-to-read": "{{actionable.remove-from-want-to-read}}",
         "add-to-want-to-read": "{{actionable.add-to-want-to-read}}",
-        "edit-series-alt": "Upravit informace o sérii",
+        "edit-series-alt": "Upravit informace",
         "reviews-tab": "{{tabs.reviews-tab}}",
         "storyline-tab": "{{tabs.storyline-tab}}",
         "books-tab": "{{tabs.books-tab}}",
@@ -695,14 +727,46 @@
         "volume-num": "{{common.volume-num}}",
         "reading-lists-title": "{{side-nav.reading-lists}}",
         "time-to-read-alt": "{{sort-field-pipe.time-to-read}}",
-        "scrobbling-tooltip": "{{settings.scrobbling}}"
+        "scrobbling-tooltip": "{{settings.scrobbling}}: {{value}}",
+        "publication-status-tooltip": "Stav publikace",
+        "release-date-title": "Vydání",
+        "time-left-alt": "Zbývající čas",
+        "publication-status-title": "Publikace",
+        "weblinks-title": "Odkazy",
+        "more-alt": "Více",
+        "pages-count": "{{num}} stran",
+        "words-count": "{{num}} slov",
+        "on": "{{reader-settings.on}}",
+        "off": "{{reader-settings.off}}"
     },
     "metadata-fields": {
         "collections-title": "{{side-nav.collections}}",
-        "reading-lists-title": "{{side-nav.reading-lists}}"
+        "reading-lists-title": "{{side-nav.reading-lists}}",
+        "editors-title": "Editoři",
+        "imprints-title": "Otisky",
+        "teams-title": "Týmy",
+        "letterers-title": "Lettereři",
+        "translators-title": "Překladatelé",
+        "pencillers-title": "Pencilleři",
+        "language-title": "Jazyk",
+        "age-rating-title": "Věková kategorie",
+        "genres-title": "Žánry",
+        "tags-title": "Štítky",
+        "writers-title": "Spisovatelé",
+        "cover-artists-title": "Umělci",
+        "characters-title": "Postavy",
+        "colorists-title": "Koloristé",
+        "inkers-title": "Potiskovač",
+        "publishers-title": "Vydavatelé",
+        "locations-title": "Lokace",
+        "links-title": "Webové odkazy"
     },
     "external-rating": {
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "kavita-rating-title": "Vaše hodnocení",
+        "entry-label": "Zobrazit podrobnosti",
+        "kavita-tooltip": "Vaše hodnocení + celkové",
+        "critic": "{{review-card.critic}}"
     },
     "badge-expander": {
         "more-items": "a {{počet}} více"
@@ -718,12 +782,28 @@
         "download": "Stáhnout"
     },
     "side-nav-companion-bar": {
-        "page-settings-title": "{{series-detail.page-settings-title}}"
+        "page-settings-title": "{{series-detail.page-settings-title}}",
+        "close-filter-and-sort": "Zavřít filtrování a řazení",
+        "open-filter-and-sort": "Otevřít filtrování a řazení",
+        "filter-and-sort-alt": "Řadit / Filtrovat"
     },
     "side-nav": {
         "filter-label": "{{common.filter}}",
         "clear": "{{common.clear}}",
-        "customize": "{{settings.customize}}"
+        "customize": "{{settings.customize}}",
+        "reading-lists": "Seznamy četby",
+        "bookmarks": "Záložky",
+        "donate": "Přispět",
+        "more": "Více",
+        "back": "Zpět",
+        "donate-tooltip": "Toto můžete odstranit přihlášením se k odběru Kavita+",
+        "home": "Domů",
+        "want-to-read": "Chci číst",
+        "collections": "Sbírky",
+        "all-series": "Všechny série",
+        "cancel-edit": "Zavřít úpravu",
+        "edit": "{{common.edit}}",
+        "browse-people": "Procházet Osoby"
     },
     "library-settings-modal": {
         "close": "{{common.close}}",
@@ -736,24 +816,110 @@
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
         "required-field": "{{validation.required-field}}",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "file-type-group-label": "Typy souborů",
+        "allow-scrobbling-label": "Povolit scrobbling",
+        "kavitaplus-eligible-tooltip": "Podporuje funkce metadat Kavita+ nebo scrobblování",
+        "include-in-dashboard-label": "Zahrnout do panelu",
+        "include-in-dashboard-tooltip": "Měly by být série z knihovny zařazeny na hlavní panel. To se týká všech sérií, jako jsou Rozečtené, Nedávno aktualizované, Nedávno přidané nebo jakékoli vlastní přírůstky.",
+        "allow-scrobbling-tooltip": "Pokud Kavita scrobble čtení události, chcete číst stav, hodnocení a recenze konfigurovaných poskytovatelů. K tomu dojde pouze v případě, že má server aktivní předplatné Kavita+.",
+        "include-in-search-label": "Zahrnout do vyhledávání",
+        "library-name-unique": "Název knihovny musí být jedinečný",
+        "add-title": "Přidat knihovnu",
+        "last-scanned-label": "Naposledy skenováno:",
+        "folder-watching-tooltip": "Přepsat sledování složky serveru pro tuto knihovnu. Pokud je vypnuto, sledování složek nebude spuštěno pro složky, které tato knihovna obsahuje. Pokud knihovny sdílejí složky, může být hlídání složek spuštěno i přesto. Vždy počká 10 minut před spuštěním kontroly.",
+        "folder-description": "Přidání složek do knihovny",
+        "cover-description-extra": "Obrázek knihovny by neměl být velký. Snažte se o malý soubor o velikosti 32x32 pixelů. Kavita neprovádí ověřování velikosti.",
+        "help-us-part-2": "náš průvodce",
+        "exclude-patterns-label": "Vyloučit vzory",
+        "help-us-part-1": "Pomozte nám tím, že budete sledovat ",
+        "naming-conventions-part-2": "požadavky na složky.",
+        "browse": "Procházet složky médií",
+        "manage-reading-list-tooltip": "Měla by Kavita vytvářet seznamy čtení ze značek StoryArc/StoryArcNumber a AlternativeSeries/AlternativeCount, které se nacházejí v souborech ComicInfo.xml/opf",
+        "folder-watching-label": "Sledování složek",
+        "edit-title": "Upravit {{name}}",
+        "name-label": "Název",
+        "type-label": "Typ",
+        "type-tooltip": "Typ knihovny určuje, jak se zpracovávají názvy souborů a zda se v uživatelském rozhraní zobrazují kapitoly (Manga) nebo vydání (Comics). Další podrobnosti o rozdílech mezi typy knihoven najdete na wiki.",
+        "kavitaplus-eligible-label": "Kavita+ Způsobilé",
+        "help-us-part-3": "k pojmenování a uspořádání médií.",
+        "naming-conventions-part-1": "Kavita má ",
+        "naming-conventions-part-3": "Zkontrolujte tento odkaz a ujistěte se, že se jím řídíte, jinak se soubory při skenování nemusí zobrazit.",
+        "cover-description": "Ikony vlastních obrázků knihovny jsou volitelné",
+        "manage-collection-label": "Spravovat sbírky",
+        "manage-collection-tooltip": "Měla by Kavita vytvářet kolekce ze značek SeriesGroup nalezených v souborech ComicInfo.xml/opf",
+        "manage-reading-list-label": "Správa seznamů četby",
+        "include-in-search-tooltip": "Měly by být do výsledků vyhledávání zahrnuty série a všechny odvozené informace (žánry, osoby, soubory) z knihovny.",
+        "force-scan": "Vynutit skenování",
+        "force-scan-tooltip": "Tím se vynutí skenování knihovny, které se bude chovat jako čisté skenování",
+        "next": "Další",
+        "file-type-group-tooltip": "Jaké typy souborů by měla Kavita vyhledávat. Například Archiv bude zahrnovat všechny soubory cb*, zip, rar atd.",
+        "exclude-patterns-tooltip": "Konfigurace sady vzorů (syntaxe Glob), které bude Kavita při skenování adresářů porovnávat a vylučovat z výsledků skeneru.",
+        "allow-metadata-matching-label": "Povolit přiřazování metadat",
+        "allow-metadata-matching-tooltip": "Měla by Kavita stáhnout metadata pro série v rámci této knihovny. K tomu dojde pouze v případě, že má server aktivní předplatné Kavita+.",
+        "enable-metadata-label": "Povolit metadata (ComicInfo/Epub/PDF)",
+        "enable-metadata-tooltip": "Povolit Kavitě číst soubory metadat, které přepisují analýzu názvů souborů."
     },
     "reader-settings": {
-        "font-family-label": "{{user-preferences.font-family-label}}",
-        "font-size-label": "{{user-preferences.font-size-book-label}}",
-        "line-spacing-label": "{{user-preferences.line-height-book-label}}",
-        "margin-label": "{{user-preferences.margin-book-label}}",
-        "reading-direction-label": "{{user-preferences.reading-direction-book-label}}",
-        "writing-style-label": "{{user-preferences.writing-style-label}}",
-        "immersive-mode-label": "{{user-preferences.immersive-mode-label}}",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}"
+        "font-family-label": "{{manage-reading-profiles.font-family-label}}",
+        "font-size-label": "{{manage-reading-profiles.font-size-book-label}}",
+        "line-spacing-label": "{{manage-reading-profiles.line-height-book-label}}",
+        "margin-label": "{{manage-reading-profiles.margin-book-label}}",
+        "reading-direction-label": "{{manage-reading-profiles.reading-direction-book-label}}",
+        "writing-style-label": "{{manage-reading-profiles.writing-style-label}}",
+        "immersive-mode-label": "{{manage-reading-profiles.immersive-mode-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
+        "right-to-left": "Zprava doleva",
+        "writing-style-tooltip": "Změní směr textu. Vodorovný je zleva doprava, svislý je shora dolů.",
+        "general-settings-title": "Obecná nastavení",
+        "reset-to-defaults": "Obnovení výchozího nastavení",
+        "tap-to-paginate-tooltip": "Kliknutím na okraje obrazovky můžete stránkovat",
+        "reader-settings-title": "Nastavení čtečky",
+        "left-to-right": "Zleva doprava",
+        "on": "Zapnout",
+        "fullscreen-label": "Celá obrazovka",
+        "fullscreen-tooltip": "Přepnutí čtečky do režimu celé obrazovky",
+        "exit": "Odejít",
+        "vertical": "Svislý",
+        "horizontal": "Vodorovný",
+        "tap-to-paginate-label": "Stránkování klepnutím",
+        "off": "Vypnout",
+        "immersive-mode-tooltip": "Tím se nabídka skryje za kliknutím na dokument čtečky a zapne se stránkování klepnutím",
+        "layout-mode-option-scroll": "Posun",
+        "enter": "Potvrdit",
+        "layout-mode-option-1col": "1 sloupec",
+        "theme-dark": "Tmavý",
+        "layout-mode-option-2col": "2 sloupec",
+        "layout-mode-tooltip": "Posun: Zrcadlí epub (obvykle jedna dlouhá rolovací stránka na kapitolu).
          1 sloupec: Vytvoří vždy jednu virtuální stránku.
          2 Sloupec: Vytvoří dvě virtuální stránky najednou vedle sebe.",
+        "color-theme-title": "Barevné motivy",
+        "theme-white": "Bílý",
+        "theme-paper": "Papír",
+        "theme-black": "Černý",
+        "create-new-tooltip": "Vytvořte nový spravovatelný profil z vašeho aktuálního implicitního profilu",
+        "update-parent": "Uložit do {{name}}",
+        "loading": "načítání",
+        "create-new": "Nový profil z implicitního",
+        "reading-profile-updated": "Profil čtení aktualizován",
+        "reading-profile-promoted": "Profil čtení propagován",
+        "line-spacing-min-label": "1x",
+        "line-spacing-max-label": "2.5x"
     },
     "bookmarks": {
         "title": "{{side-nav.bookmarks}}",
-        "series-count": "{{common.series-count}}"
+        "series-count": "{{common.series-count}}",
+        "confirm-delete": "Jste si jisti, že chcete vymazat všechny záložky pro více sérií? Toto nelze vrátit zpět.",
+        "delete-success": "Záložky byly odstraněny",
+        "no-data": "Nejsou zde žádné záložky. Zkuste vytvořit nějakou",
+        "no-data-2": "jednu.",
+        "confirm-single-delete": "Opravdu chcete vymazat všechny záložky pro {{seriesName}}? Toto nelze vrátit zpět.",
+        "delete-single-success": "Záložky {{seriesName}} byly odstraněny"
     },
     "bulk-operations": {
-        "deselect-all": "{{common.deselect-all}}"
+        "deselect-all": "{{common.deselect-all}}",
+        "items-selected": "{{num}} vybraných položek",
+        "mark-as-unread": "Označit jako nepřečtené",
+        "mark-as-read": "Označit jako přečtené",
+        "title": "Hromadné akce"
     },
     "details-tab": {
         "writers-title": "{{metadata-fields.writers-title}}",
@@ -771,21 +937,43 @@
         "imprints-title": "{{metadata-fields.imprints-title}}",
         "genres-title": "{{metadata-fields.genres-title}}",
         "tags-title": "{{metadata-fields.tags-title}}",
-        "weblinks-title": "{{tabs.weblink-tab}}"
+        "weblinks-title": "{{tabs.weblink-tab}}",
+        "format-title": "{{metadata-filter.format-label}}",
+        "length-title": "{{edit-chapter-modal.words-label}}",
+        "read-time-title": "{{edit-chapter-modal.reading-time-label}}",
+        "language-title": "{{edit-chapter-modal.language-label}}",
+        "release-title": "{{sort-field-pipe.release-year}}",
+        "age-rating-title": "{{metadata-fields.age-rating-title}}"
     },
     "related-tab": {
         "reading-lists-title": "{{reading-lists.title}}",
         "collections-title": "{{side-nav.collections}}",
-        "relations-title": "{{tabs.related-tab}}"
+        "relations-title": "{{tabs.related-tab}}",
+        "bookmarks-title": "{{side-nav.bookmarks}}"
     },
     "cover-image-chooser": {
         "reset": "{{common.reset}}",
         "apply": "{{common.apply}}",
-        "applied": "{{theme-manager.applied}}"
+        "applied": "{{theme-manager.applied}}",
+        "image-num": "Obrázek {{num}}",
+        "upload": "Nahrát",
+        "enter-an-url-pre-title": "Zadejte {{url}}",
+        "url": "URL",
+        "drag-n-drop": "Přetáhni a pusť",
+        "upload-continued": "obrázek",
+        "url-label": "URL",
+        "load": "Načíst",
+        "back": "Zpět",
+        "reset-cover-tooltip": "Obnovit obrázek obálky"
     },
     "edit-series-relation": {
         "remove": "{{common.remove}}",
-        "parent": "{{relationship-pipe.parent}}"
+        "parent": "{{relationship-pipe.parent}}",
+        "description-part-2": "wiki pro nápovědy.",
+        "target-series": "Cílová série",
+        "description-part-1": "Nevíte, jaký vztah přidat? Podívejte se na náš",
+        "relationship": "Vztah",
+        "add-relationship": "Přidat vztah"
     },
     "bulk-add-to-collection": {
         "promoted": "{{common.promoted}}",
@@ -793,20 +981,61 @@
         "filter-label": "{{common.filter}}",
         "clear": "{{common.clear}}",
         "loading": "{{common.loading}}",
-        "create": "{{common.create}}"
+        "create": "{{common.create}}",
+        "title": "Přidat do sbírky",
+        "collection-label": "Sbírka",
+        "no-data": "Zatím nebyly vytvořeny žádné sbírky"
     },
     "entity-title": {
         "issue-num": "{{common.issue-hash-num}}",
         "chapter": "{{common.chapter-num}}",
-        "book-num": "{{common.book-num-shorthand}}"
+        "book-num": "{{common.book-num-shorthand}}",
+        "special": "Speciální",
+        "vol-num": "{{user-scrobble-history.volume-num}}",
+        "single-volume": "Jeden svazek"
     },
     "manage-media-issues": {
-        "filter-label": "{{common.filter}}"
+        "filter-label": "{{common.filter}}",
+        "clear-alerts": "Vymazat upozornění",
+        "description-part-2": "wiki.",
+        "description-part-1": "Tato tabulka obsahuje problémy zjištěné při skenování nebo čtení médií. Můžete ji kdykoli vymazat a použít (vynucený) sken knihovny k provedení analýzy. Seznam některých běžných chyb a jejich význam najdete na stránce ",
+        "file-header": "Soubor",
+        "comment-header": "Komentář",
+        "created-header": "Vytvořeno",
+        "no-data": "{{common.no-data}}"
     },
     "manage-email-settings": {
         "reset": "{{common.reset}}",
         "reset-to-default": "{{common.reset-to-default}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "description": "Pro použití některých funkcí Kavity, jako je například Odeslat do zařízení, je třeba nastavit poskytovatele e-mailu. Jiné funkce, jako například Zapomenuté heslo, vyžadují zásah správce bez nastavení e-mailu.",
+        "host-name-tooltip": "Název domény reverzního proxy serveru, který je vyžadován pro funkci e-mailu. Pokud nepoužíváte reverzní proxy server, můžete použít libovolnou adresu URL, včetně adresy http://externalip:port/",
+        "test-warning": "Před stisknutím tlačítka Test musíte mít platná nastavení.",
+        "host-tooltip": "Odchozí adresa/SMTP vašeho e-mailového serveru",
+        "host-name-validation": "Název hostitele musí začínat na http(s) a nesmí končit na /",
+        "sender-displayname-tooltip": "Jméno, které příjemce uvidí, když obdrží e-mail",
+        "username-label": "Uživatelské jméno",
+        "gmail-label": "Gmail",
+        "email-settings-title": "Nastavení e-mailu",
+        "password-label": "Heslo",
+        "send-to-warning": "Pokud chcete, aby funkce Odeslat do zařízení fungovala, musíte nastavit e-mail",
+        "host-label": "Host",
+        "email-url-tooltip": "Použijte plně kvalifikovanou adresu URL e-mailové služby. Neuvádějte koncové lomítko.",
+        "size-limit-label": "Velikostní limit",
+        "sender-address-label": "Adresa odesílatele",
+        "sender-displayname-label": "Zobrazené jméno",
+        "port-label": "Port",
+        "enable-ssl-label": "Použití protokolu SSL na e-mailovém serveru",
+        "size-limit-tooltip": "Kolik bajtů může e-mailový server zpracovat pro přílohy",
+        "setting-description": "Chcete-li v systému Kavita používat funkce založené na e-mailu, musíte vyplnit nastavení názvu hostitele i SMTP.",
+        "email-url-label": "Adresa URL e-mailové služby",
+        "test": "Test",
+        "host-name-label": "Název hostitele",
+        "sender-address-tooltip": "Jedná se o e-mailovou adresu, kterou příjemce uvidí, když obdrží e-mail. Obvykle se jedná o e-mailovou adresu přidruženou k účtu.",
+        "username-tooltip": "Uživatelské jméno použité k ověření proti hostiteli",
+        "customized-templates-label": "Přizpůsobené šablony",
+        "customized-templates-tooltip": "Měla by Kavita používat adresář nastavení/šablony pro šablony místo výchozího? Za aktualizaci změn šablon jste zodpovědní vy.",
+        "outlook-label": "Outlook"
     },
     "manage-library": {
         "loading": "{{common.loading}}",
@@ -815,18 +1044,61 @@
         "deselect-all": "{{common.deselect-all}}",
         "select-all": "{{common.select-all}}",
         "cancel": "{{common.cancel}}",
-        "apply": "{{common.apply}}"
+        "apply": "{{common.apply}}",
+        "type-title": "Typ",
+        "delete-library": "Odstranit knihovnu",
+        "edit-library": "Upravit",
+        "bulk-action-label": "Hromadná akce",
+        "edit-library-by-name": "Smazat {{name}}",
+        "no-data": "Nejsou zde žádné knihovny. Zkuste si nějakou vytvořit.",
+        "include-type-label": "Zahrnout kopírování typu knihovny",
+        "add-library": "Přidat knihovnu",
+        "scan-library": "Skenovat knihovnu",
+        "title": "Knihovny",
+        "last-scanned-title": "Naposledy skenováno",
+        "shared-folders-title": "Složky",
+        "delete-library-by-name": "Smazat {{name}}",
+        "folder-count": "{{num}} složek",
+        "bulk-copy-to": "Vyberte, do kterých knihoven se má nastavení zkopírovat z {{libraryName}}",
+        "include-type-tooltip": "Tato funkce se neskenuje automaticky. Při dalším skenování může dojít k posunu sérií kvůli rozdílům v parsování"
     },
     "copy-settings-from-library-modal": {
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "select-option": "Výběr knihovny",
+        "title": "Kopírování nastavení z jedné knihovny do několika dalších",
+        "select": "Vybrat",
+        "description": "Vyberte knihovnu, ze které chcete nastavení zkopírovat, a na další obrazovce vyberte knihovny, na které chcete nastavení použít."
     },
     "manage-media-settings": {
         "reset-to-default": "{{common.reset-to-default}}",
         "reset": "{{common.reset}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "encode-as-label": "Uložit média jako",
+        "cover-image-size-label": "Velikost obrázku na obálce",
+        "media-warning": "Úlohu převodu médií musíte spustit na kartě Úlohy po uložení.",
+        "encode-as-tooltip": "Všechna média, která Kavita spravuje (obálky, záložky, oblíbené položky), budou kódována jako tento typ.",
+        "encode-as-description-part-1": "WebP/AVIF může výrazně snížit nároky na prostor pro soubory. WebP/AVIF není podporován ve všech prohlížečích nebo verzích. Chcete-li zjistit, zda jsou tato nastavení vhodná pro vaši konfiguraci, navštivte stránku ",
+        "encode-as-warning": "Po přechodu do formátu WebP/AVIF nelze převést zpět do formátu PNG. Museli byste obnovit obálky v knihovnách, aby se všechny obálky přegenerovaly. Záložky a oblíbené ikony nelze převést.",
+        "cover-image-size-tooltip": "Jak velké by se měly generovat obrázky obálky. Poznámka: Jakýkoli větší než výchozí obrázek způsobí delší načítání stránky.",
+        "encode-as-description-part-2": "Mohu použít WebP?",
+        "change": "Změnit",
+        "encode-as-description-part-3": "Mohu použít AVIF?",
+        "bookmark-dir-label": "Adresář záložek",
+        "bookmark-dir-tooltip": "Umístění, kde budou záložky uloženy. Záložky jsou zdrojové soubory a mohou být velké. Zvolte umístění s dostatečným úložným prostorem. Adresář je spravován; ostatní soubory v adresáři budou odstraněny. Pokud používáte Docker, připojte další svazek a použijte jej.",
+        "media-issue-title": "Problémy s médii",
+        "scrobble-issue-title": "Problémy se scrobble"
     },
     "manage-scrobble-errors": {
-        "filter-label": "{{common.filter}}"
+        "filter-label": "{{common.filter}}",
+        "clear-errors": "Vymazat chyby",
+        "comment-header": "Komentář",
+        "edit-header": "Upravit",
+        "created-header": "Vytvořeno",
+        "title": "Chyby scrobblingu",
+        "description": "Tato tabulka obsahuje problémy nalezené při procházení. Můžete ji kdykoli vymazat a počkat na další nahrání scrobblu. Pokud se jedná o neznámou sérii, nejlépe opravte název série nebo lokalizovaný název série nebo přidejte webový odkaz pro poskytovatele.",
+        "series-header": "Série",
+        "edit-item-alt": "Upravit {{seriesName}}",
+        "no-data": "Bez problémů"
     },
     "manage-settings": {
         "host-name-label": "{{manage-email-settings.host-name-label}}",
@@ -835,16 +1107,135 @@
         "reset-to-default": "{{common.reset-to-default}}",
         "reset": "{{common.reset}}",
         "save": "{{common.save}}",
-        "field-required": "{{validation.field-required}}"
+        "field-required": "{{validation.field-required}}",
+        "log-label": "Dny záznamů",
+        "cache-size-validation": "Musíte mít k dispozici alespoň 50 MB.",
+        "max-logs-validation": "Nemůžete mít více než {{počet}} záznamů",
+        "min-backup-validation": "Musíte mít alespoň 1 zálohu",
+        "backup-label": "Dny zálohování",
+        "on-deck-last-progress-label": "Poslední pokrok rozečtených (dny)",
+        "min-logs-validation": "Musíte mít alespoň 1 záznam",
+        "enable-folder-watching": "Povolit sledování složek",
+        "on-deck-last-chapter-add-label": "Od přidání poslední kapitoly u rozečtené (dny)",
+        "notice": "Upozornění:",
+        "port-label": "Port",
+        "ip-address-tooltip": "Seznam IP adres oddělených čárkou, na kterých server naslouchá. Toto je pevně nastaveno, pokud používáte Docker. Vyžaduje restart, aby se projevily změny.",
+        "allow-stats-label": "Povolit anonymní sběr dat o používání",
+        "enable-opds": "Povolit OPDS",
+        "ip-address-validation": "IP adresy mohou obsahovat pouze platné IPv4 nebo IPv6 adresy",
+        "base-url-validation": "Základní adresa URL musí začínat a končit znakem /",
+        "send-data": "Odeslat data",
+        "max-backup-validation": "Nemůžete mít více než {{num}} záloh",
+        "ip-address-label": "IP adresy",
+        "port-tooltip": "Port, na kterém server naslouchá. Toto je pevně nastaveno, pokud používáte Docker. Vyžaduje restart, aby se projevily změny.",
+        "backup-tooltip": "Počet záloh, které je třeba udržovat. Výchozí hodnota je 30, minimální hodnota je 1, maximální hodnota je 30.",
+        "log-tooltip": "Počet záznamů, které je třeba vést. Výchozí hodnota je 30, minimální hodnota je 1, maximální hodnota je 30.",
+        "on-deck-last-progress-tooltip": "Počet dní od posledního pokroku před rozečtením další knihy/komiksu/mangy.",
+        "opds-tooltip": "Podpora OPDS umožní všem uživatelům používat OPDS ke čtení a stahování obsahu ze serveru.",
+        "allow-stats-tooltip-part-2": "za to, co se shromažďuje.",
+        "opds-label": "OPDS",
+        "networking-settings-title": "Síťování",
+        "system-settings-title": "Systém",
+        "customization-settings-title": "Přizpůsobení",
+        "restart-required": "Změna portu, základní adresy URL, velikosti mezipaměti nebo IP vyžaduje ruční restart Kavity, aby se projevily změny.",
+        "base-url-label": "Základní URL adresa",
+        "base-url-tooltip": "Tuto možnost použijte, pokud chcete hostovat Kavitu na základní url adrese, tj. yourdomain.com/kavita. Není podporováno v Dockeru při použití uživatele, který není root.",
+        "logging-level-label": "Úroveň záznamů",
+        "logging-level-tooltip": "Pomocí ladění můžete identifikovat problémy. Ladění může zabírat hodně místa na disku.",
+        "cache-size-label": "Velikost mezipaměti",
+        "cache-size-tooltip": "Množství paměti povolené pro ukládání náročných rozhraní API do mezipaměti. Výchozí hodnota je 75 MB.",
+        "on-deck-last-chapter-add-tooltip": "Počet dní od přidání poslední kapitoly, aby zahrnovala Rozečtené.",
+        "allow-stats-tooltip-part-1": "Odesílání anonymních údajů o používání na servery společnosti Kavita. Jedná se o informace o některých používaných funkcích, počtu souborů, verzi operačního systému, verzi instalace Kavity, procesoru a paměti. Tyto informace použijeme k určení priorit funkcí, oprav chyb a ladění výkonu. Vyžaduje restart, aby se projevily změny. Viz ",
+        "folder-watching-label": "Složka Sledování",
+        "folder-watching-tooltip": "Umožňuje systému Kavita sledovat složky knihovny a zjišťovat změny a vyvolat skenování těchto změn. To umožňuje aktualizovat obsah bez ručního vyvolání skenování nebo čekání na noční skenování. Před spuštěním skenování vždy počká 10 minut.",
+        "min-days-validation": "Musí být alespoň 1 den",
+        "min-cache-validation": "Musí mít velikost 50 MB."
     },
     "manage-tasks-settings": {
         "reset-to-default": "{{common.reset-to-default}}",
         "reset": "{{common.reset}}",
         "save": "{{common.save}}",
-        "required": "{{validation.required-field}}"
+        "required": "{{validation.required-field}}",
+        "action-header": "Akce",
+        "sync-themes-success": "Synchronizace motivů byla zařazena do fronty",
+        "last-executed-header": "Naposledy provedeno",
+        "cron-header": "Cron",
+        "check-for-updates-task": "Zkontrolovat aktualizace",
+        "clean-up-want-to-read-task-desc": "Odebere všechny série, které uživatelé plně přečetli a které se nacházejí v seznamu Chci číst a mají stav publikace Dokončeno. Probíhá každých 24 hodin.",
+        "sync-themes-task-desc": "Synchronizovat stažené motivy se změnami v upstreamu, pokud se verze shodují.",
+        "cleanup-tooltip": "Jak často bude Kavita spouštět úlohy čištění. To může být náročné a ve většině případů by se mělo provádět o půlnoci",
+        "convert-media-task-success": "Převod médií do cílového kódování byl zařazen do fronty",
+        "bust-cache-task": "Rozbít mezipaměť",
+        "check-for-updates-task-desc": "Podívejte se, zda před vaší verzí nejsou nějaké stabilní verze.",
+        "adhoc-tasks-title": "Úkoly ad-hoc",
+        "clean-up-want-to-read-task": "Vyčistit Chci číst",
+        "library-scan-tooltip": "Jak často bude Kavita skenovat a obnovovat metadata kolem souborů knihovny.",
+        "library-database-backup-label": "Zálohování Kavity",
+        "library-database-backup-tooltip": "Jak často bude Kavita zálohovat databázi a další související soubory.",
+        "cleanup-label": "Čištění",
+        "weekly": "Týdně",
+        "custom-label": "Vlastní plán (zápis Cron)",
+        "cron-notation": "Toto není platný zápis Cron",
+        "disabled": "Vypnuto",
+        "custom": "Vlastní",
+        "download-logs-task": "Stáhnout záznamy",
+        "job-title-header": "Název práce",
+        "clean-up-task-success": "Čištění dokončeno",
+        "backup-database-task-success": "Úloha zálohování databáze byla zařazena do fronty",
+        "download-logs-task-desc": "Zkompiluje všechny soubory záznamů do formátu zip a stáhne je.",
+        "clear-reading-cache-task": "Vymazat vyrovnávací paměti pro čtení",
+        "clear-reading-cache-task-success": "Mezipaměť byla vymazána",
+        "clean-up-want-to-read-task-success": "Chci číst bylo vyčištěno",
+        "backup-database-task": "Záloha databáze",
+        "title": "Opakující se úkoly",
+        "library-scan-label": "Skenování knihovny",
+        "description-header": "Popis",
+        "recurring-tasks-title": "{{title}}",
+        "daily": "Denně",
+        "convert-media-task": "Převod médií na cílové kódování",
+        "convert-media-task-desc": "Spustí dlouhodobou úlohu, která převede všechna média spravovaná systémem Kavita do cílového kódování. Toto je pomalé (zejména na zařízeních ARM).",
+        "bust-cache-task-desc": "Rozbije vyrovnávací paměť Kavita+ - mělo by se používat pouze při ladění špatných shod.",
+        "bust-cache-task-success": "Kavita+ Cache rozbita",
+        "bust-locale-task": "Rozbít lokální mezipamět",
+        "bust-locale-task-desc": "Rozbije lokální mezipaměť. To může odstranit problémy s řetězci, které se po aktualizaci nezobrazují správně. Je třeba restartovat prohlížeč.",
+        "bust-locale-task-success": "Lokální pamět rozbita",
+        "clear-reading-cache-task-desc": "Vymaže soubory uložené v mezipaměti pro čtení. Užitečné, pokud jste právě aktualizovali soubor, který jste předtím četli během posledních 24 hodin.",
+        "clean-up-task": "Obecné čištění",
+        "clean-up-task-desc": "Provede noční čištění serveru. Může to být náročný proces, nedoporučuje se spouštět při aktivních uživatelích nebo skenování. Spouští se každých 24 hodin.",
+        "backup-database-task-desc": "Vytvoří zálohu databáze, záložek, témat, ručně nahraných obálek a konfiguračních souborů.",
+        "sync-themes-task": "Synchronizovat motivy"
     },
     "manage-users": {
-        "loading": "{{common.loading}}"
+        "loading": "{{common.loading}}",
+        "never": "Nikdy",
+        "change-password-alt": "Změna hesla {{user}}",
+        "title": "Aktivní uživatelé",
+        "invite": "Pozvat",
+        "change-password-tooltip": "Změnit heslo",
+        "resend": "Znovu zaslat",
+        "setup": "Nastavení",
+        "no-data": "Žádní další uživatelé nejsou k dispozici.",
+        "pending-tooltip": "Tento uživatel neověřil svůj e-mail",
+        "edit-user-tooltip": "Upravit",
+        "edit-user-alt": "Upravit uživatele {{user}}",
+        "last-active-header": "Naposledy aktivní",
+        "roles-header": "Role",
+        "you-alt": "(Ty)",
+        "pending-title": "Čeká na vyřízení",
+        "delete-user-tooltip": "Odstranit uživatele",
+        "delete-user-alt": "Odstranit uživatele {{user}}",
+        "username-pattern": "Uživatelské jméno může obsahovat pouze následující znaky a mezery: {{characters}}",
+        "resend-invite-tooltip": "Znovu poslat pozvánku",
+        "resend-invite-alt": "Znovu poslat pozvánku {{user}}",
+        "setup-user-tooltip": "Nastavení uživatele",
+        "setup-user-alt": "Nastavení uživatele {{user}}",
+        "name-header": "Jméno",
+        "none": "Žádný",
+        "online-now-tooltip": "Nyní aktivní",
+        "too-many-libraries": "Hodně",
+        "sharing-header": "Sdílení",
+        "actions-header": "Akce",
+        "all-libraries": "Všechny knihovny"
     },
     "edit-collection-tags": {
         "required-field": "{{validation.required-field}}",
@@ -857,50 +1248,178 @@
         "series-tab": "{{tabs.series-tab}}",
         "deselect-all": "{{common.deselect-all}}",
         "select-all": "{{common.select-all}}",
-        "filter-label": "{{common.filter}}"
+        "filter-label": "{{common.filter}}",
+        "name-label": "Název",
+        "title": "Upravit {{collectionName}} Kolekce",
+        "source-url-title": "Zdrojová URL:",
+        "total-series-title": "Celkový počet sérií:",
+        "last-sync-tooltip": "Kavita se denně synchronizuje s poskytovatelem předcházejícího sběru.",
+        "summary-label": "Shrnutí",
+        "missing-series-title": "Chybějící série:",
+        "name-validation": "Název musí být jedinečný",
+        "promote-label": "Propagovat",
+        "promote-tooltip": "Propagace znamená, že štítek je viditelný pro celý server, nejen pro uživatele z řad správců. Všechny série, které mají tento štítek, budou mít i nadále omezení přístupu uživatelů.",
+        "last-sync-title": "Poslední synchronizace:"
     },
     "library-recommended": {
-        "on-deck": "{{dashboard.on-deck-title}}"
+        "on-deck": "{{dashboard.on-deck-title}}",
+        "more-in-genre": "Více v {{genre}}",
+        "quick-reads": "Rychlé čtení",
+        "rediscover": "Znovuobjevte",
+        "no-data": "Není zde nic k vidění. Přidejte do své knihovny nějaká metadata, něco si přečtěte nebo ohodnoťte. Tato knihovna může mít také vypnutá doporučení.",
+        "highly-rated": "Vysoce hodnocené",
+        "quick-catchups": "Rychlé dohánění"
     },
     "settings": {
-        "kavitaplus-section-title": "{{settings.admin-kavitaplus}}"
+        "kavitaplus-section-title": "Kavita+",
+        "preferences": "Předvolby",
+        "clients": "Klíč API / OPDS",
+        "admin-users": "Uživatelé",
+        "admin-system": "Systém",
+        "admin-kavitaplus": "Licence",
+        "devices": "Zařízení",
+        "mal-stack-import": "Zásobník MAL",
+        "admin-libraries": "Knihovny",
+        "admin-media": "Média",
+        "admin-media-issues": "Problémy s médii",
+        "admin-email": "Email",
+        "admin-tasks": "Úkoly",
+        "admin-statistics": "Statistiky",
+        "user-stats": "Statistiky",
+        "scrobbling": "Scrobblování",
+        "customize": "Přizpůsobení",
+        "cbl-import": "Seznam četby CBL",
+        "server-section-title": "Server",
+        "account-section-title": "Účet",
+        "import-section-title": "Import",
+        "admin-general": "Obecné",
+        "admin-logs": "Záznamy",
+        "theme": "Motiv",
+        "info-section-title": "Informace",
+        "admin-email-history": "Historie e-mailů",
+        "admin-matched-metadata": "Shodná metadata",
+        "admin-manage-tokens": "Správa uživatelských tokenů",
+        "scrobble-holds": "Podržení Scrobble",
+        "account": "Účet",
+        "admin-metadata": "Správa metadat",
+        "reading-profiles": "Profily čtení"
     },
     "collection-detail": {
-        "item-count": "{{common.item-count}}"
+        "item-count": "{{common.item-count}}",
+        "no-data": "Nejsou zde žádné položky. Zkuste přidat sérii.",
+        "series-header": "Série",
+        "sync-progress": "Sbírané série: {{title}}",
+        "last-sync": "Poslední synchronizace: {{date}}",
+        "no-data-filtered": "Žádné položky neodpovídají vašemu aktuálnímu filtru.",
+        "title-alt": "Kavita - {{collectionName}} Kolekce"
     },
     "all-collections": {
-        "item-count": "{{common.item-count}}"
+        "item-count": "{{common.item-count}}",
+        "create-one-part-2": "jednu",
+        "create-one-part-1": "Zkuste vytvořit",
+        "title": "Sbírky",
+        "no-data": "Neexistují žádné sbírky."
     },
     "reading-lists": {
-        "item-count": "{{common.item-count}}"
+        "item-count": "{{common.item-count}}",
+        "create-one-part-2": "jeden",
+        "title": "Seznamy četby",
+        "no-data": "Neexistují žádné seznamy četby.",
+        "create-one-part-1": "Zkuste vytvořit"
     },
     "reading-list-item": {
         "remove": "{{common.remove}}",
-        "read": "{{common.read}}"
+        "read": "{{common.read}}",
+        "released-label": "Vydáno: {{date}}"
     },
     "stream-list-item": {
-        "remove": "{{common.remove}}"
+        "remove": "{{common.remove}}",
+        "load-filter": "Načíst filtr",
+        "smart-filter": "Chytrý filtr",
+        "provided": "Poskytnuto",
+        "library": "Knihovna",
+        "external-source": "Externí zdroj",
+        "delete": "{{common.delete}}"
     },
     "reading-list-detail": {
         "item-count": "{{common.item-count}}",
         "read": "{{common.read}}",
-        "characters-title": "{{metadata-fields.characters-title}}"
+        "characters-title": "{{metadata-fields.characters-title}}",
+        "continue": "Pokračovat",
+        "page-settings-title": "Nastavení stránek",
+        "remove-read": "Odebrat přečtené",
+        "order-numbers-label": "Seřadit čísla",
+        "read-options-alt": "Možnosti čtení",
+        "incognito-alt": "(Inkognito)",
+        "no-data": "Nic nebylo přidáno",
+        "details-tab": "{{series-detail.details-tab}}",
+        "publishers-title": "{{metadata-fields.publishers-title}}",
+        "dnd-warning": "Funkce chyť a upusť není dostupná na mobilních zařízeních nebo v případě, že seznam čtení obsahuje více než 100 položek.",
+        "reorder-alt": "Přeuspořádat položky",
+        "edit-label": "Režim úprav",
+        "storyline-tab": "{{series-detail.storyline-tab}}",
+        "edit-alt": "{{common.edit}}",
+        "date-range-title": "Rozsah datumů",
+        "more-alt": "{{series-detail.more-alt}}",
+        "writers-title": "{{metadata-fields.writers-title}}",
+        "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
+        "items-title": "Položky"
     },
     "events-widget": {
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "dismiss-all": "Odmítnout vše",
+        "update-available": "K dispozici je aktualizace",
+        "downloading-item": "Stahuji {{item}}",
+        "title-alt": "Aktivita",
+        "more-info": "Klikněte pro více informací",
+        "users-online-count": "{{num}} aktivních uživatelů",
+        "no-data": "Tady se toho moc neděje",
+        "left-to-process": "Zbývá zpracovat: {{leftToProcess}}",
+        "active-events-title": "Aktivní události:",
+        "download-in-queue": "{{num}} stahování ve frontě"
     },
     "shortcuts-modal": {
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "close-reader": "Zavřít čtečku",
+        "prev-page": "Přesun na předchozí stránku",
+        "next-page": "Přesun na další stránku",
+        "go-to": "Otevřete dialogové okno Přejít na stránku",
+        "bookmark": "Záložka aktuální stránky",
+        "double-click": "dvojklik",
+        "title": "Klávesové zkratky",
+        "toggle-menu": "Přepnout nabídku"
     },
     "grouped-typeahead": {
         "genres": "{{metadata-fields.genres-title}}",
         "bookmarks": "{{side-nav.bookmarks}}",
         "close": "{{common.close}}",
-        "loading": "{{common.loading}}"
+        "loading": "{{common.loading}}",
+        "files": "Soubory",
+        "reading-lists": "Seznamy četby",
+        "tags": "Štítky",
+        "chapters": "Kapitoly",
+        "people": "Lidé",
+        "libraries": "Knihovny",
+        "collections": "Sbírky",
+        "include-extras": "Zahrnout kapitoly a soubory"
     },
     "nav-header": {
         "help": "{{common.help}}",
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "no-data": "Nenalezeny žádné výsledky",
+        "scroll-to-top-alt": "Přejděte na začátek",
+        "search-series-alt": "Vyhledat série",
+        "search-alt": "Vyhledat…",
+        "all-filters": "Chytré filtry",
+        "logout": "Odhlásit se",
+        "nav-link-header": "Možnosti navigace",
+        "skip-alt": "Přeskočit na hlavní obsah",
+        "server-settings": "Nastavení serveru",
+        "settings": "Nastavení",
+        "announcements": "Oznámení",
+        "person-aka-status": "Shoduje se s aliasem",
+        "browse-tags": "Procházet štítky",
+        "browse-genres": "Procházet žánry"
     },
     "promoted-icon": {
         "promoted": "{{common.promoted}}"
@@ -910,30 +1429,111 @@
         "filter-label": "{{common.filter}}",
         "promoted-alt": "{{common.promoted}}",
         "loading": "{{common.loading}}",
-        "create": "{{common.create}}"
+        "create": "{{common.create}}",
+        "title": "Přidat do seznamu četby",
+        "no-data": "Zatím nebyly vytvořeny žádné seznamy",
+        "reading-list-label": "Seznam četby"
     },
     "edit-reading-list-modal": {
         "general-tab": "{{tabs.general-tab}}",
         "cover-image-tab": "{{tabs.cover-tab}}",
         "close": "{{common.close}}",
         "save": "{{common.save}}",
-        "required-field": "{{validation.required-field}}"
+        "required-field": "{{validation.required-field}}",
+        "year-label": "Rok",
+        "summary-label": "Shrnutí",
+        "year-validation": "Musí být větší než 1000, 0 nebo prázdné",
+        "name-unique-validation": "Název musí být jedinečný",
+        "month-validation": "Musí být mezi 1 a 12 nebo prázdné",
+        "promote-tooltip": "Propagace znamená, že sbírku lze zobrazit na celém serveru, nejen pro vás. Všechny série v rámci této kolekce budou mít stále omezení přístupu uživatelů.",
+        "ending-title": "Konec",
+        "starting-title": "Začátek",
+        "title": "Upravit seznam četby: {{name}}",
+        "month-label": "Měsíc",
+        "promote-label": "Propagovat"
     },
     "import-mal-collection-modal": {
         "close": "{{common.close}}",
-        "series-count": "{{common.series-count}}"
+        "series-count": "{{common.series-count}}",
+        "track": "Trasa",
+        "title": "Import zásobníku zájmů MAL",
+        "description": "Importovat své zásobníky zájmů MAL a vytvářet sbírky v systému Kavita",
+        "restack-count": "{{num}} zásobníků",
+        "nothing-found": "Nic nebylo nalezeno"
     },
     "edit-chapter-progress": {
         "action-header": "{{common.edit}}",
         "edit-alt": "{{common.edit}}",
-        "no-data": "{{user-scrobble-history.no-data}}"
+        "no-data": "{{user-scrobble-history.no-data}}",
+        "date-created-header": "Vytvořeno (UTC)",
+        "user-header": "Uživatel",
+        "page-read-header": "Přečtené stránky",
+        "date-updated-header": "Naposledy aktualizováno (UTC)"
     },
     "import-cbl-modal": {
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "prev": "Předchozí",
+        "restart": "Restartovat",
+        "import-step": "Importovat CBL",
+        "validate-cbl-step": "Ověření CBL",
+        "import-description": "Chcete-li začít, importujte soubor .cbl. Kavita před importem provede několik kontrol. Některé kroky zablokují postup vpřed kvůli problémům se souborem.",
+        "dry-run-step": "Suchý běh",
+        "comicvine-parsing-label": "Použít Comic Vine Series shody",
+        "validate-no-issue-description": "S CBL nebyly nalezeny žádné problémy, stiskněte tlačítko Další.",
+        "import": "Import",
+        "next": "Další",
+        "title": "CBL Import",
+        "help-label": "{{common.help}}",
+        "validate-description": "Všechny soubory byly ověřeny, aby se zjistilo, zda jsou na seznamu nějaké operace, které je třeba provést. Seznamy, které selhaly, nepřejdou do dalšího kroku. Opravte soubory CBL a zkuste to znovu.",
+        "validate-warning": "V CBL jsou problémy, které brání importu. Opravte je a zkuste to znovu.",
+        "cbl-repo": "V komunitě najdete mnoho seznamů četbyrepozitář.",
+        "final-import-step": "Poslední krok",
+        "dry-run-description": "Toto je zkušební verze, která ukazuje, co se stane, pokud stisknete tlačítko Další a provedete import. Všechny chyby nebudou importovány."
     },
     "manga-reader": {
-        "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}",
-        "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}"
+        "auto-close-menu-label": "{{manage-reading-profiles.auto-close-menu-label}}",
+        "emulate-comic-book-label": "{{manage-reading-profiles.emulate-comic-book-label}}",
+        "next-page-tooltip": "Další stránka",
+        "first-time-reading-manga": "Klepnutím na obrázek kdykoli otevřete nabídku. Klepnutím na ukazatel průběhu můžete konfigurovat různá nastavení nebo přejít na stránku. Klepnutím na strany obrázku přejdete na další/předchozí stránku.",
+        "back": "Zpět",
+        "next-chapter-tooltip": "Další kapitola/svazek",
+        "first-page-tooltip": "První strana",
+        "collapse": "Sbalit",
+        "no-next-chapter": "Žádná další kapitola",
+        "no-prev-chapter": "Žádná předchozí kapitola",
+        "incognito-title": "Anonymní režim:",
+        "left-to-right-alt": "Zleva doprava",
+        "shortcuts-menu-alt": "Modální klávesové zkratky",
+        "prev-page-tooltip": "Předchozí stránka",
+        "prev-chapter-tooltip": "Předchozí kapitola/svazek",
+        "last-page-tooltip": "Poslední stránka",
+        "right-to-left-alt": "Zprava doleva",
+        "reading-direction-tooltip": "Směr čtení: ",
+        "fullscreen": "Celá obrazovka",
+        "settings-tooltip": "Nastavení",
+        "original": "Původní",
+        "image-scaling-label": "Škálování obrazu",
+        "height": "Výška",
+        "reading-mode-tooltip": "Režim čtení",
+        "series-progress": "Pokrok v sérii: {{percentage}}",
+        "swipe-enabled-label": "Povoleno přejetí prstem",
+        "width": "Šířka",
+        "incognito-alt": "Anonymní režim je zapnutý. Přepnutím jej vypnete.",
+        "image-splitting-label": "Rozdělení obrazu",
+        "width-override-label": "Přepsání šířky",
+        "off": "{{reader-settings.off}}",
+        "enable-comic-book-label": "Napodobit komiks",
+        "brightness-label": "Jas",
+        "bookmark-page-tooltip": "Založit stránku",
+        "unbookmark-page-tooltip": "Zrušení záložky stránky",
+        "bookmarks-title": "Záložky",
+        "layout-mode-switched": "Režim rozvržení přepnutý na jednoduchý z důvodu nedostatku místa pro vykreslení dvojitého rozvržení",
+        "create-new": "{{reader-settings.create-new}}",
+        "update-parent": "{{reader-settings.update-parent}}",
+        "loading": "{{reader-settings.loading}}",
+        "create-new-tooltip": "{{reader-settings.create-new-tooltip}}",
+        "reading-profile-updated": "Profil čtení aktualizován",
+        "reading-profile-promoted": "Profil čtení propagován"
     },
     "metadata-filter": {
         "filter-title": "{{common.filter}}",
@@ -943,10 +1543,43 @@
         "genres-label": "{{metadata-fields.genres-title}}",
         "tags-label": "{{metadata-fields.tags-title}}",
         "age-rating-label": "{{metadata-fields.age-rating-title}}",
-        "language-label": "{{metadata-fields.language-title}}"
+        "language-label": "{{metadata-fields.language-title}}",
+        "unread": "Nepřečteno",
+        "format-label": "Formát",
+        "writer-label": "Spisovatel",
+        "cover-artist-label": "Autor obálky",
+        "series-name-tooltip": "Název série se filtruje podle názvu, řazení názvu nebo lokalizovaného názvu",
+        "publisher-label": "Vydavatel",
+        "colorist-label": "Kolorista",
+        "character-label": "Postava",
+        "limit-label": "Omezení",
+        "read": "Přečteno",
+        "collections-label": "Sbírky",
+        "read-progress-label": "Pokrok ve čtení",
+        "rating-label": "Hodnocení",
+        "publication-status-label": "Stav publikace",
+        "series-name-label": "Název série",
+        "descending-alt": "Sestupně",
+        "filter-name-label": "Název filtru",
+        "libraries-label": "Knihovny",
+        "in-progress": "Čtené",
+        "penciller-label": "Penciller",
+        "sort-by-label": "Řadit podle",
+        "ascending-alt": "Vzestupně",
+        "letterer-label": "Letterer",
+        "inker-label": "Inker",
+        "editor-label": "Editor",
+        "translator-label": "Překladatel",
+        "release-label": "Vydání",
+        "min": "Min",
+        "max": "Max"
     },
     "metadata-filter-row": {
-        "unit-user-rating": "{{metadata-filter-row.unit-reading-progress}}"
+        "unit-user-rating": "0,0 - 5,0 hvězdiček",
+        "unit-average-rating": "Externí hodnocení Kavita+, procenta",
+        "unit-reading-progress": "Procenta",
+        "unit-reading-date": "Datum",
+        "unit-read-last": "Dny od DNEŠKA"
     },
     "edit-series-modal": {
         "general-tab": "{{tabs.general-tab}}",
@@ -984,7 +1617,43 @@
         "pages-title": "{{edit-chapter-modal.pages-label}}",
         "volume-num": "{{common.volume-num}}",
         "release-year-validation": "{{validation.year-validation}}",
-        "volumes-title": "{{tab.volumes-tab}}"
+        "volumes-title": "{{tab.volumes-tab}}",
+        "name-label": "Název",
+        "summary-label": "Shrnutí",
+        "format-title": "Formát",
+        "highest-count-tooltip": "Nejvyšší počet nalezený u všech ComicInfo v sérii",
+        "created-title": "Vytvořeno",
+        "info-title": "Informace",
+        "view-files": "Zobrazit soubory",
+        "title": "{{seriesName}} podrobnosti",
+        "library-title": "Knihovna",
+        "total-pages-title": "Celkový počet stránek",
+        "specials-volume": "Speciály",
+        "web-link-description": "Zde můžete přidat mnoho různých odkazů na externí služby.",
+        "sort-name-label": "Řadit dle názvu",
+        "localized-name-label": "Lokalizovaný název",
+        "folder-path-tooltip": "Nejvyšší cesta od kořene knihovny, která obsahuje všechny soubory sérií",
+        "lowest-folder-path-tooltip": "Nejnižší cesta od kořene knihovny, která obsahuje všechny soubory sérií",
+        "total-words-title": "Celkový počet slov",
+        "publication-status-label": "Stav publikace",
+        "loose-leaf-volume": "Kapitoly s volnými listy",
+        "cover-image-description": "Nahrajte a vyberte nový obrázek obálky. Stisknutím tlačítka Uložit nahrajte a přepište obálku.",
+        "total-items-title": "Celkový počet položek",
+        "added-title": "Přidáno",
+        "last-added-title": "Poslední přidaná položka",
+        "folder-path-title": "Cesta ke složce",
+        "publication-status-title": "Stav publikace",
+        "max-items-title": "Maximální počet položek",
+        "force-refresh": "Vynutit obnovení",
+        "last-scanned-title": "Naposledy skenované",
+        "lowest-folder-path-title": "Nejnižší cesta ke složce",
+        "size-title": "Velikost",
+        "last-modified-title": "Naposledy upraveno",
+        "words-title": "Slova",
+        "chapter-title": "Kapitola",
+        "field-locked-alt": "Pole je uzamčeno",
+        "max-issue-tooltip": "Maximální vydání nebo pole svazku ze všech ComicInfo v sérii",
+        "force-refresh-tooltip": "Vynutit obnovení externích metadat z aplikace Kavita+"
     },
     "edit-chapter-modal": {
         "close": "{{common.close}}",
@@ -1021,7 +1690,23 @@
         "tags-tab": "{{tabs.tags-tab}}",
         "size-label": "{{edit-series-modal.size-title}}",
         "links-label": "{{metadata-fields.links-title}}",
-        "last-read-label": "{{sort-field-pipe.read-progress}}"
+        "last-read-label": "{{sort-field-pipe.read-progress}}",
+        "words-label": "Délka",
+        "pages-label": "Stránky",
+        "pages-count": "{{num}} stránek",
+        "range-hours": "{{value}} {{hourWord}}",
+        "read-time-label": "Čas čtení",
+        "title": "Upravit",
+        "title-label": "Název",
+        "sort-order-label": "Pořadí řazení",
+        "sort-order-tooltip": "Pořadí čtení této kapitoly v rámci svazku",
+        "isbn-label": "ISBN",
+        "reading-time-label": "Čas čtení",
+        "words-count": "{{num}} slov",
+        "id-label": "ID",
+        "release-date-label": "Vydání",
+        "date-added-label": "Datum přidání",
+        "files-label": "Soubory"
     },
     "edit-volume-modal": {
         "close": "{{common.close}}",
@@ -1030,8 +1715,8 @@
         "cover-image-tab": "{{tabs.cover-tab}}",
         "tasks-tab": "{{tabs.tasks-tab}}",
         "info-tab": "{{tabs.info-tab}}",
-        "pages-label": "{{edit-chapter-modal.pages-count}}",
-        "words-label": "{{edit-chapter-modal.length-title}}",
+        "pages-label": "{{edit-chapter-modal.pages-label}}",
+        "words-label": "{{edit-chapter-modal.words-label}}",
         "pages-count": "{{edit-chapter-modal.pages-count}}",
         "words-count": "{{edit-chapter-modal.words-count}}",
         "reading-time-label": "{{edit-chapter-modal.reading-time-label}}",
@@ -1042,7 +1727,9 @@
         "last-read-label": "{{edit-chapter-modal.last-read-label}}",
         "read-time-label": "{{edit-chapter-modal.read-time-label}}",
         "files-label": "{{edit-chapter-modal.files-label}}",
-        "cover-image-description": "{{edit-series-modal.cover-image-description}}"
+        "cover-image-description": "{{edit-series-modal.cover-image-description}}",
+        "title": "Upravit",
+        "range-hours": "{{value}} {{hourWord}}"
     },
     "reading-activity": {
         "this-week": "{{time-periods.this-week}}",
@@ -1050,27 +1737,78 @@
         "last-30-days": "{{time-periods.last-30-days}}",
         "last-90-days": "{{time-periods.last-90-days}}",
         "last-year": "{{time-periods.last-year}}",
-        "all-time": "{{time-periods.all-time}}"
+        "all-time": "{{time-periods.all-time}}",
+        "title": "Čtenářská aktivita",
+        "legend-label": "Formáty",
+        "no-data": "Žádný pokrok ve čtení",
+        "time-frame-label": "Časový rámec",
+        "all-users": "Všichni uživatelé",
+        "x-axis-label": "Čas",
+        "y-axis-label": "Hodiny čtení"
     },
     "series-preview-drawer": {
         "tags-label": "{{filter-field-pipe.tags}}",
         "genres-label": "{{filter-field-pipe.genres}}",
         "remove-from-want-to-read": "{{actionable.remove-from-want-to-read}}",
-        "add-to-want-to-read": "{{actionable.add-to-want-to-read}}"
+        "add-to-want-to-read": "{{actionable.add-to-want-to-read}}",
+        "view-series": "Zobrazit série",
+        "vols-and-chapters": "{{volCount}} Svazků / {{chpCount}} Kapitol",
+        "provided-by-label": "Poskytl",
+        "staff-label": "Zaměstnanci"
     },
     "server-stats": {
         "tags": "{{metadata-fields.tags-title}}",
-        "genres": "{{metadata-fields.genres-title}}"
+        "genres": "{{metadata-fields.genres-title}}",
+        "release-years-title": "Roky vydání",
+        "total-tags-label": "Celkem štítků",
+        "series": "série",
+        "file-count": "{{num}} Soubory",
+        "genre-count": "{{num}} Žánry",
+        "recently-read-title": "Nedávno přečtené",
+        "tag-count": "{{num}} Štítky",
+        "popular-series-title": "Oblíbené série",
+        "people": "Lidé",
+        "volume-count": "{{num}} Svazky",
+        "people-count": "{{num}} Lidé",
+        "total-read-time-tooltip": "Celkový čas čtení: {{count}}",
+        "total-series-label": "Celkové série",
+        "total-volumes-label": "Celkem svazků",
+        "total-genres-label": "Celkem žánrů",
+        "total-files-tooltip": "Celkem souborů: {{count}}",
+        "total-size-label": "Celková velikost",
+        "total-genres-tooltip": "Celkem žánrů: {{count}}",
+        "total-tags-tooltip": "Celkem štítků: {{count}}",
+        "total-people-label": "Celkový počet osob",
+        "total-people-tooltip": "Celkový počet osob: {{count}}",
+        "total-read-time-label": "Celkový čas čtení",
+        "reads": "čtení",
+        "total-series-tooltip": "Celkové série: {{count}}",
+        "total-volumes-tooltip": "Celkem svazků: {{count}}",
+        "total-files-label": "Celkem souborů",
+        "most-active-users-title": "Nejaktivnější uživatelé",
+        "popular-libraries-title": "Oblíbené knihovny",
+        "series-count": "{{num}} Série"
     },
     "customize-dashboard-modal": {
         "close": "{{common.close}}",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "title-sidenav": "Přizpůsobení postranní navigace",
+        "title-external-sources": "Externí zdroje",
+        "title-smart-filters": "Chytré filtry",
+        "smart-filters": "Chytré filtry",
+        "external-sources": "Externí zdroje",
+        "title-dashboard": "Přizpůsobení ovládacího panelu",
+        "dashboard": "Ovládací panel",
+        "sidenav": "Postranní navigace",
+        "description": "Různé aspekty Kavity můžete přizpůsobit změnou pořadí, přepínáním viditelnosti a přiřazením inteligentních filtrů/externích zdrojů k domovské stránce nebo postranní navigaci."
     },
     "customize-dashboard-streams": {
         "save": "{{common.save}}",
         "add": "{{common.add}}",
         "filter": "{{common.filter}}",
-        "clear": "{{common.clear}}"
+        "clear": "{{common.clear}}",
+        "no-data": "Všechny inteligentní filtry jsou přidané na ovládací panel nebo žádné dosud nebyly vytvořené.",
+        "smart-filter-title": "{{customize-dashboard-modal.title-smart-filters}}"
     },
     "customize-sidenav-streams": {
         "save": "{{common.save}}",
@@ -1078,24 +1816,48 @@
         "filter": "{{common.filter}}",
         "clear": "{{common.clear}}",
         "external-sources-title": "{{customize-dashboard-modal.external-sources}}",
-        "reorder-when-filter-present": "You cannot reorder items via drag & drop while a filter is present. Use {{customize-sidenav-streams.order-numbers-label}}",
-        "order-numbers-label": "{{reading-list-detail.order-numbers-label}}"
+        "reorder-when-filter-present": "Při přítomnosti filtru nelze měnit pořadí položek pomocí přetahování. Použijte {{customize-sidenav-streams.order-numbers-label}}",
+        "order-numbers-label": "{{reading-list-detail.order-numbers-label}}",
+        "bulk-mode-label": "Hromadný režim",
+        "no-data": "Všechny inteligentní filtry jsou přidané na postranní navigaci nebo nejsou žádné vytvořené.",
+        "smart-filters-title": "Chytré filtry",
+        "no-data-external-source": "Všechny externí zdroje jsou přidané na postranní navigaci nebo nejsou žádné vytvořené."
     },
     "manage-external-sources": {
         "clear": "{{common.clear}}",
-        "filter": "{{common.filter}}"
+        "filter": "{{common.filter}}",
+        "description": "Vylepšete své zkušenosti přidáním externích serverů a pohodlně je zahrňte do svého postranního panelu pro rychlý přístup k serveru i serveru vašeho kamaráda/ky.",
+        "help-link": "Více informací",
+        "add-source": "Přidat",
+        "no-data": "Neexistují žádné externí zdroje"
     },
     "manage-smart-filters": {
         "delete": "{{common.delete}}",
         "filter": "{{common.filter}}",
-        "clear": "{{common.clear}}"
+        "clear": "{{common.clear}}",
+        "no-data": "Nevytvořeny žádné inteligentní filtry",
+        "errored": "Ve filtru došlo k chybě kódování. Je třeba jej znovu vytvořit.",
+        "save": "{{common.save}}",
+        "edit-smart-filter": "Upravit {{name}}",
+        "name-label": "Název",
+        "required-field": "Chytré filtry potřebují název",
+        "filter-name-unique": "Názvy chytrých filtrů musí být jedinečné",
+        "edit": "{{common.edit}}",
+        "close": "{{common.close}}",
+        "cancel": "{{common.cancel}}"
     },
     "edit-external-source-item": {
         "save": "{{common.save}}",
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
         "delete": "{{common.delete}}",
-        "required": "{{validation.required-field}}"
+        "required": "{{validation.required-field}}",
+        "title": "Nový externí zdroj",
+        "not-unique": "U tohoto hostitele existuje externí zdroj. Ujistěte se, že nemáte duplikáty",
+        "host-label": "Hostitel",
+        "name-label": "Název",
+        "api-key-label": "Klíč API",
+        "pattern": "Hostitel musí být platná http(s):// url"
     },
     "stream-pipe": {
         "on-deck": "{{dashboard.on-deck-title}}",
@@ -1106,18 +1868,950 @@
         "collections": "{{side-nav.collections}}",
         "reading-lists": "{{side-nav.reading-lists}}",
         "bookmarks": "{{side-nav.bookmarks}}",
-        "all-series": "{{side-nav.all-series}}"
+        "all-series": "{{side-nav.all-series}}",
+        "browse-authors": "{{side-nav.browse-people}}"
     },
     "filter-field-pipe": {
         "age-rating": "{{metadata-fields.age-rating-title}}",
         "characters": "{{metadata-fields.characters-title}}",
-        "cover-artist": "{{person-role-pipe.cover-artist}}",
+        "cover-artist": "{{person-role-pipe.artist}}",
         "genres": "{{metadata-fields.genres-title}}",
         "release-year": "{{sort-field-pipe.release-year}}",
         "tags": "{{metadata-fields.tags-title}}",
-        "writers": "{{metadata-fields.writers-title}}"
+        "writers": "{{metadata-fields.writers-title}}",
+        "want-to-read": "Chci číst",
+        "formats": "Formáty",
+        "penciller": "Penciller",
+        "publication-status": "Stav publikace",
+        "languages": "Jazyky",
+        "read-date": "Datum čtení",
+        "average-rating": "Průměrné hodnocení",
+        "read-time": "Čas čtení",
+        "inker": "Inker",
+        "read-last": "Poslední čtení",
+        "imprint": "Otisk",
+        "editor": "Editor",
+        "team": "Tým",
+        "location": "Poloha",
+        "libraries": "Knihovny",
+        "letterer": "Letterer",
+        "series-name": "Název série",
+        "translators": "Překladatelé",
+        "user-rating": "Hodnocení uživatelů",
+        "read-progress": "Pokrok čtení",
+        "publisher": "Vydavatel",
+        "summary": "Shrnutí",
+        "file-path": "Cesta k souboru",
+        "collection-tags": "Štítky sbírky",
+        "colorist": "Kolorista",
+        "path": "Cesta"
     },
     "actionable": {
-        "clear": "{{common.clear}}"
+        "clear": "{{common.clear}}",
+        "mark-as-read": "Označit jako přečtené",
+        "remove-from-want-to-read-tooltip": "Odebrat sérii z Chci číst",
+        "mark-as-unread-tooltip": "Označit pokrok jako nepřečtené",
+        "add-to-collection-tooltip": "Přidání série do sbírky",
+        "settings": "Nastavení",
+        "view-series-tooltip": "TODO",
+        "scan-library-tooltip": "Prohledejte knihovnu a vyhledejte změny. Pomocí vynuceného skenování vynutíte kontrolu každé složky",
+        "import-cbl": "Importovat CBL",
+        "scan-library": "Skenovat knihovnu",
+        "add-to": "Přidat do",
+        "multiple-selections": "Vícenásobný výběr",
+        "add-to-want-to-read": "Přidat do Chci číst",
+        "mark-invisible": "Označit jako neviditelné",
+        "unpromote": "Zrušit propagaci",
+        "mark-invisible-tooltip": "TODO",
+        "copy-settings": "Kopírovat nastavení z",
+        "title": "Akce",
+        "read": "Číst",
+        "customize": "Přizpůsobit",
+        "mark-as-unread": "Označit jako nepřečtené",
+        "remove-from-want-to-read": "Odebrat z Chci číst",
+        "generate-colorscape-tooltip": "Generování rozsahů barev (ColorScape) a chybějících obálek",
+        "analyze-files": "Analyzovat soubory",
+        "edit": "Upravit",
+        "refresh-covers": "Obnovit obálky",
+        "add-to-reading-list": "Přidat do seznamu četby",
+        "add-to-reading-list-tooltip": "Přidat do seznamu četby",
+        "clear-tooltip": "Odstranění všech záložek této série",
+        "add-to-collection": "Přidat do sbírky",
+        "mark-visible-tooltip": "TODO",
+        "unpromote-tooltip": "Omezit viditelnost pouze na svůj účet",
+        "import-cbl-tooltip": "Vytvoří seznam čtení ze souboru CBL",
+        "import-mal-stack-tooltip": "Vytvoří chytrou sbírku ze zásobníků zájmů MAL",
+        "customize-tooltip": "TODO",
+        "remove-from-on-deck": "Odebrat z Rozečtené",
+        "read-incognito": "Číst anonymně",
+        "view-series": "Zobrazit sérii",
+        "scan-series-tooltip": "Skenovat série pro změny",
+        "delete-tooltip": "Toto rozhodnutí nelze zvrátit",
+        "read-incognito-tooltip": "Čtení bez sledování pokroku",
+        "edit-tooltip": "Úprava nastavení nebo podrobností",
+        "scan-series": "Skenovat série",
+        "remove-from-on-deck-tooltip": "Odebrat série ze zobrazení v Rozečtené",
+        "delete": "Odstranit",
+        "download-tooltip": "Stáhnout do zařízení",
+        "details": "Podrobnosti",
+        "details-tooltip": "TODO",
+        "promote": "Propagovat",
+        "back-to": "Zpět na {{action}}",
+        "refresh-covers-tooltip": "Obnovit všechny obálky",
+        "generate-colorscape": "Generovat ColorScape",
+        "analyze-files-tooltip": "Analýza souborů podle typu a velikosti přípony",
+        "settings-tooltip": "Zobrazit nastavení nebo podrobnosti",
+        "mark-as-read-tooltip": "Označit pokrok jako plně přečtené",
+        "add-to-want-to-read-tooltip": "Přidat sérii do Chci číst",
+        "others": "Ostatní",
+        "send-to": "Odeslat do",
+        "download": "Stáhnout",
+        "import-mal-stack": "Import zásobníku MAL",
+        "mark-visible": "Označit jako viditelné",
+        "promote-tooltip": "Zviditelnění položky pro všechny uživatele",
+        "new-collection": "Nová sbírka",
+        "match": "Shoda",
+        "match-tooltip": "Přiřadit série s Kavitou+ manuálně",
+        "reorder": "Přeuspořádat",
+        "rename": "Přejmenovat",
+        "rename-tooltip": "Přejmenovat inteligentní filtr",
+        "merge": "Sloučit",
+        "reading-profiles": "Profily čtení",
+        "set-reading-profile": "Nastavit profil čtení",
+        "set-reading-profile-tooltip": "Připojit profil čtení k této knihovně",
+        "clear-reading-profile": "Vymazat profil čtení",
+        "clear-reading-profile-tooltip": "Vymazat profil čtení pro tuto knihovnu",
+        "cleared-profile": "Vyčištěný profil čtení"
+    },
+    "changelog-update-item": {
+        "changed": "Změněno",
+        "fixed": "Opraveno",
+        "download": "Stáhnout",
+        "added": "Přidáno",
+        "developer": "Vývojář",
+        "theme": "Motiv",
+        "removed": "Odstraněno",
+        "api": "API",
+        "published-label": "Vydáno: ",
+        "installed": "{{changelog.installed}}",
+        "feature-requests": "Požadavky na funkce",
+        "known-issues": "Známé problémy"
+    },
+    "new-version-modal": {
+        "title": "Kavita byla aktualizována!",
+        "removed": "{{changelog.removed}}",
+        "api": "{{changelog.api}}",
+        "close": "{{common.close}}",
+        "description": "K dispozici je nová verze aplikace Kavita. Pro aktualizaci proveďte obnovení.",
+        "added": "{{changelog.added}}",
+        "changed": "{{changelog.changed}}",
+        "fixed": "{{changelog.fixed}}",
+        "developer": "{{changelog.developer}}",
+        "theme": "{{changelog.theme}}",
+        "refresh": "Obnovit",
+        "known-issues": "{{changelog.known-issues}}"
+    },
+    "person-detail": {
+        "all-roles": "Role",
+        "browse-person-by-role-title": "Všechny práce {{name}} jako {{role}}",
+        "known-for-title": "Známý díky",
+        "individual-role-title": "Jako {{role}}",
+        "browse-person-title": "Všechny práce {{name}}",
+        "anilist-url": "{{edit-person-modal.anilist-tooltip}}",
+        "no-info": "Žádné informace o této osobě",
+        "aka-title": "Známé také jako "
+    },
+    "draggable-ordered-list": {
+        "reorder-label": "Přeuspořádat",
+        "instructions-alt": "Pokud do zadávacího pole pro změnu pořadí zadáte číslo, bude položka vložena na toto místo a pořadí všech ostatních položek bude aktualizováno.",
+        "remove-item-alt": "Odebrat položku",
+        "bulk-select-label": "Hromadný výběr položky"
+    },
+    "manage-user-tokens": {
+        "description": "Uživatelé, kteří mají scrobbling tokeny, mohou potřebovat občas je obnovit. Kavita jim automaticky zašle e-mail, pokud je e-mail nastaven a mají platný e-mail.",
+        "expires-label": "Platnost končí: {{date}}",
+        "username-header": "Uživatelské jméno",
+        "anilist-header": "AniList",
+        "mal-header": "MAL",
+        "token-set-label": "Nastavit Token",
+        "no-data": "{{common.no-data}}"
+    },
+    "match-series-modal": {
+        "no-results": "Nelze najít shodu.Zkuste přidat url od podporovaného poskytovatele a zkuste to znovu.",
+        "query-tooltip": "Zadejte název série, AniList/MyAnimeList/ComicBookRoundup url. Url budou používat přímé vyhledávání.",
+        "title": "Shoda {{seriesName}}",
+        "close": "{{common.close}}",
+        "save": "{{common.save}}",
+        "query-label": "Dotaz",
+        "dont-match-label": "Neshoduje se",
+        "dont-match-tooltip": "Vynechat tuto sérii z párování a scrobblování",
+        "search": "Vyhledat",
+        "description": "Vyberte shodu na přepojení metadata Kavita+ a přegenerujte události scrobble. Funkci neshody lze použít k tomu, abyste Kavitě+ omezili přiřazování metadat a scrobblování."
+    },
+    "manage-system": {
+        "first-install-version-title": "První verze instalace",
+        "first-install-date-title": "Datum první instalace",
+        "installId-title": "ID instalace",
+        "feature-request-title": "Požadavky na funkce:",
+        "updates-title": "Historie aktualizací",
+        "discord-title": "Discord:",
+        "localization-title": "Lokalizace:",
+        "version-title": "Verze",
+        "donations-title": "Příspěvky:",
+        "source-title": "Zdroj:",
+        "more-info-title": "Více informací",
+        "wiki-title": "Wiki:",
+        "home-page-title": "Domovská stránka:",
+        "title": "O systému"
+    },
+    "file-type-group-pipe": {
+        "pdf": "PDF",
+        "archive": "Archiv",
+        "epub": "Epub",
+        "image": "Obrázek"
+    },
+    "carousel-reel": {
+        "prev-items": "Předchozí položky",
+        "next-items": "Další položky"
+    },
+    "download-button": {
+        "downloading-status": "Stahování…",
+        "download-tooltip": "Stáhnout"
+    },
+    "manage-matched-metadata": {
+        "title": "Shodná metadata",
+        "description": "Zde se nacházejí všechny příslušné série, které lze přiřadit k externím metadatům. Kavita bude přednačítat nebo obnovovat metadata sérií, 50 sérií za 24 hodin denně.",
+        "status-header": "Stav",
+        "series-name-header": "Série",
+        "valid-until-header": "Další Obnovení",
+        "matched-status-label": "Shodný",
+        "unmatched-status-label": "Neshoduje se",
+        "blacklist-status-label": "Potřebuje manuální shodu",
+        "all-status-label": "Všechny",
+        "dont-match-label": "Neshodují se",
+        "no-data": "{{common.no-data}}",
+        "dont-match-status-label": "{{dont-match-label}}",
+        "match-alt": "Spáruj {{seriesName}}",
+        "actions-header": "Akce",
+        "library-name-header": "Knihovna",
+        "library-type": "Typ knihovny",
+        "matched-state-label": "Stav shody"
+    },
+    "match-series-result-item": {
+        "volume-count": "{{server-stats.volume-count}}",
+        "chapter-count": "{{common.chapter-count}}",
+        "releasing": "Vychází",
+        "details": "Zobrazit stránku",
+        "updating-metadata-status": "Aktualizace metadat",
+        "issue-count": "{{common.issue-count}}"
+    },
+    "pdf-reader": {
+        "incognito-mode": "Anonymní režim",
+        "loading-message": "Načítání......PDF může trvat déle, než se očekávalo",
+        "light-theme-alt": "Světlý motiv",
+        "dark-theme-alt": "Tmavý motiv",
+        "close-reader-alt": "Zavřít čtečku",
+        "toggle-incognito": "Vypnout anonymní režim"
+    },
+    "infinite-scroller": {
+        "continuous-reading-prev-chapter": "Předchozí kapitola",
+        "continuous-reading-next-chapter-alt": "Posunutím nahoru přejdete na další kapitolu",
+        "continuous-reading-prev-chapter-alt": "Posunutím nahoru přejdete na předchozí kapitolu",
+        "continuous-reading-next-chapter": "Další kapitola"
+    },
+    "sort-field-pipe": {
+        "created": "Vytvořeno",
+        "last-chapter-added": "Přidaná položka",
+        "release-year": "Rok vydání",
+        "sort-name": "Název řazení",
+        "random": "Náhodné",
+        "last-modified": "Naposledy upraveno",
+        "time-to-read": "Čas k přečtení",
+        "read-progress": "Naposledy čteno",
+        "average-rating": "Průměrné hodnocení",
+        "person-name": "Jméno",
+        "person-series-count": "Počet sérií",
+        "person-chapter-count": "Počet kapitol"
+    },
+    "edit-person-modal": {
+        "name-label": "{{edit-series-modal.name-label}}",
+        "role-label": "Role",
+        "mal-id-label": "MAL ID",
+        "asin-label": "ASIN",
+        "general-tab": "{{edit-series-modal.general-tab}}",
+        "loading": "{{common.loading}}",
+        "hardcover-tooltip": "https://hardcover.app/authors/{HardcoverId}",
+        "hardcover-id-label": "Hardcover ID",
+        "title": "{{personName}} Podrobnosti",
+        "mal-tooltip": "https://myanimelist.net/people/{MalId}/",
+        "description-label": "Popis",
+        "asin-tooltip": "https://www.amazon.com/stores/J.K.-Rowling/author/{ASIN}",
+        "required-field": "{{validations.required-field}}",
+        "cover-image-description": "{{edit-series-modal.cover-image-description}}",
+        "save": "{{common.save}}",
+        "cover-image-description-extra": "Případně si můžete stáhnout obálku z CoversDB, pokud je k dispozici.",
+        "download-coversdb": "Stáhnout z CoversDB",
+        "cover-image-tab": "{{edit-series-modal.cover-image-tab}}",
+        "close": "{{common.close}}",
+        "anilist-id-label": "AniList ID",
+        "anilist-tooltip": "https://anilist.co/staff/{AniListId}/",
+        "aliases-tab": "Aliasy",
+        "aliases-label": "Upravit aliasy",
+        "alias-overlap": "Tento alias již odkazuje na jinou osobu nebo je jménem této osoby, zvažte jejich sloučení.",
+        "aliases-tooltip": "Pokud je série označena aliasem osoby, je tato osoba přiřazena, místo aby byla vytvořena nová osoba. Při odstranění aliasu je nutné sérii znovu prohledat, aby se změna zachytila."
+    },
+    "errors": {
+        "delete-theme-in-use": "Motiv je aktuálně používán alespoň jedním uživatelem, nelze odstranit",
+        "download": "Při stahování tohoto souboru došlo k problému nebo nemáte oprávnění",
+        "theme-already-in-use": "Motiv s tímto názvem již existuje",
+        "generic": "Něco neočekávaného se nepovedlo",
+        "series-doesnt-exist": "Tato série již neexistuje",
+        "unknown-crit": "Došlo k neznámé kritické chybě",
+        "error-code": "{{num}} Chyba",
+        "user-not-auth": "Uživatel není ověřen",
+        "not-found": "Tato url adresa neexistuje",
+        "rejected-cover-upload": "Obrázek se nepodařilo načíst prostřednictvím adresy url. Místo toho jej stáhněte a nahrajte ze souboru.",
+        "invalid-confirmation-url": "Neplatná potvrzovací url adresa",
+        "invalid-confirmation-email": "Neplatný potvrzovací e-mail",
+        "collection-invalid-access": "Nemáte přístup k žádným knihovnám, ke kterým tento štítek patří, nebo je tato sbírka neplatná",
+        "invalid-password-reset-url": "Neplatná url adresa pro obnovení hesla",
+        "theme-manual-upload": "Vyskytl se problém při vytváření motivu z ručního nahrávání"
+    },
+    "cover-image-size": {
+        "xlarge": "Extra velké (1265x1795)",
+        "medium": "Střední (640x909)",
+        "large": "Velké (900x1277)",
+        "default": "Výchozí (320x455)"
+    },
+    "file-breakdown-stats": {
+        "extension-header": "Rozšíření",
+        "format-tooltip": "Nezařazeno znamená, že Kavita některé soubory nekontrolovala. K tomu dochází u starých souborů existujících před verzí 0.7. Možná bude nutné spustit nucenou kontrolu prostřednictvím modálního nastavení knihovny.",
+        "format-title": "Formát",
+        "format-header": "Formát",
+        "total-size-header": "Celková velikost",
+        "total-files-header": "Soubory celkem",
+        "visualisation-label": "Vizualizace",
+        "data-table-label": "Tabulka dat",
+        "not-classified": "Nezařazeno",
+        "download-file-for-extension-header": "Stáhnout zprávu",
+        "download-file-for-extension-alt": "Stáhnout soubory Zpráva pro {{extension}}",
+        "total-file-size-title": "Celková velikost souboru:"
+    },
+    "publication-status-stats": {
+        "visualisation-label": "Vizualizace",
+        "title": "Stav publikace",
+        "data-table-label": "Datová tabulka",
+        "count-header": "Počet",
+        "year-header": "Rok"
+    },
+    "kavitaplus-metadata-breakdown-stats": {
+        "complete": "Všechny série mají metadata",
+        "no-data": "{{common.no-data}}",
+        "completed-series-label": "Dokončené série",
+        "title": "Rozdělení metadat Kavita+",
+        "description": "Kavita pomalu načítá metadata (hodnocení, recenze, doporučení atd.) pro způsobilé série.",
+        "errored-series-label": "Chybné série"
+    },
+    "email-history": {
+        "template-header": "Šablona",
+        "no-data": "{{common.no-data}}",
+        "not-sent-tooltip": "Neodesláno",
+        "description": "Zde najdete všechny e-maily odeslané z Kavity a kterému uživateli.",
+        "date-header": "Datum odeslání",
+        "user-header": "Odesláno",
+        "sent-header": "Úspěšně",
+        "sent-tooltip": "Odesláno"
+    },
+    "pdf-layout-mode-pipe": {
+        "book": "Režim knihy",
+        "single": "Jedna stránka",
+        "multiple": "Výchozí",
+        "infinite-scroll": "Nekonečné posouvání"
+    },
+    "pdf-scroll-mode-pipe": {
+        "horizontal": "Vodorovné",
+        "wrapped": "Zabalené",
+        "page": "Klepnutím stránkujte",
+        "vertical": "Svislé"
+    },
+    "metadata-builder": {
+        "add-rule": "Přidat pravidlo",
+        "or": "Shodujte se s některou z následujících možností",
+        "and": "Shodujte se všemi následujícími položkami",
+        "remove-rule": "Odebrat řádek"
+    },
+    "day-breakdown": {
+        "no-data": "Žádný pokrok, pusťte se do čtení",
+        "x-axis-label": "Den v týdnu",
+        "y-axis-label": "Události spojené se čtením",
+        "title": "Rozdělení dne"
+    },
+    "manga-format-stats": {
+        "format-header": "Formát",
+        "count-header": "Počet",
+        "visualisation-label": "Vizualizace",
+        "data-table-label": "Tabulka dat",
+        "title": "Formát"
+    },
+    "table-of-contents": {
+        "no-data": "Tato kniha nemá v metadatech nastavený obsah ani soubor toc"
+    },
+    "external-series-card": {
+        "open-external": "Otevřít externí"
+    },
+    "tabs": {
+        "smart-filters-tab": "Chytré filtry",
+        "books-tab": "Knihy",
+        "volumes-tab": "Svazky",
+        "specials-tab": "Speciály",
+        "metadata-tab": "Metadata",
+        "weblink-tab": "Webové odkazy",
+        "folder-tab": "Složka",
+        "advanced-tab": "Pokročilé",
+        "details-tab": "Podrobnosti",
+        "progress-tab": "Pokrok",
+        "tags-tab": "Štítky",
+        "tasks-tab": "Úkoly",
+        "account-tab": "Účet",
+        "preferences-tab": "Předvolby",
+        "theme-tab": "Motiv",
+        "devices-tab": "Zařízení",
+        "reviews-tab": "Recenze",
+        "recommendations-tab": "Doporučení",
+        "info-tab": "Informace",
+        "scrobbling-tab": "Scrobbling",
+        "people-tab": "Lidé",
+        "series-tab": "Série",
+        "stats-tab": "Statistiky",
+        "storyline-tab": "Příběhová linie",
+        "related-tab": "Související",
+        "general-tab": "Obecné",
+        "cover-tab": "Obrázek na obalu"
+    },
+    "card-item": {
+        "cannot-read": "Nelze přečíst"
+    },
+    "collection-owner": {
+        "collection-created-label": "Vytvořil: {{owner}}",
+        "collection-via-label": "prostřednictvím {{source}}"
+    },
+    "pdf-spread-mode-pipe": {
+        "odd": "Liché rozpětí",
+        "even": "Sudé rozpětí",
+        "off": "Bez rozpětí"
+    },
+    "next-expected-card": {
+        "title": "~{{date}}",
+        "upcoming-title": "Nadcházející"
+    },
+    "card-detail-layout": {
+        "total-items": "{{count}} položek celkem",
+        "jumpkey-count": "{{count}} sérií",
+        "no-data": "{{common.no-data}}"
+    },
+    "download-indicator": {
+        "progress": "{{procentage}}% staženo"
+    },
+    "default-date-pipe": {
+        "never": "Nikdy"
+    },
+    "browse-themes-modal": {
+        "title": "Procházet motivy"
+    },
+    "toasts": {
+        "no-next-chapter": "Nepodařilo se najít další {{entity}}",
+        "file-send-to": "Soubor(y) zaslaný(é) e-mailem na adresu {{name}}",
+        "account-migration-complete": "Migrace účtu dokončena",
+        "reset-ip-address": "Reset IP adres",
+        "email-service-reachable": "Kavita E-mailové připojení úspěšné",
+        "password-reset": "Heslo obnoveno",
+        "forced-scan-queued": "Bylo zahájeno nucené skenování pro {{name}}",
+        "series-added-to-reading-list": "Série přidána do seznamu četby",
+        "confirm-delete-reading-lists": "Určitě chcete odstranit seznamy čtení? Toto nelze vrátit zpět.",
+        "pdf-book-mode-screen-size": "Příliš malá obrazovka pro režim Kniha",
+        "k+-delete-key": "Tím se pouze odstraní licenční klíč Kavity a zobrazí se odkaz na nákup.Tím se vaše předplatné nezruší!Ke zrušení předplatného nejprve použijte nástroj Spravovat.",
+        "device-created": "Zařízení vytvořeno",
+        "bulk-covers": "Obnovování obálek ve více knihovnách je náročné a může trvat dlouho. Jste si jisti, že chcete pokračovat?",
+        "k+-reset-key-success": "Vaše licence byla odhlášena. Pomocí tlačítka Upravit znovu zaregistrujte svou instanci a znovu aktivujte Kavita+",
+        "book-settings-info": "V zásuvce můžete upravit nastavení knihy, uložit je pro všechny knihy a zobrazit obsah.",
+        "entity-unread": "{{jméno}} je nyní nepřečteno",
+        "smart-filter-deleted": "Chytrý filtr odstraněn",
+        "confirm-download-size": "{{entityType}} je {{size}}. Jste si jisti, že chcete pokračovat?",
+        "collections-promoted": "Sbírky propagovány",
+        "bulk-delete-libraries": "Jste si jisti, že chcete odstranit {{count}} knihoven?",
+        "delete-device": "Opravdu chcete toto zařízení odstranit?",
+        "chapter-added-to-reading-list": "Kapitola přidána do seznamu četby",
+        "k+-error": "Při aktivaci licence došlo k chybě. Zkuste to prosím znovu.",
+        "change-email-no-email": "E-mail byl aktualizován",
+        "confirm-delete-multiple-chapters": "Jste si jisti, že chcete smazat {{count}} kapitol/svazků? Soubory na disku se tím nezmění.",
+        "confirm-reset-server-settings": "Tím obnovíte nastavení na hodnoty z první instalace. Jste si jisti, že chcete pokračovat?",
+        "delete-review": "Opravdu chcete svou recenzi smazat?",
+        "review-deleted": "Recenze smazána",
+        "age-restriction-updated": "Věkové omezení bylo aktualizováno",
+        "reading-lists-unpromoted": "Seznamy čtení nepropagovány",
+        "regen-cover": "Byla zadána úloha na znovu vytvoření obálky",
+        "collection-updated": "Aktualizovaná sbírka",
+        "email-service-unresponsive": "E-mailová služba Url neodpověděla.",
+        "refresh-covers-queued": "Obnovit obálky ve frontě pro {{name}}",
+        "email-not-sent": "E-mail v souboru není platný a nelze jej odeslat. Odkaz byl uložen v záznamech. Správce může tento odkaz poskytnout pro dokončení toku.",
+        "k+-license-saved": "Licenční klíč je uložen, ale není platný. Kliknutím na tlačítko zkontrolovat obnovte platnost předplatného. Při první registraci může propagace trvat minutu.",
+        "load-prev-chapter": "Předchozí {{entity}} načtená",
+        "library-created": "Knihovna byla úspěšně vytvořena. Bylo zahájeno skenování.",
+        "account-registration-complete": "Registrace účtu dokončena",
+        "password-updated": "Heslo bylo aktualizováno",
+        "email-sent-to-no-existing": "Stávající e-mail není platný. Odkaz byl vypsán do záznamů. Požádejte správce o odkaz pro dokončení změny e-mailu.",
+        "email-sent-to": "Na vaši starou e-mailovou adresu byl odeslán potvrzovací e-mail.",
+        "confirm-regen-covers": "Obnovení obálek vynutí přepočítání všech obrázků obálek. Jedná se o náročnou operaci. Jste si jisti, že místo toho nechcete provést skenování?",
+        "confirm-delete-series": "Opravdu chcete tuto sérii smazat? Soubory na disku se tím nezmění.",
+        "confirm-delete-smart-filter": "Opravdu chcete tento chytrý filtr odstranit?",
+        "incognito-off": "Anonymní režim je vypnutý. Nyní se začne sledovat pokrok.",
+        "library-deleted": "Knihovna {{name}} byla odstraněna",
+        "reading-list-deleted": "Seznam četby smazán",
+        "confirm-delete-reading-list": "Určitě chcete odstranit seznam četby? Toto nelze vrátit zpět.",
+        "item-removed": "Odstraněná položka",
+        "series-deleted": "Série smazána",
+        "theme-missing": "Aktivní motiv již neexistuje. Obnovte prosím stránku.",
+        "email-sent": "E-mail odeslaný na adresu {{email}}",
+        "list-doesnt-exist": "Tento seznam neexistuje",
+        "email-service-reset": "Resetování e-mailové služby",
+        "unauthorized-2": "Neautorizovaný",
+        "server-settings-updated": "Aktualizováno nastavení serveru",
+        "reset-base-url": "Obnovení základní adresy URL",
+        "no-updates": "Nejsou k dispozici žádné aktualizace",
+        "download-in-progress": "Stahování již probíhá. Počkejte prosím.",
+        "no-series-collection-warning": "Pozor! Nejsou vybrány žádné série, uložením se sbírka odstraní. Určitě chcete pokračovat?",
+        "confirm-download-size-ios": "Systém iOS má problémy se stahováním souborů větších než 200 MB, toto stahování se nemusí dokončit.",
+        "copied-to-clipboard": "Zkopírováno do schránky",
+        "alert-long-running": "Jedná se o dlouhodobý proces. Než jej znovu vyvoláte, dejte mu prosím čas na dokončení.",
+        "confirm-library-type-change": "Změna typu knihovny vyvolá nové skenování s odlišnými pravidly analýzy a může vést k opětovnému vytvoření sérií, a tedy ke ztrátě postupu a záložek. Před tímto úkonem byste měli provést zálohu. Jste si jisti, že chcete pokračovat?",
+        "external-source-already-exists": "Externí zdroj se stejným názvem/hostitelem/klíčem API již existuje",
+        "no-pages": "Nejsou zde žádné stránky. Kavita nebyla schopna přečíst tento archiv.",
+        "unauthorized-1": "Nejste oprávněni zobrazit tuto stránku.",
+        "series-added-to-collection": "Série přidána do sbírky {{collectionName}}",
+        "reading-list-updated": "Aktualizovaný seznam četby",
+        "nothing-to-remove": "Nic k odstranění",
+        "volumes-added-to-reading-list": "Svazek přidán do seznamu četby",
+        "library-file-analysis-queued": "Analýza souboru v knihovně ve frontě pro {{name}}",
+        "entity-read": "{{name}} je nyní čteno",
+        "k+-reset-key": "Tím se zruší platnost předchozí registrace pomocí vaší licence a umožní se opětovná registrace instance systému Kavita.",
+        "confirm-delete-multiple-series": "Jste si jisti, že chcete odstranit {{count}} sérií? Soubory na disku se tím nezmění.",
+        "alert-bad-theme": "V tématu je neplatné nebo nebezpečné CSS. Obraťte se prosím na správce, aby to opravil. Výchozí je nyní tmavé téma.",
+        "multiple-added-to-reading-list": "Kapitoly a svazky přidány do seznamu četby",
+        "select-files-warning": "Chcete-li pokračovat, musíte vybrat soubory",
+        "mark-read": "Označeno jako přečtené",
+        "mark-unread": "Označeno jako nepřečtené",
+        "device-updated": "Zařízení aktualizováno",
+        "reading-list-unpromoted": "Seznam čtení nepropagován",
+        "confirm-delete-collections": "Jste si jisti, že chcete odstranit více sbírek?",
+        "reading-list-imported": "Seznam četby byl importován",
+        "series-removed-want-to-read": "Série odstraněna ze seznamu Chci číst",
+        "collection-tag-deleted": "Smazán štítek sbírky",
+        "confirm-delete-user": "Opravdu chcete tohoto uživatele odstranit?",
+        "collections-deleted": "Sbírky odstraněny",
+        "anilist-token-expired": "Platnost vašeho tokenu AniList vypršela. Scrobblování se již nebude provádět, dokud jej znovu nevytvoříte v Nastavení uživatele > Účet",
+        "generate-colorscape-queued": "Generování barevného profilu ve frontě pro {{name}}",
+        "scan-queued": "Skenování ve frontě pro {{name}}",
+        "stack-imported": "Zásobník importován",
+        "collections-unpromoted": "Sbírky nepropagovany",
+        "must-select-library": "Musí být vybrána alespoň jedna knihovna",
+        "bulk-scan": "Skenování více knihoven bude probíhat lineárně. To může trvat dlouho a nemusí být dokončeno v závislosti na velikosti knihovny.",
+        "person-image-downloaded": "Obálka osoby byla stažena a použita.",
+        "confirm-delete-volume": "Opravdu chcete tento svazek odstranit? Soubory na disku se tím nezmění.",
+        "chapter-deleted": "Kapitola odstraněna",
+        "volume-deleted": "Svazek odstraněn",
+        "confirm-delete-theme": "Odstraněním tohoto motivu dojde k jeho odstranění z disku. Před odstraněním jej můžete vzít z dočasného adresáře",
+        "user-deleted": "{{user}} byl smazán",
+        "click-email-link": "Klikněte na tento odkaz a potvrďte svůj e-mail. Abyste se mohli přihlásit, je nutné potvrzení.",
+        "reading-lists-deleted": "Seznamy čtení odstraněny",
+        "no-prev-chapter": "Nepodařilo se najít předchozí {{entity}}",
+        "load-next-chapter": "Další {{entity}} načtená",
+        "anilist-token-updated": "Token AniList byl aktualizován",
+        "confirm-delete-chapter": "Opravdu chcete tuto kapitolu smazat? Soubory na disku se tím nezmění.",
+        "confirm-library-delete": "Jste si jisti, že chcete odstranit knihovnu {{name}}? Tuto akci nelze vrátit zpět.",
+        "smart-filter-updated": "Vytvořený/aktualizovaný chytrý filtr",
+        "force-kavita+-refresh-success": "Externí metadata Kavita+ byla zneplatněna",
+        "collection-not-owned": "Tuto sbírku nevlastníte",
+        "reading-lists-promoted": "Seznamy čtení propagovány",
+        "reading-list-promoted": "Seznam čtení propagován",
+        "mal-token-required": "Je vyžadován MAL Token, nastavený v Nastavení uživatele",
+        "match-success": "Správně sladěné série",
+        "webtoon-override": "Přepnutí do režimu Webtoon kvůli obrázkům představujícím webtoon.",
+        "scrobble-gen-init": "Vytvořena úloha pro generování událostí scrobble z historie čtení, hodnocení v minulosti a jejich synchronizaci s připojenými službami.",
+        "confirm-delete-multiple-volumes": "Jste si jisti, že chcete odstranit {{count}} svazků? Soubory na disku se tím nezmění.",
+        "series-added-want-to-read": "Série přidána ze seznamu Chci číst",
+        "series-bound-to-reading-profile": "Série vázaná na čtenářský profil {{name}}",
+        "library-bound-to-reading-profile": "Knihovna vázaná na čtenářský profil {{name}}",
+        "external-match-rate-error": "Kavita vyčerpala limit pro vyhledávání {{seriesName}}. Zkuste to znovu za 5 minut."
+    },
+    "preferences": {
+        "split-right-to-left": "Rozdělit zprava doleva",
+        "pdf-multiple": "Výchozí",
+        "up-to-down": "Odshora dolů",
+        "pdf-dark": "Tmavé",
+        "fit-to-width": "Přizpůsobit šířce",
+        "left-to-right": "Zleva doprava",
+        "fit-to-height": "Přizpůsobit výšce",
+        "original": "Původní",
+        "fit-to-screen": "Přizpůsobit obrazovce",
+        "double-manga": "Dvojité (Manga)",
+        "scroll": "Posouvání",
+        "1-column": "1 sloupec",
+        "pdf-vertical": "Svislé posouvání",
+        "pdf-horizontal": "Posouvání vodorovně",
+        "pdf-page": "Klepnutím stránkujte",
+        "pdf-odd": "Liché",
+        "pdf-even": "Sudé",
+        "2-column": "2 sloupce",
+        "pdf-book": "Kniha",
+        "cards": "Karty",
+        "list": "Seznam",
+        "single": "Jednotlivé",
+        "right-to-left": "Zprava doleva",
+        "automatic": "Automatický",
+        "webtoon": "Webový komiks",
+        "double": "Dvojité",
+        "pdf-none": "Žádné",
+        "horizontal": "Vodorovné",
+        "vertical": "Svislé",
+        "split-left-to-right": "Rozdělit zleva doprava",
+        "no-split": "Bez rozdělení",
+        "pdf-light": "Světlé"
+    },
+    "read-time-pipe": {
+        "less-than-hour": "<1 hodina",
+        "hours": "Hodiny",
+        "hour": "Hodina"
+    },
+    "common": {
+        "add": "Přidat",
+        "create": "Vytvořit",
+        "reset": "Obnovit",
+        "issue-num-shorthand": "#{{num}}",
+        "volume-num-shorthand": "Svaz {{num}}",
+        "filter": "Filtr",
+        "issue-nums": "Vydání",
+        "help": "Nápověda",
+        "delete": "Odstranit",
+        "read": "Číst",
+        "cancel": "Zrušit",
+        "apply": "Použít",
+        "save": "Uložit",
+        "loading": "Načítání…",
+        "series-count": "{{num}} Sérií",
+        "author-count": "{{num}} Autorů",
+        "item-count": "{{num}} Položek",
+        "book-num": "Kniha",
+        "issue-hash-num": "Vydání #",
+        "issue-num": "Vydání",
+        "chapter-num-shorthand": "Kap {{num}}",
+        "book-nums": "Knihy",
+        "chapter-nums": "Kapitoly",
+        "volume-nums": "Svazky",
+        "remove": "Odstranit",
+        "chapter-num": "Kapitola",
+        "username": "Uživatelské jméno",
+        "password": "Heslo",
+        "promoted": "Propagováno",
+        "select-all": "Vybrat vše",
+        "deselect-all": "Zrušit výběr všech",
+        "volume-num": "Svazek",
+        "book-num-shorthand": "Kniha {{num}}",
+        "reset-to-default": "Obnovení výchozího nastavení",
+        "close": "Zavřít",
+        "clear": "Vyčistit",
+        "edit": "Upravit",
+        "submit": "Odeslat",
+        "email": "E-mail",
+        "chapter-count": "{{num}} Kapitol",
+        "no-data": "Žádná data",
+        "issue-count": "{{num}} Vydání"
+    },
+    "entity-type": {
+        "logs": "záznamy",
+        "volume": "svazek",
+        "bookmark": "záložka",
+        "chapter": "kapitola",
+        "series": "série"
+    },
+    "filter-comparison-pipe": {
+        "is-not-in-last": "Není v posledním",
+        "matches": "Shoduje se",
+        "begins-with": "Začíná s",
+        "not-equal": "Nerovná se",
+        "ends-with": "Končí s",
+        "is-after": "Je po",
+        "less-than-or-equal": "Menší nebo rovno",
+        "must-contains": "Musí obsahovat",
+        "is-empty": "Je prázdný",
+        "contains": "Obsahuje",
+        "equal": "Rovná se",
+        "greater-than": "Větší než",
+        "greater-than-or-equal": "Větší nebo rovno",
+        "less-than": "Menší než",
+        "does-not-contain": "Neobsahuje",
+        "is-before": "Je před",
+        "is-in-last": "Je v posledním"
+    },
+    "validation": {
+        "valid-email": "Musí se jednat o platný e-mail",
+        "required-field": "Toto pole je povinné",
+        "year-validation": "Musí to být platný rok větší než 1000 a dlouhý 4 znaky",
+        "password-validation": "Heslo musí mít délku 6 až 256 znaků"
+    },
+    "confirm": {
+        "alert": "Upozornění",
+        "confirm": "Potvrdit",
+        "info": "Informace",
+        "cancel": "{{common.cancel}}",
+        "ok": "Ok",
+        "prompt": "Otázka"
+    },
+    "manage-metadata-settings": {
+        "enabled-tooltip": "Povolte systému Kavita stahovat metadata a zapisovat do jeho databáze.",
+        "summary-label": "Shrnutí",
+        "summary-tooltip": "Povolit zápis Shrnutí, když je pole odemčeno.",
+        "derive-publication-status-label": "Stav publikace",
+        "derive-publication-status-tooltip": "Umožnit odvození statusu publikace z celkového počtu kapitol/svazků.",
+        "enable-relations-label": "Vztahy",
+        "enable-relations-tooltip": "Povolit přidávání vztahů sérií.",
+        "enable-people-label": "Lidé",
+        "enable-people-tooltip": "Povolit přidávání osob (postav, spisovatelů atd.). Všechny osoby obsahují obrázky.",
+        "enable-start-date-tooltip": "Umožnit zapsání data zahájení série do série",
+        "enable-genres-label": "Žánry",
+        "enable-genres-tooltip": "Povolení psaní žánrů sérií.",
+        "enable-tags-tooltip": "Povolení zápisu štítků sérií.",
+        "whitelist-label": "Povolené štítky",
+        "whitelist-tooltip": "Povolit zápis pouze řetězce z tohoto seznamu pro Štítky. Zajistěte, aby byly odděleny čárkou.",
+        "age-rating-mapping-title": "Mapování věkového hodnocení",
+        "genre": "Žánr",
+        "first-last-name-label": "První Poslední pojmenování",
+        "first-last-name-tooltip": "Zajistěte, aby se jména lidí psala jako první a pak jako poslední",
+        "person-roles-label": "Role",
+        "age-rating-mapping-description": "Všechny řetězce vlevo, pokud se nacházejí v Žánru nebo Štítcích, nastaví věkové hodnocení seriálu.",
+        "enabled-label": "Povolit stahování metadat",
+        "blacklist-label": "Zakázání žánrů/štítků",
+        "remove-source-tag-label": "Odstranění štítku zdroje",
+        "add-field-mapping-label": "Přidání mapování pole",
+        "add-age-rating-mapping-label": "Přidání mapování věkového hodnocení",
+        "field-mapping-title": "Mapování polí",
+        "tag": "Štítek",
+        "enable-tags-label": "Štítky",
+        "description": "Kavita+ má možnost stahovat a zapisovat do databáze některá omezená metadata. Tato stránka umožňuje přepínat, co je v rozsahu.",
+        "field-mapping-description": "Nastavení pravidel pro určité řetězce nalezené v poli Žánr/Štítek a jejich namapování na nový řetězec v poli Žánr/Štítek a volitelné odstranění ze seznamu Zdroje. Použitelné pouze v případě, že je povoleno zapisování do pole Žánr/Štítek.",
+        "enable-start-date-label": "Datum začátku",
+        "blacklist-tooltip": "Cokoli z tohoto seznamu bude odstraněno ze zpracování Žánrů i Štítků. Toto je místo pro přidání žánrů/štítků, které nechcete zapisovat. Ujistěte se, že jsou odděleny čárkou.",
+        "enable-cover-image-tooltip": "Umožnit Kavitě vložit obrázek na obálku série",
+        "localized-name-label": "Název lokalizované série",
+        "localized-name-tooltip": "Povolit zápis lokalizovaného názvu při odemknutí pole. Kavita se pokusí provést nejlepší odhad.",
+        "enable-cover-image-label": "Obrázek na obálce",
+        "overrides-description": "Povolit Kavitě zápis přes uzamčená pole.",
+        "overrides-label": "Přepisuje",
+        "enable-chapter-release-date-label": "Datum vydání",
+        "enable-chapter-publisher-label": "Vydavatel",
+        "enable-chapter-publisher-tooltip": "Umožnit napsání vydavatele kapitoly/vydání",
+        "enable-chapter-cover-label": "Obálka kapitoly",
+        "enable-chapter-cover-tooltip": "Umožnit nastavení obálky kapitoly/vydání",
+        "chapter-header": "Pole kapitoly",
+        "enable-chapter-release-date-tooltip": "Povolit datum vydání kapitoly/vydání, které má být napsáno",
+        "enable-chapter-title-label": "Titulek",
+        "enable-chapter-title-tooltip": "Umožnit napsání názvu kapitoly/vydání",
+        "enable-chapter-summary-label": "{{manage-metadata-settings.summary-label}}",
+        "enable-chapter-summary-tooltip": "{{manage-metadata-settings.summary-tooltip}}"
+    },
+    "metadata-setting-field-pipe": {
+        "people": "{{tabs.people-tab}}",
+        "start-date": "{{manage-metadata-settings.enable-start-date-label}}",
+        "localized-name": "{{edit-series-modal.localized-name-label}}",
+        "tags": "{{metadata-fields.tags-title}}",
+        "age-rating": "{{metadata-fields.age-rating-title}}",
+        "covers": "Obálky",
+        "genres": "{{metadata-fields.genres-title}}",
+        "summary": "{{filter-field-pipe.summary}}",
+        "publication-status": "{{edit-series-modal.publication-status-title}}",
+        "chapter-title": "Název (kapitola)",
+        "chapter-covers": "Obálky (kapitola)",
+        "chapter-release-date": "Datum vydání (kapitola)",
+        "chapter-summary": "Shrnutí (kapitola)",
+        "chapter-publisher": "{{person-role-pipe.publisher}} (Kapitola)"
+    },
+    "role-localized-pipe": {
+        "download": "Stažené",
+        "change-password": "Změnit heslo",
+        "change-restriction": "Omezení změn",
+        "login": "Přihlášení",
+        "read-only": "Pouze pro čtení",
+        "promote": "Propagovat",
+        "bookmark": "Záložka",
+        "admin": "Správce"
+    },
+    "log-level-pipe": {
+        "debug": "Ladit",
+        "information": "Informace",
+        "trace": "Sledovat",
+        "warning": "Varování",
+        "critical": "Kritické"
+    },
+    "review-modal": {
+        "title": "Upravit recenzi",
+        "min-length": "Recenze musí mít alespoň {{count}} znaků",
+        "required": "{{validation.required-field}}",
+        "delete": "{{common.delete}}",
+        "save": "{{common.save}}",
+        "review-label": "Recenze",
+        "close": "{{common.close}}"
+    },
+    "reviews": {
+        "user-reviews-local": "Místní recenze",
+        "user-reviews-plus": "Externí recenze"
+    },
+    "merge-person-modal": {
+        "title": "{{personName}}",
+        "close": "{{common.close}}",
+        "save": "{{common.save}}",
+        "src": "Sloučit osoby",
+        "merge-warning": "Pokud budete pokračovat, vybraná osoba bude odstraněna. Jméno vybrané osoby bude přidáno jako alias a všechny její role budou převedeny.",
+        "alias-title": "Nové aliasy",
+        "known-for-title": "Známý pro"
+    },
+    "manage-reading-profiles": {
+        "extra-tip": "Přiřaďte profily čtení pomocí akčního menu v sériích a knihovnách nebo hromadně. Při změně nastavení v čtečce se vytvoří skrytý profil, který si pamatuje vaše volby pro danou sérii (ne pro soubory PDF). Tento profil se odstraní, když přiřadíte k sérii jeden ze svých vlastních profilů čtení. Více informací naleznete na stránce",
+        "reading-direction-tooltip": "Směr kliknutí pro přechod na další stránku. Zprava doleva znamená, že kliknete na levou stranu obrazovky, abyste přejeli na další stránku.",
+        "layout-mode-book-tooltip": "Jak by měl být obsah rozložen. Posouvání je stejné jako u knihy. 1 nebo 2 sloupce se přizpůsobí výšce zařízení a na každou stránku se vejde 1 nebo 2 sloupce textu",
+        "description": "Ne všechny vaše série lze číst stejným způsobem, proto nastavte pro každou knihovnu nebo sérii samostatné profily čtení, aby se vám co nejlépe dařilo navázat na předchozí díly série.",
+        "reading-direction-book-tooltip": "Směr kliknutí pro přechod na další stránku. Zprava doleva znamená, že kliknete na levou stranu obrazovky, abyste přejeli na další stránku.",
+        "font-family-tooltip": "Rodina písem, která se má načíst. Výchozí nastavení načte výchozí písmo knihy",
+        "pdf-theme-tooltip": "Barevné motivy čtečky",
+        "reading-profile-series-settings-title": "Série",
+        "reading-direction-book-label": "Směr čtení",
+        "margin-book-tooltip": "Jak velký odstup na každé straně obrazovky. Na mobilních zařízeních se tato hodnota bez ohledu na nastavení nastaví na 0.",
+        "allow-auto-webtoon-reader-tooltip": "Pokud stránky vypadají jako webtoon, přepněte do režimu Webtoon čtečky. Mohou se vyskytnout některé falešně pozitivní výsledky.",
+        "reset": "{{common.reset}}",
+        "tap-to-paginate-tooltip": "Měly by strany obrazovky čtečky knih umožňovat klepnutí pro přechod na předchozí/následující stránku",
+        "delete": "{{common.delete}}",
+        "profiles-title": "Vaše profily čtení",
+        "default-profile": "Výchozí",
+        "add": "{{common.add}}",
+        "add-tooltip": "Váš nový profil bude uložen po provedení změn",
+        "make-default": "Nastavit jako výchozí",
+        "no-selected": "Není vybrán žádný profil",
+        "confirm": "Opravdu chcete smazat profil čtení {{name}}?",
+        "selection-tip": "Vyberte profil ze seznamu nebo vytvořte nový v pravém horním rohu",
+        "image-reader-settings-title": "Čtečka obrázků",
+        "reading-direction-label": "Směr čtení",
+        "scaling-option-label": "Možnosti škálování",
+        "scaling-option-tooltip": "Jak přizpůsobit velikost obrázku vaší obrazovce.",
+        "page-splitting-label": "Rozdělení stránky",
+        "page-splitting-tooltip": "Jak rozdělit obrázek v plné šířce (tj. kombinace levého a pravého obrázku)",
+        "reading-mode-label": "Režim čtení",
+        "reading-mode-tooltip": "Změňte čtečku tak, aby stránkovala vertikálně, horizontálně nebo měla nekonečné posouvání",
+        "layout-mode-label": "Režim rozvržení",
+        "layout-mode-tooltip": "Zobrazit jeden obrázek na obrazovce nebo dva obrázky vedle sebe",
+        "background-color-label": "Barva pozadí",
+        "background-color-tooltip": "Barva pozadí čtečky obrázků",
+        "auto-close-menu-label": "Automatické zavření nabídky",
+        "auto-close-menu-tooltip": "Mělo by se menu automaticky zavřít",
+        "show-screen-hints-label": "Zobrazit nápovědu na obrazovce",
+        "show-screen-hints-tooltip": "Zobrazit překryvnou vrstvu, která pomůže pochopit oblast a směr stránkování",
+        "emulate-comic-book-label": "Napodobit komiks",
+        "emulate-comic-book-tooltip": "Použije stínový efekt, který napodobuje čtení z knihy",
+        "swipe-to-paginate-label": "Přejetím prstem přejděte na stránku",
+        "swipe-to-paginate-tooltip": "Má přejetí prstem po obrazovce vyvolat přechod na další nebo předchozí stránku",
+        "allow-auto-webtoon-reader-label": "Režim automatického čtení webtoonů",
+        "width-override-label": "{{manga-reader.width-override-label}}",
+        "width-override-tooltip": "Přepsat šířku obrázků v čtečce",
+        "book-reader-settings-title": "Čtečka knih",
+        "tap-to-paginate-label": "Klepnutím na stránku posouvat",
+        "immersive-mode-label": "Imersivní režim",
+        "immersive-mode-tooltip": "Tím se skryje nabídka za kliknutím na dokument čtečky a zapne se listování klepnutím",
+        "font-family-label": "Rodina písem",
+        "writing-style-label": "Styl psaní",
+        "writing-style-tooltip": "Změní směr textu. Horizontální směr je zleva doprava, vertikální směr je shora dolů.",
+        "layout-mode-book-label": "Režim rozvržení",
+        "color-theme-book-label": "Barevné téma",
+        "color-theme-book-tooltip": "Jaké barevné schéma použít pro obsah čtečky knih a nabídku",
+        "font-size-book-label": "Velikost písma",
+        "font-size-book-tooltip": "Procento zmenšení, které se použije na písmo v knize",
+        "line-height-book-label": "Řádkování",
+        "line-height-book-tooltip": "Jak velký je odstup mezi řádky v knize",
+        "margin-book-label": "Odsazení",
+        "pdf-reader-settings-title": "Čtečka PDF",
+        "pdf-scroll-mode-label": "Režim posouvání",
+        "pdf-scroll-mode-tooltip": "Jak procházíte stránky. Vertikálně/horizontálně a klepnutím na stránku (bez posouvání)",
+        "pdf-spread-mode-label": "Režim rozložení",
+        "pdf-spread-mode-tooltip": "Jak by měly být stránky rozvrženy. Jednoduché nebo dvojité (liché/sudé)",
+        "pdf-theme-label": "Motiv",
+        "reading-profile-library-settings-title": "Knihovna",
+        "wiki-title": "wiki",
+        "disable-width-override-label": "Zakázat přepsání šířky",
+        "disable-width-override-tooltip": "Zabraňte tomu, aby se přepsání šířky projevilo, pokud je vaše obrazovka alespoň v konfigurovaném bodě zlomu nebo menší"
+    },
+    "bulk-set-reading-profile-modal": {
+        "title": "Nastavit profil čtení",
+        "close": "{{common.close}}",
+        "filter-label": "{{common.filter}}",
+        "clear": "{{common.clear}}",
+        "no-data": "Zatím nebyly vytvořeny žádné sbírky",
+        "loading": "{{common.loading}}",
+        "create": "{{common.create}}",
+        "bound": "Vázaný"
+    },
+    "browse-people": {
+        "title": "Procházet Osoby",
+        "author-count": "{{num}} osob",
+        "issue-count": "{{common.issue-count}}",
+        "roles-label": "Role",
+        "sort-label": "Třídit",
+        "name-label": "Jméno",
+        "issue-count-label": "Počet vydání",
+        "series-count-label": "Počet sérií",
+        "cover-image-description": "{{edit-series-modal.cover-image-description}}",
+        "series-count": "{{common.series-count}}"
+    },
+    "browse-genres": {
+        "title": "Procházet žánry",
+        "genre-count": "{{num}} žánrů",
+        "issue-count": "{{common.issue-count}}",
+        "series-count": "{{common.series-count}}"
+    },
+    "browse-tags": {
+        "title": "Procházet štítky",
+        "genre-count": "{{num}} štítků",
+        "issue-count": "{{common.issue-count}}",
+        "series-count": "{{common.series-count}}"
+    },
+    "browse-title-pipe": {
+        "publication-status": "{{value}} prací",
+        "age-rating": "Hodnoceno {{value}}",
+        "tag": "Má štítek {{value}}",
+        "translator": "Přeložil {{value}}",
+        "character": "Má postavu {{value}}",
+        "editor": "Úpravy provedl {{value}}",
+        "artist": "Nakreslil {{value}}",
+        "letterer": "Vepsal text {{value}}",
+        "inker": "Inkoustoval {{value}}",
+        "genre": "Má žánr {{value}}",
+        "library": "V rámci knihovny {{value}}",
+        "release-year": "Vydáno v roce {{value}}",
+        "imprint": "Otisk {{value}}",
+        "team": "Tým {{value}}",
+        "location": "V místě {{value}}",
+        "user-rating": "Hodnoceno {{value}} hvězdičkami",
+        "format": "Formát {{value}}",
+        "colorist": "Vybarvil {{value}}",
+        "publisher": "Vydáno {{value}}",
+        "writer": "Napsal {{value}}",
+        "penciller": "Nakreslil tužkou {{hodnota}}"
+    },
+    "generic-filter-field-pipe": {
+        "person-name": "Jméno",
+        "person-series-count": "Počet sérií",
+        "person-role": "Role",
+        "person-chapter-count": "Počet kapitol"
+    },
+    "breakpoint-pipe": {
+        "never": "Nikdy",
+        "mobile": "Mobilní",
+        "tablet": "Tablet",
+        "desktop": "Stolní počítač"
     }
 }
diff --git a/UI/Web/src/assets/langs/da.json b/UI/Web/src/assets/langs/da.json
index 48fa5d568..ac0ed2c76 100644
--- a/UI/Web/src/assets/langs/da.json
+++ b/UI/Web/src/assets/langs/da.json
@@ -10,19 +10,12 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}"
     },
     "user-scrobble-history": {
         "filter-label": "{{common.filter}}",
         "special": "{{entity-title.special}}"
     },
-    "review-series-modal": {
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}"
     },
diff --git a/UI/Web/src/assets/langs/de.json b/UI/Web/src/assets/langs/de.json
index eadf08954..5b18c44c0 100644
--- a/UI/Web/src/assets/langs/de.json
+++ b/UI/Web/src/assets/langs/de.json
@@ -22,11 +22,11 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "saving": "Speichern…",
         "update": "Aktualisierung",
-        "account-detail-title": "Konto Details"
+        "account-detail-title": "Konto Details",
+        "invalid-email-warning": "Eine ungültige E-Mail-Adresse blockiert einige Funktionen von Kavita"
     },
     "user-scrobble-history": {
         "title": "Scrobble-Verlauf",
@@ -39,7 +39,7 @@
         "series-header": "Serie",
         "data-header": "Daten",
         "is-processed-header": "Wird verarbeitet",
-        "no-data": "Keine Daten",
+        "no-data": "{{common.no-data}}",
         "volume-and-chapter-num": "Band {{v}} Kapitel {{n}}",
         "volume-num": "Band {{num}}",
         "chapter-num": "Kapitel {{num}}",
@@ -47,7 +47,12 @@
         "not-applicable": "Nicht anwendbar",
         "processed": "Verarbeitet",
         "not-processed": "Nicht verarbeitet",
-        "special": "{{entity-title.special}}"
+        "special": "{{entity-title.special}}",
+        "token-expired": "Ihr AniList-Token ist abgelaufen! Scrobbling-Ereignisse werden nicht verarbeitet, bis Sie auf der Seite Konten erneuert haben.",
+        "generate-scrobble-events": "Backfill Ereignisse",
+        "scrobbling-disabled": "Scrobbeln ist in deinen Kontoeinstellungen deaktiviert.",
+        "select-all-label": "Alles auswählen",
+        "delete-selected-label": "Markiertes löschen"
     },
     "scrobble-event-type-pipe": {
         "chapter-read": "Lesefortschritt",
@@ -59,15 +64,6 @@
     "spoiler": {
         "click-to-show": "Spoiler, klicke zum Anzeigen"
     },
-    "review-series-modal": {
-        "title": "Rezension bearbeiten",
-        "review-label": "Rezension",
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "min-length": "Rezension muss mindestens {{count}} Zeichen lang sein",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}",
         "user-review": "{{username}}'s Rezension",
@@ -78,7 +74,8 @@
         "your-review": "Dies ist deine Rezension",
         "external-review": "Externe Rezension",
         "local-review": "Lokale Rezension",
-        "rating-percentage": "Bewertung {{r}}%"
+        "rating-percentage": "Bewertung {{r}}%",
+        "critic": "Kritiker"
     },
     "want-to-read": {
         "title": "Favoriten",
@@ -88,7 +85,7 @@
     },
     "user-preferences": {
         "title": "Benutzer Dashboard",
-        "pref-description": "Dies sind globale Einstellungen, die an Ihr Konto gebunden sind.",
+        "pref-description": "Dies sind globale Einstellungen, die mit Ihrem Konto verknüpft sind. Die Reader-Einstellungen befinden sich in den Leseprofilen.",
         "account-tab": "{{tabs.account-tab}}",
         "preferences-tab": "{{tabs.preferences-tab}}",
         "theme-tab": "{{tabs.theme-tab}}",
@@ -112,55 +109,6 @@
         "collapse-series-relationships-tooltip": "Sollte Kavita Serien zeigen, die keine Verbindungen haben, oder ist das Elternteil/Prequel",
         "share-series-reviews-label": "Bewertungen von Serien teilen",
         "share-series-reviews-tooltip": "Soll Kavita deine Rezensionen zu Serien für andere Nutzer aufnehmen",
-        "image-reader-settings-title": "Bildleser",
-        "reading-direction-label": "Leserichtung",
-        "reading-direction-tooltip": "Richtung, in die geklicken werden müssen, um zur nächsten Seite zu gelangen. Von rechts nach links bedeutet, dass man auf die linke Seite des Bildschirms klickt, um zur nächsten Seite zu gelangen.",
-        "scaling-option-label": "Skalierungsoptionen",
-        "scaling-option-tooltip": "So wird das Bild auf den Bildschirm skaliert.",
-        "page-splitting-label": "Seitenaufteilung",
-        "page-splitting-tooltip": "Wie wird ein Bild in voller Breite geteilt (d.h. linkes und rechtes Bild werden kombiniert)",
-        "reading-mode-label": "Lesemodus",
-        "reading-mode-tooltip": "Ändern Sie den Reader so, dass er vertikal oder horizontal paginiert oder einen unendlichen Bildlauf hat",
-        "layout-mode-label": "Layoutmodus",
-        "layout-mode-tooltip": "Rendert ein einzelnes Bild auf dem Bildschirm oder zwei nebeneinander liegende Bilder",
-        "background-color-label": "Hintergrundfarbe",
-        "background-color-tooltip": "Hintergrundfarbe des Bildlesers",
-        "auto-close-menu-label": "Menü Automatisch schließen",
-        "auto-close-menu-tooltip": "Soll sich das Menü automatisch schließen",
-        "show-screen-hints-label": "Bildschirmtipps anzeigen",
-        "show-screen-hints-tooltip": "Einblenden eines Overlays zum besseren Verständnis des Seitenbereichs und der Seitenausrichtung",
-        "emulate-comic-book-label": "Comicbuch nachbilden",
-        "emulate-comic-book-tooltip": "Wendet einen Schatteneffekt an, um das Lesen aus einem Buch zu simulieren",
-        "swipe-to-paginate-label": "Zum Umblättern wischen",
-        "swipe-to-paginate-tooltip": "Soll die nächste oder vorherige Seite durch Wischen über den Bildschirm aufgerufen werden",
-        "book-reader-settings-title": "Buch-Reader",
-        "tap-to-paginate-label": "Tippen zum Umblättern",
-        "tap-to-paginate-tooltip": "Sollten die Seiten des Buchlesebildschirms ein Antippen erlauben, um zur vorherigen/nächsten Seite zu gelangen",
-        "immersive-mode-label": "Immersiver Modus",
-        "immersive-mode-tooltip": "Das Menü wird nach einem Klick auf das Reader-Dokument ausgeblendet und das Tippen zum Umblättern eingeschaltet",
-        "reading-direction-book-label": "Leserichtung",
-        "reading-direction-book-tooltip": "Richtung, in die zu klicken ist, um zur nächsten Seite zu gelangen. Von rechts nach links bedeutet, dass man auf die linke Seite des Bildschirms klickt, um zur nächsten Seite zu gelangen.",
-        "font-family-label": "Schriftart",
-        "font-family-tooltip": "Schriftart, die geladen werden soll. Standard lädt die Standardschriftart des Buches",
-        "writing-style-label": "Schreibstil",
-        "writing-style-tooltip": "Ändert die Richtung des Textes. Horizontal ist von links nach rechts, vertikal von oben nach unten.",
-        "layout-mode-book-label": "Layoutmodus",
-        "layout-mode-book-tooltip": "Wie soll der Inhalt aufgebaut sein. Scrollen ist so, wie das Buch es verpackt. 1- oder 2-spaltig entspricht der Höhe des Geräts und fasst 1 oder 2 Spalten Text pro Seite",
-        "color-theme-book-label": "Farbe Motiv",
-        "color-theme-book-tooltip": "Welches Farb Motiv soll für den Inhalt und das Menü des Buchlesers verwendet werden",
-        "font-size-book-label": "Schriftgröße",
-        "font-size-book-tooltip": "Prozentsatz der Skalierung, der auf die Schrift im Buch anzuwenden ist",
-        "line-height-book-label": "Zeilenabstände",
-        "line-height-book-tooltip": "Wie viel Abstand zwischen den Zeilen im Buch",
-        "margin-book-label": "Seitenrand",
-        "margin-book-tooltip": "Wie viel Abstand auf jeder Seite des Bildschirms. Auf mobilen Geräten wird dieser Wert unabhängig von dieser Einstellung auf 0 gesetzt.",
-        "pdf-reader-settings-title": "PDF Viewer",
-        "pdf-scroll-mode-label": "Scroll Modus",
-        "pdf-scroll-mode-tooltip": "So Scrollen sie durch Seiten. Vertikal/Horizontal und Tippen zum Paginieren (kein Scrollen)",
-        "pdf-spread-mode-label": "Ausbreitungs Modus",
-        "pdf-spread-mode-tooltip": "Wie sollten die Seiten angeordnet werden. Einzeln oder Doppelt (Gerade/Ungrade)",
-        "pdf-theme-label": "Thema",
-        "pdf-theme-tooltip": "Farbschema des Lesers",
         "clients-opds-alert": "OPDS ist auf diesem Server nicht aktiviert. Tachiyomi-Benutzer sind davon nicht betroffen.",
         "clients-opds-description": "Alle Clients von Drittanbietern verwenden entweder den API-Schlüssel oder die unten stehende Verbindungs-URL. Diese sind wie Passwörter, vertraulich zu behandeln.",
         "clients-api-key-tooltip": "Der API-Schlüssel ist wie ein Passwort. Wenn Sie ihn zurücksetzen, werden alle bestehenden Kunden ungültig.",
@@ -168,12 +116,20 @@
         "clients-api-key-label": "API-Schlüssel",
         "clients-opds-url-tooltip": "OPDS URLHier finden Sie eine Liste der unterstützten OPDS-Clients: ",
         "reset": "{{common.reset}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "anilist-scrobbling-label": "AniList Scrobbeln",
+        "want-to-read-sync-label": "Willst du lesen synchronisieren",
+        "kavitaplus-settings-title": "Kavita+",
+        "want-to-read-sync-tooltip": "Erlaube Kavita, basierend auf AniList und MAL-Serien Elemente zu deiner „Want to Read“-Liste in „Pending readlist“ hinzuzufügen",
+        "anilist-scrobbling-tooltip": "Erlaube Kavita, ihren Lesefortschritt und ihre Bewertungen zu AniList zu scrobbeln (Einweg-Synchronisierung)"
     },
     "user-holds": {
         "title": "Scrobble pausiert",
-        "description": "Dies ist eine vom Benutzer verwaltete Liste von Serien, die nicht an Upstream-Anbieter übertragen wird. Sie können eine Serie jederzeit entfernen und das nächste Scrobble-fähige Ereignis (Lesefortschritt, Bewertung, Lesewunschstatus) wird Ereignisse auslösen.",
-        "no-data": "{{typeahead.no-data}}"
+        "description": "Dies ist eine benutzergesteuerte Liste von Serien, die nicht an Upstream-Anbieter gescrobbelt wird. Du kannst eine Serie jederzeit entfernen und das nächste scrobbelfähige Ereignis (Lesefortschritt, Bewertung, Status „möchte lesen“) löst das Scrobbeln aus.",
+        "no-data": "{{typeahead.no-data}}",
+        "created-header": "{{manage-media-issues.created-header}}",
+        "series-name-header": "{{manage-matched-metadata.series-name-header}}",
+        "delete-label": "{{common.remove}}"
     },
     "theme-manager": {
         "title": "Motiv-Manager",
@@ -293,7 +249,8 @@
         "regen-warning": "Wenn Sie Ihren API-Schlüssel neu generieren, werden alle bestehenden Verbindungen ungültig.",
         "no-key": "FEHLER - SCHLÜSSEL NICHT GESETZT",
         "confirm-reset": "Alle bereits eingerichteten OPDS-Konfigurationen werden ungültig. Sind Sie sicher, dass Sie fortfahren möchten?",
-        "key-reset": "API Schlüssel zurücksetzen"
+        "key-reset": "API Schlüssel zurücksetzen",
+        "reset": "Zurücksetzen"
     },
     "scrobbling-providers": {
         "title": "Scrobbling Anbieter",
@@ -304,7 +261,7 @@
         "token-set": "Token festgelegt",
         "generate": "Generieren",
         "generic-instructions": "Geben Sie Informationen zu den Externen Diensten ein, damit Kavita+ mit diesen interagieren kann.",
-        "instructions": "First time users should click on \"{{scrobbling-providers.generate}}\" below to allow Kavita+ to talk with {{service}}. Once you authorize the program, copy and paste the token in the input below. You can regenerate your token at any time.",
+        "instructions": "Erstbenutzer sollten unten auf „{{scrobbling-providers.generate}}“ klicken, um Kavita+ zu erlauben, mit {{service}} zu kommunizieren. Sobald Sie das Programm autorisiert haben, kopieren Sie das Token und fügen Sie es in das untenstehende Feld ein. Sie können Ihr Token jederzeit neu generieren.",
         "mal-instructions": "Kavita benutzt eine MAL Client ID für die Authentifizierung. Erstelle einen neuen Client für Kavita und trage die Client ID und ihren Username ein.",
         "scrobbling-applicable-label": "Scrobbling ist anwendbar",
         "token-input-label": "{{Service}} Token hier einfügen",
@@ -313,15 +270,21 @@
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
-        "loading": "{{common.loading}}"
+        "loading": "{{common.loading}}",
+        "anilist-first-now": "Jetzt",
+        "anilist-first-later": "Später",
+        "mal-used-for": "MyAnimeList wird für Intelligente Sammlungen und die Synchronisierung von Lesewünschen verwendet.",
+        "anilist-used-for": "AniList wird zum Scrobbling (Synchronisieren von Daten) verwendet und möchte die Synchronisierung lesen.",
+        "anilist-first-header": "AniList Token gespeichert",
+        "anilist-first-description": "Ihr AniList-Token ist jetzt eingerichtet. Dieses Token ist ein Jahr lang gültig und Kavita wird Sie vor Ablauf der Gültigkeit informieren, damit Sie es hier erneuern können. Damit generiert Kavita Scrobble- (Synchronisierungs-) Ereignisse aus Ihrem Leseverlauf, Ihren Lesewünschen und Bewertungen. Sie können dies jetzt oder später starten. Wenn Sie eine Reihe haben, die nicht gescrobbelt werden soll, wählen Sie später aus und setzen Sie eine Scrobble-Sperre. Sie müssen diese Aufgabe nur einmal ausführen. Danach übernimmt Kavita die Synchronisierung für Sie.
           Wenn Sie „Später“ auswählen, finden Sie die Schaltfläche auf der Scrobbling-Seite."
     },
     "typeahead": {
         "locked-field": "Feld ist gesperrt",
         "close": "{{common.close}}",
         "loading": "{{common.loading}}",
         "add-item": "Hinzufügen {{item}}…",
-        "no-data": "Keine Daten",
-        "add-custom-item": ", tippen um benutzerdefiniertes Element hinzuzufügen"
+        "add-custom-item": ", tippen um benutzerdefiniertes Element hinzuzufügen",
+        "no-data": "{{common.no-data}}"
     },
     "generic-list-modal": {
         "close": "{{common.close}}",
@@ -354,8 +317,8 @@
         "title": "Top Leser",
         "time-selection-label": "Zeitfenster",
         "comics-label": "Comics: {{value}} Std",
-        "manga-label": "Manga: {{value}} Std.",
-        "books-label": "Bücher: {{value}} Std.",
+        "manga-label": "Manga: {{value}} Std",
+        "books-label": "Bücher: {{value}} Std",
         "this-week": "{{time-periods.this-week}}",
         "last-7-days": "{{time-periods.last-7-days}}",
         "last-30-days": "{{time-periods.last-30-days}}",
@@ -450,7 +413,7 @@
     },
     "relationship-pipe": {
         "adaptation": "Adaption",
-        "alternative-setting": "Alternative Einstellungen",
+        "alternative-setting": "Alternativer Schauplatz",
         "alternative-version": "Alternative Version",
         "character": "Charakter",
         "contains": "Beinhaltet",
@@ -478,7 +441,7 @@
         "cover-artist": "{{artist}}",
         "editor": "Editor",
         "inker": "Einfärber",
-        "letterer": "Letterer",
+        "letterer": "Schriftsetzer",
         "penciller": "Zeichner",
         "publisher": "Herausgeber",
         "writer": "Autor",
@@ -497,9 +460,9 @@
     },
     "library-type-pipe": {
         "book": "Buch",
-        "comic": "Comic",
+        "comic": "Comic (Legacy)",
         "manga": "Manga",
-        "comicVine": "Comic Vine",
+        "comicVine": "Comic",
         "image": "Bild",
         "lightNovel": "Light Novel"
     },
@@ -561,10 +524,7 @@
         "installed": "Installiert",
         "download": "Heruntergeladen",
         "nightly": "Beta: {{version}}",
-        "published-label": "Veröffentlicht: ",
-        "available": "Verfügbar",
-        "description": "Wenn du kein {{installed}} siehst",
-        "description-continued": "Du nutzt eine BETA-Version. Nur Major-Versionen werden als verfügbar angezeigt."
+        "available": "Verfügbar"
     },
     "invite-user": {
         "title": "Lade einen Nutzer ein",
@@ -610,15 +570,35 @@
         "activate-discordId-tooltip": "Verbinde deinen Discord-Account mit Kavita+. Dies gewährt dir Zugriff auf versteckte Kanäle, um Kavita mitzugestalten.",
         "discord-validation": "Dies ist keine valide Discord-User-ID. Deine User ID ist nicht dein Discord-Benutzername.",
         "activate-delete": "{{common.delete}}",
-        "activate-reset": "{{common.reset}}",
+        "activate-reset": "Lizenz zurücksetzen",
         "activate-reset-tooltip": "Ungültigmachen einer früheren Registrierung mit Ihrer Lizenz. Erfordert sowohl Lizenz als auch E-Mail",
         "activate-save": "{{common.save}}",
         "kavita+-desc-part-1": "Kavita+ ist ein Premium-Abonnementdienst, der Funktionen für alle Benutzer dieser Kavita-Instanz freischaltet. Kaufen Sie ein Abonnement zum Freischalten ",
         "kavita+-desc-part-2": "Premiumleistungen",
         "kavita+-desc-part-3": "heute!",
-        "kavita+-requirement": "Kavita+ ist so konzipiert, dass es nur mit der neuesten Version - 2 Versionen - funktioniert. Alles, was darüber hinausgeht, kann nicht funktionieren.",
-        "kavita+-releases": "Siehe Veröffentlichungen",
-        "help-label": "{{common.help}}"
+        "kavita+-requirement": "Kavita+ ist nur für die neuesten 3 Versionen ausgelegt. Alles, was darüber hinausgeht, funktioniert möglicherweise nicht.",
+        "help-label": "{{common.help}}",
+        "k+-license-overwrite": "Die Lizenz ist auf einer anderen Kavita-Instanz registriert. Dies kann bei einer Neuinstallation und selten aufgrund von Systemaktualisierungen passieren. Wählen Sie „Überschreiben“, um diese Instanz zu zwingen, sich bei Kavita+ zu registrieren.",
+        "delete-tooltip": "Dadurch wird Kavita die Lizenz entzogen, um Kavita daran zu hindern, mit Kavita+ zu sprechen. Sie werden dadurch nicht abgemeldet. Verwenden Sie zuerst „Verwalten“, um das Abonnement zu kündigen.",
+        "info-title": "Lizenz-Informationen",
+        "actions-title": "Aktionen",
+        "license-active-label": "Lizenz Aktiv",
+        "supported-version-label": "Auf unterstützte Kavita-Version",
+        "expiration-label": "Gültigkeitsdauer",
+        "valid-tooltip": "Gültig",
+        "invalid-tooltip": "Ungültig",
+        "reset-label": "Zurücksetzen",
+        "reset-tooltip": "Dadurch wird die Serverinstanz zurückgesetzt, an welche die Kavita+-Lizenz gebunden ist. E-Mail-Adresse und Lizenzschlüssel erforderlich",
+        "delete-label": "Lizenz entfernen",
+        "manage-tooltip": "Zahlungsinformationen aktualisieren, Abonnement kündigen/pausieren usw",
+        "faq-title": "FAQ",
+        "total-subbed-months-label": "Gesamtmonate abonniert",
+        "email-label": "Registrierte E-Mail",
+        "license-mismatch": "Die Lizenz kann auf eine andere Kavita-Instanz registriert werden. Zur Behebung erneut registrieren.",
+        "k+-already-registered-header": "Lizenz bereits registriert",
+        "overwrite": "Überschreiben",
+        "k+-unlocked": "Kavita+ freigeschaltet!",
+        "k+-unlocked-description": "Willkommen bei Kavita+! Kavita generiert Scrobbler-Ereignisse aus Ihren Fortschritten, Bewertungen und Lesewünschen, sobald Sie Ihre Scrobbler-Anbieter unter Ihrem Konto registriert haben. Nehmen Sie sich etwas Zeit, um sicherzustellen, dass Sie Scrobbler-Holds für alle Serien setzen, die Sie nicht scrobbeln möchten."
     },
     "book-line-overlay": {
         "copy": "Kopieren",
@@ -651,7 +631,10 @@
         "incognito-mode-label": "Unsichtbarkeits Modus",
         "next": "Nächste",
         "previous": "Vorherige",
-        "go-to-page-prompt": "Es gibt {{totalPages}} Seiten. Auf welche Seite möchten sie gehen?"
+        "go-to-page-prompt": "Es gibt {{totalPages}} Seiten. Auf welche Seite möchten sie gehen?",
+        "go-to-first-page": "Zur ersten Seite gehen",
+        "go-to-section": "Zum Abschnitt gehen",
+        "go-to-section-prompt": "Es gibt {{totalSections}} Abschnitte. Zu welchem Abschnitt möchten Sie springen?"
     },
     "personal-table-of-contents": {
         "no-data": "Noch nichts mit Lesezeichen versehen",
@@ -699,7 +682,7 @@
     "series-detail": {
         "page-settings-title": "Seiteneinstellungen",
         "close": "{{common.close}}",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
         "layout-mode-option-card": "Karte",
         "layout-mode-option-list": "Liste",
         "continue-from": "Fortsetzen: {{title}}",
@@ -725,8 +708,6 @@
         "no-pages": "{{toasts.no-pages}}",
         "no-chapters": "Zu diesem Band gibt es keine Kapitel. Kann nicht gelesen werden.",
         "cover-change": "Es kann bis zu einer Minute dauern, bis Ihr Browser das Bild aktualisiert hat. Bis dahin kann auf einigen Seiten noch das alte Bild angezeigt werden.",
-        "user-reviews-local": "Lokale Bewertungen",
-        "user-reviews-plus": "Externe Bewertungen",
         "writers-title": "{{metadata-fields.writers-title}}",
         "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
         "characters-title": "{{metadata-fields.characters-title}}",
@@ -752,9 +733,11 @@
         "more-alt": "Mehr",
         "time-left-alt": "Verbleibende Zeit",
         "time-to-read-alt": "{{sort-field-pipe.time-to-read}}",
-        "scrobbling-tooltip": "{{settings.scrobbling}}",
+        "scrobbling-tooltip": "{{settings.scrobbling}}: {{value}}",
         "publication-status-title": "Publikation",
-        "publication-status-tooltip": "Status der Publikation"
+        "publication-status-tooltip": "Status der Publikation",
+        "on": "{{reader-settings.on}}",
+        "off": "{{reader-settings.off}}"
     },
     "metadata-fields": {
         "collections-title": "{{side-nav.collections}}",
@@ -821,7 +804,9 @@
         "back": "Zurück",
         "more": "Mehr",
         "customize": "{{settings.customize}}",
-        "browse-authors": "Autoren durchsuchen"
+        "edit": "{{common.edit}}",
+        "cancel-edit": "Schließen Neu ordnen",
+        "browse-people": "Personen suchen"
     },
     "library-settings-modal": {
         "close": "{{common.close}}",
@@ -838,7 +823,7 @@
         "type-label": "Typ",
         "type-tooltip": "Der Bibliothekstyp bestimmt, wie die Dateinamen geparst werden und ob die Benutzeroberfläche Kapitel (Manga) oder Ausgaben (Comics) anzeigt. Im Wiki finden Sie weitere Details zu den Unterschieden zwischen den Bibliothekstypen.",
         "kavitaplus-eligible-label": "Kavita+ Förderfähig",
-        "kavitaplus-eligible-tooltip": "Wird Kavita+ Informationen abrufen oder Scrobbling unterstützen",
+        "kavitaplus-eligible-tooltip": "Unterstützt Kavita+-Metadatenfunktionen oder Scrobbeln",
         "folder-description": "Ordner zur Bibliothek hinzufügen",
         "browse": "Nach Medienordnern suchen",
         "help-us-part-1": "Helfen Sie uns, indem Sie folgen ",
@@ -872,7 +857,11 @@
         "file-type-group-tooltip": "Nach welchen Arten von Dateien soll Kavita suchen. Zum Beispiel schließt Archiv alle cb*-, zip-, rar- usw. Dateien ein.",
         "exclude-patterns-label": "Ausschließen von Mustern",
         "exclude-patterns-tooltip": "Konfigurieren Sie eine Reihe von Mustern (Glob-Syntax), die Kavita beim Scannen von Verzeichnissen abgleichen und von den Ergebnissen des Scanners ausschließen soll.",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "allow-metadata-matching-tooltip": "Sollte Kavita Metadaten für Serien in dieser Bibliothek herunterladen. Dies geschieht nur, wenn der Server über ein aktives Kavita+-Abonnement verfügt.",
+        "allow-metadata-matching-label": "Erlaube Metadatenabgleich",
+        "enable-metadata-label": "Metadaten aktivieren (ComicInfo/Epub/PDF)",
+        "enable-metadata-tooltip": "Erlauben Sie Kavita, Metadaten-Dateien zu lesen, die Dateinamenanalyse überschreiben."
     },
     "file-type-group-pipe": {
         "archive": "Archive",
@@ -882,30 +871,28 @@
     },
     "reader-settings": {
         "general-settings-title": "Allgemeine Einstellungen",
-        "font-family-label": "{{user-preferences.font-family-label}}",
-        "font-size-label": "{{user-preferences.font-size-book-label}}",
-        "line-spacing-label": "{{user-preferences.line-height-book-label}}",
-        "margin-label": "{{user-preferences.margin-book-label}}",
+        "line-spacing-label": "{{manage-reading-profiles.line-height-book-label}}",
+        "margin-label": "{{manage-reading-profiles.margin-book-label}}",
         "reset-to-defaults": "Auf Standardwerte zurücksetzen",
         "reader-settings-title": "Reader-Einstellungen",
-        "reading-direction-label": "{{user-preferences.reading-direction-book-label}}",
+        "reading-direction-label": "{{manage-reading-profiles.reading-direction-book-label}}",
         "right-to-left": "Von rechts nach links",
         "left-to-right": "Von links nach rechts",
         "horizontal": "Horizontal",
         "vertical": "Vertikal",
-        "writing-style-label": "{{user-preferences.writing-style-label}}",
+        "writing-style-label": "{{manage-reading-profiles.writing-style-label}}",
         "writing-style-tooltip": "Ändert die Richtung des Textes. Horizontal ist von links nach rechts, vertikal von oben nach unten.",
         "tap-to-paginate-label": "Paginierung antippen",
         "tap-to-paginate-tooltip": "Klicken Sie auf die Ränder des Bildschirms, um zu paginieren",
         "on": "An",
         "off": "Aus",
-        "immersive-mode-label": "{{user-preferences.immersive-mode-label}}",
+        "immersive-mode-label": "{{manage-reading-profiles.immersive-mode-label}}",
         "immersive-mode-tooltip": "Dadurch wird das Menü nach einem Klick auf das Reader-Dokument ausgeblendet und das Tippen zum Paginieren eingeschaltet",
         "fullscreen-label": "Vollbild",
         "fullscreen-tooltip": "Reader in den Vollbildmodus versetzen",
         "exit": "Beenden",
         "enter": "Enter",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
         "layout-mode-tooltip": "Blättern: Spiegelt die epub-Datei (in der Regel eine lange Bildlaufseite pro Kapitel).
          1 Spalte: Erzeugt jeweils eine einzelne virtuelle Seite.
          2 Spalten: Erstellt zwei virtuelle Seiten gleichzeitig, die nebeneinander angeordnet sind.",
         "layout-mode-option-scroll": "Scrollen",
         "layout-mode-option-1col": "1 Reihe",
@@ -914,7 +901,15 @@
         "theme-dark": "Dunkel",
         "theme-black": "Schwarz",
         "theme-white": "Weiß",
-        "theme-paper": "Papier"
+        "theme-paper": "Papier",
+        "line-spacing-max-label": "2.5x",
+        "create-new-tooltip": "Erstellen Sie aus Ihrem aktuellen impliziten Profil ein neues verwaltbares Profil",
+        "update-parent": "Unter {{name}} speichern",
+        "loading": "laden",
+        "create-new": "Neues Profil von impliziert",
+        "reading-profile-updated": "Leseprofil aktualisiert",
+        "reading-profile-promoted": "Leseprofil beworben",
+        "line-spacing-min-label": "1x"
     },
     "table-of-contents": {
         "no-data": "Dieses Buch hat kein Inhaltsverzeichnis in den Metadaten oder eine toc-Datei"
@@ -938,7 +933,8 @@
     },
     "card-detail-layout": {
         "total-items": "{{count}} Artikel insgesamt",
-        "jumpkey-count": "{{count}} Serien"
+        "jumpkey-count": "{{count}} Serien",
+        "no-data": "{{common.no-data}}"
     },
     "card-item": {
         "cannot-read": "Nicht lesbar"
@@ -964,12 +960,14 @@
         "language-title": "{{edit-chapter-modal.language-label}}",
         "format-title": "{{metadata-filter.format-label}}",
         "release-title": "{{sort-field-pipe.release-year}}",
-        "length-title": "{{edit-chapter-modal.words-label}}"
+        "length-title": "{{edit-chapter-modal.words-label}}",
+        "age-rating-title": "{{metadata-fields.age-rating-title}}"
     },
     "related-tab": {
         "reading-lists-title": "{{reading-lists.title}}",
         "collections-title": "{{side-nav.collections}}",
-        "relations-title": "{{tabs.related-tab}}"
+        "relations-title": "{{tabs.related-tab}}",
+        "bookmarks-title": "{{side-nav.bookmarks}}"
     },
     "cover-image-chooser": {
         "enter-an-url-pre-title": "Geben Sie eine {{url}}",
@@ -1028,7 +1026,7 @@
         "file-header": "Datei",
         "comment-header": "Kommentar",
         "created-header": "Erstellt",
-        "no-data": "Keine Daten"
+        "no-data": "{{common.no-data}}"
     },
     "manage-email-settings": {
         "description": "Um einige Funktionen von Kavita zu nutzen, wie z.B. An Gerät senden, muss ein E-Mail-Anbieter eingerichtet werden. Andere Funktionen, wie z.B. Passwort vergessen, erfordern einen Administrator-Eingriff ohne E-Mail-Einrichtung.",
@@ -1041,7 +1039,7 @@
         "reset": "{{common.reset}}",
         "test": "Test",
         "host-name-label": "Name des Hosts",
-        "host-name-tooltip": "Domänenname (des Reverse Proxy). Erforderlich für die E-Mail-Funktionalität. Wenn kein Reverse Proxy, verwenden Sie eine beliebige Url.",
+        "host-name-tooltip": "Der Domainname deines Reverse-Proxys, der für die E-Mail-Funktionalität erforderlich ist. Wenn du keinen Reverse-Proxy verwendest, kannst du eine beliebige URL verwenden, einschließlich http://externalip:port/",
         "host-name-validation": "Der Hostname muss mit http(s) beginnen und darf nicht mit einem / enden",
         "sender-address-label": "Absender Adresse",
         "sender-address-tooltip": "Dies ist die E-Mail-Adresse, die der Empfänger sieht, wenn er die E-Mail erhält. Normalerweise ist dies die mit dem Konto verbundene E-Mail-Adresse.",
@@ -1153,7 +1151,7 @@
         "log-tooltip": "Die Anzahl der zu erhaltenden Protokolle. Standardwert ist 30, Minimum ist 1, Maximum ist 30.",
         "logging-level-label": "Stufe der Protokollierung",
         "logging-level-tooltip": "Verwenden Sie Debug, um Probleme zu identifizieren. Die Fehlersuche kann viel Speicherplatz beanspruchen.",
-        "cache-size-label": "Cache Size",
+        "cache-size-label": "Cache Größe",
         "cache-size-tooltip": "Die Menge an Speicher, die für die Zwischenspeicherung schwerer APIs erlaubt ist. Der Standardwert ist 75 MB.",
         "on-deck-last-progress-label": "An Deck Letzter Fortschritt (Tage)",
         "on-deck-last-progress-tooltip": "Die Anzahl der Tage, die seit dem letzten Fortschritt vergangen sind, bevor etwas von On Deck gestartet wurde.",
@@ -1230,7 +1228,7 @@
         "convert-media-task": "Medien in Zielkodierung konvertieren",
         "convert-media-task-desc": "Führt eine langwierige Aufgabe aus, die alle von Kavita verwalteten Medien in die Zielkodierung konvertiert. Dies ist langsam (besonders auf ARM-Geräten).",
         "convert-media-task-success": "Die Konvertierung von Medien in die Zielkodierung wurde in die Warteschlange gestellt",
-        "bust-cache-task": "Bust Cache",
+        "bust-cache-task": "Leere Cache",
         "bust-cache-task-desc": "Löst den Kavita+ Cache auf - sollte nur zur Fehlersuche bei schlechten Treffern verwendet werden.",
         "bust-cache-task-success": "Kavita+ Cache geleert",
         "bust-locale-task": "Locale-Cache löschen",
@@ -1247,9 +1245,6 @@
         "backup-database-task-success": "Ein Auftrag zur Sicherung der Datenbank wurde in die Warteschlange gestellt",
         "download-logs-task": "Logs herunterladen",
         "download-logs-task-desc": "Kompiliert alle Protokolldateien in eine Zip-Datei und lädt sie herunter.",
-        "analyze-files-task": "Dateien analysieren",
-        "analyze-files-task-desc": "Führt eine langlaufende Aufgabe aus, die Dateien analysiert, um die Erweiterung und Größe zu ermitteln. Dies sollte nur einmal für die Version v0.7 ausgeführt werden. Nicht erforderlich, wenn Sie nach v0.7 installiert haben.",
-        "analyze-files-task-success": "Die Dateianalyse wurde in die Warteschlange gestellt",
         "sync-themes-task": "Themen synchronisieren",
         "sync-themes-task-desc": "Heruntergeladene Designs mit Änderungen vom Upstream synchronisieren, wenn die Version übereinstimmt.",
         "sync-themes-success": "Die Synchronisierung der Themen wurde in die Warteschlange gestellt",
@@ -1277,7 +1272,6 @@
         "change-password-alt": "Passwort ändern {{user}}",
         "resend": "Erneut senden",
         "setup": "Einrichten",
-        "admin": "Admin",
         "last-active-header": "Zuletzt aktiv",
         "roles-header": "Rollen",
         "name-header": "Name",
@@ -1289,7 +1283,8 @@
         "no-data": "Es gibt keine anderen Benutzer.",
         "loading": "{{common.loading}}",
         "actions-header": "Aktionen",
-        "pending-tooltip": "Dieser Benutzer hat seine E-Mail nicht bestätigt"
+        "pending-tooltip": "Dieser Benutzer hat seine E-Mail nicht bestätigt",
+        "all-libraries": "Alle Bibliotheken"
     },
     "edit-collection-tags": {
         "title": "Sammlung {{collectionName}} bearbeiten",
@@ -1329,7 +1324,7 @@
         "server-section-title": "Server",
         "info-section-title": "Info",
         "import-section-title": "Importieren",
-        "kavitaplus-section-title": "{{settings.admin-kavitaplus}}",
+        "kavitaplus-section-title": "Kavita+",
         "admin-general": "Allgemein",
         "admin-users": "Benutzer",
         "admin-libraries": "Bibliotheken",
@@ -1340,7 +1335,7 @@
         "admin-tasks": "Aufgaben",
         "admin-statistics": "Statistik",
         "admin-system": "System",
-        "admin-kavitaplus": "Kavita+",
+        "admin-kavitaplus": "Lizenz",
         "account": "Konto",
         "preferences": "Präferenzen",
         "clients": "API Key / OPDS",
@@ -1350,7 +1345,13 @@
         "theme": "Schema",
         "customize": "Anpassen",
         "cbl-import": "CBL-Leseliste",
-        "mal-stack-import": "MAL Stack"
+        "mal-stack-import": "MAL Stack",
+        "admin-email-history": "E-Mail-Verlauf",
+        "admin-matched-metadata": "Passende Metadaten",
+        "admin-manage-tokens": "Verwalte Benutzertoken",
+        "scrobble-holds": "Scrobble-Holds",
+        "admin-metadata": "Verwalte Metadaten",
+        "reading-profiles": "Leseprofile"
     },
     "collection-detail": {
         "no-data": "Es sind keine Artikel vorhanden. Versuchen Sie, eine Serie hinzuzufügen.",
@@ -1387,7 +1388,8 @@
     },
     "reading-list-item": {
         "remove": "{{common.remove}}",
-        "read": "{{common.read}}"
+        "read": "{{common.read}}",
+        "released-label": "Veröffentlicht: {{date}}"
     },
     "stream-list-item": {
         "remove": "{{common.remove}}",
@@ -1395,7 +1397,8 @@
         "provided": "Bereitgestellt",
         "smart-filter": "Smart Filter",
         "library": "Bibliothek",
-        "external-source": "Externe Quelle"
+        "external-source": "Externe Quelle",
+        "delete": "{{common.delete}}"
     },
     "reading-list-detail": {
         "item-count": "{{common.item-count}}",
@@ -1405,9 +1408,21 @@
         "continue": "Weiter",
         "read": "{{common.read}}",
         "read-options-alt": "Lese Optionen",
-        "incognito-alt": "(Incognito)",
+        "incognito-alt": "(Inkognito)",
         "no-data": "Nichts hinzugefügt",
-        "characters-title": "{{metadata-fields.characters-title}}"
+        "characters-title": "{{metadata-fields.characters-title}}",
+        "edit-label": "Editiermodus",
+        "reorder-alt": "Artikel neu bestellen",
+        "dnd-warning": "Drag & Drop ist auf Mobilgeräten oder bei einer Leseliste mit mehr als 100 Einträgen nicht verfügbar.",
+        "writers-title": "{{metadata-fields.writers-title}}",
+        "details-tab": "{{series-detail.details-tab}}",
+        "publishers-title": "{{metadata-fields.publishers-title}}",
+        "items-title": "Artikel",
+        "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
+        "storyline-tab": "{{series-detail.storyline-tab}}",
+        "more-alt": "{{series-detail.more-alt}}",
+        "date-range-title": "Datumsbereich",
+        "edit-alt": "{{common.edit}}"
     },
     "events-widget": {
         "title-alt": "Aktivität",
@@ -1460,7 +1475,10 @@
         "logout": "Abmelden",
         "all-filters": "Intelligente Filter",
         "nav-link-header": "Navigation Optionen",
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "person-aka-status": "Entspricht einem Alias",
+        "browse-genres": "Genres durchsuchen",
+        "browse-tags": "Tags durchsuchen"
     },
     "promoted-icon": {
         "promoted": "{{common.promoted}}"
@@ -1535,7 +1553,7 @@
         "dry-run-step": "Leerlauf",
         "final-import-step": "Letzter Schritt",
         "comicvine-parsing-label": "Comic Vine Series passend verwenden",
-        "cbl-repo": "Viele Leselisten finden Sie in der Community repo.",
+        "cbl-repo": "Du findest viele Leselisten im Repository der Community.",
         "help-label": "{{common.help}}"
     },
     "pdf-reader": {
@@ -1571,7 +1589,6 @@
     },
     "manga-reader": {
         "back": "Zurück",
-        "save-globally": "Global speichern",
         "incognito-alt": "Der Inkognito-Modus ist eingeschaltet. Zum Ausschalten schalten Sie um.",
         "incognito-title": "Inkognito-Modus:",
         "shortcuts-menu-alt": "Tastaturkurzbefehle Modal",
@@ -1593,9 +1610,7 @@
         "height": "Höhe",
         "width": "Breite",
         "width-override-label": "Breite Override",
-        "off": "Aus",
         "original": "Original",
-        "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}",
         "swipe-enabled-label": "Swipe aktiviert",
         "enable-comic-book-label": "Comicbuch nachahmen",
         "brightness-label": "Helligkeit",
@@ -1606,9 +1621,9 @@
         "layout-mode-switched": "Layoutmodus auf Einfach umgestellt, da nicht genügend Platz zum Rendern des Doppellayouts vorhanden ist",
         "no-next-chapter": "Kein nächstes Kapitel",
         "no-prev-chapter": "Kein vorheriges Kapitel",
-        "user-preferences-updated": "Benutzereinstellungen aktualisiert",
-        "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}",
-        "series-progress": "Fortschritt der Serie: {{percentage}}"
+        "series-progress": "Fortschritt der Serie: {{percentage}}",
+        "reading-profile-updated": "Leseprofil aktualisiert",
+        "reading-profile-promoted": "Leseprofil beworben"
     },
     "metadata-filter": {
         "filter-title": "{{common.filter}}",
@@ -1665,7 +1680,10 @@
         "release-year": "Jahr der Veröffentlichung",
         "read-progress": "Zuletzt gelesen",
         "average-rating": "Durchschnittliche Bewertung",
-        "random": "Zufällig"
+        "random": "Zufällig",
+        "person-series-count": "Anzahl der Serien",
+        "person-name": "Name",
+        "person-chapter-count": "Anzahl der Kapitel"
     },
     "edit-series-modal": {
         "title": "{{seriesName}} Einzelheiten",
@@ -1745,8 +1763,8 @@
         "title": "bearbeiten",
         "close": "{{common.close}}",
         "save": "{{common.save}}",
-        "title-label": "Title",
-        "sort-order-label": "Sort Order",
+        "title-label": "Titel",
+        "sort-order-label": "Sortierreihenfolge",
         "sort-order-tooltip": "Die Lesereihenfolge, in der dieses Kapitel im Band angeordnet ist",
         "isbn-label": "ISBN",
         "release-date-label": "Veröffentlichung",
@@ -1802,8 +1820,6 @@
         "cover-image-tab": "{{tabs.cover-tab}}",
         "tasks-tab": "{{tabs.tasks-tab}}",
         "info-tab": "{{tabs.info-tab}}",
-        "pages-label": "{{edit-chapter-modal.pages-count}}",
-        "words-label": "{{edit-chapter-modal.length-title}}",
         "pages-count": "{{edit-chapter-modal.pages-count}}",
         "words-count": "{{edit-chapter-modal.words-count}}",
         "reading-time-label": "{{edit-chapter-modal.reading-time-label}}",
@@ -1826,10 +1842,10 @@
     "kavitaplus-metadata-breakdown-stats": {
         "title": "Kavita+ Metadaten Aufschlüsselung",
         "description": "Kavita holt die Metadaten (Bewertungen, Rezensionen, Empfehlungen usw.) für die in Frage kommenden Serien nach und nach ab.",
-        "no-data": "Keine Daten",
         "errored-series-label": "Fehlerhafte Serien",
         "completed-series-label": "Abgeschlossene Serie",
-        "complete": "Alle Serien haben Metadaten"
+        "complete": "Alle Serien haben Metadaten",
+        "no-data": "{{common.no-data}}"
     },
     "file-breakdown-stats": {
         "format-title": "Format",
@@ -1875,7 +1891,7 @@
         "count-header": "Zähler"
     },
     "series-preview-drawer": {
-        "staff-label": "Staff",
+        "staff-label": "Team",
         "tags-label": "{{filter-field-pipe.tags}}",
         "genres-label": "{{filter-field-pipe.genres}}",
         "view-series": "Serie ansehen",
@@ -1951,17 +1967,19 @@
         "title-smart-filters": "Intelligente Filter",
         "close": "{{common.close}}",
         "dashboard": "Dashboard",
-        "sidenav": "Side Nav",
+        "sidenav": "Seitennavigation",
         "external-sources": "Externe Quellen",
         "smart-filters": "Intelligente Filter",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "description": "Du kannst verschiedene Aspekte von Kavita anpassen, indem du neu anordnest, die Sichtbarkeit umschaltest und intelligente Filter/externe Quellen mit deiner Startseite oder der Seitennavigation verknüpfst."
     },
     "customize-dashboard-streams": {
         "no-data": "Alle Smartfilter zum Dashboard hinzugefügt oder noch keine erstellt.",
         "save": "{{common.save}}",
         "add": "{{common.add}}",
         "filter": "{{common.filter}}",
-        "clear": "{{common.clear}}"
+        "clear": "{{common.clear}}",
+        "smart-filter-title": "{{customize-dashboard-modal.title-smart-filters}}"
     },
     "customize-sidenav-streams": {
         "no-data": "Alle Smart-Filter zur Seitennavigation hinzugefügt oder noch keine erstellt.",
@@ -1972,7 +1990,7 @@
         "clear": "{{common.clear}}",
         "smart-filters-title": "Smart Filter",
         "external-sources-title": "{{customize-dashboard-modal.external-sources}}",
-        "reorder-when-filter-present": "You cannot reorder items via drag & drop while a filter is present. Use {{customize-sidenav-streams.order-numbers-label}}",
+        "reorder-when-filter-present": "Sie können keine Artikel per Drag & Drop neu anordnen, solange ein Filter vorhanden ist. Verwenden Sie {{customize-sidenav-streams.order-numbers-label}}",
         "order-numbers-label": "{{reading-list-detail.order-numbers-label}}",
         "bulk-mode-label": "Bulk-Modus"
     },
@@ -1982,14 +2000,22 @@
         "description": "Erweitern Sie Ihre Erfahrung, indem Sie externe Server hinzufügen und sie bequem in Ihre Seitennavigation einbinden, um schnellen Zugriff auf Ihren Server und den Server Ihrer Freunde zu erhalten.",
         "clear": "{{common.clear}}",
         "filter": "{{common.filter}}",
-        "no-data": "No External Sources exist"
+        "no-data": "Es sind keine externen Quellen vorhanden"
     },
     "manage-smart-filters": {
         "delete": "{{common.delete}}",
         "no-data": "Keine Smart-Filter erstellt",
         "filter": "{{common.filter}}",
         "clear": "{{common.clear}}",
-        "errored": "Es liegt ein Kodierungsfehler im Filter vor. Sie müssen ihn neu erstellen."
+        "errored": "Es liegt ein Kodierungsfehler im Filter vor. Sie müssen ihn neu erstellen.",
+        "name-label": "Name",
+        "required-field": "Intelligente Filter brauchen einen Namen",
+        "cancel": "{{common.cancel}}",
+        "close": "{{common.close}}",
+        "edit": "{{common.edit}}",
+        "save": "{{common.save}}",
+        "edit-smart-filter": "Bearbeite {{name}}",
+        "filter-name-unique": "Die Namen der intelligenten Filter müssen eindeutig sein"
     },
     "edit-external-source-item": {
         "not-unique": "Für diesen Host existiert eine externe Quelle. Stellen Sie sicher, dass Sie keine Duplikate haben",
@@ -2013,8 +2039,7 @@
         "collections": "{{side-nav.collections}}",
         "reading-lists": "{{side-nav.reading-lists}}",
         "bookmarks": "{{side-nav.bookmarks}}",
-        "all-series": "{{side-nav.all-series}}",
-        "browse-authors": "{{side-nav.browse-authors}}"
+        "all-series": "{{side-nav.all-series}}"
     },
     "filter-field-pipe": {
         "age-rating": "{{metadata-fields.age-rating-title}}",
@@ -2054,7 +2079,7 @@
     "filter-comparison-pipe": {
         "begins-with": "Beginnt mit",
         "contains": "Enthält",
-        "equal": "Gleichberechtigt",
+        "equal": "Ist gleich",
         "greater-than": "Größer als",
         "greater-than-or-equal": "Größer als oder gleich",
         "less-than": "Weniger als",
@@ -2077,7 +2102,7 @@
         "scan-queued": "Scan in der Warteschlange für {{name}}",
         "server-settings-updated": "Servereinstellungen aktualisiert",
         "reset-ip-address": "IP-Adressen zurücksetzen",
-        "reset-base-url": "Base Url Reset",
+        "reset-base-url": "Zurücksetzen der Basis-URL",
         "unauthorized-1": "Sie sind nicht berechtigt, diese Seite zu sehen.",
         "unauthorized-2": "Unbefugte",
         "no-updates": "Keine Updates verfügbar",
@@ -2120,9 +2145,8 @@
         "email-sent": "E-Mail gesendet an {{email}}",
         "email-not-sent": "Die gespeicherte E-Mail ist keine gültige E-Mail und kann nicht gesendet werden. Ein Link wurde in den Protokollen gelöscht. Der Administrator kann diesen Link bereitstellen, um den Vorgang abzuschließen.",
         "k+-license-saved": "Lizenzschlüssel gespeichert, aber er ist nicht gültig. Klicken Sie auf Prüfen, um das Abonnement erneut zu validieren. Die Erstregistrierung kann eine Minute dauern, bis sie übertragen wird.",
-        "k+-unlocked": "Kavita+ freigeschaltet!",
         "k+-error": "Beim Aktivieren Ihrer Lizenz ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.",
-        "k+-delete-key": "Dadurch wird nur der Lizenzschlüssel von Kavita gelöscht und ein Kauflink angezeigt. Ihr Abonnement wird dadurch nicht gelöscht! Verwenden Sie dies nur auf Anweisung des Supports!",
+        "k+-delete-key": "Dadurch wird nur Kavitas Lizenzschlüssel gelöscht und ein Link zum Kauf wird angezeigt. Dein Abonnement wird dadurch nicht gekündigt! Verwende zuerst „Verwalten“, um dein Abonnement zu kündigen.",
         "k+-reset-key": "Dadurch wird eine frühere Registrierung mit Ihrer Lizenz ungültig und Sie können eine Kavita-Instanz neu registrieren.",
         "k+-reset-key-success": "Ihre Lizenz wurde abgemeldet. Verwenden Sie die Schaltfläche Bearbeiten, um Ihre Instanz erneut zu registrieren und Kavita+ zu aktivieren",
         "library-deleted": "Bibliothek {{name}} wurde entfernt",
@@ -2185,7 +2209,16 @@
         "bulk-scan": "Das Scannen mehrerer Bibliotheken wird linear durchgeführt. Je nach Größe der Bibliothek kann dies sehr lange dauern und nicht vollständig sein.",
         "bulk-covers": "Das Aktualisieren von Titelseiten in mehreren Bibliotheken ist intensiv und kann lange dauern. Bist du sicher, dass du fortfahren willst?",
         "person-image-downloaded": "Personen Cover wurde heruntergeladen und angewendet.",
-        "confirm-delete-multiple-chapters": "Sind Sie sicher, dass Sie {{count}} Kapitel/Bände löschen möchten? Die Dateien auf der Festplatte werden dadurch nicht verändert."
+        "confirm-delete-multiple-chapters": "Sind Sie sicher, dass Sie {{count}} Kapitel/Bände löschen möchten? Die Dateien auf der Festplatte werden dadurch nicht verändert.",
+        "bulk-delete-libraries": "Möchten Sie wirklich {{count}} Bibliotheken löschen?",
+        "match-success": "Reihenfolge korrekt zugeordnet",
+        "webtoon-override": "Wechsel in den Webtoon-Modus, da die Bilder einen Webtoon darstellen.",
+        "scrobble-gen-init": "Hat einen Auftrag in die Warteschlange gestellt, um Scrobble-Ereignisse aus dem bisherigen Leseverlauf und Bewertungen zu generieren und diese mit verbundenen Diensten zu synchronisieren.",
+        "confirm-delete-multiple-volumes": "Sind sie sicher, dass Sie {{count}} Bände löschen wollen? Die Dateien auf der Festplatte werden dadurch nicht verändert.",
+        "series-bound-to-reading-profile": "Serie gebunden an Leseprofil {{name}}",
+        "library-bound-to-reading-profile": "Bibliothek, verknüpft mit Leseprofil {{name}}",
+        "series-added-want-to-read": "Serie aus der Liste „Möchte lesen“ hinzugefügt",
+        "external-match-rate-error": "Die Rate für die Suche nach {{seriesName}} ist abgelaufen. Versuch's in 5 Minuten nochmal."
     },
     "read-time-pipe": {
         "less-than-hour": "<1 Stunde",
@@ -2255,7 +2288,19 @@
         "multiple-selections": "Mehrere Selektionen",
         "back-to": "Zurück zu {{action}}",
         "title": "Aktionen",
-        "copy-settings": "Einstellungen kopieren von"
+        "copy-settings": "Einstellungen kopieren von",
+        "match": "Treffer",
+        "match-tooltip": "Spielserie mit Kavita+ manuell abgleichen",
+        "reorder": "Nachbestellung",
+        "rename": "Umbenennen",
+        "rename-tooltip": "Smart Filter umbenennen",
+        "reading-profiles": "Leseprofile",
+        "set-reading-profile": "Leseprofil festlegen",
+        "set-reading-profile-tooltip": "Ein Leseprofil mit dieser Bibliothek verknüpfen",
+        "clear-reading-profile": "Leseprofil löschen",
+        "clear-reading-profile-tooltip": "Leseprofil für diese Bibliothek löschen",
+        "cleared-profile": "Lese-Profil gelöscht",
+        "merge": "Zusammenführen"
     },
     "preferences": {
         "left-to-right": "Links nach rechts",
@@ -2372,23 +2417,28 @@
         "issue-nums": "Ausgaben",
         "chapter-nums": "Kapitel",
         "volume-nums": "Bände",
-        "author-count": "{{num}} Autoren"
+        "author-count": "{{num}} Autoren",
+        "no-data": "Keine Daten",
+        "chapter-count": "{{num}} Kapitel",
+        "issue-count": "{{num}} Probleme"
     },
     "confirm": {
         "alert": "Alarm",
-        "confirm": "Bestätigen"
+        "confirm": "Bestätigen",
+        "info": "Info",
+        "ok": "Ok",
+        "cancel": "{{common.cancel}}",
+        "prompt": "Frage"
     },
     "person-detail": {
         "all-roles": "Funktionen",
         "known-for-title": "Bekannt für",
         "individual-role-title": "Als eine {{role}}",
         "browse-person-title": "Alle Werke von {{name}}",
-        "browse-person-by-role-title": "Alle Werke von {{name}} als {{role}}"
-    },
-    "browse-authors": {
-        "author-count": "{{num}} Personen",
-        "title": "Autoren & Schriftsteller durchsuchen",
-        "cover-image-description": "{{edit-series-modal.cover-image-description}}"
+        "browse-person-by-role-title": "Alle Werke von {{name}} als {{role}}",
+        "anilist-url": "{{edit-person-modal.anilist-tooltip}}",
+        "aka-title": "Auch bekannt als ",
+        "no-info": "Keine Informationen zu dieser Person"
     },
     "edit-person-modal": {
         "title": "Details zu {{personName}}",
@@ -2411,6 +2461,318 @@
         "name-label": "{{edit-series-modal.name-label}}",
         "required-field": "{{validations.required-field}}",
         "cover-image-description": "{{edit-series-modal.cover-image-description}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "aliases-tooltip": "Wenn eine Serie mit einem Alias einer Person versehen ist, wird diese Person zugewiesen, anstatt eine neue Person anzulegen. Wenn Sie einen Alias löschen, müssen Sie die Serie erneut scannen, damit die Änderung übernommen wird.",
+        "aliases-tab": "Aliases",
+        "aliases-label": "Aliase bearbeiten",
+        "alias-overlap": "Dieser Alias verweist bereits auf eine andere Person oder ist der Name dieser Person. Bitte erwäge, sie zusammenzuführen."
+    },
+    "changelog-update-item": {
+        "download": "Download",
+        "added": "Hinzugefügt",
+        "changed": "Geändert",
+        "fixed": "Repariert",
+        "developer": "Entwickler",
+        "theme": "Theme",
+        "removed": "Entfernt",
+        "api": "API",
+        "published-label": "Veröffentlicht: ",
+        "feature-requests": "Feature-Anfragen",
+        "installed": "{{changelog.installed}}",
+        "known-issues": "Bekannte Probleme"
+    },
+    "match-series-result-item": {
+        "releasing": "Veröffentlichung",
+        "details": "Seite anzeigen",
+        "updating-metadata-status": "Metadaten aktualisieren",
+        "volume-count": "{{server-stats.volume-count}}",
+        "chapter-count": "{{common.chapter-count}}"
+    },
+    "match-series-modal": {
+        "description": "Wähle einen Treffer aus, um die Metadaten von Kavita+ neu zu verknüpfen und Scrobble-Ereignisse neu zu generieren. „Nicht übereinstimmend“ kann verwendet werden, um Kavita daran zu hindern, Metadaten abzugleichen und zu scrobbeln.",
+        "query-tooltip": "Geben Sie den Seriennamen und die URL von AniList/MyAnimeList/ComicBookRoundup ein. Die URLs werden direkt nachgeschlagen.",
+        "no-results": "Es wurde keine Übereinstimmung gefunden. Versuche, die URL eines unterstützten Anbieters hinzuzufügen und versuche es erneut.",
+        "query-label": "Abfrage",
+        "dont-match-label": "Keine Übereinstimmung",
+        "dont-match-tooltip": "Diese Serie von Matching und Scrobbeln ausschließen",
+        "search": "Suche",
+        "title": "Treffer {{seriesName}}",
+        "save": "{{common.save}}",
+        "close": "{{common.close}}"
+    },
+    "email-history": {
+        "description": "Hier findest du alle E-Mails, die von Kavita an welchen Benutzer gesendet wurden.",
+        "template-header": "Vorlage",
+        "date-header": "Date senden",
+        "user-header": "Gesendet an",
+        "sent-header": "Erfolgreich",
+        "sent-tooltip": "Gesendet",
+        "not-sent-tooltip": "Nicht gesendet",
+        "no-data": "{{common.no-data}}"
+    },
+    "new-version-modal": {
+        "title": "Kavita wurde aktualisiert!",
+        "description": "Eine neue Version von Kavita ist verfügbar. Aktualisieren Sie zum Update.",
+        "refresh": "Aktualisieren",
+        "developer": "{{changelog.developer}}",
+        "close": "{{common.close}}",
+        "api": "{{changelog.api}}",
+        "added": "{{changelog.added}}",
+        "changed": "{{changelog.changed}}",
+        "fixed": "{{changelog.fixed}}",
+        "theme": "{{changelog.theme}}",
+        "removed": "{{changelog.removed}}",
+        "known-issues": "{{changelog.known-issues}}"
+    },
+    "manage-matched-metadata": {
+        "title": "Passende Metadaten",
+        "description": "Alle anwendbaren Serien, die mit externen Metadaten abgeglichen werden können, befinden sich hier. Kavita ruft die Metadaten der Serien im Voraus ab oder aktualisiert sie, 50 Serien pro Tag innerhalb von 24 Stunden.",
+        "status-header": "Status",
+        "series-name-header": "Serie",
+        "valid-until-header": "Nächste Aktualisierung",
+        "matched-status-label": "Übereinstimmend",
+        "unmatched-status-label": "Nicht übereinstimmend",
+        "blacklist-status-label": "Benötigt Manuelle Übereinstimmung",
+        "all-status-label": "Alle",
+        "dont-match-label": "Nicht passend",
+        "library-name-header": "Bibliothek",
+        "actions-header": "Aktionen",
+        "match-alt": "Entspricht {{seriesName}}",
+        "dont-match-status-label": "{{dont-match-label}}",
+        "no-data": "{{common.no-data}}",
+        "matched-state-label": "Match-Status",
+        "library-type": "Bibliotheksart"
+    },
+    "manage-user-tokens": {
+        "description": "Die Token von Benutzern, die Scrobbeln verwenden, müssen gelegentlich erneuert werden. Kavita sendet ihnen automatisch eine E-Mail, wenn eine E-Mail-Adresse eingerichtet ist und sie eine gültige E-Mail-Adresse haben.",
+        "username-header": "Benutzername",
+        "anilist-header": "AniList",
+        "mal-header": "MAL",
+        "expires-label": "Läuft ab: {{date}}",
+        "token-set-label": "Token-Set",
+        "no-data": "{{common.no-data}}"
+    },
+    "manage-metadata-settings": {
+        "description": "Kavita+ kann einige begrenzte Metadaten herunterladen und in die Datenbank schreiben. Auf dieser Seite kannst du einstellen, was im Umfang enthalten ist.",
+        "enabled-label": "Metadaten-Download aktivieren",
+        "enabled-tooltip": "Erlaube Kavita, Metadaten herunterzuladen und in ihre Datenbank zu schreiben.",
+        "summary-label": "Zusammenfassung",
+        "enable-relations-tooltip": "Das Hinzufügen von Serienbeziehungen zulassen.",
+        "enable-people-tooltip": "Erlaube das Hinzufügen von Personen (Charaktere, Autoren usw.). Alle Personen enthalten Bilder.",
+        "enable-start-date-tooltip": "Erlaube, dass das Startdatum der Serie in die Serie geschrieben wird",
+        "enable-genres-label": "Genres",
+        "enable-genres-tooltip": "Erlaube das Schreiben von Serien-Genres.",
+        "enable-tags-tooltip": "Erlaube das Schreiben von Tags der Serie.",
+        "blacklist-label": "Genres/Tags auf der Blacklist",
+        "enable-tags-label": "Tags",
+        "whitelist-label": "Whitelist-Tags",
+        "field-mapping-title": "Feldzuordnung",
+        "first-last-name-label": "Vorname Nachname Namensgebung",
+        "first-last-name-tooltip": "Stelle sicher, dass die Namen der Personen zuerst mit dem Vor- und dann mit dem Nachnamen geschrieben werden",
+        "person-roles-label": "Rollen",
+        "summary-tooltip": "Erlaube das Schreiben einer Zusammenfassung, wenn das Feld entsperrt ist.",
+        "derive-publication-status-label": "Veröffentlichungsstatus",
+        "enable-relations-label": "Beziehungen",
+        "enable-people-label": "Leute",
+        "age-rating-mapping-title": "Altersfreigabe-Zuordnung",
+        "genre": "Genre",
+        "tag": "Tag",
+        "remove-source-tag-label": "Quell-Tag entfernen",
+        "add-field-mapping-label": "Füge Feldzuordnung hinzu",
+        "add-age-rating-mapping-label": "Altersfreigabe hinzufügen",
+        "blacklist-tooltip": "Alles, was in dieser Liste steht, wird sowohl aus der Genre- als auch aus der Tag-Verarbeitung entfernt. Hier kannst du Genres/Tags hinzufügen, die nicht geschrieben werden sollen. Achte darauf, dass sie durch Kommas getrennt sind.",
+        "whitelist-tooltip": "Erlaube nur, dass eine Zeichenfolge in dieser Liste für Tags geschrieben wird. Stelle sicher, dass sie durch Kommas getrennt sind.",
+        "derive-publication-status-tooltip": "Erlaube, dass der Publikationsstatus aus der Gesamtzahl der Kapitel/Bände abgeleitet wird.",
+        "age-rating-mapping-description": "Alle Links, die sich entweder in Genre oder Tags befinden, legen die Altersfreigabe für die Serie fest.",
+        "field-mapping-description": "Richtet Regeln für bestimmte Zeichenketten ein, die im Feld „Genre/Tag“ gefunden werden, und ordnet sie einer neuen Zeichenkette in „Genre/Tag“ zu und entfernt sie optional aus der Liste „Quelle“. Gilt nur, wenn das Schreiben von Genre/Tag aktiviert ist.",
+        "enable-start-date-label": "Startdatum",
+        "localized-name-label": "Lokalisierter Seriennamen",
+        "localized-name-tooltip": "Erlaube die Eingabe von lokalisierten Namen, wenn das Feld entsperrt ist. Kavita wird versuchen, die beste Schätzung vorzunehmen.",
+        "enable-cover-image-tooltip": "Erlaubt Kavita, das Titelbild für die Serie zu schreiben",
+        "enable-cover-image-label": "Cover Bild",
+        "overrides-label": "Überschreibungen",
+        "overrides-description": "Erlaube Kavita, gesperrte Felder zu überschreiben.",
+        "enable-chapter-release-date-tooltip": "Veröffentlichungsdatum des Kapitels/der Ausgabe darf angegeben werden",
+        "enable-chapter-publisher-label": "Publisher",
+        "enable-chapter-release-date-label": "Veröffentlichungsdatum",
+        "enable-chapter-title-label": "Titel",
+        "enable-chapter-title-tooltip": "Titel des Kapitels/der Ausgabe darf geschrieben werden",
+        "chapter-header": "Kapitel Felder",
+        "enable-chapter-publisher-tooltip": "Zulassen, dass der Herausgeber des Kapitels/der Ausgabe geschrieben wird",
+        "enable-chapter-cover-label": "Kapitel-Cover",
+        "enable-chapter-cover-tooltip": "Cover von Kapitel/Ausgabe festlegen"
+    },
+    "metadata-setting-field-pipe": {
+        "covers": "Covers",
+        "age-rating": "{{metadata-fields.age-rating-title}}",
+        "people": "{{tabs.people-tab}}",
+        "start-date": "{{manage-metadata-settings.enable-start-date-label}}",
+        "genres": "{{metadata-fields.genres-title}}",
+        "summary": "{{filter-field-pipe.summary}}",
+        "publication-status": "{{edit-series-modal.publication-status-title}}",
+        "tags": "{{metadata-fields.tags-title}}",
+        "localized-name": "{{edit-series-modal.localized-name-label}}",
+        "chapter-release-date": "Veröffentlichungsdatum (Kapitel)",
+        "chapter-summary": "Zusammenfassung (Kapitel)",
+        "chapter-covers": "Covers (Kapitel)",
+        "chapter-title": "Titel (Kapitel)",
+        "chapter-publisher": "{{person-role-pipe.publisher}} (Kapitel)"
+    },
+    "role-localized-pipe": {
+        "bookmark": "Lesezeichen",
+        "change-restriction": "Änderung der Beschränkung",
+        "login": "Einloggen",
+        "read-only": "Nur Lesen",
+        "admin": "Admin",
+        "promote": "Promote",
+        "download": "Download",
+        "change-password": "Passwort ändern"
+    },
+    "log-level-pipe": {
+        "debug": "Debug",
+        "trace": "Verfolgen",
+        "critical": "Kritisch",
+        "information": "Information",
+        "warning": "Warnung"
+    },
+    "reviews": {
+        "user-reviews-local": "Lokale Bewertungen",
+        "user-reviews-plus": "Externe Rezension"
+    },
+    "review-modal": {
+        "review-label": "Rezension",
+        "title": "Rezension Bearbeiten",
+        "min-length": "Die Rezension muss mindestens {{count}} Zeichen lang sein"
+    },
+    "manage-reading-profiles": {
+        "description": "Nicht alle Ihre Serien können auf dieselbe Weise gelesen werden. Richten Sie daher für jede Bibliothek oder Serie separate Leseprofile ein, damit Sie so nahtlos wie möglich zu Ihrer Serie zurückkehren können.",
+        "extra-tip": "Lese-Profile kannst du über das Aktionsmenü in Serien und Bibliotheken oder für mehrere gleichzeitig festlegen. Wenn du die Einstellungen in einem Reader änderst, wird ein verstecktes Profil erstellt, das deine Auswahl für diese Serie speichert (nicht für PDFs). Dieses Profil wird gelöscht, wenn du der Serie eines deiner eigenen Lese-Profile zuweist. Mehr Infos findest du auf der",
+        "tap-to-paginate-tooltip": "Sollten die Seiten des E-Book-Reader-Bildschirms durch Antippen umblätterbar sein vorherige/nächste Seite",
+        "show-screen-hints-tooltip": "Zeige eine Überlagerung an, um den Bereich und die Richtung der Paginierung besser zu verstehen",
+        "font-size-book-tooltip": "Prozentuale Skalierung für die Schriftart im Buch",
+        "pdf-reader-settings-title": "PDF Reader",
+        "line-height-book-label": "Zeilenabstand",
+        "layout-mode-book-tooltip": "Wie Inhalte angeordnet werden sollen. Der Bildlauf entspricht dem Aufbau des Buches. 1 oder 2 Spalten passen zur Höhe des Geräts und es passen 1 oder 2 Spalten Text pro Seite",
+        "profiles-title": "Ihre Leseprofil",
+        "default-profile": "Standard",
+        "add-tooltip": "Ihr neues Profil wird nach der Änderung gespeichert",
+        "make-default": "Als Standard festlegen",
+        "no-selected": "Kein Profil ausgewählt",
+        "confirm": "Möchten Sie das Leseprofil {{name}} wirklich löschen?",
+        "selection-tip": "Wählen Sie ein Profil aus der Liste aus oder erstellen Sie oben rechts ein neues Profil",
+        "image-reader-settings-title": "Bild Reader",
+        "reading-direction-label": "Leserichtung",
+        "reading-direction-tooltip": "Klicken Sie hier, um zur nächsten Seite zu gelangen. Von rechts nach links bedeutet, dass Sie auf die linke Seite des Bildschirms klicken, um zur nächsten Seite zu gelangen.",
+        "scaling-option-label": "Skalierungsoptionen",
+        "scaling-option-tooltip": "So skalieren Sie das Bild an Ihren Bildschirm.",
+        "page-splitting-label": "Seitenaufteilung",
+        "page-splitting-tooltip": "So teilen Sie ein Bild in voller Breite (d. h. beide Bilder, links und rechts, werden kombiniert)",
+        "reading-mode-label": "Lesemodus",
+        "reading-mode-tooltip": "Ändern Sie den Reader, um vertikal, horizontal oder unbegrenzt zu scrollen",
+        "layout-mode-label": "Layout-Modus",
+        "layout-mode-tooltip": "Ein einzelnes Bild auf dem Bildschirm oder zwei Bilder nebeneinander rendern",
+        "background-color-label": "Hintergrundfarbe",
+        "background-color-tooltip": "Hintergrundfarbe des Bildlesers",
+        "auto-close-menu-label": "Menü automatisch schließen",
+        "auto-close-menu-tooltip": "Soll das Menü automatisch schließen",
+        "show-screen-hints-label": "Bildschirmhinweise anzeigen",
+        "emulate-comic-book-label": "Comicbuch nachahmen",
+        "emulate-comic-book-tooltip": "Wendet einen Schatteneffekt an, um das Lesen aus einem Buch zu imitieren",
+        "swipe-to-paginate-label": "Zum Blättern wischen",
+        "swipe-to-paginate-tooltip": "Soll durch Wischen auf dem Bildschirm die nächste oder vorherige Seite aufgerufen werden",
+        "allow-auto-webtoon-reader-label": "Automatischer Webtoon-Lesemodus",
+        "allow-auto-webtoon-reader-tooltip": "Wechseln Sie in den Webtoon-Reader-Modus, wenn die Seiten wie ein Webtoon aussehen. Es können einige Fehlalarme auftreten.",
+        "width-override-tooltip": "Breite von Bildern im Reader überschreiben",
+        "book-reader-settings-title": "Buch Reader",
+        "tap-to-paginate-label": "Zum Blättern antippen",
+        "immersive-mode-label": "Immersiver Modus",
+        "reading-direction-book-label": "Leserichtung",
+        "reading-direction-book-tooltip": "Klicken Sie hier, um zur nächsten Seite zu gelangen. Von rechts nach links bedeutet, dass Sie auf die linke Seite des Bildschirms klicken, um zur nächsten Seite zu gelangen.",
+        "immersive-mode-tooltip": "Dadurch wird das Menü hinter einem Klick auf das Lesedokument ausgeblendet und die Seitenumblätterung per Fingertipp aktiviert.",
+        "font-family-label": "Schriftfamilie",
+        "font-family-tooltip": "Zu ladende Schriftfamilie. Standardmäßig wird die Standardschriftart des Buches geladen",
+        "writing-style-label": "Schreibstil",
+        "writing-style-tooltip": "Ändert die Ausrichtung des Textes. Horizontal bedeutet von links nach rechts, vertikal bedeutet von oben nach unten.",
+        "layout-mode-book-label": "Layout-Modus",
+        "color-theme-book-label": "Farbschema",
+        "color-theme-book-tooltip": "Welches Farbschema soll für den Inhalt und das Menü des Buchlesers verwendet werden",
+        "font-size-book-label": "Schriftgröße",
+        "line-height-book-tooltip": "Wie viel Abstand zwischen den Zeilen des Buches",
+        "margin-book-label": "Rand",
+        "margin-book-tooltip": "Wie viel Abstand soll auf jeder Seite des Bildschirms sein? Diese Einstellung wird auf Mobilgeräten unabhängig von dieser Einstellung auf 0 gesetzt.",
+        "pdf-scroll-mode-label": "Scroll-Modus",
+        "pdf-scroll-mode-tooltip": "Wie Sie durch die Seiten scrollen. Vertikal/horizontal und durch Antippen blättern (kein Scrollen)",
+        "pdf-spread-mode-label": "Verteilungsmodus",
+        "pdf-spread-mode-tooltip": "Wie Seiten angelegt werden sollen. Einfach oder doppelt (ungerade/gerade)",
+        "pdf-theme-label": "Theme",
+        "pdf-theme-tooltip": "Farbschema des Readers",
+        "reading-profile-series-settings-title": "Serie",
+        "reading-profile-library-settings-title": "Bibliothek",
+        "wiki-title": "Wiki",
+        "disable-width-override-label": "Breitenüberschreibung deaktivieren",
+        "disable-width-override-tooltip": "Verhindere, dass die Breitenüberschreibung wirksam wird, wenn dein Bildschirm mindestens den konfigurierten Haltepunkt erreicht oder kleiner ist"
+    },
+    "bulk-set-reading-profile-modal": {
+        "no-data": "Es wurden noch keine Sammlungen erstellt",
+        "bound": "Gebunden",
+        "title": "Leseprofil festlegen"
+    },
+    "merge-person-modal": {
+        "alias-title": "Neue Aliase",
+        "known-for-title": "Bekannt für",
+        "src": "Person zusammenführen",
+        "merge-warning": "Wenn Sie fortfahren, wird die ausgewählte Person entfernt. Der Name der ausgewählten Person wird als Alias hinzugefügt und alle ihre Rollen werden übertragen."
+    },
+    "browse-people": {
+        "title": "Personen suchen",
+        "author-count": "{{num}} Personen",
+        "roles-label": "Rollen",
+        "sort-label": "Sortieren",
+        "name-label": "Name",
+        "issue-count-label": "Anzahl der Ausgabe",
+        "series-count-label": "Anzahl der Serien"
+    },
+    "browse-genres": {
+        "title": "Genres durchsuchen",
+        "genre-count": "{{num}} Genres"
+    },
+    "breakpoint-pipe": {
+        "never": "Niemals",
+        "tablet": "Tablet",
+        "desktop": "Desktop",
+        "mobile": "Mobil"
+    },
+    "browse-title-pipe": {
+        "user-rating": "{{value}} Sternebewertung",
+        "tag": "Hat Tag {{value}}",
+        "translator": "Übersetzt von {{value}}",
+        "character": "Hat den Charakter {{value}}",
+        "inker": "Inked von {{value}}",
+        "penciller": "Gezeichnet von {{value}}",
+        "writer": "Verfasst von {{value}}",
+        "genre": "Hat Genre {{value}}",
+        "library": "Innerhalb der Bibliothek {{value}}",
+        "publisher": "Veröffentlicht von {{value}}",
+        "editor": "Von {{value}} bearbeitet",
+        "artist": "Gezeichnet von {{value}}",
+        "letterer": "Letter von {{value}}",
+        "colorist": "Gefärbt durch {{value}}",
+        "format": "Format von {{value}}",
+        "release-year": "Veröffentlicht in {{value}}",
+        "imprint": "Imprint von {{value}}",
+        "location": "An {{value}} Standorten",
+        "team": "Team {{value}}",
+        "publication-status": "{{value}} Werke",
+        "age-rating": "Bewertet mit {{value}}"
+    },
+    "browse-tags": {
+        "title": "Tags durchsuchen",
+        "genre-count": "{{num}} Tags"
+    },
+    "generic-filter-field-pipe": {
+        "person-name": "Name",
+        "person-series-count": "Anzahl der Serien",
+        "person-chapter-count": "Kapitelanzahl",
+        "person-role": "Rolle"
     }
 }
diff --git a/UI/Web/src/assets/langs/el.json b/UI/Web/src/assets/langs/el.json
index 345ebb3df..abae28c97 100644
--- a/UI/Web/src/assets/langs/el.json
+++ b/UI/Web/src/assets/langs/el.json
@@ -21,7 +21,6 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "saving": "Αποθήκευση…",
         "update": "Ενημέρωση"
@@ -56,15 +55,6 @@
     "spoiler": {
         "click-to-show": "Spoiler, κάντε κλικ για να το δείτε"
     },
-    "review-series-modal": {
-        "title": "Επεξεργασία Κριτικής",
-        "review-label": "Κριτική",
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "min-length": "Η κριτική πρέπει να περιέχει τουλάχιστον {{count}} χαρακτήρες",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}",
         "user-review": "Η κριτική του {{username}}",
@@ -291,8 +281,6 @@
         "info-tab": "{{tabs.info-tab}}",
         "recommendations-tab": "{{tabs.recommendations-tab}}",
         "no-pages": "{{toasts.no-pages}}",
-        "user-reviews-local": "Τοπικές Κριτικές",
-        "user-reviews-plus": "Εξωτερικές Κριτικές",
         "writers-title": "{{metadata-fields.writers-title}}",
         "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
         "characters-title": "{{metadata-fields.characters-title}}",
diff --git a/UI/Web/src/assets/langs/en.json b/UI/Web/src/assets/langs/en.json
index 6b4e9fd2b..33bde5e0e 100644
--- a/UI/Web/src/assets/langs/en.json
+++ b/UI/Web/src/assets/langs/en.json
@@ -24,7 +24,7 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
+        "invalid-email-warning": "A non-valid email will block some functionalities of Kavita",
         "cancel": "{{common.cancel}}",
         "saving": "Saving…",
         "update": "Update",
@@ -42,7 +42,9 @@
         "series-header": "Series",
         "data-header": "Data",
         "is-processed-header": "Is Processed",
-        "no-data": "No Data",
+        "select-all-label": "Select all",
+        "delete-selected-label": "Delete selected",
+        "no-data": "{{common.no-data}}",
         "volume-and-chapter-num": "Volume {{v}} Chapter {{n}}",
         "volume-num": "Volume {{num}}",
         "chapter-num": "Chapter {{num}}",
@@ -50,7 +52,10 @@
         "not-applicable": "Not Applicable",
         "processed": "Processed",
         "not-processed": "Not Processed",
-        "special": "{{entity-title.special}}"
+        "special": "{{entity-title.special}}",
+        "generate-scrobble-events": "Backfill Events",
+        "token-expired": "Your AniList token is Expired! Scrobbling events will not process until you renew on Accounts page.",
+        "scrobbling-disabled": "Scrobbling is disabled on your Account Settings."
     },
 
     "scrobble-event-type-pipe": {
@@ -64,8 +69,12 @@
     "spoiler": {
         "click-to-show": "Spoiler, click to show"
     },
+    "reviews": {
+        "user-reviews-local": "Local Reviews",
+        "user-reviews-plus": "External Reviews"
+    },
 
-    "review-series-modal": {
+    "review-modal": {
         "title": "Edit Review",
         "review-label": "Review",
         "close": "{{common.close}}",
@@ -86,7 +95,8 @@
         "your-review": "This is your review",
         "external-review": "External Review",
         "local-review": "Local Review",
-        "rating-percentage": "Rating {{r}}%"
+        "rating-percentage": "Rating {{r}}%",
+        "critic": "critic"
     },
 
     "want-to-read": {
@@ -98,7 +108,7 @@
 
     "user-preferences": {
         "title": "User Dashboard",
-        "pref-description": "These are global settings that are bound to your account.",
+        "pref-description": "These are global settings that are bound to your account. Reader settings are located in Reading Profiles.",
 
         "account-tab": "{{tabs.account-tab}}",
         "preferences-tab": "{{tabs.preferences-tab}}",
@@ -126,57 +136,11 @@
         "share-series-reviews-label": "Share Series Reviews",
         "share-series-reviews-tooltip": "Should Kavita include your reviews of Series for other users",
 
-        "image-reader-settings-title": "Image Reader",
-        "reading-direction-label": "Reading Direction",
-        "reading-direction-tooltip": "Direction to click to move to next page. Right to Left means you click on left side of screen to move to next page.",
-        "scaling-option-label": "Scaling Options",
-        "scaling-option-tooltip": "How to scale the image to your screen.",
-        "page-splitting-label": "Page Splitting",
-        "page-splitting-tooltip": "How to split a full width image (ie both left and right images are combined)",
-        "reading-mode-label": "Reading Mode",
-        "reading-mode-tooltip": "Change reader to paginate vertically, horizontally, or have an infinite scroll",
-        "layout-mode-label": "Layout Mode",
-        "layout-mode-tooltip": "Render a single image to the screen or two side-by-side images",
-        "background-color-label": "Background Color",
-        "background-color-tooltip": "Background Color of Image Reader",
-        "auto-close-menu-label": "Auto Close Menu",
-        "auto-close-menu-tooltip": "Should menu auto close",
-        "show-screen-hints-label": "Show Screen Hints",
-        "show-screen-hints-tooltip": "Show an overlay to help understand pagination area and direction",
-        "emulate-comic-book-label": "Emulate comic book",
-        "emulate-comic-book-tooltip": "Applies a shadow effect to emulate reading from a book",
-        "swipe-to-paginate-label": "Swipe to Paginate",
-        "swipe-to-paginate-tooltip": "Should swiping on the screen cause the next or previous page to be triggered",
-
-        "book-reader-settings-title": "Book Reader",
-        "tap-to-paginate-label": "Tap to Paginate",
-        "tap-to-paginate-tooltip": "Should the sides of the book reader screen allow tapping on it to move to prev/next page",
-        "immersive-mode-label": "Immersive Mode",
-        "immersive-mode-tooltip": "This will hide the menu behind a click on the reader document and turn tap to paginate on",
-        "reading-direction-book-label": "Reading Direction",
-        "reading-direction-book-tooltip": "Direction to click to move to next page. Right to Left means you click on left side of screen to move to next page.",
-        "font-family-label": "Font Family",
-        "font-family-tooltip": "Font family to load up. Default will load the book's default font",
-        "writing-style-label": "Writing Style",
-        "writing-style-tooltip": "Changes the direction of the text. Horizontal is left to right, vertical is top to bottom.",
-        "layout-mode-book-label": "Layout Mode",
-        "layout-mode-book-tooltip": "How content should be laid out. Scroll is as the book packs it. 1 or 2 Column fits to the height of the device and fits 1 or 2 columns of text per page",
-        "color-theme-book-label": "Color Theme",
-        "color-theme-book-tooltip": "What color theme to apply to the book reader content and menu",
-        "font-size-book-label": "Font Size",
-        "font-size-book-tooltip": "Percent of scaling to apply to font in the book",
-        "line-height-book-label": "Line Spacing",
-        "line-height-book-tooltip": "How much spacing between the lines of the book",
-        "margin-book-label": "Margin",
-        "margin-book-tooltip": "How much spacing on each side of the screen. This will override to 0 on mobile devices regardless of this setting.",
-
-        "pdf-reader-settings-title": "PDF Reader",
-        "pdf-scroll-mode-label": "Scroll Mode",
-        "pdf-scroll-mode-tooltip": "How you scroll through pages. Vertical/Horizontal and Tap to Paginate (no scroll)",
-        "pdf-spread-mode-label": "Spread Mode",
-        "pdf-spread-mode-tooltip": "How pages should be laid out. Single or double (odd/even)",
-        "pdf-theme-label": "Theme",
-        "pdf-theme-tooltip": "Color theme of the reader",
+        "kavitaplus-settings-title": "Kavita+",
+        "anilist-scrobbling-label": "AniList Scrobbling",
+        "anilist-scrobbling-tooltip": "Allow Kavita to Scrobble (one-way sync) reading progress and ratings to AniList",
+        "want-to-read-sync-label": "Want To Read Sync",
+        "want-to-read-sync-tooltip": "Allow Kavita to add items to your Want to Read list based on AniList and MAL series in Pending readlist",
 
         "clients-opds-alert": "OPDS is not enabled on this server. This will not affect Tachiyomi users.",
         "clients-opds-description": "All 3rd Party clients will either use the API key or the Connection Url below. These are like passwords, keep it private.",
@@ -191,8 +155,12 @@
 
     "user-holds": {
         "title": "Scrobble Holds",
-        "description": "This is a user-managed list of Series that will not be scrobbled to upstream providers. You can remove a series at any time and the next scrobble-able event (reading progress, rating, want to read status) will trigger events.",
-        "no-data": "{{typeahead.no-data}}"
+        "description": "This is a user-managed list of Series that will not be scrobbled to upstream providers. You can remove a series at any time and the next scrobble-able event (reading progress, rating, want to read status) will trigger scrobbling.",
+        "no-data": "{{typeahead.no-data}}",
+        "series-name-header": "{{manage-matched-metadata.series-name-header}}",
+        "created-header": "{{manage-media-issues.created-header}}",
+        "delete-label": "{{common.remove}}"
+
     },
 
     "theme-manager": {
@@ -324,7 +292,8 @@
         "regen-warning": "Regenerating your API key will invalidate any existing clients.",
         "no-key": "ERROR - KEY NOT SET",
         "confirm-reset": "This will invalidate any OPDS configurations you have setup. Are you sure you want to continue?",
-        "key-reset": "API Key reset"
+        "key-reset": "API Key reset",
+        "reset": "Reset"
     },
 
     "scrobbling-providers": {
@@ -345,7 +314,14 @@
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
-        "loading": "{{common.loading}}"
+        "loading": "{{common.loading}}",
+        "anilist-used-for": "AniList is used for scrobbling (syncing data) and want to read syncing.",
+        "mal-used-for": "MyAnimeList is used for Smart Collections and want to read syncing.",
+        "anilist-first-header": "AniList token saved",
+        "anilist-first-description": "Your AniList token is now setup. This token lasts for a year and Kavita will inform you before it expires to refresh it here. With this, Kavita will generate scrobble (sync) events from your reading history, want to read, and ratings. You can start this now or later. If you have any series that you do not want to be scrobbled select later and place a Scrobble Hold on them. You only need to run this task once. Afterwards, Kavita will handle the syncing for you.
           If you select 'Later', you can find the button on Scrobbling page.",
+        "anilist-first-later": "Later",
+        "anilist-first-now": "Now"
+
     },
 
     "typeahead": {
@@ -353,7 +329,7 @@
         "close": "{{common.close}}",
         "loading": "{{common.loading}}",
         "add-item": "Add {{item}}…",
-        "no-data": "No data",
+        "no-data": "{{common.no-data}}",
         "add-custom-item": ", type to add a custom item"
     },
 
@@ -551,9 +527,9 @@
 
     "library-type-pipe": {
         "book": "Book",
-        "comic": "Comic",
+        "comic": "Comic (Legacy)",
         "manga": "Manga",
-        "comicVine": "Comic Vine",
+        "comicVine": "Comic",
         "image": "Image",
         "lightNovel": "Light Novel"
     },
@@ -623,10 +599,37 @@
         "installed": "Installed",
         "download": "Download",
         "nightly": "Nightly: {{version}}",
+        "available": "Available"
+    },
+
+    "changelog-update-item": {
+        "download": "Download",
+        "added": "Added",
+        "changed": "Changed",
+        "fixed": "Fixed",
+        "developer": "Developer",
+        "theme": "Theme",
+        "removed": "Removed",
+        "api": "API",
         "published-label": "Published: ",
-        "available": "Available",
-        "description": "If you do not see an {{installed}}",
-        "description-continued": "tag, you are on a nightly release. Only major versions will show as available. A nightly tag will show when on a nightly from that stable."
+        "installed": "{{changelog.installed}}",
+        "feature-requests": "Feature Requests",
+        "known-issues": "Known Issues"
+    },
+
+    "new-version-modal": {
+        "title": "Kavita was updated!",
+        "description": "A new version of Kavita is available. Refresh to update.",
+        "added": "{{changelog.added}}",
+        "changed": "{{changelog.changed}}",
+        "fixed": "{{changelog.fixed}}",
+        "developer": "{{changelog.developer}}",
+        "theme": "{{changelog.theme}}",
+        "removed": "{{changelog.removed}}",
+        "known-issues": "{{changelog.known-issues}}",
+        "api": "{{changelog.api}}",
+        "close": "{{common.close}}",
+        "refresh": "Refresh"
     },
 
     "invite-user": {
@@ -669,6 +672,29 @@
         "license-not-valid": "License Not Valid",
         "loading": "{{common.loading}}",
         "help-label": "{{common.help}}",
+        "info-title": "License Info",
+        "actions-title": "Actions",
+        "license-active-label": "License Active",
+        "supported-version-label": "On Supported Kavita version",
+        "expiration-label": "Expiration",
+        "valid-tooltip": "Valid",
+        "invalid-tooltip": "Invalid",
+        "reset-label": "Reset",
+        "reset-tooltip": "This will reset the server instance Kavita+ license is tied to. Requires Email and License Key",
+        "delete-label": "Remove License",
+        "delete-tooltip": "This will remove the license from Kavita to stop Kavita from talking to Kavita+. Does not unsubscribe you. Use 'manage' first to cancel the subscription.",
+        "manage-tooltip": "Update payment info, Cancel/Pause subscription, etc",
+        "faq-title": "FAQ",
+        "total-subbed-months-label": "Total Months Subscribed",
+        "email-label": "Registered Email",
+
+        "license-mismatch": "License may be registered to another Kavita instance. Re-register to fix.",
+        "k+-license-overwrite": "License is registered to another Kavita instance. This can happen on re-installation and rarely due to system updates. Select overwrite to force this instance to register with Kavita+.",
+        "k+-already-registered-header": "License already registered",
+        "overwrite": "Overwrite",
+
+        "k+-unlocked": "Kavita+ unlocked!",
+        "k+-unlocked-description": "Welcome to Kavita+! Kavita will generate scrobble events from your progress, ratings and want to read once you register your Scrobbling Providers under account. Take some time to ensure you place scrobbling holds for any series you don't want to scrobble.",
 
         "activate-description": "Enter the License Key and Email used to register with Stripe",
         "activate-license-label": "License Key",
@@ -677,15 +703,98 @@
         "activate-discordId-tooltip": "Link your Discord Account with Kavita+. This grants you access to hidden channels to help shape Kavita.",
         "discord-validation": "This is not a valid Discord User Id. Your user id is not your discord username.",
         "activate-delete": "{{common.delete}}",
-        "activate-reset": "{{common.reset}}",
+        "activate-reset": "Reset License",
         "activate-reset-tooltip": "Invalidate a previous registration using your license. Requires both License and Email",
         "activate-save": "{{common.save}}",
 
         "kavita+-desc-part-1": "Kavita+ is a premium subscription service which unlocks features for all users on this Kavita instance. Buy a subscription to unlock ",
         "kavita+-desc-part-2": "premium benefits",
         "kavita+-desc-part-3": "today!",
-        "kavita+-requirement": "Kavita+ is designed to work only with the latest release - 2 versions. Anything outside of that is subject to not working.",
-        "kavita+-releases": "See releases"
+        "kavita+-requirement": "Kavita+ is designed to work only with the latest 3 releases. Anything outside of that is subject to not functioning."
+    },
+
+    "manage-matched-metadata": {
+        "title": "Matched Metadata",
+        "description": "All applicable Series that can be matched with External Metadata reside here. Kavita will prefetch or refresh series metadata, 50 series per 24 hours daily.",
+        "status-header": "Status",
+        "series-name-header": "Series",
+        "library-name-header": "Library",
+        "valid-until-header": "Next Refresh",
+        "actions-header": "Actions",
+        "library-type": "Library Type",
+        "matched-state-label": "Match State",
+        "matched-status-label": "Matched",
+        "unmatched-status-label": "Not Matched",
+        "blacklist-status-label": "Needs Manual Match",
+        "dont-match-status-label": "{{dont-match-label}}",
+        "all-status-label": "All",
+        "dont-match-label": "Don't Match",
+        "no-data": "{{common.no-data}}",
+        "match-alt": "Match {{seriesName}}"
+    },
+
+    "manage-user-tokens": {
+        "description": "Users that have scrobbling tokens may need renewing occasionally. Kavita will automatically email them if email is setup and they have a valid email.",
+        "username-header": "Username",
+        "anilist-header": "AniList",
+        "mal-header": "MAL",
+        "token-set-label": "Token Set",
+        "no-data": "{{common.no-data}}",
+        "expires-label": "Expires: {{date}}"
+    },
+
+    "manage-metadata-settings": {
+        "description": "Kavita+ has the ability to download and write some limited metadata to the Database. This page allows for you to toggle what is in scope.",
+        "enabled-label": "Enable Metadata Download",
+        "enabled-tooltip": "Allow Kavita to download metadata and write to it's database.",
+        "summary-label": "Summary",
+        "summary-tooltip": "Allow Summary to be written when the field is unlocked.",
+        "localized-name-label": "Localized Series Name",
+        "localized-name-tooltip": "Allow Localized Name to be written when the field is unlocked. Kavita will attempt to make the best guess.",
+        "derive-publication-status-label": "Publication Status",
+        "derive-publication-status-tooltip": "Allow Publication Status to be derived from Total Chapter/Volume counts.",
+        "enable-relations-label": "Relationships",
+        "enable-relations-tooltip": "Allow Series Relationships to be added.",
+        "enable-people-label": "People",
+        "enable-people-tooltip": "Allow People (Characters, Writers, etc) to be added. All people include images.",
+        "enable-cover-image-label": "Cover Image",
+        "enable-cover-image-tooltip": "Allow Kavita to write the cover image for the Series",
+        "enable-start-date-label": "Start Date",
+        "enable-start-date-tooltip": "Allow Start Date of Series to be written to the Series",
+
+        "enable-chapter-title-label": "Title",
+        "enable-chapter-title-tooltip": "Allow Title of Chapter/Issue to be written",
+        "enable-chapter-summary-label": "{{manage-metadata-settings.summary-label}}",
+        "enable-chapter-summary-tooltip": "{{manage-metadata-settings.summary-tooltip}}",
+        "enable-chapter-release-date-label": "Release Date",
+        "enable-chapter-release-date-tooltip": "Allow Release Date of Chapter/Issue to be written",
+        "enable-chapter-publisher-label": "Publisher",
+        "enable-chapter-publisher-tooltip": "Allow Publisher of Chapter/Issue to be written",
+        "enable-chapter-cover-label": "Chapter Cover",
+        "enable-chapter-cover-tooltip": "Allow Cover of Chapter/Issue to be set",
+        "enable-genres-label": "Genres",
+        "enable-genres-tooltip": "Allow Series Genres to be written.",
+        "enable-tags-label": "Tags",
+        "enable-tags-tooltip": "Allow Series Tags to be written.",
+        "blacklist-label": "Blacklist Genres/Tags",
+        "blacklist-tooltip": "Anything in this list will be removed from both Genre and Tag processing. This is a place to add genres/tags you do not want written. Ensure they are comma-separated.",
+        "whitelist-label": "Whitelist Tags",
+        "whitelist-tooltip": "Only allow a string in this list from being written for Tags. Ensure they are comma-separated.",
+        "age-rating-mapping-title": "Age Rating Mapping",
+        "age-rating-mapping-description": "Any strings on the left if found in either Genre or Tags will set the Age Rating on the Series.",
+        "genre": "Genre",
+        "tag": "Tag",
+        "remove-source-tag-label": "Remove Source Tag",
+        "add-field-mapping-label": "Add Field Mapping",
+        "add-age-rating-mapping-label": "Add Age Rating Mapping",
+        "field-mapping-title": "Field Mapping",
+        "field-mapping-description": "Setup rules for certain strings found in Genre/Tag field and map it to a new string in Genre/Tag and optionally remove it from the Source list. Only applicable when Genre/Tag are enabled to be written.",
+        "first-last-name-label": "First Last Naming",
+        "first-last-name-tooltip": "Ensure People's names are written First then Last",
+        "person-roles-label": "Roles",
+        "overrides-label": "Overrides",
+        "overrides-description": "Allow Kavita to write over locked fields.",
+        "chapter-header": "Chapter Fields"
     },
 
     "book-line-overlay": {
@@ -702,7 +811,7 @@
         "page-label": "Page",
 
         "pagination-header": "Section",
-        "go-to-page": "Go to page",
+        "go-to-first-page": "Go to first page",
         "go-to-last-page": "Go to last page",
         "prev-page": "Prev Page",
         "next-page": "Next Page",
@@ -723,7 +832,12 @@
         "incognito-mode-label": "Incognito Mode",
         "next": "Next",
         "previous": "Previous",
-        "go-to-page-prompt": "There are {{totalPages}} pages. What page do you want to go to?"
+
+        "go-to-page": "Go to page",
+        "go-to-page-prompt": "There are {{totalPages}} pages. What page do you want to go to?",
+
+        "go-to-section": "Go to section",
+        "go-to-section-prompt": "There are {{totalSections}} sections. What section do you want to go to?"
     },
 
     "personal-table-of-contents": {
@@ -777,7 +891,7 @@
     "series-detail": {
         "page-settings-title": "Page Settings",
         "close": "{{common.close}}",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
         "layout-mode-option-card": "Card",
         "layout-mode-option-list": "List",
         "continue-from": "Continue {{title}}",
@@ -804,9 +918,6 @@
         "no-chapters": "There are no chapters to this volume. Cannot read.",
         "cover-change": "It can take up to a minute for your browser to refresh the image. Until then, the old image may be shown on some pages.",
 
-        "user-reviews-local": "Local Reviews",
-        "user-reviews-plus": "External Reviews",
-
         "writers-title": "{{metadata-fields.writers-title}}",
         "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
         "characters-title": "{{metadata-fields.characters-title}}",
@@ -833,9 +944,33 @@
         "more-alt": "More",
         "time-left-alt": "Time Left",
         "time-to-read-alt": "{{sort-field-pipe.time-to-read}}",
-        "scrobbling-tooltip": "{{settings.scrobbling}}",
+        "scrobbling-tooltip": "{{settings.scrobbling}}: {{value}}",
         "publication-status-title": "Publication",
-        "publication-status-tooltip": "Publication Status"
+        "publication-status-tooltip": "Publication Status",
+        "on": "{{reader-settings.on}}",
+        "off": "{{reader-settings.off}}"
+    },
+
+    "match-series-modal": {
+        "title": "Match {{seriesName}}",
+        "description": "Select a match to rewire Kavita+ metadata and regenerate scrobble events. Don't Match can be used to restrict Kavita from matching metadata and scrobbling.",
+        "close": "{{common.close}}",
+        "save": "{{common.save}}",
+        "no-results": "Unable to find a match. Try adding the url from a supported provider and retry.",
+        "query-label": "Query",
+        "query-tooltip": "Enter series name, AniList/MyAnimeList/ComicBookRoundup url. Urls will use a direct lookup.",
+        "dont-match-label": "Do not Match",
+        "dont-match-tooltip": "Opt this series from matching and scrobbling",
+        "search": "Search"
+    },
+
+    "match-series-result-item": {
+        "volume-count": "{{server-stats.volume-count}}",
+        "chapter-count": "{{common.chapter-count}}",
+        "issue-count": "{{common.issue-count}}",
+        "releasing": "Releasing",
+        "details": "View page",
+        "updating-metadata-status": "Updating Metadata"
     },
 
     "metadata-fields": {
@@ -870,7 +1005,8 @@
         "entry-label": "See Details",
         "kavita-tooltip": "Your Rating + Overall",
         "kavita-rating-title": "Your Rating",
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "critic": "{{review-card.critic}}"
     },
 
     "badge-expander": {
@@ -902,29 +1038,55 @@
         "collections": "Collections",
         "reading-lists": "Reading Lists",
         "bookmarks": "Bookmarks",
-        "browse-authors": "Browse Authors",
+        "browse-people": "Browse People",
         "filter-label": "{{common.filter}}",
         "all-series": "All Series",
         "clear": "{{common.clear}}",
         "donate": "Donate",
         "donate-tooltip": "You can remove this by subscribing to Kavita+",
         "back": "Back",
+        "cancel-edit": "Close Reorder",
         "more": "More",
-        "customize": "{{settings.customize}}"
+        "customize": "{{settings.customize}}",
+        "edit": "{{common.edit}}"
     },
 
-    "browse-authors": {
-        "title": "Browse Authors & Writers",
+    "browse-people": {
+        "title": "Browse People",
         "author-count": "{{num}} People",
-        "cover-image-description": "{{edit-series-modal.cover-image-description}}"
+        "cover-image-description": "{{edit-series-modal.cover-image-description}}",
+        "issue-count": "{{common.issue-count}}",
+        "series-count": "{{common.series-count}}",
+        "roles-label": "Roles",
+        "sort-label": "Sort",
+        "name-label": "Name",
+        "issue-count-label": "Issue Count",
+        "series-count-label": "Series Count"
+    },
+
+    "browse-genres": {
+        "title": "Browse Genres",
+        "genre-count": "{{num}} Genres",
+        "issue-count": "{{common.issue-count}}",
+        "series-count": "{{common.series-count}}"
+    },
+
+    "browse-tags": {
+        "title": "Browse Tags",
+        "genre-count": "{{num}} Tags",
+        "issue-count": "{{common.issue-count}}",
+        "series-count": "{{common.series-count}}"
     },
 
     "person-detail": {
+        "aka-title": "Also known as ",
         "known-for-title": "Known For",
         "individual-role-title": "As a {{role}}",
         "browse-person-title": "All Works of {{name}}",
         "browse-person-by-role-title": "All Works of {{name}} as a {{role}}",
-        "all-roles": "Roles"
+        "all-roles": "Roles",
+        "anilist-url": "{{edit-person-modal.anilist-tooltip}}",
+        "no-info": "No information about this Person"
     },
 
     "library-settings-modal": {
@@ -942,7 +1104,7 @@
         "type-label": "Type",
         "type-tooltip": "Library type determines how filenames are parsed and if the UI shows Chapters (Manga) vs Issues (Comics). Check the wiki for more details on the differences between the library types.",
         "kavitaplus-eligible-label": "Kavita+ Eligible",
-        "kavitaplus-eligible-tooltip": "Will Kavita+ pull information or support Scrobbling",
+        "kavitaplus-eligible-tooltip": "Supports Kavita+ metadata features or Scrobbling",
         "folder-description": "Add folders to your library",
         "browse": "Browse for Media Folders",
         "help-us-part-1": "Help us out by following ",
@@ -959,12 +1121,18 @@
         "manage-reading-list-tooltip": "Should Kavita create Reading Lists from StoryArc/StoryArcNumber and AlternativeSeries/AlternativeCount tags found within ComicInfo.xml/opf files",
         "allow-scrobbling-label": "Allow Scrobbling",
         "allow-scrobbling-tooltip": "Should Kavita scrobble reading events, want to read status, ratings, and reviews to configured providers. This will only occur if the server has an active Kavita+ Subscription.",
+        "allow-metadata-matching-label": "Allow Metadata Matching",
+        "allow-metadata-matching-tooltip": "Should Kavita download metadata for Series within this Library. This will only occur if the server has an active Kavita+ Subscription.",
         "folder-watching-label": "Folder Watching",
         "folder-watching-tooltip": "Override Server folder watching for this library. If off, folder watching won't run on the folders this library contains. If libraries share folders, then folders may still be ran against. Will always wait 10 minutes before triggering scan.",
         "include-in-dashboard-label": "Include in Dashboard",
         "include-in-dashboard-tooltip": "Should series from the library be included on the Dashboard. This affects all streams, like On Deck, Recently Updated, Recently Added, or any custom additions.",
         "include-in-search-label": "Include in Search",
         "include-in-search-tooltip": "Should series and any derived information (genres, people, files) from the library be included in search results.",
+        "enable-metadata-label": "Enable Metadata (ComicInfo/Epub/PDF)",
+        "enable-metadata-tooltip": "Allow Kavita to read metadata files which override filename parsing.",
+        "remove-prefix-for-sortname-label": "Remove common prefixes for Sort Name",
+        "remove-prefix-for-sortname-tooltip": "Kavita will remove common prefixes like 'The', 'A', 'An' from titles for sort name. Does not override set metadata.",
         "force-scan": "Force Scan",
         "force-scan-tooltip": "This will force a scan on the library, treating like a fresh scan",
         "reset": "{{common.reset}}",
@@ -988,36 +1156,45 @@
 
     "reader-settings": {
         "general-settings-title": "General Settings",
-        "font-family-label": "{{user-preferences.font-family-label}}",
-        "font-size-label": "{{user-preferences.font-size-book-label}}",
-        "line-spacing-label": "{{user-preferences.line-height-book-label}}",
-        "margin-label": "{{user-preferences.margin-book-label}}",
+        "font-family-label": "{{manage-reading-profiles.font-family-label}}",
+        "font-size-label": "{{manage-reading-profiles.font-size-book-label}}",
+        "line-spacing-label": "{{manage-reading-profiles.line-height-book-label}}",
+        "margin-label": "{{manage-reading-profiles.margin-book-label}}",
         "reset-to-defaults": "Reset to Defaults",
+        "update-parent": "Save to {{name}}",
+        "loading": "loading",
+        "create-new": "New profile from implicit",
+        "create-new-tooltip": "Create a new manageable profile from your current implicit one",
+        "reading-profile-updated": "Reading profile updated",
+        "reading-profile-promoted": "Reading profile promoted",
         "reader-settings-title": "Reader Settings",
-        "reading-direction-label": "{{user-preferences.reading-direction-book-label}}",
+        "reading-direction-label": "{{manage-reading-profiles.reading-direction-book-label}}",
         "right-to-left": "Right to Left",
         "left-to-right": "Left to Right",
         "horizontal": "Horizontal",
         "vertical": "Vertical",
-        "writing-style-label": "{{user-preferences.writing-style-label}}",
+        "writing-style-label": "{{manage-reading-profiles.writing-style-label}}",
         "writing-style-tooltip": "Changes the direction of the text. Horizontal is left to right, vertical is top to bottom.",
         "tap-to-paginate-label": "Tap Pagination",
         "tap-to-paginate-tooltip": "Click the edges of the screen to paginate",
         "on": "On",
         "off": "Off",
-        "immersive-mode-label": "{{user-preferences.immersive-mode-label}}",
+        "immersive-mode-label": "{{manage-reading-profiles.immersive-mode-label}}",
         "immersive-mode-tooltip": "This will hide the menu behind a click on the reader document and turn tap to paginate on",
         "fullscreen-label": "Fullscreen",
         "fullscreen-tooltip": "Put reader in fullscreen mode",
         "exit": "Exit",
         "enter": "Enter",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
         "layout-mode-tooltip": "Scroll: Mirrors epub file (usually one long scrolling page per chapter).
          1 Column: Creates a single virtual page at a time.
          2 Column: Creates two virtual pages at a time laid out side-by-side.",
         "layout-mode-option-scroll": "Scroll",
         "layout-mode-option-1col": "1 Column",
         "layout-mode-option-2col": "2 Column",
         "color-theme-title": "Color Theme",
 
+        "line-spacing-min-label": "1x",
+        "line-spacing-max-label": "2.5x",
+
         "theme-dark": "Dark",
         "theme-black": "Black",
         "theme-white": "White",
@@ -1049,7 +1226,8 @@
 
     "card-detail-layout": {
         "total-items": "{{count}} total items",
-        "jumpkey-count": "{{count}} Series"
+        "jumpkey-count": "{{count}} Series",
+        "no-data": "{{common.no-data}}"
     },
 
     "card-item": {
@@ -1077,13 +1255,15 @@
         "language-title": "{{edit-chapter-modal.language-label}}",
         "release-title": "{{sort-field-pipe.release-year}}",
         "format-title": "{{metadata-filter.format-label}}",
-        "length-title": "{{edit-chapter-modal.words-label}}"
+        "length-title": "{{edit-chapter-modal.words-label}}",
+        "age-rating-title": "{{metadata-fields.age-rating-title}}"
     },
 
     "related-tab": {
         "reading-lists-title": "{{reading-lists.title}}",
         "collections-title": "{{side-nav.collections}}",
-        "relations-title": "{{tabs.related-tab}}"
+        "relations-title": "{{tabs.related-tab}}",
+        "bookmarks-title": "{{side-nav.bookmarks}}"
     },
 
     "cover-image-chooser": {
@@ -1128,6 +1308,17 @@
         "create": "{{common.create}}"
     },
 
+    "bulk-set-reading-profile-modal": {
+        "title": "Set Reading profile",
+        "close": "{{common.close}}",
+        "filter-label": "{{common.filter}}",
+        "clear": "{{common.clear}}",
+        "no-data": "No collections created yet",
+        "loading": "{{common.loading}}",
+        "create": "{{common.create}}",
+        "bound":  "Bound"
+    },
+
     "entity-title": {
         "special": "Special",
         "issue-num": "{{common.issue-hash-num}}",
@@ -1141,6 +1332,17 @@
         "open-external": "Open External"
     },
 
+    "email-history": {
+        "description": "Here you can find all emails sent from Kavita and to which user.",
+        "template-header": "Template",
+        "date-header": "Send Date",
+        "user-header": "Sent To",
+        "sent-header": "Successful",
+        "no-data": "{{common.no-data}}",
+        "sent-tooltip": "Sent",
+        "not-sent-tooltip": "Not Sent"
+    },
+
 
     "manage-media-issues": {
         "description-part-1": "This table contains issues found during scan or reading of your media. You can clear it at any time and use Library (Force) Scan to perform analysis. A list of some common errors and what they mean can be found on the ",
@@ -1150,7 +1352,7 @@
         "file-header": "File",
         "comment-header": "Comment",
         "created-header": "Created",
-        "no-data": "No Data"
+        "no-data": "{{common.no-data}}"
     },
 
     "manage-email-settings": {
@@ -1164,7 +1366,7 @@
         "reset": "{{common.reset}}",
         "test": "Test",
         "host-name-label": "Host Name",
-        "host-name-tooltip": "Domain Name (of Reverse Proxy). Required for email functionality. If no reverse proxy, use any url.",
+        "host-name-tooltip": "The domain name of your reverse proxy, required for email functionality. If you’re not using a reverse proxy, you can use any URL, including http://externalip:port/",
         "host-name-validation": "Host name must start with http(s) and not end in /",
 
         "sender-address-label": "Sender Address",
@@ -1401,10 +1603,6 @@
         "download-logs-task": "Download Logs",
         "download-logs-task-desc": "Compiles all log files into a zip and downloads it.",
 
-        "analyze-files-task": "Analyze Files",
-        "analyze-files-task-desc": "Runs a long-running task which will analyze files to generate extension and size. This should only be ran once for the v0.7 release. Not needed if you installed post v0.7.",
-        "analyze-files-task-success": "File analysis has been queued",
-
         "sync-themes-task": "Sync Themes",
         "sync-themes-task-desc": "Synchronize downloaded themes with upstream changes if version matches.",
         "sync-themes-success": "Synchronization of themes has been queued",
@@ -1431,13 +1629,13 @@
         "change-password-alt": "Change Password {{user}}",
         "resend": "Resend",
         "setup": "Setup",
-        "admin": "Admin",
         "last-active-header": "Last Active",
         "roles-header": "Roles",
         "name-header": "Name",
         "none": "None",
         "never": "Never",
         "online-now-tooltip": "Online Now",
+        "all-libraries": "All Libraries",
         "too-many-libraries": "A lot",
         "sharing-header": "Sharing",
         "no-data": "There are no other users.",
@@ -1446,6 +1644,17 @@
         "pending-tooltip": "This user has not validated their email"
     },
 
+    "role-localized-pipe": {
+        "admin": "Admin",
+        "download": "Download",
+        "change-password": "Change Password",
+        "bookmark": "Bookmark",
+        "change-restriction": "Change Restriction",
+        "login": "Login",
+        "read-only": "Read Only",
+        "promote": "Promote"
+    },
+
     "edit-collection-tags": {
         "title": "Edit {{collectionName}} Collection",
         "required-field": "{{validation.required-field}}",
@@ -1487,7 +1696,7 @@
         "server-section-title": "Server",
         "info-section-title": "Info",
         "import-section-title": "Import",
-        "kavitaplus-section-title": "{{settings.admin-kavitaplus}}",
+        "kavitaplus-section-title": "Kavita+",
         "admin-general": "General",
         "admin-users": "Users",
         "admin-libraries": "Libraries",
@@ -1498,9 +1707,15 @@
         "admin-tasks": "Tasks",
         "admin-statistics": "Statistics",
         "admin-system": "System",
-        "admin-kavitaplus": "Kavita+",
+        "admin-email-history": "Email History",
+        "admin-kavitaplus": "License",
+        "admin-matched-metadata": "Matched Metadata",
+        "admin-manage-tokens": "Manage User Tokens",
+        "admin-metadata": "Manage Metadata",
+        "scrobble-holds": "Scrobble Holds",
         "account": "Account",
         "preferences": "Preferences",
+        "reading-profiles": "Reading Profiles",
         "clients": "API Key / OPDS",
         "devices": "Devices",
         "user-stats": "Stats",
@@ -1551,11 +1766,13 @@
 
     "reading-list-item": {
         "remove": "{{common.remove}}",
-        "read": "{{common.read}}"
+        "read": "{{common.read}}",
+        "released-label": "Released: {{date}}"
     },
 
     "stream-list-item": {
         "remove": "{{common.remove}}",
+        "delete": "{{common.delete}}",
         "load-filter": "Load Filter",
         "provided": "Provided",
         "smart-filter": "Smart Filter",
@@ -1573,7 +1790,19 @@
         "read-options-alt": "Read options",
         "incognito-alt": "(Incognito)",
         "no-data": "Nothing added",
-        "characters-title": "{{metadata-fields.characters-title}}"
+        "characters-title": "{{metadata-fields.characters-title}}",
+        "writers-title": "{{metadata-fields.writers-title}}",
+        "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
+        "publishers-title": "{{metadata-fields.publishers-title}}",
+        "items-title": "Items",
+        "storyline-tab": "{{series-detail.storyline-tab}}",
+        "details-tab": "{{series-detail.details-tab}}",
+        "edit-alt": "{{common.edit}}",
+        "edit-label": "Edit Mode",
+        "date-range-title": "Date Range",
+        "more-alt": "{{series-detail.more-alt}}",
+        "reorder-alt": "Reorder Items",
+        "dnd-warning": "Drag and drop is unavailable on mobile devices or when the reading list has more than 100 items."
     },
 
     "events-widget": {
@@ -1631,7 +1860,10 @@
         "logout": "Logout",
         "all-filters": "Smart Filters",
         "nav-link-header": "Navigation Options",
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "person-aka-status": "Matches an alias",
+        "browse-genres": "Browse Genres",
+        "browse-tags": "Browse Tags"
     },
 
     "promoted-icon": {
@@ -1715,7 +1947,7 @@
         "dry-run-step": "Dry Run",
         "final-import-step": "Final Step",
         "comicvine-parsing-label": "Use Comic Vine Series matching",
-        "cbl-repo": "You can find many reading lists in the community repo."
+        "cbl-repo": "You can find many reading lists in the community repository."
     },
 
     "pdf-reader": {
@@ -1756,7 +1988,10 @@
 
     "manga-reader": {
         "back": "Back",
-        "save-globally": "Save Globally",
+        "update-parent": "{{reader-settings.update-parent}}",
+        "loading": "{{reader-settings.loading}}",
+        "create-new": "{{reader-settings.create-new}}",
+        "create-new-tooltip": "{{reader-settings.create-new-tooltip}}",
         "incognito-alt": "Incognito mode is on. Toggle to turn off.",
         "incognito-title": "Incognito Mode:",
         "shortcuts-menu-alt": "Keyboard Shortcuts Modal",
@@ -1778,9 +2013,9 @@
         "height": "Height",
         "width": "Width",
         "width-override-label": "Width Override",
-        "off": "Off",
+        "off": "{{reader-settings.off}}",
         "original": "Original",
-        "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}",
+        "auto-close-menu-label": "{{manage-reading-profiles.auto-close-menu-label}}",
         "swipe-enabled-label": "Swipe Enabled",
         "enable-comic-book-label": "Emulate comic book",
         "brightness-label": "Brightness",
@@ -1792,8 +2027,9 @@
         "layout-mode-switched": "Layout mode switched to Single due to insufficient space to render double layout",
         "no-next-chapter": "No Next Chapter",
         "no-prev-chapter": "No Previous Chapter",
-        "user-preferences-updated": "User preferences updated",
-        "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}",
+        "reading-profile-updated": "Reading profile updated",
+        "reading-profile-promoted": "Reading profile promoted",
+        "emulate-comic-book-label": "{{manage-reading-profiles.emulate-comic-book-label}}",
         "series-progress": "Series Progress: {{percentage}}"
     },
 
@@ -1855,7 +2091,10 @@
         "release-year": "Release Year",
         "read-progress": "Last Read",
         "average-rating": "Average Rating",
-        "random": "Random"
+        "random": "Random",
+        "person-name": "Name",
+        "person-series-count": "Series Count",
+        "person-chapter-count": "Chapter Count"
     },
 
     "edit-series-modal": {
@@ -2000,8 +2239,8 @@
         "tasks-tab": "{{tabs.tasks-tab}}",
         "info-tab": "{{tabs.info-tab}}",
 
-        "pages-label": "{{edit-chapter-modal.pages-count}}",
-        "words-label": "{{edit-chapter-modal.length-title}}",
+        "pages-label": "{{edit-chapter-modal.pages-label}}",
+        "words-label": "{{edit-chapter-modal.words-label}}",
         "pages-count": "{{edit-chapter-modal.pages-count}}",
         "words-count": "{{edit-chapter-modal.words-count}}",
         "reading-time-label": "{{edit-chapter-modal.reading-time-label}}",
@@ -2020,6 +2259,7 @@
         "title": "{{personName}} Details",
         "general-tab": "{{edit-series-modal.general-tab}}",
         "cover-image-tab": "{{edit-series-modal.cover-image-tab}}",
+        "aliases-tab": "Aliases",
         "loading": "{{common.loading}}",
         "close": "{{common.close}}",
         "name-label": "{{edit-series-modal.name-label}}",
@@ -2037,7 +2277,20 @@
         "cover-image-description": "{{edit-series-modal.cover-image-description}}",
         "cover-image-description-extra": "Alternatively you can download a cover from CoversDB if available.",
         "save": "{{common.save}}",
-        "download-coversdb": "Download from CoversDB"
+        "download-coversdb": "Download from CoversDB",
+        "aliases-label": "Edit aliases",
+        "alias-overlap": "This alias already points towards another person or is the name of this person, consider merging them.",
+        "aliases-tooltip": "When a series is tagged with an alias of a person, the person is assigned rather than creating a new person. When deleting an alias, you'll have to rescan the series for the change to be picked up."
+    },
+
+    "merge-person-modal": {
+        "title": "{{personName}}",
+        "close": "{{common.close}}",
+        "save": "{{common.save}}",
+        "src": "Merge Person",
+        "merge-warning": "If you proceed, the selected person will be removed. The selected person's name will be added as an alias, and all their roles will be transferred.",
+        "alias-title": "New aliases",
+        "known-for-title": "Known for"
     },
 
     "day-breakdown": {
@@ -2050,7 +2303,7 @@
     "kavitaplus-metadata-breakdown-stats": {
         "title": "Kavita+ Metadata Breakdown",
         "description": "Kavita fetches metadata (ratings, reviews, recommendations, etc) slowly over time for eligible series.",
-        "no-data": "No data",
+        "no-data": "{{common.no-data}}",
         "errored-series-label": "Errored Series",
         "completed-series-label": "Completed Series",
         "complete": "All Series have metadata"
@@ -2188,7 +2441,8 @@
         "sidenav": "Side Nav",
         "external-sources": "External Sources",
         "smart-filters": "Smart Filters",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "description": "You can customize different aspects of Kavita by reordering, toggling visibility, and binding smart filters/external sources to your home page or side nav."
     },
 
     "customize-dashboard-streams": {
@@ -2196,7 +2450,8 @@
         "save": "{{common.save}}",
         "add": "{{common.add}}",
         "filter": "{{common.filter}}",
-        "clear": "{{common.clear}}"
+        "clear": "{{common.clear}}",
+        "smart-filter-title": "{{customize-dashboard-modal.title-smart-filters}}"
     },
 
     "customize-sidenav-streams": {
@@ -2227,7 +2482,15 @@
         "no-data": "No Smart Filters created",
         "filter": "{{common.filter}}",
         "clear": "{{common.clear}}",
-        "errored": "There is an encoding error in the filter. You need to recreate it."
+        "errored": "There is an encoding error in the filter. You need to recreate it.",
+        "cancel": "{{common.cancel}}",
+        "close": "{{common.close}}",
+        "edit": "{{common.edit}}",
+        "save": "{{common.save}}",
+        "edit-smart-filter": "Edit {{name}}",
+        "name-label": "Name",
+        "required-field": "Smart Filters need a name",
+        "filter-name-unique": "Smart Filter names must be unique"
     },
 
     "edit-external-source-item": {
@@ -2254,7 +2517,7 @@
         "reading-lists": "{{side-nav.reading-lists}}",
         "bookmarks": "{{side-nav.bookmarks}}",
         "all-series": "{{side-nav.all-series}}",
-        "browse-authors": "{{side-nav.browse-authors}}"
+        "browse-authors": "{{side-nav.browse-people}}"
     },
 
     "filter-field-pipe": {
@@ -2313,11 +2576,55 @@
         "is-empty": "Is Empty"
     },
 
+    "log-level-pipe": {
+        "debug": "Debug",
+        "information": "Information",
+        "trace": "Trace",
+        "warning": "Warning",
+        "critical": "Critical"
+    },
+
     "confirm": {
         "alert": "Alert",
-        "confirm": "Confirm"
+        "confirm": "Confirm",
+        "info": "Info",
+        "cancel": "{{common.cancel}}",
+        "ok": "Ok",
+        "prompt": "Question"
     },
 
+    "browse-title-pipe": {
+        "publication-status": "{{value}} works",
+        "age-rating": "Rated {{value}}",
+        "user-rating": "{{value}} star rating",
+        "tag": "Has Tag {{value}}",
+        "translator": "Translated by {{value}}",
+        "character": "Has character {{value}}",
+        "publisher": "Published by {{value}}",
+        "editor": "Edited by {{value}}",
+        "artist": "Drawn by {{value}}",
+        "letterer": "Lettered by {{value}}",
+        "colorist": "Colored by {{value}}",
+        "inker": "Inked by {{value}}",
+        "penciller": "Pencilled by {{value}}",
+        "writer": "Written by {{value}}",
+        "genre": "Has Genre {{value}}",
+        "library": "Within {{value}} library",
+        "format": "Format of {{value}}",
+        "release-year": "Released in {{value}}",
+        "imprint": "Imprint of {{value}}",
+        "team": "Team {{value}}",
+        "location": "In {{value}} location"
+    },
+
+    "generic-filter-field-pipe": {
+        "person-role": "Role",
+        "person-name": "Name",
+        "person-series-count": "Series Count",
+        "person-chapter-count": "Chapter Count"
+    },
+
+
     "toasts": {
         "regen-cover": "A job has been enqueued to regenerate the cover image",
         "no-pages": "There are no pages. Kavita was not able to read this archive.",
@@ -2359,6 +2666,7 @@
         "entity-unread": "{{name}} is now unread",
         "mark-read": "Marked as Read",
         "mark-unread": "Marked as Unread",
+        "series-added-want-to-read": "Series added from Want to Read list",
         "series-removed-want-to-read": "Series removed from Want to Read list",
         "series-deleted": "Series deleted",
         "delete-review": "Are you sure you want to delete your review?",
@@ -2368,9 +2676,8 @@
         "email-sent": "Email sent to {{email}}",
         "email-not-sent": "Email on file is not a valid email and can not be sent. A link has been dumped in logs. The admin can provide this link to complete flow.",
         "k+-license-saved": "License Key saved, but it is not valid. Click check to revalidate the subscription. First time registration may take a min to propagate.",
-        "k+-unlocked": "Kavita+ unlocked!",
         "k+-error": "There was an error when activating your license. Please try again.",
-        "k+-delete-key": "This will only delete Kavita's license key and allow a buy link to show. This will not cancel your subscription! Use this only if directed by support!",
+        "k+-delete-key": "This will only delete Kavita's license key and allow a buy link to show. This will not cancel your subscription! Use Manage to cancel your subscription first.",
         "k+-reset-key": "This will invalidate a previous registration using your license and allow you to re-register a Kavita instance.",
         "k+-reset-key-success": "Your license has been un-registered. Use Edit button to re-register your instance and re-activate Kavita+",
         "library-deleted": "Library {{name}} has been removed",
@@ -2398,6 +2705,7 @@
         "alert-long-running": "This is a long running process. Please give it the time to complete before invoking again.",
         "confirm-delete-multiple-series": "Are you sure you want to delete {{count}} series? It will not modify files on disk.",
         "confirm-delete-multiple-chapters": "Are you sure you want to delete {{count}} chapter/volumes? It will not modify files on disk.",
+        "confirm-delete-multiple-volumes": "Are you sure you want to delete {{count}} volumes? It will not modify files on disk.",
         "confirm-delete-series": "Are you sure you want to delete this series? It will not modify files on disk.",
         "confirm-delete-chapter": "Are you sure you want to delete this chapter? It will not modify files on disk.",
         "confirm-delete-volume": "Are you sure you want to delete this volume? It will not modify files on disk.",
@@ -2434,7 +2742,13 @@
         "bulk-scan": "Scanning multiple libraries will be done linearly. This may take a long time and not complete depending on library size.",
         "bulk-covers": "Refreshing covers on multiple libraries is intensive and can take a long time. Are you sure you want to continue?",
         "person-image-downloaded": "Person cover was downloaded and applied.",
-        "bulk-delete-libraries": "Are you sure you want to delete {{count}} libraries?"
+        "bulk-delete-libraries": "Are you sure you want to delete {{count}} libraries?",
+        "match-success": "Series matched correctly",
+        "webtoon-override": "Switching to Webtoon mode due to images representing a webtoon.",
+        "scrobble-gen-init": "Enqueued a job to generate scrobble events from past reading history and ratings, syncing them with connected services.",
+        "series-bound-to-reading-profile": "Series bound to Reading Profile {{name}}",
+        "library-bound-to-reading-profile": "Library bound to Reading Profile {{name}}",
+        "external-match-rate-error": "Kavita ran out of rate looking up {{seriesName}}. Try again in 5 minutes."
     },
 
     "read-time-pipe": {
@@ -2443,6 +2757,24 @@
         "hours": "Hours"
     },
 
+    "metadata-setting-field-pipe": {
+        "covers": "Covers",
+        "age-rating": "{{metadata-fields.age-rating-title}}",
+        "people": "{{tabs.people-tab}}",
+        "summary": "{{filter-field-pipe.summary}}",
+        "publication-status": "{{edit-series-modal.publication-status-title}}",
+        "start-date": "{{manage-metadata-settings.enable-start-date-label}}",
+        "genres": "{{metadata-fields.genres-title}}",
+        "tags": "{{metadata-fields.tags-title}}",
+        "localized-name": "{{edit-series-modal.localized-name-label}}",
+        "chapter-release-date": "Release Date (Chapter)",
+        "chapter-summary": "Summary (Chapter)",
+        "chapter-covers": "Covers (Chapter)",
+        "chapter-publisher": "{{person-role-pipe.publisher}} (Chapter)",
+        "chapter-title": "Title (Chapter)"
+    },
+
+
     "actionable": {
         "scan-library": "Scan Library",
         "scan-library-tooltip": "Scan library for changes. Use force scan to force checking every folder",
@@ -2470,6 +2802,13 @@
         "remove-from-on-deck": "Remove From On Deck",
         "remove-from-on-deck-tooltip": "Remove series from showing from On Deck",
 
+        "reading-profiles": "Reading Profiles",
+        "set-reading-profile": "Set Reading Profile",
+        "set-reading-profile-tooltip": "Bind a Reading Profile to this Library",
+        "clear-reading-profile": "Clear Reading Profile",
+        "clear-reading-profile-tooltip": "Clear Reading Profile for this Library",
+        "cleared-profile": "Cleared Reading Profile",
+
         "others": "Others",
         "add-to-reading-list": "Add to Reading List",
         "add-to-reading-list-tooltip": "Add to a Reading List",
@@ -2507,7 +2846,13 @@
         "multiple-selections": "Multiple Selections",
         "back-to": "Back to {{action}}",
         "title": "Actions",
-        "copy-settings": "Copy Settings From"
+        "copy-settings": "Copy Settings From",
+        "match": "Match",
+        "match-tooltip": "Match Series with Kavita+ manually",
+        "reorder": "Reorder",
+        "rename": "Rename",
+        "rename-tooltip": "Rename the Smart Filter",
+        "merge": "Merge"
     },
 
     "preferences": {
@@ -2544,6 +2889,89 @@
         "pdf-light": "Light",
         "pdf-dark": "Dark"
     },
+    "breakpoint-pipe": {
+        "never": "Never",
+        "mobile": "Mobile",
+        "tablet": "Tablet",
+        "desktop": "Desktop"
+    },
+
+    "manage-reading-profiles": {
+        "description": "Not all your series may be read in the same way, set up distinct reading profiles per library or series to make getting back in your series as seamless as possible.",
+        "extra-tip": "Assign reading profiles via the action menu on series and libraries, or in bulk. When changing settings in a reader, a hidden profile is created that remembers your choices for that series (not for pdfs). This profile is removed when you assign one of your own reading profiles to the series. More information can be found on the",
+        "wiki-title": "wiki",
+        "profiles-title": "Your reading profiles",
+        "default-profile": "Default",
+        "add": "{{common.add}}",
+        "add-tooltip": "Your new profile will be saved after making a change to it",
+        "make-default": "Set as default",
+        "no-selected": "No profile selected",
+        "confirm": "Are you sure you want to delete the reading profile {{name}}?",
+        "selection-tip": "Select a profile from the list, or create a new one at the top right",
+
+        "image-reader-settings-title": "Image Reader",
+        "reading-direction-label": "Reading Direction",
+        "reading-direction-tooltip": "Direction to click to move to next page. Right to Left means you click on left side of screen to move to next page.",
+        "scaling-option-label": "Scaling Options",
+        "scaling-option-tooltip": "How to scale the image to your screen.",
+        "page-splitting-label": "Page Splitting",
+        "page-splitting-tooltip": "How to split a full width image (ie both left and right images are combined)",
+        "reading-mode-label": "Reading Mode",
+        "reading-mode-tooltip": "Change reader to paginate vertically, horizontally, or have an infinite scroll",
+        "layout-mode-label": "Layout Mode",
+        "layout-mode-tooltip": "Render a single image to the screen or two side-by-side images",
+        "background-color-label": "Background Color",
+        "background-color-tooltip": "Background Color of Image Reader",
+        "auto-close-menu-label": "Auto Close Menu",
+        "auto-close-menu-tooltip": "Should menu auto close",
+        "show-screen-hints-label": "Show Screen Hints",
+        "show-screen-hints-tooltip": "Show an overlay to help understand pagination area and direction",
+        "emulate-comic-book-label": "Emulate comic book",
+        "emulate-comic-book-tooltip": "Applies a shadow effect to emulate reading from a book",
+        "swipe-to-paginate-label": "Swipe to Paginate",
+        "swipe-to-paginate-tooltip": "Should swiping on the screen cause the next or previous page to be triggered",
+        "allow-auto-webtoon-reader-label": "Automatic Webtoon Reader Mode",
+        "allow-auto-webtoon-reader-tooltip": "Switch into Webtoon Reader mode if pages look like a webtoon. Some false positives may occur.",
+        "width-override-label": "{{manga-reader.width-override-label}}",
+        "width-override-tooltip": "Override width of images in the reader",
+        "disable-width-override-label": "Disable width override",
+        "disable-width-override-tooltip": "Prevent the width override from taking effect when your screen is at least the configured breakpoint or smaller",
+        "reset": "{{common.reset}}",
+
+        "book-reader-settings-title": "Book Reader",
+        "tap-to-paginate-label": "Tap to Paginate",
+        "tap-to-paginate-tooltip": "Should the sides of the book reader screen allow tapping on it to move to prev/next page",
+        "immersive-mode-label": "Immersive Mode",
+        "immersive-mode-tooltip": "This will hide the menu behind a click on the reader document and turn tap to paginate on",
+        "reading-direction-book-label": "Reading Direction",
+        "reading-direction-book-tooltip": "Direction to click to move to next page. Right to Left means you click on left side of screen to move to next page.",
+        "font-family-label": "Font Family",
+        "font-family-tooltip": "Font family to load up. Default will load the book's default font",
+        "writing-style-label": "Writing Style",
+        "writing-style-tooltip": "Changes the direction of the text. Horizontal is left to right, vertical is top to bottom.",
+        "layout-mode-book-label": "Layout Mode",
+        "layout-mode-book-tooltip": "How content should be laid out. Scroll is as the book packs it. 1 or 2 Column fits to the height of the device and fits 1 or 2 columns of text per page",
+        "color-theme-book-label": "Color Theme",
+        "color-theme-book-tooltip": "What color theme to apply to the book reader content and menu",
+        "font-size-book-label": "Font Size",
+        "font-size-book-tooltip": "Percent of scaling to apply to font in the book",
+        "line-height-book-label": "Line Spacing",
+        "line-height-book-tooltip": "How much spacing between the lines of the book",
+        "margin-book-label": "Margin",
+        "margin-book-tooltip": "How much spacing on each side of the screen. This will override to 0 on mobile devices regardless of this setting.",
+
+        "pdf-reader-settings-title": "PDF Reader",
+        "pdf-scroll-mode-label": "Scroll Mode",
+        "pdf-scroll-mode-tooltip": "How you scroll through pages. Vertical/Horizontal and Tap to Paginate (no scroll)",
+        "pdf-spread-mode-label": "Spread Mode",
+        "pdf-spread-mode-tooltip": "How pages should be laid out. Single or double (odd/even)",
+        "pdf-theme-label": "Theme",
+        "pdf-theme-tooltip": "Color theme of the reader",
+
+        "reading-profile-series-settings-title": "Series",
+        "reading-profile-library-settings-title": "Library",
+        "delete": "{{common.delete}}"
+    },
 
 
     "validation": {
@@ -2618,6 +3046,9 @@
         "series-count": "{{num}} Series",
         "author-count": "{{num}} Authors",
         "item-count": "{{num}} Items",
+        "chapter-count": "{{num}} Chapters",
+        "issue-count": "{{num}} Issues",
+        "no-data": "No Data",
 
         "book-num": "Book",
         "issue-hash-num": "Issue #",
diff --git a/UI/Web/src/assets/langs/es.json b/UI/Web/src/assets/langs/es.json
index 2b3120538..2360de136 100644
--- a/UI/Web/src/assets/langs/es.json
+++ b/UI/Web/src/assets/langs/es.json
@@ -1,19 +1,19 @@
 {
     "login": {
-        "title": "Inicia sesión en tu cuenta",
+        "title": "Acceda a su cuenta",
         "username": "{{common.username}}",
         "password": "{{common.password}}",
         "password-validation": "{{validation.password-validation}}",
-        "forgot-password": "¿Has olvidado la contraseña?",
-        "submit": "Iniciar sesión"
+        "forgot-password": "¿Ha olvidado la contraseña?",
+        "submit": "Acceder"
     },
     "dashboard": {
-        "no-libraries": "No existen librerías configuradas. Crear algunas en",
+        "no-libraries": "Aún no se ha configurado ninguna biblioteca. Cree una en",
         "server-settings-link": "Configuración del servidor",
-        "not-granted": "No has sido autorizado para ver ninguna librería.",
+        "not-granted": "No tiene autorización para acceder a ninguna biblioteca.",
         "on-deck-title": "En portada",
-        "recently-updated-title": "Series Actualizadas Recientemente",
-        "recently-added-title": "Series Añadidas Recientemente",
+        "recently-updated-title": "Series actualizadas recientemente",
+        "recently-added-title": "Series añadidas recientemente",
         "more-in-genre-title": "Más en {{genre}}"
     },
     "edit-user": {
@@ -22,11 +22,11 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "saving": "Guardando …",
         "update": "Actualizar",
-        "account-detail-title": "Detalles de la cuenta"
+        "account-detail-title": "Detalles de la cuenta",
+        "invalid-email-warning": "Un correo no válido bloqueará determinadas funciones de Kavita"
     },
     "user-scrobble-history": {
         "title": "Historial de Scrobble",
@@ -39,7 +39,7 @@
         "series-header": "Series",
         "data-header": "Datos",
         "is-processed-header": "Está procesado",
-        "no-data": "No hay datos",
+        "no-data": "{{common.no-data}}",
         "volume-and-chapter-num": "Volumen {{v}} Capítulo {{n}}",
         "volume-num": "Volumen {{num}}",
         "chapter-num": "Capítulo {{num}}",
@@ -47,7 +47,10 @@
         "not-applicable": "No aplicable",
         "processed": "Procesado",
         "not-processed": "Sin procesar",
-        "special": "{{entity-title.special}}"
+        "special": "{{entity-title.special}}",
+        "token-expired": "¡Tu token de AniList ha expirado! Los eventos de scrobbling no se procesarán hasta que no sea renovado en la página de Cuentas.",
+        "generate-scrobble-events": "Eventos de Backfill",
+        "scrobbling-disabled": "Has deshabilitado el scrobbling en las configuraciones de tu cuenta"
     },
     "scrobble-event-type-pipe": {
         "chapter-read": "Progreso en la lectura",
@@ -59,15 +62,6 @@
     "spoiler": {
         "click-to-show": "Alerta de spoiler, haz clic para mostrar"
     },
-    "review-series-modal": {
-        "title": "Editar reseña",
-        "review-label": "Reseña",
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "min-length": "La reseña debe tener al menos {{count}} caracteres",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}",
         "user-review": "Reseña de {{username}}",
@@ -75,20 +69,20 @@
         "go-to-review": "Ir a la reseña"
     },
     "review-card": {
-        "your-review": "Esta es tu reseña",
+        "your-review": "Esta es su reseña",
         "external-review": "Reseña externa",
         "local-review": "Reseña local",
-        "rating-percentage": "Calificación {{r}}%"
+        "rating-percentage": "Calificación {{r}} %"
     },
     "want-to-read": {
         "title": "Quiero leer",
         "series-count": "{{common.series-count}}",
         "no-items": "No hay elementos. Prueba añadir una serie.",
-        "no-items-filtered": "Ningún elemento coincide con tu filtro actual."
+        "no-items-filtered": "Ningún elemento coincide con su filtro actual."
     },
     "user-preferences": {
         "title": "Panel de usuario",
-        "pref-description": "Estos son ajustes globales vinculados a tu cuenta.",
+        "pref-description": "Estas son configuraciones globales vinculadas a su cuenta.",
         "account-tab": "{{tabs.account-tab}}",
         "preferences-tab": "{{tabs.preferences-tab}}",
         "theme-tab": "{{tabs.theme-tab}}",
@@ -112,55 +106,6 @@
         "collapse-series-relationships-tooltip": "Kavita debería mostrar series que no tienen relaciones o es la serie madre/secuela",
         "share-series-reviews-label": "Compartir reseñas de series",
         "share-series-reviews-tooltip": "Kavita debería incluir tus reseñas de series para otros usuarios",
-        "image-reader-settings-title": "Lector de imágenes",
-        "reading-direction-label": "Dirección de lectura",
-        "reading-direction-tooltip": "Dirección para hacer clic para pasar a la siguiente página. De derecha a izquierda significa que haces clic en el lado izquierdo de la pantalla para pasar a la siguiente página.",
-        "scaling-option-label": "Opciones de escalado",
-        "scaling-option-tooltip": "Cómo ajustar la imagen a tu pantalla.",
-        "page-splitting-label": "Separación de página",
-        "page-splitting-tooltip": "Cómo separar una imagen de ancho completo (es decir, ambas imágenes izquierda y derecha están combinadas)",
-        "reading-mode-label": "Modo de lectura",
-        "reading-mode-tooltip": "Cambiar el lector a paginar verticalmente, horizontalmente, o tener un desplazamiento infinito",
-        "layout-mode-label": "Modo de diseño",
-        "layout-mode-tooltip": "Renderizar una única imagen en la pantalla o dos imágenes una al lado de la otra",
-        "background-color-label": "Color de fondo",
-        "background-color-tooltip": "Color de fondo del lector de imágenes",
-        "auto-close-menu-label": "Cerrar menú automáticamente",
-        "auto-close-menu-tooltip": "¿El menú debería cerrarse automáticamente?",
-        "show-screen-hints-label": "Mostrar sugerencias en pantalla",
-        "show-screen-hints-tooltip": "Mostrar superposiciones para ayudar a comprender las áreas de paginación y las direcciones",
-        "emulate-comic-book-label": "Emular a un cómic",
-        "emulate-comic-book-tooltip": "Agrega un efecto de sombra para imitar la lectura de un libro",
-        "swipe-to-paginate-label": "Deslizar para paginar",
-        "swipe-to-paginate-tooltip": "Permitir deslizar en la pantalla para pasar a la página anterior/siguiente",
-        "book-reader-settings-title": "Lector de libros",
-        "tap-to-paginate-label": "Tocar para paginar",
-        "tap-to-paginate-tooltip": "Los lados de la pantalla del lector de libros deben permitir tocar para pasar a la página anterior/siguiente",
-        "immersive-mode-label": "Modo inmersivo",
-        "immersive-mode-tooltip": "Esto ocultará el menú detrás de un clic en el documento del lector y activará tocar para paginar",
-        "reading-direction-book-label": "Dirección de lectura",
-        "reading-direction-book-tooltip": "Dirección para hacer clic para pasar a la siguiente página. De derecha a izquierda significa que haces clic en el lado izquierdo de la pantalla para pasar a la siguiente página.",
-        "font-family-label": "Familia de fuentes",
-        "font-family-tooltip": "Familia de fuentes para cargar. Por defecto cargará la fuente predeterminada del libro",
-        "writing-style-label": "Estilo de escritura",
-        "writing-style-tooltip": "Cambia la dirección del texto. Horizontal es de izquierda a derecha, vertical es de arriba a abajo.",
-        "layout-mode-book-label": "Modo de diseño",
-        "layout-mode-book-tooltip": "Cómo se debe organizar el contenido. Desplazable es tal como el libro se empaqueta. 1 o 2 columnas se ajusta a la altura del dispositivo y ajusta 1 o 2 columnas de texto por página",
-        "color-theme-book-label": "Tema de color",
-        "color-theme-book-tooltip": "Qué tema de color aplicar al contenido del lector de libros y al menú",
-        "font-size-book-label": "Tamaño de fuente",
-        "font-size-book-tooltip": "Porcentaje de escalado que aplicar a la fuente del libro",
-        "line-height-book-label": "Espaciado entre líneas",
-        "line-height-book-tooltip": "Cuánto espacio habrá entre las líneas del libro",
-        "margin-book-label": "Margen",
-        "margin-book-tooltip": "Cuánto espacio habrá en cada lado de la pantalla. Esto se anulará a 0 en los dispositivos móviles sin importar esta configuración.",
-        "pdf-reader-settings-title": "Lector de PDF",
-        "pdf-scroll-mode-label": "Modo de desplazamiento",
-        "pdf-scroll-mode-tooltip": "Cómo se desplaza por las páginas. Vertical/Horizontal y Toque para Paginar (sin desplazamiento)",
-        "pdf-spread-mode-label": "Modo de propagación",
-        "pdf-spread-mode-tooltip": "Cómo se deben distribuir las páginas. Simple o doble (par/impar)",
-        "pdf-theme-label": "Tema",
-        "pdf-theme-tooltip": "Tema de color del lector",
         "clients-opds-alert": "OPDS no está habilitado en este servidor. Esto no afectará a los usuarios de Tachiyomi.",
         "clients-opds-description": "Todos los clientes de terceros usarán la clave API o la URL de conexión a continuación. Estos son como contraseñas, mantenlo en privado.",
         "clients-api-key-tooltip": "La clave API es como una contraseña. Restablecerla invalidará cualquier cliente existente.",
@@ -168,12 +113,18 @@
         "clients-api-key-label": "Clave API",
         "clients-opds-url-tooltip": "Ver lista de clientes OPDS compatibles: ",
         "reset": "{{common.reset}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "kavitaplus-settings-title": "Kavita+",
+        "anilist-scrobbling-label": "AniList Scrobbling",
+        "anilist-scrobbling-tooltip": "Permite a Kavita scrobblear (sincronizar unilateralmente) tu progreso y tus evaluaciones a AniList"
     },
     "user-holds": {
         "title": "Retenciones de scrobble",
         "description": "Se trata de una lista gestionada por el usuario de series que no serán scrobbleadas a proveedores de upstream. Puedes eliminar una serie en cualquier momento y el siguiente evento scrobble-able (progreso de lectura, calificación, desea leer el estado) activará los eventos.",
-        "no-data": "{{typeahead.no-data}}"
+        "no-data": "{{typeahead.no-data}}",
+        "series-name-header": "{{manage-matched-metadata.series-name-header}}",
+        "created-header": "{{manage-media-issues.created-header}}",
+        "delete-label": "{{common.remove}}"
     },
     "theme-manager": {
         "title": "Gestor de temas",
@@ -225,7 +176,7 @@
         "platform-label": "Plataforma",
         "email-label": "Correo electrónico",
         "name-label": "Nombre",
-        "email-setup-alert": "¿Quieres enviar archivos a tus dispositivos? ¡Pídele a tu administrador que configure primero el correo electrónico!",
+        "email-setup-alert": "¿Quiere enviar archivos a sus dispositivos? Pida al personal administrativo que configure primero el correo electrónico.",
         "add": "{{common.add}}",
         "delete": "{{common.delete}}",
         "edit": "{{common.edit}}",
@@ -256,7 +207,7 @@
         "save": "{{common.save}}",
         "required-field": "{{validation.required-field}}",
         "passwords-must-match": "Las contraseñas deben coincidir",
-        "permission-error": "No tienes permiso para cambiar la contraseña. Contacta con el administrador del servidor."
+        "permission-error": "No tiene permiso para cambiar la contraseña. Contacte con el personal administrativo del servidor."
     },
     "change-email": {
         "email-title": "Correo electrónico",
@@ -269,8 +220,8 @@
         "setup-user-account": "Configurar cuenta de usuario",
         "invite-url-label": "Enlace de invitación",
         "invite-url-tooltip": "Copia y pégalo en una nueva ventana",
-        "has-invalid-email": "Parece que no tienes una dirección de correo electrónico válida. Cambiar el correo electrónico requerirá que el administrador le envíe un enlace para completar esta acción.",
-        "permission-error": "No tienes permiso para cambiar tu dirección de correo electrónico. Contacta a un administrador del servidor.",
+        "has-invalid-email": "Parece que no tiene una dirección de correo electrónico válida. Cambiar el correo electrónico requerirá que el administrador le envíe un enlace para completar esta acción.",
+        "permission-error": "No tiene permiso para cambiar su dirección de correo electrónico. Contacte con un administrador del servidor.",
         "required-field": "{{validation.required-field}}",
         "valid-email": "{{validation.valid-email}}",
         "reset": "{{common.reset}}",
@@ -290,7 +241,7 @@
         "copy": "Copiar",
         "show": "Mostrar",
         "hide": "Ocultar",
-        "regen-warning": "Regenerar tu Clave de API invalidará los clientes conectados.",
+        "regen-warning": "Regenerar su clave de API invalidará los clientes conectados.",
         "no-key": "ERROR - KEY NOT SET",
         "confirm-reset": "Esto invalidará cualquier configuración de OPDS. Estás seguro que quieres continuar?",
         "key-reset": "Resetear Clave de API"
@@ -304,7 +255,7 @@
         "token-set": "Token configurado",
         "generate": "Generar",
         "generic-instructions": "Complete la información sobre los diferentes servicios externos que debe permitir que Kavita+ interactúe con ellos.",
-        "instructions": "First time users should click on \"{{scrobbling-providers.generate}}\" below to allow Kavita+ to talk with {{service}}. Once you authorize the program, copy and paste the token in the input below. You can regenerate your token at any time.",
+        "instructions": "Los usuarios que usen el servicio por primera vez deben hacer clic en \"{{scrobbling-providers.generate}}\" para permitir que Kavita+ se comunique con {{service}}. Una vez autorizado, copia y pega el token en la caja de abajo. Puedes regenerar tu token en cualquier momento.",
         "mal-instructions": "Kavita utiliza una identificación de cliente MAL para la autenticación. Cree un nuevo Cliente para Kavita y, una vez aprobado, proporcione la identificación del cliente y su nombre de usuario.",
         "scrobbling-applicable-label": "Scrobbling aplicable",
         "token-input-label": "El token de {{service}} va aquí",
@@ -313,14 +264,20 @@
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
-        "loading": "{{common.loading}}"
+        "loading": "{{common.loading}}",
+        "anilist-used-for": "AniList es usado para hacer scrobbling (sincronizar datos) y para sincronizar la lista de \"Quiero leer\".",
+        "anilist-first-header": "Se ha guardado el token de AniList",
+        "anilist-first-description": "Se ha establecido tu token de Anilist. Este token tiene una duración máxima de un año. Kavita te informará antes de que expire para que lo refresques aquí. Con él, Kavita generará eventos de scrobble (sincronización) desde tu historial de lecturas, tu lista de \"Quiero Leer\" y las calificaciones. Puedes empezar a generarlos ahora, o más tarde. Si tienes alguna serie que no quieres que sea sometida a un evento de scrobbling, selecciona \"después\" y aplícales una retención de scrobble. Solo necesitarás ejecutar esta tarea una vez. Luego, Kavita manejará la sincronización por ti.
           Si seleccionas \"después\", podrás encontrar el botón en la página de \"Scrobbling\".",
+        "mal-used-for": "MyAnimeList es usado para las \"Colecciones Inteligentes\" y para sincronizar la lista de \"Quiero Leer\".",
+        "anilist-first-later": "Después",
+        "anilist-first-now": "Ahora"
     },
     "typeahead": {
         "locked-field": "El campo está bloqueado",
         "close": "{{common.close}}",
         "loading": "{{common.loading}}",
         "add-item": "Añadir {{item}}…",
-        "no-data": "No existen datos",
+        "no-data": "{{common.no-data}}",
         "add-custom-item": ", escribe para añadir un objeto"
     },
     "generic-list-modal": {
@@ -347,7 +304,7 @@
         "pages-count": "{{num}} páginas"
     },
     "user-stats": {
-        "library-read-progress-title": "Progreso de lectura de librería",
+        "library-read-progress-title": "Progreso de lectura de biblioteca",
         "read-percentage": "% Leído"
     },
     "top-readers": {
@@ -383,12 +340,12 @@
     "library-access-modal": {
         "select-all": "{{common.select-all}}",
         "deselect-all": "{{common.deselect-all}}",
-        "title": "Acceso a librería",
+        "title": "Acceso a biblioteca",
         "close": "{{common.close}}",
         "reset": "{{common.reset}}",
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
-        "no-data": "No hay librerías configuradas todavía."
+        "no-data": "No hay bibliotecas configuradas todavía."
     },
     "time-periods": {
         "this-week": "Esta semana",
@@ -417,10 +374,10 @@
     },
     "cbl-conflict-reason-pipe": {
         "all-series-missing": "Tu cuenta no tiene acceso a todas las series de la lista o Kavita no tiene nada presente en la lista.",
-        "chapter-missing": "{{series}}: Capítulo {{chapter}} no presente en Kavita. Este item será saltado.",
+        "chapter-missing": "{{series}}: falta el capítulo {{chapter}} en Kavita. Se pasará por alto este elemento.",
         "empty-file": "El archivo CBL está vacío. Ninguna acción realizada.",
         "name-conflict": "Una lista de lectura que coincide con el archivo CBL ({{readingListName}}) ya existe en tu cuenta.",
-        "series-collision": "La serie, {{seriesLink}}, tiene conflicto con otra serie en otra librería.",
+        "series-collision": "La serie, {{seriesLink}}, entra en conflicto con otra serie del mismo nombre en otra biblioteca.",
         "series-missing": "La serie, {{series}}, falta en Kavita o tu cuenta no tiene permiso. Todos los artículos con esta serie se omitirán de la importación.",
         "volume-missing": "{{series}}: El volumen {{volume}} no existe en Kavita o tu cuenta no está autorizada. Todos los elementos con este número de volumen serán ignorados.",
         "all-chapter-missing": "Todos los capítulos no pueden coincidir con los capítulos de Kavita.",
@@ -450,9 +407,9 @@
     },
     "relationship-pipe": {
         "adaptation": "Adaptacion",
-        "alternative-setting": "Ajuste Alternativo",
-        "alternative-version": "Version alternativa",
-        "character": "Personajes",
+        "alternative-setting": "Ambientación alternativa",
+        "alternative-version": "Versión alternativa",
+        "character": "Personaje",
         "contains": "Contiene",
         "doujinshi": "Doujinshi",
         "other": "Otro",
@@ -483,7 +440,7 @@
         "publisher": "Editorial",
         "writer": "Escritor",
         "other": "Otro",
-        "imprint": "Imprimir",
+        "imprint": "Sello",
         "translator": "Traductor",
         "team": "{{filter-field-pipe.team}}",
         "location": "{{filter-field-pipe.location}}"
@@ -553,7 +510,7 @@
         "title": "¡No te quedes atrás!",
         "close": "{{common.close}}",
         "subtitle": "¡Parece que tu instalación lleva más de {{count}} versiones de retraso!",
-        "description-1": "Por favor, considere la actualización para que esté ejecutando la última versión de Kavita.",
+        "description-1": "Considere actualizar para ejecutar la versión más reciente de Kavita.",
         "description-2": "Eche un vistazo a nuestra wiki para obtener instrucciones sobre cómo actualizar.",
         "description-3": "Si hay una razón específica por la que aún no has actualizado, ¡nos encantaría saber qué te mantienes en una versión obsoleta! Deténgase en nuestro discord y háganos saber qué está bloqueando su camino a la actualización."
     },
@@ -561,10 +518,7 @@
         "installed": "Instalado",
         "download": "Descarga",
         "nightly": "Nightly: {{version}}",
-        "published-label": "Publicado: ",
-        "available": "Disponible",
-        "description": "Si no ves una etiqueta {{installed}}",
-        "description-continued": "etiquetas, estás usando la versión nocturna. Sólo las versiones principales aparecerán como disponibles. La etiqueta nocturna aparecerá cuando utilice la versión nocturna de la versión estable."
+        "available": "Disponible"
     },
     "invite-user": {
         "title": "Invitar usuario",
@@ -573,9 +527,9 @@
         "email": "{{common.email}}",
         "required-field": "{{common.required-field}}",
         "setup-user-title": "Usuario invitado",
-        "setup-user-description": "Puedes utilizar el siguiente enlace para configurar la cuenta de tu usuario o utilizar el botón Copiar. Es posible que debas cerrar sesión antes de utilizar el enlace para registrar un nuevo usuario.",
+        "setup-user-description": "Puede usar el siguiente enlace para configurar la cuenta de su usuario o utilizar el botón Copiar. Es posible que deba cerrar sesión antes de utilizar el enlace para registrar un usuario nuevo.",
         "setup-user-account": "Configurar cuenta de usuario",
-        "setup-user-account-tooltip": "Copia y pega esto en una nueva pestaña. Puede que tengas que cerrar la sesión actual.",
+        "setup-user-account-tooltip": "Copie y pegue esto en una pestaña nueva. Puede que tenga que finalizar la sesión actual.",
         "invite-url-label": "Enlace de invitación",
         "invite": "Invitar",
         "inviting": "Invitando…",
@@ -600,7 +554,7 @@
         "activate": "Activar",
         "renew": "Renovar",
         "no-license-key": "Sin clave de licencia",
-        "license-valid": "Licencia es valida",
+        "license-valid": "La licencia es válida",
         "license-not-valid": "Licencia no válida",
         "loading": "{{common.loading}}",
         "activate-description": "Introduce clave de licencia y correo usado al registrar en Stripe",
@@ -610,15 +564,35 @@
         "activate-discordId-tooltip": "Vincula tu cuenta de Discord con Kavita+. Esto te da acceso a canales ocultos para ayudar a dar forma a Kavita.",
         "discord-validation": "Este no es un ID de usuario de Discord válido. Tu ID de usuario no es tu nombre de usuario de discordia.",
         "activate-delete": "{{common.delete}}",
-        "activate-reset": "{{common.reset}}",
+        "activate-reset": "Reestablecer Licencia",
         "activate-reset-tooltip": "Invalidar un registro anterior utilizando tu licencia. Requiere licencia y correo electrónico",
         "activate-save": "{{common.save}}",
         "kavita+-desc-part-1": "Kavita+ es una suscripción premium que desbloquea funciones para todos los usuarios en esta instancia de Kavita. Compra una suscripción para desbloquear­ ",
         "kavita+-desc-part-2": "ventajas premium",
         "kavita+-desc-part-3": "¡hoy!",
-        "kavita+-requirement": "Kavita+ está diseñado para funcionar solo con la última versión - 2 versiones. Cualquier otra seguramente no funcione.",
-        "kavita+-releases": "Ver versiones",
-        "help-label": "{{common.help}}"
+        "kavita+-requirement": "Kavita+ está diseñado para funcionar solo con las 3 versiones más recientes. Cualquier otra puede no funcionar.",
+        "help-label": "{{common.help}}",
+        "k+-unlocked": "¡Kavita+ desbloqueado!",
+        "valid-tooltip": "Válido",
+        "overwrite": "Sobreescribir",
+        "reset-label": "Restablecer",
+        "invalid-tooltip": "No válido",
+        "k+-already-registered-header": "Esta licencia ya está registrada",
+        "license-active-label": "Licencia Activa",
+        "expiration-label": "Expiración",
+        "info-title": "Información sobre la licencia",
+        "actions-title": "Acciones",
+        "reset-tooltip": "Esto reestablecerá la licencia de Kavita+ con la que este servidor está vinculado. Requiere Email y la llave de la licencia",
+        "delete-label": "Eliminar la licencia",
+        "delete-tooltip": "Esto eliminará la licencia de Kavita para detener la comunicación entre este y Kavita+. No se le da de baja. Utilice «Gestionar» primero para cancelar la suscripción.",
+        "manage-tooltip": "Actualizar información de pago, Cancelar/Pausar suscripción, etcétera",
+        "faq-title": "Preguntas frecuentes",
+        "total-subbed-months-label": "Meses de suscripción",
+        "email-label": "Email registrado",
+        "license-mismatch": "Esta licencia puede estar vinculada a otra instancia de Kavita. Vuelve a registrarla para arreglarlo.",
+        "k+-license-overwrite": "Esta licencia está vinculada a otra instancia de Kavita. Esto puede ocurrir luego de una reinstalación, o, raramente, como un efecto secundario de una actualización del sistema. Selecciona \"sobreescribir\" para forzar esta instancia a registrarse con Kavita+.",
+        "k+-unlocked-description": "¡Bienvenido a Kavita+! Kavita generará eventos de scrobble basándose en tu progreso, calificaciones y lista de \"Quiero Leer\" luego de que registres tus servicios proveedores de Scrobbling dentro de tu cuenta. Asegúrate de que les agregues una retención de scrobbling a las series que no quieres que sean sincronizadas.",
+        "supported-version-label": "En versión admitida de Kavita"
     },
     "book-line-overlay": {
         "copy": "Copiar",
@@ -629,38 +603,38 @@
         "save": "{{common.save}}"
     },
     "book-reader": {
-        "title": "Ajustes de libro",
+        "title": "Configuración de libro",
         "page-label": "Página",
         "pagination-header": "Sección",
         "go-to-page": "Ir a página",
         "go-to-last-page": "Ir a la última página",
         "prev-page": "Página anterior",
         "next-page": "Siguiente página",
-        "prev-chapter": "Capitulo/Volume anteriorn",
-        "next-chapter": "Siguiente Capitulo/Volumen",
+        "prev-chapter": "Capítulo/volumen anterior",
+        "next-chapter": "Capítulo/volumen siguiente",
         "skip-header": "Saltar al contenido principal",
-        "virtual-pages": "paginas virtuales",
-        "settings-header": "Ajustes",
-        "table-of-contents-header": "Tabla de Contenidos",
+        "virtual-pages": "páginas virtuales",
+        "settings-header": "Configuración",
+        "table-of-contents-header": "Sumario",
         "bookmarks-header": "{{side-nav.bookmarks}}",
-        "toc-header": "Índice",
+        "toc-header": "Sumario",
         "loading-book": "Cargando libro…",
         "go-back": "Ir atrás",
         "close-reader": "Cerrar el lector",
         "incognito-mode-alt": "Modo incognito activado. Pulsa para desactivar.",
-        "incognito-mode-label": "Modo incognito",
+        "incognito-mode-label": "Modo incógnito",
         "next": "Siguiente",
         "previous": "Anterior",
-        "go-to-page-prompt": "Hay {{totalPages}} páginas. A qué pagina quieres ir?"
+        "go-to-page-prompt": "Hay {{totalPages}} páginas. ¿A qué página quiere ir?"
     },
     "personal-table-of-contents": {
         "no-data": "Todavía no se ha guardado nada en marcadores",
-        "page": "Page {{value}}",
+        "page": "Página {{value}}",
         "delete": "Eliminar {{bookmarkName}}"
     },
     "confirm-email": {
-        "title": "Registrar",
-        "description": "Completa el formulario para completar tu registro",
+        "title": "Registrarse",
+        "description": "Complete el formulario para completar su registro",
         "username-label": "{{common.username}}",
         "password-label": "{{common.password}}",
         "email-label": "{{common.email}}",
@@ -672,7 +646,7 @@
     },
     "confirm-email-change": {
         "title": "Validar cambio de correo",
-        "non-confirm-description": "Por favor espera mientras el cambio de correo se valida.",
+        "non-confirm-description": "Espere mientras el cambio de correo electrónico se valida.",
         "confirm-description": "Tu correo ha sido validado y cambiado en Kavita. Serás redirigido al inicio de sesion.",
         "success": "Exito!"
     },
@@ -697,16 +671,16 @@
         "register": "Registrar"
     },
     "series-detail": {
-        "page-settings-title": "Ajustes de página",
+        "page-settings-title": "Configuración de página",
         "close": "{{common.close}}",
         "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
-        "layout-mode-option-card": "Carta",
+        "layout-mode-option-card": "Tarjeta",
         "layout-mode-option-list": "Lista",
         "continue-from": "Continuar {{title}}",
         "read": "{{common.read}}",
         "continue": "Continuar",
-        "read-incognito": "Leer en incognito",
-        "continue-incognito": "Continuar en incognito",
+        "read-incognito": "Leer en incógnito",
+        "continue-incognito": "Continuar en incógnito",
         "read-options-alt": "Opciones de lectura",
         "incognito": "Incógnito",
         "remove-from-want-to-read": "{{actionable.remove-from-want-to-read}}",
@@ -723,10 +697,8 @@
         "recommendations-tab": "{{tabs.recommendations-tab}}",
         "send-to": "Archivo enviado a {{deviceName}}",
         "no-pages": "{{toasts.no-pages}}",
-        "no-chapters": "No existen capitulos en este volumen. No se puede leer.",
+        "no-chapters": "No existen capítulos en este volumen. No se puede leer.",
         "cover-change": "Puede tomar hasta un minuto para que tu navegador actualice la imagen. Espera hasta entonces. La imagen antigua se puede mostrar en algunas páginas.",
-        "user-reviews-local": "Reseñas locales",
-        "user-reviews-plus": "Reseñas externas",
         "writers-title": "{{metadata-fields.writers-title}}",
         "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
         "characters-title": "{{metadata-fields.characters-title}}",
@@ -771,7 +743,7 @@
         "translators-title": "Traductores",
         "pencillers-title": "Dibujantes",
         "publishers-title": "Editoriales",
-        "imprints-title": "Impresores",
+        "imprints-title": "Sellos",
         "teams-title": "Equipos",
         "locations-title": "Ubicaciones",
         "language-title": "Idioma",
@@ -784,8 +756,8 @@
     },
     "external-rating": {
         "entry-label": "Ver detalles",
-        "kavita-tooltip": "Tu clasificación + Total",
-        "kavita-rating-title": "Tu valoración",
+        "kavita-tooltip": "Su clasificación + Total",
+        "kavita-rating-title": "Su valoración",
         "close": "{{common.close}}"
     },
     "badge-expander": {
@@ -820,38 +792,37 @@
         "donate-tooltip": "Puedes eliminarlo suscribiéndote a Kavita+",
         "back": "Atras",
         "more": "Ver más",
-        "customize": "{{settings.customize}}",
-        "browse-authors": "Buscar autores"
+        "customize": "{{settings.customize}}"
     },
     "library-settings-modal": {
         "close": "{{common.close}}",
         "edit-title": "Editar {{name}}",
-        "add-title": "Añadir librería",
+        "add-title": "Añadir biblioteca",
         "general-tab": "{{tabs.general-tab}}",
         "folder-tab": "{{tabs.folder-tab}}",
         "cover-tab": "{{tabs.cover-tab}}",
         "advanced-tab": "{{tabs.advanced-tab}}",
         "tasks-tab": "{{tabs.tasks-tab}}",
         "name-label": "Nombre",
-        "library-name-unique": "El nombre de la librería debe ser únic",
+        "library-name-unique": "El nombre de la biblioteca debe ser único",
         "last-scanned-label": "Ultima vez escaneado:",
         "type-label": "Tipo",
         "type-tooltip": "El tipo de biblioteca determina cómo se analizan los nombres de los archivo y si la interfaz de usuario muestra capítulos (manga) y números (cómics). Consulta la wiki para obtener más detalles sobre las diferencias entre los tipos de biblioteca.",
         "kavitaplus-eligible-label": "Kavita+ admisible",
         "kavitaplus-eligible-tooltip": "¿Kavita+ obtendrá información o admitirá Scrobbling?",
-        "folder-description": "Añadir carpetas a tu librería",
+        "folder-description": "Añadir carpetas a su biblioteca",
         "browse": "Examinar las Carpetas Multimedia",
-        "help-us-part-1": "Ayudanos siguiendo ",
+        "help-us-part-1": "Ayúdenos siguiendo ",
         "help-us-part-2": "nuestra guía",
         "help-us-part-3": "para nombrar y organizar tus archivos.",
         "naming-conventions-part-1": "Kavita tiene ",
-        "naming-conventions-part-2": "requerimientos de carpetas.",
+        "naming-conventions-part-2": "requisitos de carpetas.",
         "naming-conventions-part-3": "Comprueba este enlace para asegurarte que estás siguiendo los requerimientos. De lo contrario algunos archivos no se mostrarán al escanear.",
         "cover-description": "Los iconos de bibliotecas personalizadas son opcionales",
-        "cover-description-extra": "Las imágenes de biblioteca no deben ser grandes. Usa un archivo pequeño, de 32x32 píxeles. Kavita no valida por tamaño.",
-        "manage-collection-label": "Gestionar Colecciones",
+        "cover-description-extra": "Las imágenes de biblioteca no deben ser grandes. Use un archivo pequeño, de 32 × 32 píxeles. Kavita no valida el tamaño.",
+        "manage-collection-label": "Gestionar colecciones",
         "manage-collection-tooltip": "¿Debería Kavita crear colecciones a partir de las etiquetas SeriesGroup que se encuentran en los archivos ComicInfo.xml/opf?",
-        "manage-reading-list-label": "Gestionar Listas de Lectura",
+        "manage-reading-list-label": "Gestionar listas de lectura",
         "manage-reading-list-tooltip": "¿Debe Kavita crear listas de lectura a partir de las etiquetas StoryArc/StoryArcNumber y AlternativeSeries/AlternativeCount que se encuentran en los archivos ComicInfo.xml/opf?",
         "allow-scrobbling-label": "Permitir scrobbling",
         "allow-scrobbling-tooltip": "En caso de que Kavita scrobble lea los eventos, quiera leer el estado, las calificaciones y las reseñas de los proveedores configurados. Esto solo ocurrirá si el servidor tiene una suscripción Kavita+ activa.",
@@ -969,18 +940,19 @@
     "related-tab": {
         "reading-lists-title": "{{reading-lists.title}}",
         "collections-title": "{{side-nav.collections}}",
-        "relations-title": "{{tabs.related-tab}}"
+        "relations-title": "{{tabs.related-tab}}",
+        "bookmarks-title": "{{side-nav.bookmarks}}"
     },
     "cover-image-chooser": {
-        "enter-an-url-pre-title": "Introduzca una {{url}}",
-        "url": "Dirección url",
+        "enter-an-url-pre-title": "Introduzca un {{url}}",
+        "url": "URL",
         "drag-n-drop": "Arrastrar y soltar",
         "upload": "Subir",
         "upload-continued": "una imagen",
-        "url-label": "Url",
+        "url-label": "URL",
         "load": "Cargar",
         "back": "Atrás",
-        "reset-cover-tooltip": "Restablecer Imagen de Portada",
+        "reset-cover-tooltip": "Restablecer imagen de cubierta",
         "reset": "{{common.reset}}",
         "image-num": "Imagen {{num}}",
         "apply": "{{common.apply}}",
@@ -1028,7 +1000,7 @@
         "file-header": "Archivo",
         "comment-header": "Comentario",
         "created-header": "Creado",
-        "no-data": "Sin datos"
+        "no-data": "{{common.no-data}}"
     },
     "manage-email-settings": {
         "description": "Para utilizar algunas funciones de Kavita, como Enviar a dispositivo, se debe configurar un proveedor de correo electrónico. Otras funciones, como Olvidé mi contraseña, requieren la intervención del administrador sin necesidad de configurar el correo electrónico.",
@@ -1066,14 +1038,14 @@
     "manage-library": {
         "title": "Bibliotecas",
         "add-library": "Añadir biblioteca",
-        "no-data": "No existen bibliotecas. Prueba a crear una.",
+        "no-data": "No existen bibliotecas. Pruebe a crear una.",
         "loading": "{{common.loading}}",
         "last-scanned-title": "Último escaneo",
         "shared-folders-title": "Carpetas compartidas",
         "type-title": "Tipo",
         "scan-library": "Escanear biblioteca",
-        "delete-library": "Borrar biblioteca",
-        "delete-library-by-name": "Borrar {{name}}",
+        "delete-library": "Eliminar biblioteca",
+        "delete-library-by-name": "Eliminar {{name}}",
         "edit-library": "Editar",
         "edit-library-by-name": "Eliminar {{name}}",
         "folder-count": "{{num}} carpetas",
@@ -1096,7 +1068,7 @@
         "title": "Copia los ajustes de una biblioteca a otras"
     },
     "manage-media-settings": {
-        "encode-as-description-part-1": "WebP/AVIF puede reducir drásticamente el espacio requerido para archivos. WebP/AVIF no está soportado por todos los navegadores o versiones. Para comprobar si estos ajustes son apropiados para tu configuración, visita ",
+        "encode-as-description-part-1": "WebP/AVIF puede reducir drásticamente el espacio requerido para archivos. No todos los navegadores o versiones admiten WebP/AVIF. Para comprobar si estas configuraciones son apropiadas en su situación, visite ",
         "encode-as-description-part-2": "¿Puedo usar WebP?",
         "encode-as-description-part-3": "¿Puedo usar AVIF?",
         "encode-as-warning": "No puedes convertir de nuevo a PNG una vez ya has obtenido WebP/AVIF. Necesitarías recargar las portadas en tus bibliotecas para regenerar todas las portadas. Los marcadores y favicons no se pueden convertir.",
@@ -1111,14 +1083,14 @@
         "save": "{{common.save}}",
         "media-issue-title": "Problemas multimedia",
         "scrobble-issue-title": "Problemas con el scrobbling",
-        "cover-image-size-label": "Tamaño de la imagen de portada",
+        "cover-image-size-label": "Tamaño de la imagen de cubierta",
         "cover-image-size-tooltip": "Con qué tamaño deberían generarse las imágenes de portada. Nota: Cualquier tamaño mayor que el establecido por defecto provocará tiempo de carga mayores."
     },
     "cover-image-size": {
-        "default": "Por defecto (320x455)",
-        "medium": "Mediano (640x909)",
-        "large": "Grande (900x1277)",
-        "xlarge": "Extragrande (1265x1795)"
+        "default": "Predeterminado (320 × 455)",
+        "medium": "Mediano (640 × 909)",
+        "large": "Grande (900 × 1277)",
+        "xlarge": "Extragrande (1265 × 1795)"
     },
     "manage-scrobble-errors": {
         "title": "Errores de scrobbling",
@@ -1177,11 +1149,11 @@
         "save": "{{common.save}}",
         "cache-size-validation": "Debes tener al menos 50 MB.",
         "field-required": "{{validation.field-required}}",
-        "max-logs-validation": "No puedes tener más de {{num}} registros",
-        "min-logs-validation": "Tienes que tener al menos un registro",
+        "max-logs-validation": "No puede tener más de {{num}} registros",
+        "min-logs-validation": "Debe tener al menos un registro",
         "min-days-validation": "Debe ser al menos un día",
         "min-cache-validation": "Debe estar a 50 MB.",
-        "max-backup-validation": "No puedes tener más de {{num}} copias de seguridad",
+        "max-backup-validation": "No puede tener más de {{num}} copias de respaldo",
         "min-backup-validation": "Debes tener al menos 1 copia de seguridad",
         "ip-address-validation": "Las direcciones IP pueden contener solamente direcciones IPv4 o IPV6 válidas",
         "base-url-validation": "La URL base debe comenzar y terminar con /"
@@ -1233,9 +1205,9 @@
         "bust-cache-task": "Eliminar caché",
         "bust-cache-task-desc": "Eliminar la caché de Kavita+ - solamente se debería usar cuando se depuren malas coincidencias.",
         "bust-cache-task-success": "Caché de Kavita+ eliminada",
-        "bust-locale-task": "Borrar la caché local",
-        "bust-locale-task-desc": "Borra la caché local; esto puede resolver los problemas con las cadenas que no se muestran correctamente después de las actualizaciones. Es necesario recargar la página.",
-        "bust-locale-task-success": "Borrada la caché local",
+        "bust-locale-task": "Limpiar la caché de localización",
+        "bust-locale-task-desc": "Borra la caché de localización; esto puede resolver los problemas con las cadenas que no se muestran correctamente después de las actualizaciones. Es necesario recargar la página.",
+        "bust-locale-task-success": "Caché de localización borrada",
         "clear-reading-cache-task": "Limpiar caché de lectura",
         "clear-reading-cache-task-desc": "Limpia los archivos de caché de lectura. Esto es útil cuando acabas de actualizar un archivo que habías estado leyendo en las últimas 24 horas.",
         "clear-reading-cache-task-success": "La caché se ha limpiado",
@@ -1247,9 +1219,6 @@
         "backup-database-task-success": "Se ha puesto en cola una tarea para realizar una copia de seguridad de la base de datos",
         "download-logs-task": "Descargar registros",
         "download-logs-task-desc": "Compila todos los archivos de registro en un zip y lo descarga.",
-        "analyze-files-task": "Analizar archivos",
-        "analyze-files-task-desc": "Inicia una tarea de larga duración que analizará los archivos para detectar extensión y tamaño. Esto solo debería usarse una sola vez en la versión 0.7. No es necesario para versiones posteriores a la 0.7.",
-        "analyze-files-task-success": "El análisis de archivos se ha puesto en cola",
         "sync-themes-task": "Sincronizar temas",
         "sync-themes-task-desc": "Sincronizar los temas descargados con los cambios ascendentes si la versión coincide.",
         "sync-themes-success": "La sincronización de temas se ha puesto en espera",
@@ -1277,7 +1246,6 @@
         "change-password-alt": "Cambiar contraseña de {{user}}",
         "resend": "Reenviar",
         "setup": "Configuración",
-        "admin": "Admr.",
         "last-active-header": "Activo por última vez",
         "roles-header": "Roles",
         "name-header": "Nombre",
@@ -1329,7 +1297,7 @@
         "server-section-title": "Servidor",
         "info-section-title": "Información",
         "import-section-title": "Importar",
-        "kavitaplus-section-title": "{{settings.admin-kavitaplus}}",
+        "kavitaplus-section-title": "Kavita+",
         "admin-general": "General",
         "admin-users": "Usuarios",
         "admin-libraries": "Bibliotecas",
@@ -1340,7 +1308,7 @@
         "admin-tasks": "Tareas",
         "admin-statistics": "Estadísticas",
         "admin-system": "Sistema",
-        "admin-kavitaplus": "Kavita+",
+        "admin-kavitaplus": "Licencia",
         "account": "Cuenta",
         "preferences": "Preferencias",
         "clients": "Clave API / OPDS",
@@ -1350,7 +1318,8 @@
         "theme": "Tema",
         "customize": "Personalizar",
         "cbl-import": "Lista de lectura en CBL",
-        "mal-stack-import": "Stack de MyAnimeList"
+        "mal-stack-import": "Stack de MyAnimeList",
+        "scrobble-holds": "Retenciones de Scrobble"
     },
     "collection-detail": {
         "no-data": "No hay elementos. Prueba a añadir una serie.",
@@ -1392,14 +1361,14 @@
     "stream-list-item": {
         "remove": "{{common.remove}}",
         "load-filter": "Cargar filtro",
-        "provided": "Proporcionado",
+        "provided": "Provisto",
         "smart-filter": "Filtros",
-        "library": "Libreria",
+        "library": "Biblioteca",
         "external-source": "Fuente externa"
     },
     "reading-list-detail": {
         "item-count": "{{common.item-count}}",
-        "page-settings-title": "Ajustes de Página",
+        "page-settings-title": "Configuración de página",
         "remove-read": "Quitar Leídos",
         "order-numbers-label": "Ordenar Números",
         "continue": "Continuar",
@@ -1502,8 +1471,8 @@
     },
     "import-mal-collection-modal": {
         "close": "{{common.close}}",
-        "title": "Importación del conjunto de intereses MAL",
-        "description": "Importe sus grupo de intereses de la MAL y cree colecciones en Kavita",
+        "title": "Importación de la pila de intereses MAL",
+        "description": "Importe sus pilas de intereses de MAL y cree colecciones en Kavita",
         "series-count": "{{common.series-count}}",
         "restack-count": "{{num}} Reacciones",
         "nothing-found": "No se encontró nada",
@@ -1535,7 +1504,7 @@
         "dry-run-step": "Prueba",
         "final-import-step": "Último paso",
         "comicvine-parsing-label": "Utilice la combinación de la serie Comic Vine",
-        "cbl-repo": "Puedes encontrar muchas listas de lectura en la comunidad en el repositorio.",
+        "cbl-repo": "Encontrará muchas listas de lectura en el repositorio comunitario.",
         "help-label": "{{common.help}}"
     },
     "pdf-reader": {
@@ -1549,7 +1518,7 @@
     "pdf-layout-mode-pipe": {
         "single": "Una página",
         "book": "Modo libro",
-        "multiple": "Por defecto",
+        "multiple": "Predeterminado",
         "infinite-scroll": "Desplazamiento infinito"
     },
     "pdf-scroll-mode-pipe": {
@@ -1571,7 +1540,6 @@
     },
     "manga-reader": {
         "back": "Volver",
-        "save-globally": "Guardar globalmente",
         "incognito-alt": "El modo incógnito está encendido. Desliza para apagar.",
         "incognito-title": "Modo incógnito:",
         "shortcuts-menu-alt": "Modo de atajos de teclado",
@@ -1606,7 +1574,6 @@
         "layout-mode-switched": "El modo de diseño se ha cambiado a Individual ya que no hay espacio suficiente para renderizar el diseño doble",
         "no-next-chapter": "No hay siguiente Capítulo",
         "no-prev-chapter": "No hay Capítulo Anterior",
-        "user-preferences-updated": "Preferencias de usuario actualizadas",
         "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}",
         "series-progress": "Progreso de la serie: {{porcentage}}"
     },
@@ -1621,11 +1588,11 @@
         "save": "{{common.save}}",
         "limit-label": "Limitar",
         "format-label": "Formato",
-        "libraries-label": "Librerías",
+        "libraries-label": "Bibliotecas",
         "collections-label": "Colecciones",
         "genres-label": "{{metadata-fields.genres-title}}",
         "tags-label": "{{metadata-fields.tags-title}}",
-        "cover-artist-label": "Artista de la Portada",
+        "cover-artist-label": "Artista de la cubierta",
         "writer-label": "Escritor",
         "publisher-label": "Editorial",
         "penciller-label": "Dibujante",
@@ -1702,7 +1669,7 @@
         "localized-name-label": "Nombre encontrado",
         "summary-label": "Resumen",
         "release-year-label": "{{sort-field-pipe.release-year}}",
-        "web-link-description": "Aquí puedes añadir enlaces a servicios externos.",
+        "web-link-description": "Aquí puede añadir enlaces a servicios externos.",
         "web-link-label": "{{tabs.weblink-tab}}",
         "cover-image-description": "Subir y elegir nueva portada. Pulsa Guardar para subir y sustituir la portada.",
         "save": "{{common.save}}",
@@ -1826,7 +1793,7 @@
     "kavitaplus-metadata-breakdown-stats": {
         "title": "Desglose de los metadatos de Kavita+",
         "description": "Kavita recupera metadatos (valoraciones, reseñas, recomendaciones, etc.) lentamente a lo largo del tiempo para las series elegibles.",
-        "no-data": "Sin datos",
+        "no-data": "{{common.no-data}}",
         "errored-series-label": "Series con errores",
         "completed-series-label": "Series finalizadas",
         "complete": "Todas las series tienen metadatos"
@@ -1839,7 +1806,7 @@
         "extension-header": "Extensión",
         "format-header": "Formato",
         "total-size-header": "Tamaño total",
-        "total-files-header": "Ficheros totales",
+        "total-files-header": "Archivos totales",
         "not-classified": "Sin clasificación",
         "total-file-size-title": "Tamaño del fichero:",
         "download-file-for-extension-header": "Descargar informe",
@@ -1865,21 +1832,21 @@
         "visualisation-label": "Visualización",
         "data-table-label": "Tabla de datos",
         "format-header": "Formato",
-        "count-header": "Contar"
+        "count-header": "Recuento"
     },
     "publication-status-stats": {
         "title": "Estado de publicación",
         "visualisation-label": "Visualización",
         "data-table-label": "Tabla de datos",
         "year-header": "Año",
-        "count-header": "Contar"
+        "count-header": "Recuento"
     },
     "series-preview-drawer": {
-        "staff-label": "Staff",
+        "staff-label": "Personal",
         "tags-label": "{{filter-field-pipe.tags}}",
         "genres-label": "{{filter-field-pipe.genres}}",
         "view-series": "Ver las series",
-        "vols-and-chapters": "{{volCount}} Volúmenes / {{chpCount}} Capítulos",
+        "vols-and-chapters": "{{volCount}} volúmenes / {{chpCount}} capítulos",
         "remove-from-want-to-read": "{{actionable.remove-from-want-to-read}}",
         "add-to-want-to-read": "{{actionable.add-to-want-to-read}}",
         "provided-by-label": "Proporcionado por"
@@ -1889,12 +1856,12 @@
         "upcoming-title": "Próximamente"
     },
     "server-stats": {
-        "total-series-label": "Series totales",
-        "total-series-tooltip": "Series totales: {{count}}",
-        "total-volumes-label": "Volúmenes totales",
-        "total-volumes-tooltip": "Volumes totales: {{count}}",
-        "total-files-label": "Ficheros totales",
-        "total-files-tooltip": "Archivos totales: {{count}}",
+        "total-series-label": "Total de series",
+        "total-series-tooltip": "Total de series: {{count}}",
+        "total-volumes-label": "Total de volúmenes",
+        "total-volumes-tooltip": "Total de volúmenes: {{count}}",
+        "total-files-label": "Total de archivos",
+        "total-files-tooltip": "Total de archivos: {{count}}",
         "total-size-label": "Tamaño total",
         "total-genres-label": "Total de géneros",
         "total-genres-tooltip": "Total de géneros: {{count}}",
@@ -1908,15 +1875,15 @@
         "reads": "lecturas",
         "release-years-title": "Años de lanzamiento",
         "most-active-users-title": "Usuarios más activos",
-        "popular-libraries-title": "Bibliotecas más visitadas",
+        "popular-libraries-title": "Bibliotecas populares",
         "popular-series-title": "Series populares",
         "recently-read-title": "Recientemente leído",
         "series-count": "{{num}} series",
         "volume-count": "{{num}} volúmenes",
         "file-count": "{{num}} archivos",
-        "genre-count": "{{num}} Géneros",
-        "tag-count": "{{num}} Etiquetas",
-        "people-count": "{{num}} Personas",
+        "genre-count": "{{num}} géneros",
+        "tag-count": "{{num}} etiquetas",
+        "people-count": "{{num}} personas",
         "tags": "{{metadata-fields.tags-title}}",
         "people": "Personas",
         "genres": "{{metadata-fields.genres-title}}"
@@ -1927,8 +1894,8 @@
         "unknown-crit": "Se ha producido un error crítico desconocido",
         "user-not-auth": "El usuario no está registrado",
         "error-code": "{{num}} Error",
-        "download": "Se ha producido un problema al descargar este archivo o no tienes permisos",
-        "not-found": "Esta dirección url no existe",
+        "download": "Se ha producido un problema al descargar este archivo o no tiene permisos",
+        "not-found": "Este URL no existe",
         "generic": "Algo inesperado ha ido mal",
         "rejected-cover-upload": "No se pudo obtener la imagen a través de la URL. Descárgala y súbela desde un archivo.",
         "invalid-confirmation-url": "Dirección URL de verificación no válida",
@@ -1972,14 +1939,14 @@
         "clear": "{{common.clear}}",
         "smart-filters-title": "Filtros inteligentes",
         "external-sources-title": "{{customize-dashboard-modal.external-sources}}",
-        "reorder-when-filter-present": "You cannot reorder items via drag & drop while a filter is present. Use {{customize-sidenav-streams.order-numbers-label}}",
+        "reorder-when-filter-present": "No se pueden reordenar los elementos mediante arrastrar y soltar mientras haya un filtro presente. Utilice {{customize-sidenav-streams.order-numbers-label}}",
         "order-numbers-label": "{{reading-list-detail.order-numbers-label}}",
         "bulk-mode-label": "Por lotes"
     },
     "manage-external-sources": {
         "add-source": "Añadir",
         "help-link": "Más información",
-        "description": "Mejora tu experiencia añadiendo servidores externos e inclúyelos cómodamente en tu barra lateral para acceder rápidamente tanto a tu servidor como al de tus amigos.",
+        "description": "Mejore su experiencia añadiendo servidores externos e inclúyalos a su gusto en la barra lateral para acceder rápidamente tanto a su servidor como al de sus amigos.",
         "clear": "{{common.clear}}",
         "filter": "{{common.filter}}",
         "no-data": "No hay fuentes externas"
@@ -1989,19 +1956,19 @@
         "no-data": "No se han creado filtros inteligentes",
         "filter": "{{common.filter}}",
         "clear": "{{common.clear}}",
-        "errored": "Hay un error de codificación en el filtro. Debes volver a crearlo."
+        "errored": "Hay un error de codificación en el filtro. Debe volver a crearlo."
     },
     "edit-external-source-item": {
         "not-unique": "Existe una fuente externa con este host. Asegúrese de que no tiene duplicados",
-        "title": "Nueva fuente externa",
-        "host-label": "Host",
+        "title": "Fuente externa nueva",
+        "host-label": "Anfitrión",
         "name-label": "Nombre",
         "api-key-label": "Clave de la API",
         "save": "{{common.save}}",
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
         "delete": "{{common.delete}}",
-        "pattern": "El host debe ser una dirección url http(s):// válida",
+        "pattern": "El anfitrión debe expresarse como un URL http(s):// válido",
         "required": "{{validation.required-field}}"
     },
     "stream-pipe": {
@@ -2033,7 +2000,7 @@
         "letterer": "Rotulista",
         "publication-status": "Estado de la publicación",
         "penciller": "Dibujante",
-        "imprint": "Imprimir",
+        "imprint": "Sello",
         "publisher": "Editorial",
         "read-progress": "Progreso de la lectura",
         "read-time": "Tiempo de lectura",
@@ -2071,9 +2038,9 @@
         "is-empty": "Está vacío"
     },
     "toasts": {
-        "regen-cover": "Se ha puesto en cola un trabajo para regenerar la imagen de portada",
+        "regen-cover": "Se ha puesto en cola un trabajo para regenerar la imagen de cubierta",
         "no-pages": "No hay páginas. Kavita no pudo leer este archivo.",
-        "download-in-progress": "La descarga ya está en curso. Por favor, espere.",
+        "download-in-progress": "La descarga ya está en curso. Espere un momento.",
         "scan-queued": "Exploración en cola para {{name}}",
         "server-settings-updated": "Configuración del servidor actualizada",
         "reset-ip-address": "Reinicio de las direcciones IP",
@@ -2083,7 +2050,7 @@
         "no-updates": "No hay actualizaciones disponibles",
         "confirm-delete-user": "¿Seguro que quieres eliminar este usuario?",
         "user-deleted": "{{user}} ha sido eliminado",
-        "click-email-link": "Por favor, haga clic en este enlace para confirmar su correo electrónico. Debe confirmar para poder iniciar sesión.",
+        "click-email-link": "Pulse en este enlace para confirmar su correo electrónico. Debe confirmarlo para acceder a su cuenta.",
         "series-added-to-collection": "Series añadidas a la colección {{collectionName}}",
         "no-series-collection-warning": "¡Atención! No hay series seleccionadas, al guardar se borrará la colección. ¿Está seguro de que desea continuar?",
         "collection-updated": "Colección actualizada",
@@ -2116,13 +2083,12 @@
         "delete-review": "¿Seguro que quieres borrar tu opinión?",
         "review-deleted": "Revisión eliminada",
         "file-send-to": "Archivo(s) enviado(s) por correo electrónico a {{name}}",
-        "theme-missing": "El tema activo ya no existe. Por favor, actualice la página.",
+        "theme-missing": "El tema activo ya no existe. Actualice la página.",
         "email-sent": "Correo electrónico enviado a {{email}}",
         "email-not-sent": "El correo electrónico archivado no es válido y no se puede enviar. Se ha volcado un enlace en los registros. El administrador puede proporcionar este enlace para completar el flujo.",
         "k+-license-saved": "Clave de licencia guardada, pero no es válida. Haga clic en comprobar para revalidar la suscripción. El primer registro puede tardar un minuto en propagarse.",
-        "k+-unlocked": "¡Kavita+ desbloqueado!",
-        "k+-error": "Se ha producido un error al activar su licencia. Por favor, inténtelo de nuevo.",
-        "k+-delete-key": "Esto sólo borrará la clave de licencia de Kavita y permitirá que se muestre un enlace de compra. Esto no cancelará tu suscripción. ¡Utilice esta opción sólo si se lo indica el servicio de asistencia!",
+        "k+-error": "Se ha producido un error al activar su licencia. Inténtelo de nuevo.",
+        "k+-delete-key": "Esto sólo borrará la clave de licencia de Kavita y permitirá que se muestre un enlace de compra. Esto no cancelará tu suscripción. Utilice Manejar para cancelar su suscripción primero.",
         "k+-reset-key": "Esto invalidará un registro anterior utilizando tu licencia y te permitirá volver a registrar una instancia de Kavita.",
         "k+-reset-key-success": "Se ha anulado el registro de su licencia. Utilice el botón Editar para volver a registrar su instancia y reactivar Kavita+",
         "library-deleted": "La biblioteca {{name}} ha sido eliminada",
@@ -2147,12 +2113,12 @@
         "device-created": "Dispositivo creado",
         "delete-device": "¿Estás seguro de que quieres borrar este dispositivo?",
         "confirm-regen-covers": "Actualizar portadas obligará a recalcular todas las imágenes de las portadas. Se trata de una operación pesada. ¿Está seguro de que no desea realizar un escaneo en su lugar?",
-        "alert-long-running": "Este proceso es de larga duración. Por favor, dale tiempo a completarse antes de volverlo a iniciar.",
+        "alert-long-running": "Este proceso es de larga duración. Dele tiempo a que se complete antes de volverlo a iniciar.",
         "confirm-delete-multiple-series": "¿Estás seguro de que deseas eliminar la serie {{count}}? No se modificarán los archivos en el disco.",
         "confirm-delete-series": "¿Estás seguro de que deseas eliminar esta serie? No se modificarán los archivos en el disco.",
         "confirm-delete-chapter": "¿Seguro que quieres eliminar este capítulo? No modificará los archivos en el disco duro.",
         "confirm-delete-volume": "¿Seguro que quieres eliminar este volumen? No modificará los archivos en el disco duro.",
-        "alert-bad-theme": "Hay un css no válido o inseguro en el tema. Por favor, ponte en contacto con tu administrador para corregirlo. Estableciendo el tema oscuro por defecto.",
+        "alert-bad-theme": "Hay CSS no válido o inseguro en el tema. Contacte al personal administrativo para corregirlo. Se usará el tema oscuro de manera predeterminada.",
         "confirm-library-delete": "¿Estás seguro de que quieres eliminar la biblioteca {{name}}? No puede deshacer esta acción.",
         "confirm-library-type-change": "Cambiar el tipo de biblioteca provocará un nuevo escaneo con diferentes reglas de análisis y puede provocar que se vuelvan a crear series y, por lo tanto, puede perder el progreso y los marcadores. Debería hacer una copia de seguridad antes de hacer esto. ¿Está seguro de que desea continuar?",
         "confirm-download-size": "El {{entityType}} es {{size}}. ¿Está seguro de que desea continuar?",
@@ -2184,8 +2150,9 @@
         "must-select-library": "Debe seleccionarse al menos una biblioteca",
         "bulk-scan": "El escaneo de múltiples bibliotecas se hará linealmente. Esto puede llevar mucho tiempo y no completarse dependiendo del tamaño de la biblioteca.",
         "bulk-covers": "Actualizar las carátulas de varias bibliotecas es una tarea intensiva y puede llevar mucho tiempo. ¿Estás seguro de que quieres continuar?",
-        "person-image-downloaded": "La portada para la persona ha sido descargada y aplicada.",
-        "confirm-delete-multiple-chapters": "¿Está seguro de que desea eliminar {{count}} capítulos o volúmenes? No se modificarán los archivos del disco."
+        "person-image-downloaded": "Se ha descargado y aplicado la cubierta para la persona.",
+        "confirm-delete-multiple-chapters": "¿Está seguro de que desea eliminar {{count}} capítulos o volúmenes? No se modificarán los archivos del disco.",
+        "bulk-delete-libraries": "¿Estás seguro de que deseas eliminar {{count}} bibliotecas?"
     },
     "read-time-pipe": {
         "less-than-hour": "<1 hora",
@@ -2195,13 +2162,13 @@
     "actionable": {
         "scan-library": "Escanear Biblioteca",
         "scan-library-tooltip": "Escanear biblioteca en busca de cambios. Usa escaneo forzado para forzar la revisión de todas las carpetas",
-        "refresh-covers": "Actualizar Portadas",
-        "refresh-covers-tooltip": "Re-generar todas las portadas",
+        "refresh-covers": "Actualizar cubiertas",
+        "refresh-covers-tooltip": "Regenerar todas las cubiertas",
         "generate-colorscape": "Generar ColorScape",
         "generate-colorscape-tooltip": "Generar colorscapes y todas las portadas faltantes",
-        "analyze-files": "Analizar Archivos",
+        "analyze-files": "Analizar archivos",
         "analyze-files-tooltip": "Analizar archivos en busca de tipo de extensión y tamaño",
-        "settings": "Ajustes",
+        "settings": "Configuración",
         "settings-tooltip": "Ver ajustes o detalles",
         "edit": "Editar",
         "edit-tooltip": "Editar ajustes o detalles",
@@ -2300,7 +2267,7 @@
     "entity-type": {
         "volume": "volumen",
         "chapter": "capítulo",
-        "series": "series",
+        "series": "serie",
         "bookmark": "marcador",
         "logs": "registros"
     },
@@ -2314,7 +2281,7 @@
         "related-tab": "Relacionados",
         "general-tab": "General",
         "folder-tab": "Carpeta",
-        "cover-tab": "Imagen de portada",
+        "cover-tab": "Imagen de cubierta",
         "advanced-tab": "Avanzado",
         "tasks-tab": "Tareas",
         "recommendations-tab": "Recomendaciones",
@@ -2345,7 +2312,7 @@
         "add": "Añadir",
         "apply": "Aplicar",
         "delete": "Eliminar",
-        "remove": "Eliminar",
+        "remove": "Quitar",
         "edit": "Editar",
         "help": "Ayuda",
         "submit": "Enviar",
@@ -2357,33 +2324,39 @@
         "promoted": "Promocionado",
         "select-all": "Seleccionar todo",
         "deselect-all": "Anular selección",
-        "series-count": "{{num}} Series",
-        "item-count": "{{num}} Elementos",
+        "series-count": "{{num}} series",
+        "item-count": "{{num}} elementos",
         "book-num": "Libro",
-        "issue-hash-num": "Número #",
+        "issue-hash-num": "Número",
         "issue-num": "Número",
         "chapter-num": "Capítulo",
         "volume-num": "Volumen",
-        "chapter-num-shorthand": "Ch {{num}}",
+        "chapter-num-shorthand": "Cap. {{num}}",
         "book-num-shorthand": "Libro {{num}}",
-        "issue-num-shorthand": "#{{num}}",
+        "issue-num-shorthand": "n.º {{num}}",
         "volume-num-shorthand": "Vol {{num}}",
         "book-nums": "Libros",
         "issue-nums": "Números",
         "chapter-nums": "Capítulos",
         "volume-nums": "Volúmenes",
-        "author-count": "{{num}} autor(es)"
+        "author-count": "{{num}} autores",
+        "chapter-count": "{{num}} capítulos",
+        "no-data": "No hay datos"
     },
     "confirm": {
         "alert": "Alerta",
-        "confirm": "Confirmar"
+        "confirm": "Confirmar",
+        "info": "Información",
+        "cancel": "{{common.cancel}}",
+        "ok": "Aceptar"
     },
     "person-detail": {
         "known-for-title": "Conocido por",
         "individual-role-title": "Como {{role}}",
         "browse-person-title": "Todas las obras de {{name}}",
         "browse-person-by-role-title": "Todas las obras de {{name}} como {{rol}}",
-        "all-roles": "Roles"
+        "all-roles": "Roles",
+        "anilist-url": "{{edit-person-modal.anilist-tooltip}}"
     },
     "edit-person-modal": {
         "loading": "{{common.loading}}",
@@ -2401,16 +2374,98 @@
         "required-field": "{{validations.required-field}}",
         "save": "{{common.save}}",
         "cover-image-description": "{{edit-series-modal.cover-image-description}}",
-        "cover-image-description-extra": "También puedes descargar una portada de CoversDB si está disponible.",
+        "cover-image-description-extra": "También puede descargar una cubierta de CoversDB si está disponible.",
         "download-coversdb": "Descargar de CoversDB",
         "anilist-tooltip": "https://anilist.co/staff/{AniListId}/",
         "hardcover-tooltip": "https://hardcover.app/authors/{HardcoverId}",
         "mal-tooltip": "https://myanimelist.net/people/{MalId}/",
         "asin-tooltip": "https://www.amazon.com/stores/J.K.-Rowling/author/{ASIN}"
     },
-    "browse-authors": {
-        "title": "Buscar autores y escritores",
-        "author-count": "{{num}} personas",
-        "cover-image-description": "{{edit-series-modal.cover-image-description}}"
+    "email-history": {
+        "date-header": "Fecha de envío",
+        "template-header": "Plantilla",
+        "sent-header": "Exitoso",
+        "user-header": "Envíado a",
+        "no-data": "{{common.no-data}}",
+        "sent-tooltip": "Enviado",
+        "not-sent-tooltip": "No enviado"
+    },
+    "changelog-update-item": {
+        "changed": "Modificado",
+        "added": "Agregado",
+        "api": "API",
+        "download": "Descargar",
+        "fixed": "Arreglado",
+        "developer": "Desarrollador",
+        "theme": "Tema",
+        "removed": "Eliminado",
+        "published-label": "Publicado: ",
+        "installed": "{{changelog.installed}}",
+        "feature-requests": "Petición de funciones",
+        "known-issues": "Problemas conocidos"
+    },
+    "new-version-modal": {
+        "developer": "{{changelog.developer}}",
+        "close": "{{common.close}}",
+        "fixed": "{{changelog.fixed}}",
+        "api": "{{changelog.api}}",
+        "refresh": "Refrescar",
+        "title": "¡Kavita fue actualizado!",
+        "description": "Una nueva versión de Kavita está disponible. Refresca para actualizar.",
+        "added": "{{changelog.added}}",
+        "changed": "{{changelog.changed}}",
+        "theme": "{{changelog.theme}}",
+        "removed": "{{changelog.removed}}"
+    },
+    "manage-user-tokens": {
+        "mal-header": "MAL",
+        "username-header": "Nombre de usuario",
+        "anilist-header": "AniList",
+        "no-data": "{{common.no-data}}",
+        "expires-label": "Expira: {{data}}",
+        "token-set-label": "Token configurado"
+    },
+    "manage-matched-metadata": {
+        "valid-until-header": "Siguiente refresco",
+        "matched-status-label": "Emparejado",
+        "status-header": "Estado",
+        "series-name-header": "Serie",
+        "all-status-label": "Todo",
+        "no-data": "{{common.no-data}}",
+        "actions-header": "Acciones",
+        "library-name-header": "Biblioteca",
+        "dont-match-status-label": "{{dont-match-label}}",
+        "unmatched-status-label": "No Emparejado"
+    },
+    "match-series-result-item": {
+        "chapter-count": "{{common.chapter-count}}",
+        "details": "Ver página",
+        "volume-count": "{{server-stats.volume-count}}"
+    },
+    "match-series-modal": {
+        "search": "Buscar",
+        "close": "{{common.close}}",
+        "save": "{{common.save}}",
+        "query-label": "Consulta"
+    },
+    "manage-metadata-settings": {
+        "derive-publication-status-label": "Estado de publicación",
+        "enable-people-label": "Personas",
+        "summary-label": "Resumen",
+        "enable-relations-label": "Relaciones",
+        "enable-genres-label": "Géneros",
+        "enable-tags-label": "Etiquetas",
+        "genre": "Género",
+        "enable-cover-image-label": "Imagen de cubierta"
+    },
+    "metadata-setting-field-pipe": {
+        "summary": "{{filter-field-pipe.summary}}",
+        "people": "{{tabs.people-tab}}",
+        "start-date": "{{manage-metadata-settings.enable-start-date-label}}",
+        "age-rating": "{{metadata-fields.age-rating-title}}",
+        "publication-status": "{{edit-series-modal.publication-status-title}}",
+        "genres": "{{metadata-fields.genres-title}}",
+        "tags": "{{metadata-fields.tags-title}}",
+        "localized-name": "{{edit-series-modal.localized-name-label}}"
     }
 }
diff --git a/UI/Web/src/assets/langs/et.json b/UI/Web/src/assets/langs/et.json
index b864247e7..fb5963f25 100644
--- a/UI/Web/src/assets/langs/et.json
+++ b/UI/Web/src/assets/langs/et.json
@@ -21,7 +21,6 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "saving": "Salvestan…",
         "update": "Uuendus"
@@ -57,15 +56,6 @@
     "spoiler": {
         "click-to-show": "Potentsiaalselt mittesoovitav eelinfo sisu kohta - kliki seda, et näidata"
     },
-    "review-series-modal": {
-        "title": "Muuda ülevaade",
-        "review-label": "Ülevaade",
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "min-length": "Ülevaade peab olema vähemalt {{count}} märki pikk",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}",
         "user-review": "{{username}} ülevaade",
diff --git a/UI/Web/src/assets/langs/fi.json b/UI/Web/src/assets/langs/fi.json
index 0967ef424..7795f3c60 100644
--- a/UI/Web/src/assets/langs/fi.json
+++ b/UI/Web/src/assets/langs/fi.json
@@ -1 +1,139 @@
-{}
+{
+    "user-preferences": {
+        "locale-tooltip": "Kieli, jota Kavitan tulee käyttää",
+        "share-series-reviews-tooltip": "Pitäisikö Kavita sisällyttää arvostelusi sarjoista muille käyttäjille",
+        "title": "Käyttäjän hallintapaneeli",
+        "pref-description": "Nämä ovat laajamittaisia asetuksia, jotka on sidottu tiliisi.",
+        "account-tab": "{{tabs.account-tab}}",
+        "preferences-tab": "{{tabs.preferences-tab}}",
+        "theme-tab": "{{tabs.theme-tab}}",
+        "devices-tab": "{{tabs.devices-tab}}",
+        "smart-filters-tab": "{{tabs.smart-filters-tab}}",
+        "success-toast": "Käyttäjäasetukset päivitetty",
+        "global-settings-title": "Yleisesti pätevät asetukset",
+        "page-layout-mode-label": "Sivun asettelutila",
+        "page-layout-mode-tooltip": "Näytä kohteet kortteina tai luettelonäkymänä Sarjojen yksityiskohdat -sivulla.",
+        "locale-label": "Kieliasetus",
+        "blur-unread-summaries-label": "Sumenna lukemattomat yhteenvedot",
+        "blur-unread-summaries-tooltip": "Sumentaa yhteenvetotekstiä osissa tai luvuissa, joissa ei ole edetty lukemisessa (spoilerien välttämiseksi)",
+        "prompt-on-download-label": "Kehote lataamisesta",
+        "prompt-on-download-tooltip": "Näytä kehote, kun lataus ylittää {{size}} Mt",
+        "disable-animations-label": "Poista animaatiot käytöstä",
+        "collapse-series-relationships-label": "Kutista sarjojen suhteet",
+        "collapse-series-relationships-tooltip": "Pitäisikö Kavita näyttää sarjoja, joilla ei ole suhteita tai jotka ovat vanhempi/esiosa",
+        "share-series-reviews-label": "Jaa sarjojen arvostelut",
+        "disable-animations-tooltip": "Poistaa animaatiot käytöstä sivustolla. Hyödyllinen e-musteen lukijoille.",
+        "stats-tab": "{{tabs.stats-tab}}",
+        "scrobbling-tab": "{{tabs.scrobbling-tab}}"
+    },
+    "customize-dashboard-modal": {
+        "smart-filters": "Älykkäät suodattimet",
+        "title-external-sources": "Ulkoiset lähteet",
+        "external-sources": "Ulkoiset lähteet",
+        "title-smart-filters": "Älykkäät suodattimet"
+    },
+    "tabs": {
+        "smart-filters-tab": "Älykkäät suodattimet"
+    },
+    "nav-header": {
+        "all-filters": "Älykkäät suodattimet"
+    },
+    "grouped-typeahead": {
+        "reading-lists": "Lukulistat"
+    },
+    "login": {
+        "title": "Kirjaudu sisään tilillesi",
+        "username": "{{common.username}}",
+        "password": "{{common.password}}",
+        "password-validation": "{{validation.password-validation}}",
+        "forgot-password": "Unohtuiko salasana?",
+        "submit": "Kirjaudu sisään"
+    },
+    "dashboard": {
+        "no-libraries": "Kirjastoja ei ole vielä määritetty. Luo joitakin sisään",
+        "server-settings-link": "Palvelimen asetukset",
+        "not-granted": "Sinulle ei ole myönnetty pääsyä yhteenkään kirjastoon.",
+        "on-deck-title": "Kannella",
+        "recently-added-title": "Äskettäin lisätyt sarjat",
+        "more-in-genre-title": "Lisää {{genre}}:ssa",
+        "recently-updated-title": "Äskettäin päivitetyt sarjat"
+    },
+    "edit-user": {
+        "close": "{{common.close}}",
+        "username": "{{common.username}}",
+        "required": "{{validation.required-field}}",
+        "email": "{{common.email}}",
+        "saving": "Tallennetaan…",
+        "update": "Päivitä",
+        "account-detail-title": "Tilin yksityiskohdat",
+        "edit": "{{common.edit}}",
+        "cancel": "{{common.cancel}}"
+    },
+    "user-scrobble-history": {
+        "title": "Scrobble-historia",
+        "not-read-warning": "Ylävirran palveluntarjoajat pitävät aina suurimman numeron",
+        "filter-label": "{{common.filter}}",
+        "created-header": "Luotu",
+        "last-modified-header": "Viimeksi muokattu",
+        "type-header": "Tyyppi",
+        "series-header": "Sarjat",
+        "data-header": "Tiedot",
+        "is-processed-header": "On käsitelty",
+        "no-data": "Ei tietoja",
+        "volume-and-chapter-num": "Osa {{v}} Luku {{n}}",
+        "volume-num": "Osa {{num}}",
+        "rating": "Arvosana {{r}}",
+        "chapter-num": "Luku {{num}}",
+        "not-applicable": "Ei sovellettavissa",
+        "processed": "Käsitelty",
+        "not-processed": "Ei käsitelty",
+        "special": "{{entity-title.special}}",
+        "description": "Täältä löydät kaikki tiliisi linkitetyt scrobble-tapahtumat. Jotta tapahtumat olisivat olemassa, sinulla on oltava aktiivinen scrobble-palveluntarjoaja määritettynä. Kaikki käsitellyt tapahtumat tyhjennetään kuukauden kuluttua. Jos on käsittelemättömiä tapahtumia, ne eivät todennäköisesti pysty muodostamaan osumia ylävirtaan. Ota yhteyttä järjestelmänvalvojaasi saadaksesi ne korjattua."
+    },
+    "scrobble-event-type-pipe": {
+        "chapter-read": "Lukemisen eteneminen",
+        "score-updated": "Luokituksen päivitys",
+        "want-to-read-add": "Haluan lukea: Lisää",
+        "want-to-read-remove": "Haluan lukea: Poista",
+        "review": "Arvostelun päivitys"
+    },
+    "spoiler": {
+        "click-to-show": "Spoileri, napsauta näyttääksesi"
+    },
+    "review-card-modal": {
+        "close": "{{common.close}}",
+        "external-mod": "(external)",
+        "go-to-review": "Siirry Arvosteluun",
+        "user-review": "{{username}}:n arvostelu"
+    },
+    "review-card": {
+        "your-review": "Tämä on arvostelusi",
+        "external-review": "Ulkoinen arvostelu",
+        "local-review": "Paikallinen arvostelu",
+        "rating-percentage": "Arvio {{r}} %"
+    },
+    "want-to-read": {
+        "title": "Haluan lukea",
+        "no-items": "Ei kohteita. Yritä lisätä sarjoja.",
+        "no-items-filtered": "Yksikään kohde ei vastaa nykyistä suodatinta.",
+        "series-count": "{{common.series-count}}"
+    },
+    "restriction-selector": {
+        "no-restriction": "Ei rajoituksia"
+    },
+    "side-nav": {
+        "reading-lists": "Lukulistat"
+    },
+    "reading-lists": {
+        "title": "Lukulistat"
+    },
+    "errors": {
+        "user-not-auth": "Käyttäjää ei ole todennettu"
+    },
+    "customize-sidenav-streams": {
+        "smart-filters-title": "Älykkäät suodattimet"
+    },
+    "manage-tasks-settings": {
+        "cleanup-label": "Puhdistus"
+    }
+}
diff --git a/UI/Web/src/assets/langs/fr.json b/UI/Web/src/assets/langs/fr.json
index 1968a77db..b664de804 100644
--- a/UI/Web/src/assets/langs/fr.json
+++ b/UI/Web/src/assets/langs/fr.json
@@ -22,11 +22,11 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "saving": "Sauvegarde en cours…",
         "update": "Mise à jour",
-        "account-detail-title": "Détails du compte"
+        "account-detail-title": "Détails du compte",
+        "invalid-email-warning": "Une adresse mail invalide bloquera certaines fonctionnalités de Kavita"
     },
     "user-scrobble-history": {
         "title": "Historique de scrobble",
@@ -39,7 +39,7 @@
         "series-header": "Séries",
         "data-header": "Données",
         "is-processed-header": "A été traité",
-        "no-data": "Aucune donnée",
+        "no-data": "{{common.no-data}}",
         "volume-and-chapter-num": "Volume {{v}} Chapitre {{n}}",
         "volume-num": "Volume {{num}}",
         "chapter-num": "Chapitre {{num}}",
@@ -47,7 +47,12 @@
         "not-applicable": "Non applicable",
         "processed": "Traité",
         "not-processed": "Non Traité",
-        "special": "{{entity-title.special}}"
+        "special": "{{entity-title.special}}",
+        "token-expired": "Votre jeton AniList a expiré ! Les événements de scrobbling ne seront pas pris en compte tant que vous n'aurez pas renouvelé votre compte sur la page Comptes.",
+        "scrobbling-disabled": "Le suivi de lecture est désactivé dans les paramètres de votre compte.",
+        "generate-scrobble-events": "Rattraper les Événements",
+        "select-all-label": "Sélectionner tout",
+        "delete-selected-label": "Supprimer la sélection"
     },
     "scrobble-event-type-pipe": {
         "chapter-read": "Progression de la lecture",
@@ -59,15 +64,6 @@
     "spoiler": {
         "click-to-show": "Divulgâcheur, cliquez afin d'afficher"
     },
-    "review-series-modal": {
-        "title": "Éditer la critique",
-        "review-label": "Critique",
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "min-length": "La critique doit comporter au moins {{count}} caractères",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}",
         "user-review": "Critique de {{username}}",
@@ -78,7 +74,8 @@
         "your-review": "Voici votre critique",
         "external-review": "Critique externe",
         "local-review": "Critique locale",
-        "rating-percentage": "Évaluation {{r}}%"
+        "rating-percentage": "Évaluation {{r}}%",
+        "critic": "critique"
     },
     "want-to-read": {
         "title": "À lire",
@@ -88,7 +85,7 @@
     },
     "user-preferences": {
         "title": "Tableau de bord Utilisateur",
-        "pref-description": "Voici les paramètres globaux liés à votre compte.",
+        "pref-description": "Voici les paramètres globaux liés à votre compte. Les paramètres du lecteur se trouvent dans les profils de lecture.",
         "account-tab": "{{tabs.account-tab}}",
         "preferences-tab": "{{tabs.preferences-tab}}",
         "theme-tab": "{{tabs.theme-tab}}",
@@ -112,55 +109,6 @@
         "collapse-series-relationships-tooltip": "Kavita doit-il afficher des Séries qui n'ont pas de lien ou sont le parent/préquel",
         "share-series-reviews-label": "Partagez les critiques de la Série",
         "share-series-reviews-tooltip": "Kavita doit-il afficher vos commentaires sur les Séries pour les autres utilisateurs",
-        "image-reader-settings-title": "Lecteur d'image",
-        "reading-direction-label": "Sens de lecture",
-        "reading-direction-tooltip": "Direction dans laquelle cliquer pour passer à la page suivante. De droite à gauche signifie que vous cliquez sur le côté gauche de l'écran pour passer à la page suivante.",
-        "scaling-option-label": "Options de Mise à l'échelle",
-        "scaling-option-tooltip": "Comment ajuster la mise à l'échelle de l'image a votre écran.",
-        "page-splitting-label": "Séparation des Pages",
-        "page-splitting-tooltip": "Comment diviser une image pleine largeur (càd que les images de gauche et de droite sont combinées)",
-        "reading-mode-label": "Mode de Lecture",
-        "reading-mode-tooltip": "Modifier le lecteur pour paginer verticalement, horizontalement ou avoir un défilement infini",
-        "layout-mode-label": "Mode de mise en page",
-        "layout-mode-tooltip": "Rendu d'une seule image à l'écran ou de deux images côte à côte",
-        "background-color-label": "Couleur d'arrière-plan",
-        "background-color-tooltip": "Couleur de fond du lecteur d'image",
-        "auto-close-menu-label": "Fermeture automatique du Menu",
-        "auto-close-menu-tooltip": "Le menu devrait se fermer tout seul",
-        "show-screen-hints-label": "Afficher les conseils à l'écran",
-        "show-screen-hints-tooltip": "Afficher une superposition pour aider à comprendre la zone et la direction de la pagination",
-        "emulate-comic-book-label": "Imiter l'aspect Bande dessinées",
-        "emulate-comic-book-tooltip": "Applique un effet d'ombre pour imiter la lecture d'un livre",
-        "swipe-to-paginate-label": "Glisser pour paginer",
-        "swipe-to-paginate-tooltip": "Le glissement sur l'écran devrait provoquer le déclenchement de la page suivante ou précédente",
-        "book-reader-settings-title": "Lecteur de livre",
-        "tap-to-paginate-label": "Appuyer pour paginer",
-        "tap-to-paginate-tooltip": "Les bords d'écran du lecteur de livre doivent-ils permettre d'appuyer pour passer à la page précédente/suivante",
-        "immersive-mode-label": "Mode immersif",
-        "immersive-mode-tooltip": "Cela permet de masquer le menu en cliquant sur le document de lecture et d'activer la fonction de pagination",
-        "reading-direction-book-label": "Sens de lecture",
-        "reading-direction-book-tooltip": "Sens du clic pour aller à page suivante. Droite à gauche signifie que vous devez cliquer du côté gauche de l'écran pour aller à la page suivante.",
-        "font-family-label": "Famille de Polices",
-        "font-family-tooltip": "Famille de police à charger. Par Défaut chargera la police par défaut du livre",
-        "writing-style-label": "Style d'écriture",
-        "writing-style-tooltip": "Change la direction du texte. Horizontal est de gauche à droite, vertical est de haut en bas.",
-        "layout-mode-book-label": "Mise en page",
-        "layout-mode-book-tooltip": "Comment le contenu devrait être mis en page. Défilement correspond à la présentation d'origine du livre. 1 ou 2 Colonnes adapte le texte à la hauteur de l'appareil avec une 1 ou 2 colonnes par page",
-        "color-theme-book-label": "Couleur du thème",
-        "color-theme-book-tooltip": "Quel thème de couleur appliquer aux contenu et menu du lecteur de livre",
-        "font-size-book-label": "Taille de la Police",
-        "font-size-book-tooltip": "Pourcentage de mise à l'échelle à appliquer à la police du livre",
-        "line-height-book-label": "Espacement de l'interligne",
-        "line-height-book-tooltip": "Quel espace entre les lignes du livre",
-        "margin-book-label": "Marge",
-        "margin-book-tooltip": "Quel espace de chaque côté de l'écran. Cela sera remplacé par 0 sur les appareils mobiles indépendamment de ce réglage.",
-        "pdf-reader-settings-title": "Lecteur PDF",
-        "pdf-scroll-mode-label": "Mode de défilement",
-        "pdf-scroll-mode-tooltip": "Mode de défilement des pages. Vertical/Horizontal et Tapez pour paginer (pas de défilement)",
-        "pdf-spread-mode-label": "Mode d'étalement",
-        "pdf-spread-mode-tooltip": "Comment les pages doivent être mises en page. Simple ou double (paire/impaire)",
-        "pdf-theme-label": "Thème",
-        "pdf-theme-tooltip": "Thème de couleur du lecteur",
         "clients-opds-alert": "OPDS n'est pas actif sur ce serveur. Cela n'affectera pas les utilisateurs de Tachiyomi.",
         "clients-opds-description": "Tous les clients tiers utiliseront soit la Clé d'API ou l'Url de connexion ci-dessous. Ce sont comme des mots de passe, ne les divulguez pas.",
         "clients-api-key-tooltip": "La Clé d'API est comme un mot de passe. Gardez-la secrète, gardez-la en sécurité. La réinitialiser invalidera tous les clients existants.",
@@ -168,12 +116,20 @@
         "clients-api-key-label": "Clé API",
         "clients-opds-url-tooltip": "Voir une liste de clients OPDS suportés ",
         "reset": "{{common.reset}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "kavitaplus-settings-title": "Kavita+",
+        "anilist-scrobbling-label": "Suivi de lecture AniList",
+        "anilist-scrobbling-tooltip": "Autorise Kavita à mettre à jour le suivi de lecture et les notes sur AniList",
+        "want-to-read-sync-label": "À lire : Synchroniser",
+        "want-to-read-sync-tooltip": "Permettre à Kavita d'ajouter des éléments à votre liste \"À lire\" en fonction des séries AniList et MAL de la liste de lecture \"En attente\""
     },
     "user-holds": {
         "title": "Enregistrement du suivi d'activité",
-        "description": "C'est une liste de séries gérée par l'utilisateur qui ne sera pas soumis aux fournisseurs de contenu. Vous pouvez enlever une série à n'importe quel moment et le prochain événement de soumission (progression de lecture, notation, statut \"à lire\") déclenchera l'événement.",
-        "no-data": "{{typeahead.no-data}}"
+        "description": "C'est une liste de séries gérée par l'utilisateur qui ne sera pas soumis aux fournisseurs de contenu. Vous pouvez enlever une série à n'importe quel moment et le prochain événement de soumission (progression de lecture, notation, statut \"à lire\") déclenchera le scrobbling.",
+        "no-data": "{{typeahead.no-data}}",
+        "series-name-header": "{{manage-matched-metadata.series-name-header}}",
+        "created-header": "{{manage-media-issues.created-header}}",
+        "delete-label": "{{common.remove}}"
     },
     "theme-manager": {
         "title": "Gestionnaire de thème",
@@ -293,7 +249,8 @@
         "regen-warning": "La regénération de votre clé API va invalider tout les clients existants.",
         "no-key": "Erreur - La clé n'a pas été défini",
         "confirm-reset": "Ceci annulera toutes les configurations OPDS que vous avez configurées. Etes-vous sûr de vouloir continuer ?",
-        "key-reset": "Réinitialiser la clé API"
+        "key-reset": "Réinitialiser la clé API",
+        "reset": "Réinitialiser"
     },
     "scrobbling-providers": {
         "title": "Fournisseur de suivi d'activité (Scrobbling)",
@@ -313,14 +270,20 @@
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
-        "loading": "{{common.loading}}"
+        "loading": "{{common.loading}}",
+        "mal-used-for": "MyAnimeList est utilisé pour les collections intelligentes et la synchronisation en mode lecture.",
+        "anilist-used-for": "AniList est utilisé pour le scrobbling (synchronisation des données) et la synchronisation de la liste \"À lire\".",
+        "anilist-first-header": "Jeton AniList sauvegardé",
+        "anilist-first-later": "Plus tard",
+        "anilist-first-now": "Maintenant",
+        "anilist-first-description": "Votre jeton AniList est maintenant configuré. Ce jeton dure un an et Kavita vous informera avant son expiration pour le rafraîchir. Avec cela, Kavita générera des événements de scrobble (synchronisation) à partir de votre historique de lecture, de votre liste \"À lire\" et de vos notations. Vous pouvez commencer maintenant ou plus tard. Si vous avez des séries que vous ne souhaitez pas voir scrobblé, sélectionnez plus tard et placez y un Scrobble Hold. Vous n'avez besoin d'exécuter cette tâche qu'une seule fois. Ensuite, Kavita se chargera de la synchronisation pour vous.
           Si vous sélectionnez « Plus tard », vous pouvez trouver le bouton sur la page Scrobbling."
     },
     "typeahead": {
         "locked-field": "Ce champ est vérouillé",
         "close": "{{common.close}}",
         "loading": "{{common.loading}}",
         "add-item": "Ajouter {{item}}…",
-        "no-data": "Aucune donnée",
+        "no-data": "{{common.no-data}}",
         "add-custom-item": ", taper pour ajouter un objet personnalisé"
     },
     "generic-list-modal": {
@@ -497,9 +460,9 @@
     },
     "library-type-pipe": {
         "book": "Livre",
-        "comic": "Bande dessinée",
+        "comic": "Bande dessinée (Legacy)",
         "manga": "Manga",
-        "comicVine": "Comic Vine",
+        "comicVine": "Bande dessinée",
         "image": "Image",
         "lightNovel": "Light Novel"
     },
@@ -561,10 +524,7 @@
         "installed": "Installé",
         "download": "Télécharger",
         "nightly": "Nightly : {{version}}",
-        "published-label": "Publié : ",
-        "available": "Disponible",
-        "description": "Si vous ne voyez pas une étiquette {{installed}}",
-        "description-continued": ", vous êtes sur une version de développement quotidienne (nightly release). Seules les versions majeures seront disponibles. Une étiquette spécifique sera affichée lorsqu'il s'agit d'une version quotidienne (nightly release) à partir de la version stable."
+        "available": "Disponible"
     },
     "invite-user": {
         "title": "Inviter un utilisateur",
@@ -610,15 +570,35 @@
         "activate-discordId-tooltip": "Lien vers votre compte Discord avec Kavita+. Cela vous donne accès à des canaux cachés pour aider à façonner Kavita.",
         "discord-validation": "Ce n'est pas un identifiant Discord valide. Votre identifiant n'est pas votre nom d'utilisateur Discord.",
         "activate-delete": "{{common.delete}}",
-        "activate-reset": "{{common.reset}}",
+        "activate-reset": "Réinitialiser la licence",
         "activate-reset-tooltip": "Invalider un enregistrement précédent en utilisant votre licence. Nécessite une licence et un email",
         "activate-save": "{{common.save}}",
         "kavita+-desc-part-1": "Kavita+ est un service d'abonnement premium qui débloque des fonctionnalités pour tous les utilisateurs de l'instance Kavita. Acheter un abonnement pour débloquer ",
         "kavita+-desc-part-2": "avantages premium",
         "kavita+-desc-part-3": "aujourd'hui !",
-        "kavita+-requirement": "Kavita+ est conçu pour fonctionner uniquement avec la dernière version - 2 versions. Toute autre version est susceptible de ne pas fonctionner.",
-        "kavita+-releases": "Voir les versions",
-        "help-label": "{{common.help}}"
+        "kavita+-requirement": "Kavita+ est conçu pour fonctionner uniquement avec les 3 dernières versions. Toute autre version est susceptible de ne pas fonctionner.",
+        "help-label": "{{common.help}}",
+        "k+-license-overwrite": "La licence est enregistrée dans une autre instance de Kavita. Cela peut se produire lors d'une réinstallation ou, plus rarement, à la suite d'une mise à jour du système. Sélectionnez écraser pour forcer cette instance à s'enregistrer auprès de Kavita+.",
+        "license-active-label": "Validité de la licence",
+        "actions-title": "Actions",
+        "supported-version-label": "Sur la version supportée de Kavita",
+        "expiration-label": "Expiration",
+        "valid-tooltip": "Valide",
+        "invalid-tooltip": "Invalide",
+        "reset-label": "Remise à zéro",
+        "reset-tooltip": "Ceci réinitialisera l'instance du serveur Kavita+ à laquelle la licence est liée. Nécessite l'email et la clé de licence",
+        "delete-label": "Supprimer la licence",
+        "info-title": "Informations sur les licences",
+        "manage-tooltip": "Mise à jour des informations de paiement, annulation/pause de l'abonnement, etc",
+        "faq-title": "FAQ",
+        "total-subbed-months-label": "Nombre total de mois d'abonnement",
+        "email-label": "Adresse électronique enregistrée",
+        "license-mismatch": "La licence peut être enregistrée sur une autre instance de Kavita. Réenregistrer pour corriger.",
+        "k+-already-registered-header": "Licence déjà enregistrée",
+        "overwrite": "Écraser",
+        "k+-unlocked": "Kavita+ débloquée !",
+        "k+-unlocked-description": "Bienvenue sur Kavita+ ! Kavita générera des événements de scrobbling à partir de votre progression, de vos évaluations et de vos envies de lecture une fois que vous aurez enregistré vos fournisseurs de scrobbling sur votre compte. Prenez le temps de vous assurer que vous mettez en attente de scrobbling, toutes les séries que vous ne voulez pas scrobbler.",
+        "delete-tooltip": "Cela supprimera la licence de Kavita pour empêcher Kavita de parler à Kavita+. Cela ne vous désinscrit pas. Utilisez d'abord \"gérer\" pour annuler l'abonnement."
     },
     "book-line-overlay": {
         "copy": "Copier",
@@ -651,7 +631,10 @@
         "incognito-mode-label": "Navigation privée",
         "next": "Suivant",
         "previous": "Précédent",
-        "go-to-page-prompt": "Il y a {{totalPages}} pages. À quelle page voulez-vous aller ?"
+        "go-to-page-prompt": "Il y a {{totalPages}} pages. À quelle page voulez-vous aller ?",
+        "go-to-first-page": "Aller à la première page",
+        "go-to-section": "Aller à la section",
+        "go-to-section-prompt": "Il y a {{totalSections}} sections au total. Dans quelle section voulez-vous aller ?"
     },
     "personal-table-of-contents": {
         "no-data": "Rien n'a encore été mis en marque-page",
@@ -677,7 +660,7 @@
         "success": "Succès !"
     },
     "confirm-reset-password": {
-        "title": "Réinitialisation du mot de passe",
+        "title": "Réinitialiser le mot de passe",
         "description": "Saisir un nouveau mot de passe",
         "password-label": "{{common.password}}",
         "required-field": "{{validation.required-field}}",
@@ -699,7 +682,7 @@
     "series-detail": {
         "page-settings-title": "Paramètres des pages",
         "close": "{{common.close}}",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
         "layout-mode-option-card": "Carte",
         "layout-mode-option-list": "Liste",
         "continue-from": "Continuer {{title}}",
@@ -725,8 +708,6 @@
         "no-pages": "{{toasts.no-pages}}",
         "no-chapters": "Il n'y a aucun chapitre dans ce volume. Il ne peut être lu.",
         "cover-change": "L'actualisation de l'image par votre navigateur peut prendre jusqu'à une minute. En attendant, l'ancienne image peut être affichée sur certaines pages.",
-        "user-reviews-local": "Commentaires locaux",
-        "user-reviews-plus": "Commentaires externes",
         "writers-title": "{{metadata-fields.writers-title}}",
         "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
         "characters-title": "{{metadata-fields.characters-title}}",
@@ -743,7 +724,7 @@
         "genres-title": "{{metadata-fields.genres-title}}",
         "tags-title": "{{metadata-fields.tags-title}}",
         "ongoing": "{{publication-status-pipe.ongoing}}",
-        "release-date-title": "Publication",
+        "release-date-title": "Sortie",
         "volume-num": "{{common.volume-num}}",
         "reading-lists-title": "{{side-nav.reading-lists}}",
         "pages-count": "{{num}} Pages",
@@ -752,9 +733,11 @@
         "more-alt": "Plus",
         "time-left-alt": "Temps restant",
         "time-to-read-alt": "{{sort-field-pipe.time-to-read}}",
-        "scrobbling-tooltip": "{{settings.scrobbling}}",
+        "scrobbling-tooltip": "{{settings.scrobbling}} : {{value}}",
         "publication-status-title": "Publication",
-        "publication-status-tooltip": "État de la publication"
+        "publication-status-tooltip": "État de la publication",
+        "on": "{{reader-settings.on}}",
+        "off": "{{reader-settings.off}}"
     },
     "metadata-fields": {
         "collections-title": "{{side-nav.collections}}",
@@ -786,7 +769,8 @@
         "entry-label": "Voir les détails",
         "kavita-tooltip": "Votre évaluation + évaluation globale",
         "kavita-rating-title": "Votre évaluation",
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "critic": "{{review-card.critic}}"
     },
     "badge-expander": {
         "more-items": "et {{count}} de plus"
@@ -821,7 +805,9 @@
         "back": "Retour",
         "more": "Plus",
         "customize": "{{settings.customize}}",
-        "browse-authors": "Parcourir les auteurs"
+        "edit": "{{common.edit}}",
+        "cancel-edit": "Fermer la réorganisation",
+        "browse-people": "Parcourir les personnes"
     },
     "library-settings-modal": {
         "close": "{{common.close}}",
@@ -838,7 +824,7 @@
         "type-label": "Type",
         "type-tooltip": "Le type de bibliothèque détermine la manière dont les noms de fichiers sont analysés et si l'interface utilisateur affiche des chapitres (Manga) ou des numéros (Bandes dessinées). Consultez le wiki pour plus de détails sur les différences entre les types de bibliothèques.",
         "kavitaplus-eligible-label": "Eligible à Kavita+",
-        "kavitaplus-eligible-tooltip": "Kavita+ va-t-il extraire des informations ou soutenir le suivi d'activité (Scrobbling)",
+        "kavitaplus-eligible-tooltip": "Prise en charge des fonctions de métadonnées de Kavita+ ou de scrobbling",
         "folder-description": "Ajouter des dossier dans votre bibliothèque",
         "browse": "Rechercher des dossiers multimédias",
         "help-us-part-1": "Aidez-nous en suivant ",
@@ -872,7 +858,11 @@
         "file-type-group-tooltip": "Quels types de fichiers Kavita devrait-il analyser ? Par exemple, Archive inclura les fichiers cb*, zip, rar, etc.",
         "exclude-patterns-label": "xclure les modèles",
         "exclude-patterns-tooltip": "Configurez un ensemble de modèles (syntaxe Global) que Kavita fera correspondre lors du scan des répertoires et exclura des résultats du scanner.",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "allow-metadata-matching-label": "Permettre la correspondance des métadonnées",
+        "allow-metadata-matching-tooltip": "Kavita doit-il télécharger les métadonnées des séries de cette bibliothèque ? Cela ne se produira que si le serveur dispose d'un abonnement actif à Kavita+.",
+        "enable-metadata-label": "Activer les métadonnées (ComicInfo/Epub/PDF)",
+        "enable-metadata-tooltip": "Permet à Kavita de lire les fichiers de métadonnées. Ceux-ci remplacent l'analyse des noms de fichiers."
     },
     "file-type-group-pipe": {
         "archive": "Archive",
@@ -882,30 +872,30 @@
     },
     "reader-settings": {
         "general-settings-title": "Réglages généraux",
-        "font-family-label": "{{user-preferences.font-family-label}}",
-        "font-size-label": "{{user-preferences.font-size-book-label}}",
-        "line-spacing-label": "{{user-preferences.line-height-book-label}}",
-        "margin-label": "{{user-preferences.margin-book-label}}",
+        "font-family-label": "{{manage-reading-profiles.font-family-label}}",
+        "font-size-label": "{{manage-reading-profiles.font-size-book-label}}",
+        "line-spacing-label": "{{manage-reading-profiles.line-height-book-label}}",
+        "margin-label": "{{manage-reading-profiles.margin-book-label}}",
         "reset-to-defaults": "Réinitialiser les paramètres par défaut",
         "reader-settings-title": "Paramètres de lecture",
-        "reading-direction-label": "{{user-preferences.reading-direction-book-label}}",
+        "reading-direction-label": "{{manage-reading-profiles.reading-direction-book-label}}",
         "right-to-left": "De droite à gauche",
         "left-to-right": "De gauche à droite",
         "horizontal": "Horizontal",
         "vertical": "Vertical",
-        "writing-style-label": "{{user-preferences.writing-style-label}}",
+        "writing-style-label": "{{manage-reading-profiles.writing-style-label}}",
         "writing-style-tooltip": "Change la direction du texte. L'horizontale est de gauche à droite, la verticale de haut en bas.",
         "tap-to-paginate-label": "Appuyez sur Pagination",
         "tap-to-paginate-tooltip": "Cliquez sur les bords de l'écran pour paginer",
         "on": "Activé",
         "off": "Désactivé",
-        "immersive-mode-label": "{{user-preferences.immersive-mode-label}}",
+        "immersive-mode-label": "{{manage-reading-profiles.immersive-mode-label}}",
         "immersive-mode-tooltip": "Cela masquera le menu après un clic sur le document en lecture et activera le toucher pour lister les pages",
         "fullscreen-label": "Plein écran",
         "fullscreen-tooltip": "Mettre le lecteur en plein écran",
         "exit": "Sortir",
         "enter": "Entrer",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
         "layout-mode-tooltip": "Défilement : met en miroir le fichier epub (généralement une longue page défilante par chapitre).
          1 colonne : crée une seule page virtuelle à la fois.
          2 colonnes : crée deux pages virtuelles à la fois disposées côte à côte.",
         "layout-mode-option-scroll": "Faire défiler",
         "layout-mode-option-1col": "1 Colonne",
@@ -914,7 +904,15 @@
         "theme-dark": "Sombre",
         "theme-black": "Noir",
         "theme-white": "Blanc",
-        "theme-paper": "Papier"
+        "theme-paper": "Papier",
+        "update-parent": "Enregistrer dans {{name}}",
+        "loading": "chargement",
+        "create-new": "Nouveau profil à partir d'un profil implicite",
+        "create-new-tooltip": "Créez un nouveau profil gérable à partir de votre profil implicite actuel",
+        "reading-profile-updated": "Profil de lecture mis à jour",
+        "reading-profile-promoted": "Profil de lecture promu",
+        "line-spacing-min-label": "1x",
+        "line-spacing-max-label": "2.5x"
     },
     "table-of-contents": {
         "no-data": "Ce livre n'a pas de table des matières définie dans les métadonnées ou dans un fichier toc"
@@ -938,7 +936,8 @@
     },
     "card-detail-layout": {
         "total-items": "{{count}} éléments au total",
-        "jumpkey-count": "{{count}} Séries"
+        "jumpkey-count": "{{count}} Séries",
+        "no-data": "{{common.no-data}}"
     },
     "card-item": {
         "cannot-read": "Impossible à lire"
@@ -964,12 +963,14 @@
         "language-title": "{{edit-chapter-modal.language-label}}",
         "format-title": "{{metadata-filter.format-label}}",
         "read-time-title": "{{edit-chapter-modal.reading-time-label}}",
-        "length-title": "{{edit-chapter-modal.words-label}}"
+        "length-title": "{{edit-chapter-modal.words-label}}",
+        "age-rating-title": "{{metadata-fields.age-rating-title}}"
     },
     "related-tab": {
         "reading-lists-title": "{{reading-lists.title}}",
         "collections-title": "{{side-nav.collections}}",
-        "relations-title": "{{tabs.related-tab}}"
+        "relations-title": "{{tabs.related-tab}}",
+        "bookmarks-title": "{{side-nav.bookmarks}}"
     },
     "cover-image-chooser": {
         "enter-an-url-pre-title": "Saisir une {{url}}",
@@ -1028,7 +1029,7 @@
         "file-header": "Fichier",
         "comment-header": "Commentaire",
         "created-header": "Créé",
-        "no-data": "Aucune donnée"
+        "no-data": "{{common.no-data}}"
     },
     "manage-email-settings": {
         "description": "Afin d'utiliser certaines fonctions de Kavita comme Mot de passe oublié et Envoyer à Appareil, un fournisseur d'e-mail doit être mis en place. D'autres caractéristiques comme le changement de mot de passe sont moins sûres sans configuration Email.",
@@ -1041,7 +1042,7 @@
         "reset": "{{common.reset}}",
         "test": "Test",
         "host-name-label": "Nom d'hôte",
-        "host-name-tooltip": "Nom de domaine (du Reverse Proxy). Nécessaire pour la fonctionnalité de messagerie. S'il n'y a pas de reverse proxy, utiliser n'importe quelle url.",
+        "host-name-tooltip": "Le nom de domaine de votre proxy inverse, nécessaire pour la fonctionnalité du courrier électronique. Si vous n'utilisez pas de proxy inverse, vous pouvez utiliser n'importe quelle URL, y compris http://externalip:port/",
         "host-name-validation": "Le nom d'hôte doit commencer par http(s) et ne pas se terminer par /",
         "sender-address-label": "Adresse d’expéditeur",
         "sender-address-tooltip": "Il s'agit de l'adresse électronique que le destinataire verra lorsqu'il recevra l'e-mail. Il s'agit généralement de l'adresse électronique associée au compte.",
@@ -1247,9 +1248,6 @@
         "backup-database-task-success": "Une tâche de sauvegarde de la base de données a été mise en file d'attente",
         "download-logs-task": "Télécharges les journaux",
         "download-logs-task-desc": "Compile tous les fichiers journaux dans un fichier zip et le télécharge.",
-        "analyze-files-task": "Analyser les fichiers",
-        "analyze-files-task-desc": "Exécute une tâche de longue durée qui analysera les fichiers pour générer l'extension et la taille. Cette tâche ne doit être lancée qu'une seule fois pour la version v0.7. Elle n'est pas nécessaire si vous avez installé le logiciel après la version 0.7.",
-        "analyze-files-task-success": "L'analyse du fichier a été mise en attente",
         "sync-themes-task": "Sync Thèmes",
         "sync-themes-task-desc": "Synchroniser les thèmes téléchargés avec les modifications du dépôt d'origine si les versions correspondent.",
         "sync-themes-success": "La synchronisation des thèmes a été mise en file d'attente",
@@ -1277,7 +1275,6 @@
         "change-password-alt": "Modifier le mot de passe {{user}}",
         "resend": "Renvoyer",
         "setup": "Configurer",
-        "admin": "Admin",
         "last-active-header": "Dernier actif",
         "roles-header": "Rôles",
         "name-header": "Nom",
@@ -1289,7 +1286,8 @@
         "no-data": "Il n'y a pas d'autres utilisateurs.",
         "loading": "{{common.loading}}",
         "actions-header": "Actions",
-        "pending-tooltip": "Cet utilisateur n'a pas validé son e-mail"
+        "pending-tooltip": "Cet utilisateur n'a pas validé son e-mail",
+        "all-libraries": "Toutes les bibliothèques"
     },
     "edit-collection-tags": {
         "title": "Modifier la collection {{collectionName}}",
@@ -1329,7 +1327,7 @@
         "server-section-title": "Serveur",
         "info-section-title": "Info",
         "import-section-title": "Importer",
-        "kavitaplus-section-title": "{{settings.admin-kavitaplus}}",
+        "kavitaplus-section-title": "Kavita+",
         "admin-general": "Général",
         "admin-users": "Utilisateurs",
         "admin-libraries": "Bibliothèques",
@@ -1340,7 +1338,7 @@
         "admin-tasks": "Tâches",
         "admin-statistics": "Statistiques",
         "admin-system": "Système",
-        "admin-kavitaplus": "Kavita+",
+        "admin-kavitaplus": "Licence",
         "account": "Compte",
         "preferences": "Préférences",
         "clients": "Clé API / OPDS",
@@ -1350,7 +1348,13 @@
         "theme": "Thème",
         "customize": "Personnaliser",
         "cbl-import": "Liste de lecture CBL",
-        "mal-stack-import": "Pile MAL"
+        "mal-stack-import": "Pile MAL",
+        "scrobble-holds": "Mises en attente de scrobble",
+        "admin-email-history": "Historique des e-mails",
+        "admin-matched-metadata": "Métadonnées correspondantes",
+        "admin-manage-tokens": "Gérer les jetons utilisateur",
+        "admin-metadata": "Gérer les métadonnées",
+        "reading-profiles": "Profils de lecture"
     },
     "collection-detail": {
         "no-data": "Il n'y a pas d'éléments. Essayez d'ajouter une série.",
@@ -1387,7 +1391,8 @@
     },
     "reading-list-item": {
         "remove": "{{common.remove}}",
-        "read": "{{common.read}}"
+        "read": "{{common.read}}",
+        "released-label": "Sortie : {{date}}"
     },
     "stream-list-item": {
         "remove": "{{common.remove}}",
@@ -1395,7 +1400,8 @@
         "provided": "Fourni",
         "smart-filter": "Filtre intelligent",
         "library": "Bibliothèque",
-        "external-source": "Source externe"
+        "external-source": "Source externe",
+        "delete": "{{common.delete}}"
     },
     "reading-list-detail": {
         "item-count": "{{common.item-count}}",
@@ -1407,7 +1413,19 @@
         "read-options-alt": "Options de lecture",
         "incognito-alt": "(Incognito)",
         "no-data": "Rien n'a été ajouté",
-        "characters-title": "{{metadata-fields.characters-title}}"
+        "characters-title": "{{metadata-fields.characters-title}}",
+        "writers-title": "{{metadata-fields.writers-title}}",
+        "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
+        "details-tab": "{{series-detail.details-tab}}",
+        "edit-alt": "{{common.edit}}",
+        "edit-label": "Mode édition",
+        "date-range-title": "Plage de dates",
+        "items-title": "Éléments",
+        "publishers-title": "{{metadata-fields.publishers-title}}",
+        "storyline-tab": "{{series-detail.storyline-tab}}",
+        "reorder-alt": "Réorganiser les éléments",
+        "more-alt": "{{series-detail.more-alt}}",
+        "dnd-warning": "Le glisser-déposer n'est pas disponible sur les appareils mobiles ou lorsque la liste de lecture comporte plus de 100 éléments."
     },
     "events-widget": {
         "title-alt": "Activité",
@@ -1460,7 +1478,10 @@
         "logout": "Déconnexion",
         "all-filters": "Filtres intelligents",
         "nav-link-header": "Options de navigation",
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "person-aka-status": "Correspond à un alias",
+        "browse-genres": "Parcourir les genres",
+        "browse-tags": "Parcourir les étiquettes"
     },
     "promoted-icon": {
         "promoted": "{{common.promoted}}"
@@ -1535,7 +1556,7 @@
         "dry-run-step": "Simuler",
         "final-import-step": "Dernière étape",
         "comicvine-parsing-label": "Utiliser la correspondance des séries de Comic Vine",
-        "cbl-repo": "Vous trouverez de nombreuses listes de lecture dans la communauté repo.",
+        "cbl-repo": "Vous pouvez trouver de nombreuses listes de lecture dans la communauté dépôt.",
         "help-label": "{{common.help}}"
     },
     "pdf-reader": {
@@ -1571,7 +1592,6 @@
     },
     "manga-reader": {
         "back": "Retour",
-        "save-globally": "Sauvegarder globalement",
         "incognito-alt": "Le mode Incognito est activé. Basculer pour le désactiver.",
         "incognito-title": "Mode incognito :",
         "shortcuts-menu-alt": "Raccourcis clavier Modal",
@@ -1593,9 +1613,9 @@
         "height": "Hauteur",
         "width": "Largeur",
         "width-override-label": "Remplacement de la largeur",
-        "off": "Désactivé",
+        "off": "{{reader-settings.off}}",
         "original": "Original",
-        "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}",
+        "auto-close-menu-label": "{{manage-reading-profiles.auto-close-menu-label}}",
         "swipe-enabled-label": "Balayage activé",
         "enable-comic-book-label": "Imiter le comportement de la bande dessinée",
         "brightness-label": "Luminosité",
@@ -1606,9 +1626,14 @@
         "layout-mode-switched": "Le mode de mise en page est passé à simple en raison d'un manque d'espace pour rendre la mise en page double",
         "no-next-chapter": "Pas de prochain chapitre",
         "no-prev-chapter": "Pas de chapitre précédent",
-        "user-preferences-updated": "Mise à jour des préférences des utilisateurs",
-        "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}",
-        "series-progress": "Progression de la série : {{percentage}}"
+        "emulate-comic-book-label": "{{manage-reading-profiles.emulate-comic-book-label}}",
+        "series-progress": "Progression de la série : {{percentage}}",
+        "update-parent": "{{reader-settings.update-parent}}",
+        "loading": "{{reader-settings.loading}}",
+        "create-new": "{{reader-settings.create-new}}",
+        "create-new-tooltip": "{{reader-settings.create-new-tooltip}}",
+        "reading-profile-updated": "Profil de lecture mis à jour",
+        "reading-profile-promoted": "Profil de lecture promu"
     },
     "metadata-filter": {
         "filter-title": "{{common.filter}}",
@@ -1665,7 +1690,10 @@
         "release-year": "Année de sortie",
         "read-progress": "Dernière lecture",
         "average-rating": "Note moyenne",
-        "random": "Aléatoire"
+        "random": "Aléatoire",
+        "person-name": "Nom",
+        "person-series-count": "Nombre de séries",
+        "person-chapter-count": "Nombre de chapitres"
     },
     "edit-series-modal": {
         "title": "{{seriesName}} Détails",
@@ -1749,7 +1777,7 @@
         "sort-order-label": "Ordre de tri",
         "sort-order-tooltip": "L'ordre de lecture dans lequel ce chapitre est ordonné au sein du volume",
         "isbn-label": "ISBN",
-        "release-date-label": "Publication",
+        "release-date-label": "Sortie",
         "summary-label": "{{edit-series-modal.summary-label}}",
         "genres-label": "{{edit-series-modal.genres-label}}",
         "tags-label": "{{edit-series-modal.tags-label}}",
@@ -1802,8 +1830,8 @@
         "cover-image-tab": "{{tabs.cover-tab}}",
         "tasks-tab": "{{tabs.tasks-tab}}",
         "info-tab": "{{tabs.info-tab}}",
-        "pages-label": "{{edit-chapter-modal.pages-count}}",
-        "words-label": "{{edit-chapter-modal.length-title}}",
+        "pages-label": "{{edit-chapter-modal.pages-label}}",
+        "words-label": "{{edit-chapter-modal.words-label}}",
         "pages-count": "{{edit-chapter-modal.pages-count}}",
         "words-count": "{{edit-chapter-modal.words-count}}",
         "reading-time-label": "{{edit-chapter-modal.reading-time-label}}",
@@ -1826,7 +1854,7 @@
     "kavitaplus-metadata-breakdown-stats": {
         "title": "Décomposition des métadonnées de Kavita",
         "description": "Kavita récupère les métadonnées (évaluations, critiques, recommandations, etc.) au fur et à mesure pour les séries éligibles.",
-        "no-data": "Pas de données",
+        "no-data": "{{common.no-data}}",
         "errored-series-label": "Séries en erreur",
         "completed-series-label": "Séries complètes",
         "complete": "Toutes les séries ont des métadonnées"
@@ -1954,14 +1982,16 @@
         "sidenav": "Barre de navigation latérale",
         "external-sources": "Sources externes",
         "smart-filters": "Filtres intelligents",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "description": "Vous pouvez personnaliser différents aspects de Kavita en réorganisant, en modifiant la visibilité et en liant des filtres intelligents/sources externes à votre page d'accueil ou à votre navigation latérale."
     },
     "customize-dashboard-streams": {
         "no-data": "Tous les filtres intelligents ont été ajoutés au tableau de bord ou aucun n'a encore été créé.",
         "save": "{{common.save}}",
         "add": "{{common.add}}",
         "filter": "{{common.filter}}",
-        "clear": "{{common.clear}}"
+        "clear": "{{common.clear}}",
+        "smart-filter-title": "{{customize-dashboard-modal.title-smart-filters}}"
     },
     "customize-sidenav-streams": {
         "no-data": "Tous les filtres intelligents ont été ajoutés à la barre de navigation latérale ou aucun n'a encore été créé.",
@@ -1989,7 +2019,15 @@
         "no-data": "Aucun filtre intelligent n'a été créé",
         "filter": "{{common.filter}}",
         "clear": "{{common.clear}}",
-        "errored": "Il y a une erreur d'encodage dans le filtre. Vous devez le recréer."
+        "errored": "Il y a une erreur d'encodage dans le filtre. Vous devez le recréer.",
+        "save": "{{common.save}}",
+        "edit-smart-filter": "Éditer {{name}}",
+        "cancel": "{{common.cancel}}",
+        "close": "{{common.close}}",
+        "edit": "{{common.edit}}",
+        "required-field": "Les filtres intelligents ont besoin d'un nom",
+        "filter-name-unique": "Les noms des filtres intelligents doivent être uniques",
+        "name-label": "Nom"
     },
     "edit-external-source-item": {
         "not-unique": "Une source externe existe avec cet hôte. Assurez-vous qu'il n'y a pas de doublons",
@@ -2014,7 +2052,7 @@
         "reading-lists": "{{side-nav.reading-lists}}",
         "bookmarks": "{{side-nav.bookmarks}}",
         "all-series": "{{side-nav.all-series}}",
-        "browse-authors": "{{side-nav.browse-authors}}"
+        "browse-authors": "{{side-nav.browse-people}}"
     },
     "filter-field-pipe": {
         "age-rating": "{{metadata-fields.age-rating-title}}",
@@ -2120,9 +2158,8 @@
         "email-sent": "E-mail envoyé à {{email}}",
         "email-not-sent": "L'adresse électronique figurant dans le fichier n'est pas valide et ne peut être envoyée. Un lien a été déversé dans les journaux. L'administrateur peut fournir ce lien pour compléter le flux.",
         "k+-license-saved": "La clé de licence a été enregistrée, mais elle n'est pas valide. Cliquez sur vérifier pour revalider l'abonnement. Le premier enregistrement peut prendre une minute pour se propager.",
-        "k+-unlocked": "Kavita+ débloquée !",
         "k+-error": "Une erreur s'est produite lors de l'activation de votre licence. Veuillez réessayer.",
-        "k+-delete-key": "Cela supprimera uniquement la clé de licence de Kavita et permettra d'afficher un lien d'achat. Cela n'annulera pas votre abonnement ! N'utilisez cette option que si le support vous le demande !",
+        "k+-delete-key": "Cela supprimera uniquement la clé de licence de Kavita et affichera un lien d'achat. Cela n'annulera pas votre abonnement ! Utilisez \"Gérer\" pour annuler votre abonnement en premier.",
         "k+-reset-key": "Cela invalidera un enregistrement antérieur utilisant votre licence et permettra de réenregistrer une instance Kavita.",
         "k+-reset-key-success": "Votre licence a été désenregistrée. Utilisez le bouton Modifier pour réenregistrer votre instance et réactiver Kavita+",
         "library-deleted": "La bibliothèque {{name}} a été supprimée",
@@ -2134,7 +2171,7 @@
         "load-prev-chapter": "Précédent(e) {{entity}} chargé(e)",
         "account-registration-complete": "Enregistrement du compte terminé",
         "account-migration-complete": "Migration des comptes terminée",
-        "password-reset": "Réinitialisation du mot de passe",
+        "password-reset": "Réinitialiser le mot de passe",
         "password-updated": "Le mot de passe a été mis à jour",
         "forced-scan-queued": "Une recherche forcée a été lancée pour {{name}}",
         "library-created": "Bibliothèque créée avec succès. Un scan a été lancé.",
@@ -2185,7 +2222,16 @@
         "bulk-covers": "Rafraichir les couvertures pour plusieurs bibliothèques est lourd pour le serveur et peut prendre longtemps. Êtes vous sûr de vouloir continuer ?",
         "must-select-library": "Au moins une bibliothèque doit être sélectionnée",
         "person-image-downloaded": "La couverture de la personne a été téléchargée et appliquée.",
-        "confirm-delete-multiple-chapters": "Etes-vous sûr de vouloir supprimer {{count}} chapitres/volumes ? Cela ne modifiera pas les fichiers sur le disque."
+        "confirm-delete-multiple-chapters": "Etes-vous sûr de vouloir supprimer {{count}} chapitres/volumes ? Cela ne modifiera pas les fichiers sur le disque.",
+        "bulk-delete-libraries": "Êtes vous sûr de vouloir supprimer {{count}} bibliothèque(s) ?",
+        "webtoon-override": "Passage en mode Webtoon en raison d'images représentant un webtoon.",
+        "match-success": "Séries avec la bonne correspondance",
+        "scrobble-gen-init": "Mise en attente d'une tâche pour générer des événements de scrobble à partir de l'historique de lecture et des évaluations, en les synchronisant avec les services connectés.",
+        "series-added-want-to-read": "Série ajoutée à la liste \"A lire\"",
+        "confirm-delete-multiple-volumes": "Êtes-vous sûr de vouloir supprimer les {{count}} volumes ? Cela ne modifiera pas les fichiers sur le disque.",
+        "series-bound-to-reading-profile": "Série liée au Profil de lecture {{nom}}",
+        "library-bound-to-reading-profile": "Bibliothèque liée au Profil de lecture {{nom}}",
+        "external-match-rate-error": "Kavita a pris trop de temps en cherchant {{seriesName}}. Réessayez dans 5 minutes."
     },
     "read-time-pipe": {
         "less-than-hour": "<1 Heure",
@@ -2255,7 +2301,19 @@
         "multiple-selections": "Sélections multiples",
         "back-to": "Retour à {{action}}",
         "title": "Actions",
-        "copy-settings": "Copier les paramètres depuis"
+        "copy-settings": "Copier les paramètres depuis",
+        "match-tooltip": "Associer les séries manuellement avec Kavita+",
+        "match": "Correspondance",
+        "reorder": "Réorganiser",
+        "reading-profiles": "Profils de lecture",
+        "set-reading-profile": "Définir le profil de lecture",
+        "set-reading-profile-tooltip": "Lier un profil de lecture à cette bibliothèque",
+        "clear-reading-profile": "Effacer le Profil de lecture",
+        "clear-reading-profile-tooltip": "Efface le Profil de lecture pour cette bibliothèque",
+        "cleared-profile": "Profil de lecture effacé",
+        "rename": "Renommer",
+        "rename-tooltip": "Renommer le filtre intelligent",
+        "merge": "Fusionner"
     },
     "preferences": {
         "left-to-right": "De gauche à droite",
@@ -2372,18 +2430,28 @@
         "issue-nums": "Numéros",
         "chapter-nums": "Chapitres",
         "volume-nums": "Volumes",
-        "author-count": "{{num}} Auteurs"
+        "author-count": "{{num}} Auteurs",
+        "chapter-count": "{{num}} chapitres",
+        "no-data": "Aucune donnée",
+        "issue-count": "{{num}} Numéros"
     },
     "confirm": {
         "alert": "Alerte",
-        "confirm": "Confirmer"
+        "confirm": "Confirmer",
+        "ok": "Ok",
+        "cancel": "{{common.cancel}}",
+        "info": "Info",
+        "prompt": "Question"
     },
     "person-detail": {
         "all-roles": "Roles",
         "browse-person-by-role-title": "Toutes les œuvres de {{name}} en tant que {{role}}",
         "known-for-title": "Connu pour",
         "individual-role-title": "En tant que {{role}}",
-        "browse-person-title": "Toutes les œuvres de {{name}}"
+        "browse-person-title": "Toutes les œuvres de {{name}}",
+        "anilist-url": "{{edit-person-modal.anilist-tooltip}}",
+        "aka-title": "Également connu sous le nom de ",
+        "no-info": "Aucune information sur cette personne"
     },
     "edit-person-modal": {
         "save": "{{common.save}}",
@@ -2406,11 +2474,344 @@
         "required-field": "{{validations.required-field}}",
         "cover-image-description": "{{edit-series-modal.cover-image-description}}",
         "cover-image-description-extra": "Vous pouvez également télécharger une couverture à partir de CoversDB, si elle est disponible.",
-        "download-coversdb": "Télécharger à partir de CoversDB"
+        "download-coversdb": "Télécharger à partir de CoversDB",
+        "aliases-tab": "Alias",
+        "aliases-label": "Modifier les alias",
+        "alias-overlap": "Cet alias pointe déjà vers une autre personne ou est le nom de cette personne, envisagez de les fusionner.",
+        "aliases-tooltip": "Lorsqu'une série est étiquetée avec l'alias d'une personne, cette personne est attribuée plutôt que d'en créer une nouvelle. Lorsque vous supprimez un alias, vous devez rescanner la série pour que la modification soit prise en compte."
     },
-    "browse-authors": {
-        "title": "Parcourir les auteurs et écrivains",
+    "changelog-update-item": {
+        "added": "Ajouté",
+        "download": "Télécharger",
+        "developer": "Développeur",
+        "changed": "Modifié",
+        "fixed": "Corrigé",
+        "removed": "Supprimé",
+        "api": "API",
+        "installed": "{{changelog.installed}}",
+        "theme": "Thème",
+        "published-label": "Publié : ",
+        "known-issues": "Problèmes connus",
+        "feature-requests": "Demandes de fonctionnalités"
+    },
+    "match-series-modal": {
+        "title": "Correspondance {{seriesName}}",
+        "description": "Sélectionnez une correspondance pour recâbler les métadonnées de Kavita+ et régénérer les événements de scrobbling. L'option Ne pas faire correspondre peut être utilisée pour empêcher Kavita de faire correspondre les métadonnées et le scrobbler.",
+        "close": "{{common.close}}",
+        "save": "{{common.save}}",
+        "query-tooltip": "Entrez le nom de la série, l'URL AniList/MyAnimeList/ComicBookRoundup. Les URL utiliseront une recherche directe.",
+        "dont-match-tooltip": "Exclure cette série de la correspondance et du scrobbling",
+        "dont-match-label": "Ne pas correspondre",
+        "search": "Recherche",
+        "no-results": "Impossible de trouver une correspondance. Essayez d'ajouter l'URL d'un fournisseur pris en charge et réessayez.",
+        "query-label": "Requête"
+    },
+    "new-version-modal": {
+        "description": "Une nouvelle version de Kavita est disponible. Actualiser pour mettre à jour.",
+        "theme": "{{changelog.theme}}",
+        "removed": "{{changelog.removed}}",
+        "developer": "{{changelog.developer}}",
+        "fixed": "{{changelog.fixed}}",
+        "title": "Kavita a été mise à jour !",
+        "added": "{{changelog.added}}",
+        "changed": "{{changelog.changed}}",
+        "close": "{{common.close}}",
+        "refresh": "Rafraîchir",
+        "api": "{{changelog.api}}",
+        "known-issues": "{{changelog.known-issues}}"
+    },
+    "manage-user-tokens": {
+        "expires-label": "Expiration : {{date}}",
+        "description": "Les utilisateurs qui ont des jetons de scrobbling peuvent avoir besoin d'un renouvellement occasionnel. Kavita leur enverra automatiquement un courriel si celui-ci est configuré et s'il est valide.",
+        "username-header": "Nom d'utilisateur",
+        "anilist-header": "AniList",
+        "mal-header": "MAL",
+        "token-set-label": "Jeu de jetons",
+        "no-data": "{{common.no-data}}"
+    },
+    "manage-matched-metadata": {
+        "description": "Toutes les séries applicables qui peuvent correspondre à des métadonnées externes résident ici. Kavita prélève ou actualise les métadonnées des séries à raison de 50 séries par jour pendant 24 heures.",
+        "matched-status-label": "Correspondant",
+        "title": "Métadonnées correspondantes",
+        "status-header": "Statut",
+        "series-name-header": "Séries",
+        "unmatched-status-label": "Pas de correspondance",
+        "blacklist-status-label": "Besoin d'une correspondance manuelle",
+        "all-status-label": "Tout",
+        "dont-match-label": "Ne correspond pas",
+        "no-data": "{{common.no-data}}",
+        "valid-until-header": "Rafraîchissement suivant",
+        "library-name-header": "Bibliothèque",
+        "match-alt": "Correspondance {{seriesName}}",
+        "actions-header": "Actions",
+        "dont-match-status-label": "{{dont-match-label}}",
+        "library-type": "Type de bibliothèque",
+        "matched-state-label": "État de correspondance"
+    },
+    "manage-metadata-settings": {
+        "enable-relations-label": "Relations",
+        "enabled-tooltip": "Autorise Kavita à télécharger et à enregistrer des métadonnées dans sa base de données.",
+        "enabled-label": "Activer le téléchargement des métadata",
+        "summary-label": "Résumé",
+        "description": "Kavita+ a la capacité de télécharger et d'enregistrer certaines métadonnées dans la base de données. Cette page vous permet de définir les métadonnées prises en compte.",
+        "localized-name-label": "Nom de séries localisé",
+        "summary-tooltip": "Permettre d'écrire un résumé lorsque le champ est déverrouillé.",
+        "enable-tags-tooltip": "Permettre la série Étiquettes à écrire.",
+        "localized-name-tooltip": "Autoriser la saisie d’un nom localisé lorsque le champ est déverrouillé. Kavita tentera de faire la meilleure supposition.",
+        "blacklist-label": "Liste noire des Genres/Tags",
+        "derive-publication-status-label": "Statut de publication",
+        "derive-publication-status-tooltip": "Permettre de dériver le statut de publication à partir du nombre total de chapitres et de volumes.",
+        "enable-people-label": "Personnes",
+        "enable-cover-image-label": "Image de couverture",
+        "field-mapping-description": "Configurer des règles pour certaines chaînes trouvées dans le champ Genre/Tag et les mapper à une nouvelle chaîne dans Genre/Tag, avec l'option de les supprimer de la liste Source. Applicable uniquement lorsque l'écriture des Genres/Tags est activée.",
+        "person-roles-label": "Rôles",
+        "overrides-description": "Autoriser Kavita à écrire sur les champs verrouillés.",
+        "enable-genres-label": "Genres",
+        "enable-tags-label": "Tags",
+        "enable-start-date-label": "Date de début",
+        "enable-start-date-tooltip": "Permettre de remplacer la date de début des séries",
+        "enable-genres-tooltip": "Permettre l'écriture des genres de séries.",
+        "remove-source-tag-label": "Supprimer le Tag source",
+        "add-field-mapping-label": "Ajouter une correspondance de champ",
+        "genre": "Genre",
+        "tag": "Tag",
+        "add-age-rating-mapping-label": "Ajouter une correspondance de classification par âge",
+        "first-last-name-tooltip": "Assurez-vous que les noms des personnes sont écrits avec le Prénom suivi du Nom",
+        "overrides-label": "Remplacements",
+        "first-last-name-label": "Nommage Prénom Nom",
+        "enable-cover-image-tooltip": "Permettre à Kavita de remplacer l'image de couverture des séries",
+        "enable-relations-tooltip": "Permettre d'ajouter des relations entre les séries.",
+        "blacklist-tooltip": "Tout élément de cette liste sera supprimé du traitement des genres et des tags. C'est ici que vous pouvez ajouter les genres/tags que vous ne souhaitez pas voir modifiés. Assurez-vous qu'ils sont séparés par des virgules.",
+        "enable-people-tooltip": "Permettre d'ajouter des personnes (personnages, écrivains, etc.). Toutes les personnes contiennent des images.",
+        "whitelist-label": "Tags de la liste blanche",
+        "age-rating-mapping-description": "Toute chaîne de caractères à gauche, si elle est trouvée dans les Genres ou les Tags, définira la classification par âge de la Série.",
+        "whitelist-tooltip": "N'autoriser qu'une chaîne de cette liste à être écrite pour les Tags. Assurez-vous qu'elles sont séparées par des virgules.",
+        "age-rating-mapping-title": "Correspondance des classifications par âge",
+        "field-mapping-title": "Correspondance de champ",
+        "enable-chapter-title-tooltip": "Autoriser la modification du Titre du chapitre/volume",
+        "enable-chapter-title-label": "Titre",
+        "enable-chapter-release-date-label": "Date de diffusion",
+        "enable-chapter-summary-tooltip": "{{manage-metadata-settings.summary-tooltip}}",
+        "enable-chapter-summary-label": "{{manage-metadata-settings.summary-label}}",
+        "enable-chapter-release-date-tooltip": "Permettre la saisie de la date de publication d'un chapitre ou d'un numéro",
+        "enable-chapter-publisher-label": "Éditeur",
+        "enable-chapter-publisher-tooltip": "Permettre la saisie de l'éditeur des chapitres ou des numéros",
+        "enable-chapter-cover-label": "Couverture du chapitre",
+        "chapter-header": "Champs du chapitre",
+        "enable-chapter-cover-tooltip": "Permettre de définir la couverture d'un chapitre ou d'un numéro"
+    },
+    "match-series-result-item": {
+        "chapter-count": "{{common.chapter-count}}",
+        "updating-metadata-status": "Mise à jour des métadonnées",
+        "volume-count": "{{server-stats.volume-count}}",
+        "releasing": "Sorties",
+        "details": "Voir la page",
+        "issue-count": "{{common.issue-count}}"
+    },
+    "metadata-setting-field-pipe": {
+        "age-rating": "{{metadata-fields.age-rating-title}}",
+        "people": "{{tabs.people-tab}}",
+        "genres": "{{metadata-fields.genres-title}}",
+        "start-date": "{{manage-metadata-settings.enable-start-date-label}}",
+        "covers": "Couvertures",
+        "summary": "{{filter-field-pipe.summary}}",
+        "publication-status": "{{edit-series-modal.publication-status-title}}",
+        "tags": "{{metadata-fields.tags-title}}",
+        "localized-name": "{{edit-series-modal.localized-name-label}}",
+        "chapter-release-date": "Date de publication (Chapitre)",
+        "chapter-summary": "Résumé (Chapitre)",
+        "chapter-covers": "Couvertures (Chapitre)",
+        "chapter-publisher": "{{person-role-pipe.publisher}} (Chapitre)",
+        "chapter-title": "Titre (Chapitre)"
+    },
+    "email-history": {
+        "not-sent-tooltip": "Non envoyé",
+        "description": "Ici, vous pouvez voir tous les e-mails envoyés par Kavita et à quel utilisateur.",
+        "template-header": "Modèle",
+        "date-header": "Date d'envoi",
+        "user-header": "Envoyé à",
+        "sent-header": "Réussi",
+        "no-data": "{{common.no-data}}",
+        "sent-tooltip": "Envoyé"
+    },
+    "role-localized-pipe": {
+        "admin": "Admin",
+        "download": "Ttéléchargement",
+        "change-password": "Modifier le mot de passe",
+        "read-only": "Lecture seule",
+        "bookmark": "Marque-page",
+        "change-restriction": "Modifier la restriction",
+        "login": "Se connecter",
+        "promote": "Promouvoir"
+    },
+    "log-level-pipe": {
+        "information": "Information",
+        "debug": "Déboguer",
+        "trace": "Trace",
+        "warning": "Attention",
+        "critical": "Critique"
+    },
+    "reviews": {
+        "user-reviews-local": "Avis Locaux",
+        "user-reviews-plus": "Avis Externes"
+    },
+    "review-modal": {
+        "close": "{{common.close}}",
+        "save": "{{common.save}}",
+        "delete": "{{common.delete}}",
+        "required": "{{validation.required-field}}",
+        "review-label": "Avis",
+        "title": "Editer Avis",
+        "min-length": "L'avis doit faire au moins {{count}} caractères"
+    },
+    "browse-people": {
+        "title": "Parcourir les personnes",
         "author-count": "{{num}} Personnes",
-        "cover-image-description": "{{edit-series-modal.cover-image-description}}"
+        "cover-image-description": "{{edit-series-modal.cover-image-description}}",
+        "issue-count": "{{common.issue-count}}",
+        "series-count": "{{common.series-count}}",
+        "roles-label": "Rôles",
+        "sort-label": "Trier",
+        "name-label": "Nom",
+        "issue-count-label": "Nombre de numéros",
+        "series-count-label": "Nombre de séries"
+    },
+    "browse-genres": {
+        "title": "Parcourir les genres",
+        "genre-count": "{{num}} Genres",
+        "issue-count": "{{common.issue-count}}",
+        "series-count": "{{common.series-count}}"
+    },
+    "browse-tags": {
+        "title": "Parcourir les étiquettes",
+        "genre-count": "{{num}} Etiquettes",
+        "issue-count": "{{common.issue-count}}",
+        "series-count": "{{common.series-count}}"
+    },
+    "bulk-set-reading-profile-modal": {
+        "title": "Définir le profil de lecture",
+        "close": "{{common.close}}",
+        "filter-label": "{{common.filter}}",
+        "clear": "{{common.clear}}",
+        "no-data": "Aucune collection n'a encore été créée",
+        "loading": "{{common.loading}}",
+        "create": "{{common.create}}",
+        "bound": "Liaison"
+    },
+    "merge-person-modal": {
+        "title": "{{personName}}",
+        "close": "{{common.close}}",
+        "save": "{{common.save}}",
+        "src": "Fusionner une personne",
+        "merge-warning": "Si vous poursuivez, la personne sélectionnée sera supprimée. Le nom de la personne sélectionnée sera ajouté en tant qu'alias et tous ses rôles seront transférés.",
+        "alias-title": "Nouveaux alias",
+        "known-for-title": "Connu pour"
+    },
+    "browse-title-pipe": {
+        "publication-status": "{{value}} travaux",
+        "age-rating": "Noté {{value}}",
+        "user-rating": "{{value}} classement par étoiles",
+        "tag": "Étiquette {{value}}",
+        "translator": "Traduit par {{value}}",
+        "character": "Possède le caractère {{value}}",
+        "publisher": "Publié par {{value}}",
+        "editor": "Edité par {{value}}",
+        "artist": "Dessiné par {{value}}",
+        "letterer": "Lettré par {{value}}",
+        "colorist": "Coloré par {{value}}",
+        "inker": "Encré par {{value}}",
+        "penciller": "Crayonné par {{value}}",
+        "writer": "Ecrit par {{value}}",
+        "genre": "Genre {{value}}",
+        "library": "Au sein de la bibliothèque {{value}}",
+        "format": "Format de {{value}}",
+        "release-year": "Publié en {{value}}",
+        "imprint": "Empreinte de {{value}}",
+        "team": "Équipe {{value}}",
+        "location": "Localisation {{value}}"
+    },
+    "generic-filter-field-pipe": {
+        "person-role": "Rôle",
+        "person-name": "Nom",
+        "person-series-count": "Nombre de séries",
+        "person-chapter-count": "Nombre de chapitres"
+    },
+    "breakpoint-pipe": {
+        "never": "Jamais",
+        "mobile": "Mobile",
+        "tablet": "Tablette",
+        "desktop": "Bureau"
+    },
+    "manage-reading-profiles": {
+        "description": "Toutes vos séries ne peuvent pas être lues de la même manière, établissez des profils de lecture distincts par bibliothèque ou par série pour vous permettre de vous replonger dans vos séries aussi facilement que possible.",
+        "extra-tip": "Attribuez des profils de lecture via le menu d'action sur les séries et les bibliothèques, ou en vrac. Lorsque vous modifiez les paramètres d'une liseuse, un profil caché est créé pour mémoriser vos choix pour cette série (pas pour les pdf). Ce profil est supprimé lorsque vous attribuez l'un de vos propres profils de lecture à la série. Pour plus d'informations, consultez la page",
+        "profiles-title": "Vos profils de lecture",
+        "default-profile": "Défaut",
+        "add-tooltip": "Votre nouveau profil sera sauvegardé après avoir été modifié",
+        "make-default": "Défini comme valeur par défaut",
+        "no-selected": "Aucun profil sélectionné",
+        "confirm": "Êtes-vous sûr de vouloir supprimer le profil de lecture {{name}} ?",
+        "selection-tip": "Sélectionnez un profil dans la liste ou créez-en un nouveau en haut à droite",
+        "image-reader-settings-title": "Lecteur d'images",
+        "reading-direction-label": "Sens de lecture",
+        "reading-direction-tooltip": "Sens dans lequel il faut cliquer pour passer à la page suivante. De droite à gauche signifie que vous cliquez sur le côté gauche de l'écran pour passer à la page suivante.",
+        "scaling-option-label": "Options de mise à l'échelle",
+        "scaling-option-tooltip": "Comment adapter l'image à votre écran.",
+        "page-splitting-label": "Fractionnement des pages",
+        "page-splitting-tooltip": "Comment diviser une image en pleine largeur (signifie que les images de gauche et de droite sont combinées)",
+        "reading-mode-label": "Mode lecture",
+        "reading-mode-tooltip": "Modifier le lecteur pour qu'il soit paginé verticalement, horizontalement ou qu'il ait un défilement infini",
+        "layout-mode-label": "Mode de présentation",
+        "layout-mode-tooltip": "Rendre une seule image à l'écran ou deux images côte à côte",
+        "background-color-label": "Couleur de fond",
+        "background-color-tooltip": "Couleur d'arrière-plan du lecteur d'images",
+        "auto-close-menu-label": "Menu de fermeture automatique",
+        "auto-close-menu-tooltip": "Le menu doit-il se fermer automatiquement",
+        "show-screen-hints-label": "Afficher les conseils à l'écran",
+        "show-screen-hints-tooltip": "Afficher une superposition pour aider à comprendre la zone et le sens de pagination",
+        "emulate-comic-book-label": "S'inspirer de la bande dessinée",
+        "emulate-comic-book-tooltip": "Applique un effet d'ombre pour imiter la lecture d'un livre",
+        "add": "{{common.add}}",
+        "wiki-title": "wiki",
+        "swipe-to-paginate-label": "Balayer pour paginer",
+        "swipe-to-paginate-tooltip": "Le balayage de l'écran doit-il déclencher l'affichage de la page suivante ou précédente",
+        "allow-auto-webtoon-reader-label": "Mode de lecture automatique des webtoons",
+        "allow-auto-webtoon-reader-tooltip": "Passez en mode \"Webtoon Reader\" si les pages ressemblent à un webtoon. Des faux positifs peuvent se produire.",
+        "width-override-label": "{{manga-reader.width-override-label}}",
+        "width-override-tooltip": "Remplacer la largeur des images dans le lecteur",
+        "disable-width-override-label": "Désactiver la surcharge de la largeur",
+        "reset": "{{common.reset}}",
+        "disable-width-override-tooltip": "Empêcher la surcharge de la largeur de prendre effet lorsque l'écran est plus petit ou égal au point de rupture configuré",
+        "book-reader-settings-title": "Lecteur de livres",
+        "tap-to-paginate-label": "Tapez pour paginer",
+        "tap-to-paginate-tooltip": "Les côtés de l'écran du lecteur de livres devraient-ils permettre d'appuyer dessus pour passer à la page précédente/suivante",
+        "immersive-mode-label": "Mode immersif",
+        "immersive-mode-tooltip": "Cela permet de masquer le menu derrière un clic sur le document de lecture et d'activer la fonction de pagination",
+        "reading-direction-book-label": "Sens de lecture",
+        "reading-direction-book-tooltip": "Sens dans lequel cliquer pour passer à la page suivante. De droite à gauche signifie que vous cliquez sur le côté gauche de l'écran pour passer à la page suivante.",
+        "font-family-label": "Famille de polices",
+        "font-family-tooltip": "Famille de polices à charger. Défaut chargera la police par défaut du livre",
+        "writing-style-label": "Style d'écriture",
+        "writing-style-tooltip": "Change la direction du texte. L'horizontale va de gauche à droite, la verticale va de haut en bas.",
+        "layout-mode-book-label": "Mode de présentation",
+        "layout-mode-book-tooltip": "Comment le contenu doit être présenté. Le défilement correspond à l'emballage du livre. 1 ou 2 colonnes s'adapte à la hauteur de l'appareil et contient 1 ou 2 colonnes de texte par page",
+        "color-theme-book-label": "Thème de couleur",
+        "color-theme-book-tooltip": "Quel thème de couleur appliquer au contenu et au menu du lecteur de livres",
+        "font-size-book-label": "Taille de la police",
+        "font-size-book-tooltip": "Pourcentage de l'échelle à appliquer à la police dans le livre",
+        "line-height-book-label": "Espacement des lignes",
+        "line-height-book-tooltip": "Quel est l'espacement entre les lignes du livre",
+        "margin-book-label": "Marge",
+        "margin-book-tooltip": "L'espacement de chaque côté de l'écran. Ce paramètre est remplacé par 0 sur les appareils mobiles, quel que soit ce paramètre.",
+        "pdf-reader-settings-title": "Lecteur PDF",
+        "pdf-scroll-mode-label": "Mode défilement",
+        "pdf-scroll-mode-tooltip": "Mode de défilement des pages. Vertical/Horizontal et Taper pour paginer (pas de défilement)",
+        "pdf-spread-mode-label": "Mode d'expansion",
+        "pdf-spread-mode-tooltip": "Comment les pages doivent être mises en page. Simple ou double (paire/impaire)",
+        "pdf-theme-label": "Thème",
+        "pdf-theme-tooltip": "Couleur du thème du lecteur",
+        "reading-profile-series-settings-title": "Série",
+        "reading-profile-library-settings-title": "Bibliothèque",
+        "delete": "{{common.delete}}"
     }
 }
diff --git a/UI/Web/src/assets/langs/ga.json b/UI/Web/src/assets/langs/ga.json
index 34ebeaddb..0a6a7515b 100644
--- a/UI/Web/src/assets/langs/ga.json
+++ b/UI/Web/src/assets/langs/ga.json
@@ -22,11 +22,11 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "saving": "Ag sábháil…",
         "update": "Nuashonrú",
-        "account-detail-title": "Sonraí Cuntais"
+        "account-detail-title": "Sonraí Cuntais",
+        "invalid-email-warning": "Cuirfidh ríomhphost neamhbhailí bac ar roinnt feidhmiúlachtaí de chuid Kavita"
     },
     "user-scrobble-history": {
         "title": "Stair Scrobble",
@@ -38,8 +38,8 @@
         "type-header": "Cineál",
         "series-header": "Sraith",
         "data-header": "Sonraí",
-        "is-processed-header": "a phróiseáiltear",
-        "no-data": "Gan Sonraí",
+        "is-processed-header": "An bhfuil Próiseáilte",
+        "no-data": "{{common.no-data}}",
         "volume-and-chapter-num": "Imleabhar {{v}} Caibidil {{n}}",
         "volume-num": "Imleabhar {{num}}",
         "chapter-num": "Caibidil {{num}}",
@@ -47,7 +47,12 @@
         "not-applicable": "Neamhbhainteach",
         "processed": "Próiseáilte",
         "not-processed": "Gan Phróiseáil",
-        "special": "{{entity-title.special}}"
+        "special": "{{entity-title.special}}",
+        "generate-scrobble-events": "Imeachtaí Aislíonta",
+        "token-expired": "Tá do chomhartha AniList imithe in éag! Ní phróiseálfar imeachtaí scrobála go dtí go ndéanfaidh tú athnuachan ar leathanach na gCuntas.",
+        "scrobbling-disabled": "Tá scrobbling díchumasaithe ar do Shocruithe Cuntais.",
+        "select-all-label": "Roghnaigh gach rud",
+        "delete-selected-label": "Scrios na roghanna"
     },
     "scrobble-event-type-pipe": {
         "chapter-read": "Dul Chun Cinn léitheoireachta",
@@ -59,15 +64,6 @@
     "spoiler": {
         "click-to-show": "Spoiler, cliceáil chun a thaispeáint"
     },
-    "review-series-modal": {
-        "title": "Cuir Athbhreithniú in Eagar",
-        "review-label": "Athbhreithniú",
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "min-length": "Ní mór an t-athbhreithniú a bheith ar a laghad {{count}} carachtair",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}",
         "user-review": "Léirmheas {{username}}",
@@ -78,7 +74,8 @@
         "your-review": "Is é seo d'athbhreithniú",
         "external-review": "Athbhreithniú Seachtrach",
         "local-review": "Athbhreithniú Áitiúil",
-        "rating-percentage": "Rátáil {{r}}%"
+        "rating-percentage": "Rátáil {{r}}%",
+        "critic": "criticeoir"
     },
     "want-to-read": {
         "title": "Ag iarraidh léamh",
@@ -88,7 +85,7 @@
     },
     "user-preferences": {
         "title": "Painéal na nÚsáideoirí",
-        "pref-description": "Is socruithe domhanda iad seo atá faoi cheangal ag do chuntas.",
+        "pref-description": "Is socruithe domhanda iad seo atá ceangailte le do chuntas. Tá socruithe léitheoirí le fáil i bPróifílí Léitheoireachta.",
         "account-tab": "{{tabs.account-tab}}",
         "preferences-tab": "{{tabs.preferences-tab}}",
         "theme-tab": "{{tabs.theme-tab}}",
@@ -104,63 +101,14 @@
         "locale-tooltip": "Ba chóir go n-úsáidfeadh an teanga Kavita",
         "blur-unread-summaries-label": "Blur Achoimrí Gan Léamh",
         "blur-unread-summaries-tooltip": "Blurs téacs achomair ar imleabhair nó caibidlí nach bhfuil aon dul chun cinn a léamh (spoilers a sheachaint)",
-        "prompt-on-download-label": "Pras ar Íoslódáil",
+        "prompt-on-download-label": "Pras le hÍoslódáil",
         "prompt-on-download-tooltip": "Pras nuair a sháraíonn íoslódáil {{size}}MB i méid",
         "disable-animations-label": "Díchumasaigh Beochan",
         "disable-animations-tooltip": "Múch beochan ar an suíomh. Úsáideach do léitheoirí r-dúch.",
-        "collapse-series-relationships-label": "collapse Sraith Caidrimh",
-        "collapse-series-relationships-tooltip": "Ar chóir Kavita thaispeáint Sraith nach bhfuil aon chaidreamh nó go bhfuil an tuismitheoir / prequel",
+        "collapse-series-relationships-label": "Caidrimh Sraithe a Chomhbhrú",
+        "collapse-series-relationships-tooltip": "Ar chóir Kavita thaispeáint Sraith nach bhfuil aon chaidreamh nó go bhfuil an tuismitheoir/réamhscéal",
         "share-series-reviews-label": "Léirmheasanna Sraith Comhroinn",
         "share-series-reviews-tooltip": "Ar chóir Kavita san áireamh do athbhreithnithe ar Sraith d'úsáideoirí eile",
-        "image-reader-settings-title": "Léitheoir Íomhá",
-        "reading-direction-label": "Treo Léitheoireachta",
-        "reading-direction-tooltip": "Treo le cliceáil chun bogadh go dtí an chéad leathanach eile. Ciallaíonn Ceart go Clé go gcliceálann tú ar thaobh na láimhe clé den scáileán chun bogadh go dtí an chéad leathanach eile.",
-        "scaling-option-label": "Roghanna Scálú",
-        "scaling-option-tooltip": "Conas an íomhá a scála ar do scáileán.",
-        "page-splitting-label": "Scoilteadh Leathanach",
-        "page-splitting-tooltip": "Conas íomhá leithead iomlán a roinnt (ie cuirtear íomhánna ar chlé agus ar dheis le chéile)",
-        "reading-mode-label": "Mód Léitheoireachta",
-        "reading-mode-tooltip": "Athraigh an léitheoir chun leathanach a dhéanamh go hingearach, go cothrománach, nó bíodh scrolla gan teorainn agat",
-        "layout-mode-label": "Mód Leagan Amach",
-        "layout-mode-tooltip": "Tabhair íomhá amháin don scáileán nó dhá íomhá taobh le taobh",
-        "background-color-label": "Cúlra Dath",
-        "background-color-tooltip": "Cúlra Dath an Léitheora Íomhá",
-        "auto-close-menu-label": "Dún an Roghchlár Go hUathoibríoch",
-        "auto-close-menu-tooltip": "Ba chóir an roghchlár a dhúnadh go huathoibríoch",
-        "show-screen-hints-label": "Taispeáin Leideanna Scáileáin",
-        "show-screen-hints-tooltip": "Taispeáin forleagan chun cabhrú le tuiscint a fháil ar limistéar agus treo pagination",
-        "emulate-comic-book-label": "Aithris a dhéanamh ar ghreannán",
-        "emulate-comic-book-tooltip": "Cuireann sé scáthéifeacht i bhfeidhm chun aithris a dhéanamh ar léamh as leabhar",
-        "swipe-to-paginate-label": "Svaidhpeáil go Paginate",
-        "swipe-to-paginate-tooltip": "Ba chóir svaidhpeáil ar an scáileán a chur faoi deara an chéad leathanach eile nó an leathanach roimhe seo a spreagadh",
-        "book-reader-settings-title": "Léitheoir Leabhar",
-        "tap-to-paginate-label": "Tapáil go Paginate",
-        "tap-to-paginate-tooltip": "Má cheadaíonn taobhanna scáileán an léitheora leabhar cnagadh air chun bogadh go dtí an chéad leathanach eile/an chéad leathanach eile",
-        "immersive-mode-label": "Mód tumtha",
-        "immersive-mode-tooltip": "Folóidh sé seo an roghchlár taobh thiar de chliceáil ar an gcáipéis léitheora agus casfaidh sé tapáil chun paginate a dhéanamh air",
-        "reading-direction-book-label": "Treo Léitheoireachta",
-        "reading-direction-book-tooltip": "Treo le cliceáil chun bogadh go dtí an chéad leathanach eile. Ciallaíonn Ceart go Clé go gcliceálann tú ar thaobh na láimhe clé den scáileán chun bogadh go dtí an chéad leathanach eile.",
-        "font-family-label": "Teaghlach Cló",
-        "font-family-tooltip": "Clófhoireann le luchtú suas. Luchtóidh an réamhshocrú cló réamhshocraithe an leabhair",
-        "writing-style-label": "Stíl Scríbhneoireachta",
-        "writing-style-tooltip": "Athraíonn seo treo an téacs. Horizontal is left to right, tá ingearach ó bhun go barr.",
-        "layout-mode-book-label": "Mód Leagan Amach",
-        "layout-mode-book-tooltip": "Conas ba chóir ábhar a leagan amach. Scrollaigh mar a phacálann an leabhar é. 1 nó 2 Oireann Colún d'airde na feiste agus luíonn sé 1 nó 2 cholún téacs in aghaidh an leathanaigh",
-        "color-theme-book-label": "Téama Datha",
-        "color-theme-book-tooltip": "Cén téama datha atá le cur i bhfeidhm ar ábhar agus roghchlár an léitheora leabhar",
-        "font-size-book-label": "Clómhéid",
-        "font-size-book-tooltip": "Céatadán den scálú le cur i bhfeidhm ar chló sa leabhar",
-        "line-height-book-label": "Spásáil Líne",
-        "line-height-book-tooltip": "Cé mhéad spásáil idir línte an leabhair",
-        "margin-book-label": "Imeall",
-        "margin-book-tooltip": "Cé mhéad spásáil ar gach taobh den scáileán. Sáróidh sé seo 0 ar ghléasanna soghluaiste beag beann ar an socrú seo.",
-        "pdf-reader-settings-title": "Léitheoir PDF",
-        "pdf-scroll-mode-label": "Mód Scrollaigh",
-        "pdf-scroll-mode-tooltip": "Conas a scrollaíonn tú trí leathanaigh. Ingearach / Cothrománach agus Tapáil go Paginate (gan scrollbharra)",
-        "pdf-spread-mode-label": "Mód Scaipthe",
-        "pdf-spread-mode-tooltip": "Conas ba chóir leathanaigh a leagan amach. Singil nó dúbailte (corr / fiú)",
-        "pdf-theme-label": "Téama",
-        "pdf-theme-tooltip": "Téama datha an léitheora",
         "clients-opds-alert": "Níl OPDS cumasaithe ar an bhfreastalaí seo. Ní dhéanfaidh sé seo difear d'úsáideoirí Tachiyami.",
         "clients-opds-description": "Úsáidfidh gach cliant 3ú Páirtí an eochair API nó an Url Ceangail thíos. Tá siad seo cosúil le pasfhocail, coinnigh príobháideach é.",
         "clients-api-key-tooltip": "Tá an eochair API cosúil le pasfhocal. Má athshocraítear é, cuirfidh sé aon chliaint atá ann cheana ó bhail.",
@@ -168,12 +116,20 @@
         "clients-api-key-label": "Eochair API",
         "clients-opds-url-tooltip": "Féach liosta de chliaint OPDS a dtacaítear leo: ",
         "reset": "{{common.reset}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "kavitaplus-settings-title": "Kavita+",
+        "anilist-scrobbling-label": "Scrobbling AniList",
+        "anilist-scrobbling-tooltip": "Lig do Kavita Scrobble (sioncronú aontreo) dul chun cinn a léamh agus rátálacha chuig AniList",
+        "want-to-read-sync-label": "Ag Teastáil le Léamh Sioncrónaithe",
+        "want-to-read-sync-tooltip": "Lig do Kavita míreanna a chur le do liosta Want to Read bunaithe ar shraith AniList agus MAL sa léiliosta ar feitheamh"
     },
     "user-holds": {
         "title": "Coinníonn Scrobble",
-        "description": "Is liosta é seo atá á bhainistiú ag úsáideoirí de Shraith nach mbeidh scrobbled do sholáthraithe réamhtheachtacha. Is féidir leat sraith a bhaint ag am ar bith agus cuirfidh an chéad imeacht eile atá in ann scrobble (dul chun cinn léitheoireachta, rátáil, ag iarraidh stádas a léamh) tús le himeachtaí.",
-        "no-data": "{{typeahead.no-data}}"
+        "description": "Seo liosta de na Sraitheanna atá á mbainistiú ag an úsáideoir nach ndéanfar iad a scrobadh chuig soláthraithe in aghaidh an tsrutha. Is féidir leat sraith a bhaint ag am ar bith agus cuirfidh an chéad imeacht eile in ann scrobble (dul chun cinn a léamh, rátáil, ba mhaith leat a léamh stádas) tús le scrobbling.",
+        "no-data": "{{typeahead.no-data}}",
+        "series-name-header": "{{manage-matched-metadata.series-name-header}}",
+        "created-header": "{{manage-media-issues.created-header}}",
+        "delete-label": "{{common.remove}}"
     },
     "theme-manager": {
         "title": "Bainisteoir Téama",
@@ -293,7 +249,8 @@
         "regen-warning": "Cuirfidh athghiniúint d'eochair API aon chliaint atá ann cheana ó bhail.",
         "no-key": "EARRÁID - EOCHAIR GAN SOCRÚ",
         "confirm-reset": "Cuirfidh sé seo aon chumraíochtaí OPDS atá socraithe agat ó bhail. An bhfuil tú cinnte go bhfuil fonn ort leanúint ar aghaidh?",
-        "key-reset": "Athshocrú Eochair API"
+        "key-reset": "Athshocrú Eochair API",
+        "reset": "Athshocraigh"
     },
     "scrobbling-providers": {
         "title": "Soláthraithe Scrobbling",
@@ -313,14 +270,20 @@
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
-        "loading": "{{common.loading}}"
+        "loading": "{{common.loading}}",
+        "anilist-used-for": "Úsáidtear AniList le haghaidh scrobbling (sonraí sioncronaithe) agus ba mhaith liom sioncronú a léamh.",
+        "mal-used-for": "Úsáidtear MyAnimeList le haghaidh Bailiúcháin Chliste agus ba mhaith liom sioncronú a léamh.",
+        "anilist-first-description": "Tá do chomhartha AniList socraithe anois. Maireann an comhartha seo ar feadh bliana agus cuirfidh Kavita in iúl duit sula dtéann sé in éag chun é a athnuachan anseo. Leis seo, ginfidh Kavita imeachtaí scrobble (sync) ó do stair léitheoireachta, do mhianta a léamh, agus do rátálacha. Is féidir leat é seo a thosú anois nó níos déanaí. Má tá sraith ar bith agat nach bhfuil tú ag iarraidh a bheith scroblach roghnaigh níos déanaí agus cuir Scrobble Hold orthu. Ní mór duit ach an tasc seo a rith uair amháin. Ina dhiaidh sin, láimhseálfaidh Kavita an sioncronú duit.
           Má roghnaíonn tú 'Níos déanaí', is féidir leat an cnaipe a aimsiú ar an leathanach Scrobbling.",
+        "anilist-first-header": "Comhartha AniList sábháilte",
+        "anilist-first-later": "Níos déanaí",
+        "anilist-first-now": "Anois"
     },
     "typeahead": {
         "locked-field": "Tá an réimse faoi ghlas",
         "close": "{{common.close}}",
         "loading": "{{common.loading}}",
         "add-item": "Cuir {{item}}…",
-        "no-data": "Gan sonraí",
+        "no-data": "{{common.no-data}}",
         "add-custom-item": ", cineál chun mír saincheaptha a chur leis"
     },
     "generic-list-modal": {
@@ -340,7 +303,7 @@
         "chapters-read-tooltip": "{{user-stats-info-cards.chapters-read-label}}: {{value}}",
         "avg-reading-per-week-label": "Meánléitheoireacht / Seachtain",
         "last-active-label": "An Gníomhach Is Déanaí",
-        "chapters": "{{luach}} caibidlí",
+        "chapters": "{{value}} caibidlí",
         "pages-read-by-year-title": "Leathanaigh á Léamh de réir Bliana",
         "words-read-by-year-title": "Focail Léite De Réir Bliana",
         "words-count": "{{num}} focail",
@@ -354,7 +317,7 @@
         "title": "Léitheoirí Barr",
         "time-selection-label": "Fráma ama",
         "comics-label": "Comics: {{value}} uair",
-        "manga-label": "Manga: {{ luach }} uair",
+        "manga-label": "Manga: {{value}} uair",
         "books-label": "Leabhair: {{value}} hrs",
         "this-week": "{{time-periods.this-week}}",
         "last-7-days": "{{time-periods.last-7-days}}",
@@ -429,7 +392,7 @@
     },
     "time-duration-pipe": {
         "hours": "{{value}} uair an chloig",
-        "minutes": "{{luach}} nóiméad",
+        "minutes": "{{value}} nóiméad",
         "days": "{{value}} laethanta",
         "months": "{{value}} míonna",
         "years": "{{value}} blianta"
@@ -453,10 +416,10 @@
         "alternative-setting": "Socrú Malartach",
         "alternative-version": "Leagan Malartach",
         "character": "Carachtar",
-        "contains": "Tá",
+        "contains": "ina bhfuil",
         "doujinshi": "Doujinshi",
         "other": "Eile",
-        "prequel": "PrequelName",
+        "prequel": "Réamhscéal",
         "sequel": "Seicheamh",
         "side-story": "Scéal Taobh",
         "spin-off": "Casadh As",
@@ -466,7 +429,7 @@
     },
     "publication-status-pipe": {
         "ongoing": "Ar siúl faoi láthair",
-        "hiatus": "Hiatus",
+        "hiatus": "Briseadh",
         "completed": "Críochnaithe",
         "cancelled": "Curtha ar ceal",
         "ended": "Críochnaithe"
@@ -477,9 +440,9 @@
         "colorist": "Dathóir",
         "cover-artist": "{{artist}}",
         "editor": "Eagarthóir",
-        "inker": "InkerName",
+        "inker": "Dúchadóir",
         "letterer": "Leitir Ceanainn",
-        "penciller": "Peann luaidhe",
+        "penciller": "Peannaire",
         "publisher": "Foilsitheoir",
         "writer": "Scríbhneoir",
         "other": "Eile",
@@ -489,7 +452,7 @@
         "location": "{{filter-field-pipe.location}}"
     },
     "manga-format-pipe": {
-        "epub": "EPUBName",
+        "epub": "EPUB",
         "archive": "Cartlann",
         "image": "Íomhá",
         "pdf": "PDF",
@@ -497,9 +460,9 @@
     },
     "library-type-pipe": {
         "book": "Leabhar",
-        "comic": "Greannán",
+        "comic": "Greannán (Oidhreacht)",
         "manga": "Manga",
-        "comicVine": "Fíniúna Grinn",
+        "comicVine": "Greannán",
         "image": "Íomhá",
         "lightNovel": "Úrscéal Éadrom"
     },
@@ -518,7 +481,7 @@
         "teen": "Déagóir",
         "x18-plus": "X18+",
         "not-applicable": "Neamhbhainteach",
-        "pg": "PGName",
+        "pg": "PG",
         "r18-plus": "R18+"
     },
     "reset-password": {
@@ -560,11 +523,8 @@
     "changelog": {
         "installed": "Suiteáilte",
         "download": "Íoslódáil",
-        "nightly": "Oíche: {{version}}",
-        "published-label": "Foilsithe: ",
-        "available": "Ar fáil",
-        "description": "Mura bhfeiceann tú {{installed}}",
-        "description-continued": "tá tú ar scaoileadh oíche. Ní thaispeánfar ach mórleaganacha mar atá ar fáil. Taispeánfar clib oíche nuair a bheidh sé ar oíche ón stábla sin."
+        "nightly": "Gach oíche: {{version}}",
+        "available": "Ar fáil"
     },
     "invite-user": {
         "title": "Tabhair cuireadh don úsáideoir",
@@ -598,7 +558,7 @@
         "edit": "{{common.edit}}",
         "buy": "Ceannaigh",
         "activate": "Gníomhachtaigh",
-        "renew": "Athnuaigh",
+        "renew": "Athnuachan",
         "no-license-key": "Gan eochair cheadúnais",
         "license-valid": "Tá an ceadúnas bailí",
         "license-not-valid": "Níl an ceadúnas bailí",
@@ -610,15 +570,35 @@
         "activate-discordId-tooltip": "Nasc do Chuntas Discord le Kavita +. Tugann sé seo rochtain duit ar chainéil i bhfolach chun cabhrú le Kavita a mhúnlú.",
         "discord-validation": "Ní Aitheantas Úsáideora Discord bailí é seo. Ní hé d'aitheantas úsáideora d'ainm úsáideora discord.",
         "activate-delete": "{{common.delete}}",
-        "activate-reset": "{{common.reset}}",
+        "activate-reset": "Ceadúnas Athshocraigh",
         "activate-reset-tooltip": "Neamhbhailí clárúchán roimhe seo trí úsáid a bhaint as do cheadúnas. Teastaíonn Ceadúnas agus Ríomhphost araon",
         "activate-save": "{{common.save}}",
         "kavita+-desc-part-1": "Is seirbhís síntiús préimhe é Kavita + a dhíghlasálann gnéithe do gach úsáideoir ar an ásc Kavita seo. Ceannaigh síntiús le díghlasáil ",
         "kavita+-desc-part-2": "sochair phréimhe",
         "kavita+-desc-part-3": "inniu!",
-        "kavita+-requirement": "Tá Kavita + deartha chun oibriú ach leis an eisiúint is déanaí - leaganacha 2. Tá rud ar bith taobh amuigh de sin faoi réir gan a bheith ag obair.",
-        "kavita+-releases": "Féach eisiúintí",
-        "help-label": "{{common.help}}"
+        "kavita+-requirement": "Tá Kavita+ deartha chun oibriú leis na 3 eisiúint is déanaí amháin. Tá aon rud taobh amuigh de sin faoi réir neamhfheidhmiú.",
+        "help-label": "{{common.help}}",
+        "k+-already-registered-header": "Ceadúnas cláraithe cheana",
+        "k+-license-overwrite": "Cláraítear ceadúnas chuig ásc Kavita eile. Is féidir leis seo tarlú ar athshuiteáil agus go hannamh mar gheall ar nuashonruithe córais. Roghnaigh forscríobh chun iallach a chur ar an gcás seo clárú le Kavita+.",
+        "overwrite": "Forscríobh",
+        "k+-unlocked-description": "Fáilte go Kavita+! Ginfidh Kavita imeachtaí scrobble ó do dhul chun cinn, rátálacha agus ba mhaith leat léamh nuair a chláraíonn tú do Sholáthraithe Scrobbling faoi chuntas. Tóg roinnt ama lena chinntiú go n-áitíonn tú greimíní scrobble le haghaidh sraith ar bith nach mian leat a scrobble.",
+        "info-title": "Eolas Ceadúnais",
+        "actions-title": "Gníomhartha",
+        "license-active-label": "Ceadúnas Gníomhach",
+        "supported-version-label": "Ar leagan Kavita Tacaithe",
+        "expiration-label": "Dul in éag",
+        "valid-tooltip": "Bailí",
+        "invalid-tooltip": "Neamhbhailí",
+        "reset-label": "Athshocraigh",
+        "reset-tooltip": "Athshocróidh sé seo an cás freastalaí a bhfuil ceadúnas Kavita+ ceangailte leis. Teastaíonn Ríomhphost agus Eochair Cheadúnais",
+        "delete-label": "Bain Ceadúnas",
+        "delete-tooltip": "Bainfidh sé seo an ceadúnas de Kavita chun Kavita a stopadh ó labhairt le Kavita+. Ní dhíliostáil sé thú. Úsáid 'manage' ar dtús chun an síntiús a chealú.",
+        "manage-tooltip": "Nuashonraigh faisnéis íocaíochta, Cealaigh/Cuir síntiús, etc",
+        "faq-title": "CCanna",
+        "total-subbed-months-label": "Míonna Iomlána Suibscríofa",
+        "email-label": "Ríomhphost Cláraithe",
+        "license-mismatch": "Is féidir ceadúnas a chlárú le cás Kavita eile. Athchlárú lena shocrú.",
+        "k+-unlocked": "Kavita+ díghlasáilte!"
     },
     "book-line-overlay": {
         "copy": "Cóipeáil",
@@ -643,7 +623,7 @@
         "settings-header": "Socruithe",
         "table-of-contents-header": "Clár Ábhair",
         "bookmarks-header": "{{side-nav.bookmarks}}",
-        "toc-header": "ToCName",
+        "toc-header": "Clár",
         "loading-book": "Leabhar á luchtú…",
         "go-back": "Téigh siar",
         "close-reader": "Dún an Léitheoir",
@@ -651,7 +631,10 @@
         "incognito-mode-label": "Mód Incognito",
         "next": "Ar Aghaidh",
         "previous": "Roimhe Seo",
-        "go-to-page-prompt": "Tá leathanaigh {{totalPages}} ann. Cén leathanach ar mhaith leat dul chuige?"
+        "go-to-page-prompt": "Tá leathanaigh {{totalPages}} ann. Cén leathanach ar mhaith leat dul chuige?",
+        "go-to-section": "Téigh go dtí an roinn",
+        "go-to-section-prompt": "Tá {{totalSections}} rannóg ann. Cén rannóg ar mhaith leat dul chuici?",
+        "go-to-first-page": "Téigh go dtí an chéad leathanach"
     },
     "personal-table-of-contents": {
         "no-data": "Níl aon rud Leabharmharcáilte fós",
@@ -699,7 +682,7 @@
     "series-detail": {
         "page-settings-title": "Socruithe an Leathanaigh",
         "close": "{{common.close}}",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
         "layout-mode-option-card": "Cárta",
         "layout-mode-option-list": "Liosta",
         "continue-from": "Lean ar aghaidh {{title}}",
@@ -725,8 +708,6 @@
         "no-pages": "{{toasts.no-pages}}",
         "no-chapters": "Níl aon chaibidlí san imleabhar seo. Ní féidir léamh.",
         "cover-change": "Is féidir leis suas le nóiméad a thógáil le do bhrabhsálaí an íomhá a athnuachan. Go dtí sin, is féidir an tseaníomhá a thaispeáint ar roinnt leathanach.",
-        "user-reviews-local": "Léirmheasanna Áitiúla",
-        "user-reviews-plus": "Léirmheasanna Seachtracha",
         "writers-title": "{{metadata-fields.writers-title}}",
         "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
         "characters-title": "{{metadata-fields.characters-title}}",
@@ -752,9 +733,11 @@
         "more-alt": "Tuilleadh",
         "time-left-alt": "Am Fágtha",
         "time-to-read-alt": "{{sort-field-pipe.time-to-read}}",
-        "scrobbling-tooltip": "{{settings.scrobbling}}",
+        "scrobbling-tooltip": "{{settings.scrobbling}}: {{value}}",
         "publication-status-title": "Foilsiú",
-        "publication-status-tooltip": "Stádas Foilseacháin"
+        "publication-status-tooltip": "Stádas Foilseacháin",
+        "off": "{{reader-settings.off}}",
+        "on": "{{reader-settings.on}}"
     },
     "metadata-fields": {
         "collections-title": "{{side-nav.collections}}",
@@ -766,10 +749,10 @@
         "characters-title": "Carachtair",
         "colorists-title": "Dathaitheoirí",
         "editors-title": "Eagarthóirí",
-        "inkers-title": "Inkers",
+        "inkers-title": "Dúchadóirí",
         "letterers-title": "Litreoirí",
         "translators-title": "Aistritheoirí",
-        "pencillers-title": "Peannaireachtaí",
+        "pencillers-title": "Peannairí",
         "publishers-title": "Foilsitheoirí",
         "imprints-title": "Inphriontaí",
         "teams-title": "Foirne",
@@ -786,7 +769,8 @@
         "entry-label": "Féach Sonraí",
         "kavita-tooltip": "Do Rátáil + Tríd is tríd",
         "kavita-rating-title": "Do Rátáil",
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "critic": "{{review-card.critic}}"
     },
     "badge-expander": {
         "more-items": "agus {{count}} níos mó"
@@ -821,7 +805,9 @@
         "back": "Ar ais",
         "more": "Níos mó",
         "customize": "{{settings.customize}}",
-        "browse-authors": "Brabhsáil Údair"
+        "edit": "{{common.edit}}",
+        "cancel-edit": "Dún Athordú",
+        "browse-people": "Brabhsáil Daoine"
     },
     "library-settings-modal": {
         "close": "{{common.close}}",
@@ -838,7 +824,7 @@
         "type-label": "Cineál",
         "type-tooltip": "Cinneann cineál leabharlainne conas a dhéantar comhaid a pharsáil agus má thaispeánann an Chomhéadain Caibidlí (Manga) vs Ceisteanna (Comics). Seiceáil an vicí le haghaidh tuilleadh sonraí ar na difríochtaí idir na cineálacha leabharlainne.",
         "kavitaplus-eligible-label": "Kavita+ Incháilithe",
-        "kavitaplus-eligible-tooltip": "An dtarraingeoidh Kavita + faisnéis nó an dtacóidh sé le Scrobbling",
+        "kavitaplus-eligible-tooltip": "Tacaíonn gnéithe meiteashonraí Kavita+ nó Scrobbling",
         "folder-description": "Cuir fillteáin le do leabharlann",
         "browse": "Brabhsáil le haghaidh Fillteáin Meán",
         "help-us-part-1": "Cabhraigh linn trí na nithe seo a leanas a leanúint ",
@@ -872,40 +858,44 @@
         "file-type-group-tooltip": "Cad iad na cineálacha comhaid ba chóir Kavita scanadh le haghaidh. Mar shampla, beidh gach comhad cb *, zip, rar, srl san áireamh sa Chartlann.",
         "exclude-patterns-label": "Patrúin a Eisiamh",
         "exclude-patterns-tooltip": "Cumraigh sraith patrúin (comhréir Glob) a mheaitseálann Kavita nuair a scanadh eolairí agus eisiamh ó thorthaí Scanóir.",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "allow-metadata-matching-tooltip": "Ar cheart do Kavita meiteashonraí a íoslódáil do Shraith laistigh den Leabharlann seo. Ní tharlóidh sé seo ach amháin má tá Síntiús gníomhach Kavita+ ag an bhfreastalaí.",
+        "allow-metadata-matching-label": "Ceadaigh Meaitseáil Meiteashonraí",
+        "enable-metadata-tooltip": "Lig do Kavita comhaid meiteashonraí a léamh a sháraíonn parsáil ainm comhaid.",
+        "enable-metadata-label": "Cumasaigh Meiteashonraí (ComicInfo/Epub/PDF)"
     },
     "file-type-group-pipe": {
         "archive": "Cartlann",
-        "epub": "EpubName",
+        "epub": "Epub",
         "pdf": "Pdf",
         "image": "Íomhá"
     },
     "reader-settings": {
         "general-settings-title": "Socruithe Ginearálta",
-        "font-family-label": "{{user-preferences.font-family-label}}",
-        "font-size-label": "{{user-preferences.font-size-book-label}}",
-        "line-spacing-label": "{{user-preferences.line-height-book-label}}",
-        "margin-label": "{{user-preferences.margin-book-label}}",
+        "font-family-label": "{{manage-reading-profiles.font-family-label}}",
+        "font-size-label": "{{manage-reading-profiles.font-size-book-label}}",
+        "line-spacing-label": "{{manage-reading-profiles.line-height-book-label}}",
+        "margin-label": "{{manage-reading-profiles.margin-book-label}}",
         "reset-to-defaults": "Athshocraigh go Réamhshocruithe",
         "reader-settings-title": "Socruithe an Léitheora",
-        "reading-direction-label": "{{user-preferences.reading-direction-book-label}}",
-        "right-to-left": "Ceart go Clé",
+        "reading-direction-label": "{{manage-reading-profiles.reading-direction-book-label}}",
+        "right-to-left": "Deas go Clé",
         "left-to-right": "Clé go Deas",
         "horizontal": "Cothrománach",
         "vertical": "Ingearach",
-        "writing-style-label": "{{user-preferences.writing-style-label}}",
+        "writing-style-label": "{{manage-reading-profiles.writing-style-label}}",
         "writing-style-tooltip": "Athraíonn seo treo an téacs. Horizontal is left to right, tá ingearach ó bhun go barr.",
         "tap-to-paginate-label": "Tapáil Pagination",
         "tap-to-paginate-tooltip": "Cliceáil ar imill an scáileáin chun paginate",
-        "on": "Maidir le",
+        "on": "Ar",
         "off": "As",
-        "immersive-mode-label": "{{user-preferences.immersive-mode-label}}",
+        "immersive-mode-label": "{{manage-reading-profiles.immersive-mode-label}}",
         "immersive-mode-tooltip": "Folóidh sé seo an roghchlár taobh thiar de chliceáil ar an gcáipéis léitheora agus casfaidh sé tapáil chun paginate a dhéanamh air",
         "fullscreen-label": "Lánscáileán",
         "fullscreen-tooltip": "Cuir an léitheoir i mód lánscáileáin",
         "exit": "Scoir",
         "enter": "Iontráil",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
         "layout-mode-tooltip": "Scrollaigh: Scátháin comhad epub (de ghnáth leathanach fada scrollaithe amháin in aghaidh na caibidle).
          1 Colún: Cruthaíonn sé leathanach fíorúil amháin ag an am.
          2 Colún: Cruthaítear dhá leathanach fhíorúla ag an am atá leagtha amach taobh le taobh -taobh.",
         "layout-mode-option-scroll": "Scrollaigh",
         "layout-mode-option-1col": "1 Colún",
@@ -914,10 +904,18 @@
         "theme-dark": "Dorcha",
         "theme-black": "Dubh",
         "theme-white": "Bán",
-        "theme-paper": "Páipéar"
+        "theme-paper": "Páipéar",
+        "line-spacing-min-label": "1x",
+        "line-spacing-max-label": "2.5x",
+        "update-parent": "Sábháil chuig {{name}}",
+        "loading": "ag lódáil",
+        "create-new": "Próifíl nua ó intuigthe",
+        "reading-profile-updated": "Próifíl léitheoireachta nuashonraithe",
+        "reading-profile-promoted": "Próifíl léitheoireachta curtha chun cinn",
+        "create-new-tooltip": "Cruthaigh próifíl nua inbhainistithe ón gceann intuigthe atá agat faoi láthair"
     },
     "table-of-contents": {
-        "no-data": "Níl Clár ábhair sa leabhar seo atá leagtha síos sna meiteashonraí nó i gcomhad toc"
+        "no-data": "Níl Clár ábhair sa leabhar seo atá leagtha síos sna meiteashonraí nó i gcomhad clár"
     },
     "bookmarks": {
         "title": "{{side-nav.bookmarks}}",
@@ -938,7 +936,8 @@
     },
     "card-detail-layout": {
         "total-items": "{{count}} míreanna iomlána",
-        "jumpkey-count": "{{count}} Sraith"
+        "jumpkey-count": "{{count}} Sraith",
+        "no-data": "{{common.no-data}}"
     },
     "card-item": {
         "cannot-read": "Ní féidir léamh"
@@ -964,12 +963,14 @@
         "release-title": "{{sort-field-pipe.release-year}}",
         "read-time-title": "{{edit-chapter-modal.reading-time-label}}",
         "language-title": "{{edit-chapter-modal.language-label}}",
-        "length-title": "{{edit-chapter-modal.words-label}}"
+        "length-title": "{{edit-chapter-modal.words-label}}",
+        "age-rating-title": "{{metadata-fields.age-rating-title}}"
     },
     "related-tab": {
         "reading-lists-title": "{{reading-lists.title}}",
         "collections-title": "{{side-nav.collections}}",
-        "relations-title": "{{tabs.related-tab}}"
+        "relations-title": "{{tabs.related-tab}}",
+        "bookmarks-title": "{{side-nav.bookmarks}}"
     },
     "cover-image-chooser": {
         "enter-an-url-pre-title": "Iontráil {{url}}",
@@ -1028,10 +1029,10 @@
         "file-header": "Comhad",
         "comment-header": "Nóta Tráchta",
         "created-header": "Cruthaithe",
-        "no-data": "Gan Sonraí"
+        "no-data": "{{common.no-data}}"
     },
     "manage-email-settings": {
-        "description": "Chun úsáid a bhaint as roinnt feidhmeanna de chuid Kavita cosúil le Send To Device ní mór soláthraí ríomhphoist a shocrú. Teastaíonn idirghabháil riaracháin ó ghnéithe eile cosúil le Forgot Password gan socrú Ríomhphost.",
+        "description": "Chun úsáid a bhaint as roinnt feidhmeanna de chuid Kavita cosúil le Send To Device ní mór soláthraí ríomhphoist a shocrú. Teastaíonn idirghabháil riaracháin ó ghnéithe eile cosúil le Pasfhocal Dearmadta gan socrú Ríomhphost.",
         "setting-description": "Ní mór duit socruithe Ainm Óstach agus SMTP araon a líonadh chun feidhmiúlacht ríomhphost-bhunaithe a úsáid laistigh de Kavita.",
         "test-warning": "Ní mór socruithe bailí a bheith agat sula mbuaileann tú Tástáil.",
         "send-to-warning": "Más mian leat Seol chuig gléas a bheith ag obair ní mór duit do shocruithe ríomhphoist a shocrú",
@@ -1041,8 +1042,8 @@
         "reset": "{{common.reset}}",
         "test": "Tástáil",
         "host-name-label": "Ainm an Óstríomhaire",
-        "host-name-tooltip": "Ainm Fearainn (ón Seachfhreastalaí Droim ar Ais). Ag teastáil le haghaidh feidhmiúlacht ríomhphoist. Mura bhfuil seachfhreastalaí droim ar ais, úsáid url ar bith.",
-        "host-name-validation": "Ní mór d'ainm óstach tosú le http (í) agus ní chríochnaíonn sé i /",
+        "host-name-tooltip": "Ainm fearainn do sheachfhreastalaí droim ar ais, atá riachtanach le haghaidh feidhmiúlacht ríomhphoist. Mura bhfuil seachfhreastalaí droim ar ais á úsáid agat, is féidir leat aon URL a úsáid, lena n-áirítear http://externalip:port/",
+        "host-name-validation": "Ní mór d'ainm óstach tosú le http(s) agus ní chríochnaíonn sé i /",
         "sender-address-label": "Seoladh an tSeoltóra",
         "sender-address-tooltip": "Is é seo an seoladh ríomhphoist óna bhfeicfidh an glacadóir nuair a gheobhaidh siad an ríomhphost. De ghnáth an seoladh ríomhphoist a bhaineann leis an gcuntas.",
         "sender-displayname-label": "Taispeáin Ainm",
@@ -1058,8 +1059,8 @@
         "size-limit-tooltip": "Cé mhéad beart is féidir leis an bhfreastalaí ríomhphoist a láimhseáil le haghaidh ceangaltán",
         "customized-templates-label": "Teimpléid saincheaptha",
         "customized-templates-tooltip": "Ar chóir do Kavita eolaire cumraíochta / teimpléid a úsáid le haghaidh teimpléid seachas réamhshocrú? Tá tú freagrach as coinneáil suas chun dáta le hathruithe teimpléid.",
-        "gmail-label": "GmailName",
-        "outlook-label": "Ionchas",
+        "gmail-label": "Gmail",
+        "outlook-label": "Outlook",
         "reset-to-default": "{{common.reset-to-default}}",
         "save": "{{common.save}}"
     },
@@ -1141,7 +1142,7 @@
         "customization-settings-title": "Saincheapadh",
         "notice": "Fógra:",
         "restart-required": "Éilíonn Athrú Port, Base Url, Cache Size nó IPs atosú láimhe de Kavita chun éifeacht a ghlacadh.",
-        "base-url-label": "Bun-Url",
+        "base-url-label": "Bun Url",
         "base-url-tooltip": "Bain úsáid as seo más mian leat Kavita a óstáil ar url bonn ie) yourdomain.com/kavita. Ní thacaítear leis ar Docker ag baint úsáide as úsáideoir neamh-fhréamh.",
         "ip-address-label": "Seoltaí IP",
         "ip-address-tooltip": "Camóg scartha liosta de seoltaí IP éisteann an freastalaí ar. Socraítear é seo má tá tú ag rith ar Docker. Éilíonn atosú chun éifeacht a ghlacadh.",
@@ -1189,7 +1190,7 @@
     "manage-system": {
         "title": "Maidir leis an gCóras",
         "version-title": "Leagan",
-        "installId-title": "Suiteáil aitheantas",
+        "installId-title": "Suiteáil ID",
         "more-info-title": "Tuilleadh Eolais",
         "first-install-version-title": "An Chéad Leagan Suiteála",
         "first-install-date-title": "An Chéad Dáta Suiteála",
@@ -1247,9 +1248,6 @@
         "backup-database-task-success": "Tá post chun cúltaca a dhéanamh ar an mbunachar sonraí curtha i scuaine",
         "download-logs-task": "Íosluchtaigh Logchomhaid",
         "download-logs-task-desc": "Tiomsaíonn seo gach comhad logála isteach i zip agus íoslódálann sé é.",
-        "analyze-files-task": "Déan anailís ar chomhaid",
-        "analyze-files-task-desc": "Ritheann tasc fadtréimhseach a dhéanfaidh anailís ar chomhaid chun síneadh agus méid a ghiniúint. Níor chóir é seo a reáchtáil ach uair amháin don scaoileadh v0.7. Ní gá má shuiteáil tú post v0.7.",
-        "analyze-files-task-success": "Tá anailís comhad curtha i scuaine",
         "sync-themes-task": "Téamaí Sioncronaithe",
         "sync-themes-task-desc": "Sioncrónaigh téamaí íoslódála le hathruithe in aghaidh an tsrutha má oireann an leagan.",
         "sync-themes-success": "Tá sioncronú téamaí curtha i scuaine",
@@ -1277,7 +1275,6 @@
         "change-password-alt": "Athraigh Pasfhocal {{user}}",
         "resend": "Athdhíol",
         "setup": "Socrú",
-        "admin": "Riarachán",
         "last-active-header": "An Gníomhach Is Déanaí",
         "roles-header": "Rólanna",
         "name-header": "Ainm",
@@ -1289,7 +1286,8 @@
         "no-data": "Níl aon úsáideoirí eile ann.",
         "loading": "{{common.loading}}",
         "actions-header": "Gníomhartha",
-        "pending-tooltip": "Níor bhailíochtaigh an t-úsáideoir seo a ríomhphost"
+        "pending-tooltip": "Níor bhailíochtaigh an t-úsáideoir seo a ríomhphost",
+        "all-libraries": "Gach Leabharlann"
     },
     "edit-collection-tags": {
         "title": "Cuir {{collectionName}} Collection in eagar",
@@ -1329,7 +1327,7 @@
         "server-section-title": "Freastalaí",
         "info-section-title": "Faisnéis",
         "import-section-title": "Iompórtáil",
-        "kavitaplus-section-title": "{{settings.admin-kavitaplus}}",
+        "kavitaplus-section-title": "Kavita+",
         "admin-general": "Ginearálta",
         "admin-users": "Úsáideoirí",
         "admin-libraries": "Leabharlanna",
@@ -1340,17 +1338,23 @@
         "admin-tasks": "Tascanna",
         "admin-statistics": "Staitisticí",
         "admin-system": "Córas",
-        "admin-kavitaplus": "Kavita+",
+        "admin-kavitaplus": "Ceadúnas",
         "account": "Cuntas",
         "preferences": "Sainroghanna",
         "clients": "Eochair API / OPDS",
         "devices": "Gléasanna",
         "user-stats": "Stait",
-        "scrobbling": "Scrobbling",
+        "scrobbling": "Ag scrobadh",
         "theme": "Téama",
         "customize": "Saincheap",
         "cbl-import": "Liosta Léitheoireachta CBL",
-        "mal-stack-import": "Cruach MAL"
+        "mal-stack-import": "Cruach MAL",
+        "admin-email-history": "Stair Ríomhphoist",
+        "admin-matched-metadata": "Meiteashonraí Meaitseála",
+        "admin-manage-tokens": "Bainistigh Comharthaí Úsáideora",
+        "scrobble-holds": "Scrobble i seilbh",
+        "admin-metadata": "Bainistigh Meiteashonraí",
+        "reading-profiles": "Próifílí Léitheoireachta"
     },
     "collection-detail": {
         "no-data": "Níl aon mhír ann. Bain triail as sraith a chur leis.",
@@ -1387,7 +1391,8 @@
     },
     "reading-list-item": {
         "remove": "{{common.remove}}",
-        "read": "{{common.read}}"
+        "read": "{{common.read}}",
+        "released-label": "Eisithe: {{date}}"
     },
     "stream-list-item": {
         "remove": "{{common.remove}}",
@@ -1395,7 +1400,8 @@
         "provided": "Ar choinníoll",
         "smart-filter": "Scagaire Cliste",
         "library": "Leabharlann",
-        "external-source": "Foinse Sheachtrach"
+        "external-source": "Foinse Sheachtrach",
+        "delete": "{{common.delete}}"
     },
     "reading-list-detail": {
         "item-count": "{{common.item-count}}",
@@ -1407,7 +1413,19 @@
         "read-options-alt": "Léigh roghanna",
         "incognito-alt": "(Go hanaithnid)",
         "no-data": "Ní chuirfear aon ní leis",
-        "characters-title": "{{metadata-fields.characters-title}}"
+        "characters-title": "{{metadata-fields.characters-title}}",
+        "dnd-warning": "Níl tarraing agus scaoil ar fáil ar ghléasanna soghluaiste nó nuair a bhíonn níos mó ná 100 mír ar an liosta léitheoireachta.",
+        "writers-title": "{{metadata-fields.writers-title}}",
+        "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
+        "more-alt": "{{series-detail.more-alt}}",
+        "date-range-title": "Raon Dáta",
+        "edit-label": "Mód Cuir in Eagar",
+        "items-title": "Míreanna",
+        "reorder-alt": "Míreanna a Athordú",
+        "publishers-title": "{{metadata-fields.publishers-title}}",
+        "storyline-tab": "{{series-detail.storyline-tab}}",
+        "details-tab": "{{series-detail.details-tab}}",
+        "edit-alt": "{{common.edit}}"
     },
     "events-widget": {
         "title-alt": "Gníomhaíocht",
@@ -1460,7 +1478,10 @@
         "logout": "Logáil amach",
         "all-filters": "Scagairí Cliste",
         "nav-link-header": "Roghanna Nascleanúna",
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "person-aka-status": "Meaitseálann leasainm",
+        "browse-tags": "Brabhsáil Clibeanna",
+        "browse-genres": "Brabhsáil Seánraí"
     },
     "promoted-icon": {
         "promoted": "{{common.promoted}}"
@@ -1526,7 +1547,7 @@
         "validate-warning": "Tá saincheisteanna leis an CBL a chuirfidh cosc ar allmhairiú. Ceartaigh na ceisteanna seo ansin bain triail eile as.",
         "validate-no-issue-description": "Níor aimsíodh aon saincheisteanna le CBL, brúigh an chéad cheann eile.",
         "dry-run-description": "Is rith tirim é seo agus taispeánann sé cad a tharlóidh má bhrúnn tú Ar Aghaidh agus an t-allmhairiú a dhéanamh. Ní dhéanfar gach Teip a iompórtáil.",
-        "prev": "PrevGenericName",
+        "prev": "Roimhe seo",
         "import": "Iompórtáil",
         "restart": "Atosaigh",
         "next": "Ar Aghaidh",
@@ -1535,7 +1556,7 @@
         "dry-run-step": "Rith Tirim",
         "final-import-step": "An Chéim Dheiridh",
         "comicvine-parsing-label": "Bain úsáid as meaitseáil Sraith Vine Comic",
-        "cbl-repo": "Is féidir leat teacht ar go leor liostaí léitheoireachta sa phobal repo.",
+        "cbl-repo": "Is féidir leat teacht ar go leor liostaí léitheoireachta sa phobal stóras.",
         "help-label": "{{common.help}}"
     },
     "pdf-reader": {
@@ -1571,7 +1592,6 @@
     },
     "manga-reader": {
         "back": "Ar ais",
-        "save-globally": "Sábháil ar fud an domhain",
         "incognito-alt": "Tá mód Incognito ar siúl. Scoránaigh chun é a chasadh as.",
         "incognito-title": "Mód Incognito:",
         "shortcuts-menu-alt": "Mód Aicearraí Méarchláir",
@@ -1582,7 +1602,7 @@
         "first-page-tooltip": "An Chéad Leathanach",
         "last-page-tooltip": "An Leathanach Deireanach",
         "left-to-right-alt": "Clé go Deas",
-        "right-to-left-alt": "Ceart go Clé",
+        "right-to-left-alt": "Deas go Clé",
         "reading-direction-tooltip": "Treo Léitheoireachta: ",
         "reading-mode-tooltip": "Mód Léitheoireachta",
         "collapse": "Laghdaigh",
@@ -1593,9 +1613,9 @@
         "height": "Airde",
         "width": "Leithead",
         "width-override-label": "Sáraigh Leithead",
-        "off": "As",
+        "off": "{{reader-settings.off}}",
         "original": "Bunleagan",
-        "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}",
+        "auto-close-menu-label": "{{manage-reading-profiles.auto-close-menu-label}}",
         "swipe-enabled-label": "Svaidhpeáil Cumasaithe",
         "enable-comic-book-label": "Aithris a dhéanamh ar ghreannán",
         "brightness-label": "Gile",
@@ -1606,9 +1626,14 @@
         "layout-mode-switched": "Mód leagan amach aistrithe go Singil mar gheall ar easpa spáis chun leagan amach dúbailte a dhéanamh",
         "no-next-chapter": "Gan aon chaibidil eile",
         "no-prev-chapter": "Uimh Caibidil Roimhe Seo",
-        "user-preferences-updated": "Nuashonraíodh sainroghanna úsáideora",
-        "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}",
-        "series-progress": "Dul Chun Cinn na Sraithe: {{percentage}}"
+        "emulate-comic-book-label": "{{manage-reading-profiles.emulate-comic-book-label}}",
+        "series-progress": "Dul Chun Cinn na Sraithe: {{percentage}}",
+        "create-new": "{{reader-settings.create-new}}",
+        "update-parent": "{{reader-settings.update-parent}}",
+        "loading": "{{reader-settings.loading}}",
+        "reading-profile-updated": "Próifíl léitheoireachta nuashonraithe",
+        "reading-profile-promoted": "Próifíl léitheoireachta curtha chun cinn",
+        "create-new-tooltip": "{{reader-settings.create-new-tooltip}}"
     },
     "metadata-filter": {
         "filter-title": "{{common.filter}}",
@@ -1628,9 +1653,9 @@
         "cover-artist-label": "Ealaíontóir Clúdaigh",
         "writer-label": "Scríbhneoir",
         "publisher-label": "Foilsitheoir",
-        "penciller-label": "Peann luaidhe",
+        "penciller-label": "Peannaire",
         "letterer-label": "Leitir Ceanainn",
-        "inker-label": "InkerName",
+        "inker-label": "Dúchadóir",
         "editor-label": "Eagarthóir",
         "colorist-label": "Dathóir",
         "character-label": "Carachtar",
@@ -1665,10 +1690,13 @@
         "release-year": "Bliain Scaoilte",
         "read-progress": "An Léamh Is Déanaí",
         "average-rating": "Meánráta",
-        "random": "Randamach"
+        "random": "Randamach",
+        "person-name": "Ainm",
+        "person-series-count": "Líon na Sraitheanna",
+        "person-chapter-count": "Líon na gCaibidlí"
     },
     "edit-series-modal": {
-        "title": "{{SraithName}} Sonraí",
+        "title": "{{seriesName}} Sonraí",
         "general-tab": "{{tabs.general-tab}}",
         "metadata-tab": "{{tabs.metadata-tab}}",
         "people-tab": "{{tabs.people-tab}}",
@@ -1802,8 +1830,8 @@
         "cover-image-tab": "{{tabs.cover-tab}}",
         "tasks-tab": "{{tabs.tasks-tab}}",
         "info-tab": "{{tabs.info-tab}}",
-        "pages-label": "{{edit-chapter-modal.pages-count}}",
-        "words-label": "{{edit-chapter-modal.length-title}}",
+        "pages-label": "{{edit-chapter-modal.pages-label}}",
+        "words-label": "{{edit-chapter-modal.words-label}}",
         "pages-count": "{{edit-chapter-modal.pages-count}}",
         "words-count": "{{edit-chapter-modal.words-count}}",
         "reading-time-label": "{{edit-chapter-modal.reading-time-label}}",
@@ -1826,7 +1854,7 @@
     "kavitaplus-metadata-breakdown-stats": {
         "title": "Miondealú Meiteashonraí Kavita+",
         "description": "Faigheann Kavita meiteashonraí (rátálacha, athbhreithnithe, moltaí, srl) go mall le himeacht ama do shraith incháilithe.",
-        "no-data": "Gan sonraí",
+        "no-data": "{{common.no-data}}",
         "errored-series-label": "Sraith Earráidithe",
         "completed-series-label": "Sraith Críochnaithe",
         "complete": "Tá meiteashonraí ag gach Sraith"
@@ -1950,18 +1978,20 @@
         "title-external-sources": "Foinsí Seachtracha",
         "title-smart-filters": "Scagairí Cliste",
         "close": "{{common.close}}",
-        "dashboard": "Painéal na nIonstraimí",
-        "sidenav": "Taobh Nav",
+        "dashboard": "Deais",
+        "sidenav": "Taobh Nascleanúint",
         "external-sources": "Foinsí Seachtracha",
         "smart-filters": "Scagairí Cliste",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "description": "Is féidir leat gnéithe éagsúla de Kavita a shaincheapadh trí athordú a dhéanamh, trí infheictheacht a scoránú, agus trí scagairí cliste/foinsí seachtracha a cheangal le do leathanach baile nó le do thaobh nav."
     },
     "customize-dashboard-streams": {
         "no-data": "Gach scagairí Cliste a chuirtear le Painéal na nIonstraimí nó aon cheann a cruthaíodh go fóill.",
         "save": "{{common.save}}",
         "add": "{{common.add}}",
         "filter": "{{common.filter}}",
-        "clear": "{{common.clear}}"
+        "clear": "{{common.clear}}",
+        "smart-filter-title": "{{customize-dashboard-modal.title-smart-filters}}"
     },
     "customize-sidenav-streams": {
         "no-data": "Gach scagairí Cliste a chuirtear le Side Nav nó aon cheann a cruthaíodh go fóill.",
@@ -1989,12 +2019,20 @@
         "no-data": "Níor cruthaíodh aon scagairí cliste",
         "filter": "{{common.filter}}",
         "clear": "{{common.clear}}",
-        "errored": "Tá earráid ionchódaithe sa scagaire. Ní mór duit é a athchruthú."
+        "errored": "Tá earráid ionchódaithe sa scagaire. Ní mór duit é a athchruthú.",
+        "edit": "{{common.edit}}",
+        "save": "{{common.save}}",
+        "name-label": "Ainm",
+        "required-field": "Teastaíonn ainm ó Scagairí Cliste",
+        "filter-name-unique": "Caithfidh ainmneacha Scagaire Cliste a bheith uathúil",
+        "cancel": "{{common.cancel}}",
+        "edit-smart-filter": "Cuir {{name}} in eagar",
+        "close": "{{common.close}}"
     },
     "edit-external-source-item": {
         "not-unique": "Tá foinse sheachtrach ann leis an óstach seo. Cinntigh nach bhfuil dúbailtí agat",
         "title": "Foinse Sheachtrach Nua",
-        "host-label": "Óstríomhaire",
+        "host-label": "Óstach",
         "name-label": "Ainm",
         "api-key-label": "Eochair API",
         "save": "{{common.save}}",
@@ -2014,7 +2052,7 @@
         "reading-lists": "{{side-nav.reading-lists}}",
         "bookmarks": "{{side-nav.bookmarks}}",
         "all-series": "{{side-nav.all-series}}",
-        "browse-authors": "{{side-nav.browse-authors}}"
+        "browse-authors": "{{side-nav.browse-people}}"
     },
     "filter-field-pipe": {
         "age-rating": "{{metadata-fields.age-rating-title}}",
@@ -2025,14 +2063,14 @@
         "editor": "Eagarthóir",
         "formats": "Formáidí",
         "genres": "{{metadata-fields.genres-title}}",
-        "inker": "InkerName",
+        "inker": "Dúchadóir",
         "team": "Foireann",
         "location": "Suíomh",
         "languages": "Teangacha",
         "libraries": "Leabharlanna",
         "letterer": "Leitir Ceanainn",
         "publication-status": "Stádas Foilseacháin",
-        "penciller": "Peann luaidhe",
+        "penciller": "Peannaire",
         "imprint": "Inphriontáil",
         "publisher": "Foilsitheoir",
         "read-progress": "Léigh Dul Chun Cinn",
@@ -2044,21 +2082,21 @@
         "translators": "Aistritheoirí",
         "user-rating": "Rátáil Úsáideora",
         "writers": "{{metadata-fields.writers-title}}",
-        "path": "Conair",
-        "file-path": "Conair Chomhaid",
-        "want-to-read": "Ag iarraidh Léamh",
+        "path": "Cosán",
+        "file-path": "Cosán Comhad",
+        "want-to-read": "Ar mhaith leat léamh",
         "read-date": "Dáta Léitheoireachta",
         "average-rating": "Meánráta",
         "read-last": "Léigh go deireanach"
     },
     "filter-comparison-pipe": {
         "begins-with": "Tosaíonn sé le",
-        "contains": "Tá",
-        "equal": "Cothrom",
+        "contains": "Cuimsíonn",
+        "equal": "Comhionann",
         "greater-than": "Níos mó ná",
-        "greater-than-or-equal": "Níos mó ná nó cothrom",
+        "greater-than-or-equal": "Níos mó nó cothrom le",
         "less-than": "Níos lú ná",
-        "less-than-or-equal": "Níos lú ná nó cothrom",
+        "less-than-or-equal": "Níos lú nó cothrom le",
         "matches": "Lasáin",
         "does-not-contain": "Níl",
         "not-equal": "Níl sé cothrom",
@@ -2120,9 +2158,8 @@
         "email-sent": "Ríomhphost seolta chuig {{email}}",
         "email-not-sent": "Ní ríomhphost bailí é ríomhphost ar chomhad agus ní féidir é a sheoladh. Dumpáladh nasc i logaí. Is féidir leis an admin an nasc seo a sholáthar chun sreabhadh a chur i gcrích.",
         "k+-license-saved": "Ceadúnas Eochair shábháil, ach nach bhfuil sé bailí. Cliceáil seiceáil chun an síntiús a athbheochan. D'fhéadfadh clárú céaduaire nóiméad a ghlacadh chun iomadú.",
-        "k+-unlocked": "Kavita + díghlasáilte!",
         "k+-error": "Tharla earráid nuair a bhí do cheadúnas á ghníomhachtú. Bain triail eile as.",
-        "k+-delete-key": "Ní scriosfaidh sé seo ach eochair cheadúnais Kavita agus ligfidh sé nasc ceannaigh a thaispeáint. Ní chuirfidh sé seo do shíntiús ar ceal! Ná húsáid é seo ach amháin má ordaíonn tacaíocht é!",
+        "k+-delete-key": "Ní scriosfaidh sé seo ach eochair cheadúnais Kavita agus ligfidh sé do nasc ceannaigh a thaispeáint. Ní chuirfidh sé seo do shíntiús ar ceal! Úsáid Bainistigh chun do shíntiús a chealú ar dtús.",
         "k+-reset-key": "Déanfaidh sé seo clárúchán roimhe seo a neamhbhailíochtú trí úsáid a bhaint as do cheadúnas agus ligfidh sé duit sampla Kavita a athchlárú.",
         "k+-reset-key-success": "Tá do cheadúnas neamhchláraithe. Bain úsáid as an gcnaipe Cuir in eagar chun d'ásc a athchlárú agus Kavita+ a athghníomhachtú",
         "library-deleted": "Baineadh an leabharlann {{name}}",
@@ -2185,7 +2222,16 @@
         "must-select-library": "Ní mór leabharlann amháin ar a laghad a roghnú",
         "bulk-covers": "Bíonn sé dian ar chlúdaigh athnuachana ar leabharlanna iolracha agus féadfaidh sé tamall fada a ghlacadh. An bhfuil tú cinnte gur mhaith leat leanúint ar aghaidh?",
         "person-image-downloaded": "Rinneadh clúdach duine a íoslódáil agus a chur i bhfeidhm.",
-        "confirm-delete-multiple-chapters": "An bhfuil tú cinnte gur mhaith leat {{count}} chaibidil/imleabhar a scriosadh? Ní athróidh sé comhaid ar diosca."
+        "confirm-delete-multiple-chapters": "An bhfuil tú cinnte gur mhaith leat {{count}} chaibidil/imleabhar a scriosadh? Ní athróidh sé comhaid ar diosca.",
+        "bulk-delete-libraries": "An bhfuil tú cinnte gur mhaith leat {{count}} leabharlann a scriosadh?",
+        "match-success": "Sraith a mheaitseáil i gceart",
+        "webtoon-override": "Ag aistriú go mód Webtoon mar gheall ar íomhánna a léiríonn webtoon.",
+        "scrobble-gen-init": "Cheangail post chun teagmhais scrobble a ghiniúint ó stair léitheoireachta agus rátálacha san am a chuaigh thart, agus iad á sioncronú le seirbhísí ceangailte.",
+        "confirm-delete-multiple-volumes": "An bhfuil tú cinnte gur mian leat {{count}} imleabhar a scriosadh? Ní athróidh sé comhaid ar an diosca.",
+        "series-added-want-to-read": "Sraith curtha leis ón liosta Ar Mhaith Leat Léamh",
+        "series-bound-to-reading-profile": "Sraith atá ceangailte le Próifíl Léitheoireachta {{name}}",
+        "library-bound-to-reading-profile": "Leabharlann ceangailte le Próifíl Léitheoireachta {{name}}",
+        "external-match-rate-error": "Rith Kavita as an ráta ag cuardach {{seriesName}}. Déan iarracht arís i gceann 5 nóiméad."
     },
     "read-time-pipe": {
         "less-than-hour": "<1 Uair",
@@ -2212,12 +2258,12 @@
         "scan-series": "Scan Sraith",
         "scan-series-tooltip": "Íosluchtaigh sraith scanadh le haghaidh athruithe",
         "add-to": "Cuir leis",
-        "add-to-want-to-read": "Cuir le Want a Léamh",
-        "add-to-want-to-read-tooltip": "Cuir sraith le Ag Iarraidh Léigh",
-        "remove-from-want-to-read": "Bain ó Want a Léamh",
-        "remove-from-want-to-read-tooltip": "Bain sraith ó Ag Iarraidh Léigh",
+        "add-to-want-to-read": "Cuir le ‘Ba mhaith liom a léamh’",
+        "add-to-want-to-read-tooltip": "Cuir sraith le ‘Ba mhaith liom a léamh’",
+        "remove-from-want-to-read": "Bain as ‘Ba mhaith liom a léamh’",
+        "remove-from-want-to-read-tooltip": "Bain sraith as ‘Ba mhaith liom a léamh’",
         "remove-from-on-deck": "Bain As Ar Deic",
-        "remove-from-on-deck-tooltip": "Bain an tsraith as taispeáint ó On Deck",
+        "remove-from-on-deck-tooltip": "Bain an tsraith as taispeáint ó On Deic",
         "others": "Daoine eile",
         "add-to-reading-list": "Cuir leis an Liosta Léitheoireachta",
         "add-to-reading-list-tooltip": "Cuir le Liosta Léitheoireachta é",
@@ -2252,14 +2298,26 @@
         "promote": "Cur chun cinn",
         "promote-tooltip": "Déan an mhír sofheicthe do gach úsáideoir",
         "new-collection": "Bailiúchán Nua",
-        "multiple-selections": "Ilroghnúcháin",
+        "multiple-selections": "Il-Roghanna",
         "back-to": "Ar ais go dtí {{action}}",
         "title": "Gníomhartha",
-        "copy-settings": "Cóipeáil Socruithe Ó"
+        "copy-settings": "Cóipeáil Socruithe Ó",
+        "match": "Meaitseáil",
+        "match-tooltip": "Sraith Meaitseála le Kavita+ de láimh",
+        "reorder": "Athordú",
+        "rename": "Athainmnigh",
+        "rename-tooltip": "Athainmnigh an Scagaire Cliste",
+        "merge": "Cumaisc",
+        "reading-profiles": "Próifílí Léitheoireachta",
+        "set-reading-profile": "Socraigh Próifíl Léitheoireachta",
+        "set-reading-profile-tooltip": "Ceangail Próifíl Léitheoireachta leis an Leabharlann seo",
+        "clear-reading-profile": "Próifíl Léitheoireachta Glan",
+        "clear-reading-profile-tooltip": "Glan Próifíl Léitheoireachta don Leabharlann seo",
+        "cleared-profile": "Próifíl Léitheoireachta Glanta"
     },
     "preferences": {
         "left-to-right": "Clé go Deas",
-        "right-to-left": "Ceart go Clé",
+        "right-to-left": "Deas go Clé",
         "horizontal": "Cothrománach",
         "vertical": "Ingearach",
         "automatic": "Uathoibríoch",
@@ -2267,10 +2325,10 @@
         "fit-to-width": "Oiriúnaigh don Leithead",
         "original": "Bunleagan",
         "fit-to-screen": "Oiriúnaigh don Scáileán",
-        "split-right-to-left": "Scoilt Ar Dheis go Clé",
+        "split-right-to-left": "Scoilt Ar Deas go Clé",
         "split-left-to-right": "Scoilt Clé go Deas",
         "no-split": "Gan Scoilt",
-        "webtoon": "WebtoonName",
+        "webtoon": "Webtoon",
         "single": "Singil",
         "double": "Dúbailte",
         "double-manga": "Dúbailte (Manga)",
@@ -2330,7 +2388,7 @@
         "theme-tab": "Téama",
         "devices-tab": "Gléasanna",
         "stats-tab": "Stait",
-        "scrobbling-tab": "Scrobbling",
+        "scrobbling-tab": "Ag scrobadh",
         "smart-filters-tab": "Scagairí Cliste"
     },
     "common": {
@@ -2372,23 +2430,28 @@
         "issue-nums": "Saincheisteanna",
         "chapter-nums": "Caibidlí",
         "volume-nums": "Imleabhair",
-        "author-count": "{{num}} Údair"
+        "author-count": "{{num}} Údair",
+        "chapter-count": "{{num}} Caibidlí",
+        "no-data": "Uimh Sonraí",
+        "issue-count": "{{num}} Fadhbanna"
     },
     "confirm": {
         "alert": "Airdeall",
-        "confirm": "Deimhnigh"
-    },
-    "browse-authors": {
-        "title": "Brabhsáil Údair & Scríbhneoirí",
-        "author-count": "{{num}} Daoine",
-        "cover-image-description": "{{edit-series-modal.cover-image-description}}"
+        "confirm": "Deimhnigh",
+        "info": "Faisnéis",
+        "cancel": "{{common.cancel}}",
+        "ok": "Ceart go leor",
+        "prompt": "Ceist"
     },
     "person-detail": {
         "known-for-title": "Aitheanta do",
         "browse-person-title": "Gach Oibre de {{name}}",
         "browse-person-by-role-title": "Gach Oibre de {{name}} mar {{role}}",
         "individual-role-title": "Mar {{role}}",
-        "all-roles": "Róil"
+        "all-roles": "Róil",
+        "anilist-url": "{{edit-person-modal.anilist-tooltip}}",
+        "aka-title": "Ar a dtugtar freisin ",
+        "no-info": "Gan aon eolas faoin Duine seo"
     },
     "edit-person-modal": {
         "general-tab": "{{edit-series-modal.general-tab}}",
@@ -2402,7 +2465,7 @@
         "role-label": "Ról",
         "mal-id-label": "MAL Id",
         "anilist-id-label": "AniList Id",
-        "hardcover-id-label": "Hardcover Id",
+        "hardcover-id-label": "Id Clúdaigh Chrua",
         "asin-label": "ASIN",
         "description-label": "Cur síos",
         "save": "{{common.save}}",
@@ -2411,6 +2474,344 @@
         "anilist-tooltip": "https://anilist.co/staff/{AniListId}/",
         "cover-image-description-extra": "Nó is féidir leat clúdach a íoslódáil ó CoversDB má tá sé ar fáil.",
         "hardcover-tooltip": "https://hardcover.app/authors/{HardcoverId}",
-        "download-coversdb": "Íoslódáil ó CoverDB"
+        "download-coversdb": "Íoslódáil ó CoverDB",
+        "aliases-label": "Cuir leasainmneacha in eagar",
+        "aliases-tab": "Leasainmneacha",
+        "aliases-tooltip": "Nuair a chuirtear leasainm duine ar shraith, sanntar an duine sin seachas duine nua a chruthú. Agus leasainm á scriosadh, beidh ort an tsraith a athscanadh le go dtabharfar faoi deara an t-athrú.",
+        "alias-overlap": "Tá an leasainm seo ag tagairt do dhuine eile cheana féin nó is é ainm an duine seo é, smaoinigh ar iad a chumasc."
+    },
+    "new-version-modal": {
+        "description": "Tá leagan nua de Kavita ar fáil. Athnuaigh le nuashonrú.",
+        "fixed": "{{changelog.fixed}}",
+        "changed": "{{changelog.changed}}",
+        "title": "Nuashonraíodh Kavita!",
+        "added": "{{changelog.added}}",
+        "developer": "{{changelog.developer}}",
+        "theme": "{{changelog.theme}}",
+        "removed": "{{changelog.removed}}",
+        "api": "{{changelog.api}}",
+        "close": "{{common.close}}",
+        "refresh": "Athnuaigh",
+        "known-issues": "{{changelog.known-issues}}"
+    },
+    "changelog-update-item": {
+        "download": "Íosluchtaigh",
+        "added": "Curtha leis",
+        "removed": "Bainte",
+        "developer": "Forbróir",
+        "changed": "Athraithe",
+        "fixed": "Seasta",
+        "theme": "Téama",
+        "api": "API",
+        "published-label": "Foilsithe: ",
+        "installed": "{{changelog.installed}}",
+        "feature-requests": "Iarratais Gné",
+        "known-issues": "Fadhbanna ar eolas"
+    },
+    "match-series-modal": {
+        "save": "{{common.save}}",
+        "no-results": "Ní féidir meaitseáil a aimsiú. Bain triail as an url ó sholáthraí tacaithe a chur leis agus bain triail eile as.",
+        "query-label": "Fiosrúchán",
+        "title": "Meaitseáil {{ seriesName}}",
+        "description": "Roghnaigh meaitseáil chun meiteashonraí Kavita+ a athshreangú agus imeachtaí scrobble a athghiniúint. Is féidir Don't Match a úsáid chun Kavita a shrianadh ó mheiteashonraí a mheaitseáil agus scrobadh a dhéanamh.",
+        "close": "{{common.close}}",
+        "query-tooltip": "Cuir isteach ainm na sraithe, url AniList/MyAnimeList/ComicBookRoundup. Úsáidfear cuardach díreach sna URLanna.",
+        "dont-match-label": "Ná Meaitseáil",
+        "dont-match-tooltip": "Rogha an tsraith seo ó mheaitseáil agus scrobbling",
+        "search": "Cuardach"
+    },
+    "email-history": {
+        "description": "Anseo gheobhaidh tú gach ríomhphost a sheoltar ó Kavita agus chuig an úsáideoir.",
+        "template-header": "Teimpléad",
+        "date-header": "Dáta Seolta",
+        "user-header": "Seolta Chuig",
+        "sent-header": "D'éirigh leis",
+        "no-data": "{{common.no-data}}",
+        "sent-tooltip": "Seolta",
+        "not-sent-tooltip": "Gan Seolta"
+    },
+    "manage-matched-metadata": {
+        "no-data": "{{common.no-data}}",
+        "title": "Meiteashonraí Meaitseála",
+        "description": "Tá gach Sraith infheidhmithe is féidir a mheaitseáil le Meiteashonraí Seachtracha anseo. Déanfaidh Kavita meiteashonraí sraithe a réamhfháil nó a athnuachan, 50 sraith in aghaidh 24 uair an chloig in aghaidh an lae.",
+        "status-header": "Stádas",
+        "series-name-header": "Sraith",
+        "valid-until-header": "Ar Aghaidh Athnuachan",
+        "matched-status-label": "Meaitseáladh",
+        "unmatched-status-label": "Gan Meaitseáil",
+        "blacklist-status-label": "Match Lámhleabhar Riachtanais",
+        "all-status-label": "Gach",
+        "dont-match-label": "Ná Meaitseáil",
+        "dont-match-status-label": "{{dont-match-label}}",
+        "library-name-header": "Leabharlann",
+        "actions-header": "Gníomhartha",
+        "match-alt": "Meaitseáil {{seriesName}}",
+        "matched-state-label": "Stát an Chomhoiriúnaithe",
+        "library-type": "Cineál Leabharlainne"
+    },
+    "match-series-result-item": {
+        "details": "Féach ar an leathanach",
+        "volume-count": "{{server-stats.volume-count}}",
+        "chapter-count": "{{common.chapter-count}}",
+        "releasing": "Ag scaoileadh",
+        "updating-metadata-status": "Meiteashonraí á nuashonrú",
+        "issue-count": "{{common.issue-count}}"
+    },
+    "manage-user-tokens": {
+        "description": "Seans go mbeidh gá le hathnuachan a dhéanamh ó am go chéile ar úsáideoirí a bhfuil comharthaí scrobarnaí acu. Seolfaidh Kavita ríomhphost chucu go huathoibríoch má tá ríomhphost socraithe agus má tá ríomhphost bailí acu.",
+        "username-header": "Ainm úsáideora",
+        "anilist-header": "AniList",
+        "mal-header": "MAL",
+        "token-set-label": "Socrú Comhartha",
+        "no-data": "{{common.no-data}}",
+        "expires-label": "In éag: {{date}}"
+    },
+    "manage-metadata-settings": {
+        "derive-publication-status-label": "Stádas Foilseacháin",
+        "enable-relations-label": "Caidrimh",
+        "enable-people-label": "Daoine",
+        "enable-relations-tooltip": "Ceadaigh gaolta sraithe a chur leis.",
+        "derive-publication-status-tooltip": "Ceadaigh Stádas Foilseachán a dhíorthú ó Áireamh Iomlán na Caibidle/Imleabhar.",
+        "description": "Tá an cumas ag Kavita+ roinnt meiteashonraí teoranta a íoslódáil agus a scríobh chuig an mBunachar Sonraí. Ligeann an leathanach seo duit a bhfuil sa scóip a scoránaigh.",
+        "enabled-tooltip": "Lig do Kavita meiteashonraí a íoslódáil agus scríobh chuig a bhunachar sonraí.",
+        "summary-label": "Achoimre",
+        "summary-tooltip": "Ceadaigh Achoimre a scríobh nuair a dhíghlasáiltear an réimse.",
+        "enabled-label": "Íosluchtaigh meiteashonraí a chumasú",
+        "enable-genres-label": "Seánraí",
+        "enable-people-tooltip": "Ceadaigh daoine (Carachtair, Scríbhneoirí, srl) a chur leis. Cuimsíonn na daoine go léir íomhánna.",
+        "enable-genres-tooltip": "Ceadaigh Seánraí Sraithe a scríobh.",
+        "enable-start-date-label": "Dáta Tosaigh",
+        "enable-tags-label": "Clibeanna",
+        "enable-start-date-tooltip": "Ceadaigh Dáta Tosaigh na Sraithe a scríobh chuig an tSraith",
+        "enable-tags-tooltip": "Ceadaigh Clibeanna Sraithe a scríobh.",
+        "blacklist-label": "Seánraí/Clibeanna Liosta Dubh",
+        "blacklist-tooltip": "Bainfear aon rud ar an liosta seo den phróiseáil Seánra agus Clibe araon. Is áit é seo chun seánraí/clibeanna a chur leis nach mian leat a scríobh. Cinntigh go bhfuil siad scartha le camóga.",
+        "whitelist-label": "Clibeanna an Liosta Bán",
+        "whitelist-tooltip": "Ná ceadaigh ach teaghrán sa liosta seo a scríobh do Clibeanna. Cinntigh go bhfuil siad scartha le camóga.",
+        "age-rating-mapping-title": "Léarscáiliú Rátála Aoise",
+        "age-rating-mapping-description": "Socróidh aon teaghráin ar chlé má fhaightear iad i gCeachtar Seánra nó Clibeanna an Rátáil Aoise ar an tSraith.",
+        "genre": "Seánra",
+        "tag": "Chlib",
+        "remove-source-tag-label": "Bain Clib Foinse",
+        "add-field-mapping-label": "Cuir Mapáil Réimse leis",
+        "add-age-rating-mapping-label": "Cuir Mapáil Rátála Aoise leis",
+        "field-mapping-title": "Mapáil Réimse",
+        "field-mapping-description": "Socraigh rialacha do theaghráin áirithe a fhaightear sa réimse Seánra/Clib agus mapáil go teaghrán nua sa Seánra/Clib é agus bain den liosta Foinse go roghnach é. Ní bhaineann ach amháin nuair atá Seánra/Clib in ann a scríobh.",
+        "first-last-name-label": "Céad Deireadh Ag Ainmniú",
+        "first-last-name-tooltip": "Cinntigh go scríobhtar ainmneacha na nDaoine Ar dtús ansin ar Dheiridh",
+        "person-roles-label": "Róil",
+        "localized-name-label": "Ainm na Sraithe Logánta",
+        "enable-cover-image-label": "Íomhá Clúdaigh",
+        "overrides-description": "Lig do Kavita scríobh thar réimsí faoi ghlas.",
+        "overrides-label": "Sáraíonn",
+        "localized-name-tooltip": "Ceadaigh Ainm Logánaithe a scríobh nuair a dhíghlasáiltear an réimse. Déanfaidh Kavita iarracht an buille faoi thuairim is fearr a dhéanamh.",
+        "enable-cover-image-tooltip": "Lig do Kavita íomhá clúdaigh na Sraithe a scríobh",
+        "enable-chapter-publisher-tooltip": "Ceadaigh d’Fhoilsitheoir na Caibidle/na hEagráine a bheith scríofa",
+        "chapter-header": "Réimsí Caibidle",
+        "enable-chapter-title-label": "Teideal",
+        "enable-chapter-title-tooltip": "Ceadaigh Teideal na Caibidle/na hEagráin a scríobh",
+        "enable-chapter-summary-label": "{{manage-metadata-settings.summary-label}}",
+        "enable-chapter-summary-tooltip": "{{manage-metadata-settings.summary-tooltip}}",
+        "enable-chapter-release-date-label": "Dáta Eisiúna",
+        "enable-chapter-release-date-tooltip": "Ceadaigh Dáta Eisiúna na Caibidle/na hEagráine a scríobh",
+        "enable-chapter-publisher-label": "Foilsitheoir",
+        "enable-chapter-cover-label": "Clúdach Caibidle",
+        "enable-chapter-cover-tooltip": "Ceadaigh Clúdach na Caibidle/na hEagráin a shocrú"
+    },
+    "metadata-setting-field-pipe": {
+        "people": "{{tabs.people-tab}}",
+        "start-date": "{{manage-metadata-settings.enable-start-date-label}}",
+        "genres": "{{metadata-fields.genres-title}}",
+        "tags": "{{metadata-fields.tags-title}}",
+        "localized-name": "{{edit-series-modal.localized-name-label}}",
+        "covers": "Clúdaíonn",
+        "publication-status": "{{edit-series-modal.publication-status-title}}",
+        "summary": "{{filter-field-pipe.summary}}",
+        "age-rating": "{{metadata-fields.age-rating-title}}",
+        "chapter-covers": "Clúdaigh (Caibidil)",
+        "chapter-release-date": "Dáta Eisiúna (Caibidil)",
+        "chapter-title": "Teideal (Caibidil)",
+        "chapter-summary": "Achoimre (Caibidil)",
+        "chapter-publisher": "{{person-role-pipe.publisher}} (Caibidil)"
+    },
+    "role-localized-pipe": {
+        "admin": "Riarachán",
+        "download": "Íosluchtaigh",
+        "change-password": "Athraigh Pasfhocal",
+        "bookmark": "Leabharmharc",
+        "change-restriction": "Srian Athraithe",
+        "login": "Logáil isteach",
+        "read-only": "Léigh Amháin",
+        "promote": "Chur chun cinn"
+    },
+    "log-level-pipe": {
+        "trace": "Rian",
+        "warning": "Rabhadh",
+        "critical": "Criticiúil",
+        "information": "Eolas",
+        "debug": "Dífhabhtaithe"
+    },
+    "review-modal": {
+        "required": "{{validation.required-field}}",
+        "title": "Cuir Athbhreithniú in Eagar",
+        "save": "{{common.save}}",
+        "min-length": "Ní mór don léirmheas a bheith {{count}} carachtar ar a laghad",
+        "delete": "{{common.delete}}",
+        "review-label": "Athbhreithniú",
+        "close": "{{common.close}}"
+    },
+    "reviews": {
+        "user-reviews-local": "Léirmheasanna Áitiúla",
+        "user-reviews-plus": "Léirmheasanna Seachtracha"
+    },
+    "merge-person-modal": {
+        "close": "{{common.close}}",
+        "alias-title": "Leasainmneacha nua",
+        "merge-warning": "Má leanann tú ar aghaidh, bainfear an duine roghnaithe. Cuirfear ainm an duine roghnaithe leis mar leasainm, agus aistreofar a róil go léir.",
+        "known-for-title": "Ar a dtugtar",
+        "src": "Cumaisc Duine",
+        "title": "{{personName}}",
+        "save": "{{common.save}}"
+    },
+    "manage-reading-profiles": {
+        "selection-tip": "Roghnaigh próifíl ón liosta, nó cruthaigh ceann nua ag an mbarr ar dheis",
+        "delete": "{{common.delete}}",
+        "page-splitting-tooltip": "Conas íomhá lánleithid a roinnt (i.e. cuirtear na híomhánna clé agus deas le chéile)",
+        "auto-close-menu-label": "Dúnadh Uathoibríoch an Roghchláir",
+        "scaling-option-tooltip": "Conas an íomhá a scálú chuig do scáileán.",
+        "pdf-spread-mode-tooltip": "Leagan amach leathanaigh. Aonair nó dúbailte (corr/cothrom)",
+        "writing-style-tooltip": "Athraíonn sé treo an téacs. Is é an treo cothrománach ná ó chlé go deas, agus is é an treo ingearach ná ó bharr go bun.",
+        "reading-profile-library-settings-title": "Leabharlann",
+        "pdf-spread-mode-label": "Mód Scaipthe",
+        "layout-mode-book-tooltip": "Leagan amach an ábhair. Is é an scrollú an chaoi a bhfuil sé pacáilte sa leabhar. Oireann 1 nó 2 cholún d'airde an fheiste agus oireann sé do 1 nó 2 cholún téacs in aghaidh an leathanaigh",
+        "layout-mode-tooltip": "Rindreáil íomhá aonair ar an scáileán nó dhá íomhá taobh le taobh",
+        "color-theme-book-tooltip": "Cén téama datha atá le cur i bhfeidhm ar ábhar agus roghchlár an léitheora leabhar",
+        "layout-mode-label": "Mód Leagan Amach",
+        "description": "B’fhéidir nach léifear do shraitheanna uile ar an mbealach céanna, mar sin socraigh próifílí léitheoireachta ar leith in aghaidh an leabharlainne nó na sraithe chun go mbeidh sé chomh héasca agus is féidir filleadh ar do shraith.",
+        "profiles-title": "Do phróifílí léitheoireachta",
+        "default-profile": "Réamhshocrú",
+        "add": "{{common.add}}",
+        "add-tooltip": "Sábhálfar do phróifíl nua tar éis athrú a dhéanamh uirthi",
+        "make-default": "Socraigh mar réamhshocrú",
+        "image-reader-settings-title": "Léitheoir Íomhánna",
+        "scaling-option-label": "Roghanna Scálúcháin",
+        "page-splitting-label": "Scoilteadh Leathanaigh",
+        "reading-mode-label": "Mód Léitheoireachta",
+        "reading-mode-tooltip": "Athraigh an léitheoir chun leathanaigh a roinnt go hingearach, go cothrománach, nó scrolláil gan teorainn a bheith aige",
+        "background-color-tooltip": "Dath Cúlra an Léitheora Íomhá",
+        "auto-close-menu-tooltip": "Ar cheart go ndúnfadh an roghchlár go huathoibríoch",
+        "show-screen-hints-label": "Taispeáin Leideanna Scáileáin",
+        "show-screen-hints-tooltip": "Taispeáin forleagan chun cabhrú le limistéar agus treo na leathanaigh a thuiscint",
+        "emulate-comic-book-label": "Aithris leabhar grinn",
+        "emulate-comic-book-tooltip": "Cuireann éifeacht scátha i bhfeidhm chun léamh ó leabhar a aithris",
+        "swipe-to-paginate-label": "Svaidhpeáil chun leathanaigh a athrú",
+        "allow-auto-webtoon-reader-label": "Mód Léitheora Gréasáin Uathoibríoch",
+        "allow-auto-webtoon-reader-tooltip": "Athraigh go mód Léitheora Gréasáin má tá cuma gréasáin ar leathanaigh. D’fhéadfadh roinnt torthaí dearfacha bréagacha tarlú.",
+        "width-override-label": "{{manga-reader.width-override-label}}",
+        "reset": "{{common.reset}}",
+        "book-reader-settings-title": "Léitheoir Leabhar",
+        "tap-to-paginate-label": "Tapáil chun Leathanachú",
+        "tap-to-paginate-tooltip": "An gceadaíonn taobhanna scáileán an léitheora leabhar tapáil air chun bogadh go dtí an leathanach roimhe/an chéad leathanach eile",
+        "immersive-mode-label": "Mód Tumtha",
+        "immersive-mode-tooltip": "Cuirfidh sé seo an roghchlár i bhfolach taobh thiar de chliceáil ar an doiciméad léitheora agus casfaidh sé sconna chun leathanach a chur ar siúl",
+        "reading-direction-book-label": "Treo Léitheoireachta",
+        "reading-direction-book-tooltip": "Treo le cliceáil chun bogadh go dtí an chéad leathanach eile. Ciallaíonn Deas go Clé go gcliceálann tú ar thaobh na láimhe clé den scáileán chun bogadh go dtí an chéad leathanach eile.",
+        "font-family-label": "Teaghlach Clónna",
+        "writing-style-label": "Stíl Scríbhneoireachta",
+        "layout-mode-book-label": "Mód Leagan Amach",
+        "font-family-tooltip": "Teaghlach clónna le luchtú. Luchtófar cló réamhshocraithe an leabhair leis an rogha réamhshocraithe",
+        "color-theme-book-label": "Téama Dathanna",
+        "font-size-book-label": "Méid Cló",
+        "font-size-book-tooltip": "Céatadán den scálú le cur i bhfeidhm ar an gcló sa leabhar",
+        "line-height-book-label": "Spásáil Líne",
+        "line-height-book-tooltip": "Cé mhéad spás idir línte an leabhair",
+        "margin-book-label": "Corrlach",
+        "pdf-reader-settings-title": "Léitheoir PDF",
+        "pdf-scroll-mode-label": "Mód Scrollaigh",
+        "reading-profile-series-settings-title": "Sraith",
+        "pdf-theme-label": "Téama",
+        "no-selected": "Níl aon phróifíl roghnaithe",
+        "reading-direction-label": "Treo Léitheoireachta",
+        "reading-direction-tooltip": "Treo le cliceáil chun bogadh go dtí an chéad leathanach eile. Ciallaíonn Deas go Clé go gcliceálann tú ar thaobh na láimhe clé den scáileán chun bogadh go dtí an chéad leathanach eile.",
+        "extra-tip": "Sannadh próifílí léitheoireachta tríd an roghchlár gníomhaíochta ar shraitheanna agus ar leabharlanna, nó i mórchóir. Agus socruithe á n-athrú i léitheoir, cruthaítear próifíl fholaithe a chuimhníonn ar do roghanna don tsraith sin (ní do pdfanna). Baintear an phróifíl seo nuair a shannann tú ceann de do phróifílí léitheoireachta féin don tsraith. Is féidir tuilleadh eolais a fháil ar an",
+        "confirm": "An bhfuil tú cinnte gur mian leat an phróifíl léitheoireachta {{name}} a scriosadh?",
+        "margin-book-tooltip": "Cé mhéad spásála ar gach taobh den scáileán. Sáróidh sé seo go 0 ar ghléasanna soghluaiste beag beann ar an socrú seo.",
+        "swipe-to-paginate-tooltip": "An gcuirfí an leathanach seo chugainn nó an leathanach roimhe sin i ngníomh mar gheall ar shlaipeadh ar an scáileán?",
+        "pdf-theme-tooltip": "Téama dathanna an léitheora",
+        "background-color-label": "Dath an Chúlra",
+        "pdf-scroll-mode-tooltip": "Conas a scrollaíonn tú trí leathanaigh. Ingearach/Cothrománach agus Tapáil chun Leathanachú (gan scrolláil)",
+        "width-override-tooltip": "Sáraigh leithead na n-íomhánna sa léitheoir",
+        "wiki-title": "vicí",
+        "disable-width-override-label": "Díchumasaigh sárú leithead",
+        "disable-width-override-tooltip": "Cosc a chur ar an sárú leithead ó bheith i bhfeidhm nuair a bhíonn do scáileán ar a laghad ag an bpointe briste cumraithe nó níos lú"
+    },
+    "bulk-set-reading-profile-modal": {
+        "filter-label": "{{common.filter}}",
+        "clear": "{{common.clear}}",
+        "close": "{{common.close}}",
+        "no-data": "Níl aon bhailiúcháin cruthaithe fós",
+        "create": "{{common.create}}",
+        "bound": "Ceangailte",
+        "title": "Socraigh próifíl Léitheoireachta",
+        "loading": "{{common.loading}}"
+    },
+    "browse-people": {
+        "author-count": "{{num}} Daoine",
+        "cover-image-description": "{{edit-series-modal.cover-image-description}}",
+        "issue-count": "{{common.issue-count}}",
+        "series-count": "{{common.series-count}}",
+        "sort-label": "Sórtáil",
+        "name-label": "Ainm",
+        "series-count-label": "Líon na Sraitheanna",
+        "roles-label": "Róil",
+        "title": "Brabhsáil Daoine",
+        "issue-count-label": "Líon na nEisiúintí"
+    },
+    "browse-genres": {
+        "series-count": "{{common.series-count}}",
+        "genre-count": "Seánraí {{num}}",
+        "issue-count": "{{common.issue-count}}",
+        "title": "Brabhsáil Seánraí"
+    },
+    "browse-tags": {
+        "title": "Brabhsáil Clibeanna",
+        "genre-count": "Clibeanna {{num}}",
+        "series-count": "{{common.series-count}}",
+        "issue-count": "{{common.issue-count}}"
+    },
+    "browse-title-pipe": {
+        "publication-status": "Saothar {{value}}",
+        "user-rating": "Rátáil réalta {{value}}",
+        "tag": "Tá Clib {{value}} aige",
+        "character": "Tá carachtar {{value}} ann",
+        "editor": "Eagarthóireacht déanta ag {{value}}",
+        "letterer": "Litrithe ag {{value}}",
+        "penciller": "Pencilithe ag {{value}}",
+        "writer": "Scríofa ag {{value}}",
+        "genre": "Tá Seánra {{value}} aige",
+        "release-year": "Scaoilte i {{value}}",
+        "imprint": "Inphriontáil de {{value}}",
+        "library": "Laistigh de leabharlann {{value}}",
+        "team": "Foireann {{value}}",
+        "age-rating": "Rátáil {{value}}",
+        "publisher": "Foilsithe ag {{value}}",
+        "inker": "Dúigh le {{value}}",
+        "format": "Formáid {{value}}",
+        "translator": "Aistrithe ag {{value}}",
+        "colorist": "Daite ag {{value}}",
+        "location": "I suíomh {{value}}",
+        "artist": "Tarraingthe ag {{value}}"
+    },
+    "generic-filter-field-pipe": {
+        "person-role": "Ról",
+        "person-series-count": "Líon na Sraitheanna",
+        "person-chapter-count": "Líon na gCaibidlí",
+        "person-name": "Ainm"
+    },
+    "breakpoint-pipe": {
+        "never": "Choíche",
+        "mobile": "Soghluaiste",
+        "tablet": "Táibléad",
+        "desktop": "Deasc"
     }
 }
diff --git a/UI/Web/src/assets/langs/hi.json b/UI/Web/src/assets/langs/hi.json
index dd0da0632..f7403ba75 100644
--- a/UI/Web/src/assets/langs/hi.json
+++ b/UI/Web/src/assets/langs/hi.json
@@ -11,19 +11,12 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}"
     },
     "user-scrobble-history": {
         "filter-label": "{{common.filter}}",
         "special": "{{entity-title.special}}"
     },
-    "review-series-modal": {
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}"
     },
diff --git a/UI/Web/src/assets/langs/hu.json b/UI/Web/src/assets/langs/hu.json
index 62ed7de34..2c418e598 100644
--- a/UI/Web/src/assets/langs/hu.json
+++ b/UI/Web/src/assets/langs/hu.json
@@ -1,14 +1,14 @@
 {
     "login": {
-        "title": "Bejelentkezés",
+        "title": "Jelentkezz be a fiókodba",
         "username": "{{common.username}}",
         "password": "{{common.password}}",
         "password-validation": "{{validation.password-validation}}",
         "forgot-password": "Elfelejtett jelszó?",
-        "submit": "{{common.submit}}"
+        "submit": "{{common.submit}}Bejelentkezés"
     },
     "dashboard": {
-        "no-libraries": "Még nincs könyvtár beálltva. Állíts be egyet a",
+        "no-libraries": "Még nincs könyvtár beálltva. \nÁllíts be egyet a",
         "server-settings-link": "Szerver beállítások",
         "not-granted": "Nincs hozzáférésed semmilyen könyvtárhoz.",
         "on-deck-title": "A fedélzeten",
@@ -22,10 +22,11 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "saving": "Mentés…",
-        "update": "Frissítés"
+        "update": "Frissítés",
+        "account-detail-title": "Fiók Részletei",
+        "invalid-email-warning": "Érvénytelen email esetén a Kavita néhány funkciója zárolva lesz"
     },
     "user-scrobble-history": {
         "title": "Feldolgozás történet",
@@ -36,7 +37,7 @@
         "series-header": "Sorozat",
         "data-header": "Adat",
         "is-processed-header": "Feldolgozva",
-        "no-data": "Nincs adat",
+        "no-data": "Nincs adat{{common.no-data}}",
         "volume-and-chapter-num": "Kötet {{v}} Fejezet {{n}}",
         "volume-num": "Kötet {{num}}",
         "chapter-num": "Fejezet {{num}}",
@@ -44,7 +45,12 @@
         "not-applicable": "Nem alkalmazható",
         "processed": "Feldolgozva",
         "not-processed": "Nincs feldolgozva",
-        "special": "{{entity-title.special}}"
+        "special": "{{entity-title.special}}",
+        "scrobbling-disabled": "A scrobbling ki van kapcsolva a Fiók beállításaidban.",
+        "description": "Itt található minden a fiókodhoz tartozó srobble esemény. Ahhoz, hogy az események létrejöjjenek, be kell állítanod egy scrobble szolgáltatót. A feldolgozott események egy hónap után törlődnek. Ha vannak fel nem dolgozott események, azok adatait valószínűleg nem sikerült egyeztetni a feltöltés során. Ilyen esetben vedd fel a kapcsolatot az adminoddal, hogy javításra kerüljenek.",
+        "token-expired": "Az AniList tokened lejárt! A scrobble események nem kerülnek feldolgozásra, amíg a Fiókok oldalon nem frissíted.",
+        "select-all-label": "Összes kijelölése",
+        "delete-selected-label": "Kijelölt(ek) törlése"
     },
     "scrobble-event-type-pipe": {
         "chapter-read": "Olvasás folyamata",
@@ -56,15 +62,6 @@
     "spoiler": {
         "click-to-show": "Spoiler, kattints a megnézéshez"
     },
-    "review-series-modal": {
-        "title": "Áttekintés szerkesztése",
-        "review-label": "Áttekintés",
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "min-length": "Az áttekintés legalább {{count}} karakter kell legyen",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}",
         "user-review": "{{username}} áttekintése",
@@ -75,11 +72,14 @@
         "your-review": "A te áttekintésed",
         "external-review": "Külső áttekintés",
         "local-review": "Helyi áttekintés",
-        "rating-percentage": "Értékelés {{r}}%"
+        "rating-percentage": "Értékelés {{r}}%",
+        "critic": "kritikus"
     },
     "want-to-read": {
         "title": "Olvasandó",
-        "series-count": "{{common.series-count}}"
+        "series-count": "{{common.series-count}}",
+        "no-items": "Eddig nincsenek elemek. Próbáljon hozzáadni egy sorozatot!",
+        "no-items-filtered": "Egy elem sem felel meg a szűrési feltételeknek."
     },
     "user-preferences": {
         "account-tab": "{{tabs.account-tab}}",
@@ -89,12 +89,36 @@
         "stats-tab": "{{tabs.stats-tab}}",
         "scrobbling-tab": "{{tabs.scrobbling-tab}}",
         "smart-filters-tab": "{{tabs.smart-filters-tab}}",
-        "background-color-label": "Háttérszín",
         "reset": "{{common.reset}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "locale-tooltip": "Kavita által használt nyelv",
+        "blur-unread-summaries-label": "El nem olvasott összefoglalók elhomályosítása",
+        "disable-animations-label": "Animációk kikapcsolása",
+        "disable-animations-tooltip": "Oldalon lévő animációk kikapcsolása. Hasznos az e-ink olvasóknak.",
+        "prompt-on-download-label": "Letöltés esetében kérdezzen",
+        "prompt-on-download-tooltip": "Kérdezzen, amikor a letöltés mérete túlhaladja a {{size}}MB-ot",
+        "collapse-series-relationships-label": "Sorozat Kapcsolatok Összezárása",
+        "title": "Felhasználó irányítópultja",
+        "page-layout-mode-label": "Oldal elrendezési mód",
+        "global-settings-title": "Globális beállítások",
+        "blur-unread-summaries-tooltip": "Elmossa a kötetek vagy fejezetek összefoglaló szövegét, ha még nem olvastad (a spoilerek elkerülése érdekében)",
+        "kavitaplus-settings-title": "Kavita+",
+        "page-layout-mode-tooltip": "Elemek mutatása kártyákként vagy listanézetben a Sorozat részletei oldalon.",
+        "anilist-scrobbling-tooltip": "Scrobble (egyirányú szinkronizáció) engedélyezése a Kavitából az AniList felé (olvasási előrehaladottság és kritikák)",
+        "pref-description": "Ezek olyan globális beállítások, melyek a fiókodhoz vannak rendelve.",
+        "success-toast": "Felhasználó beállításai frissítve",
+        "locale-label": "Nyelv",
+        "anilist-scrobbling-label": "AniList Scrobbling",
+        "want-to-read-sync-label": "Olvasási várólista szinkronizálás",
+        "clients-opds-url-label": "OPDS URL",
+        "clients-api-key-label": "API Kulcs",
+        "share-series-reviews-label": "Sorozatértékelés megosztása"
     },
     "user-holds": {
-        "no-data": "{{typeahead.no-data}}"
+        "no-data": "{{typeahead.no-data}}",
+        "series-name-header": "{{manage-matched-metadata.series-name-header}}",
+        "created-header": "{{manage-media-issues.created-header}}",
+        "delete-label": "{{common.remove}}"
     },
     "theme-manager": {
         "download": "{{changelog.download}}",
@@ -102,20 +126,40 @@
         "delete": "{{common.delete}}",
         "drag-n-drop": "{{cover-image-chooser.drag-n-drop}}",
         "upload": "{{cover-image-chooser.upload}}",
-        "add": "{{common.add}}"
+        "add": "{{common.add}}",
+        "title": "Téma menedzser",
+        "set-default": "Alapértelmezett",
+        "updated-toastr": "A webhely alapértelmezett beállításai {{name}}-re frissültek",
+        "active-theme": "Aktív",
+        "upload-continued": "css fájl",
+        "site-themes": "Webhelytémák",
+        "downloaded": "Letöltött",
+        "applied": "Alkalmaz",
+        "preview-title": "Előnézet",
+        "default-theme": "Alapértelmezett",
+        "downloadable": "Letölthető"
     },
     "restriction-selector": {
-        "age-rating-label": "{{metadata-fields.age-rating-title}}"
+        "age-rating-label": "{{metadata-fields.age-rating-title}}",
+        "title": "Korhatár besorolás",
+        "not-applicable-for-admins": "Ez nem vonatkozik az adminokra.",
+        "no-restriction": "Nincs korlátozás"
     },
     "site-theme-provider-pipe": {
-        "custom": "{{device-platform-pipe.custom}}"
+        "custom": "{{device-platform-pipe.custom}}",
+        "system": "Rendszer"
     },
     "manage-devices": {
         "add": "{{common.add}}",
         "delete": "{{common.delete}}",
         "edit": "{{common.edit}}",
         "no-data": "{{typeahead.no-data}}",
-        "actions-header": "{{manage-users.actions-header}}"
+        "actions-header": "{{manage-users.actions-header}}",
+        "title": "Eszközkezelő",
+        "devices-title": "Eszközök",
+        "email-label": "Email",
+        "name-label": "Név",
+        "no-devices": "Még nincsenek beállítva eszközök"
     },
     "edit-device-modal": {
         "device-name-label": "{{manage-devices.name-label}}",
@@ -133,7 +177,12 @@
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
-        "required-field": "{{validation.required-field}}"
+        "required-field": "{{validation.required-field}}",
+        "new-password-label": "Új jelszó",
+        "current-password-label": "Jelenlegi jelszó",
+        "confirm-password-label": "Jelszó megerősítése",
+        "passwords-must-match": "A jelszavaknak egyeznie kell",
+        "permission-error": "Nincs jogosultsága a jelszó megváltoztatására. Forduljon a szerver adminisztrátorához."
     },
     "change-email": {
         "required-field": "{{validation.required-field}}",
@@ -141,7 +190,13 @@
         "reset": "{{common.reset}}",
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "current-password-label": "Jelenlegi jelszó",
+        "email-not-confirmed": "Ez az e-mail nincs megerősítve",
+        "email-confirmed": "Ezt az e-mailt megerősítették",
+        "setup-user-account": "Felhasználói fiók beállítása",
+        "email-label": "Új e-mail",
+        "email-updated-title": "E-mail frissítve"
     },
     "change-age-restriction": {
         "reset": "{{common.reset}}",
@@ -721,5 +776,24 @@
     },
     "actionable": {
         "clear": "{{common.clear}}"
+    },
+    "reviews": {
+        "user-reviews-local": "Helyi kritikák",
+        "user-reviews-plus": "Külsős kritikák"
+    },
+    "review-modal": {
+        "title": "Kritika szerkesztése",
+        "review-label": "Kritika",
+        "close": "{{common.close}}",
+        "save": "{{common.save}}",
+        "min-length": "A kritika minimum {{count}} karakter hosszúságú kell legyen",
+        "delete": "{{common.delete}}",
+        "required": "{{validation.required-field}}"
+    },
+    "theme": {
+        "theme-dark": "Sötét",
+        "theme-black": "Fekete",
+        "theme-paper": "Papír",
+        "theme-white": "Fehér"
     }
 }
diff --git a/UI/Web/src/assets/langs/id.json b/UI/Web/src/assets/langs/id.json
index 387b7ad3f..490cd5f9f 100644
--- a/UI/Web/src/assets/langs/id.json
+++ b/UI/Web/src/assets/langs/id.json
@@ -22,7 +22,6 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "saving": "Menyimpan…",
         "update": "Perbarui"
@@ -55,15 +54,6 @@
     "spoiler": {
         "click-to-show": "Spoiler, klik untuk tampilkan"
     },
-    "review-series-modal": {
-        "title": "Ubah Ulasan",
-        "review-label": "Ulasan",
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "min-length": "Ulasan harus setidaknya terdiri dari {{count}} karakter",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}"
     },
@@ -93,39 +83,6 @@
         "collapse-series-relationships-tooltip": "Haruskah Kavita menampilkan Seri yang tidak memiliki hubungan atau yang merupakan induk/prekuel",
         "share-series-reviews-label": "Bagikan Ulasan Seri",
         "share-series-reviews-tooltip": "Haruskah Kavita menyertakan ulasan Anda tentang Seri untuk pengguna lain",
-        "image-reader-settings-title": "Pembaca Gambar",
-        "reading-direction-label": "Orientasi Baca",
-        "reading-direction-tooltip": "Arah untuk mengklik agar beralih ke halaman berikutnya. Dari Kanan ke Kiri berarti Anda mengklik pada sisi kiri layar untuk beralih ke halaman berikutnya.",
-        "scaling-option-label": "Opsi Skala",
-        "scaling-option-tooltip": "Bagaimana cara menyesuaikan skala gambar ke layar Anda.",
-        "page-splitting-label": "Pemisahan Halaman",
-        "page-splitting-tooltip": "Bagaimana cara memisahkan gambar yang lebarnya penuh (gambar kiri dan kanan digabungkan)",
-        "reading-mode-label": "Mode Membaca",
-        "layout-mode-label": "Mode Tata Letak",
-        "layout-mode-tooltip": "Tampilkan satu gambar ke layar atau dua gambar berdampingan",
-        "background-color-label": "Warna Latar Belakang",
-        "auto-close-menu-label": "Tutup Menu Otomatis",
-        "show-screen-hints-label": "Tampilkan Petunjuk Layar",
-        "emulate-comic-book-label": "Emulasikan buku komik",
-        "swipe-to-paginate-label": "Geser untuk Memutar Halaman",
-        "book-reader-settings-title": "Pembaca Buku",
-        "tap-to-paginate-label": "Ketuk untuk Memutar Halaman",
-        "tap-to-paginate-tooltip": "Haruskan sisi layar pembaca buku bisa diketuk untuk pindah ke halaman sebelumnya/berikutnya",
-        "immersive-mode-label": "Mode Imersif",
-        "immersive-mode-tooltip": "Ini akan menyembunyikan menu dengan mengklik dokumen pembaca dan mengaktifkan ketuk untuk memutar halaman",
-        "reading-direction-book-label": "Arah Baca",
-        "reading-direction-book-tooltip": "Cara mengklik untuk beralih ke halaman berikutnya. Dari Kanan ke Kiri berarti mengklik di sisi kiri layar.",
-        "font-family-label": "Jenis Font",
-        "font-family-tooltip": "Jenis Font untuk dimuat. Bawaan akan memuat font bawaan buku",
-        "writing-style-label": "Gaya Penulisan",
-        "writing-style-tooltip": "Mengubah arah teks. Horizontal dari kiri ke kanan, vertikal dari atas ke bawah.",
-        "layout-mode-book-label": "Mode Tata Letak",
-        "layout-mode-book-tooltip": "Bagaimana konten harus ditata. Gulir itu sesuai dengan bawaan buku. 1 atau 2 Kolom itu sesuai dengan tinggi perangkat dan dimuat dalam 1 atau 2 kolom teks per halaman",
-        "color-theme-book-label": "Warna Tema",
-        "color-theme-book-tooltip": "Warna tema apa yang akan diterapkan pada konten pembaca buku dan menu",
-        "font-size-book-label": "Ukuran Font",
-        "line-height-book-label": "Jarak Baris",
-        "line-height-book-tooltip": "Berapa banyak spasi antara baris dalam buku",
         "reset": "{{common.reset}}",
         "save": "{{common.save}}"
     },
diff --git a/UI/Web/src/assets/langs/it.json b/UI/Web/src/assets/langs/it.json
index 43c4a887a..98fa183dd 100644
--- a/UI/Web/src/assets/langs/it.json
+++ b/UI/Web/src/assets/langs/it.json
@@ -22,11 +22,11 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "saving": "Salvataggio…",
         "update": "Aggiornamento",
-        "account-detail-title": "Dettagli Account"
+        "account-detail-title": "Dettagli Account",
+        "invalid-email-warning": "Una mail non valida bloccherà alcune funzionalità di Kavita"
     },
     "user-scrobble-history": {
         "title": "Storico Scrobble",
@@ -38,16 +38,19 @@
         "series-header": "Serie",
         "data-header": "Data",
         "is-processed-header": "È processato",
-        "no-data": "Nessun dato",
+        "no-data": "{{common.no-data}}",
         "volume-and-chapter-num": "Volume {{v}} Capitolo {{n}}",
         "volume-num": "Volume {{num}}",
         "chapter-num": "Capitolo {{num}}",
         "rating": "Valutazione {{r}}",
-        "not-applicable": "Non applicabile",
+        "not-applicable": "Non Applicate",
         "processed": "Elaborato",
         "not-processed": "Non Elaborato",
         "special": "{{entity-title.special}}",
-        "not-read-warning": "I fornitori upstream manterranno sempre il numero più alto"
+        "not-read-warning": "I fornitori upstream manterranno sempre il numero più alto",
+        "scrobbling-disabled": "Lo scrobbling è disattivato nelle impostazioni del tuo Account.",
+        "generate-scrobble-events": "Eventi di Riempimento",
+        "token-expired": "Il tuo token AniList è Scaduto! Gli eventi di scrobbling non verranno elaborati fino a quando non lo rinnovi dalla pagina Account."
     },
     "scrobble-event-type-pipe": {
         "chapter-read": "Progressi di lettura",
@@ -59,15 +62,6 @@
     "spoiler": {
         "click-to-show": "Spoiler, clicca per mostrare"
     },
-    "review-series-modal": {
-        "title": "Modifica recensione",
-        "review-label": "Recensione",
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "min-length": "La recensione deve avere almeno {{count}} caratteri",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}",
         "user-review": "Recensione di {{username}}",
@@ -112,68 +106,27 @@
         "collapse-series-relationships-tooltip": "Kavita dovrebbe mostrare serie che non hanno relazioni o è il genitore",
         "share-series-reviews-label": "Condividi le recensioni della serie",
         "share-series-reviews-tooltip": "Kavita dovrebbe includere le tue recensioni di serie per altri utenti",
-        "image-reader-settings-title": "Lettore di immagini",
-        "reading-direction-label": "Direzione Lettura",
-        "reading-direction-tooltip": "Direzione da cliccare per passare alla pagina successiva. Da destra a sinistra significa che fai clic sul lato sinistro dello schermo per passare alla pagina successiva.",
-        "scaling-option-label": "Opzioni di ridimensionamento",
-        "scaling-option-tooltip": "Come ridimensionare l'immagine sullo schermo.",
-        "page-splitting-label": "Divisione pagine",
-        "page-splitting-tooltip": "Come dividere un'immagine a tutta larghezza (cioè entrambe le immagini sinistra e destra sono combinate)",
-        "reading-mode-label": "Modalità lettura",
-        "layout-mode-label": "Modalità Layout",
-        "layout-mode-tooltip": "Renderizza una singola immagine sullo schermo o due immagini affiancate",
-        "background-color-label": "Colore di sfondo",
-        "auto-close-menu-label": "Menu di chiusura automatica",
-        "show-screen-hints-label": "Mostra suggerimenti sullo schermo",
-        "emulate-comic-book-label": "Emula fumetto",
-        "swipe-to-paginate-label": "Scorri per impaginare",
-        "book-reader-settings-title": "Lettore di Libri",
-        "tap-to-paginate-label": "Tocca per impaginare",
-        "tap-to-paginate-tooltip": "Se i lati dello schermo del lettore di libri consentono di toccarlo per passare alla pagina precedente/successiva",
-        "immersive-mode-label": "Modalità Immersiva",
-        "immersive-mode-tooltip": "Questo nasconderà il menu. Un clic sulla pagina del lettore e si attiverà il \"tocca per impaginare\"",
-        "reading-direction-book-label": "Direzione di lettura",
-        "reading-direction-book-tooltip": "Direzione da cliccare per passare alla pagina successiva. Da destra a sinistra significa che fai clic sul lato sinistro dello schermo per passare alla pagina successiva.",
-        "font-family-label": "Tipologia di Font",
-        "font-family-tooltip": "Tipologia di caratteri da caricare. Predefinito caricherà il carattere predefinito del libro",
-        "writing-style-label": "Stile di Scrittura",
-        "writing-style-tooltip": "Cambia la direzione del testo. Orizzontale è da sinistra a destra, verticale è dall'alto verso il basso.",
-        "layout-mode-book-label": "Modalità di disposizione delle pagine",
-        "layout-mode-book-tooltip": "Come devono essere strutturati i contenuti. Sfoglia è come lo presenta il libro. 1 o 2 colonne adatta all'altezza del dispositivo ed utilizza 1 o 2 colonne di testo per pagina",
-        "color-theme-book-label": "Tema Colore",
-        "color-theme-book-tooltip": "Quale tema applicare al contenuto e al menu del lettore di libri",
-        "font-size-book-label": "Dimensioni del carattere",
-        "line-height-book-label": "Spaziatura interlinea",
-        "line-height-book-tooltip": "Quanta spaziatura tra le righe del libro",
-        "margin-book-label": "Margine",
-        "margin-book-tooltip": "Quanto margine lasciare su ciascun lato dello schermo. Sui dispositivi mobili verrà ignorato il valore, indipendentemente da questo settaggio.",
-        "pdf-reader-settings-title": "Lettore PDF",
-        "pdf-scroll-mode-label": "Modalità Scorrimento",
-        "pdf-scroll-mode-tooltip": "Come scorrere le pagine. Verticalmente/Orizzontalmente e Premi per cambiare pagina (nessuno scorrimento)",
-        "pdf-spread-mode-label": "Modalità Due Pagine",
-        "pdf-spread-mode-tooltip": "Come dovrebbero essere disposte le pagine. Singole o doppie (pari/dispari)",
-        "pdf-theme-label": "Tema",
         "clients-opds-alert": "OPDS non è abilitato su questo server. Ciò non influirà sugli utenti Tachiyomi.",
         "clients-opds-description": "Tutti i client di terze parti utilizzeranno la chiave API o l'URL di connessione di seguito. Sono come password, tienile private.",
         "clients-api-key-tooltip": "La chiave API è come una password. Reimpostandolo, tutti i client esistenti verranno invalidati.",
         "clients-opds-url-tooltip": "Visualizza un elenco dei client OPDS supportati: ",
         "reset": "{{common.reset}}",
         "save": "{{common.save}}",
-        "reading-mode-tooltip": "Cambia il lettore per impaginare verticalmente, orizzontalmente o avere uno scorrimento infinito",
-        "show-screen-hints-tooltip": "Mostra una sovrapposizione per aiutare a comprendere l'area e la direzione della paginazione",
-        "emulate-comic-book-tooltip": "Applica un effetto ombra per emulare la lettura di un libro",
-        "swipe-to-paginate-tooltip": "Lo scorrimento sullo schermo dovrebbe causare l'attivazione della pagina successiva o precedente",
-        "pdf-theme-tooltip": "Tema colore del lettore",
         "clients-opds-url-label": "URL OPDS",
         "clients-api-key-label": "Chiave API",
-        "background-color-tooltip": "Colore di sfondo del lettore di immagini",
-        "auto-close-menu-tooltip": "Il menu dovrebbe chiudersi automaticamente",
-        "font-size-book-tooltip": "Percentuale di ridimensionamento da applicare al font nel libro"
+        "kavitaplus-settings-title": "Kavita+",
+        "anilist-scrobbling-tooltip": "Permetti a Kavita di fare Scrobble (sincronizzazione unidirezionale) sul progresso della lettura e sulle valutazioni verso AniList",
+        "anilist-scrobbling-label": "Scrobbling AniList",
+        "want-to-read-sync-label": "Sincronizzazione Da Leggere",
+        "want-to-read-sync-tooltip": "Permetti a Kavita di aggiungere elementi alla tua lista Da Leggere basandosi sulle serie di AniList e MAL nella lista in attesa"
     },
     "user-holds": {
-        "title": "Mantieni l'Ascolto",
-        "description": "Questo è un elenco di serie gestito dall'utente che non verrà sottoposto a scrobbling . Puoi rimuovere una serie in qualsiasi momento e il prossimo evento in grado di attivare lo scrobbling (avanzamento della lettura, valutazione, desidera leggere lo stato) attiverà gli eventi.",
-        "no-data": "{{typeahead.no-data}}"
+        "title": "Mantieni Scrobble",
+        "description": "Questo è un elenco di serie gestito dall'utente che non verrà sottoposto a scrobbling . Puoi rimuovere una serie in qualsiasi momento e il prossimo evento in grado di attivare lo scrobbling (avanzamento della lettura, valutazione, desidera leggere lo stato) attiverà lo scrobbling.",
+        "no-data": "{{typeahead.no-data}}",
+        "delete-label": "{{common.remove}}",
+        "created-header": "{{manage-media-issues.created-header}}",
+        "series-name-header": "{{manage-matched-metadata.series-name-header}}"
     },
     "theme-manager": {
         "title": "Gestore dei Temi",
@@ -279,7 +232,7 @@
         "save": "{{common.save}}"
     },
     "change-age-restriction": {
-        "age-restriction-label": "Restrizione per età",
+        "age-restriction-label": "Restrizioni per Età",
         "unknowns": "Sconosciuti",
         "reset": "{{common.reset}}",
         "edit": "{{common.edit}}",
@@ -293,7 +246,8 @@
         "regen-warning": "La rigenerazione della chiave API invaliderà tutti i client esistenti.",
         "no-key": "ERRORE - CHIAVE NON IMPOSTATA",
         "confirm-reset": "Ciò invaliderà tutte le configurazioni OPDS impostate. Sei sicuro di voler continuare?",
-        "key-reset": "Ripristino della chiave API"
+        "key-reset": "Ripristino della chiave API",
+        "reset": "Ripristina"
     },
     "scrobbling-providers": {
         "title": "Fornitori di Scrobbling",
@@ -313,14 +267,20 @@
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
-        "loading": "{{common.loading}}"
+        "loading": "{{common.loading}}",
+        "anilist-first-header": "Token AniList salvato",
+        "anilist-first-later": "Più tardi",
+        "anilist-first-now": "Ora",
+        "mal-used-for": "MyAnimeList è utilizzato per le Collezioni Smart e la sincronizzazione della lista da leggere.",
+        "anilist-used-for": "AniList è utilizzato per lo scrobbling (sincronizzazione di dati) e la sincronizzazione della lista da leggere.",
+        "anilist-first-description": "Il tuo token AniList è stato impostato. Questo token ha durata di un anno e Kavita ti informerà prima della scadenza per poterlo aggiornare. Con questo, Kavita genererà gli eventi di scrobbling (sincronizzazione) dalla tua cronologia di lettura, lista da leggere, e valutazioni. Puoi attivarlo ora oppure più tardi. Se hai serie che non vuoi sincronizzare seleziona più tardi e imposta lo Scrobble Hold su di esse. Devi attivare questo task solo una volta. Dopodiché, Kavita gestirà la sincronizzazione per te.
          Se selezioni 'Più tardi', puoi trovare il pulsante nella pagina Scrobbling."
     },
     "typeahead": {
-        "locked-field": "Il campo è bloccato",
+        "locked-field": "Il Campo è bloccato",
         "close": "{{common.close}}",
         "loading": "{{common.loading}}",
         "add-item": "Aggiungi {{item}}…",
-        "no-data": "Nessun dato presente",
+        "no-data": "{{common.no-data}}",
         "add-custom-item": ", digitare per aggiungere un elemento personalizzato"
     },
     "generic-list-modal": {
@@ -417,14 +377,14 @@
     },
     "cbl-conflict-reason-pipe": {
         "all-series-missing": "Il tuo account non ha accesso a tutte le serie nell'elenco o Kavita non ha nulla presente nell'elenco.",
-        "chapter-missing": "{{series}}: manca il capitolo {{chapter}} di Kavita. Questo elemento verrà saltato.",
+        "chapter-missing": "{{series}}: manca il Capitolo {{chapter}} di Kavita. Questo elemento verrà saltato.",
         "empty-file": "Il file cbl è vuoto, niente da fare.",
         "name-conflict": "Esiste già un elenco di lettura ({{readingListName}}) sul tuo account che corrisponde al file cbl.",
         "series-collision": "La serie, {{seriesLink}}, si scontra con un'altra serie con lo stesso nome in un'altra libreria.",
         "series-missing": "La serie, {{series}}, non è presente in Kavita oppure il tuo account non dispone dell'autorizzazione. Tutti gli articoli con questa serie verranno ignorati dall'importazione.",
         "volume-missing": "{{series}}: Il volume {{volume}} non è presente in Kavita oppure il tuo account non dispone dell'autorizzazione. Tutti gli elementi con questo numero di volume verranno ignorati.",
         "all-chapter-missing": "Non tutti i capitoli possono essere abbinati ai capitoli in Kavita.",
-        "invalid-file": "Il file è danneggiato o non corrisponde ai tag/specifiche previste.",
+        "invalid-file": "Il file è danneggiato o non corrisponde alle etichette/specifiche previste.",
         "success": "{{series}} volume {{volume}} capitolo {{chapter}} mappato correttamente."
     },
     "time-duration-pipe": {
@@ -450,9 +410,9 @@
     },
     "relationship-pipe": {
         "adaptation": "Adattamento",
-        "alternative-setting": "Impostazioni Alternative",
-        "alternative-version": "Versione Alternativa",
-        "character": "Carattere",
+        "alternative-setting": "Ambientazione alternativa",
+        "alternative-version": "Versione alternativa",
+        "character": "Personaggio",
         "contains": "Contiene",
         "doujinshi": "Doujinshi",
         "other": "Altro",
@@ -561,10 +521,7 @@
         "installed": "Installato",
         "download": "Download",
         "nightly": "Nightly: {{version}}",
-        "published-label": "Pubblicato: ",
-        "available": "Disponibile",
-        "description": "Se non vedi un {{installed}}",
-        "description-continued": "tag, sei in una nightly release. Solo le versioni principali verranno visualizzate come disponibili. Un tag nightly verrà visualizzato quando si sta usando la versione nightly di questa stable."
+        "available": "Disponibile"
     },
     "invite-user": {
         "title": "Invita utente",
@@ -610,12 +567,35 @@
         "activate-discordId-tooltip": "Collega la tua utenza Discord con Kavita+. Ciò ti garantisce accesso ai canali nascosti per auitare a plasmare Kavita.",
         "discord-validation": "Questo non è un Id utenteDiscord valido. Il tuo Id utente Non è il tuo nome utente Discord.",
         "activate-delete": "{{common.delete}}",
-        "activate-reset": "{{common.reset}}",
+        "activate-reset": "Reset Licenza",
         "activate-reset-tooltip": "Slega la tua licenza con questo server. Richiede sia licenza che e-mail.",
         "activate-save": "{{common.save}}",
         "kavita+-desc-part-3": "oggi!",
         "kavita+-desc-part-1": "Kavita+ è un servizio di abbonamento premium che sblocca funzionalità per tutti gli utenti su questa istanza Kavita. Acquista un abbonamento per sbloccare ",
-        "kavita+-desc-part-2": "vantaggi premium"
+        "kavita+-desc-part-2": "vantaggi premium",
+        "help-label": "{{common.help}}",
+        "info-title": "Informazioni sulla Licenza",
+        "actions-title": "Azioni",
+        "license-active-label": "Licenza Attiva",
+        "supported-version-label": "Nella versione di Kavita supportata",
+        "expiration-label": "Scadenza",
+        "valid-tooltip": "Valido",
+        "invalid-tooltip": "Invalido",
+        "reset-label": "Reset",
+        "delete-label": "Rimuovi Licenza",
+        "delete-tooltip": "La licenza verrà rimossa da Kavita, interrompendo la comunicazione con Kavita+. Non verrai disiscritto. Utilizza 'gestisci' prima per cancellare l'iscrizione.",
+        "manage-tooltip": "Aggiorna dati di pagamento, Cancella/Metti in pausa l'iscrizione, ecc",
+        "email-label": "Email Registrata",
+        "license-mismatch": "La licenza potrebbe essere registrata ad un'altra istanza di Kavita. Per risolvere effettua nuovamente la registrazione.",
+        "k+-already-registered-header": "Licenza già registrata",
+        "overwrite": "Sovrascrivi",
+        "k+-unlocked": "Kavita+ sbloccato!",
+        "kavita+-requirement": "Kavita+ è progettato per funzionare solo con le ultime 3 versioni rilasciate. Qualsiasi cosa al di fuori di queste potrebbe non funzionare.",
+        "reset-tooltip": "L'istanza del server connesso alla licenza Kavita+ verrà resettata. Richiede Email e la Chiave di Licenza",
+        "faq-title": "FAQ",
+        "k+-license-overwrite": "La licenza è registrata ad un'altra istanza di Kavita. Questo può succedere durante la re-installazione e raramente dovuto ad aggiornamenti di sistema. Seleziona sovrascrivi per forzare la registrazione Kavita+ all'istanza corrente.",
+        "k+-unlocked-description": "Benvenuto a Kavita+! Kavita genererà eventi di scrobbling in base al tuo progresso, alle tue valutazioni e alla lista da leggere una volta registrato il tuo Provider di Scrobbling nella sezione Account. Prenditi del tempo per assicurarti di aver impostato lo Scrobble Hold per le serie che non desideri sincronizzare.",
+        "total-subbed-months-label": "Totale Mesi Iscritto"
     },
     "book-line-overlay": {
         "copy": "Copia",
@@ -664,7 +644,8 @@
         "required-field": "{{common.required-field}}",
         "valid-email": "{{common.valid-email}}",
         "password-validation": "{{validation.password-validation}}",
-        "register": "Registrati"
+        "register": "Registrati",
+        "error-label": "Errore:"
     },
     "confirm-email-change": {
         "title": "Convalida modifica e-mail",
@@ -707,7 +688,7 @@
         "incognito": "Incongnito",
         "remove-from-want-to-read": "{{actionable.remove-from-want-to-read}}",
         "add-to-want-to-read": "{{actionable.add-to-want-to-read}}",
-        "edit-series-alt": "Modifica informazione di serie",
+        "edit-series-alt": "Modifica Informazioni",
         "reviews-tab": "{{tabs.reviews-tab}}",
         "storyline-tab": "{{tabs.storyline-tab}}",
         "books-tab": "{{tabs.books-tab}}",
@@ -740,14 +721,43 @@
         "volume-num": "{{common.volume-num}}",
         "reading-lists-title": "{{side-nav.reading-lists}}",
         "time-to-read-alt": "{{sort-field-pipe.time-to-read}}",
-        "scrobbling-tooltip": "{{settings.scrobbling}}"
+        "scrobbling-tooltip": "{{settings.scrobbling}}",
+        "words-count": "{{num}} Parole",
+        "more-alt": "Ancora",
+        "pages-count": "{{num}} Pagine",
+        "weblinks-title": "Link",
+        "time-left-alt": "Tempo Rimanente",
+        "publication-status-title": "Pubblicazione",
+        "publication-status-tooltip": "Stato di Pubblicazione",
+        "release-date-title": "Uscita"
     },
     "metadata-fields": {
         "collections-title": "{{side-nav.collections}}",
-        "reading-lists-title": "{{side-nav.reading-lists}}"
+        "reading-lists-title": "{{side-nav.reading-lists}}",
+        "editors-title": "Editori",
+        "language-title": "Lingua",
+        "inkers-title": "Inchiostratori",
+        "letterers-title": "Letteristi",
+        "age-rating-title": "Valutazione dell'Età",
+        "genres-title": "Generi",
+        "imprints-title": "Impronte",
+        "characters-title": "Personaggi",
+        "colorists-title": "Coloristi",
+        "cover-artists-title": "Artisti",
+        "tags-title": "Etichette",
+        "translators-title": "Traduttori",
+        "pencillers-title": "Disegnatori",
+        "publishers-title": "Case Editrici",
+        "writers-title": "Scrittori",
+        "teams-title": "Team",
+        "links-title": "Collegamenti",
+        "locations-title": "Posizioni"
     },
     "external-rating": {
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "entry-label": "Guarda i Dettagli",
+        "kavita-tooltip": "La tua Valutazione + Complessivamente",
+        "kavita-rating-title": "La tua Valutazione"
     },
     "badge-expander": {
         "more-items": "e {{count}} ancora"
@@ -764,8 +774,8 @@
     },
     "side-nav-companion-bar": {
         "page-settings-title": "{{series-detail.page-settings-title}}",
-        "open-filter-and-sort": "Apri filtro e ordinamento",
-        "close-filter-and-sort": "Chiudi filtraggio e ordinamento",
+        "open-filter-and-sort": "Apri Filtro e Ordinamento",
+        "close-filter-and-sort": "Chiudi Filtraggio e Ordinamento",
         "filter-and-sort-alt": "Ordina / Filtra"
     },
     "side-nav": {
@@ -796,7 +806,7 @@
         "library-name-unique": "Il nome della Libreria deve essere univoco",
         "last-scanned-label": "Ultima scansione:",
         "type-label": "Tipo",
-        "type-tooltip": "Il tipo di libreria determina come vengono analizzati i nomi dei file e se l'interfaccia utente mostra capitoli (manga) e numeri (fumetti). Il libro funziona allo stesso modo del manga ma ha nomi diversi nell'interfaccia utente.",
+        "type-tooltip": "Il tipo di libreria determina come vengono analizzati i nomi dei file e se l'interfaccia utente mostra Capitoli (Manga) e Numeri (Fumetti). Il libro funziona allo stesso modo del manga ma ha nomi diversi nell'interfaccia utente.",
         "kavitaplus-eligible-label": "Idoneo a Kavita+",
         "kavitaplus-eligible-tooltip": "Kavita+ scaricherà informazioni o supporterà lo Scrobbling",
         "folder-description": "Aggiungi cartelle alla tua libreria",
@@ -810,9 +820,9 @@
         "cover-description": "Le icone delle immagini della libreria personalizzata sono facoltative",
         "cover-description-extra": "L'immagine della libreria non deve essere grande. Punta a un file piccolo, di dimensioni 32x32 pixel. Kavita non esegue la convalida delle dimensioni.",
         "manage-collection-label": "Gestisci raccolte",
-        "manage-collection-tooltip": "Kavita dovrebbe creare raccolte dai tag SeriesGroup trovati nei file ComicInfo.xml/opf",
+        "manage-collection-tooltip": "Kavita dovrebbe creare raccolte dalle etichette SeriesGroup trovati nei file ComicInfo.xml/opf",
         "manage-reading-list-label": "Gestisci le liste di lettura",
-        "manage-reading-list-tooltip": "Kavita dovrebbe creare liste di lettura dai tag StoryArc/StoryArcNumber e AlternativeSeries/AlternativeCount trovati nei file ComicInfo.xml/opf",
+        "manage-reading-list-tooltip": "Kavita dovrebbe creare liste di lettura dalle Etichette StoryArc/StoryArcNumber e AlternativeSeries/AlternativeCount trovati nei file ComicInfo.xml/opf",
         "allow-scrobbling-label": "Consenti Scrobbling",
         "allow-scrobbling-tooltip": "Kavita dovrebbe eseguire lo scrobble degli eventi di lettura, lo stato \"da leggere\", le valutazioni e le recensioni dei fornitori configurati. Ciò si verificherà solo se il server dispone di un abbonamento Kavita+ attivo.",
         "folder-watching-label": "Controllo delle cartelle",
@@ -832,7 +842,9 @@
         "file-type-group-tooltip": "Quali tipi di file dovrebbe scansionare Kavita. Ad esempio, Archivio includerà tutti i file cb*, zip, rar, ecc.",
         "exclude-patterns-label": "Escludi modelli",
         "exclude-patterns-tooltip": "Configura una serie di modelli (sintassi Glob) che Kavita abbinerà durante la scansione delle directory ed escluderà dai risultati dello scanner.",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "allow-metadata-matching-label": "Consenti corrispondenza Metadati",
+        "allow-metadata-matching-tooltip": "Kavita dovrebbe scaricare i metadati per le serie all'interno di questa libreria. Ciò avverrà solo se il server ha un abbonamento Kavita+ attivo."
     },
     "file-type-group-pipe": {
         "archive": "Archivio",
@@ -870,7 +882,7 @@
         "layout-mode-option-scroll": "Scorrere",
         "layout-mode-option-1col": "1 Colonna",
         "layout-mode-option-2col": "2 Colonne",
-        "color-theme-title": "Tema",
+        "color-theme-title": "Colore Tema",
         "theme-dark": "Scuro",
         "theme-black": "Nero",
         "theme-white": "Bianco",
@@ -919,12 +931,18 @@
         "imprints-title": "{{metadata-fields.imprints-title}}",
         "genres-title": "{{metadata-fields.genres-title}}",
         "tags-title": "{{metadata-fields.tags-title}}",
-        "weblinks-title": "{{tabs.weblink-tab}}"
+        "weblinks-title": "{{tabs.weblink-tab}}",
+        "format-title": "{{metadata-filter.format-label}}",
+        "release-title": "{{sort-field-pipe.release-year}}",
+        "length-title": "{{edit-chapter-modal.words-label}}",
+        "language-title": "{{edit-chapter-modal.language-label}}",
+        "read-time-title": "{{edit-chapter-modal.reading-time-label}}"
     },
     "related-tab": {
         "reading-lists-title": "{{reading-lists.title}}",
         "collections-title": "{{side-nav.collections}}",
-        "relations-title": "{{tabs.related-tab}}"
+        "relations-title": "{{tabs.related-tab}}",
+        "bookmarks-title": "{{side-nav.bookmarks}}"
     },
     "cover-image-chooser": {
         "enter-an-url-pre-title": "Inserisci un {{url}}",
@@ -968,16 +986,25 @@
         "special": "Speciale",
         "issue-num": "{{common.issue-hash-num}}",
         "chapter": "{{common.chapter-num}}",
-        "book-num": "{{common.book-num-shorthand}}"
+        "book-num": "{{common.book-num-shorthand}}",
+        "single-volume": "Volume Singolo",
+        "vol-num": "{{user-scrobble-history.volume-num}}"
     },
     "external-series-card": {
         "open-external": "Apri Esternamente"
     },
     "manage-media-issues": {
-        "filter-label": "{{common.filter}}"
+        "filter-label": "{{common.filter}}",
+        "description-part-2": "wiki.",
+        "comment-header": "Commenti",
+        "file-header": "File",
+        "created-header": "Creato",
+        "no-data": "{{common.no-data}}",
+        "description-part-1": "Questa tabella contiene i problemi riscontrati durante la scansione o la lettura del tuo supporto. Puoi cancellarla in qualsiasi momento e usare Library (Force) Scan per eseguire l'analisi. Un elenco di alcuni errori comuni e il loro significato può essere trovato su ",
+        "clear-alerts": "Cancella Avvisi"
     },
     "manage-email-settings": {
-        "description": "Per utilizzare alcune funzioni di Kavita come Password Dimenticata e Invia Al Dispositivo, è necessario impostare un provider di posta elettronica. Altre funzionalità come la modifica della password sono meno sicure senza la configurazione dell'e-mail.",
+        "description": "Per utilizzare alcune funzioni di Kavita come Invia a Dispositivo è necessario configurare un provider di posta elettronica. Altre funzioni come Password dimenticata richiedono l'intervento dell'amministratore senza la configurazione della posta elettronica.",
         "send-to-warning": "Se vuoi che Invia Al Dispositivo funzioni, devi configurare le impostazioni e-mail",
         "email-url-label": "URL Servizio Email",
         "email-url-tooltip": "Utilizza l'URL completo del servizio di posta elettronica. Non includere la barra finale.",
@@ -985,7 +1012,7 @@
         "reset": "{{common.reset}}",
         "test": "Prova",
         "host-name-label": "Nome Host",
-        "host-name-tooltip": "Nome di dominio (del proxy inverso). Se impostato, la generazione della posta elettronica utilizzerà sempre questo.",
+        "host-name-tooltip": "Nome Dominio (del Reverse Proxy). Richiesto per la funzionalità email. Se non c'è un proxy inverso, usa un url.",
         "host-name-validation": "Il nome host deve iniziare con http(s) e non terminare con /",
         "sender-address-label": "Indirizzo Mittente",
         "sender-address-tooltip": "Questo è l'indirizzo email che il destinatario vedrà quando riceverà l'email. In genere, l'indirizzo email associato all'account.",
@@ -1005,16 +1032,18 @@
         "gmail-label": "Gmail",
         "outlook-label": "Outlook",
         "reset-to-default": "{{common.reset-to-default}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "setting-description": "Per utilizzare la funzionalità basata sulla posta elettronica in Kavita è necessario compilare sia il nome host che le impostazioni SMTP.",
+        "test-warning": "Prima di premere Test le impostazioni devono essere valide."
     },
     "manage-library": {
         "title": "Librerie",
         "add-library": "Aggiungi Libreria",
         "no-data": "Non esistono librerie. Prova a crearne una.",
         "loading": "{{common.loading}}",
-        "last-scanned-title": "Ultima scansione:",
-        "shared-folders-title": "Cartelle Condivise:",
-        "type-title": "Tipo:",
+        "last-scanned-title": "Ultima Scansione",
+        "shared-folders-title": "Cartelle",
+        "type-title": "Tipo",
         "scan-library": "Analizza Libreria",
         "delete-library": "Elimina Libreria",
         "delete-library-by-name": "Elimina {{name}}",
@@ -1025,17 +1054,26 @@
         "deselect-all": "{{common.deselect-all}}",
         "select-all": "{{common.select-all}}",
         "cancel": "{{common.cancel}}",
-        "apply": "{{common.apply}}"
+        "apply": "{{common.apply}}",
+        "bulk-action-label": "Azione Collettiva",
+        "include-type-tooltip": "Questa non verrà scansionata automaticamente. Nella scansione successiva, potresti avere uno spostamento di serie dovuto a differenze di analisi",
+        "folder-count": "{{num}} cartelle",
+        "include-type-label": "Includi la copia del tipo di libreria",
+        "bulk-copy-to": "Seleziona le librerie da cui copiare le impostazioni {{libraryName}}"
     },
     "copy-settings-from-library-modal": {
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "title": "Copia le impostazioni da una libreria ad altre",
+        "description": "Seleziona una libreria da cui copiare le impostazioni e nella schermata successiva seleziona le librerie a cui applicare.",
+        "select-option": "Seleziona una Libreria",
+        "select": "Seleziona"
     },
     "manage-media-settings": {
         "encode-as-description-part-1": "WebP/AVIF puo drasticamente ridurre i requisiti di spazio per i file. WebP/AVIF non e supportato su tutti i browser o versioni. Per imparare se queste impostazioni sono appropriate per il tuo setup, visita ",
         "encode-as-description-part-2": "Posso usare WebP?",
         "encode-as-description-part-3": "Posso usare AVIF?",
         "encode-as-warning": "Non puoi tornare in dietro una volta che sei passato a WebP/AVIF. Avresti bisogno di ricaricare le copertine sulle librerie per rigenerarle tutte. I segnalibri e favicons non possono essere convertiti.",
-        "media-warning": "È necessario attivare l'attività di conversione multimediale nella scheda Attività.,",
+        "media-warning": "Dopo il salvataggio, è necessario attivare l'attività di conversione dei media nella scheda Attività.",
         "encode-as-label": "Salva supporto con nome",
         "encode-as-tooltip": "Tutti i media gestiti da Kavita (copertine, segnalibri, favicon) verranno codificati come questo tipo.",
         "bookmark-dir-label": "Directory dei preferiti",
@@ -1056,14 +1094,16 @@
         "xlarge": "Molto grande (1265x1795)"
     },
     "manage-scrobble-errors": {
-        "description": "Questa tabella contiene i problemi rilevati durante lo scrobbling. Questo elenco non è gestito. Puoi cancellarlo in qualsiasi momento e attendere il successivo caricamento di scrobble per vederlo. Se è presente una serie sconosciuta, è meglio correggere il nome della serie o il nome della serie localizzata o aggiungere un collegamento web per i fornitori.",
+        "description": "Questa tabella contiene i problemi riscontrati durante lo scrobbling. Puoi cancellarla in qualsiasi momento e attendere il prossimo caricamento dello scrobbling per vedere. Se c'è una serie sconosciuta, è meglio correggere il nome della serie o il nome della serie localizzata o aggiungere un collegamento Web per i provider.",
         "filter-label": "{{common.filter}}",
         "clear-errors": "Pulisic Errori",
         "series-header": "Serie",
         "created-header": "Creata",
         "comment-header": "Commento",
         "edit-header": "Modifica",
-        "edit-item-alt": "Modifica {{seriesName}}"
+        "edit-item-alt": "Modifica {{seriesName}}",
+        "no-data": "Nessun Numero",
+        "title": "Errori di Scrobbling"
     },
     "default-date-pipe": {
         "never": "Mai"
@@ -1114,7 +1154,10 @@
         "max-backup-validation": "Non puoi avere più di {{num}} backup",
         "min-backup-validation": "Devi avere almeno 1 backup",
         "ip-address-validation": "Gli indirizzi IP possono contenere solo indirizzi IPv4 o IPv6 validi",
-        "base-url-validation": "L'URL di base deve iniziare e terminare con /"
+        "base-url-validation": "L'URL di base deve iniziare e terminare con /",
+        "networking-settings-title": "Rete",
+        "customization-settings-title": "Personalizzazione",
+        "system-settings-title": "Sistema"
     },
     "manage-system": {
         "title": "Informazioni sul sistema",
@@ -1128,7 +1171,9 @@
         "source-title": "Sorgente:",
         "feature-request-title": "Richieste di funzionalità:",
         "localization-title": "Localizzazioni:",
-        "updates-title": "Aggiorna cronologia"
+        "updates-title": "Aggiorna cronologia",
+        "first-install-date-title": "Data della prima Installazione",
+        "first-install-version-title": "Prima versione di Installazione"
     },
     "manage-tasks-settings": {
         "title": "Task ricorrenti",
@@ -1161,7 +1206,7 @@
         "bust-cache-task-desc": "Elimina la cache Kavita+: dovrebbe essere utilizzato solo durante il debug di corrispondenze errate.",
         "bust-cache-task-success": "Cache Kavita+ danneggiata",
         "bust-locale-task": "Busta cache delle impostazioni locali",
-        "bust-locale-task-desc": "Blocca la cache delle impostazioni locali. Ciò può risolvere i problemi relativi alle stringhe che non vengono visualizzate correttamente dopo un aggiornamento",
+        "bust-locale-task-desc": "Svuota la cache locale. Questo può risolvere i problemi con le stringhe che non vengono visualizzate correttamente dopo un aggiornamento. È necessario un aggiornamento del browser.",
         "bust-locale-task-success": "Cache locale cancellata",
         "clear-reading-cache-task": "Pulisci Cache di Lettura",
         "clear-reading-cache-task-desc": "Cancella i file memorizzati nella cache per la lettura. Utile quando hai appena aggiornato un file che stavi leggendo nelle ultime 24 ore.",
@@ -1174,11 +1219,15 @@
         "backup-database-task-success": "Un lavoro per il backup del database è stato messo in coda",
         "download-logs-task": "Scarica Logs",
         "download-logs-task-desc": "Compila tutti i file di registro in un file zip e lo scarica.",
-        "analyze-files-task": "Analizza File",
-        "analyze-files-task-desc": "Esegue un'attività di lunga durata che analizzerà i file per generare estensione e dimensione. Dovrebbe essere eseguito solo una volta per la versione v0.7. Non necessario se hai installato la versione successiva alla v0.7.",
-        "analyze-files-task-success": "L'analisi del file è stata messa in coda",
         "check-for-updates-task": "Cerca Aggiornamenti",
-        "check-for-updates-task-desc": "Verifica se sono disponibili versioni stabili prima della tua versione."
+        "check-for-updates-task-desc": "Verifica se sono disponibili versioni stabili prima della tua versione.",
+        "clean-up-task": "Pulizia Generale",
+        "clean-up-task-desc": "Esegue attività di pulizia notturne sul server. Può essere pesante, si consiglia di non eseguirlo con utenti attivi o scansioni. Viene eseguito ogni 24 ore.",
+        "clean-up-task-success": "Pulizia completata",
+        "convert-media-task-success": "La conversione del Media nella Target Encoding è stata messa in coda",
+        "sync-themes-task": "Sincronizza i Temi",
+        "sync-themes-task-desc": "Sincronizza i temi scaricati con le modifiche upstream se la versione corrisponde.",
+        "sync-themes-success": "La sincronizzazione dei temi è stata messa in coda"
     },
     "manage-users": {
         "title": "Utenti Attivi",
@@ -1198,12 +1247,18 @@
         "change-password-alt": "Cambia Password {{user}}",
         "resend": "Rinvia",
         "setup": "Impostare",
-        "admin": "Amministratore",
         "none": "Nessuno",
         "never": "Mai",
         "online-now-tooltip": "Inlinea Adesso",
         "no-data": "Non ci sono altri utenti.",
-        "loading": "{{common.loading}}"
+        "loading": "{{common.loading}}",
+        "pending-tooltip": "Questo utente non ha convalidato la propria email",
+        "actions-header": "Azioni",
+        "too-many-libraries": "Molto",
+        "roles-header": "Ruoli",
+        "sharing-header": "Condivisione",
+        "last-active-header": "Ultimo Attivo",
+        "name-header": "Nome"
     },
     "edit-collection-tags": {
         "title": "Modifica {{collectionName}} Collezione",
@@ -1216,13 +1271,18 @@
         "info-tab": "{{tabs.info-tab}}",
         "series-tab": "{{tabs.series-tab}}",
         "name-label": "Nome",
-        "name-validation": "Il nome deve essere univoco",
+        "name-validation": "Il Nome deve essere univoco",
         "promote-label": "Promuovi",
         "promote-tooltip": "La promozione significa che il tag può essere visto a livello di server, non solo per gli utenti amministratori. Su tutte le serie che hanno questo tag verranno comunque applicate restrizioni di accesso da parte degli utenti.",
         "summary-label": "Sommario",
         "deselect-all": "{{common.deselect-all}}",
         "select-all": "{{common.select-all}}",
-        "filter-label": "{{common.filter}}"
+        "filter-label": "{{common.filter}}",
+        "last-sync-title": "Ultima Sincronizzazione:",
+        "last-sync-tooltip": "Kavita si sincronizza quotidianamente con il provider di raccolta upstream.",
+        "missing-series-title": "Serie Mancanti:",
+        "source-url-title": "Url di origine:",
+        "total-series-title": "Serie totali:"
     },
     "library-recommended": {
         "no-data": "Niente da mostrare qui. Aggiungi alcuni metadati alla tua libreria, leggi qualcosa o valuta qualcosa. In questa libreria potrebbero anche essere disattivati i consigli.",
@@ -1234,14 +1294,46 @@
         "on-deck": "{{dashboard.on-deck-title}}"
     },
     "settings": {
-        "kavitaplus-section-title": "{{settings.admin-kavitaplus}}"
+        "kavitaplus-section-title": "Kavita+",
+        "preferences": "Preferenze",
+        "info-section-title": "Info",
+        "clients": "API Key / OPDS",
+        "devices": "Dispositivi",
+        "customize": "Personalizza",
+        "mal-stack-import": "MAL Stack",
+        "scrobble-holds": "Scrobble Tenuti",
+        "account": "Account",
+        "admin-media-issues": "Problemi dei Media",
+        "user-stats": "Statistiche",
+        "account-section-title": "Account",
+        "admin-logs": "Log",
+        "admin-email": "Email",
+        "admin-tasks": "Compiti",
+        "theme": "Tema",
+        "server-section-title": "Server",
+        "import-section-title": "Importa",
+        "admin-manage-tokens": "Gestisci i Token degli Utenti",
+        "admin-metadata": "Gestisci i Metadati",
+        "admin-statistics": "Statistiche",
+        "admin-system": "Sistema",
+        "admin-email-history": "Cronologia Email",
+        "scrobbling": "Scrobbling",
+        "admin-kavitaplus": "Licenza",
+        "cbl-import": "CBL Lista di Lettura",
+        "admin-media": "Media",
+        "admin-libraries": "Librerie",
+        "admin-matched-metadata": "Metadati Abbinati",
+        "admin-general": "Generale",
+        "admin-users": "Utenti"
     },
     "collection-detail": {
         "no-data": "Non ci sono articoli. Prova ad aggiungere una serie.",
         "no-data-filtered": "Nessun articolo corrisponde al filtro attuale.",
         "title-alt": "Kavita - Collezione {{collectionName}}",
         "series-header": "Serie",
-        "item-count": "{{common.item-count}}"
+        "item-count": "{{common.item-count}}",
+        "last-sync": "Ultima Sincronizzazione: {{date}}",
+        "sync-progress": "Serie Raccolte: {{title}}"
     },
     "all-collections": {
         "title": "Collezioni",
@@ -1269,7 +1361,8 @@
     },
     "reading-list-item": {
         "remove": "{{common.remove}}",
-        "read": "{{common.read}}"
+        "read": "{{common.read}}",
+        "released-label": "Rilasciato: {{date}}"
     },
     "stream-list-item": {
         "remove": "{{common.remove}}",
@@ -1300,7 +1393,9 @@
         "close": "{{common.close}}",
         "users-online-count": "{{num}} Utenti online",
         "active-events-title": "Eventi Attivi:",
-        "no-data": "Non succede molto qui"
+        "no-data": "Non succede molto qui",
+        "download-in-queue": "{{num}} download in Coda",
+        "left-to-process": "Da elaborare: {{leftToProcess}}"
     },
     "shortcuts-modal": {
         "title": "Scorciatoie Tastiera",
@@ -1317,14 +1412,15 @@
         "files": "Files",
         "chapters": "Capitoli",
         "people": "Persone",
-        "tags": "Tags",
+        "tags": "Etichette",
         "genres": "{{metadata-fields.genres-title}}",
         "bookmarks": "{{side-nav.bookmarks}}",
         "libraries": "Librerie",
         "reading-lists": "Liste Lettura",
         "collections": "Collezioni",
         "close": "{{common.close}}",
-        "loading": "{{common.loading}}"
+        "loading": "{{common.loading}}",
+        "include-extras": "Includi Capitoli e File"
     },
     "nav-header": {
         "skip-alt": "Passa al contenuto principale",
@@ -1338,7 +1434,8 @@
         "announcements": "Annunci",
         "logout": "Disconnettersi",
         "all-filters": "Filtri Intelligenti",
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "nav-link-header": "Opzioni di Navigazione"
     },
     "promoted-icon": {
         "promoted": "{{common.promoted}}"
@@ -1380,7 +1477,9 @@
         "title": "MAL Importazione Stack Interessi",
         "description": "Importa i tuoi stack di interessi MAL e crea raccolte all'interno di Kavita",
         "series-count": "{{common.series-count}}",
-        "restack-count": "{{num}} Reimpilare"
+        "restack-count": "{{num}} Reimpilare",
+        "track": "Traccia",
+        "nothing-found": "Non ho trovato nulla"
     },
     "edit-chapter-progress": {
         "user-header": "Utente",
@@ -1395,7 +1494,7 @@
         "close": "{{common.close}}",
         "title": "Importa CBL",
         "import-description": "Per iniziare, importa un file .cbl. Kavita eseguirà più controlli prima dell'importazione. Alcuni passaggi bloccheranno l'avanzamento a causa di problemi con il file.",
-        "validate-description": "Tutti i file sono stati convalidati per vedere se ci sono operazioni da fare nell'elenco. Eventuali elenchi non riusciti non passeranno al passaggio successivo. Correggi i file CBL e riprova.",
+        "validate-description": "Tutti i file sono stati convalidati per vedere se ci sono operazioni da fare sulla lista. Tutte le liste che hanno fallito non passeranno alla fase successiva. Correggi i file CBL e riprova.",
         "validate-warning": "Ci sono problemi con il CBL che impediscono l'importazione. Correggi questi problemi e riprova.",
         "validate-no-issue-description": "Nessun problema riscontrato con CBL, premi Avanti.",
         "dry-run-description": "Questa è una prova e mostra cosa accadrà se premi Avanti ed esegui l'importazione. Tutti gli errori non verranno importati.",
@@ -1407,7 +1506,9 @@
         "validate-cbl-step": "Convalidare CBL",
         "dry-run-step": "Fai una prova",
         "final-import-step": "Passaggio Finale",
-        "comicvine-parsing-label": "Trova serie con ComicVine"
+        "comicvine-parsing-label": "Trova serie con ComicVine",
+        "help-label": "{{common.help}}",
+        "cbl-repo": "Puoi trovare molti elenchi di lettura nella community repo."
     },
     "pdf-reader": {
         "loading-message": "Caricamento... I PDF potrebbero richiedere più tempo del previsto",
@@ -1442,7 +1543,6 @@
     },
     "manga-reader": {
         "back": "Indietro",
-        "save-globally": "Salva Globalmente",
         "incognito-alt": "La modalità di navigazione in incognito è attiva. Attiva/disattiva per disattivare.",
         "incognito-title": "Modalità Incognito:",
         "shortcuts-menu-alt": "Scorciatoie da tastiera modale",
@@ -1475,14 +1575,15 @@
         "layout-mode-switched": "La modalità layout è passata a Singola a causa dello spazio insufficiente per eseguire il rendering del layout doppio",
         "no-next-chapter": "Nessun prossimo capitolo",
         "no-prev-chapter": "Nessun capitolo precedente",
-        "user-preferences-updated": "Preferenze utente aggiornate",
         "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}",
-        "series-progress": "Avanzamento della serie: {{percentage}}"
+        "series-progress": "Avanzamento della serie: {{percentage}}",
+        "off": "Spegni",
+        "width-override-label": "Sovrascrivi la Larghezza"
     },
     "metadata-filter": {
         "filter-title": "{{common.filter}}",
         "sort-by-label": "Ordina per",
-        "filter-name-label": "Nome del Filtro",
+        "filter-name-label": "Filtra per Nome",
         "ascending-alt": "Ascendente",
         "descending-alt": "Discendente",
         "reset": "{{common.reset}}",
@@ -1502,37 +1603,39 @@
         "inker-label": "Inchiostratore",
         "editor-label": "Editore",
         "colorist-label": "Colorista",
-        "character-label": "Carattere",
+        "character-label": "Personaggio",
         "translator-label": "Traduttore",
-        "read-progress-label": "Progresso Lettura",
+        "read-progress-label": "Progresso di Lettura",
         "unread": "Non letto",
-        "read": "Leggere",
-        "in-progress": "In corso",
+        "read": "Leggi",
+        "in-progress": "In Corso",
         "rating-label": "Valutazione",
         "age-rating-label": "{{metadata-fields.age-rating-title}}",
         "language-label": "{{metadata-fields.language-title}}",
-        "publication-status-label": "Stato Pubblicazione",
+        "publication-status-label": "Stato di Pubblicazione",
         "series-name-label": "Nome Serie",
-        "series-name-tooltip": "Il nome della serie verrà filtrato in base a Nome, Nome ordinamento o Nome localizzato",
-        "release-label": "Pubblicazione",
+        "series-name-tooltip": "Il nome della serie verrà filtrato in base a Nome, Ordinamento per Nome o Nome Localizzato",
+        "release-label": "Uscita",
         "min": "Min",
         "max": "Max"
     },
     "metadata-filter-row": {
         "unit-reading-date": "Data",
-        "unit-average-rating": "Valutazione Media (Kavita+) - solo per le serie memorizzate nella cache",
+        "unit-average-rating": "Valutazione esterna Kavita+, percentuale",
         "unit-reading-progress": "Percentuale",
-        "unit-user-rating": "{{metadata-filter-row.unit-reading-progress}}"
+        "unit-user-rating": "0.0 - 5.0 Stelle",
+        "unit-read-last": "Giorni da OGGI"
     },
     "sort-field-pipe": {
-        "sort-name": "Ordina Nome",
+        "sort-name": "Ordinamento per Nome",
         "created": "Creato",
         "last-modified": "Ultima modifica",
         "last-chapter-added": "Elemento aggiunto",
         "time-to-read": "Tempo di leggere",
-        "release-year": "Anno di pubblicazione",
+        "release-year": "Anno di Uscita",
         "read-progress": "Ultimo Letto",
-        "average-rating": "Valutazione Media"
+        "average-rating": "Valutazione Media",
+        "random": "Casuale"
     },
     "edit-series-modal": {
         "title": "{{seriesName}} Dettagli",
@@ -1565,7 +1668,7 @@
         "required-field": "{{validation.required-field}}",
         "close": "{{common.close}}",
         "name-label": "Nome",
-        "sort-name-label": "Ordina nome",
+        "sort-name-label": "Ordinamento per Nome",
         "localized-name-label": "Nome localizzato",
         "summary-label": "Sommario",
         "release-year-label": "{{sort-field-pipe.release-year}}",
@@ -1575,33 +1678,38 @@
         "save": "{{common.save}}",
         "field-locked-alt": "Il campo è bloccato",
         "info-title": "Informazioni",
-        "library-title": "Biblioteca:",
-        "format-title": "Formato:",
-        "created-title": "Creato:",
+        "library-title": "Libreria",
+        "format-title": "Formato",
+        "created-title": "Creato",
         "last-read-title": "{{sort-field-pipe.read-progress}}",
-        "last-added-title": "Ultimo elemento aggiunto:",
-        "last-scanned-title": "Ultima scansione:",
-        "folder-path-title": "Percorso Cartella:",
-        "publication-status-title": "Stato Pubblicazione:",
-        "total-pages-title": "Pagine Totali:",
-        "total-items-title": "Articoli totali:",
-        "max-items-title": "Articoli massimi:",
-        "size-title": "Dimensione:",
+        "last-added-title": "Ultimo Elemento Aggiunto",
+        "last-scanned-title": "Ultima Scansione",
+        "folder-path-title": "Percorso Cartella",
+        "publication-status-title": "Stato Pubblicazione",
+        "total-pages-title": "Pagine Totali",
+        "total-items-title": "Articoli Totali",
+        "max-items-title": "Articoli Massimi",
+        "size-title": "Dimensione",
         "loading": "{{common.loading}}",
-        "added-title": "Aggiunto:",
-        "last-modified-title": "Ultima modifica:",
+        "added-title": "Aggiunto",
+        "last-modified-title": "Ultima Modifica",
         "view-files": "Vedi files",
         "pages-title": "{{edit-chapter-modal.pages-label}}",
-        "chapter-title": "Capitolo:",
+        "chapter-title": "Capitolo",
         "volume-num": "{{common.volume-num}}",
         "highest-count-tooltip": "Conteggio più alto trovato in tutte le ComicInfo della serie",
         "max-issue-tooltip": "Campo numero massimo o volume da tutti i ComicInfo della serie",
         "force-refresh": "Forza Aggiornamento",
-        "force-refresh-tooltip": "Forza aggiornamento metadata esterni da Kavita+",
+        "force-refresh-tooltip": "Forza aggiornamento metadati esterni da Kavita+",
         "loose-leaf-volume": "Capitoli volanti",
         "specials-volume": "Speciali",
         "release-year-validation": "{{validation.year-validation}}",
-        "volumes-title": "{{tab.volumes-tab}}"
+        "volumes-title": "{{tab.volumes-tab}}",
+        "folder-path-tooltip": "Percorso più alto dalla root della libreria che contiene tutti i file di serie",
+        "lowest-folder-path-title": "Percoso più basso della Cartella",
+        "total-words-title": "Parole Totali",
+        "lowest-folder-path-tooltip": "Percorso più basso dalla root della libreria che contiene tutti i file della serie",
+        "words-title": "Parole"
     },
     "edit-chapter-modal": {
         "close": "{{common.close}}",
@@ -1638,7 +1746,23 @@
         "tags-tab": "{{tabs.tags-tab}}",
         "size-label": "{{edit-series-modal.size-title}}",
         "links-label": "{{metadata-fields.links-title}}",
-        "last-read-label": "{{sort-field-pipe.read-progress}}"
+        "last-read-label": "{{sort-field-pipe.read-progress}}",
+        "words-count": "{{num}} Parole",
+        "reading-time-label": "Tempo di Lettura",
+        "pages-count": "{{num}} Pagine",
+        "files-label": "File",
+        "pages-label": "Pagine",
+        "read-time-label": "Tempo di Lettura",
+        "title": "Modifica",
+        "release-date-label": "Uscita",
+        "sort-order-label": "Ordinamento",
+        "date-added-label": "Data Aggiunta",
+        "words-label": "Lunghezza",
+        "title-label": "Titolo",
+        "sort-order-tooltip": "L'ordine di lettura in cui questo capitolo è ordinato all'interno del volume",
+        "isbn-label": "ISBN",
+        "range-hours": "{{value}} {{hourWord}}",
+        "id-label": "ID"
     },
     "edit-volume-modal": {
         "close": "{{common.close}}",
@@ -1659,7 +1783,9 @@
         "last-read-label": "{{edit-chapter-modal.last-read-label}}",
         "read-time-label": "{{edit-chapter-modal.read-time-label}}",
         "files-label": "{{edit-chapter-modal.files-label}}",
-        "cover-image-description": "{{edit-series-modal.cover-image-description}}"
+        "cover-image-description": "{{edit-series-modal.cover-image-description}}",
+        "title": "Modifica",
+        "range-hours": "{{value}} {{hourWord}}"
     },
     "day-breakdown": {
         "title": "Ripartizione del giorno",
@@ -1670,10 +1796,10 @@
     "kavitaplus-metadata-breakdown-stats": {
         "title": "Problema Metadati Kavita+",
         "description": "Kavita recupera lentamente nel tempo i metadati (valutazioni, recensioni, consigli, ecc.) per le serie idonee.",
-        "no-data": "Dati Mancanti",
+        "no-data": "{{common.no-data}}",
         "errored-series-label": "Errore Serie",
         "completed-series-label": "Serie Completate",
-        "complete": "Metadata completi per tutte le serie"
+        "complete": "Metadati completi per tutte le serie"
     },
     "file-breakdown-stats": {
         "format-title": "Formato",
@@ -1685,7 +1811,9 @@
         "total-size-header": "Dimensione Totale",
         "total-files-header": "FIle Totali",
         "not-classified": "Non Classificato",
-        "total-file-size-title": "Dimensione totale del file:"
+        "total-file-size-title": "Dimensione totale del file:",
+        "download-file-for-extension-header": "Scarica Report",
+        "download-file-for-extension-alt": "Scarica i file di Report per {{extension}}"
     },
     "reading-activity": {
         "title": "Attività di Lettura",
@@ -1727,7 +1855,8 @@
         "provided-by-label": "Fornito da"
     },
     "next-expected-card": {
-        "title": "~{{date}}"
+        "title": "~{{date}}",
+        "upcoming-title": "Prossimamente"
     },
     "server-stats": {
         "total-series-label": "Serie Totali",
@@ -1739,15 +1868,15 @@
         "total-size-label": "Dimensione totale",
         "total-genres-label": "Generi Totali",
         "total-genres-tooltip": "Generi Totali: {{count}}",
-        "total-tags-label": "Tags Totali",
-        "total-tags-tooltip": "Tags Totali: {{count}}",
+        "total-tags-label": "Etichette Totali",
+        "total-tags-tooltip": "Etichette Totali: {{count}}",
         "total-people-label": "Persone Totali",
         "total-people-tooltip": "Persone Totali: {{count}}",
         "total-read-time-label": "Tempo di lettura totale",
         "total-read-time-tooltip": "Tempo di lettura totale: {{count}}",
         "series": "serie",
         "reads": "lettori",
-        "release-years-title": "Anni di rilascio",
+        "release-years-title": "Anni di Uscita",
         "most-active-users-title": "Utenti più attivi",
         "popular-libraries-title": "Biblioteche popolari",
         "popular-series-title": "Serie popolari",
@@ -1756,7 +1885,7 @@
         "volume-count": "{{num}} Volumi",
         "file-count": "{{num}} Files",
         "genre-count": "{{num}} Generi",
-        "tag-count": "{{num}} Tags",
+        "tag-count": "{{num}} Etichette",
         "people-count": "{{num}} Persone",
         "tags": "{{metadata-fields.tags-title}}",
         "people": "Persone",
@@ -1768,19 +1897,22 @@
         "unknown-crit": "Si è verificato un errore critico sconosciuto",
         "user-not-auth": "L'utente non è autenticato",
         "error-code": "{{num}} Errore",
-        "download": "Si è verificato un problema durante il download di questo file oppure non disponi delle autorizzazioni",
+        "download": "Si è verificato un problema durante il download di questo file oppure non hai l'autorizzazione",
         "not-found": "questo URL non esiste",
         "generic": "Qualcosa di inaspettato è andato storto",
-        "rejected-cover-upload": "Impossibile recuperare l'immagine a causa del rifiuto della richiesta da parte del server. Si prega di scaricare e caricare invece dal file.",
+        "rejected-cover-upload": "L'immagine non può essere recuperata tramite l'url. Scarica e carica invece dal file.",
         "invalid-confirmation-url": "URL di conferma non valido",
         "invalid-confirmation-email": "E-mail di conferma non valida",
-        "invalid-password-reset-url": "URL di reimpostazione della password non valido"
+        "invalid-password-reset-url": "URL di reimpostazione della password non valido",
+        "theme-manual-upload": "Si è verificato un problema durante la creazione del Tema tramite caricamento manuale",
+        "delete-theme-in-use": "Il Tema è attualmente utilizzato da almeno un utente, non è possibile eliminarlo",
+        "theme-already-in-use": "Il Tema esiste già con quel nome"
     },
     "metadata-builder": {
         "or": "Abbina uno dei seguenti elementi",
         "and": "Abbina tutto quanto segue",
         "add-rule": "Aggiungi regola",
-        "remove-rule": "Rimuovi riga"
+        "remove-rule": "Rimuovi Riga"
     },
     "customize-dashboard-modal": {
         "title-dashboard": "Personalizza la Dashboard",
@@ -1792,7 +1924,8 @@
         "sidenav": "Nav laterale",
         "external-sources": "Fonti esterne",
         "smart-filters": "Filtri Intelligenti",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "description": "Puoi personalizzare diversi aspetti di Kavita riordinandoli, modificandone la visibilità e associando filtri intelligenti/fonti esterne alla home page o alla navigazione laterale."
     },
     "customize-dashboard-streams": {
         "no-data": "Tutti i filtri Smart aggiunti a Dashboard o nessuno ancora creato.",
@@ -1810,7 +1943,7 @@
         "clear": "{{common.clear}}",
         "smart-filters-title": "Filtri Intelligenti",
         "external-sources-title": "{{customize-dashboard-modal.external-sources}}",
-        "reorder-when-filter-present": "You cannot reorder items via drag & drop while a filter is present. Use {{customize-sidenav-streams.order-numbers-label}}",
+        "reorder-when-filter-present": "Non è possibile riordinare gli elementi tramite trascinamento della selezione mentre è presente un filtro. Utilizzare {{customize-sidenav-streams.order-numbers-label}}",
         "order-numbers-label": "{{reading-list-detail.order-numbers-label}}",
         "bulk-mode-label": "Modalità Bulk"
     },
@@ -1826,7 +1959,8 @@
         "delete": "{{common.delete}}",
         "no-data": "Nessun filtro intelligente creato",
         "filter": "{{common.filter}}",
-        "clear": "{{common.clear}}"
+        "clear": "{{common.clear}}",
+        "errored": "C'è un errore di codifica nel filtro. Devi ricrearlo."
     },
     "edit-external-source-item": {
         "not-unique": "La fonte esterna esiste con questo host. Assicurarsi di non avere duplicati",
@@ -1850,14 +1984,15 @@
         "collections": "{{side-nav.collections}}",
         "reading-lists": "{{side-nav.reading-lists}}",
         "bookmarks": "{{side-nav.bookmarks}}",
-        "all-series": "{{side-nav.all-series}}"
+        "all-series": "{{side-nav.all-series}}",
+        "browse-authors": "{{side-nav.browse-authors}}"
     },
     "filter-field-pipe": {
         "age-rating": "{{metadata-fields.age-rating-title}}",
         "characters": "{{metadata-fields.characters-title}}",
-        "collection-tags": "Tag di raccolta",
+        "collection-tags": "Etichette delle Collezioni",
         "colorist": "Colorista",
-        "cover-artist": "{{person-role-pipe.cover-artist}}",
+        "cover-artist": "{{person-role-pipe.artist}}",
         "editor": "Editore",
         "formats": "Formati",
         "genres": "{{metadata-fields.genres-title}}",
@@ -1884,7 +2019,8 @@
         "file-path": "Percorso File",
         "want-to-read": "Da leggere",
         "read-date": "Data di lettura",
-        "average-rating": "Valutazione Media"
+        "average-rating": "Valutazione Media",
+        "read-last": "Leggi per ultimo"
     },
     "filter-comparison-pipe": {
         "begins-with": "Inizia con",
@@ -1902,7 +2038,8 @@
         "is-after": "È dopo",
         "is-in-last": "È ultimo",
         "is-not-in-last": "Non è l'ultimo",
-        "must-contains": "Deve Contenere"
+        "must-contains": "Deve Contenere",
+        "is-empty": "È vuoto"
     },
     "toasts": {
         "regen-cover": "È stato accodato un lavoro per rigenerare l'immagine di copertina",
@@ -1951,10 +2088,9 @@
         "email-sent": "Email inviata a {{email}}",
         "email-not-sent": "L'email in archivio non è un'email valida e non può essere inviata. Un collegamento è stato inserito nei log. L'amministratore può fornire questo collegamento per completare il flusso.",
         "k+-license-saved": "Chiave di licenza salvata, ma non è valida. Fare clic su Controlla per riconvalidare l'abbonamento. La prima registrazione potrebbe richiedere un minuto per propagarsi.",
-        "k+-unlocked": "Kavita+ sbloccato!",
         "k+-error": "Si è verificato un errore durante l'attivazione della licenza. Per favore riprova.",
-        "k+-delete-key": "Ciò eliminerà solo la chiave di licenza di Kavita e consentirà la visualizzazione di un collegamento per l'acquisto. Questo non annullerà il tuo abbonamento! Usalo solo se indicato dal supporto!",
-        "k+-reset-key": "Ciò scioglierà la tua chiave da un server e ti consentirà di registrare nuovamente un'istanza Kavita.",
+        "k+-delete-key": "Ciò eliminerà solo la chiave di licenza di Kavita e consentirà la visualizzazione di un collegamento per l'acquisto. Questo non annullerà il tuo abbonamento! Usalo solo se indicato dal supporto!",
+        "k+-reset-key": "Ciò invaliderà una precedente registrazione effettuata utilizzando la tua licenza e ti consentirà di registrare nuovamente un'istanza di Kavita.",
         "k+-reset-key-success": "La tua licenza è stata annullata. Utilizza il pulsante Modifica per registrare nuovamente la tua istanza e riattivare Kavita+",
         "library-deleted": "La libreria {{name}} è stata rimossa",
         "copied-to-clipboard": "Copiato negli appunti",
@@ -1983,7 +2119,7 @@
         "confirm-delete-series": "Sei sicuro di voler eliminare questa serie? Non modificherà i file sul disco.",
         "alert-bad-theme": "Nel tema sono presenti CSS non validi o non sicuri. Rivolgiti al tuo amministratore per correggere il problema. Per impostazione predefinita è utilizzato il tema scuro.",
         "confirm-library-delete": "Sei sicuro di voler eliminare la libreria {{name}}? Non puoi annullare questa azione.",
-        "confirm-library-type-change": "La modifica del tipo di libreria attiverà una nuova scansione con regole di analisi diverse e potrebbe portare alla ricreazione delle serie e quindi potresti perdere progressi e segnalibri. Dovresti eseguire il backup prima di farlo. Sei sicuro di voler continuare?",
+        "confirm-library-type-change": "Cambiare il tipo di libreria attiverà una nuova scansione con regole di analisi diverse e potrebbe portare alla ricreazione di serie e quindi potresti perdere progressi e segnalibri. Dovresti eseguire un backup prima di farlo. Vuoi continuare?",
         "confirm-download-size": "Il {{entityType}} è {{size}}. Sei sicuro di voler continuare?",
         "confirm-download-size-ios": "iOS ha problemi a scaricare file più grandi di 200MB, il download potrebbe non essere completo.",
         "list-doesnt-exist": "Questo elenco non esiste",
@@ -1995,11 +2131,34 @@
         "collection-tag-deleted": "Tag Collezione cancellato",
         "force-kavita+-refresh-success": "I metadati esterni di Kavita+ sono stati invalidati",
         "collection-not-owned": "Non sei il propritario di questa collezione",
-        "collections-promoted": "Collezione Promossa",
+        "collections-promoted": "Collezione promossa",
         "collections-unpromoted": "Collezione non-promossa",
         "confirm-delete-collections": "Sei sicuro di voler cancellare tutte le collezioni selezionate?",
         "collections-deleted": "Collezioni Eliminate",
-        "pdf-book-mode-screen-size": "Schermo troppo piccolo per la modalità Libro"
+        "pdf-book-mode-screen-size": "Schermo troppo piccolo per la modalità Libro",
+        "generate-colorscape-queued": "Genera colorscape in coda per {{name}}",
+        "confirm-delete-chapter": "Sei sicuro di voler eliminare questo capitolo? Non modificherà i file sul disco.",
+        "confirm-delete-volume": "Sei sicuro di voler eliminare questo volume? Non modificherà i file sul disco.",
+        "reading-lists-promoted": "Liste di Lettura promosse",
+        "bulk-delete-libraries": "Vuoi davvero eliminare {{count}} librerie?",
+        "match-success": "Le serie corrispondono correttamente",
+        "confirm-delete-multiple-chapters": "Sei sicuro di voler eliminare {{count}} chapter/volumes? Non modificherà i file sul disco.",
+        "webtoon-override": "Passaggio alla modalità Webtoon a causa di immagini che rappresentano un webtoon.",
+        "reading-list-unpromoted": "Lista di Lettura non promossa",
+        "reading-lists-unpromoted": "Liste di Lettura non promosse",
+        "confirm-reset-server-settings": "Questo ripristinerà le tue impostazioni ai valori della prima installazione. Vuoi continuare?",
+        "bulk-covers": "L'aggiornamento delle copertine su più librerie è intensivo e può richiedere molto tempo. Vuoi continuare?",
+        "person-image-downloaded": "La copertina personale è stata scaricata e applicata.",
+        "confirm-delete-reading-lists": "Vuoi davvero eliminare gli elenchi di lettura? Questa operazione non può essere annullata.",
+        "must-select-library": "È necessario selezionare almeno una libreria",
+        "bulk-scan": "La scansione di più librerie verrà eseguita in modo lineare. Ciò potrebbe richiedere molto tempo e non essere completato a seconda delle dimensioni della libreria.",
+        "chapter-deleted": "Capitolo Cancellato",
+        "volume-deleted": "Volume Cancellato",
+        "stack-imported": "Stack Importato",
+        "mal-token-required": "È richiesto il token MAL, impostalo nelle impostazioni utente",
+        "reading-list-promoted": "Lista di Lettura promossa",
+        "reading-lists-deleted": "Elenchi di lettura cancellati",
+        "confirm-delete-theme": "La rimozione di questo tema lo eliminerà dal disco. Puoi prenderlo dalla directory temporanea prima della rimozione"
     },
     "actionable": {
         "scan-library": "Scansione libreria",
@@ -2013,7 +2172,7 @@
         "add-to": "Aggiungi a",
         "add-to-want-to-read": "Aggiungi a Da Leggere",
         "remove-from-want-to-read": "Rimuovi da Da Leggere",
-        "remove-from-on-deck": "Rimuovi dal primo piano",
+        "remove-from-on-deck": "Rimuovi da Primo Piano",
         "others": "Altri",
         "add-to-reading-list": "Aggiungi alla lista di lettura",
         "add-to-collection": "Aggiungi alla Collezzione",
@@ -2031,7 +2190,42 @@
         "mark-visible": "Segna come Visibile",
         "mark-invisible": "Segna come Invisibile",
         "unpromote": "Non-Promuovere",
-        "promote": "Promuovi"
+        "promote": "Promuovi",
+        "add-to-want-to-read-tooltip": "Aggiungi serie a Da Leggere",
+        "settings-tooltip": "Visualizza impostazioni o dettagli",
+        "add-to-collection-tooltip": "Aggiungere serie a una raccolta",
+        "delete-tooltip": "Non c'è modo di annullare questa decisione",
+        "read-incognito-tooltip": "Leggi senza monitorare i progressi",
+        "import-cbl-tooltip": "Crea un elenco di lettura da un file CBL",
+        "import-mal-stack-tooltip": "Crea una raccolta intelligente dai tuoi stack di interessi MAL",
+        "copy-settings": "Copia impostazioni da",
+        "match-tooltip": "Abbina manualmente la serie con Kavita+",
+        "mark-invisible-tooltip": "TODO",
+        "promote-tooltip": "Rendi l'elemento visibile a tutti gli utenti",
+        "new-collection": "Nuova Collezione",
+        "download-tooltip": "Scarica sul dispositivo",
+        "mark-as-unread-tooltip": "Segna il progresso come non letto",
+        "edit-tooltip": "Modifica impostazioni o dettagli",
+        "match": "Abbina",
+        "scan-library-tooltip": "Esegui la scansione della libreria per le modifiche. Usa la scansione forzata per forzare il controllo di ogni cartella",
+        "generate-colorscape": "Genera ColorScape",
+        "details-tooltip": "TODO",
+        "view-series-tooltip": "TODO",
+        "mark-as-read-tooltip": "Segna il progresso come completamente letto",
+        "scan-series-tooltip": "Esegui la scansione della serie per eventuali modifiche",
+        "remove-from-want-to-read-tooltip": "Rimuovi le serie da Da Leggere",
+        "add-to-reading-list-tooltip": "Aggiungi a un elenco di lettura",
+        "multiple-selections": "Selezioni Multiple",
+        "back-to": "Torna a {{action}}",
+        "unpromote-tooltip": "Limita la visibilità solo al tuo account",
+        "generate-colorscape-tooltip": "Genera colorscapes e tutte le copertine mancanti",
+        "analyze-files-tooltip": "Analizza i file per tipo di estensione e dimensione",
+        "customize-tooltip": "TODO",
+        "title": "Azioni",
+        "refresh-covers-tooltip": "Rigenera tutte le copertine",
+        "clear-tooltip": "Rimuovi tutti i segnalibri per questa serie",
+        "mark-visible-tooltip": "TODO",
+        "remove-from-on-deck-tooltip": "Rimuovi la serie dalla visualizzazione da Primo Piano"
     },
     "preferences": {
         "left-to-right": "Da sinistra a destra",
@@ -2063,12 +2257,15 @@
         "pdf-odd": "Pagine Pari",
         "pdf-even": "Dispari",
         "pdf-light": "Chiaro",
-        "pdf-dark": "Scuro"
+        "pdf-dark": "Scuro",
+        "split-left-to-right": "Dividi da sinistra a destra",
+        "split-right-to-left": "Dividi da destra a sinistra"
     },
     "validation": {
         "required-field": "Il campo è richiesto",
         "valid-email": "Questa e-mail deve essere valida",
-        "password-validation": "La password deve avere una lunghezza compresa tra 6 e 32 caratteri"
+        "password-validation": "La password deve essere lunga tra 6 e 256 caratteri",
+        "year-validation": "Deve essere un anno valido maggiore di 1000 e lungo 4 caratteri"
     },
     "entity-type": {
         "volume": "volume",
@@ -2107,6 +2304,231 @@
         "issue-hash-num": "Numero #",
         "issue-num": "Numero",
         "chapter-num": "Capitolo",
-        "volume-num": "Volume"
+        "volume-num": "Volume",
+        "book-nums": "Libri",
+        "issue-num-shorthand": "#{{num}}",
+        "author-count": "{{num}} Autori",
+        "chapter-count": "{{num}} Capitoli",
+        "volume-nums": "Volumi",
+        "no-data": "Nessun Dato",
+        "issue-nums": "Numeri",
+        "chapter-nums": "Capitoli",
+        "chapter-num-shorthand": "Ch {{num}}",
+        "volume-num-shorthand": "Vol {{num}}",
+        "book-num-shorthand": "Libro {{num}}"
+    },
+    "manage-matched-metadata": {
+        "library-name-header": "Libreria",
+        "actions-header": "Azioni",
+        "dont-match-status-label": "{{dont-match-label}}",
+        "title": "Metadati Abbinati",
+        "description": "Tutte le Serie applicabili che possono essere abbinate con i Metadati Esterni si trovano qui. Kavita preleverà o aggiornerà i metadati delle serie, 50 serie ogni 24 ore al giorno.",
+        "status-header": "Stato",
+        "series-name-header": "Serie",
+        "valid-until-header": "Prossimo Aggiornamento",
+        "matched-status-label": "Abbinato",
+        "unmatched-status-label": "Non Abbinato",
+        "blacklist-status-label": "Richiede Abbinamento Manuale",
+        "all-status-label": "Tutti",
+        "no-data": "{{common.no-data}}",
+        "match-alt": "Abbina {{seriesName}}",
+        "dont-match-label": "Non Corrisponde"
+    },
+    "changelog-update-item": {
+        "fixed": "Corretto",
+        "developer": "Sviluppatore",
+        "theme": "Tema",
+        "removed": "Rimosso",
+        "api": "API",
+        "installed": "{{changelog.installed}}",
+        "download": "Scarica",
+        "changed": "Modificato",
+        "published-label": "Pubblicato: ",
+        "added": "Aggiunto",
+        "feature-requests": "Richieste di funzionalità",
+        "known-issues": "Problemi Noti"
+    },
+    "new-version-modal": {
+        "description": "È disponibile una nuova versione di Kavita. Aggiorna la pagina per applicarla.",
+        "added": "{{changelog.added}}",
+        "changed": "{{changelog.changed}}",
+        "theme": "{{changelog.theme}}",
+        "api": "{{changelog.api}}",
+        "close": "{{common.close}}",
+        "fixed": "{{changelog.fixed}}",
+        "removed": "{{changelog.removed}}",
+        "title": "Kavita è stato aggiornato!",
+        "developer": "{{changelog.developer}}",
+        "refresh": "Aggiorna",
+        "known-issues": "{{changelog.known-issues}}"
+    },
+    "manage-user-tokens": {
+        "description": "Gli utenti che dispongono di token di scrobbling potrebbero doverli rinnovare occasionalmente. Kavita invierà loro automaticamente un'email se il sistema di posta è configurato e se hanno un'email valida.",
+        "username-header": "Nome Utente",
+        "anilist-header": "AniList",
+        "token-set-label": "Token Impostato",
+        "no-data": "{{common.no-data}}",
+        "expires-label": "Scade: {{date}}",
+        "mal-header": "MAL"
+    },
+    "manage-metadata-settings": {
+        "enable-relations-tooltip": "Consenti di aggiungere le Associazioni tra Serie.",
+        "enable-people-label": "Persone",
+        "enable-tags-label": "Etichette",
+        "enable-genres-tooltip": "Consenti di inserire i Generi delle Serie.",
+        "tag": "Etichetta",
+        "remove-source-tag-label": "Rimuovi Etichetta di Origine",
+        "add-field-mapping-label": "Aggiungi Mappatura dei Campi",
+        "enable-cover-image-label": "Immagine di Copertina",
+        "enable-start-date-tooltip": "Consenti di scrivere la Data di Inizio della Serie",
+        "enable-start-date-label": "Data di Inizio",
+        "enable-genres-label": "Generi",
+        "enable-tags-tooltip": "Consenti di inserire le Etichette delle Serie.",
+        "blacklist-label": "Generi/Etichette in Blacklist",
+        "whitelist-label": "Etichette in Whitelist",
+        "whitelist-tooltip": "Consenti di scrivere solo una stringa in questa lista per le Etichette. Assicurati che siano separati da virgole.",
+        "age-rating-mapping-title": "Mappatura della Classificazione per Età",
+        "age-rating-mapping-description": "Qualsiasi stringa a sinistra, se trovata in Generi o Etichette, imposterà la Classificazione per Età della serie.",
+        "genre": "Genere",
+        "add-age-rating-mapping-label": "Aggiungi Mappatura della Classificazione per Età",
+        "field-mapping-title": "Mappatura dei Campi",
+        "description": "Kavita+ ha la capacità di scaricare e scrivere alcuni metadati limitati nel database. Questa pagina ti permette di selezionare quali dati includere.",
+        "enabled-label": "Abilita il Download dei Metadati",
+        "enabled-tooltip": "Consenti a Kavita di scaricare i metadati e scriverli nel suo database.",
+        "summary-label": "Sinossi",
+        "summary-tooltip": "Consenti la scrittura del riepilogo quando il campo è sbloccato.",
+        "localized-name-label": "Nome Localizzato della Serie",
+        "localized-name-tooltip": "Consenti a Kavita di scrivere il Nome Localizzato quando il campo è sbloccato. Kavita tenterà di fare la scelta migliore.",
+        "derive-publication-status-label": "Stato di Pubblicazione",
+        "derive-publication-status-tooltip": "Consenti che lo Stato di pubblicazione sia derivato dal conteggio totale dei capitoli/volumi.",
+        "blacklist-tooltip": "Qualsiasi elemento presente in questa lista verrà rimosso sia dall'elaborazione dei Generi che da quello delle Etichette. Questo è un luogo in cui aggiungere generi/etichette che non desideri vengano scritti. Assicurati che siano separati da virgole.",
+        "enable-relations-label": "Associazioni",
+        "enable-people-tooltip": "Consenti di aggiungere Persone (Personaggi, Scrittori, ecc.). Tutte le persone includono immagini.",
+        "enable-cover-image-tooltip": "Consenti a Kavita di scrivere l'immagine di copertina per la Serie",
+        "first-last-name-tooltip": "Assicurati che i nomi delle persone siano scritti prima con il Nome e poi con il Cognome",
+        "overrides-label": "Sostituzioni",
+        "person-roles-label": "Ruoli",
+        "field-mapping-description": "Imposta le regole per determinate stringhe trovate nel campo Genere/Tag e mappale a una nuova stringa in Genere/Tag e, facoltativamente, rimuovila dall'elenco Sorgente. Applicabile solo quando Genere/Tag sono abilitati per essere scritti.",
+        "overrides-description": "Consenti a Kavita di scrivere sui campi bloccati.",
+        "first-last-name-label": "Nome Cognome"
+    },
+    "person-detail": {
+        "all-roles": "Ruoli",
+        "known-for-title": "Conosciuto Per",
+        "anilist-url": "{{edit-person-modal.anilist-tooltip}}",
+        "individual-role-title": "Come {{role}}",
+        "browse-person-title": "Tutte le Opere di {{name}}",
+        "browse-person-by-role-title": "Tutte le Opere di {{name}} come {{role}}"
+    },
+    "tabs": {
+        "devices-tab": "Dispositivi",
+        "stats-tab": "Statistiche",
+        "specials-tab": "Speciali",
+        "related-tab": "Correlati",
+        "general-tab": "Generale",
+        "recommendations-tab": "Raccomandazioni",
+        "theme-tab": "Tema",
+        "details-tab": "Dettagli",
+        "reviews-tab": "Recensioni",
+        "series-tab": "Serie",
+        "preferences-tab": "Preferenze",
+        "smart-filters-tab": "Filtri Intelligenti",
+        "tasks-tab": "Tasks",
+        "progress-tab": "Progressi",
+        "storyline-tab": "Trama",
+        "volumes-tab": "Volumi",
+        "cover-tab": "Immagine di Copertina",
+        "advanced-tab": "Avanzate",
+        "weblink-tab": "Collegamenti Web",
+        "people-tab": "Persone",
+        "books-tab": "Libri",
+        "folder-tab": "Cartella",
+        "scrobbling-tab": "Scrobbling",
+        "account-tab": "Account",
+        "tags-tab": "Etichette",
+        "info-tab": "Info",
+        "metadata-tab": "Metadati"
+    },
+    "edit-person-modal": {
+        "title": "{{personName}} Dettagli",
+        "general-tab": "{{edit-series-modal.general-tab}}",
+        "loading": "{{common.loading}}",
+        "description-label": "Descrizione",
+        "download-coversdb": "Scarica da CoversDB",
+        "cover-image-description-extra": "In alternativa, se disponibile, è possibile scaricare una copertina da CoversDB.",
+        "close": "{{common.close}}",
+        "mal-tooltip": "https://myanimelist.net/people/{MalId}/",
+        "anilist-id-label": "AniList Id",
+        "required-field": "{{validations.required-field}}",
+        "save": "{{common.save}}",
+        "cover-image-tab": "{{edit-series-modal.cover-image-tab}}",
+        "hardcover-id-label": "Id Copertina Rigida",
+        "anilist-tooltip": "https://anilist.co/staff/{AniListId}/",
+        "asin-label": "ASIN",
+        "name-label": "{{edit-series-modal.name-label}}",
+        "role-label": "Ruolo",
+        "mal-id-label": "MAL Id",
+        "hardcover-tooltip": "https://hardcover.app/authors/{HardcoverId}",
+        "asin-tooltip": "https://www.amazon.com/stores/J.K.-Rowling/author/{ASIN}",
+        "cover-image-description": "{{edit-series-modal.cover-image-description}}"
+    },
+    "metadata-setting-field-pipe": {
+        "tags": "{{metadata-fields.tags-title}}",
+        "people": "{{tabs.people-tab}}",
+        "summary": "{{filter-field-pipe.summary}}",
+        "age-rating": "{{metadata-fields.age-rating-title}}",
+        "covers": "Copertine",
+        "publication-status": "{{edit-series-modal.publication-status-title}}",
+        "start-date": "{{manage-metadata-settings.enable-start-date-label}}",
+        "genres": "{{metadata-fields.genres-title}}",
+        "localized-name": "{{edit-series-modal.localized-name-label}}"
+    },
+    "confirm": {
+        "alert": "Avviso",
+        "confirm": "Conferma",
+        "info": "Info",
+        "cancel": "{{common.cancel}}",
+        "ok": "Ok"
+    },
+    "read-time-pipe": {
+        "less-than-hour": "<1 Ora",
+        "hour": "Ora",
+        "hours": "Ore"
+    },
+    "browse-themes-modal": {
+        "title": "Sfoglia Temi"
+    },
+    "email-history": {
+        "sent-tooltip": "Inviato",
+        "date-header": "Data di Invio",
+        "description": "Qui puoi trovare tutte le email inviate da Kavita e a quale utente.",
+        "template-header": "Modello",
+        "sent-header": "Riuscito",
+        "not-sent-tooltip": "Non Inviato",
+        "user-header": "Spedito A",
+        "no-data": "{{common.no-data}}"
+    },
+    "match-series-modal": {
+        "dont-match-tooltip": "Scegli questa serie da abbinare e scrobbling",
+        "save": "{{common.save}}",
+        "description": "Seleziona una corrispondenza per ricollegare i metadati di Kavita+ e rigenerare gli eventi di scrobbling. Non Abbinare può essere utilizzato per impedire a Kavita di abbinare i metadati e di effettuare lo scrobbling.",
+        "search": "Cerca",
+        "close": "{{common.close}}",
+        "title": "Abbina {{seriesName}}",
+        "dont-match-label": "Non Abbinare",
+        "no-results": "mpossibile trovare una corrispondenza. Prova ad aggiungere l'URL da un provider supportato e riprova.",
+        "query-label": "Domanda",
+        "query-tooltip": "Inserisci il nome della serie, l'URL di AniList/MyAnimeList. Gli URL utilizzeranno una ricerca diretta."
+    },
+    "match-series-result-item": {
+        "chapter-count": "{{common.chapter-count}}",
+        "volume-count": "{{server-stats.volume-count}}",
+        "details": "Visualizza la pagina",
+        "releasing": "Rilasciando",
+        "updating-metadata-status": "Aggiornamento Metadati"
+    },
+    "download-button": {
+        "downloading-status": "Scaricamento…",
+        "download-tooltip": "Scarica"
     }
 }
diff --git a/UI/Web/src/assets/langs/ja.json b/UI/Web/src/assets/langs/ja.json
index 099644055..5e8196f91 100644
--- a/UI/Web/src/assets/langs/ja.json
+++ b/UI/Web/src/assets/langs/ja.json
@@ -22,11 +22,11 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "saving": "保存中…",
         "update": "更新",
-        "account-detail-title": "口座の詳細"
+        "account-detail-title": "アカウントの詳細",
+        "invalid-email-warning": "無効なメールアドレスによりKavitaの一部の機能がブロックされます"
     },
     "user-scrobble-history": {
         "title": "Scrobble 履歴",
@@ -39,7 +39,7 @@
         "series-header": "シリーズ",
         "data-header": "データ",
         "is-processed-header": "処理済み",
-        "no-data": "データなし",
+        "no-data": "{{common.no-data}}",
         "volume-and-chapter-num": "第{{v}}巻 第 {{n}}章",
         "volume-num": "第{{num}}巻",
         "chapter-num": "第{{num}}章",
@@ -47,7 +47,9 @@
         "not-applicable": "該当なし",
         "processed": "処理済み",
         "not-processed": "未処理",
-        "special": "{{entity-title.special}}"
+        "special": "{{entity-title.special}}",
+        "scrobbling-disabled": "Scrobbleはアカウント設定で無効になっています。",
+        "token-expired": "あなたのAniListトークンは期限切れだ！アカウントページで更新するまで、イベントのスコーブリングは処理されない。"
     },
     "scrobble-event-type-pipe": {
         "chapter-read": "読書の進捗状況",
@@ -59,15 +61,6 @@
     "spoiler": {
         "click-to-show": "クリックするとネタバレが表示されます"
     },
-    "review-series-modal": {
-        "title": "レビューを編集する",
-        "review-label": "レビュー",
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "min-length": "レビューは最低 {{count}}文字以上である必要があります｡",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}",
         "user-review": "{{username}}さんのレビュー",
@@ -88,7 +81,7 @@
     },
     "user-preferences": {
         "title": "ユーザーダッシュボード",
-        "pref-description": "これらのグローバル設定はあなたのアカウントに紐つけられます｡",
+        "pref-description": "これらのグローバル設定はあなたのアカウントに紐つけられます。",
         "account-tab": "{{tabs.account-tab}}",
         "preferences-tab": "{{tabs.preferences-tab}}",
         "theme-tab": "{{tabs.theme-tab}}",
@@ -112,72 +105,25 @@
         "collapse-series-relationships-tooltip": "Kavita上で関連するシリーズを表示する",
         "share-series-reviews-label": "レビューを共有する",
         "share-series-reviews-tooltip": "Kavitaはレビューを他のユーザーに共有する",
-        "image-reader-settings-title": "画像リーダー",
-        "reading-direction-label": "綴じ方向",
-        "reading-direction-tooltip": "次のページに進む場合のクリック場所。右から左にめくる場合は左端をクリックする。",
-        "scaling-option-label": "スケーリング設定",
-        "scaling-option-tooltip": "画像の表示を画面に合わせる方法｡",
-        "page-splitting-label": "ページ分割",
-        "page-splitting-tooltip": "分割されたページを見開きとして表示する",
-        "reading-mode-label": "読書モード",
-        "reading-mode-tooltip": "リーダーを垂直に、水平方向に、または無限スクロールを持つように変更",
-        "layout-mode-label": "レイアウトモード",
-        "layout-mode-tooltip": "画面に単一の画像をレンダリングするか、横に並べた2つの画像をレンダリングします。",
-        "background-color-label": "背景色",
-        "background-color-tooltip": "画像リーダーの背景色",
-        "auto-close-menu-label": "オートクローズメニュー",
-        "auto-close-menu-tooltip": "メニュー自動閉鎖",
-        "show-screen-hints-label": "画面ヒントを表示する",
-        "show-screen-hints-tooltip": "パジネーションエリアと方向を理解するためのオーバーレイを表示",
-        "emulate-comic-book-label": "コミックのエミュレート",
-        "emulate-comic-book-tooltip": "書籍から読書をエミュレートする影効果を適用",
-        "swipe-to-paginate-label": "スワイプでめくる",
-        "swipe-to-paginate-tooltip": "画面上にスワイプすると、次のページまたは前のページがトリガーされるようになります",
-        "book-reader-settings-title": "ブックリーダー",
-        "tap-to-paginate-label": "タップしてめくる",
-        "tap-to-paginate-tooltip": "画面の端をタップして前/次のページに移動できるようにする",
-        "immersive-mode-label": "没入モード",
-        "immersive-mode-tooltip": "リーダードキュメント上のクリックでメニューを非表示にし､タップでページ送りが有効になります。",
-        "reading-direction-book-label": "読書方向",
-        "reading-direction-book-tooltip": "次のページに移動するにはどちらをクリックしますか？右から左の場合は、次のページに移動するために画面の左側をクリックします。",
-        "font-family-label": "フォントファミリー",
-        "font-family-tooltip": "フォントファミリーを読み込みます。デフォルトでは、本のデフォルトのフォントが読み込まれます。",
-        "writing-style-label": "ライティングスタイル",
-        "writing-style-tooltip": "縦書き､横書きを切り替えます｡水平は左から右、垂直は上から下です。",
-        "layout-mode-book-label": "レイアウトモード",
-        "layout-mode-book-tooltip": "コンテンツの表示方法を選択します。\"Scroll\"は本のままスクロール表示されます。\"1 or 2 Column\"はデバイスの高さに合わせ、1ページに1または2列のテキストが収まります。",
-        "color-theme-book-label": "カラー テーマ:",
-        "color-theme-book-tooltip": "ブックリーダーのコンテンツとメニューに適用するカラーテーマ",
-        "font-size-book-label": "文字サイズ",
-        "font-size-book-tooltip": "本のフォントに適用するスケーリングの割合",
-        "line-height-book-label": "行間隔",
-        "line-height-book-tooltip": "書籍の行間の間隔",
-        "margin-book-label": "余白",
-        "margin-book-tooltip": "画面の各側面にどれだけの余白を設定しますか？この設定に関わらず、モバイルデバイスでは余白は0になります。",
-        "pdf-reader-settings-title": "PDFリーダー",
-        "pdf-scroll-mode-label": "スクロールモード",
-        "pdf-scroll-mode-tooltip": "ページをスクロールする方法 縦/横/タップでパギン(スクロールなし)",
-        "pdf-spread-mode-label": "見開き設定",
-        "pdf-spread-mode-tooltip": "ページのレイアウト。単一または見開き (奇数・偶数)",
-        "pdf-theme-label": "テーマ",
-        "pdf-theme-tooltip": "読者の色テーマ",
         "clients-opds-alert": "このサーバではOPDSが有効になっていません。 立ち読みユーザーには影響しません.",
-        "clients-opds-description": "外部クライアントを使用する場合は以下のAPIもしくは接続用URLを使用してください｡これはパスワードのように機能するのでプライバシーを保持してください｡",
+        "clients-opds-description": "外部クライアントを使用する場合は以下のAPIもしくは接続用URLを使用してください｡これはパスワードのようなものであるため、公開しないでください。",
         "clients-api-key-tooltip": "API キーはパスワードのようになります。 リセットすると、既存のクライアントが無効になります.",
         "clients-opds-url-label": "OPDS URL",
         "clients-api-key-label": "APIキー",
         "clients-opds-url-tooltip": "サポートされている OPDS クライアントのリストを参照してください ",
         "reset": "{{common.reset}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "kavitaplus-settings-title": "Kavita+",
+        "anilist-scrobbling-label": "AniListへのスコア登録"
     },
     "user-holds": {
         "title": "Scrobble Holds",
-        "description": "これはユーザーが管理するシリーズのリストで、上流の Scrobble プロバイダに同期されません。シリーズをいつでも削除でき、次の Scrobble イベント（読書進捗、評価、読みたいステータス）が発生するとイベントがトリガーされます。",
+        "description": "これはユーザーが管理するシリーズのリストで、上流の Scrobble プロバイダに同期されません。シリーズをいつでも削除でき、次の Scrobble イベント（読書進捗、評価、読みたいステータス）が発生すると Scrobble がトリガーされます。",
         "no-data": "{{typeahead.no-data}}"
     },
     "theme-manager": {
         "title": "テーママネージャー",
-        "description": "カビタは私の色で来て、あなたのニーズを満たしているカラースキームを見つけるか、自分自身を構築し、それを共有します。 テーマは、アカウントに適用されるか、すべてのアカウントに適用される場合があります.",
+        "description": "Kavitaにはマイカラー機能があります。あなたのニーズに合った配色を見つけるか、自分で作ってシェアしましょう。テーマはあなたのアカウントに適用することも、すべてのアカウントに適用することもできます。",
         "site-themes": "サイトのテーマ",
         "set-default": "デフォルトに戻す",
         "default-theme": "デフォルト",
@@ -211,7 +157,7 @@
         "age-rating-label": "{{metadata-fields.age-rating-title}}",
         "no-restriction": "無制限",
         "include-unknowns-label": "不明を含む",
-        "include-unknowns-tooltip": "Trueの場合、コンテンツが年齢制限付きのものであっても全て許可されます｡これによりタグ付けされていないメディアが対象年齢以下のユーザーに閲覧されます｡"
+        "include-unknowns-tooltip": "Trueの場合、コンテンツが年齢制限付きのものであっても全て許可されます｡これによりタグ付けされていないメディアが対象年齢以下のユーザーに閲覧されます。"
     },
     "site-theme-provider-pipe": {
         "system": "システム",
@@ -219,7 +165,7 @@
     },
     "manage-devices": {
         "title": "デバイスマネージャ",
-        "description": "このセクションは、ウェブブラウザでKavitaに接続できないデバイスを設定するためのものです。",
+        "description": "このセクションは、ウェブブラウザでKavitaに接続できず、代わりにファイルを受信するメールアドレスを持つデバイスを設定するためのものです。",
         "devices-title": "デバイス",
         "no-devices": "セットアップされたデバイスがありません",
         "platform-label": "プラットフォーム",
@@ -237,7 +183,7 @@
         "device-name-label": "{{manage-devices.name-label}}",
         "platform-label": "{{manage-devices.platform-label}}",
         "email-label": "{{common.email}}",
-        "email-tooltip": "このメールアドレスは送信先でファイルを受信するために使用されます。",
+        "email-tooltip": "このメールアドレスは送信先でファイルを受信するために使用されます",
         "device-platform-label": "デバイスプラットフォーム",
         "save": "{{common.save}}",
         "close": "{{common.close}}",
@@ -256,7 +202,7 @@
         "save": "{{common.save}}",
         "required-field": "{{validation.required-field}}",
         "passwords-must-match": "パスワードが一致する必要があります",
-        "permission-error": "あなたはパスワードを変更する権限を持っていません｡サーバーの管理者に連絡してください｡"
+        "permission-error": "あなたはパスワードを変更する権限を持っていません｡サーバーの管理者に連絡してください。"
     },
     "change-email": {
         "email-title": "メール",
@@ -288,9 +234,9 @@
     },
     "api-key": {
         "copy": "コピー",
-        "show": "Show",
+        "show": "表示",
         "hide": "隠す",
-        "regen-warning": "APIキーを再生成すると既存のクライアントは無効になります｡",
+        "regen-warning": "APIキーを再生成すると既存のクライアントは無効になります。",
         "no-key": "ERROR - キーが設定されていません",
         "confirm-reset": "これによりセットアップされたOPDS構成が無効になります｡続行しますか？",
         "key-reset": "API Keyをリセットする"
@@ -304,7 +250,7 @@
         "token-set": "トークンを設定",
         "generate": "生成",
         "generic-instructions": "Kavita+ がそれらと相互作用することを可能にする必要があるさまざまな外部サービスに関する情報を記入します.",
-        "instructions": "First time users should click on \"{{scrobbling-providers.generate}}\" below to allow Kavita+ to talk with {{service}}. Once you authorize the program, copy and paste the token in the input below. You can regenerate your token at any time.",
+        "instructions": "初めてご利用になる方は、以下の「{{scrobbling-providers.generate}}」をクリックして、Kavita+と{{service}}との通信を許可してください。許可したら、トークンをコピーして下の入力欄に貼り付けてください。トークンはいつでも再生成することができます。",
         "mal-instructions": "カビタは、認証のためにMALクライアントIDを使用しています。 Kavita の新しいクライアントを作成し、承認されると、クライアント ID とユーザー名を入力します.",
         "scrobbling-applicable-label": "有効な振動",
         "token-input-label": "{{service}} 関連するトークンをここに挿入",
@@ -320,7 +266,7 @@
         "close": "{{common.close}}",
         "loading": "{{common.loading}}",
         "add-item": "{{item}}を追加…",
-        "no-data": "データなし",
+        "no-data": "{{common.no-data}}",
         "add-custom-item": ", カスタム項目を追加するタイプ"
     },
     "generic-list-modal": {
@@ -388,7 +334,7 @@
         "reset": "{{common.reset}}",
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
-        "no-data": "まだ設定されたライブラリがありません｡"
+        "no-data": "まだ設定されたライブラリがありません。"
     },
     "time-periods": {
         "this-week": "今週",
@@ -497,9 +443,9 @@
     },
     "library-type-pipe": {
         "book": "本",
-        "comic": "アメコミ",
+        "comic": "アメコミ (レガシー)",
         "manga": "マンガ",
-        "comicVine": "Comic Vine",
+        "comicVine": "アメコミ",
         "image": "画像",
         "lightNovel": "ライトノベル"
     },
@@ -561,10 +507,7 @@
         "installed": "インストール済",
         "download": "ダウンロード",
         "nightly": "ナイトリー: {{バージョン}}",
-        "published-label": "出版: ",
-        "available": "利用可能",
-        "description": "{{installed}}が表示されない場合",
-        "description-continued": "タグは、毎晩リリースされます。 メジャーバージョンのみが公開されます。 夜間のタグは、その安定から夜間に表示されます."
+        "available": "利用可能"
     },
     "invite-user": {
         "title": "ユーザーを招待",
@@ -587,7 +530,7 @@
         "title": "ライブラリ",
         "select-all": "{{common.select-all}}",
         "deselect-all": "{{common.deselect-all}}",
-        "no-data": "まだライブラリが設定されていません｡"
+        "no-data": "まだライブラリが設定されていません。"
     },
     "license": {
         "title": "Kavita+ ライセンス",
@@ -610,14 +553,15 @@
         "activate-discordId-tooltip": "DiscordアカウントをKavita+にリンクしてください。これにより、Kavitaを形成するための非公開のチャンネルへのアクセスが得られます。",
         "discord-validation": "これは有効なDiscordユーザーIDではありません。 ユーザ ID は、あなたのユーザ名ではありません.",
         "activate-delete": "{{common.delete}}",
-        "activate-reset": "{{common.reset}}",
+        "activate-reset": "ライセンスをリセット",
         "activate-reset-tooltip": "ライセンスを使用して、以前の登録を無効化します。 ライセンスとメールの両方が必要です",
         "activate-save": "{{common.save}}",
         "kavita+-desc-part-1": "Kavita+ は、この Kavita インスタンスのすべてのユーザーのための機能のロックを解除するプレミアムサブスクリプションサービスです。 サブスクリプションを購入してロック解除 ",
         "kavita+-desc-part-2": "プレミアム特典",
         "kavita+-desc-part-3": "今日は!",
-        "kavita+-requirement": "Kavita+ は、最新リリース (2 つのバージョン) でのみ動作するように設計されています。それ以外のものは動作しない可能性があります。",
-        "kavita+-releases": "リリースを参照"
+        "kavita+-requirement": "Kavita+ は、最新の3つのリリースでのみ動作するように設計されています。それ以外のものは動作しない可能性があります。",
+        "help-label": "{{common.help}}",
+        "info-title": "ライセンス情報"
     },
     "book-line-overlay": {
         "copy": "コピー",
@@ -646,7 +590,7 @@
         "loading-book": "本を読込中.…",
         "go-back": "戻る",
         "close-reader": "リーダーを閉じる",
-        "incognito-mode-alt": "シークレットモードがオンです｡切り替えるとオフになります｡",
+        "incognito-mode-alt": "シークレットモードがオンです｡切り替えるとオフになります。",
         "incognito-mode-label": "シークレットモード",
         "next": "次",
         "previous": "前回",
@@ -670,9 +614,9 @@
         "error-label": "エラー:"
     },
     "confirm-email-change": {
-        "title": "メールアドレスが変更されたので認証してください。",
-        "non-confirm-description": "メールの更新が認証されるまでお待ちください｡",
-        "confirm-description": "お客様のEメールが認証され、Kavita内で変更されました。ログインにリダイレクトされます。",
+        "title": "メールアドレス変更の検証",
+        "non-confirm-description": "メールの更新が認証されるまでお待ちください。",
+        "confirm-description": "あなたのEメールが認証され、Kavita内で変更されました。ログインにリダイレクトされます。",
         "success": "成功しました!"
     },
     "confirm-reset-password": {
@@ -685,7 +629,7 @@
     },
     "register": {
         "title": "登録",
-        "description": "管理者アカウントを登録するには、フォームに必要事項を入力してください。",
+        "description": "管理者アカウントを登録するには、フォームに必要事項を入力してください",
         "username-label": "{{common.username}}",
         "email-label": "{{common.email}}",
         "email-tooltip": "Eメールは実際のアドレスではなく、パスワードを忘れたアクセスを提供します。 カビタのメールがなければ、サーバーの外に送られません.",
@@ -720,12 +664,10 @@
         "details-tab": "{{tabs.details-tab}}",
         "info-tab": "{{tabs.info-tab}}",
         "recommendations-tab": "{{tabs.recommendations-tab}}",
-        "send-to": "{{deviceName}}にファイルがメールで送信されました。",
+        "send-to": "{{deviceName}}にファイルがメールで送信されました",
         "no-pages": "{{toasts.no-pages}}",
         "no-chapters": "この巻にはチャプターが存在しません。読むことはできません。",
         "cover-change": "ブラウザが画像をリフレッシュするまで最大1分かかる場合があります。その間、一部のページでは古い画像が表示される可能性があります。",
-        "user-reviews-local": "ローカルレビュー",
-        "user-reviews-plus": "外部レビュー",
         "writers-title": "{{metadata-fields.writers-title}}",
         "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
         "characters-title": "{{metadata-fields.characters-title}}",
@@ -757,7 +699,10 @@
     },
     "metadata-fields": {
         "collections-title": "{{side-nav.collections}}",
-        "reading-lists-title": "{{side-nav.reading-lists}}"
+        "reading-lists-title": "{{side-nav.reading-lists}}",
+        "writers-title": "筆者",
+        "genres-title": "ジャンル",
+        "tags-title": "タグ"
     },
     "external-rating": {
         "close": "{{common.close}}"
@@ -809,7 +754,7 @@
         "library-name-unique": "ライブラリ名はユニークでなければなりません｡",
         "last-scanned-label": "最後のスキャン:",
         "type-label": "タイプ",
-        "type-tooltip": "ライブラリの種類によって、ファイル名の解析方法やUIがチャプター（マンガ）とイシュー（コミック）を表示するかどうかが決まります。ブックはマンガと同じ方法で動作しますが、UIの表示が異なります。",
+        "type-tooltip": "ライブラリの種類によって、ファイル名の解析方法やUIがチャプター（マンガ）とイシュー（コミック）を表示するかどうかが決まります。ライブラリタイプの違いの詳細についてはwikiを参照してください。",
         "kavitaplus-eligible-label": "Kavita+ Eligible",
         "kavitaplus-eligible-tooltip": "Kavita+ は情報を取得するか、Scrobbling をサポートしますか",
         "folder-description": "ライブラリにフォルダーを追加する",
@@ -818,12 +763,12 @@
         "help-us-part-2": "私達のガイド",
         "help-us-part-3": "メディアのネーミングと整理に.",
         "naming-conventions-part-1": "Kavitaは持っています ",
-        "naming-conventions-part-2": "フォルダーの要件",
+        "naming-conventions-part-2": "フォルダーの要件。",
         "naming-conventions-part-3": "このリンクを確認して、フォローしていることを確認してください。そうでない場合、スキャンでファイルが表示されないかもしれません。",
         "cover-description": "カスタムライブラリイメージアイコンはオプションです",
         "cover-description-extra": "ライブラリの画像は大きくない方が良いです。小さなファイルを目指し、サイズは32x32ピクセルにしてください。Kavitaはサイズに関する検証を行いません。",
         "manage-collection-label": "コレクションの管理",
-        "manage-collection-tooltip": "ComicInfo.xml/opfファイル内で見つけたシリーズグループタグからコレクションを作成します。",
+        "manage-collection-tooltip": "ComicInfo.xml/opfファイル内で見つけたシリーズグループタグからコレクションを作成します",
         "manage-reading-list-label": "読書リストの管理",
         "manage-reading-list-tooltip": "ComicInfo.xml/opfファイル内のStoryArc/StoryArcNumberおよびAlternativeSeries/AlternativeCountタグからReading Listsを自動的に作成",
         "allow-scrobbling-label": "Scrobblingを許可する",
@@ -873,7 +818,7 @@
         "on": "オン",
         "off": "オフ",
         "immersive-mode-label": "{{user-preferences.immersive-mode-label}}",
-        "immersive-mode-tooltip": "これにより、リーダードキュメント上のクリックでメニューが非表示になり、タップでページ送りが有効になります。",
+        "immersive-mode-tooltip": "これにより、リーダードキュメント上のクリックでメニューが非表示になり、タップでページ送りが有効になります",
         "fullscreen-label": "フルスクリーン",
         "fullscreen-tooltip": "フルスクリーンモード",
         "exit": "終了",
@@ -886,7 +831,8 @@
         "theme-dark": "ダーク",
         "theme-black": "ブラック",
         "theme-white": "白",
-        "theme-paper": "紙"
+        "theme-paper": "紙",
+        "enter": "Enter"
     },
     "table-of-contents": {
         "no-data": "この本は、目次がメタデータまたはTOCファイルに設定されていません"
@@ -897,7 +843,7 @@
         "no-data": "ブックマークはありません。 作成しましょう｡",
         "no-data-2": "1",
         "confirm-delete": "複数のシリーズのすべてのブックマークをクリアしたいですか? これは元に戻すことができません.",
-        "confirm-single-delete": "{{seriesName}}を消去しますか？ これはもとに戻すことはできません｡",
+        "confirm-single-delete": "{{seriesName}}を消去しますか？ これはもとに戻すことはできません。",
         "delete-success": "ブックマークが削除されました",
         "delete-single-success": "{{seriesName}}はすでに削除されました"
     },
@@ -936,7 +882,8 @@
     "related-tab": {
         "reading-lists-title": "{{reading-lists.title}}",
         "collections-title": "{{side-nav.collections}}",
-        "relations-title": "{{tabs.related-tab}}"
+        "relations-title": "{{tabs.related-tab}}",
+        "bookmarks-title": "{{side-nav.bookmarks}}"
     },
     "cover-image-chooser": {
         "enter-an-url-pre-title": "{{url}}の入力",
@@ -989,7 +936,7 @@
         "filter-label": "{{common.filter}}"
     },
     "manage-email-settings": {
-        "description": "Kavitaの「パスワードを忘れた場合」や「デバイスに送信」などの一部の機能を使用するには、メールプロバイダを設定する必要があります。メールの設定がない場合、パスワードの変更などの他の機能はセキュリティが低くなります",
+        "description": "Kavitaの「デバイスに送信」などの一部の機能を使用するには、メールプロバイダを設定する必要があります。「パスワードを忘れた場合」など他の機能については、メールの設定ではなく管理者の介入が必要です。",
         "setting-description": "Kavitaでメール機能を利用するにはホスト名とSMTPの両方の設定が必要です。",
         "send-to-warning": "デバイスへ送信する場合は、メールの設定を行う必要があります",
         "email-url-label": "メールサービスURL",
@@ -998,7 +945,7 @@
         "reset": "{{common.reset}}",
         "test": "テスト",
         "host-name-label": "ホスト名",
-        "host-name-tooltip": "リバースプロキシのドメイン名が設定されている場合、メール生成は常にこれを使用します。",
+        "host-name-tooltip": "(リバースプロキシの)ドメイン名。メールが動作するのに必要です。リバースプロキシを使用していない場合、任意のURLを使用できます。",
         "host-name-validation": "ホスト名はhttp(s)で始まり、/で終わっていてはいけません",
         "sender-address-label": "送信者のアドレス",
         "sender-address-tooltip": "これは、受信者がメールを受け取るときに見る送信者のメールアドレスです。通常、アカウントに関連付けられたメールアドレスです。",
@@ -1023,11 +970,11 @@
     "manage-library": {
         "title": "ライブラリ",
         "add-library": "ライブラリを追加",
-        "no-data": "ライブラリはありません。作成しましょう｡",
+        "no-data": "ライブラリがありません。作成しましょう。",
         "loading": "{{common.loading}}",
-        "last-scanned-title": "最後のスキャン:",
-        "shared-folders-title": "共有フォルダー:",
-        "type-title": "タイプ:",
+        "last-scanned-title": "最後のスキャン",
+        "shared-folders-title": "フォルダ",
+        "type-title": "タイプ",
         "scan-library": "ライブラリのスキャン",
         "delete-library": "ライブラリを削除する",
         "delete-library-by-name": "{{name}}を削除",
@@ -1038,7 +985,8 @@
         "deselect-all": "{{common.deselect-all}}",
         "select-all": "{{common.select-all}}",
         "cancel": "{{common.cancel}}",
-        "apply": "{{common.apply}}"
+        "apply": "{{common.apply}}",
+        "folder-count": "{{num}}個のフォルダ"
     },
     "copy-settings-from-library-modal": {
         "close": "{{common.close}}"
@@ -1048,7 +996,7 @@
         "encode-as-description-part-2": "WebPを使いますか?",
         "encode-as-description-part-3": "AVIFを使いますか?",
         "encode-as-warning": "一旦WebP/AVIFに変換すると、PNGに戻すことはできません。すべてのカバーを再生成するには、ライブラリでカバーを更新する必要があります。ブックマークとファビコンは変換できません。",
-        "media-warning": "メディアの変換タスクをトリガーする必要があります。[タスク]タブで行ってください",
+        "media-warning": "保存後、[タスク] タブでメディア変換タスクをトリガーする必要があります。",
         "encode-as-label": "メディアを保存",
         "encode-as-tooltip": "カビタが管理するすべてのメディア(カバー、ブックマーク、ファビコン)は、このタイプとしてエンコードされます.",
         "bookmark-dir-label": "ブックマーク ディレクトリ",
@@ -1069,7 +1017,7 @@
         "xlarge": "エクストララージ (1265x1795)"
     },
     "manage-scrobble-errors": {
-        "description": "ここには、Scrobbling 中に見つかった問題が含まれています。このリストはいつでもクリアでき、自動的に更新されます。不明なシリーズがある場合は、シリーズ名またはローカライズされたシリーズ名を修正するか、プロバイダのためのウェブリンクを追加するのが最善です。",
+        "description": "ここには、Scrobbling 中に見つかった問題が含まれています。このリストはいつでもクリアして次回のScrobbleのアップロードを待つことができます。不明なシリーズがある場合は、シリーズ名またはローカライズされたシリーズ名を修正するか、プロバイダのためのウェブリンクを追加するのが最善です。",
         "filter-label": "{{common.filter}}",
         "clear-errors": "エラーをクリア",
         "series-header": "シリーズ",
@@ -1091,7 +1039,7 @@
         "port-label": "ポート",
         "port-tooltip": "サーバーがリッスンするIPアドレスのカンマ区切りのリストです。Dockerで実行している場合は固定されています。有効にするには再起動が必要です。",
         "backup-label": "日次バックアップ",
-        "backup-tooltip": "維持するバックアップの数。 デフォルトは30、最小は1、最大は30です.",
+        "backup-tooltip": "維持するバックアップの数。 デフォルトは30、最小は1、最大は30です。",
         "log-label": "ログの日数",
         "log-tooltip": "維持するログの数。 デフォルトは30、最小は1、最大は30です。",
         "logging-level-label": "ログレベル",
@@ -1118,16 +1066,16 @@
         "reset-to-default": "{{common.reset-to-default}}",
         "reset": "{{common.reset}}",
         "save": "{{common.save}}",
-        "cache-size-validation": "最低 50 MB以上が必要です",
+        "cache-size-validation": "最低 50 MBが必要です。",
         "field-required": "{{validation.field-required}}",
-        "max-logs-validation": "{{num}}以上のログを持つことはできません。",
+        "max-logs-validation": "{{num}}以上のログを持つことはできません",
         "min-logs-validation": "少なくとも1つのログを持っている必要があります",
         "min-days-validation": "最低1日以上必要です",
-        "min-cache-validation": "50 MB以上",
+        "min-cache-validation": "50 MB以上。",
         "max-backup-validation": "{{num}}以上のバックアップを持つことはできません｡",
         "min-backup-validation": "バックアップが1つ以上ある必要があります",
         "ip-address-validation": "IP アドレスは、有効な IPv4 または IPv6 アドレスのみを含むことができます",
-        "base-url-validation": "ベースURLは、/で始まり、/で終わる必要があります。"
+        "base-url-validation": "ベースURLは、/で始まり、/で終わる必要があります"
     },
     "manage-system": {
         "title": "システムについて",
@@ -1140,7 +1088,7 @@
         "donations-title": "寄付:",
         "source-title": "ソース:",
         "feature-request-title": "リクエスト:",
-        "localization-title": "ローカライゼーション",
+        "localization-title": "ローカライゼーション:",
         "updates-title": "更新履歴"
     },
     "manage-tasks-settings": {
@@ -1174,7 +1122,7 @@
         "bust-cache-task-desc": "Kavita+キャッシュをクリアします。悪い一致のデバッグ時にのみ使用するべきです。",
         "bust-cache-task-success": "Kavita+キャッシュがクリアされました｡",
         "bust-locale-task": "ロケールキャッシュをクリアする",
-        "bust-locale-task-desc": "ロケールキャッシュをクリアします。これにより、更新後に文字列が正しく表示されない問題が修正されることがあります｡",
+        "bust-locale-task-desc": "ロケールキャッシュをクリアします。これにより、更新後に文字列が正しく表示されない問題が修正されることがあります｡ブラウザでページの更新が必要です。",
         "bust-locale-task-success": "ロケールキャッシュがクリアされました｡",
         "clear-reading-cache-task": "読書キャッシュのクリア",
         "clear-reading-cache-task-desc": "読書のためのキャッシュされたファイルをクリアします。前回24時間以内に読んでいたファイルを更新したばかりの場合に便利です。",
@@ -1186,12 +1134,9 @@
         "backup-database-task-desc": "データベース、ブックマーク、テーマ、手動でアップロードしたカバー、および構成ファイルのバックアップを取ります。",
         "backup-database-task-success": "データベースのバックアップのジョブがキューに追加されました",
         "download-logs-task": "ログをダウンロード",
-        "download-logs-task-desc": "すべてのログファイルをzipに変換し、ダウンロードします",
-        "analyze-files-task": "ファイル分析",
-        "analyze-files-task-desc": "拡張子とサイズを生成するためにファイルを分析する長時間実行されるタスクを実行します。これはv0.7リリースのために一度だけ実行する必要があります。v0.7以降にインストールした場合は不要です。",
-        "analyze-files-task-success": "ファイルの分析がキューに追加されました",
+        "download-logs-task-desc": "すべてのログファイルをzipに変換し、ダウンロードします。",
         "check-for-updates-task": "アップデートの確認",
-        "check-for-updates-task-desc": "あなたのバージョンよりも新しい安定版があるか確認してください"
+        "check-for-updates-task-desc": "あなたのバージョンよりも新しい安定版があるか確認してください。"
     },
     "manage-users": {
         "title": "アクティブなユーザー",
@@ -1211,11 +1156,10 @@
         "change-password-alt": "{{user}}のパスワードを変更する",
         "resend": "再送信",
         "setup": "セットアップ",
-        "admin": "管理者",
         "none": "なし",
         "never": "もう質問しない",
         "online-now-tooltip": "オンライン",
-        "no-data": "他のユーザーはいません",
+        "no-data": "他のユーザーはいません。",
         "loading": "{{common.loading}}"
     },
     "edit-collection-tags": {
@@ -1247,11 +1191,36 @@
         "on-deck": "{{dashboard.on-deck-title}}"
     },
     "settings": {
-        "kavitaplus-section-title": "{{settings.admin-kavitaplus}}"
+        "kavitaplus-section-title": "Kavita+",
+        "admin-libraries": "ライブラリ",
+        "admin-media-issues": "メディアの問題",
+        "admin-logs": "ログ",
+        "admin-tasks": "タスク",
+        "clients": "APIキー / OPDS",
+        "user-stats": "統計",
+        "scrobbling": "Scrobbling",
+        "admin-general": "一般",
+        "account-section-title": "アカウント",
+        "server-section-title": "サーバー",
+        "import-section-title": "インポート",
+        "admin-media": "メディア",
+        "admin-kavitaplus": "ライセンス",
+        "theme": "テーマ",
+        "customize": "カスタマイズ",
+        "admin-users": "ユーザー",
+        "admin-email": "メール",
+        "admin-statistics": "統計",
+        "admin-system": "システム",
+        "admin-email-history": "メール履歴",
+        "admin-matched-metadata": "一致したメタデータ",
+        "account": "アカウント",
+        "preferences": "一般設定",
+        "devices": "デバイス",
+        "info-section-title": "情報"
     },
     "collection-detail": {
-        "no-data": "表示するものがありません｡　追加してみましょう｡",
-        "no-data-filtered": "このフィルターに一致したものがありません｡",
+        "no-data": "表示するものがありません｡シリーズを追加してみてください。",
+        "no-data-filtered": "このフィルターに一致したものがありません。",
         "title-alt": "Kavita - {{collectionName}} コレクション",
         "series-header": "シリーズ",
         "item-count": "{{common.item-count}}"
@@ -1372,7 +1341,7 @@
         "cover-image-tab": "{{tabs.cover-tab}}",
         "close": "{{common.close}}",
         "save": "{{common.save}}",
-        "year-validation": "1000以上、0、空白いずれかである必要があります。",
+        "year-validation": "1000以上、0、空白のいずれかである必要があります。",
         "month-validation": "1から12の範囲内か、または空白である必要があります｡",
         "name-unique-validation": "名前は一意である必要があります",
         "required-field": "{{validation.required-field}}",
@@ -1382,7 +1351,7 @@
         "ending-title": "終了",
         "starting-title": "開始",
         "promote-label": "プロモーション",
-        "promote-tooltip": "「Promotion」は、そのタグがサーバー全体で見えるようになることを意味します。ただし、このタグを持つすべてのシリーズには引き続きユーザーアクセスの制限が適用されます。"
+        "promote-tooltip": "「Promotion」は、そのコレクションがあなただけでなくサーバー全体で見えるようになることを意味します。このコレクション内の全てのシリーズには引き続きユーザーアクセスの制限が適用されます。"
     },
     "import-mal-collection-modal": {
         "close": "{{common.close}}",
@@ -1408,7 +1377,8 @@
         "import-step": "CBLを読み込む",
         "validate-cbl-step": "有効なCBL",
         "dry-run-step": "ドライラン",
-        "final-import-step": "最終ステップ"
+        "final-import-step": "最終ステップ",
+        "comicvine-parsing-label": "Comic Vine シリーズのマッチングを使用"
     },
     "pdf-reader": {
         "loading-message": "ローディング...... PDF は期待以上の時間がかかる場合があります",
@@ -1430,9 +1400,8 @@
     },
     "manga-reader": {
         "back": "戻る",
-        "save-globally": "グローバルに保存",
         "incognito-alt": "シークレットモードがオンです｡切り替えるとオフになります｡",
-        "incognito-title": "シークレットモード",
+        "incognito-title": "シークレットモード:",
         "shortcuts-menu-alt": "キーボードショートカットモデル",
         "prev-page-tooltip": "前のページ",
         "next-page-tooltip": "次のページ",
@@ -1463,7 +1432,6 @@
         "layout-mode-switched": "レイアウトモードが見開きレイアウトをレンダリングするのに十分な余白がないため、単一レイアウトに切り替えられました｡",
         "no-next-chapter": "次の章はありません",
         "no-prev-chapter": "前の章はありません",
-        "user-preferences-updated": "ユーザー環境設定を更新しました",
         "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}",
         "series-progress": "シリーズの進捗: {{percentage}}"
     },
@@ -1508,9 +1476,9 @@
     },
     "metadata-filter-row": {
         "unit-reading-date": "日付",
-        "unit-average-rating": "平均評価（Kavita+） - キャッシュされたシリーズのみ",
+        "unit-average-rating": "Kavita+の外部評価, パーセント",
         "unit-reading-progress": "パーセント",
-        "unit-user-rating": "{{metadata-filter-row.unit-reading-progress}}"
+        "unit-user-rating": "星 0.0 - 5.0"
     },
     "sort-field-pipe": {
         "sort-name": "ソート名",
@@ -1559,35 +1527,36 @@
         "release-year-label": "{{sort-field-pipe.release-year}}",
         "web-link-description": "外部サービスにさまざまなリンクを追加できます.",
         "web-link-label": "{{tabs.weblink-tab}}",
-        "cover-image-description": "新しいカバー画像をアップロードして選択します。アップロードしてカバーを上書きするには、「保存」を押します｡",
+        "cover-image-description": "新しいカバー画像をアップロードして選択します。アップロードしてカバーを上書きするには、「保存」を押します。",
         "save": "{{common.save}}",
         "field-locked-alt": "フィールドはロックされています",
         "info-title": "インフォメーション",
-        "library-title": "ライブラリー:",
-        "format-title": "フォーマット:",
-        "created-title": "作成:",
+        "library-title": "ライブラリー",
+        "format-title": "フォーマット",
+        "created-title": "作成",
         "last-read-title": "{{sort-field-pipe.read-progress}}",
-        "last-added-title": "最後に追加した:",
-        "last-scanned-title": "最後のスキャン:",
-        "folder-path-title": "フォルダーパス:",
-        "publication-status-title": "出版状況:",
-        "total-pages-title": "総ページ数:",
-        "total-items-title": "合計項目:",
-        "max-items-title": "最大項目:",
-        "size-title": "サイズ:",
+        "last-added-title": "最後に追加した",
+        "last-scanned-title": "最後のスキャン",
+        "folder-path-title": "フォルダーパス",
+        "publication-status-title": "出版状況",
+        "total-pages-title": "総ページ数",
+        "total-items-title": "合計項目",
+        "max-items-title": "最大項目",
+        "size-title": "サイズ",
         "loading": "{{common.loading}}",
-        "added-title": "追加:",
-        "last-modified-title": "最終更新日:",
+        "added-title": "追加",
+        "last-modified-title": "最終更新日",
         "view-files": "ファイルの表示",
         "pages-title": "{{edit-chapter-modal.pages-label}}",
-        "chapter-title": "章:",
+        "chapter-title": "章",
         "volume-num": "{{common.volume-num}}",
         "highest-count-tooltip": "シリーズ内のすべてのComicInfoで見つかった最大カウント",
         "max-issue-tooltip": "シリーズ内のComicInfoの全てから最大のIssueまたはVolumeフィールドを取得します｡",
         "force-refresh": "強制リフレッシュ",
         "force-refresh-tooltip": "Kavita+ から外部メタデータを強制的に更新します",
         "release-year-validation": "{{validation.year-validation}}",
-        "volumes-title": "{{tab.volumes-tab}}"
+        "volumes-title": "{{tab.volumes-tab}}",
+        "specials-volume": "特装版"
     },
     "edit-chapter-modal": {
         "close": "{{common.close}}",
@@ -1677,7 +1646,8 @@
         "last-30-days": "{{time-periods.last-30-days}}",
         "last-90-days": "{{time-periods.last-90-days}}",
         "last-year": "{{time-periods.last-year}}",
-        "all-time": "{{time-periods.all-time}}"
+        "all-time": "{{time-periods.all-time}}",
+        "all-users": "すべてのユーザー"
     },
     "manga-format-stats": {
         "title": "フォーマット",
@@ -1748,7 +1718,7 @@
         "download": "このファイルのダウンロードに問題が発生したか、アクセス権がない可能性があります｡",
         "not-found": "Urlが存在しない",
         "generic": "予期せぬ問題が発生しました｡",
-        "rejected-cover-upload": "サーバーの拒否リクエストにより、画像が取得できません。 ファイルをダウンロードしてアップロードしてください.",
+        "rejected-cover-upload": "URLから画像を取得できません。 代わりにファイルをダウンロードしてアップロードしてください.",
         "invalid-confirmation-url": "無効な確認用URL",
         "invalid-confirmation-email": "無効な確認メール",
         "invalid-password-reset-url": "無効なパスワードリセットURL"
@@ -1772,29 +1742,29 @@
         "help": "{{common.help}}"
     },
     "customize-dashboard-streams": {
-        "no-data": "すべてのスマートフィルターはダッシュボードに追加されたかまだ作成されていません",
+        "no-data": "すべてのスマートフィルターはダッシュボードに追加されたかまだ作成されていません。",
         "save": "{{common.save}}",
         "add": "{{common.add}}",
         "filter": "{{common.filter}}",
         "clear": "{{common.clear}}"
     },
     "customize-sidenav-streams": {
-        "no-data": "すべてのスマートフィルターはダッシュボードに追加されたかまだ作成されていません｡",
-        "no-data-external-source": "すべての外部ソースはサイドナビに追加されたかまだ作成されていません｡",
+        "no-data": "すべてのスマートフィルターはサイドバーに追加されたかまだ作成されていません。",
+        "no-data-external-source": "すべての外部ソースはサイドバーに追加されたかまだ作成されていません。",
         "save": "{{common.save}}",
         "add": "{{common.add}}",
         "filter": "{{common.filter}}",
         "clear": "{{common.clear}}",
         "smart-filters-title": "スマートフィルター",
         "external-sources-title": "{{customize-dashboard-modal.external-sources}}",
-        "reorder-when-filter-present": "You cannot reorder items via drag & drop while a filter is present. Use {{customize-sidenav-streams.order-numbers-label}}",
+        "reorder-when-filter-present": "フィルターが存在する間は、アイテムをドラッグ＆ドロップで並べ替えることはできません。{{customize-sidenav-streams.order-numbers-label}}を使用してください。",
         "order-numbers-label": "{{reading-list-detail.order-numbers-label}}",
         "bulk-mode-label": "バルク モード"
     },
     "manage-external-sources": {
         "add-source": "追加",
         "help-link": "詳細情報",
-        "description": "外部サーバーを追加し、それらをサイドナビに便利に組み込んで、自分のサーバーと友達のサーバーに素早くアクセスできるようにして、エクスペリエンスを向上させましょう",
+        "description": "外部サーバーを追加し、それらをサイドナビに便利に組み込んで、自分のサーバーと友達のサーバーに素早くアクセスできるようにして、エクスペリエンスを向上させましょう。",
         "clear": "{{common.clear}}",
         "filter": "{{common.filter}}",
         "no-data": "外部ソースが存在しません"
@@ -1834,7 +1804,7 @@
         "characters": "{{metadata-fields.characters-title}}",
         "collection-tags": "コレクションタグ",
         "colorist": "カラーリスト",
-        "cover-artist": "{{person-role-pipe.cover-artist}}",
+        "cover-artist": "{{person-role-pipe.artist}}",
         "editor": "編集者",
         "formats": "フォーマット",
         "genres": "{{metadata-fields.genres-title}}",
@@ -1858,7 +1828,8 @@
         "file-path": "ファイルパス",
         "want-to-read": "読みたい",
         "read-date": "読書日付",
-        "average-rating": "平均評価"
+        "average-rating": "平均評価",
+        "location": "ロケーション"
     },
     "filter-comparison-pipe": {
         "begins-with": "はじめに",
@@ -1879,9 +1850,9 @@
         "must-contains": "含まれている必要があります"
     },
     "toasts": {
-        "regen-cover": "カバー画像を再生成するためのジョブがキューに追加されました。",
+        "regen-cover": "カバー画像を再生成するためのジョブがキューに追加されました",
         "no-pages": "ページはありません。 カビタはこのアーカイブを読むことができませんでした.",
-        "download-in-progress": "ダウンロードは既に進行中です。 お待ち下さい｡",
+        "download-in-progress": "ダウンロードは既に進行中です。 お待ち下さい。",
         "scan-queued": "{{name}}のスキャンがキューに追加されました",
         "server-settings-updated": "サーバ設定更新",
         "reset-ip-address": "IPアドレスのリセット",
@@ -1906,10 +1877,10 @@
         "multiple-added-to-reading-list": "読書リストに章と巻が追加されました",
         "select-files-warning": "転送するファイルを選択する必要があります",
         "reading-list-imported": "読書リストがインポートされました｡",
-        "incognito-off": "シークレットモードがオフになりました。これから進捗がトラッキングされます",
+        "incognito-off": "シークレットモードがオフになりました。これから進捗がトラッキングされます。",
         "email-service-reset": "メールサービスリセット",
         "email-service-reachable": "Kavitaメール接続成功",
-        "email-service-unresponsive": "メールサービスのURLは反応しませんでした",
+        "email-service-unresponsive": "メールサービスのURLは応答しませんでした。",
         "refresh-covers-queued": "{{name}}のカバー更新がキューに追加されました｡",
         "library-file-analysis-queued": "{{name}}のライブラリの解析がキューに追加されました｡",
         "entity-read": "{{name}}は読まれています",
@@ -1921,18 +1892,17 @@
         "delete-review": "レビューを削除してもよろしいですか?",
         "review-deleted": "レビューが削除されました",
         "file-send-to": "ファイルが {{name}}にメールで送信されました｡",
-        "theme-missing": "アクティブなテーマが存在しません。ページをリフレッシュしてください｡",
+        "theme-missing": "アクティブなテーマは存在しません。ページをリフレッシュしてください。",
         "email-sent": "{{email}}にメールが送信されました｡",
-        "email-not-sent": "ファイルにあるメールは有効なメールではなく、送信できません｡ログにリンクが出力されました｡管理者はこのリンクを提供してフローを完了できます｡",
+        "email-not-sent": "ファイルにあるメールは有効なメールではなく、送信できません｡ログにリンクが出力されました｡管理者はこのリンクを提供してフローを完了できます。",
         "k+-license-saved": "ライセンスキーが保存されましたが､無効です｡[確認]をクリックしてサブスクリプションを再検証してください｡初回の登録には少し時間がかかる場合があります",
-        "k+-unlocked": "Kavita+はアンロックされました!",
         "k+-error": "ライセンスの有効化時にエラーがありました。 お問い合わせ.",
-        "k+-delete-key": "これはKavitaのライセンスキーのみを削除し、購入リンクを表示できるようにします。 サブスクリプションをキャンセルしません! サポートを指示すればこれだけを使う!",
-        "k+-reset-key": "これにより、サーバーからキーを外し、Kavitaインスタンスを再登録することができます.",
+        "k+-delete-key": "これはKavitaのライセンスキーのみを削除し、購入リンクを表示できるようにするだけです。 これはサブスクリプションをキャンセルしません! 最初に [管理] を使用してサブスクリプションをキャンセルしてください。",
+        "k+-reset-key": "これにより、以前のライセンスを用いた登録が無効になり、Kavita インスタンスを再登録できるようになります。",
         "k+-reset-key-success": "ライセンスが登録解除されました。[編集]ボタンを使用してインスタンスを再登録し、Kavita+を再アクティベートしてください",
         "library-deleted": "ライブラリ {{name}} を削除しました",
         "copied-to-clipboard": "クリップボードにコピー",
-        "book-settings-info": "本の設定を変更し、それらの設定をすべての本に保存し、ドロワーから目次を表示することができます",
+        "book-settings-info": "本の設定を変更し、それらの設定をすべての本に保存し、ドロワーから目次を表示することができます。",
         "no-next-chapter": "前の{{entity}}が見つかりませんでした｡",
         "no-prev-chapter": "前の{{entity}}が見つかりませんでした｡",
         "load-next-chapter": "次の {{entity}} が読み込まれました",
@@ -1952,11 +1922,11 @@
         "device-created": "デバイス作成",
         "delete-device": "このデバイスを削除してもよろしいですか?",
         "confirm-regen-covers": "カバーを更新すると、すべてのカバー画像が再計算されます。これは負荷がかかる操作です。本当にスキャンを実行したくないですか？",
-        "alert-long-running": "これは時間のかかる処理です。再度実行する前に完了するまでお待ちください｡",
-        "confirm-delete-multiple-series": "{{count}} シリーズを削除したいですか? ディスク上のファイルは削除されません｡",
-        "confirm-delete-series": "本当にこのシリーズを削除してもよろしいですか？これはディスク上のファイルを変更しません",
+        "alert-long-running": "これは時間のかかる処理です。再度実行する前に完了するまでお待ちください。",
+        "confirm-delete-multiple-series": "本当に{{count}} シリーズを削除しますか? ディスク上のファイルは削除されません。",
+        "confirm-delete-series": "本当にこのシリーズを削除してもよろしいですか？これはディスク上のファイルを変更しません。",
         "alert-bad-theme": "テーマには無効または安全でないCSSが含まれています。これを修正するには、管理者に連絡してください。デフォルトでダークテーマに設定されます。",
-        "confirm-library-delete": "{{name}} のライブラリを削除したいですか? もとに戻すことはできません｡",
+        "confirm-library-delete": "本当にライブラリ「{{name}}」を削除しますか? この操作を元に戻すことはできません｡",
         "confirm-library-type-change": "ライブラリのタイプを変更すると、異なる解析ルールで新しいスキャンがトリガーされ、シリーズが再作成される可能性があり、進行状況やブックマークが失われる可能性があります。続行してもよろしいですか？",
         "confirm-download-size": "{{entityType}} は {{size}}です｡続行しますか?",
         "confirm-download-size-ios": "iOS では 200MB を超えるファイルのダウンロードに問題があり、このダウンロードが完了しない可能性があります。",
@@ -2018,12 +1988,23 @@
         "2-column": "2行",
         "cards": "カード",
         "list": "リスト",
-        "up-to-down": "ダウンまで"
+        "up-to-down": "ダウンまで",
+        "pdf-book": "本",
+        "pdf-multiple": "デフォルト",
+        "pdf-horizontal": "水平スクロール",
+        "pdf-even": "偶数",
+        "pdf-dark": "ダーク",
+        "pdf-odd": "奇数",
+        "pdf-light": "ライト",
+        "pdf-none": "無し",
+        "pdf-page": "タップでページ送り",
+        "pdf-vertical": "垂直スクロール"
     },
     "validation": {
         "required-field": "必須項目",
         "valid-email": "これは有効な電子メールでなければなりません",
-        "password-validation": "パスワードは6文字と32文字の間の長さでなければなりません"
+        "password-validation": "パスワードは6文字と256文字の間の長さでなければなりません",
+        "year-validation": "これは1000より大きい4文字の有効な年でなければなりません"
     },
     "entity-type": {
         "volume": "ボリューム",
@@ -2058,10 +2039,81 @@
         "deselect-all": "すべて選択解除",
         "series-count": "{{num}} シリーズ",
         "item-count": "{{num}} アイテム",
-        "book-num": "本",
-        "issue-hash-num": "問題 #",
-        "issue-num": "問題",
+        "book-num": "冊",
+        "issue-hash-num": "号数 #",
+        "issue-num": "号",
         "chapter-num": "チャプター",
-        "volume-num": "ボリューム"
+        "volume-num": "ボリューム",
+        "issue-nums": "号",
+        "chapter-nums": "チャプター",
+        "volume-nums": "巻",
+        "book-nums": "冊",
+        "author-count": "{{num}} 人の著者",
+        "chapter-count": "{{num}} 章",
+        "issue-num-shorthand": "#{{num}}",
+        "volume-num-shorthand": "第{{num}}巻",
+        "no-data": "データがありません",
+        "book-num-shorthand": "{{num}} 冊",
+        "chapter-num-shorthand": "{{num}} 章"
+    },
+    "tabs": {
+        "details-tab": "詳細",
+        "folder-tab": "フォルダー",
+        "account-tab": "アカウント",
+        "smart-filters-tab": "スマートフィルター",
+        "books-tab": "本",
+        "tags-tab": "タグ",
+        "people-tab": "人物",
+        "metadata-tab": "メタデータ",
+        "volumes-tab": "巻",
+        "specials-tab": "スペシャル",
+        "related-tab": "関係",
+        "general-tab": "一般",
+        "cover-tab": "カバー画像",
+        "tasks-tab": "タスク",
+        "recommendations-tab": "おすすめ",
+        "info-tab": "情報",
+        "progress-tab": "進捗",
+        "series-tab": "シリーズ",
+        "weblink-tab": "ウェブリンク",
+        "preferences-tab": "一般設定",
+        "devices-tab": "デバイス",
+        "stats-tab": "統計",
+        "scrobbling-tab": "Scrobbling",
+        "storyline-tab": "ストーリー",
+        "advanced-tab": "高度な設定",
+        "theme-tab": "テーマ",
+        "reviews-tab": "レビュー"
+    },
+    "new-version-modal": {
+        "title": "Kavitaがアップデートされました!",
+        "description": "新しいバージョンのKavitaが利用可能です。更新してアップデートしてください。",
+        "known-issues": "{{changelog.known-issues}}",
+        "theme": "{{changelog.theme}}",
+        "removed": "{{changelog.removed}}",
+        "api": "{{changelog.api}}",
+        "added": "{{changelog.added}}",
+        "developer": "{{changelog.developer}}",
+        "close": "{{common.close}}",
+        "refresh": "更新",
+        "fixed": "{{changelog.fixed}}",
+        "changed": "{{changelog.changed}}"
+    },
+    "changelog-update-item": {
+        "known-issues": "既知の問題",
+        "fixed": "修正",
+        "developer": "開発者",
+        "theme": "テーマ",
+        "removed": "削除",
+        "api": "API",
+        "published-label": "公開日: ",
+        "feature-requests": "機能リクエスト",
+        "installed": "{{changelog.installed}}",
+        "download": "ダウンロード",
+        "added": "追加",
+        "changed": "変更"
+    },
+    "manage-metadata-settings": {
+        "enable-cover-image-label": "カバー画像"
     }
 }
diff --git a/UI/Web/src/assets/langs/ko.json b/UI/Web/src/assets/langs/ko.json
index 805acf789..ee5a50f6d 100644
--- a/UI/Web/src/assets/langs/ko.json
+++ b/UI/Web/src/assets/langs/ko.json
@@ -22,11 +22,11 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "saving": "저장중…",
         "update": "업데이트",
-        "account-detail-title": "계정 자세히보기"
+        "account-detail-title": "계정 자세히보기",
+        "invalid-email-warning": "유효하지 않은 이메일은 Kavita의 일부 기능을 차단합니다"
     },
     "user-scrobble-history": {
         "title": "스크로블 이력",
@@ -39,7 +39,7 @@
         "series-header": "시리즈",
         "data-header": "데이터",
         "is-processed-header": "처리됨",
-        "no-data": "데이터 없음",
+        "no-data": "{{common.no-data}}",
         "volume-and-chapter-num": "{{v}}권 {{n}}화",
         "volume-num": "{{num}}권",
         "chapter-num": "{{num}}화",
@@ -47,7 +47,12 @@
         "not-applicable": "해당 사항 없음",
         "processed": "처리됨",
         "not-processed": "처리되지 않음",
-        "special": "{{entity-title.special}}"
+        "special": "{{entity-title.special}}",
+        "scrobbling-disabled": "계정 설정에서 스크로블링이 비활성화되어 있습니다.",
+        "generate-scrobble-events": "채우기 이벤트",
+        "token-expired": "AniList 토큰이 만료되었습니다! 계정 페이지에서 갱신하기 전까지는 Scrobbling 이벤트가 처리되지 않습니다.",
+        "select-all-label": "모두 선택",
+        "delete-selected-label": "선택 취소"
     },
     "scrobble-event-type-pipe": {
         "chapter-read": "읽기 진행률",
@@ -59,15 +64,6 @@
     "spoiler": {
         "click-to-show": "스포일러, 표시하려면 클릭"
     },
-    "review-series-modal": {
-        "title": "리뷰 수정",
-        "review-label": "평가",
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "min-length": "리뷰는 적어도 {{count}}자여야 합니다",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}",
         "user-review": "{{username}}님의 리뷰",
@@ -78,7 +74,8 @@
         "your-review": "당신의 리뷰",
         "external-review": "외부 리뷰",
         "local-review": "로컬 리뷰",
-        "rating-percentage": "평점 {{r}}%"
+        "rating-percentage": "평점 {{r}}%",
+        "critic": "평점"
     },
     "want-to-read": {
         "title": "읽고 싶어요",
@@ -88,7 +85,7 @@
     },
     "user-preferences": {
         "title": "사용자 대시보드",
-        "pref-description": "계정에 연결된 전역 설정입니다.",
+        "pref-description": "계정에 연결된 전역 설정입니다. 리더 설정은 읽기 프로필에 있습니다.",
         "account-tab": "{{tabs.account-tab}}",
         "preferences-tab": "{{tabs.preferences-tab}}",
         "theme-tab": "{{tabs.theme-tab}}",
@@ -112,55 +109,6 @@
         "collapse-series-relationships-tooltip": "Kavita는 관계가 없거나 상위/속편인 시리즈를 표시해야 합니까",
         "share-series-reviews-label": "시리즈 리뷰 공유",
         "share-series-reviews-tooltip": "Kavita에 다른 사용자를 위한 시리즈 리뷰를 포함합니까",
-        "image-reader-settings-title": "이미지 리더",
-        "reading-direction-label": "읽는 방향",
-        "reading-direction-tooltip": "다음 페이지로 이동할 때 클릭해야 하는 방향입니다. 오른쪽에서 왼쪽은 화면 왼쪽을 클릭하여 다음 페이지로 이동하는 것을 의미합니다.",
-        "scaling-option-label": "스케일링 옵션",
-        "scaling-option-tooltip": "화면에 맞게 이미지 크기를 조정하는 방법.",
-        "page-splitting-label": "페이지 분할",
-        "page-splitting-tooltip": "전체 너비 이미지를 분할하는 방법(예: 왼쪽 및 오른쪽 이미지가 모두 결합됨)",
-        "reading-mode-label": "읽기 모드",
-        "reading-mode-tooltip": "세로, 가로로 페이지를 매기거나 무한 스크롤이 가능하도록 리더를 변경하세요",
-        "layout-mode-label": "레이아웃 모드",
-        "layout-mode-tooltip": "단일 이미지를 화면에 렌더링하거나 두 개의 이미지를 나란히 렌더링합니다",
-        "background-color-label": "배경색",
-        "background-color-tooltip": "이미지 리더의 배경색",
-        "auto-close-menu-label": "자동 메뉴 닫기",
-        "auto-close-menu-tooltip": "메뉴가 자동으로 닫혀야 하나요",
-        "show-screen-hints-label": "화면에 힌트 표시",
-        "show-screen-hints-tooltip": "페이지 매기기 영역과 방향을 이해하는 데 도움이 되는 오버레이 표시",
-        "emulate-comic-book-label": "만화책 에뮬레이션",
-        "emulate-comic-book-tooltip": "책 읽기를 에뮬레이트하기 위해 그림자 효과를 적용합니다",
-        "swipe-to-paginate-label": "스와이프하여 페이지 넘김",
-        "swipe-to-paginate-tooltip": "화면을 스와이프하면 다음 페이지나 이전 페이지가 실행되어야 합니다",
-        "book-reader-settings-title": "북 리더",
-        "tap-to-paginate-label": "탭하여 페이지 넘김",
-        "tap-to-paginate-tooltip": "북 리더 화면의 측면을 탭하여 이전/다음 페이지로 이동할 수 있습니다",
-        "immersive-mode-label": "몰입 모드",
-        "immersive-mode-tooltip": "문서를 클릭하고 탭할 때 페이지 넘기기가 켜져 있으면 메뉴가 숨겨집니다",
-        "reading-direction-book-label": "읽는 방향",
-        "reading-direction-book-tooltip": "다음 페이지로 이동할 때 클릭해야 하는 방향입니다. 오른쪽에서 왼쪽은 화면 왼쪽을 클릭하여 다음 페이지로 이동하는 것을 의미합니다.",
-        "font-family-label": "글꼴",
-        "font-family-tooltip": "로드할 글꼴 모음입니다. 기본값은 책의 기본 글꼴을 로드합니다",
-        "writing-style-label": "작문 스타일",
-        "writing-style-tooltip": "텍스트의 방향을 변경합니다. 가로는 왼쪽에서 오른쪽으로, 세로는 위에서 아래로.",
-        "layout-mode-book-label": "레이아웃 모드",
-        "layout-mode-book-tooltip": "콘텐츠를 어떻게 배치할지 정합니다 스크롤은 책에 포함된 대로입니다. 1 또는 2 열은 장치의 높이에 맞게 페이지당 1 또는 2 열의 텍스트가 들어갑니다",
-        "color-theme-book-label": "색상 테마",
-        "color-theme-book-tooltip": "북 리더 콘텐츠 및 메뉴에 적용할 색상 테마",
-        "font-size-book-label": "글꼴 크기",
-        "font-size-book-tooltip": "책의 글꼴에 적용할 크기 조정 비율",
-        "line-height-book-label": "줄 간격",
-        "line-height-book-tooltip": "줄 사이의 간격",
-        "margin-book-label": "여백",
-        "margin-book-tooltip": "화면 양쪽의 간격입니다. 이 설정과 상관없이 모바일 장치에서는 0으로 재정의됩니다.",
-        "pdf-reader-settings-title": "PDF리더",
-        "pdf-scroll-mode-label": "스크롤 모드",
-        "pdf-scroll-mode-tooltip": "페이지를 스크롤하는 방법. 수직/수평 및 탭하여 페이지 매김(스크롤 없음)",
-        "pdf-spread-mode-label": "스프레드 모드",
-        "pdf-spread-mode-tooltip": "페이지를 배치하는 방법. 싱글 또는 더블(홀수/짝수)",
-        "pdf-theme-label": "테마",
-        "pdf-theme-tooltip": "리더의 색상 테마",
         "clients-opds-alert": "이 서버에서 OPDS를 사용할 수 없습니다. 이것은 Tachiyomi 사용자에게 영향을 미치지 않습니다.",
         "clients-opds-description": "모든 서드파티 클라이언트는 API 키 또는 아래의 연결 URL을 사용합니다. 이것은 암호와 같으므로 비공개로 유지하십시오.",
         "clients-api-key-tooltip": "API 키는 비밀번호와 같습니다. 재설정하면 기존 클라이언트가 모두 무효화됩니다.",
@@ -168,12 +116,20 @@
         "clients-api-key-label": "API 키",
         "clients-opds-url-tooltip": "지원되는 OPDS 클라이언트 목록을 확인하세요. ",
         "reset": "{{common.reset}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "anilist-scrobbling-label": "AniList 스크로블링",
+        "anilist-scrobbling-tooltip": "Kavita가 AniList에 읽기 진행 상황 및 평가를 스크로블(단방향 동기화)하도록 허용",
+        "want-to-read-sync-label": "읽고 싶은 동기화",
+        "want-to-read-sync-tooltip": "Kavita가 AniList 및 MAL의 보류 중인 읽기 목록에 있는 시리즈를 기반으로 '읽고 싶은 목록'에 항목을 추가하도록 허용합니다",
+        "kavitaplus-settings-title": "Kavita+"
     },
     "user-holds": {
         "title": "스크러블 홀드",
-        "description": "이것은 업스트림 공급자에게 스크로블되지 않는 시리즈의 사용자 관리 목록입니다. 언제든지 시리즈를 제거할 수 있으며 다음 스크로블 가능 이벤트(읽기 진행률, 평점, 읽고 싶어요 상태)가 이벤트를 트리거합니다.",
-        "no-data": "{{typeahead.no-data}}"
+        "description": "이것은 업스트림 공급자에게 스크로블되지 않는 시리즈의 사용자 관리 목록입니다. 언제든지 시리즈를 제거할 수 있으며 다음 스크로블 가능 이벤트(읽기 진행률, 평점, 읽고 싶어요 상태)가 스크로블링을 트리거합니다.",
+        "no-data": "{{typeahead.no-data}}",
+        "series-name-header": "{{manage-matched-metadata.series-name-header}}",
+        "created-header": "{{manage-media-issues.created-header}}",
+        "delete-label": "{{common.remove}}"
     },
     "theme-manager": {
         "title": "테마 관리자",
@@ -293,7 +249,8 @@
         "regen-warning": "API 키를 재생성하면 기존 클라이언트가 무효화됩니다.",
         "no-key": "오류 - 키가 설정되지 않음",
         "confirm-reset": "이렇게 하면 설정한 모든 OPDS 구성이 무효화됩니다. 정말 계속 하시겠습니까?",
-        "key-reset": "API 키 재설정"
+        "key-reset": "API 키 재설정",
+        "reset": "재설정"
     },
     "scrobbling-providers": {
         "title": "스크로블링 공급자",
@@ -313,14 +270,20 @@
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
-        "loading": "{{common.loading}}"
+        "loading": "{{common.loading}}",
+        "anilist-first-description": "AniList 토큰이 이제 설정되었습니다. 이 토큰은 1년 동안 지속되며 Kavita는 만료되기 전에 여기에서 새로 고침하라고 알려줍니다. 이를 통해 Kavita는 귀하의 독서 기록, 읽고 싶은 것, 평가에서 스크러블(동기화) 이벤트를 생성합니다. 지금 또는 나중에 시작할 수 있습니다. 스크러블하지 않으려는 시리즈가 있는 경우 나중에를 선택하고 스크러블 보류를 설정합니다. 이 작업은 한 번만 실행하면 됩니다. 그 후 Kavita가 귀하를 대신하여 동기화를 처리합니다. 
          '나중에'를 선택하면 스크러블 페이지에서 버튼을 찾을 수 있습니다.",
+        "anilist-used-for": "AniList는 스크로블링(데이터 동기화) 및 '읽고 싶은 목록' 동기화에 사용됩니다.",
+        "mal-used-for": "MyAnimeList는 스마트 컬렉션 및 '읽고 싶은 목록' 동기화에 사용됩니다.",
+        "anilist-first-header": "AniList 토큰이 저장되었습니다",
+        "anilist-first-later": "나중에",
+        "anilist-first-now": "지금"
     },
     "typeahead": {
         "locked-field": "필드가 잠겨 있습니다",
         "close": "{{common.close}}",
         "loading": "{{common.loading}}",
         "add-item": "추가 {{item}}…",
-        "no-data": "데이터 없음",
+        "no-data": "{{common.no-data}}",
         "add-custom-item": ", 사용자 정의 목록을 추가하려면 입력하세요"
     },
     "generic-list-modal": {
@@ -497,9 +460,9 @@
     },
     "library-type-pipe": {
         "book": "책",
-        "comic": "만화(Comic)",
+        "comic": "만화 (Legacy)",
         "manga": "만화(Manga)",
-        "comicVine": "Comic Vine",
+        "comicVine": "코믹(Comic)",
         "image": "이미지",
         "lightNovel": "라이트 노벨"
     },
@@ -561,10 +524,7 @@
         "installed": "설치됨",
         "download": "다운로드",
         "nightly": "야간: {{version}}",
-        "published-label": "게시됨: ",
-        "available": "사용 가능",
-        "description": "{{installed}}가 표시되지 않는 경우",
-        "description-continued": "태그, 당신은 나이틀리 릴리스에 있습니다. 사용 가능한 것은 주요 버전만 표시됩니다. 해당 안정 버전의 나이틀리 릴리스에 대한 나이틀리 태그가 표시됩니다."
+        "available": "사용 가능"
     },
     "invite-user": {
         "title": "사용자 초대",
@@ -610,15 +570,35 @@
         "activate-discordId-tooltip": "Kavita+와 Discord 계정을 연결하세요. 이렇게 하면 Kavita를 형성하는 데 도움이 되는 숨겨진 채널에 액세스할 수 있습니다.",
         "discord-validation": "이것은 유효한 Discord 사용자 ID가 아닙니다. 사용자 ID는 Discord 사용자 이름이 아닙니다.",
         "activate-delete": "{{common.delete}}",
-        "activate-reset": "{{common.reset}}",
+        "activate-reset": "라이센스 초기화",
         "activate-reset-tooltip": "라이센스를 사용하여 이전 등록을 무효화합니다. 라이센스와 이메일이 모두 필요합니다",
         "activate-save": "{{common.save}}",
         "kavita+-desc-part-1": "Kavita+는 이 Kavita 인스턴스의 모든 사용자를 위한 기능을 잠금 해제하는 프리미엄 구독 서비스입니다. 잠금 해제하려면 구독을 구매하세요 ",
         "kavita+-desc-part-2": "프리미엄 혜택",
         "kavita+-desc-part-3": "오늘!",
-        "kavita+-requirement": "Kavita+는 최신 릴리스(2개 버전)에서만 작동하도록 설계되었습니다. 그 밖의 모든 것은 작동하지 않을 수 있습니다.",
-        "kavita+-releases": "릴리스 보기",
-        "help-label": "{{common.help}}"
+        "kavita+-requirement": "Kavita+는 최신 3개의 릴리스 버전에서만 작동하도록 설계되었습니다. 그 외 버전에서는 작동하지 않을 수 있습니다.",
+        "help-label": "{{common.help}}",
+        "delete-label": "라이선스 삭제",
+        "delete-tooltip": "이 작업은 Kavita에서 라이선스를 제거하여 Kavita가 Kavita+와 통신하지 않도록 합니다. 구독을 취소하지는 않습니다. 먼저 '관리'를 사용하여 구독을 취소하십시오.",
+        "manage-tooltip": "결제 정보 업데이트, 구독 취소/일시 중지 등",
+        "email-label": "등록된 이메일",
+        "k+-already-registered-header": "라이선스가 이미 등록되었습니다",
+        "overwrite": "덮어쓰기",
+        "k+-unlocked": "Kavita+ 잠금 해제됨!",
+        "faq-title": "FAQ",
+        "license-mismatch": "라이선스가 다른 Kavita 인스턴스에 등록되었을 수 있습니다. 재등록하여 문제를 해결하십시오.",
+        "k+-unlocked-description": "Kavita+에 오신 것을 환영합니다! 계정에서 스크로블 제공자를 등록하면 Kavita는 진행 상황, 평점 및 읽고 싶은 항목에서 스크로블 이벤트를 생성합니다. 스크로블하고 싶지 않은 시리즈에 대해 스크로블 보류를 설정하는 데 시간을 할애하십시오.",
+        "reset-tooltip": "이 작업은 Kavita+ 라이선스가 연결된 서버 인스턴스를 초기화합니다. 이메일과 라이선스 키가 필요합니다",
+        "total-subbed-months-label": "총 구독 개월 수",
+        "k+-license-overwrite": "라이선스가 다른 Kavita 인스턴스에 등록되어 있습니다. 이는 재설치 시 또는 드물게 시스템 업데이트로 인해 발생할 수 있습니다. 덮어쓰기를 선택하여 이 인스턴스가 Kavita+에 강제로 등록되도록 합니다.",
+        "supported-version-label": "지원되는 Kavita 버전 사용 중",
+        "expiration-label": "만료",
+        "reset-label": "리셋",
+        "info-title": "라이센스 정보",
+        "actions-title": "액션",
+        "license-active-label": "라이선스 활성화됨",
+        "valid-tooltip": "유효",
+        "invalid-tooltip": "무효"
     },
     "book-line-overlay": {
         "copy": "복사",
@@ -633,7 +613,7 @@
         "page-label": "페이지",
         "pagination-header": "섹션",
         "go-to-page": "페이지로 이동",
-        "go-to-last-page": "마지막 페이지로 이동",
+        "go-to-last-page": "마지막 페이지로",
         "prev-page": "이전 페이지",
         "next-page": "다음 페이지",
         "prev-chapter": "이전 챕터/볼륨",
@@ -651,7 +631,10 @@
         "incognito-mode-label": "시크릿 모드",
         "next": "다음",
         "previous": "이전",
-        "go-to-page-prompt": "{{totalPages}} 페이지가 있습니다. 어떤 페이지로 이동하시겠습니까?"
+        "go-to-page-prompt": "{{totalPages}} 페이지가 있습니다. 어떤 페이지로 이동하시겠습니까?",
+        "go-to-first-page": "첫 페이지로",
+        "go-to-section": "섹션으로 이동",
+        "go-to-section-prompt": "{{totalSections}} 섹션이 있습니다. 어떤 섹션으로 이동하시겠습니까?"
     },
     "personal-table-of-contents": {
         "no-data": "아직 북마크된 항목 없음",
@@ -699,7 +682,7 @@
     "series-detail": {
         "page-settings-title": "페이지 설정",
         "close": "{{common.close}}",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
         "layout-mode-option-card": "카드",
         "layout-mode-option-list": "리스트",
         "continue-from": "계속읽기 {{title}}",
@@ -725,8 +708,6 @@
         "no-pages": "{{toasts.no-pages}}",
         "no-chapters": "이 볼륨에는 챕터가 없습니다. 읽을 수 없습니다.",
         "cover-change": "브라우저에서 이미지를 새로 고치는 데 최대 1분이 걸릴 수 있습니다. 그때까지는 일부 페이지에 이전 이미지가 표시될 수 있습니다.",
-        "user-reviews-local": "로컬 리뷰",
-        "user-reviews-plus": "외부 리뷰",
         "writers-title": "{{metadata-fields.writers-title}}",
         "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
         "characters-title": "{{metadata-fields.characters-title}}",
@@ -752,9 +733,11 @@
         "more-alt": "더 보기",
         "time-left-alt": "남은 시간",
         "time-to-read-alt": "{{sort-field-pipe.time-to-read}}",
-        "scrobbling-tooltip": "{{settings.scrobbling}}",
+        "scrobbling-tooltip": "{{settings.scrobbling}}: {{value}}",
         "publication-status-title": "출판",
-        "publication-status-tooltip": "출판현황"
+        "publication-status-tooltip": "출판현황",
+        "on": "{{reader-settings.on}}",
+        "off": "{{reader-settings.off}}"
     },
     "metadata-fields": {
         "collections-title": "{{side-nav.collections}}",
@@ -786,7 +769,8 @@
         "entry-label": "세부정보 보기",
         "kavita-tooltip": "귀하의 평가 + 전체",
         "kavita-rating-title": "귀하의 평가",
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "critic": "{{review-card.critic}}"
     },
     "badge-expander": {
         "more-items": "와 {{count}} 더"
@@ -821,7 +805,9 @@
         "back": "뒤로가기",
         "more": "더 보기",
         "customize": "{{settings.customize}}",
-        "browse-authors": "작가 찾아보기"
+        "edit": "{{common.edit}}",
+        "cancel-edit": "재정렬 닫기",
+        "browse-people": "사용자 탐색"
     },
     "library-settings-modal": {
         "close": "{{common.close}}",
@@ -838,7 +824,7 @@
         "type-label": "유형",
         "type-tooltip": "라이브러리 유형에 따라 파일 이름이 구문 분석되는 방식과 UI에 장(만화)과 이슈(만화)가 표시되는지 여부가 결정됩니다. 라이브러리 유형 간의 차이점에 대한 자세한 내용은 Wiki를 확인하세요.",
         "kavitaplus-eligible-label": "Kavita+ 적격",
-        "kavitaplus-eligible-tooltip": "Kavita+가 정보를 가져오거나 스크로블링을 지원합니까",
+        "kavitaplus-eligible-tooltip": "Kavita+ 메타데이터 기능 또는 자동 추천 지원",
         "folder-description": "라이브러리에 폴더 추가",
         "browse": "미디어 폴더 찾아보기",
         "help-us-part-1": "팔로우하여 저희를 도와주세요 ",
@@ -872,7 +858,10 @@
         "file-type-group-tooltip": "\"Kavita\"이(가) 무엇을 스캔해야 하는지에 따라 다양한 파일 유형이 있을 수 있습니다. 아카이브 파일은 일반적으로 cb*, zip, rar 등을 포함합니다.",
         "exclude-patterns-label": "패턴 제외",
         "exclude-patterns-tooltip": "디렉터리를 스캔할 때 Kavita가 일치시킬 패턴 집합(Glob 구문)을 구성하고, 스캐너 결과에서 제외할 수 있도록 설정하세요.",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "allow-metadata-matching-tooltip": "Kavita가 이 라이브러리 내의 시리즈에 대한 메타데이터를 다운로드해야 합니까? 이는 서버에 활성 Kavita+ 구독이 있는 경우에만 발생합니다.",
+        "allow-metadata-matching-label": "메타데이터 일치 허용",
+        "enable-metadata-label": "메타데이터 활성화 (ComicInfo/Epub/PDF)"
     },
     "file-type-group-pipe": {
         "archive": "아카이브",
@@ -882,30 +871,30 @@
     },
     "reader-settings": {
         "general-settings-title": "일반 설정",
-        "font-family-label": "{{user-preferences.font-family-label}}",
-        "font-size-label": "{{user-preferences.font-size-book-label}}",
-        "line-spacing-label": "{{user-preferences.line-height-book-label}}",
-        "margin-label": "{{user-preferences.margin-book-label}}",
+        "font-family-label": "{{manage-reading-profiles.font-family-label}}",
+        "font-size-label": "{{manage-reading-profiles.font-size-book-label}}",
+        "line-spacing-label": "{{manage-reading-profiles.line-height-book-label}}",
+        "margin-label": "{{manage-reading-profiles.margin-book-label}}",
         "reset-to-defaults": "기본값으로 재설정",
         "reader-settings-title": "리더 설정",
-        "reading-direction-label": "{{user-preferences.reading-direction-book-label}}",
+        "reading-direction-label": "{{manage-reading-profiles.reading-direction-book-label}}",
         "right-to-left": "오른쪽에서 왼쪽",
         "left-to-right": "왼쪽에서 오른쪽",
         "horizontal": "가로",
         "vertical": "세로",
-        "writing-style-label": "{{user-preferences.writing-style-label}}",
+        "writing-style-label": "{{manage-reading-profiles.writing-style-label}}",
         "writing-style-tooltip": "텍스트의 방향을 변경합니다. 가로는 왼쪽에서 오른쪽으로, 세로는 위에서 아래로.",
         "tap-to-paginate-label": "탭 해서 페이지 넘김",
         "tap-to-paginate-tooltip": "화면 가장자리를 클릭하여 페이지를 넘김",
         "on": "켜기",
         "off": "끄기",
-        "immersive-mode-label": "{{user-preferences.immersive-mode-label}}",
+        "immersive-mode-label": "{{manage-reading-profiles.immersive-mode-label}}",
         "immersive-mode-tooltip": "이렇게 하면 리더 문서를 클릭하면 메뉴가 숨겨지고 탭하여 페이지 넘김이 켜집니다",
         "fullscreen-label": "전체 화면",
         "fullscreen-tooltip": "리더를 전체 화면 모드로 전환",
         "exit": "끄기",
         "enter": "켜기",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
         "layout-mode-tooltip": "스크롤: epub 파일을 미러링합니다(일반적으로 장당 하나의 긴 스크롤 페이지).
          1열: 한 번에 하나의 가상 페이지를 생성합니다.
          2열: 한 번에 두 개의 가상 페이지를 나란히 생성합니다.",
         "layout-mode-option-scroll": "스크롤",
         "layout-mode-option-1col": "1열",
@@ -914,7 +903,10 @@
         "theme-dark": "다크",
         "theme-black": "블랙",
         "theme-white": "화이트",
-        "theme-paper": "종이"
+        "theme-paper": "종이",
+        "update-parent": "{{name}}(으)로 저장",
+        "line-spacing-min-label": "1x",
+        "line-spacing-max-label": "2.5x"
     },
     "table-of-contents": {
         "no-data": "이 책에는 메타데이터 또는 toc 파일에 설정된 목차가 없습니다"
@@ -938,7 +930,8 @@
     },
     "card-detail-layout": {
         "total-items": "{{count}} 총 항목",
-        "jumpkey-count": "{{count}} 시리즈"
+        "jumpkey-count": "{{count}} 시리즈",
+        "no-data": "{{common.no-data}}"
     },
     "card-item": {
         "cannot-read": "읽을 수 없음"
@@ -964,12 +957,14 @@
         "length-title": "{{edit-chapter-modal.words-label}}",
         "read-time-title": "{{edit-chapter-modal.reading-time-label}}",
         "language-title": "{{edit-chapter-modal.language-label}}",
-        "release-title": "{{sort-field-pipe.release-year}}"
+        "release-title": "{{sort-field-pipe.release-year}}",
+        "age-rating-title": "{{metadata-fields.age-rating-title}}"
     },
     "related-tab": {
         "reading-lists-title": "{{reading-lists.title}}",
         "collections-title": "{{side-nav.collections}}",
-        "relations-title": "{{tabs.related-tab}}"
+        "relations-title": "{{tabs.related-tab}}",
+        "bookmarks-title": "{{side-nav.bookmarks}}"
     },
     "cover-image-chooser": {
         "enter-an-url-pre-title": "{{url}}을(를) 입력하세요",
@@ -1028,7 +1023,7 @@
         "file-header": "파일",
         "comment-header": "댓글",
         "created-header": "생성됨",
-        "no-data": "데이터 없음"
+        "no-data": "{{common.no-data}}"
     },
     "manage-email-settings": {
         "description": "장치로 보내기와 같은 Kavita의 일부 기능을 사용하려면 이메일 공급자를 설정해야 합니다. 비밀번호 분실과 같은 다른 기능은 이메일 설정 없이 관리자 개입이 필요합니다.",
@@ -1041,7 +1036,7 @@
         "reset": "{{common.reset}}",
         "test": "테스트",
         "host-name-label": "호스트 이름",
-        "host-name-tooltip": "도메인 이름(역방향 프록시의). 이메일 기능에 필요합니다. 역방향 프록시가 없으면 임의의 URL을 사용하십시오.",
+        "host-name-tooltip": "이메일 기능에 필요한 역방향 프록시의 도메인 이름입니다. 역방향 프록시를 사용하지 않는 경우, http://externalip:port/ 형식 등 어떠한 URL도 사용할 수 있습니다",
         "host-name-validation": "호스트 이름은 http(s)로 시작하고 /로 끝나지 않아야 합니다",
         "sender-address-label": "송신자 주소",
         "sender-address-tooltip": "이는 수신자가 이메일을 받을 때 볼 수 있는 이메일 주소입니다. 일반적으로 계정과 연결된 이메일 주소입니다.",
@@ -1247,9 +1242,6 @@
         "backup-database-task-success": "데이터베이스 백업 작업이 대기 중입니다",
         "download-logs-task": "로그 다운로드",
         "download-logs-task-desc": "모든 로그 파일을 zip으로 컴파일하고 다운로드합니다.",
-        "analyze-files-task": "파일 분석",
-        "analyze-files-task-desc": "파일을 분석하여 확장자와 크기를 생성하는 장기 실행 작업을 실행합니다. 이것은 v0.7 릴리스에 대해 한 번만 실행해야 합니다. v0.7 이후를 설치한 경우에는 필요하지 않습니다.",
-        "analyze-files-task-success": "파일 분석이 대기 중입니다",
         "sync-themes-task": "테마 동기화",
         "sync-themes-task-desc": "버전이 일치하면 다운로드한 테마를 변경 사항과 동기화합니다.",
         "sync-themes-success": "테마 동기화가 대기 중입니다",
@@ -1277,7 +1269,6 @@
         "change-password-alt": "비밀번호 변경 {{user}}",
         "resend": "재전송",
         "setup": "설정",
-        "admin": "관리자",
         "last-active-header": "마지막 활성",
         "roles-header": "역할",
         "name-header": "이름",
@@ -1289,7 +1280,8 @@
         "no-data": "다른 사용자가 없습니다.",
         "loading": "{{common.loading}}",
         "actions-header": "작업",
-        "pending-tooltip": "이 사용자는 이메일을 확인하지 않았습니다"
+        "pending-tooltip": "이 사용자는 이메일을 확인하지 않았습니다",
+        "all-libraries": "모든 라이브러리"
     },
     "edit-collection-tags": {
         "title": "편집 {{collectionName}} 컬렉션",
@@ -1329,7 +1321,7 @@
         "server-section-title": "서버",
         "info-section-title": "정보",
         "import-section-title": "가져오기",
-        "kavitaplus-section-title": "{{settings.admin-kavitaplus}}",
+        "kavitaplus-section-title": "Kavita+",
         "admin-general": "일반",
         "admin-users": "유저",
         "admin-libraries": "라이브러리",
@@ -1340,7 +1332,7 @@
         "admin-tasks": "작업",
         "admin-statistics": "통계",
         "admin-system": "시스템",
-        "admin-kavitaplus": "Kavita+",
+        "admin-kavitaplus": "라이센스",
         "account": "계정",
         "preferences": "환경설정",
         "clients": "API 키 / OPDS",
@@ -1350,7 +1342,12 @@
         "theme": "테마",
         "customize": "커스터마이즈",
         "cbl-import": "CBL 읽기 목록",
-        "mal-stack-import": "MAL 스택"
+        "mal-stack-import": "MAL 스택",
+        "admin-manage-tokens": "사용자 토큰 관리",
+        "admin-metadata": "메타데이터 관리",
+        "scrobble-holds": "스크러블 홀드",
+        "admin-email-history": "이메일 기록",
+        "admin-matched-metadata": "일치하는 메타데이터"
     },
     "collection-detail": {
         "no-data": "항목이 없습니다. 시리즈를 추가해 보세요.",
@@ -1387,7 +1384,8 @@
     },
     "reading-list-item": {
         "remove": "{{common.remove}}",
-        "read": "{{common.read}}"
+        "read": "{{common.read}}",
+        "released-label": "출시: {{date}}"
     },
     "stream-list-item": {
         "remove": "{{common.remove}}",
@@ -1395,7 +1393,8 @@
         "provided": "제공",
         "smart-filter": "스마트 필터",
         "library": "라이브러리",
-        "external-source": "외부 소스"
+        "external-source": "외부 소스",
+        "delete": "{{common.delete}}"
     },
     "reading-list-detail": {
         "item-count": "{{common.item-count}}",
@@ -1407,7 +1406,19 @@
         "read-options-alt": "읽기 옵션",
         "incognito-alt": "(시크릿 모드)",
         "no-data": "추가된 사항 없음",
-        "characters-title": "{{metadata-fields.characters-title}}"
+        "characters-title": "{{metadata-fields.characters-title}}",
+        "writers-title": "{{metadata-fields.writers-title}}",
+        "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
+        "edit-alt": "{{common.edit}}",
+        "edit-label": "편집 모드",
+        "storyline-tab": "{{series-detail.storyline-tab}}",
+        "publishers-title": "{{metadata-fields.publishers-title}}",
+        "items-title": "항목",
+        "date-range-title": "날짜 범위",
+        "more-alt": "{{series-detail.more-alt}}",
+        "reorder-alt": "항목 재정렬",
+        "dnd-warning": "드래그 앤 드롭은 모바일 기기나 읽기 목록에 100개 이상의 항목이 있을 경우 사용할 수 없습니다.",
+        "details-tab": "{{series-detail.details-tab}}"
     },
     "events-widget": {
         "title-alt": "활동",
@@ -1535,7 +1546,7 @@
         "dry-run-step": "모의 실행",
         "final-import-step": "마지막 단계",
         "comicvine-parsing-label": "Comic Vine 시리즈 매칭 사용",
-        "cbl-repo": "커뮤니티에서 많은 독서 목록을 찾을 수 있습니다. 보고.",
+        "cbl-repo": "커뮤니티에서 많은 독서 목록을 찾을 수 있습니다. 리포지토리.",
         "help-label": "{{common.help}}"
     },
     "pdf-reader": {
@@ -1571,7 +1582,6 @@
     },
     "manga-reader": {
         "back": "뒤로가기",
-        "save-globally": "전역 설정",
         "incognito-alt": "시크릿 모드가 켜져 있습니다. 끄려면 전환하세요.",
         "incognito-title": "시크릿 모드:",
         "shortcuts-menu-alt": "키보드 단축키 모달",
@@ -1593,9 +1603,9 @@
         "height": "높이",
         "width": "너비",
         "width-override-label": "너비 재지정",
-        "off": "끄기",
+        "off": "{{reader-settings.off}}",
         "original": "원본",
-        "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}",
+        "auto-close-menu-label": "{{manage-reading-profiles.auto-close-menu-label}}",
         "swipe-enabled-label": "스와이프 사용",
         "enable-comic-book-label": "만화책 에뮬레이션",
         "brightness-label": "밝기",
@@ -1606,9 +1616,12 @@
         "layout-mode-switched": "이중 레이아웃을 렌더링할 공간이 부족하여 레이아웃 모드가 단일로 전환됨",
         "no-next-chapter": "다음 챕터 없음",
         "no-prev-chapter": "이전 챕터 없음",
-        "user-preferences-updated": "사용자 기본 설정 업데이트됨",
-        "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}",
-        "series-progress": "시리즈 진행률: {{percentage}}"
+        "emulate-comic-book-label": "{{manage-reading-profiles.emulate-comic-book-label}}",
+        "series-progress": "시리즈 진행률: {{percentage}}",
+        "create-new": "{{reader-settings.create-new}}",
+        "update-parent": "{{reader-settings.update-parent}}",
+        "loading": "{{reader-settings.loading}}",
+        "create-new-tooltip": "{{reader-settings.create-new-tooltip}}"
     },
     "metadata-filter": {
         "filter-title": "{{common.filter}}",
@@ -1665,7 +1678,8 @@
         "release-year": "출시 연도",
         "read-progress": "마지막으로 읽음",
         "average-rating": "평균 평점",
-        "random": "랜덤"
+        "random": "랜덤",
+        "person-name": "이름"
     },
     "edit-series-modal": {
         "title": "{{seriesName}} 세부정보",
@@ -1802,8 +1816,8 @@
         "cover-image-tab": "{{tabs.cover-tab}}",
         "tasks-tab": "{{tabs.tasks-tab}}",
         "info-tab": "{{tabs.info-tab}}",
-        "pages-label": "{{edit-chapter-modal.pages-count}}",
-        "words-label": "{{edit-chapter-modal.length-title}}",
+        "pages-label": "{{edit-chapter-modal.pages-label}}",
+        "words-label": "{{edit-chapter-modal.words-label}}",
         "pages-count": "{{edit-chapter-modal.pages-count}}",
         "words-count": "{{edit-chapter-modal.words-count}}",
         "reading-time-label": "{{edit-chapter-modal.reading-time-label}}",
@@ -1826,7 +1840,7 @@
     "kavitaplus-metadata-breakdown-stats": {
         "title": "Kavita+ 메타데이터 분석",
         "description": "Kavita는 대상 시리즈에 대한 메타데이터(평점, 리뷰, 추천 등)를 시간이 지남에 따라 천천히 가져옵니다.",
-        "no-data": "데이터 없음",
+        "no-data": "{{common.no-data}}",
         "errored-series-label": "오류가 있는 시리즈",
         "completed-series-label": "완료된 시리즈",
         "complete": "모든 시리즈에는 메타데이터가 있습니다"
@@ -1954,14 +1968,16 @@
         "sidenav": "사이드 내비게이션",
         "external-sources": "외부 소스",
         "smart-filters": "스마트 필터",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "description": "순서 바꾸기, 표시 여부 전환, 스마트 필터 및 외부 소스를 홈페이지 또는 사이드 탐색 메뉴에 바인딩하여 Kavita의 다양한 기능을 사용자 지정할 수 있습니다."
     },
     "customize-dashboard-streams": {
         "no-data": "대시보드에 모든 스마트 필터가 추가되었거나 아직 생성되지 않았습니다.",
         "save": "{{common.save}}",
         "add": "{{common.add}}",
         "filter": "{{common.filter}}",
-        "clear": "{{common.clear}}"
+        "clear": "{{common.clear}}",
+        "smart-filter-title": "{{customize-dashboard-modal.title-smart-filters}}"
     },
     "customize-sidenav-streams": {
         "no-data": "모든 스마트 필터가 사이드 내비게이션에 추가되었거나 아직 생성되지 않았습니다.",
@@ -1989,7 +2005,15 @@
         "no-data": "스마트 필터가 생성되지 않았습니다",
         "filter": "{{common.filter}}",
         "clear": "{{common.clear}}",
-        "errored": "필터에 인코딩 오류가 있습니다. 다시 생성해야 합니다."
+        "errored": "필터에 인코딩 오류가 있습니다. 다시 생성해야 합니다.",
+        "cancel": "{{common.cancel}}",
+        "close": "{{common.close}}",
+        "save": "{{common.save}}",
+        "edit-smart-filter": "편집 {{name}}",
+        "name-label": "이름",
+        "required-field": "스마트 필터에 이름 필요",
+        "filter-name-unique": "스마트 필터 이름은 고유해야 합니다",
+        "edit": "{{common.edit}}"
     },
     "edit-external-source-item": {
         "not-unique": "이 호스트에 외부 소스가 존재합니다. 중복이 없는지 확인하세요",
@@ -2014,7 +2038,7 @@
         "reading-lists": "{{side-nav.reading-lists}}",
         "bookmarks": "{{side-nav.bookmarks}}",
         "all-series": "{{side-nav.all-series}}",
-        "browse-authors": "{{side-nav.browse-authors}}"
+        "browse-authors": "{{side-nav.browse-people}}"
     },
     "filter-field-pipe": {
         "age-rating": "{{metadata-fields.age-rating-title}}",
@@ -2120,9 +2144,8 @@
         "email-sent": "{{email}}에 이메일 전송",
         "email-not-sent": "파일에 있는 이메일이 유효한 이메일이 아니므로 보낼 수 없습니다. 로그에 링크가 기록되었습니다. 관리자는 이 링크를 제공하여 프로세스를 완료할 수 있습니다.",
         "k+-license-saved": "라이선스 키가 저장되었지만 유효하지 않습니다. 가입을 재확인하려면 확인을 클릭하십시오. 처음 등록하는 경우 전파하는 데 1분 정도 걸릴 수 있습니다.",
-        "k+-unlocked": "Kavita+ 잠금 해제!",
         "k+-error": "라이선스를 활성화하는 동안 오류가 발생했습니다. 다시 시도해 주세요.",
-        "k+-delete-key": "이렇게 하면 Kavita의 라이선스 키만 삭제되고 구매 링크가 표시됩니다. 이것은 구독을 취소하지 않습니다! 지원팀에서 지시하는 경우에만 사용하세요!",
+        "k+-delete-key": "이렇게 하면 Kavita 라이선스 키만 삭제되고 구매 링크가 표시됩니다. 구독은 취소되지 않습니다! 먼저 관리를 사용하여 구독을 취소하세요.",
         "k+-reset-key": "이렇게 하면 라이선스를 사용한 이전 등록이 무효화되고 Kavita 인스턴스를 다시 등록할 수 있습니다.",
         "k+-reset-key-success": "라이선스가 등록 해제되었습니다. 인스턴스를 다시 등록하고 Kavita+를 다시 활성화하려면 수정 버튼을 사용하세요",
         "library-deleted": "라이브러리 {{name}}이(가) 제거되었습니다",
@@ -2185,7 +2208,13 @@
         "bulk-scan": "여러 라이브러리를 스캔하는 것은 순차적으로 진행됩니다. 라이브러리 크기에 따라 시간이 오래 걸리거나 완료되지 않을 수 있습니다.",
         "bulk-covers": "여러 라이브러리에서 커버를 새로 고침하는 것은 많은 리소스를 소모하며 시간이 오래 걸릴 수 있습니다. 계속하시겠습니까?",
         "person-image-downloaded": "인물 표지를 다운로드하여 적용했습니다.",
-        "confirm-delete-multiple-chapters": "{{count}}개의 챕터/볼륨을 삭제하시겠습니까? 디스크의 파일은 수정되지 않습니다."
+        "confirm-delete-multiple-chapters": "{{count}}개의 챕터/볼륨을 삭제하시겠습니까? 디스크의 파일은 수정되지 않습니다.",
+        "bulk-delete-libraries": "{{count}}개의 라이브러리를 삭제하시겠습니까?",
+        "webtoon-override": "웹툰을 나타내는 이미지가 있어 웹툰 모드로 전환합니다.",
+        "match-success": "시리즈가 올바르게 일치함",
+        "confirm-delete-multiple-volumes": "{{count}}개의 볼륨을 삭제하시겠습니까? 디스크의 파일은 수정되지 않습니다.",
+        "scrobble-gen-init": "과거 열람 이력 및 평가를 추적하는 이벤트를 생성하여 연결된 서비스와 동기화하는 기능을 작업 예정 목록에 추가하였습니다.",
+        "series-added-want-to-read": "읽고 싶어요 목록에 추가된 시리즈"
     },
     "read-time-pipe": {
         "less-than-hour": "<1시간",
@@ -2255,7 +2284,15 @@
         "multiple-selections": "다중 선택",
         "back-to": "{{action}}으로 돌아가기",
         "title": "작업",
-        "copy-settings": "설정 복사하기"
+        "copy-settings": "설정 복사하기",
+        "match": "일치",
+        "match-tooltip": "Kavita+에서 시리즈를 수동으로 일치시키기",
+        "reorder": "정렬 변경",
+        "rename": "이름 변경",
+        "rename-tooltip": "스마트 필터 이름 변경",
+        "reading-profiles": "읽기 프로필",
+        "set-reading-profile": "읽기 프로필 설정",
+        "merge": "병합"
     },
     "preferences": {
         "left-to-right": "왼쪽에서 오른쪽",
@@ -2372,23 +2409,25 @@
         "issue-nums": "이슈",
         "chapter-nums": "챕터",
         "volume-nums": "볼륨",
-        "author-count": "{{num}} 저자"
+        "author-count": "{{num}} 저자",
+        "no-data": "데이터 없음",
+        "chapter-count": "{{num}} 챕터"
     },
     "confirm": {
-        "alert": "경고",
-        "confirm": "확인"
-    },
-    "browse-authors": {
-        "author-count": "{{num}} 사람",
-        "cover-image-description": "{{edit-series-modal.cover-image-description}}",
-        "title": "저자 및 작가 찾아보기"
+        "alert": "긴급",
+        "confirm": "확인",
+        "info": "정보",
+        "cancel": "{{common.cancel}}",
+        "ok": "Ok"
     },
     "person-detail": {
         "known-for-title": "알려진",
         "individual-role-title": "{{role}} 로서",
         "browse-person-title": "{{name}}의 모든 작품",
         "all-roles": "역할",
-        "browse-person-by-role-title": "{{role}}로서의 {{name}}의 모든 작품"
+        "browse-person-by-role-title": "{{role}}로서의 {{name}}의 모든 작품",
+        "anilist-url": "{{edit-person-modal.anilist-tooltip}}",
+        "no-info": "이 사람에 대한 정보 없음"
     },
     "edit-person-modal": {
         "general-tab": "{{edit-series-modal.general-tab}}",
@@ -2411,6 +2450,231 @@
         "anilist-tooltip": "https://anilist.co/staff/{AniListId}/",
         "hardcover-id-label": "Hardcover Id",
         "hardcover-tooltip": "https://hardcover.app/authors/{HardcoverId}",
-        "description-label": "설명"
+        "description-label": "설명",
+        "aliases-label": "별명 편집",
+        "aliases-tab": "별명"
+    },
+    "changelog-update-item": {
+        "known-issues": "알려진 문제",
+        "removed": "삭제됨",
+        "feature-requests": "기능 요청",
+        "download": "다운로드",
+        "added": "추가됨",
+        "changed": "변경됨",
+        "fixed": "수정됨",
+        "developer": "개발자",
+        "theme": "테마",
+        "api": "API",
+        "published-label": "게시된 날짜: ",
+        "installed": "{{changelog.installed}}"
+    },
+    "new-version-modal": {
+        "known-issues": "{{changelog.known-issues}}",
+        "close": "{{common.close}}",
+        "theme": "{{changelog.theme}}",
+        "changed": "{{changelog.changed}}",
+        "refresh": "새로고침",
+        "fixed": "{{changelog.fixed}}",
+        "developer": "{{changelog.developer}}",
+        "removed": "{{changelog.removed}}",
+        "api": "{{changelog.api}}",
+        "title": "Kavita가 업데이트되었습니다!",
+        "description": "Kavita의 새 버전이 출시되었습니다. 업데이트하려면 새로 고침하세요.",
+        "added": "{{changelog.added}}"
+    },
+    "manage-matched-metadata": {
+        "title": "일치하는 메타데이터",
+        "library-name-header": "라이브러리",
+        "valid-until-header": "다음 새로 고침",
+        "actions-header": "액션",
+        "matched-status-label": "일치함",
+        "unmatched-status-label": "일치하지 않음",
+        "no-data": "{{common.no-data}}",
+        "dont-match-status-label": "{{dont-match-label}}",
+        "dont-match-label": "일치하지 않음",
+        "description": "외부 메타데이터와 일치할 수 있는 모든 해당 시리즈는 여기에 있습니다. Kavita는 매일 24시간당 50개 시리즈의 시리즈 메타데이터를 사전 페치하거나 새로 고칩니다.",
+        "match-alt": "일치 {{seriesName}}",
+        "status-header": "상태",
+        "series-name-header": "시리즈",
+        "blacklist-status-label": "수동 일치 필요",
+        "all-status-label": "모두",
+        "matched-state-label": "일치 상태",
+        "library-type": "라이브러리 유형"
+    },
+    "manage-user-tokens": {
+        "username-header": "사용자 이름",
+        "anilist-header": "AniList",
+        "no-data": "{{common.no-data}}",
+        "token-set-label": "토큰 셋",
+        "description": "스크로블링 토큰을 보유한 사용자는 가끔 갱신해야 할 수 있습니다. 이메일이 설정되어 있고 유효한 이메일이 있는 경우 Kavita가 자동으로 이메일을 보냅니다.",
+        "mal-header": "MAL",
+        "expires-label": "만료: {{date}}"
+    },
+    "manage-metadata-settings": {
+        "derive-publication-status-label": "출판현황",
+        "enable-relations-label": "관계",
+        "enable-relations-tooltip": "시리즈 관계를 추가할 수 있도록 허용합니다.",
+        "enable-cover-image-tooltip": "Kavita가 시리즈의 표지 이미지를 작성하도록 허용합니다",
+        "enable-tags-label": "태그",
+        "enable-tags-tooltip": "시리즈 태그 작성을 허용합니다.",
+        "first-last-name-tooltip": "사람들의 이름이 먼저 쓰여지고 그 다음에 성으로 쓰여지도록 하세요",
+        "summary-label": "요약",
+        "whitelist-tooltip": "이 목록의 문자열만 태그에 대해 작성되는 것을 허용합니다. 쉼표로 구분해야 합니다.",
+        "age-rating-mapping-description": "장르나 태그에서 왼쪽의 문자열이 발견되면 해당 시리즈의 연령 등급이 설정됩니다.",
+        "add-age-rating-mapping-label": "연령 등급 매핑 추가",
+        "field-mapping-title": "필드 매핑",
+        "remove-source-tag-label": "소스 태그 제거",
+        "first-last-name-label": "이름 성",
+        "person-roles-label": "역할",
+        "enabled-label": "메타데이터 다운로드 활성화",
+        "enable-people-label": "사람들",
+        "derive-publication-status-tooltip": "총 장/권 수를 기준으로 출판 상태를 도출할 수 있습니다.",
+        "field-mapping-description": "장르/태그 필드에서 발견된 특정 문자열에 대한 설정 규칙을 장르/태그의 새 문자열에 매핑하고 선택적으로 소스 목록에서 제거합니다. 장르/태그를 쓸 수 있는 경우에만 적용됩니다.",
+        "blacklist-label": "블랙리스트 장르/태그",
+        "enabled-tooltip": "Kavita가 메타데이터를 다운로드하고 데이터베이스에 쓸 수 있도록 허용합니다.",
+        "summary-tooltip": "필드 잠금이 해제되면 요약을 쓸 수 있도록 허용합니다.",
+        "enable-people-tooltip": "사람(캐릭터, 작가 등)을 추가할 수 있도록 허용합니다. 모든 사람은 이미지를 포함합니다.",
+        "add-field-mapping-label": "필드 매핑 추가",
+        "localized-name-label": "현지화된 시리즈 이름",
+        "localized-name-tooltip": "필드가 잠금 해제되면 Localized Name을 쓸 수 있도록 허용합니다. Kavita는 최선의 추측을 시도합니다.",
+        "enable-cover-image-label": "표지 이미지",
+        "description": "Kavita+는 일부 제한된 메타데이터를 다운로드하여 데이터베이스에 쓸 수 있는 기능이 있습니다. 이 페이지에서는 범위에 있는 것을 토글할 수 있습니다.",
+        "tag": "태그",
+        "overrides-description": "Kavita가 잠긴 필드 위에 쓸 수 있도록 허용합니다.",
+        "overrides-label": "재정의",
+        "blacklist-tooltip": "이 목록의 모든 항목은 장르 및 태그 처리에서 모두 제거됩니다. 여기는 쓰지 않으려는 장르/태그를 추가하는 곳입니다. 쉼표로 구분해야 합니다.",
+        "enable-start-date-label": "시작일",
+        "enable-start-date-tooltip": "시리즈 시작 날짜를 시리즈에 쓸 수 있도록 허용",
+        "enable-genres-label": "장르",
+        "enable-genres-tooltip": "시리즈 장르를 작성할 수 있도록 허용합니다.",
+        "whitelist-label": "화이트리스트 태그",
+        "age-rating-mapping-title": "연령 등급 매핑",
+        "genre": "장르",
+        "enable-chapter-title-label": "제목",
+        "chapter-header": "챕터 필드",
+        "enable-chapter-title-tooltip": "Chapter/Issue 제목 작성 허용",
+        "enable-chapter-summary-label": "{{manage-metadata-settings.summary-label}}",
+        "enable-chapter-summary-tooltip": "{{manage-metadata-settings.summary-tooltip}}",
+        "enable-chapter-release-date-label": "발매일",
+        "enable-chapter-release-date-tooltip": "Chapter/Issue 발매일 작성 허용",
+        "enable-chapter-publisher-label": "출판사",
+        "enable-chapter-publisher-tooltip": "Chapter/Issue 출판사 작성 허용",
+        "enable-chapter-cover-label": "챕터 표지",
+        "enable-chapter-cover-tooltip": "Chapter/Issue 커버 설정 허용"
+    },
+    "match-series-modal": {
+        "search": "검색",
+        "dont-match-tooltip": "이 시리즈를 매칭 및 스크로블링에서 제외합니다",
+        "save": "{{common.save}}",
+        "title": "일치 {{seriesName}}",
+        "dont-match-label": "일치하지 않음",
+        "description": "Kavita+ 메타데이터를 다시 연결하고 스크로블 이벤트를 재생성하려면 매치를 선택하세요. Don't Match를 사용하면 Kavita가 메타데이터를 일치시키고 스크로블링하는 것을 제한할 수 있습니다.",
+        "close": "{{common.close}}",
+        "query-label": "쿼리",
+        "no-results": "일치하는 항목을 찾을 수 없습니다. 지원되는 공급자의 URL을 추가하고 다시 시도해 보세요.",
+        "query-tooltip": "시리즈 이름, AniList/MyAnimeList/ComicBookRoundup URL을 입력하세요. URL은 직접 조회를 사용합니다."
+    },
+    "match-series-result-item": {
+        "volume-count": "{{server-stats.volume-count}}",
+        "details": "페이지 보기",
+        "updating-metadata-status": "메타데이터 업데이트",
+        "releasing": "출시",
+        "chapter-count": "{{common.chapter-count}}",
+        "issue-count": "{{common.issue-count}}"
+    },
+    "email-history": {
+        "sent-header": "성공",
+        "no-data": "{{common.no-data}}",
+        "not-sent-tooltip": "전송되지 않음",
+        "sent-tooltip": "전송된",
+        "description": "여기에서 Kavita에서 보낸 모든 이메일과 해당 사용자에게 보낸 이메일을 확인할 수 있습니다.",
+        "user-header": "보낸 사람",
+        "date-header": "보내는 날짜",
+        "template-header": "템플릿"
+    },
+    "metadata-setting-field-pipe": {
+        "genres": "{{metadata-fields.genres-title}}",
+        "tags": "{{metadata-fields.tags-title}}",
+        "localized-name": "{{edit-series-modal.localized-name-label}}",
+        "covers": "커버",
+        "age-rating": "{{metadata-fields.age-rating-title}}",
+        "people": "{{tabs.people-tab}}",
+        "summary": "{{filter-field-pipe.summary}}",
+        "publication-status": "{{edit-series-modal.publication-status-title}}",
+        "start-date": "{{manage-metadata-settings.enable-start-date-label}}",
+        "chapter-publisher": "{{person-role-pipe.publisher}} (Chapter)",
+        "chapter-covers": "커버 (Chapter)",
+        "chapter-title": "제목 (챕터)",
+        "chapter-release-date": "발매일 (Chapter)",
+        "chapter-summary": "요약 (Chapter)"
+    },
+    "role-localized-pipe": {
+        "admin": "관리자",
+        "download": "다운로드",
+        "change-password": "패스워드 변경",
+        "bookmark": "북마크",
+        "change-restriction": "제한 변경",
+        "login": "로그인",
+        "read-only": "읽기 전용",
+        "promote": "홍보"
+    },
+    "log-level-pipe": {
+        "debug": "디버그",
+        "information": "정보",
+        "trace": "추적",
+        "warning": "경고",
+        "critical": "치명적"
+    },
+    "reviews": {
+        "user-reviews-local": "로컬 리뷰",
+        "user-reviews-plus": "외부 리뷰"
+    },
+    "review-modal": {
+        "title": "리뷰 편집",
+        "review-label": "리뷰",
+        "close": "{{common.close}}",
+        "save": "{{common.save}}",
+        "delete": "{{common.delete}}",
+        "min-length": "리뷰는 최소 {{count}}자 이상이어야 합니다",
+        "required": "{{validation.required-field}}"
+    },
+    "browse-people": {
+        "author-count": "{{num}} 사용자",
+        "cover-image-description": "{{edit-series-modal.cover-image-description}}",
+        "roles-label": "역할",
+        "sort-label": "정렬",
+        "series-count": "{{common.series-count}}",
+        "title": "사용자 탐색",
+        "issue-count": "{{common.issue-count}}",
+        "name-label": "이름"
+    },
+    "merge-person-modal": {
+        "save": "{{common.save}}",
+        "merge-warning": "진행할 경우, 선택된 사용자가 제거됩니다. 선택된 사용자의 이름은 별명으로 추가되며, 모든 역할이 이전됩니다.",
+        "src": "사용자 병합",
+        "alias-title": "새 별명",
+        "close": "{{common.close}}",
+        "title": "{{personName}}"
+    },
+    "bulk-set-reading-profile-modal": {
+        "loading": "{{common.loading}}",
+        "clear": "{{common.clear}}",
+        "filter-label": "{{common.filter}}",
+        "close": "{{common.close}}",
+        "create": "{{common.create}}",
+        "title": "읽기 프로필 설정"
+    },
+    "manage-reading-profiles": {
+        "reset": "{{common.reset}}"
+    },
+    "browse-genres": {
+        "series-count": "{{common.series-count}}",
+        "issue-count": "{{common.issue-count}}"
+    },
+    "browse-tags": {
+        "title": "태그 탐색",
+        "series-count": "{{common.series-count}}",
+        "issue-count": "{{common.issue-count}}",
+        "genre-count": "{{num}} 태그"
     }
 }
diff --git a/UI/Web/src/assets/langs/ms.json b/UI/Web/src/assets/langs/ms.json
index 88a9b66e9..caadc9d33 100644
--- a/UI/Web/src/assets/langs/ms.json
+++ b/UI/Web/src/assets/langs/ms.json
@@ -21,19 +21,12 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}"
     },
     "user-scrobble-history": {
         "filter-label": "{{common.filter}}",
         "special": "{{entity-title.special}}"
     },
-    "review-series-modal": {
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}"
     },
diff --git a/UI/Web/src/assets/langs/nb_NO.json b/UI/Web/src/assets/langs/nb_NO.json
index 48fa5d568..ac0ed2c76 100644
--- a/UI/Web/src/assets/langs/nb_NO.json
+++ b/UI/Web/src/assets/langs/nb_NO.json
@@ -10,19 +10,12 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}"
     },
     "user-scrobble-history": {
         "filter-label": "{{common.filter}}",
         "special": "{{entity-title.special}}"
     },
-    "review-series-modal": {
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}"
     },
diff --git a/UI/Web/src/assets/langs/nl.json b/UI/Web/src/assets/langs/nl.json
index 704ed3cb2..d9a3a4df1 100644
--- a/UI/Web/src/assets/langs/nl.json
+++ b/UI/Web/src/assets/langs/nl.json
@@ -8,7 +8,7 @@
         "submit": "Inloggen"
     },
     "dashboard": {
-        "no-libraries": "Er zijn nog geen bibliotheken ingesteld. Configureer wat in",
+        "no-libraries": "Er zijn nog geen bibliotheken ingesteld. Creëer wat in",
         "server-settings-link": "Serverinstellingen",
         "not-granted": "U heeft geen toegang gekregen tot bibliotheken.",
         "on-deck-title": "Aan het lezen",
@@ -22,10 +22,11 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "saving": "Opslaan…",
-        "update": "Update"
+        "update": "Update",
+        "invalid-email-warning": "Een ongeldig e-mailadres blokkeert bepaalde functionaliteiten van Kavita",
+        "account-detail-title": "Accountgegevens"
     },
     "user-scrobble-history": {
         "title": "Scrobble geschiedenis",
@@ -43,7 +44,13 @@
         "not-applicable": "Niet toepasbaar",
         "processed": "Verwerkt",
         "not-processed": "Niet Verwerkt",
-        "special": "{{entity-title.special}}"
+        "special": "{{entity-title.special}}",
+        "scrobbling-disabled": "Scrobbelen is uitgeschakeld in uw Accountinstellingen.",
+        "volume-num": "Deel {{num}}",
+        "chapter-num": "Hoofdstuk {{num}}",
+        "not-read-warning": "Upstream-providers behouden altijd het hoogste aantal",
+        "generate-scrobble-events": "Genereer evenementen",
+        "token-expired": "Je AniList-token is verlopen! Scrobbling-evenementen zullen niet verwerkt worden totdat je deze verlengt op de Accounts-pagina."
     },
     "scrobble-event-type-pipe": {
         "chapter-read": "Leesvoortgang",
@@ -55,15 +62,6 @@
     "spoiler": {
         "click-to-show": "Spoiler, klik om te tonen"
     },
-    "review-series-modal": {
-        "title": "Beoordeling bewerken",
-        "review-label": "Beoordeling",
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "min-length": "Review moet minimum {{count}} characters hebben",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}",
         "user-review": "{{username}}s Recensie",
@@ -73,7 +71,7 @@
     "review-card": {
         "your-review": "Dit is jouw recensie",
         "external-review": "Externe recensie",
-        "local-review": "Recensie",
+        "local-review": "Lokale recensie",
         "rating-percentage": "Beoordeling {{r}}%"
     },
     "want-to-read": {
@@ -108,47 +106,16 @@
         "collapse-series-relationships-tooltip": "Moet Kavita series laten zien die geen relaties hebben of die geen ouder / prequel is",
         "share-series-reviews-label": "Deel serierecensies",
         "share-series-reviews-tooltip": "Moet Kavita jouw beoordelingen van Series voor andere gebruikers gebruiken",
-        "image-reader-settings-title": "Afbeeldingslezer",
-        "reading-direction-label": "Leesrichting",
-        "reading-direction-tooltip": "Richting om te klikken om naar de volgende pagina te gaan. Rechts naar links betekent dat u aan de linkerkant van het scherm klikt om naar de volgende pagina te gaan.",
-        "scaling-option-label": "Schaal opties",
-        "scaling-option-tooltip": "Hoe de afbeelding naar uw scherm te schalen.",
-        "page-splitting-label": "Pagina splitsen",
-        "page-splitting-tooltip": "Een afbeelding over de volledige breedte splitsen (dwz zowel de linker- als de rechterafbeelding worden gecombineerd)",
-        "reading-mode-label": "Leesmodus",
-        "layout-mode-label": "Lay-out Modus",
-        "layout-mode-tooltip": "Geef een enkele afbeelding of twee afbeeldingen naast elkaar weer",
-        "background-color-label": "Achtergrondkleur",
-        "auto-close-menu-label": "Menu automatisch sluiten",
-        "show-screen-hints-label": "Toon schermhints",
-        "emulate-comic-book-label": "Emuleer Stripverhaal",
-        "swipe-to-paginate-label": "Veeg om te bladeren",
-        "book-reader-settings-title": "Boekenlezer",
-        "tap-to-paginate-label": "Tik om te bladeren",
-        "tap-to-paginate-tooltip": "Tikken op de zijden van de lezen toestaan om te bladeren naar vorige/volgende pagina",
-        "immersive-mode-label": "Immersie-modus",
-        "immersive-mode-tooltip": "Hierdoor wordt het menu verborgen achter een klik op het lezerdocument en wordt de tik om te pagineren ingeschakeld",
-        "reading-direction-book-label": "Leesrichting",
-        "reading-direction-book-tooltip": "Richting waarin u klikt om naar de volgende pagina te gaan. Van rechts naar links betekent dat u aan de linkerkant van het scherm klikt om naar de volgende pagina te gaan.",
-        "font-family-label": "Lettertypefamilie",
-        "font-family-tooltip": "Lettertypefamilie om te laden. Standaard laadt het standaardlettertype van het boek",
-        "writing-style-label": "Schrijfstijl",
-        "writing-style-tooltip": "Verandert de richting van de tekst. Horizontaal is van links naar rechts, verticaal is van boven naar beneden.",
-        "layout-mode-book-label": "Lay-outmodus",
-        "layout-mode-book-tooltip": "Hoe de inhoud moet worden ingedeeld. Scroll is zoals het boek het verpakt. 1 of 2 kolommen passen bij de hoogte van het apparaat en er passen 1 of 2 kolommen tekst per pagina",
-        "color-theme-book-label": "Kleurenthema",
-        "color-theme-book-tooltip": "Welk kleurenthema moet worden toegepast op de inhoud en het menu van de boeklezer",
-        "font-size-book-label": "Lettertypegrootte",
-        "line-height-book-label": "Regelafstand",
-        "line-height-book-tooltip": "Hoeveel ruimte tussen de regels van het boek",
-        "margin-book-label": "Marge",
-        "margin-book-tooltip": "Hoeveel ruimte aan elke kant van het scherm. Dit overschrijft naar 0 op mobiele apparaten, ongeacht deze instelling.",
         "clients-opds-alert": "OPDS is niet ingeschakeld op deze server. Dit heeft geen invloed op Tachiyomi-gebruikers.",
         "clients-opds-description": "Alle externe clients gebruiken de API-sleutel of de onderstaande verbindings-URL. Dit zijn net wachtwoorden, houd het privé.",
         "clients-api-key-tooltip": "De API-sleutel is als een wachtwoord. Houd het geheim, houd het veilig.",
         "clients-opds-url-tooltip": "OPDS URL",
         "reset": "{{common.reset}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "anilist-scrobbling-tooltip": "Laat Kavita om naar AniList uw leesvoortgang en recensies te Scrobblen (eenrichtingssynchronisatie)",
+        "kavitaplus-settings-title": "Kavita+",
+        "anilist-scrobbling-label": "AniList scrobbelen",
+        "want-to-read-sync-label": "Willen Lezen Sync"
     },
     "user-holds": {
         "title": "Scrobble Holds",
@@ -500,10 +467,7 @@
     "changelog": {
         "installed": "Geïnstalleerd",
         "download": "Download",
-        "published-label": "Gepubliceerd: ",
-        "available": "Beschikbaar",
-        "description": "Als je geen {{installed}} ziet",
-        "description-continued": "tag, je bent op een nightly release. Alleen hoofdversies worden weergegeven als beschikbaar."
+        "available": "Beschikbaar"
     },
     "invite-user": {
         "title": "Gebruiker uitnodigen",
@@ -1058,9 +1022,6 @@
         "backup-database-task-success": "Een taak voor het maken van een back-up van de database is in de wachtrij geplaatst",
         "download-logs-task": "Logboeken downloaden",
         "download-logs-task-desc": "Compileert alle logbestanden in een zip en downloadt deze.",
-        "analyze-files-task": "Analyseer bestanden",
-        "analyze-files-task-desc": "Voert een langlopende taak uit die bestanden analyseert om extensie en grootte te genereren. Dit mag slechts één keer worden uitgevoerd voor de v0.7-release. Niet nodig als je post v0.7 hebt geïnstalleerd.",
-        "analyze-files-task-success": "Bestandsanalyse is in de wachtrij geplaatst",
         "check-for-updates-task": "Controleer op updates",
         "check-for-updates-task-desc": "Kijk of er stabiele releases zijn vóór uw versie."
     },
@@ -1291,7 +1252,6 @@
     },
     "manga-reader": {
         "back": "Terug",
-        "save-globally": "Globaal opslaan",
         "incognito-alt": "De incognitomodus staat aan. Schakel om uit te schakelen.",
         "incognito-title": "Incognito modus:",
         "shortcuts-menu-alt": "Sneltoetsen Modaal",
@@ -1323,7 +1283,6 @@
         "layout-mode-switched": "De lay-outmodus is overgeschakeld naar Enkel omdat er onvoldoende ruimte is om een dubbele lay-out weer te geven",
         "no-next-chapter": "Geen volgend hoofdstuk",
         "no-prev-chapter": "Geen vorig hoofdstuk",
-        "user-preferences-updated": "Gebruikersvoorkeuren bijgewerkt",
         "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}"
     },
     "metadata-filter": {
diff --git a/UI/Web/src/assets/langs/pl.json b/UI/Web/src/assets/langs/pl.json
index b3040e15d..3184ac616 100644
--- a/UI/Web/src/assets/langs/pl.json
+++ b/UI/Web/src/assets/langs/pl.json
@@ -22,11 +22,11 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "saving": "Zapisuję…",
         "update": "Aktualizacja",
-        "account-detail-title": "Szczegóły konta"
+        "account-detail-title": "Szczegóły konta",
+        "invalid-email-warning": "Nie poprawny adres e-mail zablokuje niektóre funkcję Kavity"
     },
     "user-scrobble-history": {
         "title": "Historia Scrobblowania",
@@ -39,7 +39,7 @@
         "series-header": "Serie",
         "data-header": "Data",
         "is-processed-header": "Jest przetwarzany",
-        "no-data": "Brak danych",
+        "no-data": "{{common.no-data}}",
         "volume-and-chapter-num": "Tom {{v}} Rozdział {{n}}",
         "volume-num": "Tom {{num}}",
         "chapter-num": "Rozdział {{num}}",
@@ -47,7 +47,12 @@
         "not-applicable": "Nie dotyczy",
         "processed": "Przetworzono",
         "not-processed": "Nie przetworzono",
-        "special": "{{entity-title.special}}"
+        "special": "{{entity-title.special}}",
+        "scrobbling-disabled": "Scrobbling jest wyłączony w opcjach twojego Konta.",
+        "token-expired": "Twój token AniList wygasł! Scrobbling nie będzie przetwarzany do momentu jego odnowienia na stronie Konta.",
+        "generate-scrobble-events": "Wydarzenia Backfill",
+        "select-all-label": "Zaznacz wszystko",
+        "delete-selected-label": "Usuń zaznaczone"
     },
     "scrobble-event-type-pipe": {
         "chapter-read": "Postęp czytania",
@@ -59,15 +64,6 @@
     "spoiler": {
         "click-to-show": "Spoiler, kliknij by wyświetlić"
     },
-    "review-series-modal": {
-        "title": "Edytuj recenzję",
-        "review-label": "Recenzja",
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "min-length": "Recenzja musi zawierać co najmniej {{count}} znaków",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}",
         "user-review": "Recenzja {{username}}",
@@ -78,7 +74,8 @@
         "your-review": "To twoja recenzja",
         "external-review": "Recenzja zewnętrzna",
         "local-review": "Recenzja lokalna",
-        "rating-percentage": "Ocena {{r}}%"
+        "rating-percentage": "Ocena {{r}}%",
+        "critic": "krytyk"
     },
     "want-to-read": {
         "title": "Chcę przeczytać",
@@ -88,7 +85,7 @@
     },
     "user-preferences": {
         "title": "Panel użytkownika",
-        "pref-description": "To są ustawienia globalne, które powiązane są z twoim kontem.",
+        "pref-description": "To są ustawienia globalne, które powiązane są z twoim kontem. Ustawienia czytnika znajdują się w Profilach czytania.",
         "account-tab": "{{tabs.account-tab}}",
         "preferences-tab": "{{tabs.preferences-tab}}",
         "theme-tab": "{{tabs.theme-tab}}",
@@ -112,68 +109,27 @@
         "collapse-series-relationships-tooltip": "Czy Kavita powinna pokazywać serie, które nie mają powiązań lub są rodzicem/prequelem",
         "share-series-reviews-label": "Udostępnij recenzje serii",
         "share-series-reviews-tooltip": "Czy Kavita powinna udostępniać Twoje recenzje serii innym użytkownikom?",
-        "image-reader-settings-title": "Czytnik obrazów",
-        "reading-direction-label": "Kierunek czytania",
-        "reading-direction-tooltip": "Kierunek kliknięcia, aby przejść do następnej strony. Od prawej do lewej oznacza, że należy kliknąć po lewej stronie ekranu, aby przejść do następnej strony.",
-        "scaling-option-label": "Opcje skalowania",
-        "scaling-option-tooltip": "Jak skalować obraz do ekranu.",
-        "page-splitting-label": "Podział stron",
-        "page-splitting-tooltip": "Jak podzielić obraz o pełnej szerokości (tj. połączyć lewy i prawy obraz)",
-        "reading-mode-label": "Tryb czytania",
-        "reading-mode-tooltip": "Zmień czytnik na podział stron pionowo, poziomo lub na nieskończone przewijanie",
-        "layout-mode-label": "Rodzaj układu",
-        "layout-mode-tooltip": "Wyświetlaj pojedynczy obraz na ekranie lub dwa obrazy obok siebie",
-        "background-color-label": "Kolor tła",
-        "background-color-tooltip": "Kolor tła czytnika obrazów",
-        "auto-close-menu-label": "Automatyczne zamknięcie menu",
-        "auto-close-menu-tooltip": "Automatyczne zamykanie menu",
-        "show-screen-hints-label": "Wyświetlaj podpowiedzi",
-        "show-screen-hints-tooltip": "Pokaż nakładkę aby lepiej zobrazować strefy paginacji i kierunek czytania",
-        "emulate-comic-book-label": "Naśladuj komiks",
-        "emulate-comic-book-tooltip": "Dodaje efekt cienia, aby imitować czytanie z książki",
-        "swipe-to-paginate-label": "Przesuń, aby zmienić stronę",
-        "swipe-to-paginate-tooltip": "Czy przesunięcie palcem po ekranie powinno powodować przejście do następnej lub poprzedniej strony",
-        "book-reader-settings-title": "Czytnik książek",
-        "tap-to-paginate-label": "Stuknij aby zmienić stronę",
-        "tap-to-paginate-tooltip": "Czy boki ekranu czytnika książek powinny umożliwiać dotknięcie go w celu przejścia do poprzedniej/następnej strony?",
-        "immersive-mode-label": "Tryb immersyjny",
-        "immersive-mode-tooltip": "Spowoduje to ukrycie menu po kliknięciu czytnika i włączenie funkcji podziału na strony",
-        "reading-direction-book-label": "Kierunek czytania",
-        "reading-direction-book-tooltip": "Kierunek kliknięcia, aby przejść do następnej strony. Od prawej do lewej oznacza, że należy kliknąć po lewej stronie ekranu, aby przejść do następnej strony.",
-        "font-family-label": "Rodzina czcionek",
-        "font-family-tooltip": "Rodzina czcionek do załadowania. Domyślna spowoduje załadowanie domyślnej czcionki książki",
-        "writing-style-label": "Kierunek tekstu",
-        "writing-style-tooltip": "Zmienia kierunek tekstu. Poziomo od lewej do prawej, pionowo od góry do dołu.",
-        "layout-mode-book-label": "Rodzaj układu",
-        "layout-mode-book-tooltip": "Jak powinna być ułożona treść. Przewijanie jest takie, jak w książce. 1 lub 2 kolumny dopasowują się do wysokości urządzenia i mieszczą 1 lub 2 kolumny tekstu na stronie",
-        "color-theme-book-label": "Kolor motywu",
-        "color-theme-book-tooltip": "Jaki motyw kolorystyczny zastosować do treści i menu czytnika książek?",
-        "font-size-book-label": "Rozmiar czcionki",
-        "font-size-book-tooltip": "Procent skalowania do zastosowania dla czcionki w książce",
-        "line-height-book-label": "Odstępy między wierszami",
-        "line-height-book-tooltip": "Jak duży odstęp między wierszami książki",
-        "margin-book-label": "Margines",
-        "margin-book-tooltip": "Odstępy po każdej stronie ekranu. Na urządzeniach mobilnych wartość ta zostanie zastąpiona wartością 0, niezależnie od tego ustawienia.",
-        "pdf-reader-settings-title": "Czytnik PDF",
-        "pdf-scroll-mode-label": "Tryb przewijania",
-        "pdf-scroll-mode-tooltip": "Sposób przewijania stron. Pionowo/poziomo i dotknij, aby zmienić stronę (bez przewijania)",
-        "pdf-spread-mode-label": "Tryb układu stron",
-        "pdf-spread-mode-tooltip": "Jak powinny być rozmieszczone strony. Pojedynczo lub podwójnie (zaczynając od nieparzystej/parzystej)",
-        "pdf-theme-label": "Motyw",
-        "pdf-theme-tooltip": "Motyw kolorystyczny czytnika",
         "clients-opds-alert": "OPDS nie jest włączony na tym serwerze. Nie będzie to miało wpływu na użytkowników Tachiyomi.",
         "clients-opds-description": "Wszystkie zewnętrzne aplikacje będą używać poniższego klucza API lub linku URL. Są one jak hasła, zachowa je w tajemnicy.",
         "clients-api-key-tooltip": "Klucz API jest jak hasło. Zresetowanie spowoduje unieważnienie wszystkich istniejących klientów.",
         "clients-opds-url-label": "OPDS URL",
         "clients-api-key-label": "Klucz API",
-        "clients-opds-url-tooltip": "Zobacz listę wspieranych klientów ODPS: ",
+        "clients-opds-url-tooltip": "Zobacz listę wspieranych klientów OPDS: ",
         "reset": "{{common.reset}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "kavitaplus-settings-title": "Kavita+",
+        "anilist-scrobbling-tooltip": "Pozwól Kavicie Scrobblować (synchronizacja jednostronna) postęp czytania i oceny do AniList",
+        "anilist-scrobbling-label": "AniList Scrobbling",
+        "want-to-read-sync-label": "Synchronizuj Chcę przeczytać",
+        "want-to-read-sync-tooltip": "Pozwól Kavicie na dodanie do twojej listy Chcę przeczytać na podstawie serii oczekujących na przeczytanie z AniList i MAL"
     },
     "user-holds": {
-        "description": "To jest lista serii zarządzana przez użytkownika, które nie będą scrobblowane do zewnętrznych dostawców. Możesz usunąć serię w dowolnym momencie, a następne zdarzenie umożliwiające scrobblowanie (postęp czytania, ocena, status 'chcę przeczytać') wywoła odpowiednie zdarzenia.",
+        "description": "To jest lista serii zarządzana przez użytkownika, które nie będą scrobblowane do zewnętrznych dostawców. Możesz usunąć serię w dowolnym momencie, a następne zdarzenie umożliwiające scrobblowanie (postęp czytania, ocena, status 'chcę przeczytać') wywoła scrobblowanie.",
         "no-data": "{{typeahead.no-data}}",
-        "title": "Wstrzymane pozycje scrobblowania"
+        "title": "Wstrzymane pozycje scrobblowania",
+        "series-name-header": "{{manage-matched-metadata.series-name-header}}",
+        "created-header": "{{manage-media-issues.created-header}}",
+        "delete-label": "{{common.remove}}"
     },
     "theme-manager": {
         "title": "Menedżer motywów",
@@ -223,7 +179,7 @@
         "devices-title": "Urządzenia",
         "no-devices": "Nie skonfigurowano jeszcze żadnych urządzeń",
         "platform-label": "Platforma",
-        "email-label": "Email",
+        "email-label": "E-mail",
         "name-label": "Nazwa",
         "email-setup-alert": "Chcesz wysyłać pliki na swoje urządzenia? Najpierw poproś administratora o skonfigurowanie poczty e-mail!",
         "add": "{{common.add}}",
@@ -259,12 +215,12 @@
         "permission-error": "Nie masz uprawnień do zmiany hasła. Skontaktuj się z administratorem serwera."
     },
     "change-email": {
-        "email-title": "Email",
-        "email-label": "Nowy Email",
+        "email-title": "E-mail",
+        "email-label": "Nowy E-mail",
         "current-password-label": "Bieżące hasło",
         "email-not-confirmed": "Ten e-mail nie został potwierdzony",
         "email-confirmed": "Ten e-mail został potwierdzony",
-        "email-updated-title": "Zaktualizowano email",
+        "email-updated-title": "Zaktualizowano e-mail",
         "email-updated-description": "Możesz użyć poniższego linku, aby potwierdzić adres e-mail swojego konta. Jeżeli został skonfigurowany, wiadomość e-mail zostanie wysłana, a link może zostać użyty do potwierdzenia wiadomości e-mail.",
         "setup-user-account": "Konfiguracja konta użytkownika",
         "invite-url-label": "Adres URL zaproszenia",
@@ -293,7 +249,8 @@
         "regen-warning": "Ponowne wygenerowanie klucza API spowoduje unieważnienie wszystkich istniejących klientów.",
         "no-key": "BŁĄD - KLUCZ NIE ZOSTAŁ USTAWIONY",
         "confirm-reset": "Spowoduje to unieważnienie wszystkich skonfigurowanych ustawień OPDS. Czy na pewno chcesz kontynuować?",
-        "key-reset": "Reset klucza API"
+        "key-reset": "Reset klucza API",
+        "reset": "Reset"
     },
     "scrobbling-providers": {
         "title": "Dostawcy usług scrobblowania",
@@ -313,14 +270,20 @@
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
-        "loading": "{{common.loading}}"
+        "loading": "{{common.loading}}",
+        "mal-used-for": "MyAnimeList jest użyte do synchronizacji Inteligentnej Kolekcji oraz Chcę przeczytać.",
+        "anilist-first-description": "Twój token AniList jest teraz skonfigurowany. Ten token działa przez rok, a Kavita poinformuje Cię przed jego wygaśnięciem, aby odświeżyć go tutaj. Dzięki temu Kavita wygeneruje zdarzenia scrobble (synchronizacji) z historii czytania, chęci przeczytania i ocen. Można to zrobić teraz lub później. Jeśli masz jakieś serie, których nie chcesz scrobblować, wybierz później i umieść na nich Scrobble Hold. Wystarczy uruchomić to zadanie tylko raz. Następnie Kavita zajmie się synchronizacją.
           Jeśli wybierzesz „Później”, możesz znaleźć przycisk na stronie Scrobbling.",
+        "anilist-used-for": "AniList jest używane do scrobblowania (synchronizacja danych) i synchronizacja Chcę przeczytać.",
+        "anilist-first-header": "Token AniList zapisany",
+        "anilist-first-later": "Potem",
+        "anilist-first-now": "Teraz"
     },
     "typeahead": {
         "locked-field": "Pole jest zablokowane",
         "close": "{{common.close}}",
         "loading": "{{common.loading}}",
         "add-item": "Dodaj {{item}}…",
-        "no-data": "Brak danych",
+        "no-data": "{{common.no-data}}",
         "add-custom-item": ", aby dodać element niestandardowy"
     },
     "generic-list-modal": {
@@ -450,7 +413,7 @@
     },
     "relationship-pipe": {
         "adaptation": "Adaptacja",
-        "alternative-setting": "Alternatywne miejsce akcji",
+        "alternative-setting": "Alternatywne uniwersum",
         "alternative-version": "Alternatywna wersja",
         "character": "Postać",
         "contains": "Zawiera",
@@ -458,18 +421,18 @@
         "other": "Inne",
         "prequel": "Prequel",
         "sequel": "Sequel",
-        "side-story": "Opowieść poboczna",
-        "spin-off": "Spin Off",
-        "parent": "Rodzic",
-        "edition": "Edycja",
-        "annual": "Coroczny"
+        "side-story": "Historia poboczna",
+        "spin-off": "Spin-off",
+        "parent": "Główna historia",
+        "edition": "Wersja wydania",
+        "annual": "Wydanie roczne"
     },
     "publication-status-pipe": {
         "ongoing": "W trakcie",
-        "hiatus": "Hiatus",
-        "completed": "Zakończono",
+        "hiatus": "Wstrzymano",
+        "completed": "Zakończono (kompletne)",
         "cancelled": "Anulowano",
-        "ended": "Zakończono"
+        "ended": "Zakończono (niekompletne)"
     },
     "person-role-pipe": {
         "artist": "Artysta",
@@ -497,9 +460,9 @@
     },
     "library-type-pipe": {
         "book": "Książka",
-        "comic": "Komiks",
+        "comic": "Komiks (Legacy)",
         "manga": "Manga",
-        "comicVine": "Comic Vine",
+        "comicVine": "Comic",
         "image": "Obraz",
         "lightNovel": "Light Novel"
     },
@@ -561,10 +524,7 @@
         "installed": "Zainstalowane",
         "download": "Pobrane",
         "nightly": "Nightly: {{version}}",
-        "published-label": "Opublikowano: ",
-        "available": "Dostępne",
-        "description": "Jeśli nie widzisz {{installed}}",
-        "description-continued": "oznacza, że korzystasz z wersji nightly. Tylko główne wersje będą wyświetlane jako dostępne. Tag nightly będzie wyświetlany podczas korzystania z wersji nightly."
+        "available": "Dostępne"
     },
     "invite-user": {
         "title": "Zaproś użytkownika",
@@ -610,15 +570,35 @@
         "activate-discordId-tooltip": "Połącz swoje konto Discord z Kavita+. Dzięki temu uzyskasz dostęp do ukrytych kanałów, które pomogą ci kształtować Kavitę.",
         "discord-validation": "To nie jest prawidłowy identyfikator użytkownika Discord. Twój identyfikator użytkownika nie jest nazwą użytkownika Discord.",
         "activate-delete": "{{common.delete}}",
-        "activate-reset": "{{common.reset}}",
+        "activate-reset": "Resetuj licencję",
         "activate-reset-tooltip": "Unieważnienie poprzedniej rejestracji przy użyciu licencji. Wymaga zarówno licencji, jak i adresu e-mail",
         "activate-save": "{{common.save}}",
         "kavita+-desc-part-1": "Kavita+ to usługa subskrypcji premium, która odblokowuje funkcje dla wszystkich użytkowników tej instancji Kavita. Kup subskrypcję, aby odblokować ",
         "kavita+-desc-part-2": "dodatkowe korzyści",
         "kavita+-desc-part-3": "dzisiaj!",
-        "kavita+-requirement": "Kavita+ została zaprojektowana do pracy tylko z ostatnim 2 wersjami. Wszystko poza tym może nie działać.",
-        "kavita+-releases": "Zobacz wydania",
-        "help-label": "{{common.help}}"
+        "kavita+-requirement": "Kavita+ została zaprojektowana do pracy tylko z ostatnim 3 wersjami. Wszystko poza tym może nie działać.",
+        "help-label": "{{common.help}}",
+        "k+-license-overwrite": "Licencja jest zarejestrowana na inną instancję Kavita.Może się to zdarzyć przy ponownej instalacji i rzadko z powodu aktualizacji systemu. Wybierz opcję zastąpienia, aby wymusić rejestrację tej instancji w Kavita+.",
+        "k+-unlocked-description": "Witamy w Kavita+! Kavita wygeneruje wydarzenia scrobble na podstawie twoich postępów, ocen i listy Chcę przeczytać po zarejestrowaniu dostawców scrobblingu na koncie. Poświęć trochę czasu, aby upewnić się, że umieściłeś blokady scrobblowania dla wszystkich serii, których nie chcesz scrobblować.",
+        "info-title": "Informacje licencyjne",
+        "actions-title": "Akcje",
+        "license-active-label": "Aktywacja licencji",
+        "expiration-label": "Wygaśnie",
+        "valid-tooltip": "Ważne",
+        "invalid-tooltip": "Nieważne",
+        "reset-label": "Reset",
+        "delete-label": "Usuń licencję",
+        "faq-title": "FAQ",
+        "total-subbed-months-label": "Łączna liczba miesięcy subskrypcji",
+        "license-mismatch": "Licencja może być używana w innej instancji Kavity. Zarejestruj ponownie aby naprawić.",
+        "k+-already-registered-header": "Licencja jest już zarejestrowana",
+        "overwrite": "Zastęp",
+        "k+-unlocked": "Kavita+ odblokowana!",
+        "supported-version-label": "W wspieranej wersji Kavita",
+        "reset-tooltip": "Spowoduje to reset serwera Kavita+, do którego powiązana jest licencja. Wymaga adresu e-mail i klucza licencji",
+        "email-label": "Zarejestrowany e-mail",
+        "delete-tooltip": "Spowoduje to usunięcie licencji z Kavity, aby uniemożliwić Kavicie rozmowę z Kavitą+. Nie powoduje to anulowania subskrypcji. Aby anulować subskrypcję, należy najpierw użyć opcji „Zarządzaj”.",
+        "manage-tooltip": "Zaktualizuj metody płatności, anulowanie/wstrzymanie subskrypcji, itp."
     },
     "book-line-overlay": {
         "copy": "Kopiuj",
@@ -651,7 +631,10 @@
         "incognito-mode-label": "Tryb incognito",
         "next": "Dalej",
         "previous": "Poprzedni",
-        "go-to-page-prompt": "Jest {{totalPages}} stron. Na jaką stronę chcesz przejść?"
+        "go-to-page-prompt": "Jest {{totalPages}} stron. Na jaką stronę chcesz przejść?",
+        "go-to-first-page": "Idź do pierwszej strony",
+        "go-to-section": "Idź do sekcji",
+        "go-to-section-prompt": "Znajduje się {{totalSections}} sekcji. Do której sekcji chcesz przejść?"
     },
     "personal-table-of-contents": {
         "no-data": "Nie dodano jeszcze nic do zakładek",
@@ -699,7 +682,7 @@
     "series-detail": {
         "page-settings-title": "Ustawienia strony",
         "close": "{{common.close}}",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
         "layout-mode-option-card": "Karta",
         "layout-mode-option-list": "Lista",
         "continue-from": "Kontynuuj {{title}}",
@@ -725,8 +708,6 @@
         "no-pages": "{{toasts.no-pages}}",
         "no-chapters": "W tym tomie nie ma rozdziałów. Nie można odczytać.",
         "cover-change": "Odświeżenie obrazu w przeglądarce może potrwać do minuty. Do tego czasu na niektórych stronach może być wyświetlany stary obraz.",
-        "user-reviews-local": "Lokalne recenzje",
-        "user-reviews-plus": "Zewnętrzne recenzje",
         "writers-title": "{{metadata-fields.writers-title}}",
         "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
         "characters-title": "{{metadata-fields.characters-title}}",
@@ -752,9 +733,11 @@
         "more-alt": "Więcej",
         "time-left-alt": "Pozostały czas",
         "time-to-read-alt": "{{sort-field-pipe.time-to-read}}",
-        "scrobbling-tooltip": "{{settings.scrobbling}}",
+        "scrobbling-tooltip": "{{settings.scrobbling}}: {{value}}",
         "publication-status-title": "Publikacja",
-        "publication-status-tooltip": "Status publikacji"
+        "publication-status-tooltip": "Status publikacji",
+        "on": "{{reader-settings.on}}",
+        "off": "{{reader-settings.off}}"
     },
     "metadata-fields": {
         "collections-title": "{{side-nav.collections}}",
@@ -786,7 +769,8 @@
         "entry-label": "Zobacz szczegóły",
         "kavita-tooltip": "Twoja ocena + ogólna",
         "kavita-rating-title": "Twoja ocena",
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "critic": "{{review-card.critic}}"
     },
     "badge-expander": {
         "more-items": "i {{count}} więcej"
@@ -821,7 +805,9 @@
         "back": "Wstecz",
         "more": "Więcej",
         "customize": "{{settings.customize}}",
-        "browse-authors": "Przeglądaj autorów"
+        "edit": "{{common.edit}}",
+        "cancel-edit": "Zamknij zmianę kolejności",
+        "browse-people": "Przeglądaj osoby"
     },
     "library-settings-modal": {
         "close": "{{common.close}}",
@@ -838,7 +824,7 @@
         "type-label": "Typ",
         "type-tooltip": "Typ biblioteki określa sposób analizowania nazw plików i to, czy interfejs użytkownika pokazuje rozdziały (manga) czy wydania (komiksy). Więcej szczegółów na temat różnic między typami bibliotek można znaleźć na wiki.",
         "kavitaplus-eligible-label": "Kwalifikuje się do Kavity+",
-        "kavitaplus-eligible-tooltip": "Czy Kavita+ będzie pobierać informacje lub obsługiwać Scrobblowanie",
+        "kavitaplus-eligible-tooltip": "Obsługuje funkcje metadanych Kavita+ lub Scrobbling",
         "folder-description": "Dodaj foldery do biblioteki",
         "browse": "Wyszukaj foldery z multimediami",
         "help-us-part-1": "Pomóż nam, postępując zgodnie z ",
@@ -872,7 +858,11 @@
         "file-type-group-tooltip": "Jakie typy plików Kavita będzie szukać podczas skanowania. Na przykład, Archiwa zawiera wszystkie cb*, zip, rar, itd. typy plików.",
         "exclude-patterns-label": "Wyklucz wzorce",
         "exclude-patterns-tooltip": "Skonfiguruj zestaw wzorców (składnia Glob) które Kavita będzie dopasowywać podczas skanowania katalogów i wykluczać z wyników skanera.",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "allow-metadata-matching-tooltip": "Czy Kavita powinna pobrać metadane dla serii w tej bibliotece.Nastąpi to tylko wtedy, gdy serwer ma aktywną subskrypcję Kavita+.",
+        "allow-metadata-matching-label": "Zezwól na dopasowywanie metadanych",
+        "enable-metadata-label": "Włącz metadane (ComicInfo/Epub/PDF)",
+        "enable-metadata-tooltip": "Umożliwienie Kavicie odczytywania plików metadanych, które zastępują parsowanie nazw plików."
     },
     "file-type-group-pipe": {
         "archive": "Archiwum",
@@ -882,39 +872,47 @@
     },
     "reader-settings": {
         "general-settings-title": "Ustawienia ogólne",
-        "font-family-label": "{{user-preferences.font-family-label}}",
-        "font-size-label": "{{user-preferences.font-size-book-label}}",
-        "line-spacing-label": "{{user-preferences.line-height-book-label}}",
-        "margin-label": "{{user-preferences.margin-book-label}}",
+        "font-family-label": "{{manage-reading-profiles.font-family-label}}",
+        "font-size-label": "{{manage-reading-profiles.font-size-book-label}}",
+        "line-spacing-label": "{{manage-reading-profiles.line-height-book-label}}",
+        "margin-label": "{{manage-reading-profiles.margin-book-label}}",
         "reset-to-defaults": "Przywróć ustawienia domyślne",
         "reader-settings-title": "Ustawienia czytnika",
-        "reading-direction-label": "{{user-preferences.reading-direction-book-label}}",
+        "reading-direction-label": "{{manage-reading-profiles.reading-direction-book-label}}",
         "right-to-left": "Od prawej do lewej",
         "left-to-right": "Od lewej do prawej",
         "horizontal": "Poziomo",
         "vertical": "Pionowo",
-        "writing-style-label": "{{user-preferences.writing-style-label}}",
+        "writing-style-label": "{{manage-reading-profiles.writing-style-label}}",
         "writing-style-tooltip": "Zmienia kierunek tekstu. Poziomo od lewej do prawej, pionowo od góry do dołu.",
         "tap-to-paginate-label": "Stuknij aby zmienić stronę",
         "tap-to-paginate-tooltip": "Kliknij przy krawędzi ekranu, aby zmienić stronę",
         "on": "Wł.",
         "off": "Wył.",
-        "immersive-mode-label": "{{user-preferences.immersive-mode-label}}",
+        "immersive-mode-label": "{{manage-reading-profiles.immersive-mode-label}}",
         "immersive-mode-tooltip": "Spowoduje to ukrycie menu po kliknięciu czytnika i włączenie funkcji podziału na strony",
         "fullscreen-label": "Pełny ekran",
         "fullscreen-tooltip": "Przełącz czytnik w tryb pełnoekranowy",
         "exit": "Wyjdź",
         "enter": "Wejdź",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
         "layout-mode-tooltip": "Scroll: Lustrzane odbicie pliku epub (zwykle jedna długa przewijana strona na rozdział).
          1 Kolumna: Tworzy pojedynczą stronę wirtualną naraz.
          2 Kolumny:Tworzy jednocześnie dwie wirtualne strony ułożone obok siebie.",
         "layout-mode-option-scroll": "Przewijanie",
         "layout-mode-option-1col": "1 Kolumna",
         "layout-mode-option-2col": "2 Kolumny",
-        "color-theme-title": "Motyw kolorów",
+        "color-theme-title": "Kolor motywu",
         "theme-dark": "Ciemny",
         "theme-black": "Czarny",
         "theme-white": "Biały",
-        "theme-paper": "Papier"
+        "theme-paper": "Papier",
+        "update-parent": "Zapisz do {{name}}",
+        "loading": "ładowanie",
+        "create-new": "Nowy profil z domyślnego",
+        "create-new-tooltip": "Utwórz nowy zarządzalny profil na podstawie obecnego domyślnego profilu",
+        "reading-profile-updated": "Zaktualizowano profil czytelnika",
+        "reading-profile-promoted": "Promowany profil czytelniczy",
+        "line-spacing-min-label": "1x",
+        "line-spacing-max-label": "2.5x"
     },
     "table-of-contents": {
         "no-data": "Ta książka nie ma spisu treści ustawionego w metadanych ani pliku toc"
@@ -938,7 +936,8 @@
     },
     "card-detail-layout": {
         "total-items": "{{count}} całkowita liczba elementów",
-        "jumpkey-count": "{{count}} Serii"
+        "jumpkey-count": "{{count}} Serii",
+        "no-data": "{{common.no-data}}"
     },
     "card-item": {
         "cannot-read": "Nie można odczytać"
@@ -964,12 +963,14 @@
         "language-title": "{{edit-chapter-modal.language-label}}",
         "release-title": "{{sort-field-pipe.release-year}}",
         "format-title": "{{metadata-filter.format-label}}",
-        "length-title": "{{edit-chapter-modal.words-label}}"
+        "length-title": "{{edit-chapter-modal.words-label}}",
+        "age-rating-title": "{{metadata-fields.age-rating-title}}"
     },
     "related-tab": {
         "reading-lists-title": "{{reading-lists.title}}",
         "collections-title": "{{side-nav.collections}}",
-        "relations-title": "{{tabs.related-tab}}"
+        "relations-title": "{{tabs.related-tab}}",
+        "bookmarks-title": "{{side-nav.bookmarks}}"
     },
     "cover-image-chooser": {
         "enter-an-url-pre-title": "Wprowadź {{url}}",
@@ -1028,7 +1029,7 @@
         "file-header": "Plik",
         "comment-header": "Komentarz",
         "created-header": "Utworzono",
-        "no-data": "Brak danych"
+        "no-data": "{{common.no-data}}"
     },
     "manage-email-settings": {
         "description": "Aby korzystać z niektórych funkcji Kavita, takich jak Wyślij do urządzenia, należy skonfigurować dostawcę poczty e-mail. Inne funkcje, takie jak zapomniałem hasła, wymagają interwencji admina bez konfiguracji poczty e-mail.",
@@ -1041,7 +1042,7 @@
         "reset": "{{common.reset}}",
         "test": "Test",
         "host-name-label": "Nazwa Hosta",
-        "host-name-tooltip": "Nazwa domeny (dla reverse proxy). Wymagana do działania poczty e-mail. Jeśli nie używasz reverse proxy podaj dowolny adres URL.",
+        "host-name-tooltip": "Nazwa domeny twojego reverse proxy, wymagana do działania poczty e-mail. Jeśli nie używasz reverse proxy, możesz użyć dowolnego adresu URL, w tym http://externalip:port/",
         "host-name-validation": "Nazwa hosta musi zaczynać się od http(s) i nie może kończyć się na /",
         "sender-address-label": "Adres nadawcy",
         "sender-address-tooltip": "Jest to adres e-mail, który odbiorca zobaczy po otrzymaniu wiadomości e-mail. Zazwyczaj jest to adres e-mail powiązany z kontem.",
@@ -1247,9 +1248,6 @@
         "backup-database-task-success": "Zadanie utworzenia kopii zapasowej bazy danych zostało umieszczone w kolejce",
         "download-logs-task": "Pobierz logi",
         "download-logs-task-desc": "Kompiluje wszystkie pliki dziennika do pliku zip i pobiera go.",
-        "analyze-files-task": "Analizuj pliki",
-        "analyze-files-task-desc": "Uruchamia długotrwałe zadanie, które analizuje pliki w celu wygenerowania rozszerzenia i rozmiaru. Powinno być uruchomione tylko raz dla wersji v0.7. Nie jest wymagane w przypadku instalacji po wersji v0.7.",
-        "analyze-files-task-success": "Analiza plików została umieszczona w kolejce",
         "sync-themes-task": "Synchronizuj motywy",
         "sync-themes-task-desc": "Synchronizuje pobrane motywy ze zmianami wprowadzonymi przez upstream, jeśli wersja się zgadza.",
         "sync-themes-success": "Synchronizacja motywów została dodana do kolejki",
@@ -1277,7 +1275,6 @@
         "change-password-alt": "Zmień hasło {{user}}",
         "resend": "Wyślij ponownie",
         "setup": "Konfiguracja",
-        "admin": "Admin",
         "last-active-header": "Ostatni aktywny",
         "roles-header": "Role",
         "name-header": "Nazwa",
@@ -1289,7 +1286,8 @@
         "no-data": "Nie ma innych użytkowników.",
         "loading": "{{common.loading}}",
         "actions-header": "Działania",
-        "pending-tooltip": "Ten użytkownik nie potwierdził swojego e-maila"
+        "pending-tooltip": "Ten użytkownik nie potwierdził swojego e-maila",
+        "all-libraries": "Wszystkie biblioteki"
     },
     "edit-collection-tags": {
         "title": "Edytuj kolekcję {{collectionName}}",
@@ -1329,28 +1327,34 @@
         "server-section-title": "Serwer",
         "info-section-title": "Info",
         "import-section-title": "Importuj",
-        "kavitaplus-section-title": "{{settings.admin-kavitaplus}}",
+        "kavitaplus-section-title": "Kavita+",
         "admin-general": "Ogólne",
         "admin-users": "Użytkownicy",
         "admin-libraries": "Biblioteki",
         "admin-media": "Media",
         "admin-media-issues": "Problemy z mediami",
         "admin-logs": "Logi",
-        "admin-email": "Email",
+        "admin-email": "E-mail",
         "admin-tasks": "Zadania",
         "admin-statistics": "Statystyki",
         "admin-system": "System",
-        "admin-kavitaplus": "Kavita+",
+        "admin-kavitaplus": "Licencja",
         "account": "Konto",
         "preferences": "Preferencje",
-        "clients": "Klucz API / ODPS",
+        "clients": "Klucz API / OPDS",
         "devices": "Urządzenia",
         "user-stats": "Statystyki",
         "scrobbling": "Scrobblowanie",
         "theme": "Motyw",
         "customize": "Dostosuj",
         "cbl-import": "Lista czytelnicza CBL",
-        "mal-stack-import": "MAL Stack"
+        "mal-stack-import": "MAL Stack",
+        "admin-matched-metadata": "Pasujące metadane",
+        "admin-manage-tokens": "Zarządzanie tokenami użytkownika",
+        "admin-metadata": "Zarządzaj metadanymi",
+        "scrobble-holds": "Wstrzymane pozycje scrobblowania",
+        "admin-email-history": "Historia e-mail",
+        "reading-profiles": "Profil czytelniczy"
     },
     "collection-detail": {
         "no-data": "Brak elementów. Spróbuj dodać serię.",
@@ -1387,7 +1391,8 @@
     },
     "reading-list-item": {
         "remove": "{{common.remove}}",
-        "read": "{{common.read}}"
+        "read": "{{common.read}}",
+        "released-label": "Wydano: {{date}}"
     },
     "stream-list-item": {
         "remove": "{{common.remove}}",
@@ -1395,7 +1400,8 @@
         "smart-filter": "Inteligentny filtr",
         "library": "Biblioteka",
         "external-source": "Zewnętrzne źródła",
-        "provided": "Wbudowane"
+        "provided": "Wbudowane",
+        "delete": "{{common.delete}}"
     },
     "reading-list-detail": {
         "item-count": "{{common.item-count}}",
@@ -1407,7 +1413,19 @@
         "read-options-alt": "Opcje czytania",
         "incognito-alt": "(Incognito)",
         "no-data": "Nic nie dodano",
-        "characters-title": "{{metadata-fields.characters-title}}"
+        "characters-title": "{{metadata-fields.characters-title}}",
+        "writers-title": "{{metadata-fields.writers-title}}",
+        "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
+        "publishers-title": "{{metadata-fields.publishers-title}}",
+        "items-title": "Pozycje",
+        "storyline-tab": "{{series-detail.storyline-tab}}",
+        "edit-alt": "{{common.edit}}",
+        "more-alt": "{{series-detail.more-alt}}",
+        "edit-label": "Tryb edycji",
+        "date-range-title": "Zakres dat",
+        "reorder-alt": "Zmiana kolejności pozycji",
+        "dnd-warning": "Funkcja przeciągnij i upuść jest niedostępna na urządzeniach mobilnych lub gdy lista czytelnicza zawiera ponad 100 pozycji.",
+        "details-tab": "{{series-detail.details-tab}}"
     },
     "events-widget": {
         "title-alt": "Aktywność",
@@ -1460,7 +1478,10 @@
         "logout": "Wyloguj",
         "all-filters": "Inteligentne filtry",
         "nav-link-header": "Opcje Nawigacji",
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "person-aka-status": "Pasuje do aliasu",
+        "browse-genres": "Przeglądaj gatunki",
+        "browse-tags": "Przeglądaj tagi"
     },
     "promoted-icon": {
         "promoted": "{{common.promoted}}"
@@ -1571,7 +1592,6 @@
     },
     "manga-reader": {
         "back": "Wstecz",
-        "save-globally": "Zapisz globalnie",
         "incognito-alt": "Tryb incognito jest włączony. Przełącz, aby go wyłączyć.",
         "incognito-title": "Tryb incognito:",
         "shortcuts-menu-alt": "Tryb skrótów klawiaturowych",
@@ -1593,9 +1613,9 @@
         "height": "Wysokość",
         "width": "Szerokość",
         "width-override-label": "Nadpisanie szerokości",
-        "off": "Wył.",
+        "off": "{{reader-settings.off}}",
         "original": "Oryginał",
-        "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}",
+        "auto-close-menu-label": "{{manage-reading-profiles.auto-close-menu-label}}",
         "swipe-enabled-label": "Włączone przeciąganie",
         "enable-comic-book-label": "Naśladuj komiks",
         "brightness-label": "Jasność",
@@ -1606,9 +1626,14 @@
         "layout-mode-switched": "Tryb układu został przełączony na Pojedynczy z powodu niewystarczającej ilości miejsca do renderowania podwójnego układu",
         "no-next-chapter": "Brak następnego rozdziału",
         "no-prev-chapter": "Brak poprzedniego rozdziału",
-        "user-preferences-updated": "Zaktualizowano preferencje użytkownika",
-        "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}",
-        "series-progress": "Postęp serii: {{percentage}}"
+        "emulate-comic-book-label": "{{manage-reading-profiles.emulate-comic-book-label}}",
+        "series-progress": "Postęp serii: {{percentage}}",
+        "update-parent": "{{reader-settings.update-parent}}",
+        "loading": "{{reader-settings.loading}}",
+        "create-new": "{{reader-settings.create-new}}",
+        "create-new-tooltip": "{{reader-settings.create-new-tooltip}}",
+        "reading-profile-updated": "Profil czytelniczy zaktualizowany",
+        "reading-profile-promoted": "Promowany profil czytelniczy"
     },
     "metadata-filter": {
         "filter-title": "{{common.filter}}",
@@ -1665,7 +1690,10 @@
         "release-year": "Rok wydania",
         "read-progress": "Ostatnio czytano",
         "average-rating": "Średnia ocena",
-        "random": "Losowe"
+        "random": "Losowe",
+        "person-name": "Nazwa",
+        "person-series-count": "Liczba serii",
+        "person-chapter-count": "Liczba rozdziałów"
     },
     "edit-series-modal": {
         "title": "{{seriesName}} szczegóły",
@@ -1802,8 +1830,8 @@
         "cover-image-tab": "{{tabs.cover-tab}}",
         "tasks-tab": "{{tabs.tasks-tab}}",
         "info-tab": "{{tabs.info-tab}}",
-        "pages-label": "{{edit-chapter-modal.pages-count}}",
-        "words-label": "{{edit-chapter-modal.length-title}}",
+        "pages-label": "{{edit-chapter-modal.pages-label}}",
+        "words-label": "{{edit-chapter-modal.words-label}}",
         "pages-count": "{{edit-chapter-modal.pages-count}}",
         "words-count": "{{edit-chapter-modal.words-count}}",
         "reading-time-label": "{{edit-chapter-modal.reading-time-label}}",
@@ -1825,7 +1853,7 @@
     },
     "kavitaplus-metadata-breakdown-stats": {
         "description": "Kavita powoli pobiera metadane (oceny, recenzje, rekomendacje itp.) dla kwalifikujących się serii.",
-        "no-data": "Brak danych",
+        "no-data": "{{common.no-data}}",
         "completed-series-label": "Zakończone serie",
         "complete": "Wszystkie serie mają metadane",
         "title": "Podział metadanych Kavita+",
@@ -1875,7 +1903,7 @@
         "count-header": "Liczba"
     },
     "series-preview-drawer": {
-        "staff-label": "Ekipa",
+        "staff-label": "Personel",
         "tags-label": "{{filter-field-pipe.tags}}",
         "genres-label": "{{filter-field-pipe.genres}}",
         "view-series": "Wyświetl serię",
@@ -1954,14 +1982,16 @@
         "sidenav": "Panel boczny",
         "external-sources": "Zewnętrzne źródła",
         "smart-filters": "Inteligentne filtry",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "description": "Możesz dostosować różne aspekty Kavita, zmieniając kolejność, przełączając widoczność i wiążąc inteligentne filtry / źródła zewnętrzne ze stroną główną lub boczną nawigacją."
     },
     "customize-dashboard-streams": {
         "no-data": "Wszystkie inteligentne filtry zostały dodane do panelu nawigacyjnego lub żadne nie zostały jeszcze utworzone.",
         "save": "{{common.save}}",
         "add": "{{common.add}}",
         "filter": "{{common.filter}}",
-        "clear": "{{common.clear}}"
+        "clear": "{{common.clear}}",
+        "smart-filter-title": "{{customize-dashboard-modal.title-smart-filters}}"
     },
     "customize-sidenav-streams": {
         "no-data": "Wszystkie inteligentne filtry zostały dodane do Panelu bocznego, lub nie zostały jeszcze nie utworzone.",
@@ -1989,7 +2019,15 @@
         "no-data": "Nie utworzono inteligentnych filtrów",
         "filter": "{{common.filter}}",
         "clear": "{{common.clear}}",
-        "errored": "W filtrze wystąpił błąd kodowania. Należy go ponownie utworzyć."
+        "errored": "W filtrze wystąpił błąd kodowania. Należy go ponownie utworzyć.",
+        "close": "{{common.close}}",
+        "cancel": "{{common.cancel}}",
+        "edit": "{{common.edit}}",
+        "save": "{{common.save}}",
+        "required-field": "Smart filtry potzebują nzwy",
+        "filter-name-unique": "Nazwy inteligentnych filtrów muszą być unikatowe",
+        "edit-smart-filter": "Edytuj {{name}}",
+        "name-label": "Nazwa"
     },
     "edit-external-source-item": {
         "not-unique": "Zewnętrzne źródło istnieje na tym hoście. Upewnij się, że nie masz duplikatów",
@@ -2014,7 +2052,7 @@
         "reading-lists": "{{side-nav.reading-lists}}",
         "bookmarks": "{{side-nav.bookmarks}}",
         "all-series": "{{side-nav.all-series}}",
-        "browse-authors": "{{side-nav.browse-authors}}"
+        "browse-authors": "{{side-nav.browse-people}}"
     },
     "filter-field-pipe": {
         "age-rating": "{{metadata-fields.age-rating-title}}",
@@ -2115,14 +2153,13 @@
         "series-deleted": "Seria usunięta",
         "delete-review": "Czy na pewno chcesz usunąć swoją recenzję?",
         "review-deleted": "Recenzja usunięta",
-        "file-send-to": "Plik(i) wysłane emailem do {{name}}",
+        "file-send-to": "Plik(i) wysłane e-mailem do {{name}}",
         "theme-missing": "Aktywny motyw już nie istnieje. Odśwież stronę.",
         "email-sent": "Email wysłany do {{name}}",
         "email-not-sent": "Adres e-mail w pliku nie jest prawidłowy i nie można go wysłać. Link został zrzucony do logów. Administrator może podać ten link, aby zakończyć przepływ.",
         "k+-license-saved": "Klucz licencyjny został zapisany, ale jest nieważny. Kliknij sprawdź, aby ponownie zweryfikować subskrypcję. Propagacja rejestracji po raz pierwszy może potrwać kilka minut.",
-        "k+-unlocked": "Kavita+ odblokowana!",
         "k+-error": "Wystąpił błąd podczas aktywacji licencji. Spróbuj ponownie.",
-        "k+-delete-key": "Spowoduje to jedynie usunięcie klucza licencyjnego Kavity i umożliwi wyświetlenie linku do zakupu. Nie spowoduje to anulowania subskrypcji! Używaj tej opcji tylko na polecenie pomocy technicznej!",
+        "k+-delete-key": "Spowoduje to jedynie usunięcie klucza licencyjnego Kavity i umożliwi wyświetlenie linku do zakupu. Nie spowoduje to anulowania subskrypcji! Użyj opcji Zarządzaj, aby najpierw anulować subskrypcję.",
         "k+-reset-key": "To unieważni poprzednią rejestrację przy użyciu licencji i pozwoli na ponowną rejestrację instancji Kavita.",
         "k+-reset-key-success": "Twoja licencja została wyrejestrowana. Użyj przycisku Edytuj, aby ponownie zarejestrować swoją instancję i ponownie aktywować Kavita+",
         "library-deleted": "Biblioteka {{name}} została usunięta",
@@ -2185,7 +2222,16 @@
         "person-image-downloaded": "Obrazek osoby został pobrany i ustawiony.",
         "must-select-library": "Należy wybrać co najmniej jedną bibliotekę",
         "stack-imported": "Zaimportowano Stacki",
-        "confirm-delete-multiple-chapters": "Czy na pewno chcesz usunąć {{count}} rozdziałów/tomów? Nie spowoduje to modyfikacji plików na dysku."
+        "confirm-delete-multiple-chapters": "Czy na pewno chcesz usunąć {{count}} rozdziałów/tomów? Nie spowoduje to modyfikacji plików na dysku.",
+        "webtoon-override": "Przełączanie do trybu Webtoon z powodu obrazów odpowiadających webtoonowi.",
+        "bulk-delete-libraries": "Jesteś pewien że chcesz usunąć {{count}} bibliotek?",
+        "match-success": "Seria dopasowana prawidłowo",
+        "scrobble-gen-init": "Ustawiono w kolejce zadanie generowania zdarzeń scrobble na podstawie wcześniejszej historii czytania i ocen, synchronizując je z połączonymi usługami.",
+        "confirm-delete-multiple-volumes": "Czy na pewno chcesz usunąć {{count}} tomów? Nie spowoduje to modyfikacji plików na dysku.",
+        "series-added-want-to-read": "Seria dodana z listy Chcę przeczytać",
+        "series-bound-to-reading-profile": "Seria powiązana z profilem czytelniczym {{name}}",
+        "library-bound-to-reading-profile": "Biblioteka powiązana z profilem czytelniczym {{name}}",
+        "external-match-rate-error": "Kavicie skończyła się liczba wyszukiwań {{seriesName}}. Spróbuj ponownie za 5 minut."
     },
     "read-time-pipe": {
         "less-than-hour": "<1 godzina",
@@ -2255,7 +2301,19 @@
         "back-to": "Powrót do {{action}}",
         "title": "Akcje",
         "copy-settings": "Kopiuj ustawienia z",
-        "import-mal-stack": "Importuj MAL Stack"
+        "import-mal-stack": "Importuj MAL Stack",
+        "match-tooltip": "Dopasuj serię ręcznie z Kavita+",
+        "match": "Dopasuj",
+        "reorder": "Zmień kolejność",
+        "reading-profiles": "Profile Czytelnicze",
+        "set-reading-profile": "Ustaw profil czytelniczy",
+        "set-reading-profile-tooltip": "Powiąż profil czytelnika z tą biblioteką",
+        "clear-reading-profile": "Wyczyść profil czytelniczy",
+        "clear-reading-profile-tooltip": "Wyczyść profil czytelniczy z tej biblioteki",
+        "cleared-profile": "Wyczyść profil czytelniczy",
+        "rename": "Zmień nazwę",
+        "rename-tooltip": "Zmień nazwę filtru inteligentnego",
+        "merge": "Scal"
     },
     "preferences": {
         "left-to-right": "Od lewej do prawej",
@@ -2349,7 +2407,7 @@
         "edit": "Edytuj",
         "help": "Pomoc",
         "submit": "Prześlij",
-        "email": "Email",
+        "email": "E-mail",
         "read": "Czytaj",
         "loading": "Ładowanie…",
         "username": "Nazwa użytkownika",
@@ -2372,23 +2430,28 @@
         "issue-nums": "Wydania",
         "chapter-nums": "Rozdziały",
         "volume-nums": "Tomy",
-        "author-count": "{{num}} autorów"
+        "author-count": "{{num}} autorów",
+        "no-data": "Brak danych",
+        "chapter-count": "{{num}} Rozdziałów",
+        "issue-count": "{{num}} Wydań"
     },
     "person-detail": {
         "all-roles": "Role",
         "known-for-title": "Znany z",
         "browse-person-title": "Wszystkie dzieła {{name}}",
         "individual-role-title": "Jako {{role}}",
-        "browse-person-by-role-title": "Wszystkie dzieła {{name}} jako {{role}}"
-    },
-    "browse-authors": {
-        "cover-image-description": "{{edit-series-modal.cover-image-description}}",
-        "title": "Przeglądaj autorów i pisarzy",
-        "author-count": "{{num}} osób"
+        "browse-person-by-role-title": "Wszystkie dzieła {{name}} jako {{role}}",
+        "anilist-url": "{{edit-person-modal.anilist-tooltip}}",
+        "aka-title": "Znany również jako ",
+        "no-info": "Brak informacji o tej osobie"
     },
     "confirm": {
         "confirm": "Potwierdź",
-        "alert": "Uwaga"
+        "alert": "Uwaga",
+        "info": "Informacje",
+        "cancel": "{{common.cancel}}",
+        "ok": "Ok",
+        "prompt": "Pytanie"
     },
     "edit-person-modal": {
         "role-label": "Rola",
@@ -2411,6 +2474,344 @@
         "download-coversdb": "Pobierz z CoversDB",
         "name-label": "{{edit-series-modal.name-label}}",
         "required-field": "{{validations.required-field}}",
-        "cover-image-description": "{{edit-series-modal.cover-image-description}}"
+        "cover-image-description": "{{edit-series-modal.cover-image-description}}",
+        "aliases-tab": "Pseudonimy",
+        "aliases-label": "Edytuj pseudonimy",
+        "alias-overlap": "Ten pseudonim wskazuje już na inną osobę lub jest imieniem tej osoby, rozważ ich połączenie.",
+        "aliases-tooltip": "Gdy seria jest oznaczona pseudonimem osoby, osoba jest przypisywana zamiast tworzenia nowej osoby. Po usunięciu aliasu konieczne będzie ponowne przeskanowanie serii, aby zmiana została uwzględniona."
+    },
+    "changelog-update-item": {
+        "added": "Dodano",
+        "download": "Pobierz",
+        "changed": "Zmieniono",
+        "fixed": "Naprawione",
+        "developer": "Twórca",
+        "theme": "Motyw",
+        "removed": "Usunięto",
+        "api": "API",
+        "published-label": "Opublikowano: ",
+        "installed": "{{changelog.installed}}",
+        "feature-requests": "Prośby o funkcje",
+        "known-issues": "Znane błędy"
+    },
+    "new-version-modal": {
+        "refresh": "Odśwież",
+        "description": "Nowa wersja Kavity jest dostępna. Odśwież aby zaktualizować.",
+        "api": "{{changelog.api}}",
+        "title": "Kavita została zaktualizowana!",
+        "added": "{{changelog.added}}",
+        "changed": "{{changelog.changed}}",
+        "fixed": "{{changelog.fixed}}",
+        "theme": "{{changelog.theme}}",
+        "removed": "{{changelog.removed}}",
+        "developer": "{{changelog.developer}}",
+        "close": "{{common.close}}",
+        "known-issues": "{{changelog.known-issues}}"
+    },
+    "manage-matched-metadata": {
+        "description": "Tutaj znajdują się wszystkie odpowiednie serie, które można dopasować do zewnętrznych metadanych. Kavita będzie wstępnie pobierać lub odświeżać metadane serii, 50 serii na 24 godziny dziennie.",
+        "no-data": "{{common.no-data}}",
+        "dont-match-status-label": "{{dont-match-label}}",
+        "title": "Dopasowana metadata",
+        "series-name-header": "Serie",
+        "matched-status-label": "Dopasowano",
+        "unmatched-status-label": "Nie dopasowano",
+        "blacklist-status-label": "Wymagane ręczne dopasowanie",
+        "library-name-header": "Biblioteka",
+        "valid-until-header": "Następne odświeżenie",
+        "actions-header": "Akcje",
+        "all-status-label": "Wyszystko",
+        "match-alt": "Dopasuj {{seriesName}}",
+        "dont-match-label": "Nie pasuję",
+        "status-header": "tatus",
+        "library-type": "Typ biblioteki",
+        "matched-state-label": "Dopasuj stan"
+    },
+    "manage-metadata-settings": {
+        "derive-publication-status-tooltip": "Umożliwienie uzyskania statusu publikacji na podstawie łącznej liczby rozdziałów/tomów.",
+        "enabled-label": "Włącz pobieranie metadanych",
+        "derive-publication-status-label": "Status publikacji",
+        "first-last-name-label": "Imię/Nazwisko",
+        "person-roles-label": "Role",
+        "enabled-tooltip": "Zezwól Kavicie na pobieranie metadanych i zapisywanie ich w bazie danych.",
+        "field-mapping-description": "Konfiguruje reguły dla określonych ciągów znaków znalezionych w polu Genre/Tag i mapuje je na nowy ciąg znaków w polu Genre/Tag oraz opcjonalnie usuwa je z listy źródłowej. Ma zastosowanie tylko wtedy, gdy zapisywanie Genre/Tag jest włączone.",
+        "first-last-name-tooltip": "Upewnij się że imiona Ludzi są zapisywanie - Imię potem Nazwisko",
+        "enable-start-date-tooltip": "Zezwalaj na zapisywanie daty rozpoczęcia serii w serii",
+        "summary-tooltip": "Zezwala na zapisywanie streszczenia, gdy pole jest odblokowane.",
+        "description": "Kavita+ ma możliwość pobierania i zapisywania pewnych ograniczonych metadanych do bazy danych. Ta strona umożliwia przełączanie ich zakresu.",
+        "summary-label": "Streszczenie",
+        "localized-name-label": "Zlokalizowana nazwa serii",
+        "localized-name-tooltip": "Zezwól na wpisanie zlokalizowanej nazwy, gdy pole jest odblokowane.Kavita podejmie próbę najlepszego odgadnięcia.",
+        "age-rating-mapping-description": "Wszelkie ciągi po lewej stronie, jeśli zostaną znalezione w gatunku lub tagach, ustawią klasyfikację wiekową serii.",
+        "enable-relations-label": "Powiązania",
+        "enable-tags-tooltip": "Zezwalaj na zapisywanie tagów serii.",
+        "blacklist-label": "Czarna lista Gatunki/Tagi",
+        "field-mapping-title": "Mapowanie pola",
+        "enable-relations-tooltip": "Zezwalaj na dodawanie relacji między seriami.",
+        "enable-people-label": "Ludzie",
+        "enable-start-date-label": "Data rozpoczęcia",
+        "enable-genres-label": "Gatunki",
+        "enable-people-tooltip": "Zezwalaj na dodawanie osób (postaci, pisarzy itp.). Wszystkie osoby zawierają obrazy.",
+        "enable-cover-image-label": "Obraz okładki",
+        "enable-genres-tooltip": "Zezwalaj na zapisywanie gatunków serii.",
+        "enable-tags-label": "Tagi",
+        "enable-cover-image-tooltip": "Pozwól Kavicie napisać obraz okładki dla serii",
+        "blacklist-tooltip": "Wszystko, co znajdzie się na tej liście, zostanie usunięte z przetwarzania gatunków i tagów. Jest to miejsce na dodanie gatunków/tagów, które nie mają być zapisywane. Upewnij się, że są one oddzielone przecinkami.",
+        "whitelist-label": "Tagi na białej liście",
+        "whitelist-tooltip": "Zezwalaj na zapisywanie ciągów z tej listy tylko dla Tagów.Upewnij się, że są one oddzielone przecinkami.",
+        "age-rating-mapping-title": "Mapowanie klasyfikacji wiekowej",
+        "genre": "Gatunek",
+        "tag": "Tag",
+        "remove-source-tag-label": "Usuń tag źródłowy",
+        "add-age-rating-mapping-label": "Dodaj filtr klasyfikacji wiekowej",
+        "add-field-mapping-label": "Dodaj mapowanie pola",
+        "overrides-label": "Zastąpienia",
+        "overrides-description": "Zezwól Kavicie na zapisywanie w zablokowanych polach.",
+        "enable-chapter-title-label": "Tytuł",
+        "enable-chapter-title-tooltip": "Zezwól na wpisanie tytułu rozdziału/wydania",
+        "enable-chapter-summary-label": "{{manage-metadata-settings.summary-label}}",
+        "enable-chapter-summary-tooltip": "{{manage-metadata-settings.summary-tooltip}}",
+        "enable-chapter-release-date-label": "Data wydania",
+        "enable-chapter-release-date-tooltip": "Zezwól na wpisanie daty wydania rozdziału/wydania",
+        "enable-chapter-publisher-label": "Wydawca",
+        "enable-chapter-publisher-tooltip": "Zezwól na wpisanie wydawcy rozdziału/wydania",
+        "enable-chapter-cover-label": "Okładka rozdziału",
+        "enable-chapter-cover-tooltip": "Zezwól na ustawienie okładki rozdziału/wydania",
+        "chapter-header": "Pola rozdziału"
+    },
+    "match-series-modal": {
+        "description": "Wybierz dopasowanie, aby przekierować metadane Kavita+ i zregenerować zdarzenia scrobblowania.Opcja Nie dopasowuj może być użyta do ograniczenia dopasowywania metadanych i scrobblowania przez Kavita+.",
+        "no-results": "Nie można znaleźć dopasowania. Spróbuj dodać adres URL od obsługiwanego dostawcy i spróbuj ponownie.",
+        "dont-match-label": "Ni pasuję",
+        "dont-match-tooltip": "Wybierz tą serie do dopasowania i scrobblingu",
+        "save": "{{common.save}}",
+        "title": "Dopasuj {{seriesName}}",
+        "query-label": "Zapytanie",
+        "close": "{{common.close}}",
+        "query-tooltip": "Wprowadź nazwę serii, adres URL AniList/MyAnimeList//ComicBookRoundup. Adresy URL będą użyte do bezpośredniego wyszukiwania.",
+        "search": "Szukaj"
+    },
+    "manage-user-tokens": {
+        "description": "Użytkownicy posiadający tokeny scrobblowania mogą od czasu do czasu wymagać odnowienia. Kavita automatycznie wyśle do nich wiadomość e-mail, jeśli e-mail jest skonfigurowany i mają prawidłowy adres e-mail.",
+        "mal-header": "MAL",
+        "anilist-header": "AniList",
+        "username-header": "Nazwa użytkownika",
+        "token-set-label": "Token ustawiony",
+        "no-data": "{{common.no-data}}",
+        "expires-label": "Wygasa: {{date}}"
+    },
+    "match-series-result-item": {
+        "volume-count": "{{server-stats.volume-count}}",
+        "releasing": "Wydawane",
+        "updating-metadata-status": "Aktualizacja metadanych",
+        "details": "Pokaż stronę",
+        "chapter-count": "{{common.chapter-count}}",
+        "issue-count": "{{common.issue-count}}"
+    },
+    "metadata-setting-field-pipe": {
+        "genres": "{{metadata-fields.genres-title}}",
+        "people": "{{tabs.people-tab}}",
+        "summary": "{{filter-field-pipe.summary}}",
+        "publication-status": "{{edit-series-modal.publication-status-title}}",
+        "start-date": "{{manage-metadata-settings.enable-start-date-label}}",
+        "covers": "Okładki",
+        "age-rating": "{{metadata-fields.age-rating-title}}",
+        "tags": "{{metadata-fields.tags-title}}",
+        "localized-name": "{{edit-series-modal.localized-name-label}}",
+        "chapter-release-date": "Data wydania (rozdział)",
+        "chapter-summary": "Podsumowanie (Rozdział)",
+        "chapter-covers": "Okładki (Rozdział)",
+        "chapter-publisher": "{{person-role-pipe.publisher}} (Rozdział)",
+        "chapter-title": "Tytuł (Rozdział)"
+    },
+    "email-history": {
+        "sent-header": "Udane",
+        "description": "Tutaj można znaleźć wszystkie wiadomości e-mail wysłane przez Kavita i do którego użytkownika.",
+        "template-header": "Szablon",
+        "date-header": "Data wysłania",
+        "user-header": "Wyślij do",
+        "no-data": "{{common.no-data}}",
+        "sent-tooltip": "Wysłano",
+        "not-sent-tooltip": "Nie wysłano"
+    },
+    "role-localized-pipe": {
+        "download": "Pobierz",
+        "change-password": "Zmień hasło",
+        "bookmark": "Zakładka",
+        "change-restriction": "Zmień ograniczenia",
+        "login": "Login",
+        "read-only": "Tylko do odczytu",
+        "promote": "Promuj",
+        "admin": "Admin"
+    },
+    "log-level-pipe": {
+        "debug": "Debug",
+        "information": "Informacje",
+        "warning": "Ostrzeżenie",
+        "critical": "Krytyczne",
+        "trace": "Ślad"
+    },
+    "reviews": {
+        "user-reviews-local": "Lokalne recenzje",
+        "user-reviews-plus": "Zewnętrzne recenzje"
+    },
+    "review-modal": {
+        "title": "Edytuj recenzję",
+        "review-label": "Recenzja",
+        "close": "{{common.close}}",
+        "save": "{{common.save}}",
+        "delete": "{{common.delete}}",
+        "min-length": "Recenzja musi zawierać co najmniej {{count}} znaków",
+        "required": "{{validation.required-field}}"
+    },
+    "browse-people": {
+        "title": "Przeglądaj osoby",
+        "author-count": "{{num}} Osób",
+        "cover-image-description": "{{edit-series-modal.cover-image-description}}",
+        "issue-count": "{{common.issue-count}}",
+        "series-count": "{{common.series-count}}",
+        "roles-label": "Role",
+        "sort-label": "Sortuj",
+        "name-label": "Nazwa",
+        "issue-count-label": "Liczba wydań",
+        "series-count-label": "Liczba serii"
+    },
+    "browse-genres": {
+        "title": "Przeglądaj gatunki",
+        "genre-count": "{{num}} Gatunków",
+        "issue-count": "{{common.issue-count}}",
+        "series-count": "{{common.series-count}}"
+    },
+    "browse-tags": {
+        "title": "Przeglądaj tagi",
+        "genre-count": "{{num}} Tagów",
+        "issue-count": "{{common.issue-count}}",
+        "series-count": "{{common.series-count}}"
+    },
+    "bulk-set-reading-profile-modal": {
+        "title": "Ustaw profil czytelniczy",
+        "close": "{{common.close}}",
+        "filter-label": "{{common.filter}}",
+        "clear": "{{common.clear}}",
+        "no-data": "Nie utworzono jeszcze żadnych kolekcji",
+        "loading": "{{common.loading}}",
+        "create": "{{common.create}}",
+        "bound": "Powiązany"
+    },
+    "merge-person-modal": {
+        "title": "{{personName}}",
+        "close": "{{common.close}}",
+        "save": "{{common.save}}",
+        "src": "Połącz osoby",
+        "merge-warning": "Kontynuacja spowoduje usunięcie wybranej osoby. Imię i nazwisko wybranej osoby zostanie dodane jako pseudonim, a wszystkie jej role zostaną przeniesione.",
+        "alias-title": "Nowy pseudonim",
+        "known-for-title": "Znany z"
+    },
+    "browse-title-pipe": {
+        "publication-status": "{{value}} działa",
+        "age-rating": "Przeznaczony dla {{value}}",
+        "user-rating": "{{value}} gwiazdek",
+        "tag": "Ma {{value}} tagów",
+        "translator": "Przetłumaczone przez {{value}}",
+        "character": "Posiada postać {{value}}",
+        "publisher": "Wydany przez {{value}}",
+        "editor": "Edytowany przez {{value}}",
+        "artist": "Rysowany przez {{value}}",
+        "letterer": "Literowany przez {{value}}",
+        "colorist": "Kolorowany przez {{value}}",
+        "inker": "Tuszowany przez {{value}}",
+        "writer": "Napisany przez {{value}}",
+        "genre": "Ma gatunek {{value}}",
+        "library": "Wewnątrz {{value}} biblioteki",
+        "format": "Format {{value}}",
+        "release-year": "Wydano w {{value}}",
+        "imprint": "Imprint {{value}}",
+        "team": "Zespół {{value}}",
+        "location": "W {{value}} lokalizacji",
+        "penciller": "Nakreślone ołówkiem przez {{value}}"
+    },
+    "generic-filter-field-pipe": {
+        "person-role": "Rola",
+        "person-name": "Nazwa",
+        "person-series-count": "Liczba serii",
+        "person-chapter-count": "Liczba rozdziałów"
+    },
+    "breakpoint-pipe": {
+        "never": "Nigdy",
+        "tablet": "Tablet",
+        "desktop": "Komputer stacjonarny",
+        "mobile": "Mobilny"
+    },
+    "manage-reading-profiles": {
+        "description": "Nie wszystkie serie mogą być czytane w ten sam sposób, skonfiguruj odrębne profile czytelnicze dla każdej biblioteki lub serii, aby powrót do serii był jak najbardziej płynny.",
+        "extra-tip": "Przypisywanie profili czytelniczych za pomocą menu akcji w seriach i bibliotekach lub zbiorczo. Podczas zmiany ustawień w czytniku tworzony jest ukryty profil, który zapamiętuje wybory dla danej serii (nie dla plików PDF). Profil ten jest usuwany po przypisaniu jednego z własnych profili czytania do serii. Więcej informacji można znaleźć na",
+        "wiki-title": "wiki",
+        "profiles-title": "Twoje profile czytelnicze",
+        "default-profile": "Domyślny",
+        "add": "{{common.add}}",
+        "add-tooltip": "Nowy profil zostanie zapisany po wprowadzeniu w nim zmian",
+        "make-default": "Ustaw jako domyślny",
+        "no-selected": "Nie wybrano profilu",
+        "confirm": "Czy na pewno chcesz usunąć profil czytelniczy {{name}}?",
+        "selection-tip": "Wybierz profil z listy lub utwórz nowy w prawym górnym rogu",
+        "image-reader-settings-title": "Czytnik obrazów",
+        "reading-direction-label": "Kierunek czytania",
+        "reading-direction-tooltip": "Kierunek kliknięcia, aby przejść do następnej strony. Od prawej do lewej oznacza kliknięcie po lewej stronie ekranu, aby przejść do następnej strony.",
+        "scaling-option-label": "Opcje skalowania",
+        "scaling-option-tooltip": "Jak przeskalować obraz do ekranu.",
+        "page-splitting-label": "Dzielenie stron",
+        "page-splitting-tooltip": "Jak podzielić obraz o pełnej szerokości (tj. obrazy lewy i prawy są połączone)?",
+        "reading-mode-label": "Tryb czytania",
+        "reading-mode-tooltip": "Zmień czytnik, aby przewijał strony pionowo, poziomo lub w nieskończoność",
+        "layout-mode-label": "Tryb układu",
+        "layout-mode-tooltip": "Wyświetl pojedynczy obraz na ekranie lub dwóch obrazów obok siebie",
+        "background-color-label": "Kolor tła",
+        "background-color-tooltip": "Kolor tła czytnika obrazów",
+        "auto-close-menu-label": "Automatycznie zamknij menu",
+        "auto-close-menu-tooltip": "Czy menu powinno się automatycznie zamykać?",
+        "show-screen-hints-label": "Wyświetl podpowiedzi",
+        "show-screen-hints-tooltip": "Wyświetlanie nakładki ułatwiającej zrozumienie obszaru i kierunku przewijania stron",
+        "emulate-comic-book-label": "Naśladuj komiks",
+        "emulate-comic-book-tooltip": "Stosuje efekt cienia, aby naśladować czytanie z książki",
+        "swipe-to-paginate-label": "Przesuń, aby zmienić stronę",
+        "swipe-to-paginate-tooltip": "Czy przesunięcie palcem po ekranie powinno powodować przejście do następnej lub poprzedniej strony?",
+        "allow-auto-webtoon-reader-label": "Automatyczny tryb czytnika Webtoon",
+        "allow-auto-webtoon-reader-tooltip": "Przełącz się w tryb Webtoon Reader, jeśli strony wyglądają jak webtoon. Mogą wystąpić fałszywie pozytywne wyniki.",
+        "width-override-label": "{{manga-reader.width-override-label}}",
+        "width-override-tooltip": "Zastąp szerokość obrazów w czytniku",
+        "disable-width-override-label": "Wyłącz zastępowanie szerokości",
+        "disable-width-override-tooltip": "Zapobieganie zastępowaniu szerokości, gdy ekran ma co najmniej skonfigurowany punkt podziału lub jest mniejszy",
+        "reset": "{{common.reset}}",
+        "book-reader-settings-title": "Czytnik książek",
+        "tap-to-paginate-label": "Stuknij, aby zmienić stronę",
+        "tap-to-paginate-tooltip": "Czy boki ekranu czytnika książek powinny umożliwiać dotknięcie go w celu przejścia do poprzedniej/następnej strony?",
+        "immersive-mode-label": "Tryb immersyjny",
+        "immersive-mode-tooltip": "Spowoduje to ukrycie menu za kliknięciem dokumentu czytnika i włączenie funkcji przewijania stron",
+        "reading-direction-book-label": "Kierunek czytania",
+        "reading-direction-book-tooltip": "Kierunek kliknięcia, aby przejść do następnej strony. Od prawej do lewej oznacza kliknięcie po lewej stronie ekranu, aby przejść do następnej strony.",
+        "font-family-label": "Rodzina fontów",
+        "font-family-tooltip": "Rodzina fontów do załadowania. Domyślna spowoduje załadowanie domyślnego fontu książki",
+        "writing-style-label": "Styl pisania",
+        "writing-style-tooltip": "Zmienia kierunek tekstu. Poziomo od lewej do prawej, pionowo od góry do dołu.",
+        "layout-mode-book-label": "Tryb układu",
+        "layout-mode-book-tooltip": "Jak powinna być ułożona treść. Przewijanie jest zgodne z układem książki. 1 lub 2 kolumny pasują do wysokości urządzenia i mieszczą 1 lub 2 kolumny tekstu na stronę",
+        "color-theme-book-label": "Kolor motywu",
+        "color-theme-book-tooltip": "Jaki motyw kolorystyczny zastosować do treści i menu czytnika książek?",
+        "font-size-book-label": "Wielkość fontu",
+        "font-size-book-tooltip": "Procent skalowania zastosowany do fontu w książce",
+        "line-height-book-label": "Odstęp między wierszami",
+        "line-height-book-tooltip": "Jak duże odstępy między wierszami książki",
+        "margin-book-label": "Margines",
+        "margin-book-tooltip": "Odstępy po każdej stronie ekranu. Na urządzeniach mobilnych wartość ta zostanie zastąpiona wartością 0, niezależnie od tego ustawienia.",
+        "pdf-reader-settings-title": "Czytnik PDF",
+        "pdf-scroll-mode-label": "Tryb przewijania",
+        "pdf-scroll-mode-tooltip": "Sposób przewijania stron. Pionowo/poziomo i dotknij, aby przewinąć (bez przewijania)",
+        "pdf-spread-mode-label": "Tryb stron",
+        "pdf-spread-mode-tooltip": "Jak powinny być ułożone strony. Pojedyncze lub podwójne (nieparzyste/parzyste)",
+        "pdf-theme-label": "Motyw",
+        "pdf-theme-tooltip": "Kolor motywu czytnika",
+        "reading-profile-series-settings-title": "Serie",
+        "reading-profile-library-settings-title": "Biblioteka",
+        "delete": "{{common.delete}}"
     }
 }
diff --git a/UI/Web/src/assets/langs/pt.json b/UI/Web/src/assets/langs/pt.json
index ccffd4e6f..75bf126d0 100644
--- a/UI/Web/src/assets/langs/pt.json
+++ b/UI/Web/src/assets/langs/pt.json
@@ -22,11 +22,11 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "saving": "A Guardar…",
         "update": "Atualizar",
-        "account-detail-title": "Detalhes da Conta"
+        "account-detail-title": "Detalhes da Conta",
+        "invalid-email-warning": "Um email inválido bloqueará algumas funcionalidades do Kavita"
     },
     "user-scrobble-history": {
         "title": "Histórico de Scrobble",
@@ -39,7 +39,7 @@
         "series-header": "Séries",
         "data-header": "Dados",
         "is-processed-header": "Processado",
-        "no-data": "Sem Dados",
+        "no-data": "{{common.no-data}}",
         "volume-and-chapter-num": "Volume {{v}} Capítulo {{n}}",
         "volume-num": "Volume {{num}}",
         "chapter-num": "Capítulo {{num}}",
@@ -47,7 +47,12 @@
         "not-applicable": "Não Aplicável",
         "processed": "Processado",
         "not-processed": "Não Processado",
-        "special": "{{entity-title.special}}"
+        "special": "{{entity-title.special}}",
+        "token-expired": "O token do AniList expirou! Os eventos de scrobbling não serão processados até que o token seja refrescado na página Contas.",
+        "scrobbling-disabled": "O scrobbling está desabilitado nas suas Definições de Conta.",
+        "generate-scrobble-events": "Eventos de Scrobbling",
+        "select-all-label": "Selecionar tudo",
+        "delete-selected-label": "Apagar selecionado"
     },
     "scrobble-event-type-pipe": {
         "chapter-read": "Leitura Efetuada",
@@ -59,15 +64,6 @@
     "spoiler": {
         "click-to-show": "Spoiler, clique para ver"
     },
-    "review-series-modal": {
-        "title": "Editar Crítica",
-        "review-label": "Crítica",
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "min-length": "A resenha deve ter pelo menos {{count}} caracteres",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}",
         "user-review": "Crítica de {{username}}",
@@ -78,7 +74,8 @@
         "your-review": "Esta é a sua crítica",
         "external-review": "Crítica externa",
         "local-review": "Crítica Local",
-        "rating-percentage": "Classificação {{r}}%"
+        "rating-percentage": "Classificação {{r}}%",
+        "critic": "crítico"
     },
     "want-to-read": {
         "title": "Leituras Futuras",
@@ -88,7 +85,7 @@
     },
     "user-preferences": {
         "title": "Painel do Utilizador",
-        "pref-description": "Estas definições globais estão ligadas à sua conta.",
+        "pref-description": "Estas definições globais estão ligadas à sua conta. As definições do Leitor estão nos Perfis de Leitura.",
         "account-tab": "{{tabs.account-tab}}",
         "preferences-tab": "{{tabs.preferences-tab}}",
         "theme-tab": "{{tabs.theme-tab}}",
@@ -112,55 +109,6 @@
         "collapse-series-relationships-tooltip": "O Kavita deve mostrar Séries que não tenham relações ou é o pai/prequela",
         "share-series-reviews-label": "Partilhar Críticas de Séries",
         "share-series-reviews-tooltip": "As suas críticas de Séries devem ser incluídas para outros utilizadores pelo Kavita",
-        "image-reader-settings-title": "Leitor de Imagens",
-        "reading-direction-label": "Direção de Leitura",
-        "reading-direction-tooltip": "Direção a clicar para ir para a próxima página. Direita para a Esquerda significa que se clica no lado esquerdo do ecrã para ir para a página seguinte.",
-        "scaling-option-label": "Opções de Dimensionamento",
-        "scaling-option-tooltip": "Como adaptar a dimensão da imagem ao seu ecrã.",
-        "page-splitting-label": "Separação de Páginas",
-        "page-splitting-tooltip": "Como separar uma imagem que ocupa a largura completa (p.e., as imagens esquerda e direita estão juntas numa só)",
-        "reading-mode-label": "Modo de Leitura",
-        "reading-mode-tooltip": "Alterar o leitor para paginar na vertical, na horizontal, ou ter um scroll infinito",
-        "layout-mode-label": "Modo de Exibição",
-        "layout-mode-tooltip": "Mostrar uma única imagem no ecrã ou mostrar duas imagens lado a lado",
-        "background-color-label": "Cor de Fundo",
-        "background-color-tooltip": "Cor de Fundo do Leitor de Imagens",
-        "auto-close-menu-label": "Fechar Menu Automaticamente",
-        "auto-close-menu-tooltip": "O menu deve fechar-se automaticamente?",
-        "show-screen-hints-label": "Mostrar Dicas no Ecrã",
-        "show-screen-hints-tooltip": "Mostrar uma indicação visual que ajude a perceber a área de paginação e a direção",
-        "emulate-comic-book-label": "Emular livro de BD",
-        "emulate-comic-book-tooltip": "Aplica um efeito de sobra para emular a leitura num livro",
-        "swipe-to-paginate-label": "Deslize para Paginar",
-        "swipe-to-paginate-tooltip": "O gesto de deslizar deve causar que a página seguinte ou anterior seja mostrada?",
-        "book-reader-settings-title": "Leitor de Livros",
-        "tap-to-paginate-label": "Toque para Paginar",
-        "tap-to-paginate-tooltip": "Se é permitido tocar nos lados do ecrã do leitor de livros para ir para a próxima/anterior página",
-        "immersive-mode-label": "Modo Imersivo",
-        "immersive-mode-tooltip": "O menu será escondido com um clique no documento e o toque para paginar ficará ativo",
-        "reading-direction-book-label": "Direção de Leitura",
-        "reading-direction-book-tooltip": "Direção a clicar para ir para a página seguinte. Direita para Esquerda significa que se clica no lado esquerdo do ecrã para ir para a página seguinte.",
-        "font-family-label": "Família de Fonte",
-        "font-family-tooltip": "Família de fonte a carregar. Por defeito será carregado a fonte do livro",
-        "writing-style-label": "Estilo de Escrita",
-        "writing-style-tooltip": "Muda a direção do texto. Horizontal é da esquerda para direita, vertical é do topo para o fundo.",
-        "layout-mode-book-label": "Modo de Exibição",
-        "layout-mode-book-tooltip": "Como o conteúdo deve ser exibido. A opção Scroll exibe de acordo com o definido no arquivo. As opções 1 ou 2 Colunas, ajustam à altura do dispositivo e mostram 1 ou 2 colunas de texto por página",
-        "color-theme-book-label": "Tema de Cor",
-        "color-theme-book-tooltip": "Que tema de cores aplicar ao conteúdo e menu do leitor de livros",
-        "font-size-book-label": "Tamanho de Fonte",
-        "font-size-book-tooltip": "Escala em percentagem a aplicar à fonte no livro",
-        "line-height-book-label": "Espaçamento Entre Linhas",
-        "line-height-book-tooltip": "Quanto espaçamento entre as linhas do livro",
-        "margin-book-label": "Margem",
-        "margin-book-tooltip": "Espaçamento em cada lado do ecrã. Nos dispositivos móveis o valor desta definição será sempre substituído por 0.",
-        "pdf-reader-settings-title": "Leitor de PDF",
-        "pdf-scroll-mode-label": "Modo de Rolagem",
-        "pdf-scroll-mode-tooltip": "Como rola pelas páginas. Vertical/Horizontal e toque para paginar (sem rolagem)",
-        "pdf-spread-mode-label": "Modo de Propagação",
-        "pdf-spread-mode-tooltip": "Como as páginas devem ser dispostas. Simples ou duplo (ímpar/par)",
-        "pdf-theme-label": "Tema",
-        "pdf-theme-tooltip": "Tema de cores do leitor",
         "clients-opds-alert": "O OPDS não está habilitado neste servidor. Isto não irá afectar os utilizadores do Tachiyomi.",
         "clients-opds-description": "Todos os clientes de terceiros utilizarão a chave de API ou URL abaixo. Estes elementos são semelhantes a palavras passe, mantenha-os privados.",
         "clients-api-key-tooltip": "A chave de API é como uma palavra passe. Se for redefinida, qualquer cliente existente será invalidado.",
@@ -168,12 +116,20 @@
         "clients-api-key-label": "Chave da API",
         "clients-opds-url-tooltip": "Veja uma lista de clientes OPDS suportados: ",
         "reset": "{{common.reset}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "want-to-read-sync-label": "Sincronizar Leituras Futuras",
+        "want-to-read-sync-tooltip": "Permitir que o Kavita adicione itens à lista Leituras Futuras com base nas séries da lista de leitura Pendentes do AniList e/ou MAL",
+        "anilist-scrobbling-tooltip": "Permitir que o Kavita faça Scrobble (sincronização unidirecional) do progresso das leituras e classificações para o AniList",
+        "kavitaplus-settings-title": "Kavita+",
+        "anilist-scrobbling-label": "Scrobbling AniList"
     },
     "user-holds": {
         "title": "Retenções de Scrobble",
-        "description": "Esta é uma lista de Séries, gerida por utilizador, que não será scrobbled para os fornecedores upstream. Pode eliminar uma série a qualquer momento e próximo evento de scrobble (progresso de leitura, classificação, estado de leituras futuras) irá despoletar eventos.",
-        "no-data": "{{typeahead.no-data}}"
+        "description": "Esta é uma lista de Séries, gerida por utilizador, que não será scrobbled para os provedores upstream. Pode eliminar uma série a qualquer momento e o próximo evento de scrobble (progresso de leitura, classificação, estado de leituras futuras) irá despoletar o processo de scrobbling.",
+        "no-data": "{{typeahead.no-data}}",
+        "series-name-header": "{{manage-matched-metadata.series-name-header}}",
+        "created-header": "{{manage-media-issues.created-header}}",
+        "delete-label": "{{common.remove}}"
     },
     "theme-manager": {
         "title": "Gestor de Temas",
@@ -293,7 +249,8 @@
         "regen-warning": "Se recriar a chave da API, os clientes de terceiros existentes deixarão de ter acesso.",
         "no-key": "ERRO - CHAVE NÃO DEFINIDA",
         "confirm-reset": "Isto irá invalidar todas as configurações OPDS. Tem a certeza que deseja continuar?",
-        "key-reset": "Repor chave da API"
+        "key-reset": "Repor chave da API",
+        "reset": "Restaurar"
     },
     "scrobbling-providers": {
         "title": "Fornecedores de Scrobbling",
@@ -313,14 +270,20 @@
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
-        "loading": "{{common.loading}}"
+        "loading": "{{common.loading}}",
+        "mal-used-for": "O MyAnimeList é usado para Coleções Inteligentes e sincronização de leituras futuras.",
+        "anilist-used-for": "O AniList é usado para scrobbling (sincronização de dados) e sincronização das leituras futuras.",
+        "anilist-first-description": "O token do AniList está configurado. Este token tem a duração de um ano e o Kavita irá informá-lo antes da sua expiração para que o possa refrescar aqui. Com este token, o Kavita irá gerar eventos scrobble (sincronização) a partir da seu histórico de leituras, leituras futuras, e classificações. Pode começar isto agora ou mais tarde. Se tiver alguma série que não deseja que seja scrobbled, selecione-a mais tarde e escolha a opção Pausa de Scrobble. Esta tarefa só tem de ser executada uma vez. Depois disso, será o Kavita a gerir a sincronização.
           Se selecionar 'Mais Tarde', pode encontrar o botão na página de Scrobbling.",
+        "anilist-first-header": "Token do AniList gravado",
+        "anilist-first-later": "Mais Tarde",
+        "anilist-first-now": "Agora"
     },
     "typeahead": {
         "locked-field": "Campo bloqueado",
         "close": "{{common.close}}",
         "loading": "{{common.loading}}",
         "add-item": "Adicionar {{item}}…",
-        "no-data": "Sem dados",
+        "no-data": "{{common.no-data}}",
         "add-custom-item": ", digite para adicionar um item personalizado"
     },
     "generic-list-modal": {
@@ -497,9 +460,9 @@
     },
     "library-type-pipe": {
         "book": "Livro",
-        "comic": "BD",
+        "comic": "BD (Legado)",
         "manga": "Manga",
-        "comicVine": "Comic Vine",
+        "comicVine": "BD",
         "image": "Imagem",
         "lightNovel": "Light Novel"
     },
@@ -561,10 +524,7 @@
         "installed": "Instalado",
         "download": "Descarregar",
         "nightly": "Versão Diária: {{version}}",
-        "published-label": "Publicado: ",
-        "available": "Disponível",
-        "description": "Se não vir uma etiqueta {{installed}}",
-        "description-continued": "etiqueta, está num lançamento experimental. Apenas as versões principais serão exibidas como disponíveis. Uma etiqueta experimental será exibida todas as experimentais naquele estável."
+        "available": "Disponível"
     },
     "invite-user": {
         "title": "Convidar Utilizador",
@@ -610,15 +570,35 @@
         "activate-discordId-tooltip": "Associe a sua conta Discord com o Kavita+. Isto irá dar-lhe acesso a canais privados que são usados para definir os desenvolvimentos futuros do Kavita.",
         "discord-validation": "Este User Id do Discord não é válido. O seu user id não é o mesmo que o seu nome no Discord.",
         "activate-delete": "{{common.delete}}",
-        "activate-reset": "{{common.reset}}",
+        "activate-reset": "Reiniciar Licença",
         "activate-reset-tooltip": "Invalide um registro anterior usando sua licença. Requer licença e e-mail",
         "activate-save": "{{common.save}}",
         "kavita+-desc-part-1": "O Kavita+ é um serviço de subscrição premium que desbloqueia funcionalidades para todos os utilizadores desta instância do Kavita. Compre uma subscrição para desbloquear ",
         "kavita+-desc-part-2": "benefícios premium",
         "kavita+-desc-part-3": "hoje!",
-        "kavita+-requirement": "O Kavita+ funciona apenas com a última versão e as 2 versões anteriores. Qualquer outra versão poderá não funcionar.",
-        "kavita+-releases": "Ver lançamentos",
-        "help-label": "{{common.help}}"
+        "kavita+-requirement": "O Kavita+ funciona apenas com a última versão e as 3 versões anteriores. Qualquer outra versão poderá não funcionar.",
+        "help-label": "{{common.help}}",
+        "info-title": "Informação da Licença",
+        "actions-title": "Ações",
+        "license-active-label": "Licença Ativa",
+        "supported-version-label": "Na versão Suportada do Kavita",
+        "expiration-label": "Data de Expiração",
+        "valid-tooltip": "Válida",
+        "invalid-tooltip": "Inválida",
+        "reset-label": "Restaurar",
+        "k+-unlocked-description": "Bem vindo ao Kavita+! O Kavita irá gerar eventos de scrobble a partir do seu progresso, classificações, e leituras futuras, assim que registar os seus Provedores de Scrobbling na sua conta. Certifique-se que as séries para as quais não deseja eventos de scobble têm a pausa de scrobbling ativada.",
+        "delete-label": "Remover Licença",
+        "delete-tooltip": "Isto irá remover a licença do Kavita para impedir que o Kavita comunique com o Kavita+. Não vai perder a subscrição. Use 'gerir' para cancelar a subscrição.",
+        "manage-tooltip": "Atualizar informação de pagamento, Cancelar/Pausar subscrição, etc",
+        "faq-title": "Dúvidas Frequentes",
+        "total-subbed-months-label": "Total de Meses Subscrito",
+        "email-label": "Email Registado",
+        "license-mismatch": "A licença pode estar registada noutra instância Kavita. Volte a registar para corrigir.",
+        "k+-already-registered-header": "Licença já registada",
+        "overwrite": "Substituir",
+        "k+-unlocked": "Kavita+ desbloqueado!",
+        "k+-license-overwrite": "A licença está registada noutra instância Kavita. Isto pode acontecer quando se reinstala e raramente acontece quando se fazem atualizações. Selecione substituir para forçar esta instância a registar-se com o Kavita+.",
+        "reset-tooltip": "A instância do servidor que está associada à licença Kavita+ será reiniciada. É necessário Email e Licença"
     },
     "book-line-overlay": {
         "copy": "Copiar",
@@ -651,7 +631,10 @@
         "incognito-mode-label": "Modo Incógnito",
         "next": "Seguinte",
         "previous": "Anterior",
-        "go-to-page-prompt": "Existem {{totalPages}} páginas. Para que página deseja ir?"
+        "go-to-page-prompt": "Existem {{totalPages}} páginas. Para que página deseja ir?",
+        "go-to-first-page": "Ir para a primeira página",
+        "go-to-section": "Ir para secção",
+        "go-to-section-prompt": "Existem {{totalSections}} secções. Para que secção deseja ir?"
     },
     "personal-table-of-contents": {
         "no-data": "Ainda não existem marcadores",
@@ -699,7 +682,7 @@
     "series-detail": {
         "page-settings-title": "Definições de Página",
         "close": "{{common.close}}",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
         "layout-mode-option-card": "Cartão",
         "layout-mode-option-list": "Lista",
         "continue-from": "Continuar {{title}}",
@@ -725,8 +708,6 @@
         "no-pages": "{{toasts.no-pages}}",
         "no-chapters": "Não existem capítulos neste volume. Impossível ler.",
         "cover-change": "Pode levar até um minuto para a imagem ser refrescada pelo browser. Até isso acontecer, a imagem antiga será mostrada nalgumas páginas.",
-        "user-reviews-local": "Críticas Locais",
-        "user-reviews-plus": "Críticas Externas",
         "writers-title": "{{metadata-fields.writers-title}}",
         "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
         "characters-title": "{{metadata-fields.characters-title}}",
@@ -752,9 +733,11 @@
         "more-alt": "Mais",
         "time-left-alt": "Tempo Restante",
         "time-to-read-alt": "{{sort-field-pipe.time-to-read}}",
-        "scrobbling-tooltip": "{{settings.scrobbling}}",
+        "scrobbling-tooltip": "{{settings.scrobbling}}: {{value}}",
         "publication-status-title": "Publicação",
-        "publication-status-tooltip": "Estado da Publicação"
+        "publication-status-tooltip": "Estado da Publicação",
+        "on": "{{reader-settings.on}}",
+        "off": "{{reader-settings.off}}"
     },
     "metadata-fields": {
         "collections-title": "{{side-nav.collections}}",
@@ -786,7 +769,8 @@
         "entry-label": "Ver detalhes",
         "kavita-tooltip": "A Sua Classificação + Geral",
         "kavita-rating-title": "A Sua Classificação",
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "critic": "{{review-card.critic}}"
     },
     "badge-expander": {
         "more-items": "e mais {{count}}"
@@ -821,7 +805,9 @@
         "back": "Voltar",
         "more": "Mais",
         "customize": "{{settings.customize}}",
-        "browse-authors": "Explorar Autores"
+        "edit": "{{common.edit}}",
+        "cancel-edit": "Fechar Reordenar",
+        "browse-people": "Explorar Pessoas"
     },
     "library-settings-modal": {
         "close": "{{common.close}}",
@@ -836,9 +822,9 @@
         "library-name-unique": "O nome da biblioteca tem de ser único",
         "last-scanned-label": "Último Scan:",
         "type-label": "Tipo",
-        "type-tooltip": "O tipo de biblioteca indica como os nomes dos ficheiros são processados e se o UI mostra Capítulos (Manga) vs Números (BDs). Verifique o wiki para mais detalhes relativamente às diferenças entre os dois tipos de bibliotecas.",
+        "type-tooltip": "O tipo de biblioteca indica como os nomes dos ficheiros são processados e se o UI mostra Capítulos (Manga) vs Edições (BDs). Verifique o wiki para mais detalhes relativamente às diferenças entre os dois tipos de bibliotecas.",
         "kavitaplus-eligible-label": "Kavita+ Elegível",
-        "kavitaplus-eligible-tooltip": "O Kavita+ extrairá informações ou oferecerá suporte ao Scrobbling",
+        "kavitaplus-eligible-tooltip": "Suporta as funcionalidades de metadados do Kavita+ ou Scrobbling",
         "folder-description": "Adicione pastas à sua biblioteca",
         "browse": "Procure as Pastas Que Pretende Adicionar",
         "help-us-part-1": "Ajude-nos e siga ",
@@ -872,7 +858,11 @@
         "file-type-group-tooltip": "Os tipos de ficheiros que o Kavita pode procurar. Por exemplo, Arquivo irá incluir todos os ficheiros cb*, zip, rar, etc.",
         "exclude-patterns-label": "Padrões de Exclusão",
         "exclude-patterns-tooltip": "Configura um conjunto de padrões (sintaxe Glob) que o Kavita irá excluir dos resultados da analise de directorias.",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "allow-metadata-matching-label": "Permitir Correspondência de Metadados",
+        "allow-metadata-matching-tooltip": "Se o Kavita deve descarregar metadados para as Séries nesta Biblioteca. Isto irá acontecer apenas se o servidor tiver uma subscrição Kavita+ ativa.",
+        "enable-metadata-label": "Permitir Metadados (ComicInfo/Epub/PDF)",
+        "enable-metadata-tooltip": "Permitir que o Kavita use metadados que substituem a análise dos nomes dos ficheiros."
     },
     "file-type-group-pipe": {
         "archive": "Arquivo",
@@ -882,30 +872,30 @@
     },
     "reader-settings": {
         "general-settings-title": "Definições Gerais",
-        "font-family-label": "{{user-preferences.font-family-label}}",
-        "font-size-label": "{{user-preferences.font-size-book-label}}",
-        "line-spacing-label": "{{user-preferences.line-height-book-label}}",
-        "margin-label": "{{user-preferences.margin-book-label}}",
+        "font-family-label": "{{manage-reading-profiles.font-family-label}}",
+        "font-size-label": "{{manage-reading-profiles.font-size-book-label}}",
+        "line-spacing-label": "{{manage-reading-profiles.line-height-book-label}}",
+        "margin-label": "{{manage-reading-profiles.margin-book-label}}",
         "reset-to-defaults": "Repor Definições por Defeito",
         "reader-settings-title": "Definições do Leitor",
-        "reading-direction-label": "{{user-preferences.reading-direction-book-label}}",
+        "reading-direction-label": "{{manage-reading-profiles.reading-direction-book-label}}",
         "right-to-left": "Direita para a Esquerda",
         "left-to-right": "Esquerda para a Direita",
         "horizontal": "Horizontal",
         "vertical": "Vertical",
-        "writing-style-label": "{{user-preferences.writing-style-label}}",
+        "writing-style-label": "{{manage-reading-profiles.writing-style-label}}",
         "writing-style-tooltip": "Altera a direção do texto. Horizontal é da esquerda para direita, veritcal é do topo para o fundo.",
         "tap-to-paginate-label": "Paginação por Toque",
         "tap-to-paginate-tooltip": "Clicar as extremidades do ecrã para paginar",
         "on": "Ligado",
         "off": "Desligado",
-        "immersive-mode-label": "{{user-preferences.immersive-mode-label}}",
+        "immersive-mode-label": "{{manage-reading-profiles.immersive-mode-label}}",
         "immersive-mode-tooltip": "Esta opção ocultará o menu ao clicar no documento e ligará o Toque para Paginar",
         "fullscreen-label": "Ecrã Completo",
         "fullscreen-tooltip": "Colocar o leitor em modo ecrã completo",
         "exit": "Sair",
         "enter": "Entrar",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
         "layout-mode-tooltip": "Scroll: Espelha o ficheiro epub (geralmente é uma página longa por capítulo).
          1 Coluna: Cria uma única página virtual.
          2 Colunas: Cria duas páginas virtuais que são dispostas lado a lado.",
         "layout-mode-option-scroll": "Scroll",
         "layout-mode-option-1col": "1 Coluna",
@@ -914,7 +904,15 @@
         "theme-dark": "Escuro",
         "theme-black": "Preto",
         "theme-white": "Branco",
-        "theme-paper": "Papel"
+        "theme-paper": "Papel",
+        "update-parent": "Gravar para {{name}}",
+        "loading": "a carregar",
+        "create-new": "Novo perfil implícito",
+        "create-new-tooltip": "Crie um novo perfil a partir do seu perfil implícito atual",
+        "reading-profile-updated": "Perfil de leitura atualizado",
+        "reading-profile-promoted": "Perfil de leitura promovido",
+        "line-spacing-min-label": "1x",
+        "line-spacing-max-label": "2.5x"
     },
     "table-of-contents": {
         "no-data": "Este livro não tem um Indíce definido nos metadados ou um ficheiro toc"
@@ -938,7 +936,8 @@
     },
     "card-detail-layout": {
         "total-items": "{{count}} itens totais",
-        "jumpkey-count": "{{count}} Séries"
+        "jumpkey-count": "{{count}} Séries",
+        "no-data": "{{common.no-data}}"
     },
     "card-item": {
         "cannot-read": "Não Pode Ler"
@@ -964,12 +963,14 @@
         "language-title": "{{edit-chapter-modal.language-label}}",
         "release-title": "{{sort-field-pipe.release-year}}",
         "format-title": "{{metadata-filter.format-label}}",
-        "length-title": "{{edit-chapter-modal.words-label}}"
+        "length-title": "{{edit-chapter-modal.words-label}}",
+        "age-rating-title": "{{metadata-fields.age-rating-title}}"
     },
     "related-tab": {
         "reading-lists-title": "{{reading-lists.title}}",
         "collections-title": "{{side-nav.collections}}",
-        "relations-title": "{{tabs.related-tab}}"
+        "relations-title": "{{tabs.related-tab}}",
+        "bookmarks-title": "{{side-nav.bookmarks}}"
     },
     "cover-image-chooser": {
         "enter-an-url-pre-title": "Introduza um {{url}}",
@@ -1028,7 +1029,7 @@
         "file-header": "Ficheiro",
         "comment-header": "Comentário",
         "created-header": "Criado",
-        "no-data": "Sem Dados"
+        "no-data": "{{common.no-data}}"
     },
     "manage-email-settings": {
         "description": "Para poder usar algumas funcionalidades do Kavita, como Enviar para Dispositivo, tem de configurar um serviço de email. Outras funcionalidades, como Esqueceu a Password, requerem a intervenção do administrador se não tiver o Email configurado.",
@@ -1041,7 +1042,7 @@
         "reset": "{{common.reset}}",
         "test": "Teste",
         "host-name-label": "Nome do Host",
-        "host-name-tooltip": "Nome de domínio (do Proxy Inverso). Obrigatório para a funcionalidade de email. Se não existir proxy inverso, use qualquer url.",
+        "host-name-tooltip": "O nome de domínio do proxy inverso, necessário para a funcionalidade de email. Se não usar um proxy inverso, pode usar qualquer URL, incluindo http://externalip:port/",
         "host-name-validation": "O nome do host tem de começar por http(s) e não pode acabar com /",
         "sender-address-label": "Endereço Remetente",
         "sender-address-tooltip": "Este é o endereço de e-mail que o destinatário verá quando receber o email. Normalmente, o endereço de email associado à conta.",
@@ -1247,9 +1248,6 @@
         "backup-database-task-success": "Foi agendada a tarefa para criar uma cópia de segurança da BD",
         "download-logs-task": "Descarregar Logs",
         "download-logs-task-desc": "Junta todos os ficheiros de log num ficheiro zip e descarrega-o.",
-        "analyze-files-task": "Analisar Ficheiros",
-        "analyze-files-task-desc": "Corre uma tarefa de longa duração que analisa ficheiros para gerar extensão e tamanho. Este processo deverá correr apenas uma vez para a versão v0.7. Não é necessário se tiver uma versão pós v0.7 instalada.",
-        "analyze-files-task-success": "Foi agendada a análise de ficheiros",
         "sync-themes-task": "Sincronizar Temas",
         "sync-themes-task-desc": "Sincronizar temas descarregados com alterações upstream se a versão corresponder.",
         "sync-themes-success": "A sincronização de temas foi colocada em fila de espera",
@@ -1277,7 +1275,6 @@
         "change-password-alt": "Alterar Palavra Passe {{user}}",
         "resend": "Reenviar",
         "setup": "Configurar",
-        "admin": "Admin",
         "last-active-header": "Última Atividade",
         "roles-header": "Funções",
         "name-header": "Nome",
@@ -1289,7 +1286,8 @@
         "no-data": "Não existem outros utilizadores.",
         "loading": "{{common.loading}}",
         "actions-header": "Ações",
-        "pending-tooltip": "Este utilizador não validou o seu email"
+        "pending-tooltip": "Este utilizador não validou o seu email",
+        "all-libraries": "Todas as Bibliotecas"
     },
     "edit-collection-tags": {
         "title": "Editar Coleção {{collectionName}}",
@@ -1329,7 +1327,7 @@
         "server-section-title": "Servidor",
         "info-section-title": "Info",
         "import-section-title": "Importar",
-        "kavitaplus-section-title": "{{settings.admin-kavitaplus}}",
+        "kavitaplus-section-title": "Kavita+",
         "admin-general": "Geral",
         "admin-users": "Utilizadores",
         "admin-libraries": "Bibliotecas",
@@ -1340,7 +1338,7 @@
         "admin-tasks": "Tarefas",
         "admin-statistics": "Estatísticas",
         "admin-system": "Sistema",
-        "admin-kavitaplus": "Kavita+",
+        "admin-kavitaplus": "Licença",
         "account": "Conta",
         "preferences": "Preferências",
         "clients": "Chave API / OPDS",
@@ -1350,7 +1348,13 @@
         "theme": "Tema",
         "customize": "Personalizar",
         "cbl-import": "Lista de Leitura CBL",
-        "mal-stack-import": "Pilha MAL"
+        "mal-stack-import": "Pilha MAL",
+        "admin-email-history": "Histórico de Emails",
+        "admin-matched-metadata": "Metadados com Correspondência",
+        "admin-manage-tokens": "Gerir Tokens de Utilizador",
+        "scrobble-holds": "Pausas de Scrobble",
+        "admin-metadata": "Gerir Metadados",
+        "reading-profiles": "Perfis de Leitura"
     },
     "collection-detail": {
         "no-data": "Não existem itens. Tente adicionar uma série.",
@@ -1387,7 +1391,8 @@
     },
     "reading-list-item": {
         "remove": "{{common.remove}}",
-        "read": "{{common.read}}"
+        "read": "{{common.read}}",
+        "released-label": "Lançamento: {{date}}"
     },
     "stream-list-item": {
         "remove": "{{common.remove}}",
@@ -1395,7 +1400,8 @@
         "provided": "Disponibilizado",
         "smart-filter": "Filtro Inteligente",
         "library": "Biblioteca",
-        "external-source": "Fonte Externa"
+        "external-source": "Fonte Externa",
+        "delete": "{{common.delete}}"
     },
     "reading-list-detail": {
         "item-count": "{{common.item-count}}",
@@ -1407,7 +1413,19 @@
         "read-options-alt": "Opções de leitura",
         "incognito-alt": "(Incógnito)",
         "no-data": "Nada adicionado",
-        "characters-title": "{{metadata-fields.characters-title}}"
+        "characters-title": "{{metadata-fields.characters-title}}",
+        "writers-title": "{{metadata-fields.writers-title}}",
+        "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
+        "details-tab": "{{series-detail.details-tab}}",
+        "dnd-warning": "A funcionalidade arrastar e largar está indisponível em dispositivos móveis ou quando a lista de leitura tem mais de 100 itens.",
+        "items-title": "Itens",
+        "publishers-title": "{{metadata-fields.publishers-title}}",
+        "storyline-tab": "{{series-detail.storyline-tab}}",
+        "edit-label": "Modo Edição",
+        "date-range-title": "Intervalo de Datas",
+        "edit-alt": "{{common.edit}}",
+        "reorder-alt": "Reordenar Itens",
+        "more-alt": "{{series-detail.more-alt}}"
     },
     "events-widget": {
         "title-alt": "Atividade",
@@ -1460,7 +1478,10 @@
         "logout": "Terminar Sessão",
         "all-filters": "Filtros Inteligentes",
         "nav-link-header": "Opções de Navegação",
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "person-aka-status": "Corresponde um pseudónimo",
+        "browse-genres": "Explorar Géneros",
+        "browse-tags": "Explorar Etiquetas"
     },
     "promoted-icon": {
         "promoted": "{{common.promoted}}"
@@ -1571,7 +1592,6 @@
     },
     "manga-reader": {
         "back": "Voltar",
-        "save-globally": "Guardar Globalmente",
         "incognito-alt": "O modo anónimo está ligado. Pressione novamente para desligar.",
         "incognito-title": "Modo Incógnito:",
         "shortcuts-menu-alt": "Modal de Atalhos de Teclado",
@@ -1593,9 +1613,9 @@
         "height": "Altura",
         "width": "Largura",
         "width-override-label": "Sobrepor Largura",
-        "off": "Desligado",
+        "off": "{{reader-settings.off}}",
         "original": "Original",
-        "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}",
+        "auto-close-menu-label": "{{manage-reading-profiles.auto-close-menu-label}}",
         "swipe-enabled-label": "Deslizar Ativado",
         "enable-comic-book-label": "Emular livro de BD",
         "brightness-label": "Brilho",
@@ -1606,9 +1626,14 @@
         "layout-mode-switched": "O modo de layout foi mudado para Individual por não haver espaço suficiente para mostrar o layout duplo",
         "no-next-chapter": "Não há Capítulo Seguinte",
         "no-prev-chapter": "Não há Capítulo Anterior",
-        "user-preferences-updated": "Preferência de utilizador atualizadas",
-        "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}",
-        "series-progress": "Progresso da Série: {{percentage}}"
+        "emulate-comic-book-label": "{{manage-reading-profiles.emulate-comic-book-label}}",
+        "series-progress": "Progresso da Série: {{percentage}}",
+        "update-parent": "{{reader-settings.update-parent}}",
+        "loading": "{{reader-settings.loading}}",
+        "create-new": "{{reader-settings.create-new}}",
+        "create-new-tooltip": "{{reader-settings.create-new-tooltip}}",
+        "reading-profile-updated": "Perfil de leitura atualizado",
+        "reading-profile-promoted": "Perfil de leitura promovido"
     },
     "metadata-filter": {
         "filter-title": "{{common.filter}}",
@@ -1665,7 +1690,10 @@
         "release-year": "Ano de Lançamento",
         "read-progress": "Última Leitura",
         "average-rating": "Classificação Média",
-        "random": "Aleatório"
+        "random": "Aleatório",
+        "person-name": "Nome",
+        "person-series-count": "Número de Séries",
+        "person-chapter-count": "Número de Capítulos"
     },
     "edit-series-modal": {
         "title": "Detalhes de {{seriesName}}",
@@ -1802,8 +1830,8 @@
         "cover-image-tab": "{{tabs.cover-tab}}",
         "tasks-tab": "{{tabs.tasks-tab}}",
         "info-tab": "{{tabs.info-tab}}",
-        "pages-label": "{{edit-chapter-modal.pages-count}}",
-        "words-label": "{{edit-chapter-modal.length-title}}",
+        "pages-label": "{{edit-chapter-modal.pages-label}}",
+        "words-label": "{{edit-chapter-modal.words-label}}",
         "pages-count": "{{edit-chapter-modal.pages-count}}",
         "words-count": "{{edit-chapter-modal.words-count}}",
         "reading-time-label": "{{edit-chapter-modal.reading-time-label}}",
@@ -1826,7 +1854,7 @@
     "kavitaplus-metadata-breakdown-stats": {
         "title": "Detalhamento de Metadados Kavita+",
         "description": "Kavita busca metadados (avaliações, comentários, recomendações, etc.) lentamente ao longo do tempo para séries elegíveis.",
-        "no-data": "Sem dados",
+        "no-data": "{{common.no-data}}",
         "errored-series-label": "Séries com erros",
         "completed-series-label": "Séries Concluídas",
         "complete": "Todas as séries possuem metadados"
@@ -1954,14 +1982,16 @@
         "sidenav": "Navegação Lateral",
         "external-sources": "Fontes Externas",
         "smart-filters": "Filtros Inteligentes",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "description": "Pode personalizar diferentes aspetos do Kavita ao reordenar, mudar a visibilidade, e fixar filtros inteligentes/origens externas à sua página inicial ou navegação lateral."
     },
     "customize-dashboard-streams": {
         "no-data": "Todos os Filtros inteligentes foram adicionados ao Painel Principal ou nenhum foi ainda criado.",
         "save": "{{common.save}}",
         "add": "{{common.add}}",
         "filter": "{{common.filter}}",
-        "clear": "{{common.clear}}"
+        "clear": "{{common.clear}}",
+        "smart-filter-title": "{{customize-dashboard-modal.title-smart-filters}}"
     },
     "customize-sidenav-streams": {
         "no-data": "Todos os Filtros inteligentes foram adicionados à Navegação Lateral ou nenhum foi ainda criado.",
@@ -1989,7 +2019,15 @@
         "no-data": "Não foram criados Filtros Inteligentes",
         "filter": "{{common.filter}}",
         "clear": "{{common.clear}}",
-        "errored": "Existe um erro de encoding no filtro. Tem de ser recriado."
+        "errored": "Existe um erro de encoding no filtro. Tem de ser recriado.",
+        "cancel": "{{common.cancel}}",
+        "close": "{{common.close}}",
+        "edit": "{{common.edit}}",
+        "save": "{{common.save}}",
+        "edit-smart-filter": "Editar {{name}}",
+        "name-label": "Nome",
+        "required-field": "Os Filtros Inteligentes requerem um nome",
+        "filter-name-unique": "Os nomes dos Filtros Inteligentes têm de ser únicos"
     },
     "edit-external-source-item": {
         "not-unique": "Existe uma fonte externa com este host. Garanta que não tem duplicados",
@@ -2014,7 +2052,7 @@
         "reading-lists": "{{side-nav.reading-lists}}",
         "bookmarks": "{{side-nav.bookmarks}}",
         "all-series": "{{side-nav.all-series}}",
-        "browse-authors": "{{side-nav.browse-authors}}"
+        "browse-authors": "{{side-nav.browse-people}}"
     },
     "filter-field-pipe": {
         "age-rating": "{{metadata-fields.age-rating-title}}",
@@ -2120,9 +2158,8 @@
         "email-sent": "Email enviado para {{email}}",
         "email-not-sent": "O email em ficheiro não é um email válido e não pode ser enviado. Foi colocado um link nos logs. O administrador pode disponibilizar este link para concluir o processo.",
         "k+-license-saved": "Licença guardada, mas não é válida. Carregue em \"check\" para atualizar a subscrição. O primeiro registo poderá levar algum tempo a propagar.",
-        "k+-unlocked": "Kavita+ desbloqueado!",
         "k+-error": "Ocorreu um erro ao ativar a licença. Por favor tente novamente.",
-        "k+-delete-key": "Isto apenas irá apagar a licença do Kavita e permitir que seja mostrado um link para comprar a licença. A sua subscrição não será cancelada! Use esta opção apenas quando assim indicado pelo suporte!",
+        "k+-delete-key": "Isto apenas irá apagar a licença do Kavita e permitir que seja mostrado um link para comprar a licença. A sua subscrição não será cancelada! Use a opção Gerir para cancelar a sua subscrição primeiro.",
         "k+-reset-key": "Isto irá invalidar um registo anterior com a sua licença e permitir voltar a registar uma instância Kavita.",
         "k+-reset-key-success": "A sua licença foi desassociada. Use o botão Editar para voltar a registar a sua instância e voltar a ativar o Kavita+",
         "library-deleted": "A biblioteca {{name}} foi removida",
@@ -2185,7 +2222,16 @@
         "bulk-scan": "A análise de bibliotecas é feita linearmente. Este processo pode demorar muito tempo e, dependendo do tamanho da biblioteca, não terminar.",
         "bulk-covers": "Refrescar as capas em múltiplas bibliotecas é um processo intensivo e pode demorar muito tempo. Tem a certeza que deseja continuar?",
         "person-image-downloaded": "A capa da pessoa foi descarregada e aplicada.",
-        "confirm-delete-multiple-chapters": "Tem a certeza de que pretende eliminar {{count}} capítulos/volumes? Este processo não irá modificar ficheiros em disco."
+        "confirm-delete-multiple-chapters": "Tem a certeza de que pretende eliminar {{count}} capítulos/volumes? Este processo não irá modificar ficheiros em disco.",
+        "bulk-delete-libraries": "Tem a certeza que deseja eliminar {{count}} bibliotecas?",
+        "match-success": "Séries correspondidas com sucesso",
+        "webtoon-override": "O modo Webtoon vai ser usado porque as imagens representam um webtoon.",
+        "scrobble-gen-init": "Foi colocada uma tarefa em fila para gerar eventos de scrobble a partir do historial de leitura e classificações existentes, sincronizando-as com os serviços que estão configurados.",
+        "series-added-want-to-read": "Série adicionada da lista Leituras Futuras",
+        "confirm-delete-multiple-volumes": "Tem a certeza que deseja apagar {{count}} volumes? Os ficheiros em disco não serão alterados.",
+        "series-bound-to-reading-profile": "Série vinculada ao Perfil de Leitura {{name}}",
+        "library-bound-to-reading-profile": "Biblioteca vinculada ao Perfil de Leitura {{name}}",
+        "external-match-rate-error": "O Kavita ficou sem taxa à procura de {{seriesName}}. Tente novamente em 5 minutos."
     },
     "read-time-pipe": {
         "less-than-hour": "<1 Hora",
@@ -2255,7 +2301,19 @@
         "multiple-selections": "Múltiplas Seleções",
         "back-to": "Voltar para {{action}}",
         "title": "Ações",
-        "copy-settings": "Copiar Definições De"
+        "copy-settings": "Copiar Definições De",
+        "match": "Correspondência",
+        "match-tooltip": "Fazer a associação manual das Séries com o Kavita+",
+        "reorder": "Reordenar",
+        "reading-profiles": "Perfis de Leitura",
+        "set-reading-profile": "Escolher Perfil de Leitura",
+        "set-reading-profile-tooltip": "Vincular um Perfil de Leitura a esta Biblioteca",
+        "clear-reading-profile": "Limpar Perfil de Leitura",
+        "clear-reading-profile-tooltip": "Limpar Perfil de Leitura para esta Biblioteca",
+        "cleared-profile": "Perfil de Leitura Limpo",
+        "rename": "Renomear",
+        "rename-tooltip": "Renomear o Filtro Inteligente",
+        "merge": "Juntar"
     },
     "preferences": {
         "left-to-right": "Esquerda para Direita",
@@ -2360,7 +2418,7 @@
         "series-count": "{{num}} Séries",
         "item-count": "{{num}} Itens",
         "book-num": "Livro",
-        "issue-hash-num": "Número #",
+        "issue-hash-num": "Edição #",
         "issue-num": "Número",
         "chapter-num": "Capítulo",
         "volume-num": "Volume",
@@ -2369,21 +2427,31 @@
         "issue-num-shorthand": "#{{num}}",
         "volume-num-shorthand": "Vol {{num}}",
         "book-nums": "Livros",
-        "issue-nums": "Números",
+        "issue-nums": "Edições",
         "chapter-nums": "Capítulos",
         "volume-nums": "Volumes",
-        "author-count": "{{num}} Autores"
+        "author-count": "{{num}} Autores",
+        "chapter-count": "{{num}} Capítulos",
+        "no-data": "Sem Dados",
+        "issue-count": "{{num}} Edições"
     },
     "confirm": {
         "alert": "Alerta",
-        "confirm": "Confirmar"
+        "confirm": "Confirmar",
+        "cancel": "{{common.cancel}}",
+        "info": "Informação",
+        "ok": "Ok",
+        "prompt": "Questão"
     },
     "person-detail": {
         "all-roles": "Funções",
         "browse-person-by-role-title": "Todas as Obras de {{name}} como {{role}}",
         "individual-role-title": "Como um {{role}}",
         "browse-person-title": "Todos as Obras de {{name}}",
-        "known-for-title": "Conhecido Por"
+        "known-for-title": "Conhecido Por",
+        "anilist-url": "{{edit-person-modal.anilist-tooltip}}",
+        "aka-title": "Também conhecido como ",
+        "no-info": "Sem informação sobre esta Pessoa"
     },
     "edit-person-modal": {
         "cover-image-description": "{{edit-series-modal.cover-image-description}}",
@@ -2406,11 +2474,344 @@
         "cover-image-description-extra": "Em alternativa pode descarregar uma capa a partir do CoversDB, se disponível.",
         "anilist-tooltip": "https://anilist.co/staff/{AniListId}/",
         "asin-tooltip": "https://www.amazon.com/stores/J.K.-Rowling/author/{ASIN}",
-        "download-coversdb": "Descarregar de CoversDB"
+        "download-coversdb": "Descarregar de CoversDB",
+        "aliases-tab": "Pseudónimos",
+        "aliases-label": "Editar pseudónimos",
+        "alias-overlap": "Este pseudónimo refere-se a outra pessoa ou é o nome desta pessoa, considere juntar as duas pessoas.",
+        "aliases-tooltip": "Quando uma série é etiquetada com o pseudónimo de uma pessoa, essa pessoa é associada à serie em vez de ser criada uma pessoa nova. Quando um pseudónimo for apagado, será necessário voltar a analisar a série para que essa alteração tenha efeito."
     },
-    "browse-authors": {
+    "changelog-update-item": {
+        "fixed": "Corrigido",
+        "published-label": "Publicado: ",
+        "download": "Descarregar",
+        "added": "Adicionado",
+        "api": "API",
+        "changed": "Alterado",
+        "theme": "Tema",
+        "installed": "{{changelog.installed}}",
+        "removed": "Removido",
+        "developer": "Programador",
+        "feature-requests": "Pedidos de Funcionalidades",
+        "known-issues": "Questões conhecidas"
+    },
+    "match-series-modal": {
+        "search": "Pesquisa",
+        "query-tooltip": "Introduza o nome da série, e o url do AniList/MyAnimeList/ComicBookRoundup. Os Urls irão usar uma pesquisa direta.",
+        "save": "{{common.save}}",
+        "title": "Corresponder {{seriesName}}",
+        "close": "{{common.close}}",
+        "no-results": "Não foi possível encontrar uma correspondência. Tente adicionar o url de um provedor suportado e tente novamente.",
+        "query-label": "Consulta",
+        "dont-match-label": "Não fazer Correspondência",
+        "dont-match-tooltip": "Optar que esta série não tenha correspondências ou scrobbling",
+        "description": "Selecione uma correspondência para refazer os metadados do Kavita+ e voltar a gerar eventos de scrobble. A opção \"Não Corresponder\" pode ser usada para impedir que o Kavita faça scrobbling e correspondência de metadados."
+    },
+    "new-version-modal": {
+        "added": "{{changelog.added}}",
+        "changed": "{{changelog.changed}}",
+        "developer": "{{changelog.developer}}",
+        "theme": "{{changelog.theme}}",
+        "refresh": "Refrescar",
+        "title": "O Kavita foi atualizado!",
+        "description": "Está disponível uma nova versão do Kavita. Refresque para atualizar.",
+        "fixed": "{{changelog.fixed}}",
+        "removed": "{{changelog.removed}}",
+        "api": "{{changelog.api}}",
+        "close": "{{common.close}}",
+        "known-issues": "{{changelog.known-issues}}"
+    },
+    "match-series-result-item": {
+        "volume-count": "{{server-stats.volume-count}}",
+        "chapter-count": "{{common.chapter-count}}",
+        "details": "Ver página",
+        "updating-metadata-status": "Metadados em Atualização",
+        "releasing": "Em Lançamento",
+        "issue-count": "{{common.issue-count}}"
+    },
+    "email-history": {
+        "description": "Aqui pode encontrar todos os emails enviados pelo Kavita, e para que utilizadores.",
+        "no-data": "{{common.no-data}}",
+        "not-sent-tooltip": "Não Enviado",
+        "date-header": "Data de Envio",
+        "user-header": "Destinatário",
+        "sent-header": "Com Sucesso",
+        "sent-tooltip": "Enviado",
+        "template-header": "Template"
+    },
+    "manage-user-tokens": {
+        "no-data": "{{common.no-data}}",
+        "username-header": "Nome de Utilizador",
+        "description": "Os utilizadores que têm tokens de scrobbling, podem ter de os renovar ocasionalmente. O Kavita irá enviar um email automaticamente, se o email estiver configurado e for válido.",
+        "anilist-header": "AniList",
+        "mal-header": "MAL",
+        "expires-label": "Expira: {{date}}",
+        "token-set-label": "Grupo de Tokens"
+    },
+    "manage-matched-metadata": {
+        "title": "Correspondência de Metadados",
+        "description": "Todas as Séries que possam ter correspondência com Metadados Externos aparecem aqui. O Kavita irá obter ou refrescar os metadados de 50 séries a cada 24 horas.",
+        "status-header": "Estado",
+        "series-name-header": "Séries",
+        "valid-until-header": "Próximo Refrescamento",
+        "matched-status-label": "Correspondente",
+        "unmatched-status-label": "Não Correspondente",
+        "blacklist-status-label": "Necessita Correspondência Manual",
+        "all-status-label": "Todos",
+        "dont-match-label": "Não Corresponde",
+        "no-data": "{{common.no-data}}",
+        "dont-match-status-label": "{{dont-match-label}}",
+        "library-name-header": "Biblioteca",
+        "actions-header": "Ações",
+        "match-alt": "Corresponder {{seriesName}}",
+        "library-type": "Tipo de Biblioteca",
+        "matched-state-label": "Estado da Correspondência"
+    },
+    "manage-metadata-settings": {
+        "description": "O Kavita+ tem a capacidade de descarregar e escrever alguns metadados na base de dados. Esta página permite selecionar o que está abrangido.",
+        "summary-label": "Sumário",
+        "enabled-label": "Permitir Descarregar Metadados",
+        "summary-tooltip": "Permitir que o Sumário seja escrito quando o campo está desbloqueado.",
+        "derive-publication-status-label": "Estado da Publicação",
+        "derive-publication-status-tooltip": "Permitir que o Estado da Publicação seja obtido do Total de Capítulos/Volumes.",
+        "enable-relations-label": "Relações",
+        "enable-relations-tooltip": "Permitir que as Relações sejam adicionadas.",
+        "localized-name-label": "Nome da Série Localizado",
+        "localized-name-tooltip": "Permitir que o Nome Localizado seja escrito quando o campo está desbloqueado. O Kavita tentará escolher o melhor valor possível.",
+        "enabled-tooltip": "Permitir que o Kavita descarregue metadados e os persista na sua base de dados.",
+        "enable-people-label": "Pessoas",
+        "enable-genres-tooltip": "Permitir que os Géneros sejam guardados na Série.",
+        "enable-genres-label": "Géneros",
+        "enable-cover-image-label": "Imagem de Capa",
+        "enable-cover-image-tooltip": "Permitir que o Kavita escreva a imagem de capa da Série",
+        "enable-tags-label": "Etiquetas",
+        "enable-tags-tooltip": "Permitir que as Etiquetas sejam guardadas na Série.",
+        "enable-start-date-label": "Data de Início",
+        "enable-start-date-tooltip": "Permitir que a Data de Início da Série seja guardada na Série",
+        "enable-people-tooltip": "Permitir que Pessoas (Personagens­, Escritores, etc) sejam adicionados. Todas as pessoas incluem imagens.",
+        "blacklist-tooltip": "O que estiver nesta lista será removido do processamento dos Géneros e Etiquetas. Neste campo devem ser colocados géneros/etiquetas que não quer que sejam guardados. Garanta que estão separados por vírgulas.",
+        "blacklist-label": "Colocar Géneros/Etiquetas na Lista Negra",
+        "age-rating-mapping-title": "Mapeamento de Classificação Etária",
+        "genre": "Género",
+        "tag": "Etiqueta",
+        "field-mapping-title": "Mapeamento de Campo",
+        "overrides-description": "Permitir que o Kavita escreva em campos bloqueados.",
+        "add-field-mapping-label": "Adicionar Mapeamento de Campo",
+        "add-age-rating-mapping-label": "Adicionar Mapeamento de Classificação Etária",
+        "remove-source-tag-label": "Remover Etiqueta de Origem",
+        "whitelist-label": "Etiquetas Permitidas",
+        "field-mapping-description": "Configure regras para os termos encontrados nos campos Género/Etiqueta e mapeie-os para termos novos no Género/Etiqueta ou remova-os, opcionalmente, da lista de origem. Só é aplicável quando o Género/Etiqueta podem ser escritos.",
+        "whitelist-tooltip": "Apenas que apenas os termos nesta lista sejam escritos nas Etiquetas. Certifique-se que os termos estão separados por vírgulas.",
+        "age-rating-mapping-description": "Os termos à esquerda que forem encontrados no Género ou Etiquetas, serão usados para definir a Classificação Etária da Série.",
+        "first-last-name-label": "Convenção Primeiro Nome/Sobrenome",
+        "first-last-name-tooltip": "Certificar que os nomes das Pessoas são escritos pela ordem Primeiro Nome e depois Sobrenome",
+        "overrides-label": "Substituições",
+        "person-roles-label": "Papéis",
+        "enable-chapter-title-label": "Título",
+        "enable-chapter-title-tooltip": "Permitir que o Título do Capítulo/Edição seja gravado",
+        "enable-chapter-summary-label": "{{manage-metadata-settings.summary-label}}",
+        "enable-chapter-summary-tooltip": "{{manage-metadata-settings.summary-tooltip}}",
+        "enable-chapter-release-date-label": "Data de Lançamento",
+        "enable-chapter-release-date-tooltip": "Permitir que a Data de Lançamento do Capítulo/Edição seja gravado",
+        "enable-chapter-publisher-label": "Editora",
+        "enable-chapter-publisher-tooltip": "Permitir que o Editor do Capítulo/Edição seja gravado",
+        "enable-chapter-cover-label": "Capa do Capítulo",
+        "enable-chapter-cover-tooltip": "Permitir que a Capa do Capítulo/Editor seja definida",
+        "chapter-header": "Campos do Capítulo"
+    },
+    "metadata-setting-field-pipe": {
+        "people": "{{tabs.people-tab}}",
+        "summary": "{{filter-field-pipe.summary}}",
+        "genres": "{{metadata-fields.genres-title}}",
+        "age-rating": "{{metadata-fields.age-rating-title}}",
+        "tags": "{{metadata-fields.tags-title}}",
+        "localized-name": "{{edit-series-modal.localized-name-label}}",
+        "publication-status": "{{edit-series-modal.publication-status-title}}",
+        "covers": "Capas",
+        "start-date": "{{manage-metadata-settings.enable-start-date-label}}",
+        "chapter-release-date": "Data de Lançamento (Capítulo)",
+        "chapter-summary": "Sumário (Capítulo)",
+        "chapter-covers": "Capas (Capítulo)",
+        "chapter-publisher": "{{person-role-pipe.publisher}} (Capítulo)",
+        "chapter-title": "Título (Capítulo)"
+    },
+    "role-localized-pipe": {
+        "admin": "Administrador",
+        "download": "Descarregar",
+        "change-password": "Mudar Palavra Passe",
+        "bookmark": "Marcador",
+        "change-restriction": "Mudar Restrição",
+        "login": "Login",
+        "read-only": "Só Leitura",
+        "promote": "Promover"
+    },
+    "log-level-pipe": {
+        "debug": "Debug",
+        "information": "Informação",
+        "trace": "Rastrear",
+        "warning": "Aviso",
+        "critical": "Crítico"
+    },
+    "manage-reading-profiles": {
+        "reset": "{{common.reset}}",
+        "description": "Nem todas as séries podem ser lidas da mesma maneira, defina perfis de leitura distintos por biblioteca ou séries para que o regresso às suas séries seja o mais simples possível.",
+        "extra-tip": "Atribua perfis de leitura a partir do menu de ações nas séries ou bibliotecas, ou em massa. Quando alterar definições num leitor, é criado um perfil escondido que memoriza as suas escolhas para essa série (não se aplica a pdfs). Este perfil é removido quando atribui o seu próprio perfil de leitura à série. Pode encontrar mais informação no",
+        "wiki-title": "wiki",
+        "profiles-title": "Os seus perfis de leitura",
+        "default-profile": "Por Defeito",
+        "add": "{{common.add}}",
+        "add-tooltip": "O seu novo perfil será gravado depois de lhe fazer qualquer alteração",
+        "make-default": "Definir por defeito",
+        "no-selected": "Nenhum perfil selecionado",
+        "confirm": "Tem a certeza que deseja eliminar o perfil de leitura {{name}}?",
+        "selection-tip": "Selecione um perfil da lista ou crie um novo à direita no topo",
+        "image-reader-settings-title": "Leitor de Imagens",
+        "reading-direction-label": "Direção de Leitura",
+        "reading-direction-tooltip": "Direção em que deve clicar para ir para a página seguinte. Direita para Esquerda significa que se clica no lado esquerdo do ecrã para ir para a página seguinte.",
+        "scaling-option-label": "Opções de Escala",
+        "scaling-option-tooltip": "Como a imagem é dimensionada no seu ecrã.",
+        "page-splitting-label": "Divisão de Páginas",
+        "page-splitting-tooltip": "Como dividir uma imagem que ocupa a largura toda (p.e., a imagem da esquerda e direita estão juntas)",
+        "reading-mode-label": "Modo de Leitura",
+        "reading-mode-tooltip": "Alterar o leitor para paginar verticalmente, horizontalmente ou para ter scroll infinito",
+        "layout-mode-label": "Modo de Layout",
+        "layout-mode-tooltip": "Mostrar apenas uma imagem no ecrã ou duas imagens lado a lado",
+        "background-color-label": "Cor de fundo",
+        "background-color-tooltip": "Cor de fundo do Leitor de Imagens",
+        "auto-close-menu-label": "Fechar Menu Automaticamente",
+        "auto-close-menu-tooltip": "Se o menu deve fechar automaticamente",
+        "show-screen-hints-label": "Mostrar Dicas no Ecrã",
+        "show-screen-hints-tooltip": "Mostrar dicas no ecrã que ajudam a compreender a área e direção de paginação",
+        "emulate-comic-book-label": "Emular livro de banda desenhada",
+        "emulate-comic-book-tooltip": "Aplica um efeito de sombra para emular a leitura a partir de um livro físico",
+        "swipe-to-paginate-label": "Deslizar para Paginar",
+        "swipe-to-paginate-tooltip": "Se o gesto de deslizar no ecrã causa que as páginas seguinte ou anterior sejam mostradas",
+        "allow-auto-webtoon-reader-label": "Modo Leitor Webtoon Automático",
+        "allow-auto-webtoon-reader-tooltip": "Muda para o modo Leitor Webtoon se as páginas indicam que é um webtoon. Podem acontecer falsos positivos.",
+        "width-override-label": "{{manga-reader.width-override-label}}",
+        "width-override-tooltip": "Substituir a largura das imagens no leitor",
+        "disable-width-override-label": "Desabilitar a substituição da largura",
+        "disable-width-override-tooltip": "Evitar que a substituição da largura tenha efeito quando o seu ecrã está configurado com o valor mínimo aceite",
+        "book-reader-settings-title": "Leitor de Livros",
+        "tap-to-paginate-label": "Tocar par Paginar",
+        "tap-to-paginate-tooltip": "Se as laterais do leitor de livros permitem que o toque mostre a página anterior/seguinte",
+        "immersive-mode-label": "Modo Imersivo",
+        "immersive-mode-tooltip": "Irá esconder o menu quando se clicar no documento e ligar o toque para paginar",
+        "reading-direction-book-label": "Direção de Leitura",
+        "reading-direction-book-tooltip": "Direção a clicar para ir para a página seguinte. Direita para Esquerda significa que se tem de clicar no lado esquerdo do ecrã para ir para a página seguinte.",
+        "font-family-label": "Família de Font",
+        "font-family-tooltip": "Família de fonts que vai ser carregada. Por defeito é carregada a font usada pelo livro",
+        "writing-style-label": "Estilo de Escrita",
+        "writing-style-tooltip": "Muda a direção do texto. A direção horizontal é da esquerda para direita, vertical é do topo para o fundo.",
+        "layout-mode-book-label": "Modo de Layout",
+        "layout-mode-book-tooltip": "Como o conteúdo deve ser disposto. O modo Scroll é como o livro define. O modo 1 ou 2 Colunas, ajusta-se à altura do dispositivo e tenta mostrar 1 ou 2 colunas de texto por página",
+        "color-theme-book-label": "Tema de Cores",
+        "color-theme-book-tooltip": "Que tema de cores deve ser aplicado ao conteúdo e menu do leitor de livros",
+        "font-size-book-label": "Tamanho da Font",
+        "font-size-book-tooltip": "Percentagem de dimensionamento que vai ser aplicado à font do livro",
+        "line-height-book-label": "Espaçamento entre Linhas",
+        "line-height-book-tooltip": "O espaçamento que existe entre linhas do livro",
+        "margin-book-label": "Margem",
+        "margin-book-tooltip": "Quando espaçamento existe de cada lado do ecrã. Esta opção será colocada a 0 em dispositivos móveis independentemente do valor que é aqui colocado.",
+        "pdf-reader-settings-title": "Leitor de PDF",
+        "pdf-scroll-mode-label": "Modo de Scroll",
+        "pdf-scroll-mode-tooltip": "Como é feito o scroll pelas páginas. Vertical/Horizontal e Tocar para Paginar (sem scroll)",
+        "pdf-spread-mode-label": "Modo de Layout",
+        "pdf-spread-mode-tooltip": "Como as páginas devem ser dispostas. Individual ou dupla (ímpar/par)",
+        "pdf-theme-label": "Tema",
+        "pdf-theme-tooltip": "O tema de cores do leitor",
+        "reading-profile-series-settings-title": "Séries",
+        "reading-profile-library-settings-title": "Biblioteca",
+        "delete": "{{common.delete}}"
+    },
+    "reviews": {
+        "user-reviews-local": "Criticas Locais",
+        "user-reviews-plus": "Criticas Externas"
+    },
+    "review-modal": {
+        "title": "Editar Crítica",
+        "review-label": "Crítica",
+        "close": "{{common.close}}",
+        "save": "{{common.save}}",
+        "delete": "{{common.delete}}",
+        "min-length": "A crítica tem de ter no mínimo {{count}} caracteres",
+        "required": "{{validation.required-field}}"
+    },
+    "browse-people": {
+        "title": "Explorar Pessoas",
         "author-count": "{{num}} Pessoas",
         "cover-image-description": "{{edit-series-modal.cover-image-description}}",
-        "title": "Explorar Autores & Escritores"
+        "issue-count": "{{common.issue-count}}",
+        "series-count": "{{common.series-count}}",
+        "roles-label": "Funções",
+        "sort-label": "Ordenar",
+        "name-label": "Nome",
+        "issue-count-label": "Número de Edições",
+        "series-count-label": "Número de Séries"
+    },
+    "browse-genres": {
+        "title": "Explorar Géneros",
+        "genre-count": "{{num}} Géneros",
+        "issue-count": "{{common.issue-count}}",
+        "series-count": "{{common.series-count}}"
+    },
+    "browse-tags": {
+        "title": "Explorar Etiquetas",
+        "genre-count": "{{num}} Etiquetas",
+        "issue-count": "{{common.issue-count}}",
+        "series-count": "{{common.series-count}}"
+    },
+    "bulk-set-reading-profile-modal": {
+        "title": "Definir perfil de leitura",
+        "close": "{{common.close}}",
+        "filter-label": "{{common.filter}}",
+        "clear": "{{common.clear}}",
+        "no-data": "Ainda não foram criadas coleções",
+        "loading": "{{common.loading}}",
+        "create": "{{common.create}}",
+        "bound": "Vinculado"
+    },
+    "merge-person-modal": {
+        "title": "{{personName}}",
+        "close": "{{common.close}}",
+        "save": "{{common.save}}",
+        "src": "Juntar Pessoa",
+        "merge-warning": "Se continuar, a pessoa selecionada será removida. O nome da pessoa selecionada será adicionada como pseudónimo e todas as suas funções serão transferidas.",
+        "alias-title": "Novos pseudónimos",
+        "known-for-title": "Conhecido por"
+    },
+    "browse-title-pipe": {
+        "publication-status": "{{value}} trabalhos",
+        "age-rating": "Avaliado com {{value}}",
+        "user-rating": "{{value}} classificação em estrelas",
+        "tag": "Tem Etiqueta {{value}}",
+        "translator": "Traduzido por {{value}}",
+        "character": "Tem o personagem {{value}}",
+        "publisher": "Publicado por {{value}}",
+        "editor": "Editado por {{value}}",
+        "artist": "Desenhado por {{value}}",
+        "letterer": "Com letras de {{value}}",
+        "colorist": "Colorido por {{value}}",
+        "inker": "Arte-finalizado por {{value}}",
+        "penciller": "Desenhado por {{value}}",
+        "writer": "Escrito por {{value}}",
+        "genre": "Tem o Género {{value}}",
+        "library": "Dentro da biblioteca {{value}}",
+        "format": "Formato de {{value}}",
+        "release-year": "Lançado em {{value}}",
+        "imprint": "Impressão de {{value}}",
+        "team": "Equipa {{value}}",
+        "location": "Na localização {{value}}"
+    },
+    "generic-filter-field-pipe": {
+        "person-role": "Função",
+        "person-name": "Nome",
+        "person-series-count": "Número de Séries",
+        "person-chapter-count": "Número de Capítulos"
+    },
+    "breakpoint-pipe": {
+        "never": "Nunca",
+        "mobile": "Móvel",
+        "tablet": "Tablet",
+        "desktop": "Desktop"
     }
 }
diff --git a/UI/Web/src/assets/langs/pt_BR.json b/UI/Web/src/assets/langs/pt_BR.json
index 1df4fc831..f8427c85b 100644
--- a/UI/Web/src/assets/langs/pt_BR.json
+++ b/UI/Web/src/assets/langs/pt_BR.json
@@ -22,11 +22,11 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "saving": "Salvando…",
         "update": "Atualizar",
-        "account-detail-title": "Detalhes da Conta"
+        "account-detail-title": "Detalhes da Conta",
+        "invalid-email-warning": "Um email não válido bloqueará algumas funcionalidades do Kavita"
     },
     "user-scrobble-history": {
         "title": "Histórico de scrobble",
@@ -39,7 +39,7 @@
         "series-header": "Séries",
         "data-header": "Dados",
         "is-processed-header": "É Processado",
-        "no-data": "Sem Dados",
+        "no-data": "{{common.no-data}}",
         "volume-and-chapter-num": "Volume {{v}} Capítulo {{n}}",
         "volume-num": "Volume {{num}}",
         "chapter-num": "Capítulo {{num}}",
@@ -47,7 +47,12 @@
         "not-applicable": "Não Aplicável",
         "processed": "Processado",
         "not-processed": "Não Processado",
-        "special": "{{entity-title.special}}"
+        "special": "{{entity-title.special}}",
+        "generate-scrobble-events": "Eventos de Preenchimento",
+        "token-expired": "Seu token AniList expirou! Os eventos de scrobbling não serão processados até que você renove na página Contas.",
+        "scrobbling-disabled": "O scrobbling está desativado nas configurações da sua conta.",
+        "select-all-label": "Selecionar tudo",
+        "delete-selected-label": "Excluir selecionado(s)"
     },
     "scrobble-event-type-pipe": {
         "chapter-read": "Progresso da Leitura",
@@ -59,15 +64,6 @@
     "spoiler": {
         "click-to-show": "Spoiler, clique para mostrar"
     },
-    "review-series-modal": {
-        "title": "Editar Análise",
-        "review-label": "Análise",
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "min-length": "A análise deve ter pelo menos {{count}} caracteres",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}",
         "user-review": "{{username}}'s Análise",
@@ -78,7 +74,8 @@
         "your-review": "Esta é sua análise",
         "external-review": "Análise Externa",
         "local-review": "Análise Local",
-        "rating-percentage": "Avaliação {{r}}%"
+        "rating-percentage": "Avaliação {{r}}%",
+        "critic": "crítico"
     },
     "want-to-read": {
         "title": "Quero Ler",
@@ -88,7 +85,7 @@
     },
     "user-preferences": {
         "title": "Painel do Usuário",
-        "pref-description": "Essas são configurações globais vinculadas à sua conta.",
+        "pref-description": "Estas são configurações globais vinculadas à sua conta. As configurações do leitor estão localizadas em Perfis de Leitura.",
         "account-tab": "{{tabs.account-tab}}",
         "preferences-tab": "{{tabs.preferences-tab}}",
         "theme-tab": "{{tabs.theme-tab}}",
@@ -112,55 +109,6 @@
         "collapse-series-relationships-tooltip": "Kavita deve mostrar uma série que não tem relacionamentos ou é derivado/prequela",
         "share-series-reviews-label": "Compartilhar Análises de Séries",
         "share-series-reviews-tooltip": "Kavita deve incluir suas análises da série para outros usuários",
-        "image-reader-settings-title": "Leitor de Imagem",
-        "reading-direction-label": "Direção de Leitura",
-        "reading-direction-tooltip": "Direção para clicar para mover para a próxima página. Da direita para a esquerda significa que você clica no lado esquerdo da tela para ir para a próxima página.",
-        "scaling-option-label": "Opções de Escala",
-        "scaling-option-tooltip": "Como dimensionar a imagem para sua tela.",
-        "page-splitting-label": "Divisão de Página",
-        "page-splitting-tooltip": "Como dividir uma imagem de largura total (ou seja, as imagens esquerda e direita são combinadas)",
-        "reading-mode-label": "Modo de Leitura",
-        "reading-mode-tooltip": "Mude o leitor para paginar verticalmente, horizontalmente ou ter uma rolagem infinita",
-        "layout-mode-label": "Modo de Layout",
-        "layout-mode-tooltip": "Renderiza uma única imagem na tela ou duas imagens lado a lado",
-        "background-color-label": "Cor de Fundo",
-        "background-color-tooltip": "Cor de Fundo do Leitor de Imagens",
-        "auto-close-menu-label": "Fechar Automaticamente o Menu",
-        "auto-close-menu-tooltip": "O menu deve fechar automaticamente",
-        "show-screen-hints-label": "Mostrar Dicas na Tela",
-        "show-screen-hints-tooltip": "Mostrar uma sobreposição para entender a área e a direção da paginação",
-        "emulate-comic-book-label": "Emular quadrinhos",
-        "emulate-comic-book-tooltip": "Aplica um efeito de sombra para emular a leitura de um livro",
-        "swipe-to-paginate-label": "Deslizar para Paginar",
-        "swipe-to-paginate-tooltip": "Deslizar na tela deve fazer com que a página seguinte ou anterior seja acionada",
-        "book-reader-settings-title": "Leitor de Livro",
-        "tap-to-paginate-label": "Toque para Paginar",
-        "tap-to-paginate-tooltip": "Se as laterais da tela do leitor de livros permitirem tocar nela para ir para a página anterior/próxima",
-        "immersive-mode-label": "Modo Imersivo",
-        "immersive-mode-tooltip": "Isso ocultará o menu atrás de um clique no documento do leitor e gire o toque para paginar",
-        "reading-direction-book-label": "Direção de Leitura",
-        "reading-direction-book-tooltip": "Direção para clicar para ir para a próxima página. Da direita para a esquerda significa que você clica no lado esquerdo da tela para ir para a próxima página.",
-        "font-family-label": "Família da Fonte",
-        "font-family-tooltip": "Família de fontes para carregar. Padrão carregará a fonte padrão do livro",
-        "writing-style-label": "Estilo de Escrita",
-        "writing-style-tooltip": "Altera a direção do texto. Horizontal é da esquerda para a direita, vertical é de cima para baixo.",
-        "layout-mode-book-label": "Modo de Layout",
-        "layout-mode-book-tooltip": "Como o conteúdo deve ser apresentado. Rolar é como o livro o embala. 1 ou 2 colunas se ajustam à altura do dispositivo e 1 ou 2 colunas de texto por página",
-        "color-theme-book-label": "Cor do Tema",
-        "color-theme-book-tooltip": "Qual tema de cor aplicar ao conteúdo e ao menu do leitor de livros",
-        "font-size-book-label": "Tamanho da Fonte",
-        "font-size-book-tooltip": "Porcentagem de escala a ser aplicada à fonte do livro",
-        "line-height-book-label": "Espaçamento da Linha",
-        "line-height-book-tooltip": "Quanto espaçamento entre as linhas do livro",
-        "margin-book-label": "Margem",
-        "margin-book-tooltip": "Quanto espaçamento em cada lado da tela. Isso será substituído por 0 em dispositivos móveis, independentemente dessa configuração.",
-        "pdf-reader-settings-title": "Leitor de PDF",
-        "pdf-scroll-mode-label": "Modo de Rolagem",
-        "pdf-scroll-mode-tooltip": "Como você rola pelas páginas. Vertical/Horizontal e toque para paginar (sem rolagem)",
-        "pdf-spread-mode-label": "Modo de Propagação",
-        "pdf-spread-mode-tooltip": "Como as páginas devem ser dispostas. Simples ou duplo (ímpar/par)",
-        "pdf-theme-label": "Tema",
-        "pdf-theme-tooltip": "Tema de cores do leitor",
         "clients-opds-alert": "O OPDS não está ativado neste servidor. Isso não afetará os usuários do Tachiyomi.",
         "clients-opds-description": "Todos os clientes de terceiros usarão a chave de API ou o URL de conexão abaixo. Estas são como senhas, mantenha-as privadas.",
         "clients-api-key-tooltip": "A chave API é como uma senha. Redefini-lo invalidará todos os clientes existentes.",
@@ -168,12 +116,20 @@
         "clients-api-key-label": "Chave de API",
         "clients-opds-url-tooltip": "Veja uma lista de clientes OPDS suportados:· ",
         "reset": "{{common.reset}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "kavitaplus-settings-title": "Kavita+",
+        "anilist-scrobbling-label": "AniList Scrobbling",
+        "anilist-scrobbling-tooltip": "Permitir que Kavita faça scrobble (sincronização unidirecional) de leitura e avaliações para o AniList",
+        "want-to-read-sync-label": "Sincronizar Quero Ler",
+        "want-to-read-sync-tooltip": "Permitir que Kavita adicione itens à sua lista de Quero Ler com base em séries Anilist e Mal, pendentes na lista de leitura"
     },
     "user-holds": {
-        "title": "Segurar Scrobble",
-        "description": "Esta é uma lista de séries gerenciada pelo usuário que não será transferida para provedores upstream. Você pode remover uma série a qualquer momento e o próximo evento passível de scrobble (leitura de progresso, classificação, desejo de ler status) acionará eventos.",
-        "no-data": "{{typeahead.no-data}}"
+        "title": "Paradas do Scrobble",
+        "description": "Esta é uma lista de séries gerenciada pelo usuário que não será transferida para provedores upstream. Você pode remover uma série a qualquer momento e o próximo evento passível de scrobble (leitura de progresso, avaliação, status de Quero Ler) acionará o scrobble.",
+        "no-data": "{{typeahead.no-data}}",
+        "series-name-header": "{{manage-matched-metadata.series-name-header}}",
+        "created-header": "{{manage-media-issues.created-header}}",
+        "delete-label": "{{common.remove}}"
     },
     "theme-manager": {
         "title": "Gerenciador de Temas",
@@ -293,7 +249,8 @@
         "regen-warning": "Gerar novamente sua chave de API invalidará todos os clientes existentes.",
         "no-key": "ERRO - NENHUMA CHAVE DEFINIDA",
         "confirm-reset": "Isso invalidará todas as configurações OPDS que você configurou. Você tem certeza que quer continuar?",
-        "key-reset": "Redefinir chave API"
+        "key-reset": "Redefinir chave API",
+        "reset": "Redefinir"
     },
     "scrobbling-providers": {
         "title": "Provedores de Scrobbling",
@@ -304,7 +261,7 @@
         "token-set": "Token Definido",
         "generate": "Gerar",
         "generic-instructions": "Preencha informações sobre os diferentes Serviços Externos que você precisa para permitir que Kavita+ interaja com eles.",
-        "instructions": "First time users should click on \"{{scrobbling-providers.generate}}\" below to allow Kavita+ to talk with {{service}}. Once you authorize the program, copy and paste the token in the input below. You can regenerate your token at any time.",
+        "instructions": "Os usuários iniciantes devem clicar em \"{{scroblbling-providers.generate}}\" abaixo para permitir que o Kavita+ converse com {{Service}}. Depois de autorizar o programa, copie e cole o token na entrada abaixo. Você pode regenerar seu token a qualquer momento.",
         "mal-instructions": "Kavita usa um ID de cliente MAL para autenticação. Crie um novo cliente para Kavita e, uma vez aprovado, forneça o ID do cliente e seu nome de usuário.",
         "scrobbling-applicable-label": "Scrobbling Aplicável",
         "token-input-label": "{{service}} token vai aqui",
@@ -313,14 +270,20 @@
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
-        "loading": "{{common.loading}}"
+        "loading": "{{common.loading}}",
+        "anilist-first-description": "Seu token AniList agora está configurado. Este token dura um ano e Kavita irá informá-lo antes que expire para atualizá-lo aqui. Com isso, Kavita irá gerar eventos de scrobble (sincronização) a partir do seu histórico de leitura, Quero Ler e avaliações. Você pode começar isso agora ou mais tarde. Se você tiver alguma série que não deseja que seja rabiscada, selecione mais tarde e coloque um Scrobble Parado nela. Você só precisa executar esta tarefa uma vez. Depois disso, Kavita cuidará da sincronização para você.1
           Se você selecionar 'Mais tarde', poderá encontrar o botão na página Scrobbling.",
+        "anilist-used-for": "AniList é usado para scrobbling (sincronização de dados) e a sincronização Quero Ler.",
+        "mal-used-for": "MyAnimeList é usado para coleções inteligentes e deseja sincronizar a leitura.",
+        "anilist-first-header": "Token AniList salvo",
+        "anilist-first-later": "Depois",
+        "anilist-first-now": "Agora"
     },
     "typeahead": {
         "locked-field": "O campo está bloqueado",
         "close": "{{common.close}}",
         "loading": "{{common.loading}}",
         "add-item": "Adicionar {{item}}…",
-        "no-data": "Sem dados",
+        "no-data": "{{common.no-data}}",
         "add-custom-item": ", digite para adicionar um item personalizado"
     },
     "generic-list-modal": {
@@ -497,9 +460,9 @@
     },
     "library-type-pipe": {
         "book": "Livro",
-        "comic": "Quadrinhos",
+        "comic": "Quadrinhos (Legado)",
         "manga": "Mangá",
-        "comicVine": "Comic Vine",
+        "comicVine": "Quadrinhos",
         "image": "Imagem",
         "lightNovel": "Light Novel"
     },
@@ -561,10 +524,7 @@
         "installed": "Instalado",
         "download": "Baixar",
         "nightly": "Versão Experimental: {{version}}",
-        "published-label": "Publicado: ",
-        "available": "Disponível",
-        "description": "se você não vir um {{installed}}",
-        "description-continued": "etiqueta, você está em um lançamento experimental. Apenas as versões principais serão exibidas como disponíveis. Uma etiqueta experimental será exibida todas as experimentais naquele estável."
+        "available": "Disponível"
     },
     "invite-user": {
         "title": "Convidar Usuário",
@@ -610,15 +570,35 @@
         "activate-discordId-tooltip": "Vincule sua conta Discord ao Kavita+. Isso concede acesso a canais ocultos para moldar Kavita.",
         "discord-validation": "Este não é um ID de usuário válido do Discord. Seu ID de usuário não é seu nome de usuário discord.",
         "activate-delete": "{{common.delete}}",
-        "activate-reset": "{{common.reset}}",
+        "activate-reset": "Redefinir Licença",
         "activate-reset-tooltip": "Invalidar um registro anterior usando sua licença. Requer licença e e-mail",
         "activate-save": "{{common.save}}",
         "kavita+-desc-part-1": "Kavita+ é um serviço de assinatura premium que desbloqueia recursos para todos os usuários nesta instância Kavita. Compre uma assinatura para desbloquear ",
         "kavita+-desc-part-2": "benefícios premium",
         "kavita+-desc-part-3": "hoje!",
-        "kavita+-requirement": "Kavita+ foi projetado para funcionar apenas com a versão mais recente – 2 versões. Qualquer coisa fora disso está sujeita a não funcionar.",
-        "kavita+-releases": "Veja os lançamentos",
-        "help-label": "{{common.help}}"
+        "kavita+-requirement": "Kavita+ foi projetado para funcionar apenas com os 3 lançamentos mais recentes. Qualquer coisa fora disso está sujeita a não funcionar.",
+        "help-label": "{{common.help}}",
+        "supported-version-label": "Na versão Kavita suportada",
+        "k+-unlocked-description": "Bem-vindo ao Kavita+! Kavita gerará eventos scrobble a partir de seu progresso, availações e Quero Ler assim que você registrar seus provedores de scrobbling na conta. Reserve algum tempo para garantir que você coloque paradas de scrobbling para qualquer série que você não queira scrobble.",
+        "license-mismatch": "A licença pode ser registrada para outra instância Kavita. Registre-se novamente para corrigir.",
+        "k+-license-overwrite": "A licença está registrada em outra instância do Kavita. Isso pode acontecer durante a reinstalação e raramente devido a atualizações do sistema. Selecione substituir para forçar o registro desta instância no Kavita+.",
+        "info-title": "Informações sobre licença",
+        "reset-tooltip": "Isso redefinirá a instância do servidor à qual a licença Kavita+ está vinculada. Requer e-mail e chave de licença",
+        "actions-title": "Ações",
+        "license-active-label": "Licença Ativa",
+        "expiration-label": "Expiração",
+        "valid-tooltip": "Válido",
+        "invalid-tooltip": "Inválido",
+        "reset-label": "Restaurar",
+        "delete-label": "Remover Licença",
+        "delete-tooltip": "Isso removerá a licença do Kavita para impedir que o Kavita fale com o Kavita+. Não cancela sua inscrição. Use 'gerenciar' primeiro para cancelar a assinatura.",
+        "manage-tooltip": "Atualizar informações de pagamento, cancelar/pausar assinatura, etc",
+        "faq-title": "FAQ",
+        "total-subbed-months-label": "Total de Meses Assinados",
+        "email-label": "E-mail Cadastrado",
+        "k+-already-registered-header": "Licença já registrada",
+        "overwrite": "Sobrescrever",
+        "k+-unlocked": "Kavita+ desbloqueado!"
     },
     "book-line-overlay": {
         "copy": "Copiar",
@@ -651,10 +631,13 @@
         "incognito-mode-label": "Modo Incógnito",
         "next": "Seguinte",
         "previous": "Anterior",
-        "go-to-page-prompt": "Existem {{totalPages}} páginas. Para qual página você quer ir?"
+        "go-to-page-prompt": "Existem {{totalPages}} páginas. Para qual página você quer ir?",
+        "go-to-section": "Ir para seção",
+        "go-to-section-prompt": "Existem {{totalSections}} seções. Para qual seção você deseja ir?",
+        "go-to-first-page": "Ir para a primeira página"
     },
     "personal-table-of-contents": {
-        "no-data": "Nada Marcado Ainda",
+        "no-data": "Nada Marcado ainda",
         "page": "Página {{value}}",
         "delete": "Excluir {{bookmarkName}}"
     },
@@ -699,7 +682,7 @@
     "series-detail": {
         "page-settings-title": "Configurações da Página",
         "close": "{{common.close}}",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
         "layout-mode-option-card": "Cartão",
         "layout-mode-option-list": "Lista",
         "continue-from": "Continuar {{title}}",
@@ -725,8 +708,6 @@
         "no-pages": "{{toasts.no-pages}}",
         "no-chapters": "Não há capítulos neste volume. Não posso ler.",
         "cover-change": "Pode levar até um minuto para o seu navegador atualizar a imagem. Até lá, a imagem antiga pode ser exibida em algumas páginas.",
-        "user-reviews-local": "Análises Locais",
-        "user-reviews-plus": "Análises Externas",
         "writers-title": "{{metadata-fields.writers-title}}",
         "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
         "characters-title": "{{metadata-fields.characters-title}}",
@@ -752,9 +733,11 @@
         "more-alt": "Mais",
         "time-left-alt": "Tempo Restante",
         "time-to-read-alt": "{{sort-field-pipe.time-to-read}}",
-        "scrobbling-tooltip": "{{settings.scrobbling}}",
+        "scrobbling-tooltip": "{{settings.scrobbling}}: {{value}}",
         "publication-status-title": "Publicação",
-        "publication-status-tooltip": "Estado da Publicação"
+        "publication-status-tooltip": "Estado da Publicação",
+        "off": "{{reader-settings.off}}",
+        "on": "{{reader-settings.on}}"
     },
     "metadata-fields": {
         "collections-title": "{{side-nav.collections}}",
@@ -786,7 +769,8 @@
         "entry-label": "Ver Detalhes",
         "kavita-tooltip": "Sua Avaliação + Geral",
         "kavita-rating-title": "Sua Avaliação",
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "critic": "{{review-card.critic}}"
     },
     "badge-expander": {
         "more-items": "e {{count}} mais"
@@ -821,7 +805,9 @@
         "back": "Voltar",
         "more": "Mais",
         "customize": "{{settings.customize}}",
-        "browse-authors": "Navegar pelos Autores"
+        "edit": "{{common.edit}}",
+        "cancel-edit": "Fechar Reordenar",
+        "browse-people": "Navegar por Pessoas"
     },
     "library-settings-modal": {
         "close": "{{common.close}}",
@@ -836,9 +822,9 @@
         "library-name-unique": "O nome da biblioteca deve ser exclusivo",
         "last-scanned-label": "Último Escaneamento:",
         "type-label": "Tipo",
-        "type-tooltip": "O tipo de biblioteca determina como os nomes dos arquivos são analisados e se a IU mostra Capítulos (mangá) versus Números (quadrinhos). Verifique o wiki para obter mais detalhes sobre as diferenças entre os tipos de biblioteca.",
+        "type-tooltip": "O tipo de biblioteca determina como os nomes dos arquivos são analisados e se a IU mostra Capítulos (mangá) versus Edições (quadrinhos). Verifique o wiki para obter mais detalhes sobre as diferenças entre os tipos de biblioteca.",
         "kavitaplus-eligible-label": "Kavita+ Elegível",
-        "kavitaplus-eligible-tooltip": "O Kavita+ extrairá informações ou oferecerá suporte ao Scrobbling",
+        "kavitaplus-eligible-tooltip": "Kavita+ suporta as capacidades de metadados ou Scrobbling",
         "folder-description": "Adicionar pastas à sua biblioteca",
         "browse": "Navegar por Pastas de Mídia",
         "help-us-part-1": "Ajude-nos seguindo ",
@@ -872,7 +858,11 @@
         "file-type-group-tooltip": "Que tipos de arquivos o Kavita deve procurar. Por exemplo, Arquivo incluirá todos os arquivos cb*, zip, rar, etc.",
         "exclude-patterns-label": "Excluir Padrões",
         "exclude-patterns-tooltip": "Configure um conjunto de padrões (sintaxe Glob) que Kavita corresponderá ao verificar diretórios e excluirá dos resultados do Scanner.",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "allow-metadata-matching-label": "Permitir Correspondência de Metadados",
+        "allow-metadata-matching-tooltip": "Deve o Kavita baixar os metadados para Séries nesta Biblioteca. Isso só ocorrerá se o servidor tiver uma Assinatura Kavita+ ativa.",
+        "enable-metadata-label": "Habilitar metadados (ComicInfo/Epub/PDF)",
+        "enable-metadata-tooltip": "Permitir que o Kavita leia arquivos de metadados que substituem a análise de nomes de arquivos."
     },
     "file-type-group-pipe": {
         "archive": "Arquivo",
@@ -882,30 +872,30 @@
     },
     "reader-settings": {
         "general-settings-title": "Configurações Gerais",
-        "font-family-label": "{{user-preferences.font-family-label}}",
-        "font-size-label": "{{user-preferences.font-size-book-label}}",
-        "line-spacing-label": "{{user-preferences.line-height-book-label}}",
-        "margin-label": "{{user-preferences.margin-book-label}}",
+        "font-family-label": "{{manage-reading-profiles.font-family-label}}",
+        "font-size-label": "{{manage-reading-profiles.font-size-book-label}}",
+        "line-spacing-label": "{{manage-reading-profiles.line-height-book-label}}",
+        "margin-label": "{{manage-reading-profiles.margin-book-label}}",
         "reset-to-defaults": "Redefinir para os Padrões",
         "reader-settings-title": "Configurações do Leitor",
-        "reading-direction-label": "{{user-preferences.reading-direction-book-label}}",
+        "reading-direction-label": "{{manage-reading-profiles.reading-direction-book-label}}",
         "right-to-left": "Direita para Esquerda",
         "left-to-right": "Esquerda para Direita",
         "horizontal": "Horizontal",
         "vertical": "Vertical",
-        "writing-style-label": "{{user-preferences.writing-style-label}}",
+        "writing-style-label": "{{manage-reading-profiles.writing-style-label}}",
         "writing-style-tooltip": "Altera a direção do texto. Horizontal é da esquerda para a direita, vertical é de cima para baixo.",
         "tap-to-paginate-label": "Toque em Paginação",
         "tap-to-paginate-tooltip": "Clique nas bordas da tela para paginar",
         "on": "Ligado",
         "off": "Desligado",
-        "immersive-mode-label": "{{user-preferences.immersive-mode-label}}",
+        "immersive-mode-label": "{{manage-reading-profiles.immersive-mode-label}}",
         "immersive-mode-tooltip": "Isso ocultará o menu atrás de um clique no documento do leitor e gire o toque para paginar",
         "fullscreen-label": "Tela Cheia",
         "fullscreen-tooltip": "Põe o leitor no modo de tela cheia",
         "exit": "Sair",
         "enter": "Entrar",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
         "layout-mode-tooltip": "Scroll: Espelha o arquivo epub (geralmente uma longa página de rolagem por capítulo). 
          1 Coluna: Cria uma única página virtual por vez. 
          2 Colunas: Cria duas páginas virtuais por vez dispostas lado a lado.",
         "layout-mode-option-scroll": "Rolar",
         "layout-mode-option-1col": "1 Coluna",
@@ -914,7 +904,15 @@
         "theme-dark": "Escuro",
         "theme-black": "Preto",
         "theme-white": "Branco",
-        "theme-paper": "Papel"
+        "theme-paper": "Papel",
+        "update-parent": "Salvar em {{name}}",
+        "loading": "carregando",
+        "create-new": "Novo perfil do implícito",
+        "create-new-tooltip": "Criar um novo perfil gerenciável a partir do seu perfil implícito atual",
+        "reading-profile-updated": "Perfil de leitura atualizado",
+        "reading-profile-promoted": "Perfil de leitura promovido",
+        "line-spacing-min-label": "1x",
+        "line-spacing-max-label": "2.5x"
     },
     "table-of-contents": {
         "no-data": "Este livro não tem um índice definido nos metadados ou um arquivo toc"
@@ -938,7 +936,8 @@
     },
     "card-detail-layout": {
         "total-items": "{{count}} itens no total",
-        "jumpkey-count": "{{count}} Séries"
+        "jumpkey-count": "{{count}} Séries",
+        "no-data": "{{common.no-data}}"
     },
     "card-item": {
         "cannot-read": "Não foi Possível Ler"
@@ -964,12 +963,14 @@
         "read-time-title": "{{edit-chapter-modal.reading-time-label}}",
         "language-title": "{{edit-chapter-modal.language-label}}",
         "release-title": "{{sort-field-pipe.release-year}}",
-        "length-title": "{{edit-chapter-modal.words-label}}"
+        "length-title": "{{edit-chapter-modal.words-label}}",
+        "age-rating-title": "{{metadata-fields.age-rating-title}}"
     },
     "related-tab": {
         "reading-lists-title": "{{reading-lists.title}}",
         "collections-title": "{{side-nav.collections}}",
-        "relations-title": "{{tabs.related-tab}}"
+        "relations-title": "{{tabs.related-tab}}",
+        "bookmarks-title": "{{side-nav.bookmarks}}"
     },
     "cover-image-chooser": {
         "enter-an-url-pre-title": "Insira uma {{url}}",
@@ -1028,7 +1029,7 @@
         "file-header": "Arquivo",
         "comment-header": "Comentário",
         "created-header": "Criado",
-        "no-data": "Sem Dados"
+        "no-data": "{{common.no-data}}"
     },
     "manage-email-settings": {
         "description": "Para usar algumas funções do Kavita, como Enviar para dispositivo, um provedor de e-mail deve ser configurado. Outros recursos como Esqueci a senha requerem intervenção do administrador sem configuração de e-mail.",
@@ -1041,7 +1042,7 @@
         "reset": "{{common.reset}}",
         "test": "Teste",
         "host-name-label": "Nome do Host",
-        "host-name-tooltip": "Nome de domínio (de proxy reverso). Necessário para funcionalidade de e-mail. Se não houver proxy reverso, use qualquer URL.",
+        "host-name-tooltip": "O nome de domínio do seu proxy reverso, necessário para a funcionalidade de e-mail. Se não estiver a usando um proxy reverso, pode utilizar qualquer URL, incluindo http://externalip:port/",
         "host-name-validation": "O nome do host deve começar com http(s) e não terminar com /",
         "sender-address-label": "Endereço do Remetente",
         "sender-address-tooltip": "Este é o endereço de e-mail que o destinatário verá quando receber o e-mail. Normalmente, o endereço de e-mail associado à conta.",
@@ -1152,7 +1153,7 @@
         "log-label": "Dias de Registros",
         "log-tooltip": "O número de registros a serem mantidos. O padrão é 30, o mínimo é 1 e o máximo é 30.",
         "logging-level-label": "Nível de Registro",
-        "logging-level-tooltip": "Use a depuração para ajudar a identificar problemas. A depuração pode consumir muito espaço em disco.",
+        "logging-level-tooltip": "Use a depuração para identificar problemas. A depuração pode consumir muito espaço em disco.",
         "cache-size-label": "Tamanho do Cache",
         "cache-size-tooltip": "A quantidade de memória permitida para cache de APIs pesadas. O padrão é 75 MB.",
         "on-deck-last-progress-label": "Última Leitura Na Estante (dias)",
@@ -1247,9 +1248,6 @@
         "backup-database-task-success": "Uma tarefa para fazer backup do banco de dados foi enfileirada",
         "download-logs-task": "Registros de Download",
         "download-logs-task-desc": "Compila todos os arquivos de registro em um zip e baixa ele.",
-        "analyze-files-task": "Analisar Arquivos",
-        "analyze-files-task-desc": "Executa uma tarefa de longa duração que analisará arquivos para gerar extensão e tamanho. Isso deve ser executado apenas uma vez para a versão v0.7. Não é necessário se você instalou o pós v0.7.",
-        "analyze-files-task-success": "A análise do arquivo foi colocada na fila",
         "sync-themes-task": "Sincronizar Temas",
         "sync-themes-task-desc": "Sincronize os temas baixados com alterações upstream se a versão corresponder.",
         "sync-themes-success": "A sincronização de temas foi colocada na fila",
@@ -1277,7 +1275,6 @@
         "change-password-alt": "Alterar Senha {{user}}",
         "resend": "Reenviar",
         "setup": "Configurar",
-        "admin": "Admin",
         "last-active-header": "Última Atividade",
         "roles-header": "Papéis",
         "name-header": "Nome",
@@ -1289,7 +1286,8 @@
         "no-data": "Não há outros usuários.",
         "loading": "{{common.loading}}",
         "actions-header": "Ações",
-        "pending-tooltip": "Este usuário não validou seu e-mail"
+        "pending-tooltip": "Este usuário não validou seu e-mail",
+        "all-libraries": "Todas as Bibliotecas"
     },
     "edit-collection-tags": {
         "title": "Editar {{collectionName}} Coleção",
@@ -1329,7 +1327,7 @@
         "server-section-title": "Servidor",
         "info-section-title": "Info",
         "import-section-title": "Importar",
-        "kavitaplus-section-title": "{{settings.admin-kavitaplus}}",
+        "kavitaplus-section-title": "Kavita+",
         "admin-general": "Geral",
         "admin-users": "Usuários",
         "admin-libraries": "Bibliotecas",
@@ -1340,7 +1338,7 @@
         "admin-tasks": "Tarefas",
         "admin-statistics": "Estatísticas",
         "admin-system": "Sistema",
-        "admin-kavitaplus": "Kavita+",
+        "admin-kavitaplus": "Licença",
         "account": "Conta",
         "preferences": "Preferências",
         "clients": "Chave API / OPDS",
@@ -1350,7 +1348,13 @@
         "theme": "Tema",
         "customize": "Personalizar",
         "cbl-import": "Lista de Leitura CBL",
-        "mal-stack-import": "Pilha MAL"
+        "mal-stack-import": "Pilha MAL",
+        "scrobble-holds": "Paradas do Scrobble",
+        "admin-email-history": "Histórico do e-mail",
+        "admin-matched-metadata": "Metadados Correspondentes",
+        "admin-manage-tokens": "Gerenciar Tokens do Usuário",
+        "admin-metadata": "Gerenciar Metadados",
+        "reading-profiles": "Perfis de Leitura"
     },
     "collection-detail": {
         "no-data": "Não há itens. Tente adicionar uma série.",
@@ -1387,7 +1391,8 @@
     },
     "reading-list-item": {
         "remove": "{{common.remove}}",
-        "read": "{{common.read}}"
+        "read": "{{common.read}}",
+        "released-label": "Lançado: {{date}}"
     },
     "stream-list-item": {
         "remove": "{{common.remove}}",
@@ -1395,7 +1400,8 @@
         "provided": "Provido",
         "smart-filter": "Filtro Intelegente",
         "library": "Biblioteca",
-        "external-source": "Fonte Externa"
+        "external-source": "Fonte Externa",
+        "delete": "{{common.delete}}"
     },
     "reading-list-detail": {
         "item-count": "{{common.item-count}}",
@@ -1407,7 +1413,19 @@
         "read-options-alt": "Opções de leitura",
         "incognito-alt": "(Incógnito)",
         "no-data": "Nada adicionado",
-        "characters-title": "{{metadata-fields.characters-title}}"
+        "characters-title": "{{metadata-fields.characters-title}}",
+        "items-title": "Itens",
+        "storyline-tab": "{{series-detail.storyline-tab}}",
+        "details-tab": "{{series-detail.details-tab}}",
+        "edit-label": "Modo de Edição",
+        "date-range-title": "Faixa de Datas",
+        "reorder-alt": "Reordenar Itens",
+        "publishers-title": "{{metadata-fields.publishers-title}}",
+        "more-alt": "{{series-detail.more-alt}}",
+        "edit-alt": "{{common.edit}}",
+        "writers-title": "{{metadata-fields.writers-title}}",
+        "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
+        "dnd-warning": "O arrastar e soltar não está disponível em dispositivos móveis ou quando a lista de leitura tem mais de 100 itens."
     },
     "events-widget": {
         "title-alt": "Atividade",
@@ -1460,7 +1478,10 @@
         "logout": "Sair",
         "all-filters": "Filtros Inteligentes",
         "nav-link-header": "Opções de Navegação",
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "person-aka-status": "Resultados como pseudônimos",
+        "browse-tags": "Navegar pelas Etiquetas",
+        "browse-genres": "Navegar pelos Gêneros"
     },
     "promoted-icon": {
         "promoted": "{{common.promoted}}"
@@ -1524,7 +1545,7 @@
         "import-description": "Para começar, importe um arquivo .cbl. O Kavita executará várias verificações antes de importar. Algumas etapas bloquearão o avanço devido a problemas com o arquivo.",
         "validate-description": "Todos os arquivos foram validados para verificar se há alguma operação a ser feita na lista. Quaisquer listas que falharam não passarão para a próxima etapa. Corrija os arquivos CBL e tente novamente.",
         "validate-warning": "Existem problemas com o CBL que impedirão uma importação. Corrija esses problemas e tente novamente.",
-        "validate-no-issue-description": "Nenhum problema encontrado com CBL, pressione próximo.",
+        "validate-no-issue-description": "Nenhum problema encontrado com CBL, pressione seguinte.",
         "dry-run-description": "Esta é uma simulação e mostra o que acontecerá se você pressionar Avançar e executar a importação. Todas as falhas não serão importadas.",
         "prev": "Anterior",
         "import": "Importar",
@@ -1535,7 +1556,7 @@
         "dry-run-step": "Funcionamento a Seco",
         "final-import-step": "Passo Final",
         "comicvine-parsing-label": "Usar a correspondência da série Comic Vine",
-        "cbl-repo": "Você pode encontrar muitas listas de leitura no repositório da  comunidade.",
+        "cbl-repo": "Pode encontrar muitas listas de leitura no repositório da comunidade.",
         "help-label": "{{common.help}}"
     },
     "pdf-reader": {
@@ -1571,7 +1592,6 @@
     },
     "manga-reader": {
         "back": "Voltar",
-        "save-globally": "Salvar Globalmente",
         "incognito-alt": "O modo de navegação anônima está ativado. Alterne para desligar.",
         "incognito-title": "Modo Incógnito:",
         "shortcuts-menu-alt": "Modal de Atalhos de Teclado",
@@ -1593,9 +1613,9 @@
         "height": "Altura",
         "width": "Largura",
         "width-override-label": "Substituição de Largura",
-        "off": "Desligado",
+        "off": "{{reader-settings.off}}",
         "original": "Original",
-        "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}",
+        "auto-close-menu-label": "{{manage-reading-profiles.auto-close-menu-label}}",
         "swipe-enabled-label": "Deslizar Ativado",
         "enable-comic-book-label": "Emular quadrinhos",
         "brightness-label": "Brilho",
@@ -1606,9 +1626,14 @@
         "layout-mode-switched": "Modo de layout alterado para Único devido a espaço insuficiente para renderizar layout duplo",
         "no-next-chapter": "Nenhum Capítulo A Seguir",
         "no-prev-chapter": "Nenhum Capítulo Anterior",
-        "user-preferences-updated": "Preferências de usuário atualizadas",
-        "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}",
-        "series-progress": "Progresso das Séries: {{percentage}}"
+        "emulate-comic-book-label": "{{manage-reading-profiles.emulate-comic-book-label}}",
+        "series-progress": "Progresso das Séries: {{percentage}}",
+        "loading": "{{reader-settings.loading}}",
+        "create-new-tooltip": "{{reader-settings.create-new-tooltip}}",
+        "reading-profile-promoted": "Perfil de leitura promovido",
+        "update-parent": "{{reader-settings.update-parent}}",
+        "reading-profile-updated": "Perfil de leitura atualizado",
+        "create-new": "{{reader-settings.create-new}}"
     },
     "metadata-filter": {
         "filter-title": "{{common.filter}}",
@@ -1665,7 +1690,10 @@
         "release-year": "Ano de Lançamento",
         "read-progress": "Última Leitura",
         "average-rating": "Avaliação Média",
-        "random": "Aleatório"
+        "random": "Aleatório",
+        "person-name": "Nome",
+        "person-chapter-count": "Número de Capítulos",
+        "person-series-count": "Número de Séries"
     },
     "edit-series-modal": {
         "title": "{{seriesName}} Detalhes",
@@ -1733,7 +1761,7 @@
         "chapter-title": "Capítulo",
         "volume-num": "{{common.volume-num}}",
         "highest-count-tooltip": "Número mais alto encontrado em todos os ComicInfo da Série",
-        "max-issue-tooltip": "Campo Máx. de Número ou Volume de todos ComicInfo nas Séries",
+        "max-issue-tooltip": "Campo Máx. de Edições ou Volume de todos ComicInfo nas Séries",
         "force-refresh": "Forçar Atualização",
         "force-refresh-tooltip": "Forçar a atualização de metadados externos do Kavita+",
         "loose-leaf-volume": "Capítulos de Folhas Soltas",
@@ -1802,8 +1830,8 @@
         "cover-image-tab": "{{tabs.cover-tab}}",
         "tasks-tab": "{{tabs.tasks-tab}}",
         "info-tab": "{{tabs.info-tab}}",
-        "pages-label": "{{edit-chapter-modal.pages-count}}",
-        "words-label": "{{edit-chapter-modal.length-title}}",
+        "pages-label": "{{edit-chapter-modal.pages-label}}",
+        "words-label": "{{edit-chapter-modal.words-label}}",
         "pages-count": "{{edit-chapter-modal.pages-count}}",
         "words-count": "{{edit-chapter-modal.words-count}}",
         "reading-time-label": "{{edit-chapter-modal.reading-time-label}}",
@@ -1826,7 +1854,7 @@
     "kavitaplus-metadata-breakdown-stats": {
         "title": "Detalhamento de Metadados Kavita+",
         "description": "Kavita busca metadados (avaliações, comentários, recomendações, etc.) lentamente ao longo do tempo para séries elegíveis.",
-        "no-data": "Sem dados",
+        "no-data": "{{common.no-data}}",
         "errored-series-label": "Séries com erros",
         "completed-series-label": "Séries Concluídas",
         "complete": "Todas as séries possuem metadados"
@@ -1954,14 +1982,16 @@
         "sidenav": "Navegador Lateral",
         "external-sources": "Fontes Externas",
         "smart-filters": "Filtros Inteligentes",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "description": "Pode personalizar diferentes aspectos do Kavita reordenando, alternando a visibilidade e ligando filtros inteligentes/fontes externas à sua página inicial ou navegação lateral."
     },
     "customize-dashboard-streams": {
         "no-data": "Todos os filtros inteligentes foram adicionados ao Painel de Controle ou nenhum foi criado ainda.",
         "save": "{{common.save}}",
         "add": "{{common.add}}",
         "filter": "{{common.filter}}",
-        "clear": "{{common.clear}}"
+        "clear": "{{common.clear}}",
+        "smart-filter-title": "{{customize-dashboard-modal.title-smart-filters}}"
     },
     "customize-sidenav-streams": {
         "no-data": "Todos os filtros inteligentes adicionados ao Navegador Lateral ou nenhum criado ainda.",
@@ -1972,7 +2002,7 @@
         "clear": "{{common.clear}}",
         "smart-filters-title": "Filtros Inteligentes",
         "external-sources-title": "{{customize-dashboard-modal.external-sources}}",
-        "reorder-when-filter-present": "You cannot reorder items via drag & drop while a filter is present. Use {{customize-sidenav-streams.order-numbers-label}}",
+        "reorder-when-filter-present": "Você não pode reordenar itens via arrasto e soltar enquanto um filtro estiver presente. Use {{personalize-sidenav streams.order-numbers-label}}",
         "order-numbers-label": "{{reading-list-detail.order-numbers-label}}",
         "bulk-mode-label": "Modo em Massa"
     },
@@ -1989,7 +2019,15 @@
         "no-data": "Nenhum Filtro Inteligente criado",
         "filter": "{{common.filter}}",
         "clear": "{{common.clear}}",
-        "errored": "Há um erro de codificação no filtro. Você precisa recriá-lo."
+        "errored": "Há um erro de codificação no filtro. Você precisa recriá-lo.",
+        "cancel": "{{common.cancel}}",
+        "close": "{{common.close}}",
+        "edit": "{{common.edit}}",
+        "save": "{{common.save}}",
+        "edit-smart-filter": "Editar {{name}}",
+        "name-label": "Nome",
+        "required-field": "Filtros inteligentes precisam de um nome",
+        "filter-name-unique": "Os nomes dos Filtros Inteligentes devem ser exclusivos"
     },
     "edit-external-source-item": {
         "not-unique": "Existe uma fonte externa com este host. Certifique-se de não ter duplicatas",
@@ -2014,7 +2052,7 @@
         "reading-lists": "{{side-nav.reading-lists}}",
         "bookmarks": "{{side-nav.bookmarks}}",
         "all-series": "{{side-nav.all-series}}",
-        "browse-authors": "{{side-nav.browse-authors}}"
+        "browse-authors": "{{side-nav.browse-people}}"
     },
     "filter-field-pipe": {
         "age-rating": "{{metadata-fields.age-rating-title}}",
@@ -2120,9 +2158,8 @@
         "email-sent": "E-mail enviado para {{email}}",
         "email-not-sent": "O e-mail registrado não é um e-mail válido e não pode ser enviado. Um link foi despejado nos logs. O administrador pode fornecer este link para concluir o fluxo.",
         "k+-license-saved": "Chave de licença salva, mas não é válida. Clique em verificar para revalidar a assinatura. O registro pela primeira vez pode demorar um minuto para se propagar.",
-        "k+-unlocked": "Kavita+ desbloqueado!",
         "k+-error": "Ocorreu um erro ao ativar sua licença. Por favor, tente novamente.",
-        "k+-delete-key": "Isso apenas excluirá a chave de licença do Kavita e permitirá que um link de compra seja exibido. Isso não cancelará sua assinatura! Use isso somente se instruído pelo suporte!",
+        "k+-delete-key": "Isso excluirá apenas a chave de licença do Kavita e permitirá a exibição de um link de compra. 2Isso não cancelará sua assinatura! Use Gerenciar para cancelar sua assinatura primeiro.",
         "k+-reset-key": "Isso invalidará um registro anterior usando sua licença e permitirá que você registre novamente uma instância Kavita.",
         "k+-reset-key-success": "Sua licença foi cancelada. Use o botão Editar para registrar novamente sua instância e reativar o Kavita+",
         "library-deleted": "A biblioteca {{name}} foi removida",
@@ -2156,7 +2193,7 @@
         "confirm-library-delete": "Tem certeza de que deseja excluir a biblioteca {{name}}? Você não pode desfazer esta ação.",
         "confirm-library-type-change": "Alterar o tipo de biblioteca acionará uma nova verificação com regras de análise diferentes e poderá levar à recriação de séries e, portanto, você poderá perder progresso e marcadores. Você deve fazer backup antes de fazer isso. Tem certeza de que deseja continuar?",
         "confirm-download-size": "O {{entityType}} é {{size}}. Você tem certeza que quer continuar?",
-        "confirm-download-size-ios": "O iOS tem problemas para baixar arquivos maiores que 200 MB; esse download pode não ser concluído.",
+        "confirm-download-size-ios": "O iOS tem problemas para baixar arquivos maiores que 200 MB, esse download pode não ser concluído.",
         "list-doesnt-exist": "Esta lista não existe",
         "confirm-delete-smart-filter": "Tem certeza de que deseja excluir este Filtro Inteligente?",
         "smart-filter-deleted": "Filtro Inteligente Excluído",
@@ -2185,7 +2222,16 @@
         "bulk-covers": "A atualização de capas em diversas bibliotecas é intensa e pode levar muito tempo. Tem certeza de que deseja continuar?",
         "bulk-scan": "A verificação de múltiplas bibliotecas será feita linearmente. Isso pode levar muito tempo e não ser concluído dependendo do tamanho da biblioteca.",
         "person-image-downloaded": "A capa da pessoa foi baixada e aplicada.",
-        "confirm-delete-multiple-chapters": "Tem certeza de que deseja excluir {{count}} capítulos/volumes? Não modificará arquivos no disco."
+        "confirm-delete-multiple-chapters": "Tem certeza de que deseja excluir {{count}} capítulos/volumes? Não modificará arquivos no disco.",
+        "bulk-delete-libraries": "Tem certeza de que deseja excluir {{count}} bibliotecas?",
+        "match-success": "Série correspondida corretamente",
+        "webtoon-override": "Mudando para o modo Webtoon devido a imagens que representam um Webtoon.",
+        "scrobble-gen-init": "Enfileirou uma tarefa para gerar eventos scrobble a partir do histórico de leitura e avaliações anteriores, sincronizando-os com serviços conectados.",
+        "confirm-delete-multiple-volumes": "Tem certeza de que deseja excluir {{count}} volumes? Isso não modificará os arquivos no disco.",
+        "series-added-want-to-read": "Série adicionada da lista Quero Ler",
+        "library-bound-to-reading-profile": "Biblioteca vinculada ao Perfil de Leitura {{name}}",
+        "series-bound-to-reading-profile": "Série vinculada ao Perfil de Leitura {{name}}",
+        "external-match-rate-error": "Kavita ficou sem taxa ao procurar {{seriesName}}. Tente novamente em 5 minutos."
     },
     "read-time-pipe": {
         "less-than-hour": "<1 Hora",
@@ -2255,7 +2301,19 @@
         "multiple-selections": "Múltiplas Seleções",
         "back-to": "Voltar para {{action}}",
         "title": "Ações",
-        "copy-settings": "Copiar Configurações De"
+        "copy-settings": "Copiar Configurações De",
+        "match": "Corresponder",
+        "match-tooltip": "Corresponder Séries com Kavita+ manualmente",
+        "reorder": "Reordenar",
+        "rename-tooltip": "Renomear o Filtro Inteligente",
+        "rename": "Renomear",
+        "merge": "Mesclar",
+        "reading-profiles": "Perfis de Leitura",
+        "clear-reading-profile": "Limpar Perfil de Leitura",
+        "clear-reading-profile-tooltip": "Limpar Perfil de Leitura para esta Biblioteca",
+        "cleared-profile": "Perfil de Leitura Limpo",
+        "set-reading-profile-tooltip": "Vincular um Perfil de Leitura a esta Biblioteca",
+        "set-reading-profile": "Definir Perfil de Leitura"
     },
     "preferences": {
         "left-to-right": "Esquerda para Direita",
@@ -2360,8 +2418,8 @@
         "series-count": "{{num}} Séries",
         "item-count": "{{num}} Itens",
         "book-num": "Livro",
-        "issue-hash-num": "Número #",
-        "issue-num": "Número",
+        "issue-hash-num": "Edição #",
+        "issue-num": "Edição",
         "chapter-num": "Capítulo",
         "volume-num": "Volume",
         "chapter-num-shorthand": "Cap. {{num}}",
@@ -2369,14 +2427,21 @@
         "issue-num-shorthand": "#{{num}}",
         "volume-num-shorthand": "Vol. {{num}}",
         "book-nums": "Livros",
-        "issue-nums": "Números",
+        "issue-nums": "Edições",
         "chapter-nums": "Capítulos",
         "volume-nums": "Volumes",
-        "author-count": "{{num}} Autores"
+        "author-count": "{{num}} Autores",
+        "chapter-count": "{{num}} Capítulos",
+        "no-data": "Sem Dados",
+        "issue-count": "{{num}} Edições"
     },
     "confirm": {
         "confirm": "Confirmar",
-        "alert": "Alerta"
+        "alert": "Alerta",
+        "info": "Informações",
+        "cancel": "{{common.cancel}}",
+        "ok": "Ok",
+        "prompt": "Questão"
     },
     "edit-person-modal": {
         "cover-image-tab": "{{edit-series-modal.cover-image-tab}}",
@@ -2399,18 +2464,354 @@
         "cover-image-description-extra": "Alternativamente, você pode baixar uma capa do CoversDB, se disponível.",
         "download-coversdb": "Baixar do CoversDB",
         "hardcover-tooltip": "https://hardcover.app/authors/{HardcoverId}",
-        "asin-tooltip": "https://www.amazon.com/stores/J.K.-Rowling/author/{ASIN}"
-    },
-    "browse-authors": {
-        "author-count": "{{num}} Pessoas",
-        "title": "Navegar pelos Autores & Escritores",
-        "cover-image-description": "{{edit-series-modal.cover-image-description}}"
+        "asin-tooltip": "https://www.amazon.com/stores/J.K.-Rowling/author/{ASIN}",
+        "alias-overlap": "Esse pseudônimo já aponta para outra pessoa ou é o nome dessa pessoa, considere mesclá -la.",
+        "aliases-label": "Editar pseudônimos",
+        "aliases-tab": "Pseudônimos",
+        "aliases-tooltip": "Quando uma série é etiquetada com um pseudônimo de uma pessoa, a pessoa é atribuída em vez de ser criada uma nova pessoa. Ao eliminar um pseudônimo, terá de voltar a analisar a série para que a alteração seja detectada."
     },
     "person-detail": {
         "browse-person-title": "Todas as obras de {{name}}",
         "browse-person-by-role-title": "Todos os trabalhos de {{name}} como {{role}}",
         "individual-role-title": "Como um {{role}}",
         "known-for-title": "Conhecido Por",
-        "all-roles": "Papéis"
+        "all-roles": "Papéis",
+        "anilist-url": "{{edit-person-modal.anilist-tooltip}}",
+        "no-info": "Nenhuma informação sobre esta Pessoa",
+        "aka-title": "Também conhecido como · "
+    },
+    "manage-user-tokens": {
+        "anilist-header": "AniList",
+        "description": "Os usuários que possuem tokens scrobbling podem precisar de renovação ocasionalmente. Kavita enviará um e-mail automaticamente se o e-mail estiver configurado e eles tiverem um e-mail válido.",
+        "username-header": "Nome de usuário",
+        "mal-header": "MAL",
+        "token-set-label": "Configurar Token",
+        "no-data": "{{common.no-data}}",
+        "expires-label": "Expira: {{date}}"
+    },
+    "changelog-update-item": {
+        "download": "Baixar",
+        "added": "Adicionado",
+        "changed": "Alterado",
+        "fixed": "Corrigido",
+        "developer": "Desenvolvedor",
+        "theme": "Tema",
+        "removed": "Removido",
+        "api": "API",
+        "published-label": "Publicado: ",
+        "installed": "{{changelog.installed}}",
+        "feature-requests": "Solicitações de Recursos",
+        "known-issues": "Problemas Conhecidos"
+    },
+    "new-version-modal": {
+        "title": "Kavita foi atualizado!",
+        "description": "Uma nova versão do Kavita está disponível. Baixe para atualizar.",
+        "added": "{{changelog.added}}",
+        "changed": "{{changelog.changed}}",
+        "fixed": "{{changelog.fixed}}",
+        "developer": "{{changelog.developer}}",
+        "theme": "{{changelog.theme}}",
+        "removed": "{{changelog.removed}}",
+        "api": "{{changelog.api}}",
+        "close": "{{common.close}}",
+        "refresh": "Atualizar",
+        "known-issues": "{{changelog.known-issues}}"
+    },
+    "manage-matched-metadata": {
+        "title": "Metadados Correspondentes",
+        "description": "Todas as séries aplicáveis que podem ser combinadas com metadados externos residem aqui. Kavita irá pré-buscar ou atualizar metadados de séries, 50 séries por 24 horas diariamente.",
+        "status-header": "Estado",
+        "series-name-header": "Séries",
+        "valid-until-header": "Próxima Atualização",
+        "matched-status-label": "Correspondente",
+        "unmatched-status-label": "Não Correspondente",
+        "blacklist-status-label": "Precisa de Correspondência Manual",
+        "all-status-label": "Todos",
+        "dont-match-label": "Não Corresponde",
+        "no-data": "{{common.no-data}}",
+        "dont-match-status-label": "{{dont-match-label}}",
+        "actions-header": "Ações",
+        "match-alt": "Correspondente à {{seriesName}}",
+        "library-name-header": "Biblioteca",
+        "matched-state-label": "Estado da Correspondência",
+        "library-type": "Tipo de Biblioteca"
+    },
+    "match-series-modal": {
+        "description": "Selecione uma correspondência para religar os metadados do Kavita+ e regenerar eventos scrobble. Não Corresponde pode ser usado para impedir que Kavita corresponda a metadados e scrobbling.",
+        "close": "{{common.close}}",
+        "title": "Correspondente {{seriesName}}",
+        "save": "{{common.save}}",
+        "no-results": "Não foi possível encontrar uma correspondência. Tente adicionar o URL de um provedor compatível e tente novamente.",
+        "query-label": "Consulta",
+        "query-tooltip": "Digite o nome da série, urls de Anilist/Myanimelist/ComicbookRoundup URL. As URLs serão usadas como pesquisa direta.",
+        "dont-match-label": "Não Fazer Correspondência",
+        "dont-match-tooltip": "Opte por esta série de correspondência e scrobbling",
+        "search": "Pesquisar"
+    },
+    "match-series-result-item": {
+        "volume-count": "{{server-stats.volume-count}}",
+        "chapter-count": "{{common.chapter-count}}",
+        "releasing": "Lançando",
+        "details": "Exibir página",
+        "updating-metadata-status": "Atualizando Metadados",
+        "issue-count": "{{common.issue-count}}"
+    },
+    "email-history": {
+        "description": "Aqui você encontra todos os e-mails enviados por Kavita e para qual usuário.",
+        "template-header": "Modelo",
+        "date-header": "Data de Envio",
+        "user-header": "Enviado Para",
+        "sent-header": "Com Sucesso",
+        "no-data": "{{common.no-data}}",
+        "sent-tooltip": "Enviado",
+        "not-sent-tooltip": "Não Enviado"
+    },
+    "manage-metadata-settings": {
+        "enable-relations-tooltip": "Permitir que as Relações das Séries sejam  adicionado.",
+        "blacklist-tooltip": "Qualquer coisa nesta lista será removida do gênero e do processamento de etiquetas. Este é um local para adicionar gêneros/etiquetas que você  não quer escrever. Verifique se eles são separados por vírgula.",
+        "enabled-label": "Habilitar Download de Metadados",
+        "enabled-tooltip": "Permitir que o Kavita baixe metadados e escreva no banco de dados.",
+        "summary-label": "Resumo",
+        "summary-tooltip": "Permitir que o resumo seja escrito quando o campo for desbloqueado.",
+        "derive-publication-status-tooltip": "Permitir que o estado da publicação seja derivado dos Números Totais de Capítulos/Volumes.",
+        "enable-relations-label": "Relações",
+        "enable-people-label": "Pessoa",
+        "enable-people-tooltip": "Permitir que as Pessoas (Personagens, Escritores, etc) sejam  adicionado . Todas as pessoas incluem imagens.",
+        "enable-start-date-label": "Data de Início",
+        "enable-genres-label": "Gêneros",
+        "enable-tags-label": "Etiquetas",
+        "enable-tags-tooltip": "Permitir que as Etiquetas das Séries sejam escritas.",
+        "blacklist-label": "Lista de bloqueio de Gêneros/Etiquetas",
+        "whitelist-label": "Etiquetas Permitidas",
+        "whitelist-tooltip": "Permitir apenas os termos nesta lista de sejam gravadas nas  etiquetas . Verifique se eles são separados por vírgula.",
+        "age-rating-mapping-title": "Mapeamento de Classificação Etária",
+        "age-rating-mapping-description": "Quaisquer sequências à esquerda, se encontradas em gênero ou etiquetas, definirá a classificação de idade das Séries.",
+        "genre": "Gênero",
+        "tag": "Etiqueta",
+        "remove-source-tag-label": "Remover Etiqueta Original",
+        "add-field-mapping-label": "Adicionar Mapeamento de Campo",
+        "add-age-rating-mapping-label": "Adicionar Mapeamento de Classificação de Etária",
+        "field-mapping-title": "Mapeamento de Campo",
+        "first-last-name-label": "Primeiro Sobrenome",
+        "person-roles-label": "Papéis",
+        "field-mapping-description": "As regras de configuração para certos termos encontrados no campo de gênero/etiqueta e mapeiam para um novo termo em gênero/etiqueta e opcionalmente, removam -a da lista de origem. Somente aplicável quando o gênero/etiqueta estiverem ativados para serem gravados.",
+        "first-last-name-tooltip": "Garantir que os nomes das Pessoas sejam escritos Primeiro, então o Último",
+        "enable-genres-tooltip": "Permitir que os Gêneros das Séries sejam escritos.",
+        "derive-publication-status-label": "Estado da Publicação",
+        "description": "O Kavita+ tem a capacidade de baixar e escrever alguns metadados limitados no banco de dados. Esta página permite que você alterne o que está no escopo.",
+        "enable-start-date-tooltip": "Permitir que a Data de Início das Séries seja gravada na Séries",
+        "localized-name-label": "Nome da Série Localizada",
+        "enable-cover-image-label": "Imagem da Capa",
+        "enable-cover-image-tooltip": "Permitir que Kavita escreva a imagem da capa das Séries",
+        "localized-name-tooltip": "Permitir que o nome localizado seja escrito quando o campo for desbloqueado. Kavita tentará dar o melhor palpite.",
+        "overrides-description": "Permita que Kavita escreva os campos trancados.",
+        "overrides-label": "Substituir",
+        "enable-chapter-title-label": "Título",
+        "enable-chapter-publisher-label": "Editora",
+        "enable-chapter-publisher-tooltip": "Permitir que a Editora do Capítulo/Edição seja salvo",
+        "enable-chapter-cover-label": "Capa do Capítulo",
+        "enable-chapter-cover-tooltip": "Permitir que a Capa do Capítulo/Edição seja definida",
+        "chapter-header": "Campos de Capítulo",
+        "enable-chapter-title-tooltip": "Permitir que o Título do Capítulo/Edição seja salvo",
+        "enable-chapter-summary-label": "{{manage-metadata-settings.summary-label}}",
+        "enable-chapter-summary-tooltip": "{{manage-metadata-settings.summary-tooltip}}",
+        "enable-chapter-release-date-label": "Data de Lançamento",
+        "enable-chapter-release-date-tooltip": "Permitir que a Data de Lançamento do Capítulo/Edição seja salvo"
+    },
+    "metadata-setting-field-pipe": {
+        "publication-status": "{{edit-series-modal.publication-status-title}}",
+        "start-date": "{{manage-metadata-settings.enable-start-date-label}}",
+        "genres": "{{metadata-fields.genres-title}}",
+        "tags": "{{metadata-fields.tags-title}}",
+        "covers": "Capas",
+        "localized-name": "{{edit-series-modal.localized-name-label}}",
+        "age-rating": "{{metadata-fields.age-rating-title}}",
+        "people": "{{tabs.people-tab}}",
+        "summary": "{{filter-field-pipe.summary}}",
+        "chapter-summary": "Resumo (Capítulo)",
+        "chapter-covers": "Capas (Capítulo)",
+        "chapter-publisher": "{{person-role-pipe.publisher}} (Capítulo)",
+        "chapter-title": "Título (Capítulo)",
+        "chapter-release-date": "Data de Lançamento (Capítulo)"
+    },
+    "role-localized-pipe": {
+        "admin": "Admin",
+        "download": "Baixar",
+        "change-password": "Alterar Senha",
+        "bookmark": "Marcador",
+        "change-restriction": "Alterar Restrição",
+        "login": "Entrar",
+        "read-only": "Só para Leitura",
+        "promote": "Divulgar"
+    },
+    "log-level-pipe": {
+        "debug": "Depuração",
+        "information": "Informação",
+        "trace": "Rastro",
+        "warning": "Aviso",
+        "critical": "Crítico"
+    },
+    "reviews": {
+        "user-reviews-local": "Análises Locais",
+        "user-reviews-plus": "Análises Externas"
+    },
+    "review-modal": {
+        "title": "Editar Análise",
+        "review-label": "Análise",
+        "close": "{{common.close}}",
+        "delete": "{{common.delete}}",
+        "min-length": "A análise deve ter pelo menos {{count}} caracteres",
+        "required": "{{validation.required-field}}",
+        "save": "{{common.save}}"
+    },
+    "merge-person-modal": {
+        "save": "{{common.save}}",
+        "src": "Mesclar Pessoa",
+        "alias-title": "Novos pseudônimos",
+        "close": "{{common.close}}",
+        "title": "{{personName}}",
+        "merge-warning": "se prosseguir, a pessoa selecionada será removida. O nome da pessoa selecionada será adicionado como um pseudônimo e todas as suas funções serão transferidas.",
+        "known-for-title": "Conhecido por"
+    },
+    "manage-reading-profiles": {
+        "swipe-to-paginate-tooltip": "Ao deslizar na tela, a página seguinte ou anterior será acionada",
+        "no-selected": "Nenhum perfil selecionado",
+        "selection-tip": "Selecione um perfil da lista ou crie um novo no canto superior direito",
+        "reading-direction-label": "Direção da Leitura",
+        "scaling-option-label": "Opções de Escala",
+        "page-splitting-label": "Divisão de Página",
+        "reading-mode-label": "Modo de Leitura",
+        "layout-mode-tooltip": "Renderizar uma única imagem na tela ou duas imagens lado a lado",
+        "background-color-tooltip": "Cor de Fundo do Leitor de Imagem",
+        "auto-close-menu-label": "Fechar o Menu Automaticamente",
+        "auto-close-menu-tooltip": "O menu deve fechar automaticamente",
+        "show-screen-hints-tooltip": "Mostrar uma sobreposição para ajudar a entender a área de paginação e a direção",
+        "swipe-to-paginate-label": "Deslizar para Paginar",
+        "allow-auto-webtoon-reader-label": "Modo de Leitura Automática Webtoon",
+        "width-override-label": "{{manga-reader.width-override-label}}",
+        "reset": "{{common.reset}}",
+        "book-reader-settings-title": "Leitor de Livros",
+        "tap-to-paginate-label": "Toque para Paginar",
+        "immersive-mode-label": "Modo Imersivo",
+        "reading-direction-book-label": "Direção da Leitura",
+        "font-family-label": "Família da Fonte",
+        "font-family-tooltip": "Família da fonte para carregar. O padrão carregará a fonte padrão do livro",
+        "layout-mode-book-label": "Modo de Layout",
+        "color-theme-book-label": "Cor do Tema",
+        "font-size-book-label": "Tamanho da Fonte",
+        "font-size-book-tooltip": "Porcentagem de escala a ser aplicada à fonte do livro",
+        "line-height-book-label": "Espaçamento entre Linhas",
+        "line-height-book-tooltip": "Quanto espaçamento entre as linhas do livro",
+        "pdf-reader-settings-title": "Leitor de PDF",
+        "pdf-scroll-mode-label": "Modo de Rolagem",
+        "pdf-theme-label": "Tema",
+        "pdf-theme-tooltip": "Cor do tema do leitor",
+        "reading-profile-library-settings-title": "Biblioteca",
+        "delete": "{{common.delete}}",
+        "image-reader-settings-title": "Leitor de Imagens",
+        "extra-tip": "Atribua perfis de leitura por meio do menu de ações em séries e bibliotecas, ou em massa. Ao alterar as configurações em um leitor, um perfil oculto é criado para lembrar suas escolhas para aquela série (exceto para PDFs). Este perfil é removido quando você atribui um dos seus próprios perfis de leitura à série. Mais informações podem ser encontradas em",
+        "make-default": "Definir como padrão",
+        "layout-mode-label": "Modo de Layout",
+        "add": "{{common.add}}",
+        "scaling-option-tooltip": "Como dimensionar a imagem para sua tela.",
+        "background-color-label": "Cor do Fundo",
+        "default-profile": "Padrão",
+        "description": "Nem todas as suas séries podem ser lidas da mesma forma; crie perfis de leitura distintos por biblioteca ou série para que o retorno às suas séries seja o mais tranquilo possível.",
+        "show-screen-hints-label": "Mostrar Dicas na Tela",
+        "width-override-tooltip": "Substituir largura de imagens no leitor",
+        "pdf-spread-mode-tooltip": "Como as páginas devem ser dispostas. Simples ou duplas (ímpar/par)",
+        "immersive-mode-tooltip": "Isso ocultará o menu atrás de um clique no documento do leitor e girará o toque para paginar",
+        "allow-auto-webtoon-reader-tooltip": "Mude para o modo Leitor de Webtoons se as páginas parecerem um webtoon. Podem ocorrer alguns falsos positivos.",
+        "writing-style-tooltip": "Altera a direção do texto. Horizontal é da esquerda para a direita, vertical é de cima para baixo.",
+        "writing-style-label": "Estilo da Escrita",
+        "reading-profile-series-settings-title": "Séries",
+        "emulate-comic-book-label": "Emular história em quadrinhos",
+        "profiles-title": "Seus perfis de leitura",
+        "page-splitting-tooltip": "Como dividir uma imagem de largura total (por exemplo, as imagens esquerda e direita são combinadas)",
+        "reading-mode-tooltip": "Alterar o leitor para paginar verticalmente, horizontalmente ou ter uma rolagem infinita",
+        "confirm": "Tem certeza de que deseja excluir o perfil de leitura {{name}}?",
+        "add-tooltip": "Seu novo perfil será salvo após fazer uma alteração nele",
+        "reading-direction-tooltip": "Direção para clicar para ir para a próxima página. Da direita para a esquerda significa clicar no lado esquerdo da tela para ir para a próxima página.",
+        "tap-to-paginate-tooltip": "As laterais da tela do leitor de livros devem permitir que você toque nela para ir para a página anterior/seguinte",
+        "margin-book-tooltip": "Quanto espaçamento em cada lado da tela. Isso será substituído por 0 em dispositivos móveis, independentemente desta configuração.",
+        "layout-mode-book-tooltip": "Como o conteúdo deve ser disposto. A rolagem é como o livro o embala. 1 ou 2 colunas se ajustam à altura do dispositivo e comportam 1 ou 2 colunas de texto por página",
+        "color-theme-book-tooltip": "Qual tema de cor aplicar ao conteúdo e menu do leitor de livros",
+        "margin-book-label": "Margem",
+        "pdf-spread-mode-label": "Modo de Propagação",
+        "pdf-scroll-mode-tooltip": "Como você rola as páginas. Vertical/Horizontal e Toque para Paginar (sem rolagem)",
+        "emulate-comic-book-tooltip": "Aplica um efeito de sombra para emular a leitura de um livro",
+        "reading-direction-book-tooltip": "Direção para clicar para ir para a próxima página. Da direita para a esquerda significa clicar no lado esquerdo da tela para ir para a próxima página.",
+        "wiki-title": "wiki",
+        "disable-width-override-label": "Desativar substituição de largura",
+        "disable-width-override-tooltip": "Evitar que a substituição da largura entre em vigor quando a tela estiver pelo menos no ponto de interrupção configurado ou menor"
+    },
+    "bulk-set-reading-profile-modal": {
+        "title": "Definir perfil de leitura",
+        "filter-label": "{{common.filter}}",
+        "clear": "{{common.clear}}",
+        "loading": "{{common.loading}}",
+        "create": "{{common.create}}",
+        "bound": "Vinculado",
+        "no-data": "Nenhuma coleção criada ainda",
+        "close": "{{common.close}}"
+    },
+    "browse-people": {
+        "series-count": "{{common.series-count}}",
+        "roles-label": "Papéis",
+        "name-label": "Nome",
+        "series-count-label": "Número de Séries",
+        "title": "Navegar por Pessoas",
+        "sort-label": "Ordenar",
+        "issue-count-label": "Número de Edições",
+        "author-count": "{{num}} Pessoas",
+        "cover-image-description": "{{edit-series-modal.cover-image-description}}",
+        "issue-count": "{{common.issue-count}}"
+    },
+    "browse-genres": {
+        "genre-count": "{{num}} Gêneros",
+        "issue-count": "{{common.issue-count}}",
+        "title": "Navegar por Gêneros",
+        "series-count": "{{common.series-count}}"
+    },
+    "browse-tags": {
+        "issue-count": "{{common.issue-count}}",
+        "series-count": "{{common.series-count}}",
+        "title": "Navegar pelas Etiquetas",
+        "genre-count": "{{num}} Etiquetas"
+    },
+    "browse-title-pipe": {
+        "age-rating": "Avaliado com {{value}}",
+        "user-rating": "{{value}} avaliação com estrelas",
+        "translator": "Traduzido por {{value}}",
+        "editor": "Editado por {{value}}",
+        "artist": "Desenhado por {{value}}",
+        "colorist": "Colorido por {{value}}",
+        "inker": "Arte-finalizado por {{value}}",
+        "penciller": "Desenhado por {{value}}",
+        "genre": "Tem o Gênero {{value}}",
+        "imprint": "Impressão de {{value}}",
+        "team": "Equipe {{value}}",
+        "location": "Em {{value}} localização",
+        "release-year": "Lançado em {{value}}",
+        "tag": "Tem a Etiqueta {{value}}",
+        "writer": "Escrito por {{value}}",
+        "publication-status": "{{value}} trabalhos",
+        "format": "Formato de {{value}}",
+        "letterer": "Com letra de {{value}}",
+        "library": "Dentro da biblioteca {{value}}",
+        "character": "Tem o personagem {{value}}",
+        "publisher": "Publicado por {{value}}"
+    },
+    "breakpoint-pipe": {
+        "desktop": "Desktop",
+        "tablet": "Tablet",
+        "never": "Nunca",
+        "mobile": "Móvel"
+    },
+    "generic-filter-field-pipe": {
+        "person-name": "Nome",
+        "person-role": "Papel",
+        "person-series-count": "Número de Séries",
+        "person-chapter-count": "Número de Capítulos"
     }
 }
diff --git a/UI/Web/src/assets/langs/ru.json b/UI/Web/src/assets/langs/ru.json
index 1c21d4ad6..18c9a9a06 100644
--- a/UI/Web/src/assets/langs/ru.json
+++ b/UI/Web/src/assets/langs/ru.json
@@ -1,11 +1,11 @@
 {
     "login": {
-        "title": "Войти",
+        "title": "Войти в свой аккаунт",
         "username": "{{common.username}}",
         "password": "{{common.password}}",
         "password-validation": "{{validation.password-validation}}",
         "forgot-password": "Забыли пароль?",
-        "submit": "{{common.submit}}"
+        "submit": "Войти"
     },
     "dashboard": {
         "no-libraries": "Библиотеки пока не настроены. Настройте некоторые из них в",
@@ -22,15 +22,16 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "saving": "Сохранение…",
-        "update": "Обновление"
+        "update": "Обновление",
+        "invalid-email-warning": "Недействительный адрес электронной почты заблокирует некоторые функции Kavita",
+        "account-detail-title": "Детали учетной записи"
     },
     "user-scrobble-history": {
         "title": "История Скроббла",
         "description": "Здесь вы найдете все события скроббла, связанные с вашей учетной записью. Для того чтобы события существовали, у вас должен быть настроен активный поставщик скробблинга. Все события, которые были обработаны, будут удалены через месяц. Если есть необработанные события, то, скорее всего, они не смогут сформировать совпадения выше по потоку. Пожалуйста, обратитесь к своему администратору, чтобы они были исправлены.",
-        "filter-label": "{{common.filter}}",
+        "filter-label": "{{общий.фильтр}}",
         "created-header": "Создано",
         "last-modified-header": "Последнее изменение",
         "type-header": "Тип",
@@ -45,7 +46,8 @@
         "not-applicable": "Непригодный",
         "processed": "Обработанный",
         "not-processed": "Не обработано",
-        "special": "{{entity-title.special}}"
+        "special": "{{entity-title.special}}",
+        "not-read-warning": "Поставщики услуг верхнего уровня всегда будут иметь наибольшее количество"
     },
     "scrobble-event-type-pipe": {
         "chapter-read": "Прогресс чтения",
@@ -57,15 +59,6 @@
     "spoiler": {
         "click-to-show": "Спойлер, нажмите, чтобы показать"
     },
-    "review-series-modal": {
-        "title": "Редактировать отзыв",
-        "review-label": "Обзор",
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "min-length": "Отзыв должен содержать не меньше {{count}} символов",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}",
         "user-review": "Обзор на {{username}}",
@@ -100,7 +93,7 @@
         "page-layout-mode-tooltip": "Показывать элементы в виде карточек или списка на странице сведений о серии.",
         "locale-label": "Язык",
         "locale-tooltip": "Язык, который должна использовать Кавита",
-        "blur-unread-summaries-label": "Размытие непрочитанных сводок",
+        "blur-unread-summaries-label": "Размытие непрочитанного",
         "blur-unread-summaries-tooltip": "Размытие аннотаций в не прочитанных томах или главах (во избежание спойлеров)",
         "prompt-on-download-label": "Запрос на загрузку",
         "prompt-on-download-tooltip": "Запрашивать, когда размер загрузки превышает {{size}} МБ",
@@ -110,41 +103,6 @@
         "collapse-series-relationships-tooltip": "Должна ли Кавита показывать серии, которые не имеют отношения друг к другу, или это родителаякий серия/приквел",
         "share-series-reviews-label": "Поделится обзором серий",
         "share-series-reviews-tooltip": "Должна ли Kavita включать ваши отзывы о сериях для других пользователей",
-        "image-reader-settings-title": "Просмоторщик изображений",
-        "reading-direction-label": "Направление чтения",
-        "reading-direction-tooltip": "Направление нажатия для перехода на следующую страницу. С права на лево означает, что для перехода на следующую страницу нужно нажать в левой части экрана.",
-        "scaling-option-label": "Параметры масштабирования",
-        "scaling-option-tooltip": "Как масштабировать изображение для вашего экрана.",
-        "page-splitting-label": "Разделение страниц",
-        "page-splitting-tooltip": "Как разделить изображение во всю ширину (т.е. как левое, так и правое изображения объединяются)",
-        "reading-mode-label": "Режим чтения",
-        "layout-mode-label": "Режим макета",
-        "layout-mode-tooltip": "Вывод на экран одного изображения или двух рядом расположенных изображений",
-        "background-color-label": "Цвет фона",
-        "auto-close-menu-label": "Автоматическое закрытие меню",
-        "show-screen-hints-label": "Показывать экранные подсказки",
-        "emulate-comic-book-label": "Имитация комиксов",
-        "swipe-to-paginate-label": "Проведите пальцем по страницам",
-        "book-reader-settings-title": "Читалка",
-        "tap-to-paginate-label": "Нажмите для пагинации",
-        "tap-to-paginate-tooltip": "Должны ли боковые стороны экрана читалки позволять нажимать на них для перехода к предыдущей/следующей странице",
-        "immersive-mode-label": "Режим погружения",
-        "immersive-mode-tooltip": "Это позволит скрыть меню после щелчка по документу читателя и включить функцию перехода к страницам",
-        "reading-direction-book-label": "Направление чтения",
-        "reading-direction-book-tooltip": "Направление нажатия для перехода на следующую страницу. С лева на право означает, что для перехода на следующую страницу нужно щелкнуть в левой части экрана.",
-        "font-family-label": "Семейство шрифтов",
-        "font-family-tooltip": "Семейство шрифтов для загрузки. По умолчанию загрузит шрифт, используемый в книге по умолчанию",
-        "writing-style-label": "Стиль письма",
-        "writing-style-tooltip": "Изменяет направление текста. Горизонтальное направление - слева направо, вертикальное - сверху вниз.",
-        "layout-mode-book-label": "Режим макета",
-        "layout-mode-book-tooltip": "Как должен быть размещен контент. Scroll - так, как это принято в книгах. 1 или 2 колонки соответствуют высоте устройства и вмещают 1 или 2 колонки текста на страницу",
-        "color-theme-book-label": "Цветовая тема",
-        "color-theme-book-tooltip": "Какую цветовую тему применить к содержанию и меню программы чтения книг",
-        "font-size-book-label": "Размер шрифта",
-        "line-height-book-label": "Межстрочный интервал",
-        "line-height-book-tooltip": "Размер интервала между строками книги",
-        "margin-book-label": "Отступ",
-        "margin-book-tooltip": "Величина интервала с каждой стороны экрана. На мобильных устройствах этот параметр будет иметь значение 0 независимо от этой настройки.",
         "clients-opds-alert": "OPDS не включен на этом сервере. Это не повлияет на пользователей Tachiyomi.",
         "clients-opds-description": "Все сторонние клиенты будут использовать либо API-ключ, либо указанный ниже Url подключения. Например пароли, храните их в тайне.",
         "clients-api-key-tooltip": "Ключ API - это как пароль. Храните его в секрете, берегите его.",
@@ -192,7 +150,7 @@
     },
     "manage-devices": {
         "title": "Диспетчер устройств",
-        "description": "Этот раздел предназначен для настройки устройств, которые не могут подключаться к Kavita через веб-браузер, а вместо этого имеют адрес электронной почты, принимающий файлы.",
+        "description": "Раздел предназначен для настройки устройств, которые не могут подключаться к Kavita через веб-браузер, но используют адрес электронной почты, принимающий файлы.",
         "devices-title": "Устройства",
         "no-devices": "Пока нет ни одного настроенного устройства",
         "platform-label": "Платформа: ",
@@ -292,21 +250,25 @@
         "open-filtered-search": "Откройте отфильтрованный поиск для {{item}}."
     },
     "user-stats-info-cards": {
-        "total-pages-read-label": "Всего прочитанных страниц",
+        "total-pages-read-label": "Прочитанных страниц",
         "total-pages-read-tooltip": "{{user-stats-info-cards.total-pages-read-label}}: {{value}}",
-        "total-words-read-label": "Всего слов прочитано",
+        "total-words-read-label": "Прочитанных слов",
         "total-words-read-tooltip": "{{user-stats-info-cards.total-words-read-label}}: {{value}}",
         "time-spent-reading-label": "Время, проведенное за чтением",
         "time-spent-reading-tooltip": "{{user-stats-info-cards.time-spent-reading-label}}: {{value}}",
-        "chapters-read-label": "Читать главы",
+        "chapters-read-label": "Прочитанных глав",
         "chapters-read-tooltip": "{{user-stats-info-cards.chapters-read-label}}: {{value}}",
-        "avg-reading-per-week-label": "Среднее чтение / неделя",
-        "last-active-label": "Последний активный",
-        "chapters": "{{value}} глав"
+        "avg-reading-per-week-label": "Среднее время чтения / в неделю",
+        "last-active-label": "Последняя активность",
+        "chapters": "{{value}} глав",
+        "pages-count": "{{num}} страниц",
+        "pages-read-by-year-title": "Прочтено страниц за год",
+        "words-read-by-year-title": "Прочтенных слов за год",
+        "words-count": "{{num}} слов"
     },
     "user-stats": {
         "library-read-progress-title": "Прогресс чтения в библиотеке",
-        "read-percentage": "% Читать"
+        "read-percentage": "% Прочитанного"
     },
     "top-readers": {
         "title": "Лучшие читатели",
@@ -517,7 +479,10 @@
         "reading-direction-label": "{{user-preferences.reading-direction-book-label}}",
         "writing-style-label": "{{user-preferences.writing-style-label}}",
         "immersive-mode-label": "{{user-preferences.immersive-mode-label}}",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}"
+        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "left-to-right": "Слева направо",
+        "right-to-left": "Справа налево",
+        "writing-style-tooltip": "Изменяет направление текста. По горизонтали - слева направо, по вертикали - сверху вниз."
     },
     "bookmarks": {
         "title": "{{side-nav.bookmarks}}",
@@ -606,7 +571,11 @@
         "reset-to-default": "{{common.reset-to-default}}",
         "reset": "{{common.reset}}",
         "save": "{{common.save}}",
-        "field-required": "{{validation.field-required}}"
+        "field-required": "{{validation.field-required}}",
+        "allow-stats-label": "Отправка анонимной статистики",
+        "port-tooltip": "Порт сервера. Для вступления в силу требуется перезагрузка. Эту настройку нельзя изменить, если вы запускаете образ Docker как пользователь без прав root.",
+        "port-label": "Порт",
+        "allow-stats-tooltip-part-1": "Отправляйте анонимные данные об использовании Kavita. Сюда входит информация о некоторых используемых функциях, количестве файлов, версии операционной системы, версии установки Kavita, процессоре и памяти. Мы будем использовать эту информацию для определения приоритетов добавления новых функций, исправления ошибок и оптимизации производительности. Более подробная информация о собираемых данных отражена на https://wiki.kavitareader.com . Для вступления в силу требуется перезагрузка. "
     },
     "manage-tasks-settings": {
         "reset-to-default": "{{common.reset-to-default}}",
@@ -704,7 +673,9 @@
     },
     "manga-reader": {
         "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}",
-        "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}"
+        "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}",
+        "right-to-left-alt": "Справа налево",
+        "left-to-right-alt": "Слево направо"
     },
     "metadata-filter": {
         "filter-title": "{{common.filter}}",
@@ -821,7 +792,9 @@
         "last-30-days": "{{time-periods.last-30-days}}",
         "last-90-days": "{{time-periods.last-90-days}}",
         "last-year": "{{time-periods.last-year}}",
-        "all-time": "{{time-periods.all-time}}"
+        "all-time": "{{time-periods.all-time}}",
+        "title": "Активность чтения",
+        "no-data": "Отсутствует прогресс"
     },
     "series-preview-drawer": {
         "tags-label": "{{filter-field-pipe.tags}}",
@@ -889,12 +862,19 @@
         "writers": "{{metadata-fields.writers-title}}"
     },
     "actionable": {
-        "clear": "{{common.clear}}"
+        "clear": "{{common.clear}}",
+        "download": "Скачать",
+        "add-to": "Добавить к",
+        "read": "Читать",
+        "new-collection": "Новая коллекция",
+        "rename": "Переименовать",
+        "refresh-covers-tooltip": "Востанавить все обложки"
     },
     "validation": {
         "required-field": "Это поле обязательно для заполнения",
         "valid-email": "Это должен быть действительный адрес электронной почты",
-        "password-validation": "Длина пароля должна составлять от 6 до 32 символов"
+        "password-validation": "Длина пароля должна составлять от 6 до 32 символов",
+        "year-validation": "Значение года должно быть настоящий, цифра должна быть больше 1000 и содержать 4 цифры"
     },
     "entity-type": {
         "volume": "том",
@@ -932,6 +912,42 @@
         "issue-hash-num": "Вопрос #",
         "issue-num": "Вопрос",
         "chapter-num": "Глава",
-        "volume-num": "Том"
+        "volume-num": "Том",
+        "book-num-shorthand": "Книга {{num}}",
+        "chapter-nums": "Главы",
+        "volume-nums": "Тома",
+        "book-nums": "Книги",
+        "issue-num-shorthand": "#{{num}}",
+        "volume-num-shorthand": "Том. {{num}}",
+        "chapter-num-shorthand": "Глава {{num}}",
+        "chapter-count": "{{num}} Главы",
+        "no-data": "Нет данных"
+    },
+    "preferences": {
+        "original": "Оригинал",
+        "list": "Список",
+        "pdf-multiple": "По умолчанию",
+        "left-to-right": "Слева направо",
+        "right-to-left": "Справа налево"
+    },
+    "toasts": {
+        "confirm-download-size-ios": "В iOS возникают проблемы с загрузкой файлов размером более 200 МБ, загрузка может завершиться некорректно.",
+        "confirm-library-type-change": "Смена типа библиотеки вызовет новое сканирование с другими правилами синтаксического анализа и может привести к повторному созданию серий, что может привести к потере прогресса и закладок. Перед началом разумно создать резервную копию. Вы уверены, что хотите продолжить?",
+        "chapter-deleted": "Удаление главы",
+        "collection-not-owned": "Вы не являетесь владельцем этой коллекции"
+    },
+    "tabs": {
+        "devices-tab": "Устройства",
+        "smart-filters-tab": "Умный фильтр",
+        "folder-tab": "Папка"
+    },
+    "metadata-setting-field-pipe": {
+        "chapter-release-date": "Дата Релиза (Главы)"
+    },
+    "read-time-pipe": {
+        "less-than-hour": "<1 Часа"
+    },
+    "day-breakdown": {
+        "no-data": "Отсутствует прогресс, отправляйтесь читать =)"
     }
 }
diff --git a/UI/Web/src/assets/langs/sk.json b/UI/Web/src/assets/langs/sk.json
index f36436dc9..858c360b7 100644
--- a/UI/Web/src/assets/langs/sk.json
+++ b/UI/Web/src/assets/langs/sk.json
@@ -4,7 +4,7 @@
         "username": "{{common.username}}",
         "password": "{{common.password}}",
         "password-validation": "{{validation.password-validation}}",
-        "forgot-password": "Zabudnuté heslo?",
+        "forgot-password": "Zabudli ste heslo?",
         "submit": "Prihlásiť sa"
     },
     "dashboard": {
@@ -22,11 +22,11 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "saving": "Ukladanie…",
         "update": "Aktualizovať",
-        "account-detail-title": "Podrobnosti o účte"
+        "account-detail-title": "Podrobnosti o účte",
+        "invalid-email-warning": "Neplatný e-mail zablokuje niektoré funkcie Kavity"
     },
     "user-scrobble-history": {
         "title": "História Scrobblingu",
@@ -38,7 +38,7 @@
         "series-header": "Série",
         "data-header": "Dáta",
         "is-processed-header": "Je spracované",
-        "no-data": "Žiadne dáta",
+        "no-data": "{{common.no-data}}",
         "volume-and-chapter-num": "Zväzok {{v}} Kapitola {{n}}",
         "rating": "Hodnotenie {{r}}",
         "not-applicable": "Neplatné",
@@ -47,7 +47,12 @@
         "special": "{{entity-title.special}}",
         "chapter-num": "Kapitola {{num}}",
         "not-read-warning": "Upstream poskytovatelia si vždy ponechajú najvyššie číslo",
-        "volume-num": "Zväzok {{num}}"
+        "volume-num": "Zväzok {{num}}",
+        "generate-scrobble-events": "Záložné udalosti",
+        "token-expired": "Platnosť vášho tokenu AniList vypršala! Scrobbling udalosti sa spracujú až po obnovení na stránke Účty.",
+        "scrobbling-disabled": "Scrobblovanie je zakázané v nastaveniach vášho účtu.",
+        "select-all-label": "Vybrať všetko",
+        "delete-selected-label": "Odstrániť vybraté"
     },
     "scrobble-event-type-pipe": {
         "chapter-read": "Pokrok v čítaní",
@@ -59,15 +64,6 @@
     "spoiler": {
         "click-to-show": "Spojler, kliknite na zobrazenie"
     },
-    "review-series-modal": {
-        "title": "Upraviť recenziu",
-        "review-label": "Recenzia",
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "required": "{{validation.required-field}}",
-        "min-length": "Recenzia musí obsahovať aspoň {{count}} znakov"
-    },
     "review-card-modal": {
         "close": "{{common.close}}",
         "external-mod": "(externé)",
@@ -78,7 +74,8 @@
         "your-review": "Toto je Vaša recenzia",
         "external-review": "Externá recenzia",
         "local-review": "Lokálna Recenzia",
-        "rating-percentage": "Hodnotenie {{r}}%"
+        "rating-percentage": "Hodnotenie {{r}}%",
+        "critic": "kritika"
     },
     "want-to-read": {
         "title": "Chcem prečítať",
@@ -88,7 +85,7 @@
     },
     "user-preferences": {
         "title": "Používateľský panel",
-        "pref-description": "Toto sú globálne nastavenia, ktoré sú viazané na Váš účet.",
+        "pref-description": "Toto sú globálne nastavenia, ktoré sú prepojené s vaším účtom. Nastavenia čitateľa sa nachádzajú v časti Profilov čitateľa.",
         "account-tab": "{{tabs.account-tab}}",
         "preferences-tab": "{{tabs.preferences-tab}}",
         "theme-tab": "{{tabs.theme-tab}}",
@@ -112,73 +109,32 @@
         "collapse-series-relationships-tooltip": "Mala by Kavita ukázať seriál, ktorý nemá žiadne vzťahy alebo je nadradeným/prequel",
         "share-series-reviews-label": "Zdieľať recenzie série",
         "share-series-reviews-tooltip": "Ak má Kavita zahrnúť vaše recenzie na Série pre iných používateľov",
-        "image-reader-settings-title": "Čítačka obrázkov",
-        "reading-direction-label": "Smer čítania",
-        "reading-direction-tooltip": "Smer pre kliknutie na prejdenie na ďalšiu stránku. Sprava doľava znamená, že kliknutím na ľavú stranu obrazovky prejdete na ďalšiu stránku.",
-        "scaling-option-label": "Možnosti škálovania",
-        "scaling-option-tooltip": "Ako zmeniť mierku obrázka na obrazovku.",
-        "page-splitting-label": "Rozdelenie stránky",
-        "page-splitting-tooltip": "Ako rozdeliť obrázok na celú šírku (tj ľavý a pravý obrázok sa skombinujú)",
-        "reading-mode-label": "Režim čítania",
-        "layout-mode-label": "Režim rozloženia",
-        "layout-mode-tooltip": "Vykreslite jeden obrázok na obrazovku alebo dva obrázky vedľa seba",
-        "background-color-label": "Farba pozadia",
-        "auto-close-menu-label": "Automaticky zatvoriť menu",
-        "show-screen-hints-label": "Zobraziť tipy na obrazovke",
-        "emulate-comic-book-label": "Napodobniť komiks",
-        "swipe-to-paginate-label": "Potiahnuť pre Stránkovanie",
-        "book-reader-settings-title": "Čítačka kníh",
-        "tap-to-paginate-label": "Klepnutím môžete stránkovať",
-        "tap-to-paginate-tooltip": "Ak strany obrazovky čítačky kníh umožňujú ťuknutím na ňu prejsť na predchádzajúcu/nasledujúcu stranu",
-        "immersive-mode-label": "Imerzívny režim",
-        "immersive-mode-tooltip": "Ponuka sa skryje pri kliknutí na dokument čítačky a zapne dotyk pre listovanie strán",
-        "reading-direction-book-label": "Smer čítania",
-        "reading-direction-book-tooltip": "Smer na kliknutie pre prejdenie na ďalšiu stránku. Sprava doľava znamená, že kliknutím na ľavú stranu obrazovky prejdete na ďalšiu stránku.",
-        "font-family-label": "Typ Písma",
-        "font-family-tooltip": "Typ písma na načítanie. Predvolené načíta predvolené písmo knihy",
-        "writing-style-label": "Štýl písania",
-        "writing-style-tooltip": "Zmení smer textu. Horizontálne je zľava doprava, vertikálne je zhora nadol.",
-        "layout-mode-book-label": "Režim Rozloženia",
-        "layout-mode-book-tooltip": "Ako by mal byť obsah usporiadaný. Zvitok je taký, ako ho balí kniha. 1 alebo 2 stĺpce sa prispôsobia výške zariadenia a zmestia sa 1 alebo 2 stĺpce textu na stranu",
-        "color-theme-book-tooltip": "Akú farebnú tému použiť na obsah a ponuku čítačky kníh",
-        "font-size-book-label": "Veľkosť Písma",
-        "line-height-book-label": "Riadkovanie",
-        "line-height-book-tooltip": "Koľko medzier medzi riadkami knihy",
-        "margin-book-label": "Okraj stránky",
-        "margin-book-tooltip": "Koľko medzier na každej strane obrazovky. Na mobilných zariadeniach sa to prepíše na 0 bez ohľadu na toto nastavenie.",
         "clients-opds-description": "Všetci klienti tretích strán budú používať kľúč API alebo pripájaciu adresu URL nižšie. Musí sa s nimi zaobchádzať dôverne, rovnako ako s heslami.",
         "clients-api-key-tooltip": "Kľúč API je ako heslo. Jeho obnovenie zruší platnosť všetkých existujúcich klientov.",
         "reset": "{{common.reset}}",
         "save": "{{common.save}}",
-        "reading-mode-tooltip": "Zmeňte čítačku na zvislé, vodorovné stránkovanie alebo na nekonečné posúvanie",
         "clients-opds-alert": "OPDS nie je na tomto serveri povolené. Toto neovplyvní používateľov Tachiyomi.",
         "clients-opds-url-tooltip": "Pozrite si zoznam podporovaných klientov OPDS: ",
-        "color-theme-book-label": "Farebný motív",
-        "pdf-reader-settings-title": "PDF Čítačka",
-        "pdf-scroll-mode-label": "Režim scrollovania",
-        "pdf-scroll-mode-tooltip": "Ako listujete stránkami. Vertikálne/horizontálne a stránkovanie klepnutím (bez posúvania)",
-        "pdf-spread-mode-label": "Režim šírenia",
-        "swipe-to-paginate-tooltip": "Potiahnutie prstom po obrazovke by malo spôsobiť spustenie nasledujúcej alebo predchádzajúcej stránky",
-        "font-size-book-tooltip": "Percento mierky, ktorá sa má použiť na písmo v knihe",
-        "pdf-theme-tooltip": "Farebná téma čitateľa",
         "clients-opds-url-label": "OPDS URL",
         "clients-api-key-label": "API kľúč",
-        "background-color-tooltip": "Farba pozadia čítačky obrázkov",
-        "auto-close-menu-tooltip": "Malo by sa menu automaticky zatvoriť",
-        "show-screen-hints-tooltip": "Zobrazte prekrytie, ktoré vám pomôže pochopiť oblasť a smer stránkovania",
-        "emulate-comic-book-tooltip": "Aplikuje tieňový efekt na emuláciu čítania z knihy",
-        "pdf-spread-mode-tooltip": "Ako by mali byť stránky usporiadané. Jedno alebo dvojlôžkové (nepárne/párne)",
-        "pdf-theme-label": "Téma"
+        "kavitaplus-settings-title": "Kavita+",
+        "anilist-scrobbling-label": "AniList Scrobblovanie",
+        "anilist-scrobbling-tooltip": "Umožniť Kavite scrobblovať (jednosmerná synchronizácia) priebeh čítania a hodnotenia do zoznamu AniList",
+        "want-to-read-sync-label": "Synchronizovať \"chcem čítať\"",
+        "want-to-read-sync-tooltip": "Povoľte Kavite pridávať položky do vášho zoznamu Chcete si prečítať na základe AniListu a MAL sérií v zozname čakajúcich na prečítanie"
     },
     "user-holds": {
         "title": "Scrobble tituly",
-        "description": "Toto je používateľsky spravovaný zoznam sérií, ktorý nebude skopírovaný na poskytovateľov upstream. Sériu môžete kedykoľvek odstrániť a nasledujúca udalosť s možnosťou scrobble (postup čítania, hodnotenie, stav 'Chcem čítať') spustí udalosti.",
-        "no-data": "{{typeahead.no-data}}"
+        "description": "Toto je používateľsky spravovaný zoznam sérií, ktorý nebude skopírovaný na poskytovateľov upstream. Sériu môžete kedykoľvek odstrániť a nasledujúca udalosť s možnosťou scrobble (postup čítania, hodnotenie, stav 'Chcem čítať') spustí scrobbling.",
+        "no-data": "{{typeahead.no-data}}",
+        "delete-label": "{{common.remove}}",
+        "series-name-header": "{{manage-matched-metadata.series-name-header}}",
+        "created-header": "{{manage-media-issues.created-header}}"
     },
     "theme-manager": {
         "title": "Správca tém",
         "site-themes": "Témy/Motívy stránok",
-        "set-default": "Nastaviť ako predvolené",
+        "set-default": "Nastaviť predvolené",
         "download": "{{changelog.download}}",
         "apply": "{{common.apply}}",
         "applied": "Aplikované",
@@ -293,7 +249,8 @@
         "regen-warning": "Opätovné vygenerovanie kľúča API zruší platnosť všetkých existujúcich klientov.",
         "no-key": "CHYBA – KĽÚČ NIE JE NASTAVENÝ",
         "confirm-reset": "Toto zruší platnosť všetkých konfigurácií OPDS, ktoré ste nastavili. Ste si istý, že chcete pokračovať?",
-        "key-reset": "Obnovenie kľúča API"
+        "key-reset": "Obnovenie kľúča API",
+        "reset": "Resetovať"
     },
     "scrobbling-providers": {
         "title": "Poskytovatelia scrobbblingu",
@@ -303,7 +260,7 @@
         "no-token-set": "Token nieje nastavený",
         "token-set": "Token je nastavený",
         "generate": "Generovať",
-        "instructions": "First time users should click on \"{{scrobbling-providers.generate}}\" below to allow Kavita+ to talk with {{service}}. Once you authorize the program, copy and paste the token in the input below. You can regenerate your token at any time.",
+        "instructions": "Noví používatelia by mali kliknúť na \"{{scrobbling-providers.generate}}\" nižšie, aby umožnili Kavite+ komunikovať s {{service}}. Po autorizácii programu skopírujte a vložte token do vstupu nižšie. Token môžete kedykoľvek regenerovať.",
         "token-input-label": "{{service}} Token vložiť sem",
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
@@ -313,14 +270,20 @@
         "generic-instructions": "Vyplňte informácie o externých službách, ktorým musíte umožniť interakciu Kavita+ pre interakciu s nimi.",
         "mal-instructions": "Kavita používa na autentifikáciu ID klienta MAL. Vytvorte nového klienta pre Kavitu a po schválení zadajte ID klienta a svoje používateľské meno.",
         "mal-token-input-label": "ID klienta MAL",
-        "mal-username-input-label": "Používateľské meno MAL"
+        "mal-username-input-label": "Používateľské meno MAL",
+        "anilist-used-for": "AniList sa používa na scrobbling (synchronizáciu údajov) a chce čítať synchronizáciu.",
+        "mal-used-for": "MyAnimeList sa používa pre inteligentné zbierky a chce čítať synchronizáciu.",
+        "anilist-first-header": "AniList token uložený",
+        "anilist-first-description": "Váš token AniList je teraz nastavený. Tento token trvá rok a Kavita vás bude informovať pred vypršaním jeho platnosti, aby ste ho obnovili tu. Vďaka tomu bude Kavita generovať scrobble (synchronizované) udalosti z vašej histórie čítania, želania si prečítať a hodnotení. Môžete s tým začať teraz alebo neskôr. Ak máte nejaké série, ktoré nechcete, aby boli scrobblované, vyberte neskôr a umiestnite na ne Scrobble Hold. Túto úlohu stačí spustiť iba raz. Kavita sa potom postará o synchronizáciu za vás.
           Ak vyberiete možnosť „Neskôr“, tlačidlo nájdete na stránke Scrobbling.",
+        "anilist-first-later": "Neskôr",
+        "anilist-first-now": "Teraz"
     },
     "typeahead": {
         "locked-field": "Pole je zamknuté",
         "close": "{{common.close}}",
         "loading": "{{common.loading}}",
         "add-item": "Pridať {{item}}…",
-        "no-data": "Dáta niesú k dispozícii",
+        "no-data": "{{common.no-data}}",
         "add-custom-item": ", vložiť, ak chcete pridať vlastnú položku"
     },
     "generic-list-modal": {
@@ -497,11 +460,11 @@
     },
     "library-type-pipe": {
         "book": "Kniha",
-        "comic": "Komiks",
+        "comic": "Komiks (Legacy)",
         "manga": "Manga",
         "image": "Obrázok",
         "lightNovel": "Light Novel",
-        "comicVine": "Comic Vine"
+        "comicVine": "Comic"
     },
     "age-rating-pipe": {
         "unknown": "Neznámy",
@@ -560,11 +523,8 @@
     "changelog": {
         "installed": "Nainštalované",
         "download": "Stiahnuť",
-        "published-label": "Publikovaný: ",
         "available": "Dostupné",
-        "description": "Ak nevidíte {{installed}}",
-        "nightly": "Beta: {{version}}",
-        "description-continued": "Si na Beta verzii. Ako dostupné sa zobrazia iba hlavné verzie."
+        "nightly": "Beta: {{version}}"
     },
     "invite-user": {
         "title": "Pozvať používateľa",
@@ -609,16 +569,36 @@
         "activate-discordId-tooltip": "Prepojte svoj Discord účet s Kavita+. To vám umožňuje prístup k skrytým kanálom, ktoré vám pomôžu tvarovať Kavitu.",
         "discord-validation": "Toto nie je platné ID používateľa Discord. Vaše ID používateľa nie je vaše používateľské discord meno.",
         "activate-delete": "{{common.delete}}",
-        "activate-reset": "{{common.reset}}",
+        "activate-reset": "Resetovať licenciu",
         "activate-reset-tooltip": "Zrušte platnosť predchádzajúcej registrácie pomocou vašej licencie. Vyžaduje licenciu aj e-mail",
         "activate-save": "{{common.save}}",
         "help-label": "{{common.help}}",
         "activate-discordId-label": "Discord Používateľské ID",
         "kavita+-desc-part-2": "prémiové benefity",
         "kavita+-desc-part-3": "dnes!",
-        "kavita+-requirement": "Kavita+ je navrhnutá tak, aby fungovala iba s najnovším vydaním – 2 verziami. Čokoľvek mimo toho môže byť nefunkčné.",
-        "kavita+-releases": "Pozrite si vydania",
-        "kavita+-desc-part-1": "Kavita+ je prémiová predplatená služba, ktorá odomyká funkcie pre všetkých používateľov v tejto inštancii Kavita. Kúpte si predplatné pre odomknutie. "
+        "kavita+-requirement": "Kavita+ je navrhnutá tak, aby fungovala iba s najnovšími 3 vydaniami. Čokoľvek mimo toho môže byť nefunkčné.",
+        "kavita+-desc-part-1": "Kavita+ je prémiová predplatená služba, ktorá odomyká funkcie pre všetkých používateľov v tejto inštancii Kavita. Kúpte si predplatné pre odomknutie. ",
+        "info-title": "Info o licencii",
+        "actions-title": "Akcie",
+        "license-active-label": "Licencia je aktívna",
+        "supported-version-label": "Na podporovanej verzii Kavita",
+        "expiration-label": "Expirácia",
+        "valid-tooltip": "Platné",
+        "k+-unlocked-description": "Vitajte v Kavita+! Kavita bude generovať scrobble udalosti z vášho pokroku, hodnotení a čo si chcete prečítať, keď zaregistrujete svojich poskytovateľov scrobble pod účtom. Urobte si nejaký čas, aby ste sa uistili, že umiestnite scrobbling chyty pre každú sériu, ktorú nechcete scrobble.",
+        "invalid-tooltip": "Neplatné",
+        "reset-label": "Reset",
+        "reset-tooltip": "Týmto sa resetuje inštancia servera, ku ktorej je viazaná licencia Kavita+. Vyžaduje e-mail a licenčný kľúč",
+        "delete-label": "Odstrániť licenciu",
+        "delete-tooltip": "Týmto sa odstráni licencia pre Kavitu, aby Kavita nefungovala s Kavitou+. Neodhlási vás. Na zrušenie predplatného najskôr použite „spravovať“.",
+        "manage-tooltip": "Aktualizácia platobných údajov, zrušenie/pozastavenie odberu atď",
+        "faq-title": "Časté otázky",
+        "total-subbed-months-label": "Celkový počet predplatených mesiacov",
+        "email-label": "Registrovaný Email",
+        "license-mismatch": "Licencia môže byť zaregistrovaná v inej inštancii Kavita. Znova sa zaregistrujte pre opravu.",
+        "k+-license-overwrite": "Licencia je zaregistrovaná v inej inštancii Kavita. Môže sa to stať pri opätovnej inštalácii a zriedkavo kvôli aktualizáciám systému. Vyberte prepísať, aby ste vynútili registráciu tejto inštancie v Kavita+.",
+        "k+-already-registered-header": "Licencia je už zaregistrovaná",
+        "overwrite": "Prepísať",
+        "k+-unlocked": "Kavita+ odomknutá!"
     },
     "book-line-overlay": {
         "copy": "Kopírovať",
@@ -651,7 +631,10 @@
         "go-to-page-prompt": "Počet stránok: {{totalPages}}. Na akú stránku chceš ísť?",
         "toc-header": "ToC",
         "loading-book": "Načítava sa kniha…",
-        "close-reader": "Zavrieť Čítačku"
+        "close-reader": "Zavrieť Čítačku",
+        "go-to-first-page": "Prejsť na prvú stránku",
+        "go-to-section": "Prejsť do sekcie",
+        "go-to-section-prompt": "Existuje {{totalSections}} sekcií. Do ktorej sekcie chcete prejsť?"
     },
     "personal-table-of-contents": {
         "no-data": "Zatiaľ nič nie je v záložkách",
@@ -699,7 +682,7 @@
     "series-detail": {
         "page-settings-title": "Nastavenie Stránky",
         "close": "{{common.close}}",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
         "layout-mode-option-card": "Karta",
         "continue-from": "Pokračovať {{title}}",
         "read": "{{common.read}}",
@@ -743,18 +726,18 @@
         "volume-num": "{{common.volume-num}}",
         "reading-lists-title": "{{side-nav.reading-lists}}",
         "time-to-read-alt": "{{sort-field-pipe.time-to-read}}",
-        "scrobbling-tooltip": "{{settings.scrobbling}}",
+        "scrobbling-tooltip": "{{settings.scrobbling}}: {{value}}",
         "time-left-alt": "Zostávajúci čas",
         "layout-mode-option-list": "Zoznam",
         "more-alt": "Viac",
         "publication-status-title": "Publikácia",
         "publication-status-tooltip": "Stav publikácie",
-        "user-reviews-local": "Miestne recenzie",
-        "user-reviews-plus": "Externé recenzie",
         "pages-count": "{{num}} Strán",
         "words-count": "{{num}} Slov",
         "weblinks-title": "Odkazy",
-        "release-date-title": "Vydanie"
+        "release-date-title": "Vydanie",
+        "on": "{{reader-settings.on}}",
+        "off": "{{reader-settings.off}}"
     },
     "metadata-fields": {
         "collections-title": "{{side-nav.collections}}",
@@ -782,7 +765,8 @@
         "close": "{{common.close}}",
         "entry-label": "Pozri detaily",
         "kavita-tooltip": "Vaše hodnotenie + Celkové",
-        "kavita-rating-title": "Vaše hodnotenie"
+        "kavita-rating-title": "Vaše hodnotenie",
+        "critic": "{{review-card.critic}}"
     },
     "badge-expander": {
         "more-items": "a {{count}} ďalších"
@@ -805,7 +789,7 @@
     },
     "side-nav": {
         "home": "Domov",
-        "want-to-read": "Chcem čítať",
+        "want-to-read": "Obľúbené",
         "collections": "Zbierky",
         "reading-lists": "Čítacie Zoznamy",
         "bookmarks": "Záložky",
@@ -817,7 +801,9 @@
         "back": "Naspäť",
         "more": "Viac",
         "customize": "{{settings.customize}}",
-        "browse-authors": "Prezerať autorov"
+        "edit": "{{common.edit}}",
+        "cancel-edit": "Zavrieť zmenu poradia",
+        "browse-people": "Prehľadávať ľudí"
     },
     "library-settings-modal": {
         "close": "{{common.close}}",
@@ -828,11 +814,11 @@
         "cover-tab": "{{tabs.cover-tab}}",
         "advanced-tab": "{{tabs.advanced-tab}}",
         "tasks-tab": "{{tabs.tasks-tab}}",
-        "name-label": "Názov",
+        "name-label": "Meno",
         "library-name-unique": "Názov knižnice musí byť jedinečný",
         "last-scanned-label": "Naposledy skenované:",
         "type-label": "Typ",
-        "kavitaplus-eligible-tooltip": "Bude Kavita+ získavať informácie alebo podporovať Scrobbling",
+        "kavitaplus-eligible-tooltip": "Podporuje funkcie metadát Kavita+ alebo Scroblovanie",
         "folder-description": "Pridajte priečinky do svojej knižnice",
         "browse": "Prehľadávať priečinky médií",
         "help-us-part-2": "náš sprievodca",
@@ -868,7 +854,11 @@
         "help": "{{common.help}}",
         "help-us-part-1": "Pomôžte nám: ",
         "type-tooltip": "Typ knižnice určuje, ako sa analyzujú názvy súborov a či používateľské rozhranie zobrazuje kapitoly (manga) vs. čísla (komiksy). Viac podrobností o rozdieloch medzi typmi knižníc nájdete na wiki.",
-        "kavitaplus-eligible-label": "Kavita+ Oprávnené"
+        "kavitaplus-eligible-label": "Kavita+ Oprávnené",
+        "allow-metadata-matching-label": "Povoliť zhodu metadát",
+        "allow-metadata-matching-tooltip": "Mala by Kavita stiahnuť metadáta pre série v rámci tejto knižnice. Toto sa uskutoční len vtedy, ak má server aktívne predplatné Kavita+.",
+        "enable-metadata-label": "Povoliť metadáta (ComicInfo/Epub/PDF)",
+        "enable-metadata-tooltip": "Povoliť Kavite čítať súbory s metadátami, ktoré prepíšu analýzu názvov súborov."
     },
     "file-type-group-pipe": {
         "archive": "Archív",
@@ -878,27 +868,27 @@
     },
     "reader-settings": {
         "general-settings-title": "Všeobecné Nastavenia",
-        "font-family-label": "{{user-preferences.font-family-label}}",
-        "font-size-label": "{{user-preferences.font-size-book-label}}",
-        "line-spacing-label": "{{user-preferences.line-height-book-label}}",
-        "margin-label": "{{user-preferences.margin-book-label}}",
+        "font-family-label": "{{manage-reading-profiles.font-family-label}}",
+        "font-size-label": "{{manage-reading-profiles.font-size-book-label}}",
+        "line-spacing-label": "{{manage-reading-profiles.line-height-book-label}}",
+        "margin-label": "{{manage-reading-profiles.margin-book-label}}",
         "reset-to-defaults": "Obnoviť predvolené nastavenia",
         "reader-settings-title": "Nastavenia čítačky",
-        "reading-direction-label": "{{user-preferences.reading-direction-book-label}}",
+        "reading-direction-label": "{{manage-reading-profiles.reading-direction-book-label}}",
         "right-to-left": "Zprava doľava",
         "left-to-right": "Zľava doprava",
         "horizontal": "Horizontálne",
         "vertical": "Vertikálne",
-        "writing-style-label": "{{user-preferences.writing-style-label}}",
+        "writing-style-label": "{{manage-reading-profiles.writing-style-label}}",
         "tap-to-paginate-label": "Klepnite na Stránkovanie",
         "tap-to-paginate-tooltip": "Pre stránkovanie kliknite na okraje obrazovky",
         "on": "Zapnuté",
         "off": "Vypnuté",
-        "immersive-mode-label": "{{user-preferences.immersive-mode-label}}",
+        "immersive-mode-label": "{{manage-reading-profiles.immersive-mode-label}}",
         "immersive-mode-tooltip": "Ponuka sa skryje pri kliknutí na dokument čítačky a zapne dotyk pre listovanie strán",
         "fullscreen-label": "Celá obrazovka",
         "fullscreen-tooltip": "Prepnite čítačku do režimu celej obrazovky",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
         "layout-mode-option-scroll": "Skrolovať",
         "layout-mode-option-1col": "1 Stĺpec",
         "layout-mode-option-2col": "2 Stĺpce",
@@ -910,7 +900,15 @@
         "writing-style-tooltip": "Zmení smer textu. Vodorovný je zľava doprava, zvislý zhora nadol.",
         "exit": "Ukončiť",
         "enter": "Enter",
-        "layout-mode-tooltip": "Posúvanie: Zrkadlí súbor epub (zvyčajne jedna dlhá rolovacia stránka na kapitolu).
          1 stĺpec: Vytvorí jednu virtuálnu stránku naraz.
          2 stĺpec: Vytvorí dve virtuálne stránky naraz rozložené vedľa seba."
+        "layout-mode-tooltip": "Posúvanie: Zrkadlí súbor epub (zvyčajne jedna dlhá rolovacia stránka na kapitolu).
          1 stĺpec: Vytvorí jednu virtuálnu stránku naraz.
          2 stĺpec: Vytvorí dve virtuálne stránky naraz rozložené vedľa seba.",
+        "loading": "načítavanie",
+        "create-new-tooltip": "Vytvorte nový spravovateľný profil z vášho súčasného implicitného profilu",
+        "reading-profile-updated": "Profil čítania bol aktualizovaný",
+        "line-spacing-max-label": "2.5x",
+        "create-new": "Nový profil z implicitného",
+        "reading-profile-promoted": "Profil čítania bol povýšený",
+        "update-parent": "Uložiť do {{name}}",
+        "line-spacing-min-label": "1x"
     },
     "table-of-contents": {
         "no-data": "Táto kniha nemá v metadátach ani v súbore toc nastavený obsah"
@@ -934,7 +932,8 @@
     },
     "card-detail-layout": {
         "total-items": "Celkový počet položiek: {{count}}",
-        "jumpkey-count": "{{count}} Série"
+        "jumpkey-count": "{{count}} Série",
+        "no-data": "{{common.no-data}}"
     },
     "card-item": {
         "cannot-read": "Nedá sa čítať"
@@ -960,12 +959,14 @@
         "language-title": "{{edit-chapter-modal.language-label}}",
         "release-title": "{{sort-field-pipe.release-year}}",
         "format-title": "{{metadata-filter.format-label}}",
-        "length-title": "{{edit-chapter-modal.words-label}}"
+        "length-title": "{{edit-chapter-modal.words-label}}",
+        "age-rating-title": "{{metadata-fields.age-rating-title}}"
     },
     "related-tab": {
         "reading-lists-title": "{{reading-lists.title}}",
         "collections-title": "{{side-nav.collections}}",
-        "relations-title": "{{tabs.related-tab}}"
+        "relations-title": "{{tabs.related-tab}}",
+        "bookmarks-title": "{{side-nav.bookmarks}}"
     },
     "cover-image-chooser": {
         "enter-an-url-pre-title": "Zadajte {{url}}",
@@ -1019,7 +1020,7 @@
         "clear-alerts": "Vymazať upozornenia",
         "comment-header": "Komentár",
         "created-header": "Vytvorené",
-        "no-data": "Žiadne dáta",
+        "no-data": "{{common.no-data}}",
         "file-header": "Súbor",
         "description-part-1": "Táto tabuľka obsahuje problémy zistené počas skenovania alebo čítania vašich médií. Môžete ju kedykoľvek vymazať a na vykonanie analýzy použiť Library (Force) Scan (vynútené skenovanie). Zoznam niektorých bežných chýb a ich význam nájdete na stránke "
     },
@@ -1031,7 +1032,7 @@
         "email-settings-title": "Nastavenia e-mailu",
         "reset": "{{common.reset}}",
         "test": "Test",
-        "host-name-tooltip": "Názov domény (reverzného proxy). Vyžaduje sa pre funkčnosť e-mailu. Ak nieje reverzné proxy, použite ľubovoľnú url adresu.",
+        "host-name-tooltip": "Názov domény vášho reverzného proxy servera, potrebný pre fungovanie e-mailu. Ak nepoužívate reverzný proxy server, môžete použiť ľubovoľnú URL adresu vrátane http://externalip:port/",
         "host-name-validation": "Hostname musí začínať http(s) a nesmie končiť na /",
         "sender-address-label": "Adresa odosielateľa",
         "sender-address-tooltip": "Toto je e-mailová adresa, z ktorej príjemca uvidí, keď dostane e-mail. Zvyčajne ide o e-mailovú adresu priradenú k účtu.",
@@ -1229,9 +1230,6 @@
         "backup-database-task-success": "Úloha na zálohovanie databázy bola zaradená do fronty",
         "download-logs-task": "Stiahnuť logy",
         "download-logs-task-desc": "Skompiluje všetky log súbory do .zip a stiahne súbor.",
-        "analyze-files-task": "Analyzovať súbory",
-        "analyze-files-task-desc": "Spustí dlhotrvajúcu úlohu, ktorá bude analyzovať súbory, aby sa vygenerovala prípona a veľkosť. Toto by malo byť spustené iba raz pre vydanie v0.7. Nie je potrebné, ak ste nainštalovali po v0.7.",
-        "analyze-files-task-success": "Analýza súborov bola zaradená do fronty",
         "check-for-updates-task": "Skontroluj aktualizácie",
         "check-for-updates-task-desc": "Zistite, či sú pred vašou verziou nejaké stabilné vydania.",
         "clean-up-task": "Všeobecné čistenie",
@@ -1264,7 +1262,6 @@
         "change-password-alt": "Zmeniť heslo {{user}}",
         "resend": "Znovu odoslať",
         "setup": "Nastaviť",
-        "admin": "Administrátor",
         "none": "Žiadne",
         "never": "Nikdy",
         "online-now-tooltip": "Práve online",
@@ -1276,7 +1273,8 @@
         "roles-header": "Roly",
         "name-header": "Meno",
         "sharing-header": "Zdieľanie",
-        "pending-tooltip": "Tento používateľ neoveril svoj e-mail"
+        "pending-tooltip": "Tento používateľ neoveril svoj e-mail",
+        "all-libraries": "Všetky knižnice"
     },
     "edit-collection-tags": {
         "title": "Upraviť zbierku {{collectionName}}",
@@ -1288,7 +1286,7 @@
         "cover-image-tab": "{{tabs.cover-tab}}",
         "info-tab": "{{tabs.info-tab}}",
         "series-tab": "{{tabs.series-tab}}",
-        "name-label": "Názov",
+        "name-label": "Meno",
         "name-validation": "Názov musí byť jedinečný",
         "promote-label": "Povýšiť",
         "promote-tooltip": "Povýšenie znamená, že tag možno vidieť na celom serveri, nielen pre správcov. Všetky série, ktoré majú tento tag, budú mať stále obmedzenia prístupu používateľov.",
@@ -1300,7 +1298,7 @@
         "source-url-title": "Zdroj Url:",
         "last-sync-tooltip": "Kavita sa denne synchronizuje s poskytovateľmi zberu upstream.",
         "missing-series-title": "Chýbajúce série:",
-        "total-series-title": "Celkovo sérii"
+        "total-series-title": "Celkovo sérii:"
     },
     "library-recommended": {
         "no-data": "Nie je tu nič na zobrazenie. Pridajte nejaké metadáta do svojej knižnice, prečítajte si niečo alebo niečo ohodnoťte. Táto knižnica môže mať tiež vypnuté odporúčania.",
@@ -1312,10 +1310,10 @@
         "on-deck": "{{dashboard.on-deck-title}}"
     },
     "settings": {
-        "kavitaplus-section-title": "{{settings.admin-kavitaplus}}",
+        "kavitaplus-section-title": "Kavita+",
         "admin-libraries": "Knižnice",
         "account": "Účet",
-        "admin-kavitaplus": "Kavita+",
+        "admin-kavitaplus": "Licencia",
         "preferences": "Nastavenia",
         "info-section-title": "Info",
         "import-section-title": "Importovať",
@@ -1337,7 +1335,13 @@
         "customize": "Prispôsobenie",
         "cbl-import": "CBL Zoznam na čítanie",
         "mal-stack-import": "MAL Stack",
-        "scrobbling": "Scrobblovanie"
+        "scrobbling": "Scrobblovanie",
+        "admin-manage-tokens": "Správa používateľských tokenov",
+        "admin-email-history": "História e-mailov",
+        "admin-matched-metadata": "Zhodné metadáta",
+        "scrobble-holds": "Scrobble chyty",
+        "admin-metadata": "Spravovať metadáta",
+        "reading-profiles": "Čítanie profilov"
     },
     "collection-detail": {
         "no-data": "Neexistujú žiadne položky. Skúste pridať sériu.",
@@ -1374,7 +1378,8 @@
     },
     "reading-list-item": {
         "remove": "{{common.remove}}",
-        "read": "{{common.read}}"
+        "read": "{{common.read}}",
+        "released-label": "Vydané: {{date}}"
     },
     "stream-list-item": {
         "remove": "{{common.remove}}",
@@ -1382,7 +1387,8 @@
         "provided": "Poskytnuté",
         "smart-filter": "Smart Filter",
         "library": "Knižnica",
-        "external-source": "Externý zdroj"
+        "external-source": "Externý zdroj",
+        "delete": "{{common.delete}}"
     },
     "reading-list-detail": {
         "item-count": "{{common.item-count}}",
@@ -1394,7 +1400,19 @@
         "read-options-alt": "Možnosti čítania",
         "incognito-alt": "(Inkognito)",
         "no-data": "Nič nebolo pridané",
-        "characters-title": "{{metadata-fields.characters-title}}"
+        "characters-title": "{{metadata-fields.characters-title}}",
+        "writers-title": "{{metadata-fields.writers-title}}",
+        "edit-alt": "{{common.edit}}",
+        "storyline-tab": "{{series-detail.storyline-tab}}",
+        "details-tab": "{{series-detail.details-tab}}",
+        "more-alt": "{{series-detail.more-alt}}",
+        "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
+        "publishers-title": "{{metadata-fields.publishers-title}}",
+        "items-title": "Položky",
+        "edit-label": "Režim úprav",
+        "reorder-alt": "Preusporiadať položky",
+        "date-range-title": "Rozsah dátumov",
+        "dnd-warning": "Funkcia „drag and drop“ nie je k dispozícii na mobilných zariadeniach alebo ak zoznam na čítanie obsahuje viac ako 100 položiek."
     },
     "events-widget": {
         "title-alt": "Aktivita",
@@ -1447,7 +1465,10 @@
         "logout": "Odhlásiť sa",
         "all-filters": "Smart Filtre",
         "close": "{{common.close}}",
-        "nav-link-header": "Možnosti navigácie"
+        "nav-link-header": "Možnosti navigácie",
+        "person-aka-status": "Zhoduje sa s aliasom",
+        "browse-tags": "Prehľadávať značky",
+        "browse-genres": "Prehľadávať žánre"
     },
     "promoted-icon": {
         "promoted": "{{common.promoted}}"
@@ -1486,7 +1507,7 @@
         "title": "MAL záujmy Stack Importovanie",
         "nothing-found": "Nič sa nenašlo",
         "description": "Importujte svoje MAL záujmy Stacks a vytvorte zbierky v rámci Kavita",
-        "restack-count": "{{num}} Restacks",
+        "restack-count": "{{num}} Restackov",
         "track": "Skladba"
     },
     "edit-chapter-progress": {
@@ -1534,7 +1555,6 @@
     },
     "manga-reader": {
         "back": "Naspäť",
-        "save-globally": "Uložiť globálne",
         "incognito-alt": "Režim inkognito je zapnutý. Prepínačom vypnete.",
         "incognito-title": "Režim inkognito:",
         "shortcuts-menu-alt": "Modálne klávesové skratky",
@@ -1555,7 +1575,7 @@
         "height": "Výška",
         "width": "Šírka",
         "original": "Originál",
-        "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}",
+        "auto-close-menu-label": "{{manage-reading-profiles.auto-close-menu-label}}",
         "swipe-enabled-label": "Potiahnutie prstom je povolené",
         "enable-comic-book-label": "Napodobniť komiks",
         "brightness-label": "Jas",
@@ -1566,12 +1586,17 @@
         "layout-mode-switched": "Režim rozloženia bol prepnutý na Single z dôvodu nedostatku miesta na vykreslenie dvojitého rozloženia",
         "no-next-chapter": "Žiadna ďalšia kapitola",
         "no-prev-chapter": "Žiadna predchádzajúca kapitola",
-        "user-preferences-updated": "Predvoľby používateľa boli aktualizované",
-        "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}",
+        "emulate-comic-book-label": "{{manage-reading-profiles.emulate-comic-book-label}}",
         "series-progress": "Priebeh série: {{percentage}}",
         "collapse": "Zabaliť",
-        "off": "Vypnuté",
-        "width-override-label": "Prepísanie šírky"
+        "off": "{{reader-settings.off}}",
+        "width-override-label": "Prepísanie šírky",
+        "create-new-tooltip": "{{reader-settings.create-new-tooltip}}",
+        "create-new": "{{reader-settings.create-new}}",
+        "loading": "{{reader-settings.loading}}",
+        "update-parent": "{{reader-settings.update-parent}}",
+        "reading-profile-updated": "Profil čítania bol aktualizovaný",
+        "reading-profile-promoted": "Profil čítania bol povýšený"
     },
     "metadata-filter": {
         "filter-title": "{{common.filter}}",
@@ -1628,7 +1653,10 @@
         "release-year": "Rok vydania",
         "read-progress": "Naposledy čítané",
         "average-rating": "Priemerné hodnotenie",
-        "random": "Náhodný"
+        "random": "Náhodný",
+        "person-chapter-count": "Počet kapitol",
+        "person-name": "Meno",
+        "person-series-count": "Počet sérií"
     },
     "edit-series-modal": {
         "title": "Podrobnosti o {{seriesName}}",
@@ -1660,7 +1688,7 @@
         "publication-status-label": "Stav publikácie",
         "required-field": "{{validation.required-field}}",
         "close": "{{common.close}}",
-        "name-label": "Názov",
+        "name-label": "Meno",
         "sort-name-label": "Triediť podľa názvu",
         "localized-name-label": "Lokalizovaný názov",
         "summary-label": "Zhrnutie",
@@ -1764,8 +1792,8 @@
         "cover-image-tab": "{{tabs.cover-tab}}",
         "tasks-tab": "{{tabs.tasks-tab}}",
         "info-tab": "{{tabs.info-tab}}",
-        "pages-label": "{{edit-chapter-modal.pages-count}}",
-        "words-label": "{{edit-chapter-modal.length-title}}",
+        "pages-label": "{{edit-chapter-modal.pages-label}}",
+        "words-label": "{{edit-chapter-modal.words-label}}",
         "pages-count": "{{edit-chapter-modal.pages-count}}",
         "words-count": "{{edit-chapter-modal.words-count}}",
         "reading-time-label": "{{edit-chapter-modal.reading-time-label}}",
@@ -1905,14 +1933,16 @@
         "sidenav": "Bočná navigácia",
         "external-sources": "Externé zdroje",
         "smart-filters": "Smart Filtre",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "description": "Rôzne aspekty Kavity si môžete prispôsobiť zmenou poradia, prepnutím viditeľnosti a naviazaním inteligentných filtrov/externých zdrojov na vašu domovskú stránku alebo bočnú navigáciu."
     },
     "customize-dashboard-streams": {
         "no-data": "Všetky smart filtre boli pridané do Dashboard-u alebo ešte neboli vytvorené.",
         "save": "{{common.save}}",
         "add": "{{common.add}}",
         "filter": "{{common.filter}}",
-        "clear": "{{common.clear}}"
+        "clear": "{{common.clear}}",
+        "smart-filter-title": "{{customize-dashboard-modal.title-smart-filters}}"
     },
     "customize-sidenav-streams": {
         "no-data": "Všetky Smart filtre boli pridané do bočnej navigácie alebo ešte neboli vytvorené žiadne.",
@@ -1923,7 +1953,7 @@
         "clear": "{{common.clear}}",
         "smart-filters-title": "Smart Filtre",
         "external-sources-title": "{{customize-dashboard-modal.external-sources}}",
-        "reorder-when-filter-present": "You cannot reorder items via drag & drop while a filter is present. Use {{customize-sidenav-streams.order-numbers-label}}",
+        "reorder-when-filter-present": "Keď je prítomný filter, nemôžete zmeniť poradie položiek pomocou prehodenia (drag & drop). Použite {{customize-sidenav-streams.order-numbers-label}}",
         "order-numbers-label": "{{reading-list-detail.order-numbers-label}}",
         "bulk-mode-label": "Hromadný režim"
     },
@@ -1940,13 +1970,21 @@
         "no-data": "Neboli vytvorené žiadne Smart filtre",
         "filter": "{{common.filter}}",
         "clear": "{{common.clear}}",
-        "errored": "Vo filtri je chyba kódovania. Musíte to znova vytvoriť."
+        "errored": "Vo filtri je chyba kódovania. Musíte to znova vytvoriť.",
+        "save": "{{common.save}}",
+        "edit-smart-filter": "Upraviť {{name}}",
+        "name-label": "Meno",
+        "required-field": "Inteligentné filtre potrebujú názov",
+        "close": "{{common.close}}",
+        "filter-name-unique": "Názvy inteligentných filtrov musia byť jedinečné",
+        "edit": "{{common.edit}}",
+        "cancel": "{{common.cancel}}"
     },
     "edit-external-source-item": {
         "not-unique": "Externý zdroj už existuje s týmto host-om. Uistite sa, že nemáte duplikáty",
         "title": "Nový externý zdroj",
         "host-label": "Host",
-        "name-label": "Názov",
+        "name-label": "Meno",
         "api-key-label": "API kľúč",
         "save": "{{common.save}}",
         "edit": "{{common.edit}}",
@@ -1965,7 +2003,7 @@
         "reading-lists": "{{side-nav.reading-lists}}",
         "bookmarks": "{{side-nav.bookmarks}}",
         "all-series": "{{side-nav.all-series}}",
-        "browse-authors": "{{side-nav.browse-authors}}"
+        "browse-authors": "{{side-nav.browse-people}}"
     },
     "filter-field-pipe": {
         "age-rating": "{{metadata-fields.age-rating-title}}",
@@ -2038,7 +2076,7 @@
         "series-added-to-collection": "Séria bola pridaná do zbierky {{collectionName}}",
         "no-series-collection-warning": "POZOR! Nie sú vybraté žiadne série, uložením sa zbierka odstráni. Ste si istý, že chcete pokračovať?",
         "collection-updated": "Zbierka bola aktualizovaná",
-        "reading-list-deleted": "Zoznam na čítanie bol odstránený",
+        "reading-list-deleted": "Zoznam na čítanie bo zmazaný",
         "reading-list-updated": "Zoznam na čítanie bol aktualizovaný",
         "confirm-delete-reading-list": "Naozaj chcete vymazať zoznam na čítanie? Toto nie je možné vrátiť späť.",
         "item-removed": "Položka bola odstránená",
@@ -2068,9 +2106,8 @@
         "email-sent": "E-mail bol odoslaný na {{email}}",
         "email-not-sent": "E-mail v záznamoch nie je platný e-mail a nemožno ho odoslať. Do logov sa vypísal odkaz. Správca môže poskytnúť tento odkaz na dokončenie postupu.",
         "k+-license-saved": "Licenčný kľúč bol uložený, ale nie je platný. Kliknutím na začiarknutie obnovíte platnosť predplatného. Rozšírenie prvej registrácie môže minútu trvať.",
-        "k+-unlocked": "Kavita+ odomknutá!",
         "k+-error": "Pri aktivácii vašej licencie sa vyskytla chyba. Prosím skúste znova.",
-        "k+-delete-key": "Týmto sa odstráni iba licenčný kľúč Kavity a umožní sa zobrazenie odkazu na kúpu. Týmto sa vaše predplatné nezruší! Použite to iba na pokyn podpory!",
+        "k+-delete-key": "Týmto sa odstráni iba licenčný kľúč Kavity a umožní sa zobrazenie odkazu na nákup. Týmto sa nezruší vaše predplatné! Najprv použite Spravovať na zrušenie predplatného.",
         "k+-reset-key": "Toto zruší platnosť predchádzajúcej registrácie pomocou vašej licencie a umožní vám znova zaregistrovať inštanciu Kavita.",
         "k+-reset-key-success": "Vaša licencia bola zrušená. Pomocou tlačidla Upraviť znova zaregistrujte svoju inštanciu a znova aktivujte Kavita+",
         "library-deleted": "Knižnica {{name}} bola odstránená",
@@ -2136,7 +2173,16 @@
         "volume-deleted": "Zväzok vymazaný",
         "bulk-covers": "Obnovenie obalov vo viacerých knižniciach je intenzívne a môže trvať dlho. Naozaj chcete pokračovať?",
         "person-image-downloaded": "Titulná fotka osoby bola stiahnutá a použitá.",
-        "confirm-delete-multiple-chapters": "Naozaj chcete odstrániť {{count}} kapitolu/zväzky? Nezmení súbory na disku."
+        "confirm-delete-multiple-chapters": "Naozaj chcete odstrániť {{count}} kapitolu/zväzky? Nezmení súbory na disku.",
+        "bulk-delete-libraries": "Naozaj chcete odstrániť {{count}} knižnice?",
+        "match-success": "Séria správne priradená",
+        "webtoon-override": "Prepnutie do režimu Webtoon kvôli obrázkom reprezentujúcim webtoon.",
+        "confirm-delete-multiple-volumes": "Naozaj chcete odstrániť {{count}} zväzkov? Týmto sa nezmenia súbory na disku.",
+        "library-bound-to-reading-profile": "Knižnica prepojená s čitateľským profilom {{name}}",
+        "scrobble-gen-init": "Zaradená úloha na generovanie udalostí Scrobblingu z histórie čítania a hodnotení v minulosti a ich synchronizáciu s pripojenými službami.",
+        "series-added-want-to-read": "Séria bola pridaná zo zoznamu Chcem si prečítať",
+        "series-bound-to-reading-profile": "Séria viazaná na čitateľský profil {{name}}",
+        "external-match-rate-error": "Kavite došla sadzba pri hľadaní {{seriesName}}. Skúste to znova o 5 minút."
     },
     "actionable": {
         "scan-library": "Skenovať knižnicu",
@@ -2191,7 +2237,7 @@
         "scan-series-tooltip": "Skenovať Série pre zmeny",
         "promote-tooltip": "Zviditeľnite položku pre všetkých používateľov",
         "customize-tooltip": "TODO",
-        "scan-library-tooltip": "Skenovať zmeny v knižnici. Použite vynútenie skenovania pre vynútenie kontroly každého priečinka.",
+        "scan-library-tooltip": "Skenovať zmeny v knižnici. Použite vynútenie skenovania pre vynútenie kontroly každého priečinka",
         "generate-colorscape": "Generovať ColorScape",
         "refresh-covers-tooltip": "Regenerovať všetky Obaly",
         "mark-as-unread-tooltip": "Označiť priebeh ako neprečítané",
@@ -2201,7 +2247,19 @@
         "mark-visible-tooltip": "TODO",
         "unpromote": "Zrušiť propagáciu",
         "unpromote-tooltip": "Obmedzte viditeľnosť iba na svoj účet",
-        "copy-settings": "Kopírovať nastavenia z"
+        "copy-settings": "Kopírovať nastavenia z",
+        "match": "Zhoda",
+        "match-tooltip": "Zoraďte sériu s Kavitou+ manuálne",
+        "merge": "Zlúčiť",
+        "clear-reading-profile": "Vymazať profil čítania",
+        "clear-reading-profile-tooltip": "Vymazať profil čítania pre túto knižnicu",
+        "cleared-profile": "Vymazaný profil čítania",
+        "reading-profiles": "Profily čítania",
+        "set-reading-profile-tooltip": "Prepojiť čitateľský profil s touto knižnicou",
+        "reorder": "Zmeniť poradie",
+        "rename": "Premenovať",
+        "rename-tooltip": "Premenovanie inteligentného filtra",
+        "set-reading-profile": "Nastaviť profil čítania"
     },
     "preferences": {
         "left-to-right": "Zľava doprava",
@@ -2289,24 +2347,25 @@
         "book-nums": "Knihy",
         "chapter-nums": "Kapitoly",
         "volume-nums": "Zväzky",
-        "issue-nums": "Vydania"
+        "issue-nums": "Vydania",
+        "chapter-count": "{{num}} kapitol",
+        "no-data": "Žiadne údaje",
+        "issue-count": "{{num}} Problémov"
     },
     "person-detail": {
         "all-roles": "Roly",
         "individual-role-title": "Ako {{role}}",
         "browse-person-title": "Všetky diela {{name}}",
         "known-for-title": "Známy pre",
-        "browse-person-by-role-title": "Všetky diela {{name}} ako {{role}}"
+        "browse-person-by-role-title": "Všetky diela {{name}} ako {{role}}",
+        "anilist-url": "{{edit-person-modal.anilist-tooltip}}",
+        "aka-title": "Tiež známe ako ",
+        "no-info": "Žiadne informácie o tejto osobe"
     },
     "download-button": {
         "download-tooltip": "Stiahnuť",
         "downloading-status": "Sťahuje sa…"
     },
-    "browse-authors": {
-        "title": "Prezerať autorov a spisovateľov",
-        "author-count": "{{num}} Ľudí",
-        "cover-image-description": "{{edit-series-modal.cover-image-description}}"
-    },
     "pdf-scroll-mode-pipe": {
         "horizontal": "Horizontálne",
         "page": "Klepnutím môžete stránkovať",
@@ -2364,7 +2423,11 @@
     },
     "confirm": {
         "alert": "Upozornenie",
-        "confirm": "Potvrdiť"
+        "confirm": "Potvrdiť",
+        "info": "Info",
+        "cancel": "{{common.cancel}}",
+        "ok": "Ok",
+        "prompt": "Otázka"
     },
     "collection-owner": {
         "collection-created-label": "Vytvorené: {{owner}}",
@@ -2391,7 +2454,11 @@
         "cover-image-description-extra": "Alternatívne si môžete stiahnuť obal z CoversDB, ak je k dispozícii.",
         "cover-image-description": "{{edit-series-modal.cover-image-description}}",
         "save": "{{common.save}}",
-        "download-coversdb": "Stiahnuť z CoversDB"
+        "download-coversdb": "Stiahnuť z CoversDB",
+        "aliases-tab": "Aliasy",
+        "aliases-label": "Upraviť aliasy",
+        "alias-overlap": "Tento alias už odkazuje na inú osobu alebo je menom tejto osoby, zvážte ich zlúčenie.",
+        "aliases-tooltip": "Keď je séria označená aliasom osoby, táto osoba je priradená, nie je vytvorená nová osoba. Pri odstraňovaní aliasu budete musieť znova prehľadať sériu, aby sa zmena prejavila."
     },
     "kavitaplus-metadata-breakdown-stats": {
         "completed-series-label": "Dokončené série",
@@ -2399,7 +2466,7 @@
         "errored-series-label": "Chybná séria",
         "complete": "Všetky série majú metadáta",
         "title": "Kavita+ Rozdelenie metadáť",
-        "no-data": "Žiadne dáta"
+        "no-data": "{{common.no-data}}"
     },
     "next-expected-card": {
         "title": "~{{date}}",
@@ -2412,5 +2479,339 @@
     },
     "download-indicator": {
         "progress": "{{percentage}}% stiahnuté"
+    },
+    "changelog-update-item": {
+        "fixed": "Opravené",
+        "developer": "Developer",
+        "download": "Stiahnuť",
+        "added": "Pridané",
+        "changed": "Zmenené",
+        "theme": "Téma",
+        "removed": "Odstránené",
+        "api": "API",
+        "published-label": "Zverejnené: ",
+        "installed": "{{changelog.installed}}",
+        "feature-requests": "Požiadavky na funkcie",
+        "known-issues": "Známe problémy"
+    },
+    "new-version-modal": {
+        "title": "Kavita bola aktualizovaná!",
+        "description": "K dispozícii je nová verzia Kavity. Aktualizujte obnovením.",
+        "added": "{{changelog.added}}",
+        "changed": "{{changelog.changed}}",
+        "fixed": "{{changelog.fixed}}",
+        "developer": "{{changelog.developer}}",
+        "theme": "{{changelog.theme}}",
+        "removed": "{{changelog.removed}}",
+        "api": "{{changelog.api}}",
+        "close": "{{common.close}}",
+        "refresh": "Obnoviť",
+        "known-issues": "{{changelog.known-issues}}"
+    },
+    "manage-matched-metadata": {
+        "description": "Všetky príslušné série, ktoré je možné priradiť k externým metaúdajom, sa nachádzajú tu. Kavita vopred načíta alebo obnoví metadáta série, 50 sérií za 24 hodín denne.",
+        "title": "Zhodné metadáta",
+        "status-header": "Stav",
+        "series-name-header": "Série",
+        "valid-until-header": "Ďalšie obnovenie",
+        "matched-status-label": "Zhoda",
+        "unmatched-status-label": "Nezhoda",
+        "blacklist-status-label": "Vyžaduje sa manuálna zhoda",
+        "all-status-label": "Všetky",
+        "dont-match-label": "Nezhodovať",
+        "no-data": "{{common.no-data}}",
+        "library-name-header": "Knižnica",
+        "actions-header": "Akcie",
+        "dont-match-status-label": "{{dont-match-label}}",
+        "match-alt": "Zhoda {{seriesName}}",
+        "matched-state-label": "Stav zhody",
+        "library-type": "Typ knižnice"
+    },
+    "match-series-modal": {
+        "description": "Vyberte zhodu na opätovné prepojenie metadát Kavita+ a regeneráciu scrobble udalostí. \"Nezhoda\" sa dá použiť na obmedzenie Kavity v zhode metadát a scrobblingu.",
+        "title": "Zhoda {{seriesName}}",
+        "save": "{{common.save}}",
+        "close": "{{common.close}}",
+        "no-results": "Nedá sa nájsť zhoda. Skúste pridať adresu URL od podporovaného poskytovateľa a skúste to znova.",
+        "query-label": "Dopyt",
+        "query-tooltip": "Zadajte názov série, URL adresu AniList/MyAnimeList/ComicBookRoundup. URL adresy budú používať priame vyhľadávanie.",
+        "dont-match-label": "Nezhoduj",
+        "dont-match-tooltip": "Rozhodnite sa pre túto sériu z párovania a scrobblingu",
+        "search": "Hľadať"
+    },
+    "manage-user-tokens": {
+        "anilist-header": "AniList",
+        "description": "Používatelia, ktorí majú tokeny na scrobbling, môžu občas potrebovať obnovenie. Kavita im automaticky pošle e-mail, ak je e-mail nastavený a majú platný e-mail.",
+        "username-header": "Používateľské meno",
+        "mal-header": "MAL",
+        "token-set-label": "Token nastavený",
+        "no-data": "{{common.no-data}}",
+        "expires-label": "Expiruje: {{date}}"
+    },
+    "email-history": {
+        "template-header": "Šablóna",
+        "description": "Tu nájdete všetky e-maily odoslané z Kavity a ktorému používateľovi.",
+        "date-header": "Dátum odoslania",
+        "user-header": "Odoslané",
+        "sent-header": "Úspešne",
+        "no-data": "{{common.no-data}}",
+        "sent-tooltip": "Odoslané",
+        "not-sent-tooltip": "Neodoslané"
+    },
+    "match-series-result-item": {
+        "chapter-count": "{{common.chapter-count}}",
+        "volume-count": "{{server-stats.volume-count}}",
+        "releasing": "Vydanie",
+        "details": "Zobraziť stránku",
+        "updating-metadata-status": "Aktualizácia metadát",
+        "issue-count": "{{common.issue-count}}"
+    },
+    "manage-metadata-settings": {
+        "tag": "Tag/Značka",
+        "enable-genres-tooltip": "Povoľte zapísanie žánrov série.",
+        "description": "Systém Kavita+ má schopnosť preberať a zapisovať niektoré obmedzené metadáta do databázy. Táto stránka umožňuje prepínať, čo je v rozsahu.",
+        "localized-name-label": "Názov lokalizovanej série",
+        "localized-name-tooltip": "Umožniť zápis lokalizovaného názvu, keď je pole odomknuté. Kavita sa pokúsi o čo najlepší odhad.",
+        "derive-publication-status-tooltip": "Umožniť odvodenie statusu publikácie z celkového počtu kapitol/súborov.",
+        "enable-relations-label": "Vzťahy",
+        "enable-relations-tooltip": "Povoliť pridávanie vzťahov sérii.",
+        "enable-cover-image-label": "Obrázok obálky",
+        "enable-cover-image-tooltip": "Povoliť Kavite zapísať obrázok na obálku série",
+        "enable-start-date-tooltip": "Umožniť zápis dátumu začiatku série do série",
+        "enable-genres-label": "Žánre",
+        "overrides-label": "Prepísania",
+        "field-mapping-description": "Nastavte pravidlá pre určité reťazce nájdené v poli Žáner/Značka(Tag) a namapujte ich na nový reťazec v Žáner/Značka(Tag) a prípadne ho odstráňte zo zoznamu Zdroja. Použiteľné iba vtedy, keď je povolený zápis žánru/značky(tagu).",
+        "overrides-description": "Umožnite Kavite zapísať uzamknuté polia.",
+        "enabled-label": "Povolenie preberania metadát",
+        "summary-label": "Zhrnutie",
+        "summary-tooltip": "Umožniť zápis súhrnu, keď je pole odomknuté.",
+        "derive-publication-status-label": "Stav publikácie",
+        "enabled-tooltip": "Povoľte Kavite sťahovať metadáta a zapisovať do databázy.",
+        "enable-start-date-label": "Dátum začiatku",
+        "enable-people-label": "Ľudia",
+        "enable-people-tooltip": "Povoliť pridávanie ľudí (postáv, spisovateľov atď.). Všetky osoby obsahujú obrázky.",
+        "enable-tags-tooltip": "Povolenie zapísania Tagov/značiek série.",
+        "blacklist-label": "Čierna listina/Blacklist Žánrov/značiek",
+        "blacklist-tooltip": "Všetko v tomto zozname bude odstránené zo spracovania žánru aj tagu/značky. Toto je miesto na pridávanie žánrov/značiek(tagov), ktoré nechcete zapísať. Uistite sa, že sú oddelené čiarkami.",
+        "enable-tags-label": "Tagy/Značky",
+        "whitelist-tooltip": "Povoliť zápis reťazca v tomto zozname iba pre Tagy/Značky. Uistite sa, že sú oddelené čiarkami.",
+        "age-rating-mapping-title": "Priradenie vekového hodnotenia",
+        "age-rating-mapping-description": "Akékoľvek reťazce vľavo, ak sa nachádzajú v žánri alebo v tagoch/značkách, nastavia vekové hodnotenie série.",
+        "genre": "Žáner",
+        "whitelist-label": "Biely zoznam(Whitelist) tagov/značiek",
+        "add-age-rating-mapping-label": "Pridajte mapovanie vekového hodnotenia",
+        "field-mapping-title": "Mapovanie polí",
+        "add-field-mapping-label": "Pridať mapovanie polí",
+        "remove-source-tag-label": "Odstrániť zdroj značky/tagu",
+        "first-last-name-label": "Meno Priezvisko Pomenovanie",
+        "person-roles-label": "Roly",
+        "first-last-name-tooltip": "Uistite sa, že mená osôb sú napísané najprv s krstným menom a potom s priezviskom",
+        "enable-chapter-release-date-label": "Dátum vydania",
+        "enable-chapter-release-date-tooltip": "Umožniť napísanie dátumu vydania kapitoly/čísla",
+        "enable-chapter-publisher-label": "Vydavateľ",
+        "enable-chapter-publisher-tooltip": "Povoliť vydavateľovi kapitoly/čísla napísať",
+        "enable-chapter-cover-label": "Obálka kapitoly",
+        "enable-chapter-cover-tooltip": "Povoliť nastavenie obálky kapitoly/čísla",
+        "chapter-header": "Polia kapitoly",
+        "enable-chapter-title-label": "Názov",
+        "enable-chapter-title-tooltip": "Umožniť napísanie názvu kapitoly/vydania",
+        "enable-chapter-summary-label": "{{manage-metadata-settings.summary-label}}",
+        "enable-chapter-summary-tooltip": "{{manage-metadata-settings.summary-tooltip}}"
+    },
+    "metadata-setting-field-pipe": {
+        "start-date": "{{manage-metadata-settings.enable-start-date-label}}",
+        "genres": "{{metadata-fields.genres-title}}",
+        "publication-status": "{{edit-series-modal.publication-status-title}}",
+        "covers": "Obaly",
+        "age-rating": "{{metadata-fields.age-rating-title}}",
+        "people": "{{tabs.people-tab}}",
+        "summary": "{{filter-field-pipe.summary}}",
+        "tags": "{{metadata-fields.tags-title}}",
+        "localized-name": "{{edit-series-modal.localized-name-label}}",
+        "chapter-covers": "Obálky (kapitola)",
+        "chapter-title": "Názov (kapitola)",
+        "chapter-release-date": "Dátum vydania (kapitola)",
+        "chapter-summary": "Zhrnutie (kapitola)",
+        "chapter-publisher": "{{person-role-pipe.publisher}} (Chapter)"
+    },
+    "log-level-pipe": {
+        "trace": "Trace/stopy",
+        "warning": "Pozor",
+        "critical": "Kritické",
+        "debug": "Debugovanie",
+        "information": "Informácie"
+    },
+    "role-localized-pipe": {
+        "change-password": "Zmeniť heslo",
+        "download": "Stiahnuť",
+        "login": "Prihlásenie",
+        "change-restriction": "Zmeniť obmedzenie",
+        "admin": "Admin",
+        "bookmark": "Záložka",
+        "promote": "Propagovať",
+        "read-only": "Iba na čítanie"
+    },
+    "merge-person-modal": {
+        "title": "{{personName}}",
+        "src": "Zlúčiť osobu",
+        "save": "{{common.save}}",
+        "close": "{{common.close}}",
+        "known-for-title": "Známy pre",
+        "merge-warning": "Ak budete pokračovať, vybraná osoba bude odstránená. Meno vybranej osoby bude pridané ako alias a všetky jej role budú prenesené.",
+        "alias-title": "Nové aliasy"
+    },
+    "manage-reading-profiles": {
+        "no-selected": "Nie je vybratý žiadny profil",
+        "confirm": "Naozaj chcete odstrániť čitateľský profil {{name}}?",
+        "scaling-option-tooltip": "Ako prispôsobiť obrázok veľkosti obrazovky.",
+        "auto-close-menu-label": "Menu automatického zatvorenia",
+        "auto-close-menu-tooltip": "Ponuka by sa mala automaticky zatvoriť",
+        "show-screen-hints-label": "Zobraziť rady na obrazovke",
+        "show-screen-hints-tooltip": "Zobraziť prekrytie, ktoré pomôže pochopiť oblasť a smer stránkovania",
+        "width-override-label": "{{manga-reader.width-override-label}}",
+        "reset": "{{common.reset}}",
+        "book-reader-settings-title": "Čítačka kníh",
+        "tap-to-paginate-label": "Klepnutie pre stránkovanie",
+        "tap-to-paginate-tooltip": "Mali by bočné strany obrazovky čítačky kníh umožňovať klepnutie na prechod na predchádzajúcu/nasledujúcu stranu",
+        "immersive-mode-label": "Imerzívny režim",
+        "reading-direction-book-label": "Smer čítania",
+        "reading-direction-book-tooltip": "Smer kliknutia pre presun na ďalšiu stránku. Sprava doľava znamená, že kliknutím na ľavú stranu obrazovky prejdete na ďalšiu stránku.",
+        "font-family-label": "Skupina písma",
+        "writing-style-label": "Štýl písania",
+        "writing-style-tooltip": "Mení smer textu. Horizontálne je zľava doprava, vertikálne je zhora nadol.",
+        "layout-mode-book-label": "Režim rozloženia",
+        "font-size-book-label": "Veľkosť písma",
+        "margin-book-label": "Okraj",
+        "margin-book-tooltip": "Veľkosť rozstupu na každej strane obrazovky. Na mobilných zariadeniach sa táto hodnota prepíše na 0 bez ohľadu na toto nastavenie.",
+        "pdf-reader-settings-title": "PDF Čítačka",
+        "pdf-scroll-mode-label": "Režim scrolovania",
+        "pdf-scroll-mode-tooltip": "Spôsob posúvania medzi stránkami. Vertikálne/vodorovne a klepnutím pre stránkovanie (bez posúvania)",
+        "pdf-theme-tooltip": "Farebná téma čítačky",
+        "reading-profile-series-settings-title": "Série",
+        "profiles-title": "Vaše čitateľské profily",
+        "add": "{{common.add}}",
+        "delete": "{{common.delete}}",
+        "selection-tip": "Vyberte profil zo zoznamu alebo si vytvorte nový v pravom hornom rohu",
+        "font-size-book-tooltip": "Percentuálna zmena mierky, ktorá sa má použiť na písmo v knihe",
+        "line-height-book-tooltip": "Aké medzery medzi riadkami v knihe",
+        "extra-tip": "Priraďte čitateľské profily prostredníctvom ponuky akcií v sériách a knižniciach alebo hromadne. Pri zmene nastavení v čítačke sa vytvorí skrytý profil, ktorý si pamätá vaše voľby pre danú sériu (nie pre súbory PDF). Tento profil sa odstráni, keď k sérii priradíte jeden z vlastných čitateľských profilov. Viac informácií nájdete na",
+        "default-profile": "Predvolené",
+        "add-tooltip": "Váš nový profil bude uložený po vykonaní zmien",
+        "make-default": "Nastaviť ako predvolené",
+        "scaling-option-label": "Možnosti škálovania",
+        "description": "Nie všetky vaše série sa dajú čítať rovnakým spôsobom, preto si pre každú knižnicu alebo sériu nastavte samostatné čitateľské profily, aby bol návrat k sérii čo najplynulejší.",
+        "immersive-mode-tooltip": "Týmto sa ponuka skryje za kliknutím na dokument čítačky a zapne sa možnosť klepnutia pre stránkovanie",
+        "image-reader-settings-title": "Čítačka obrázkov",
+        "pdf-spread-mode-tooltip": "Ako by mali byť stránky rozložené. Jednoduché alebo dvojité (párne/nepárne)",
+        "page-splitting-label": "Rozdelenie stránky",
+        "swipe-to-paginate-tooltip": "Malo by potiahnutie prstom po obrazovke spustiť ďalšiu alebo predchádzajúcu stránku",
+        "layout-mode-book-tooltip": "Ako by mal byť obsah rozložený. Posúvanie je také, aké je v knihe. 1 alebo 2 stĺpce sa prispôsobia výške zariadenia a zmestia sa 1 alebo 2 stĺpce textu na stranu",
+        "color-theme-book-label": "Farebný motív",
+        "page-splitting-tooltip": "Ako rozdeliť obrázok na celú šírku (t. j. ľavý aj pravý obrázok sa spoja)",
+        "allow-auto-webtoon-reader-label": "Automatický režim čítačky webových karikatúr",
+        "reading-direction-label": "Smer čítania",
+        "reading-direction-tooltip": "Smer kliknutia pre presun na ďalšiu stránku. Sprava doľava znamená, že kliknutím na ľavú stranu obrazovky prejdete na ďalšiu stránku.",
+        "emulate-comic-book-tooltip": "Aplikuje efekt tieňa na emuláciu čítania z knihy",
+        "background-color-tooltip": "Farba pozadia čítačky obrázkov",
+        "reading-mode-tooltip": "Zmeňte čítačku na vertikálne, horizontálne stránkovanie alebo nekonečné posúvanie",
+        "layout-mode-label": "Režim rozloženia",
+        "allow-auto-webtoon-reader-tooltip": "Ak stránky vyzerajú ako webtoon, prepnite do režimu čítačky webtoonov. Môžu sa vyskytnúť falošne pozitívne výsledky.",
+        "pdf-spread-mode-label": "Režim šírenia",
+        "layout-mode-tooltip": "Zobrazenie jedného obrázka na obrazovke alebo dvoch obrázkov vedľa seba",
+        "emulate-comic-book-label": "Napodobniť komiks",
+        "swipe-to-paginate-label": "Prejdením prstom prejdete na stránkovanie",
+        "line-height-book-label": "Riadkovanie",
+        "background-color-label": "Farba pozadia",
+        "reading-profile-library-settings-title": "Knižnica",
+        "width-override-tooltip": "Prepísať šírku obrázkov v čítačke",
+        "font-family-tooltip": "Skupina písiem, ktoré sa majú načítať. Predvolené načíta predvolené písmo knihy",
+        "color-theme-book-tooltip": "Akú farebnú tému použiť na obsah a ponuku čítačky kníh",
+        "reading-mode-label": "Režim čítania",
+        "pdf-theme-label": "Téma",
+        "wiki-title": "wiki",
+        "disable-width-override-tooltip": "Zabráňte tomu, aby sa prepísanie šírky prejavilo, keď je obrazovka aspoň na úrovni nakonfigurovaného bodu zlomu alebo menšia",
+        "disable-width-override-label": "Zakázať prepísanie šírky"
+    },
+    "bulk-set-reading-profile-modal": {
+        "close": "{{common.close}}",
+        "title": "Nastaviť profil čítania",
+        "filter-label": "{{common.filter}}",
+        "clear": "{{common.clear}}",
+        "no-data": "Zatiaľ nie sú vytvorené žiadne zbierky",
+        "loading": "{{common.loading}}",
+        "bound": "Väzba",
+        "create": "{{common.create}}"
+    },
+    "reviews": {
+        "user-reviews-local": "Miestne recenzie",
+        "user-reviews-plus": "Externé recenzie"
+    },
+    "review-modal": {
+        "title": "Upraviť recenziu",
+        "review-label": "Recenzia",
+        "close": "{{common.close}}",
+        "save": "{{common.save}}",
+        "delete": "{{common.delete}}",
+        "min-length": "Recenzia musí mať aspoň {{count}} znakov",
+        "required": "{{validation.required-field}}"
+    },
+    "browse-people": {
+        "title": "Prehľadávať ľudí",
+        "name-label": "Meno",
+        "series-count-label": "Počet sérií",
+        "roles-label": "Roly",
+        "sort-label": "Usporiadať",
+        "issue-count": "{{common.issue-count}}",
+        "series-count": "{{common.series-count}}",
+        "cover-image-description": "{{edit-series-modal.cover-image-description}}",
+        "issue-count-label": "Počet vydaní",
+        "author-count": "{{num}} Ľudia"
+    },
+    "browse-genres": {
+        "title": "Prehľadávať žánre",
+        "genre-count": "{{num}} Žánrov",
+        "issue-count": "{{common.issue-count}}",
+        "series-count": "{{common.series-count}}"
+    },
+    "browse-tags": {
+        "genre-count": "Značky ({{num}})",
+        "series-count": "{{common.series-count}}",
+        "title": "Prehľadávať značky",
+        "issue-count": "{{common.issue-count}}"
+    },
+    "browse-title-pipe": {
+        "user-rating": "Hodnotenie hviezdičkami: {{value}}",
+        "translator": "Preložil/a {{value}}",
+        "character": "Má charakter {{value}}",
+        "publisher": "Publikované {{value}}",
+        "editor": "Upravené {{value}}",
+        "colorist": "Kolorizované {{value}}",
+        "inker": "Tlačené {{value}}",
+        "penciller": "Kreslené {{value}}",
+        "writer": "Napísal/a {{value}}",
+        "letterer": "Spísané {{value}}",
+        "format": "Formát {{value}}",
+        "release-year": "Vydané v {{value}}",
+        "imprint": "Odtlačok {{value}}",
+        "publication-status": "{{value}} funguje",
+        "age-rating": "Hodnotené ako {{value}}",
+        "tag": "Má značku {{value}}",
+        "genre": "Má žáner {{value}}",
+        "team": "Tím {{value}}",
+        "location": "V lokalite {{value}}",
+        "artist": "Nakreslené {{value}}",
+        "library": "V knižnici {{value}}"
+    },
+    "generic-filter-field-pipe": {
+        "person-name": "Meno",
+        "person-series-count": "Počet sérií",
+        "person-chapter-count": "Počet kapitol",
+        "person-role": "Rola"
+    },
+    "breakpoint-pipe": {
+        "never": "Nikdy",
+        "mobile": "Mobil",
+        "tablet": "Tablet",
+        "desktop": "Desktop"
     }
 }
diff --git a/UI/Web/src/assets/langs/sl.json b/UI/Web/src/assets/langs/sl.json
new file mode 100644
index 000000000..0967ef424
--- /dev/null
+++ b/UI/Web/src/assets/langs/sl.json
@@ -0,0 +1 @@
+{}
diff --git a/UI/Web/src/assets/langs/sv.json b/UI/Web/src/assets/langs/sv.json
index 935df1c6a..5dfd7a1c0 100644
--- a/UI/Web/src/assets/langs/sv.json
+++ b/UI/Web/src/assets/langs/sv.json
@@ -3,7 +3,7 @@
         "username": "{{common.username}}",
         "password": "{{common.password}}",
         "password-validation": "{{validation.password-validation}}",
-        "title": "Logga in till ditt konto",
+        "title": "Logga in på ditt konto",
         "forgot-password": "Glömt lösenord?",
         "submit": "Logga in"
     },
@@ -13,11 +13,11 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "account-detail-title": "Kontodetaljer",
         "saving": "Sparar…",
-        "update": "Uppdatera"
+        "update": "Uppdatera",
+        "invalid-email-warning": "En ogiltig e-post kommer blockera vissa funktioner i Kavita"
     },
     "user-scrobble-history": {
         "filter-label": "{{common.filter}}",
@@ -27,7 +27,7 @@
         "last-modified-header": "Senast ändrad",
         "series-header": "Serier",
         "volume-and-chapter-num": "Volym {{v}} Kapitel {{n}}",
-        "no-data": "Ingen data",
+        "no-data": "{{common.no-data}}",
         "volume-num": "Volym {{num}}",
         "chapter-num": "Kapitel {{num}}",
         "rating": "Betyg {{r}}",
@@ -38,16 +38,10 @@
         "data-header": "Data",
         "title": "Scrobble-historik",
         "not-read-warning": "Leverantör av tjänsten kommer alltid ha högst nummer",
-        "is-processed-header": "Är processad"
-    },
-    "review-series-modal": {
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "required": "{{validation.required-field}}",
-        "title": "Redigera recension",
-        "review-label": "Recension",
-        "min-length": "Recension måste vara minst {{count}} tecken"
+        "is-processed-header": "Är processad",
+        "scrobbling-disabled": "Scrobbling är inaktiverat i dina Kontoinställningar.",
+        "token-expired": "Din AniList-token är Utgången! Scrobbling kommer inte processeras förrän du har förnyat det under Konto.",
+        "generate-scrobble-events": "Backfill Events"
     },
     "review-card-modal": {
         "close": "{{common.close}}",
@@ -80,14 +74,34 @@
         "global-settings-title": "Global inställningar",
         "page-layout-mode-label": "Sidlayout-läge",
         "page-layout-mode-tooltip": "Visa som kort eller listvy på Seriedetaljer-sidan.",
-        "locale-label": "Plats",
+        "locale-label": "Språk",
         "locale-tooltip": "Språket Kavita ska nyttja",
         "blur-unread-summaries-label": "Censurera olästa sammanfattningar",
-        "blur-unread-summaries-tooltip": "Cencurera sammanfattningar på volymer eller kapitel som inte har någon läsprogress (för att undvika spoilers)",
-        "disable-animations-tooltip": "Inaktivera animationer på sidan. Användbart på e-ink-läsare."
+        "blur-unread-summaries-tooltip": "Cencurera handlingen på volymer eller kapitel som inte har någon läsprogress (för att undvika spoilers)",
+        "disable-animations-tooltip": "Inaktivera animationer på sidan. Användbart på e-ink-läsare.",
+        "share-series-reviews-tooltip": "Ska Kavita inkludera dina recensioner av Serier för andra användare",
+        "kavitaplus-settings-title": "Kavita+",
+        "anilist-scrobbling-label": "AniList Scrobbling",
+        "anilist-scrobbling-tooltip": "Tillåt Kavita att Scrobbla (envägssynk) läsförlopp och betygsättningar till AniList",
+        "want-to-read-sync-label": "Vill Läsa Synk",
+        "want-to-read-sync-tooltip": "Tillåt Kavita att lägga till artiklar till din Vill Läsa-lista baserat på AniList- och MAL-serier i Väntande läslista",
+        "collapse-series-relationships-label": "Dölj Serierelationer",
+        "collapse-series-relationships-tooltip": "Ska Kavita visa Serier som saknar relation eller är förälder/uppföljare",
+        "share-series-reviews-label": "Dela Serierecensioner",
+        "clients-opds-url-label": "OPDS-länk",
+        "clients-api-key-label": "API-nyckel",
+        "clients-opds-url-tooltip": "Se en lista av kompatibla OPDS klienter. ",
+        "clients-opds-description": "Alla tredje partens klienter kommer använda antingen API-nyckeln eller Anslutnings-länken nedan. Dessa är som lösenord, håll dem hemliga.",
+        "clients-opds-alert": "OPDS är inte aktiverat på denna server. Detta kommer inte påverka Tachiyomi användare.",
+        "clients-api-key-tooltip": "API-nyckeln är som ett lösenord. Återställs den tas alla anslutningar till klienter bort."
     },
     "user-holds": {
-        "no-data": "{{typeahead.no-data}}"
+        "no-data": "{{typeahead.no-data}}",
+        "title": "Scrobble Stopp",
+        "created-header": "{{manage-media-issues.created-header}}",
+        "delete-label": "{{common.remove}}",
+        "series-name-header": "{{manage-matched-metadata.series-name-header}}",
+        "description": "Det här är en användarhanterad lista över serier som inte kommer att scrobbla till externa leverantörer. Du kan ta bort en serie när som helst, och nästa scrobblingsbara händelse (läseframsteg, betyg, status 'vill läsa') kommer att utlösa scrobbling."
     },
     "theme-manager": {
         "download": "{{changelog.download}}",
@@ -95,20 +109,50 @@
         "delete": "{{common.delete}}",
         "drag-n-drop": "{{cover-image-chooser.drag-n-drop}}",
         "upload": "{{cover-image-chooser.upload}}",
-        "add": "{{common.add}}"
+        "add": "{{common.add}}",
+        "set-default": "Sätt standard",
+        "default-theme": "Standard",
+        "downloadable": "Nedladdningsbar",
+        "downloaded": "Nedladdade",
+        "active-theme": "Aktiv",
+        "site-themes": "Webbplatsens teman",
+        "scan-queued": "En genomsökning av webbplatsens teman har lagts i kö",
+        "preview-default-admin": "Välj ett tema först eller ladda upp ett manuellt",
+        "preview-default": "Välj ett tema först",
+        "title": "Temahanterare",
+        "description": "Kavita kommer i mina färger, hitta ett färgschema som passar dina behov eller skapa ett eget och dela det. Teman kan tillämpas på ditt konto eller på alla konton.",
+        "upload-continued": "en css-fil",
+        "preview-title": "Förhandsgranska",
+        "applied": "Tillämpat",
+        "updated-toastr": "Webbplatsens standardtema har uppdaterats till {{name}}"
     },
     "restriction-selector": {
-        "age-rating-label": "{{metadata-fields.age-rating-title}}"
+        "age-rating-label": "{{metadata-fields.age-rating-title}}",
+        "title": "Åldersgräns-begränsning",
+        "no-restriction": "Ingen begränsning",
+        "include-unknowns-tooltip": "Om aktiverat kommer okända åldersklassificeringar att tillåtas tillsammans med åldersbegränsning. Detta kan leda till att omärkt media blir tillgänglig för användare med åldersbegränsningar.",
+        "description": "När detta är valt kommer alla serier och läslistor som innehåller minst ett objekt som överstiger den valda åldersgränsen att tas bort från resultaten.",
+        "not-applicable-for-admins": "Detta gäller inte för administratörer.",
+        "include-unknowns-label": "Inkludera okända"
     },
     "site-theme-provider-pipe": {
-        "custom": "{{device-platform-pipe.custom}}"
+        "custom": "{{device-platform-pipe.custom}}",
+        "system": "System"
     },
     "manage-devices": {
         "add": "{{common.add}}",
         "delete": "{{common.delete}}",
         "edit": "{{common.edit}}",
         "no-data": "{{typeahead.no-data}}",
-        "actions-header": "{{manage-users.actions-header}}"
+        "actions-header": "{{manage-users.actions-header}}",
+        "title": "Enhetshanterare",
+        "platform-label": "Plattform",
+        "email-setup-alert": "Vill du skicka filer till dina enheter? Be din administratör att först konfigurera e-postinställningarna!",
+        "description": "Detta avsnitt är till för att du ska kunna konfigurera enheter som inte kan ansluta till Kavita via en webbläsare och istället har en e-postadress som tar emot filer.",
+        "name-label": "Namn",
+        "devices-title": "Enheter",
+        "no-devices": "Det finns inga enheter konfigurerade ännu",
+        "email-label": "Email"
     },
     "edit-device-modal": {
         "device-name-label": "{{manage-devices.name-label}}",
@@ -118,7 +162,10 @@
         "close": "{{common.close}}",
         "cancel": "{{common.cancel}}",
         "required-field": "{{validation.required-field}}",
-        "valid-email": "{{validation.valid-email}}"
+        "valid-email": "{{validation.valid-email}}",
+        "title": "Ändra Enhet",
+        "email-tooltip": "Denna e-postadress kommer att användas för att ta emot filen via \"Skicka till\"",
+        "device-platform-label": "Enhetsplattform"
     },
     "change-password": {
         "password-label": "{{common.password}}",
@@ -126,7 +173,12 @@
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
-        "required-field": "{{validation.required-field}}"
+        "required-field": "{{validation.required-field}}",
+        "permission-error": "Du har inte behörighet att ändra ditt lösenord. Kontakta serveradministratören.",
+        "current-password-label": "Nuvarande lösenord",
+        "new-password-label": "Nytt lösenord",
+        "passwords-must-match": "Lösenord måste matcha",
+        "confirm-password-label": "Bekräfta lösenord"
     },
     "change-email": {
         "required-field": "{{validation.required-field}}",
@@ -134,35 +186,84 @@
         "reset": "{{common.reset}}",
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "has-invalid-email": "Det verkar som att du inte har en giltig e-postadress angiven. För att ändra e-post krävs det att administratören skickar en länk till dig för att slutföra denna åtgärd.",
+        "invite-url-tooltip": "Kopiera detta och klistra in det i en ny flik",
+        "invite-url-label": "Inbjudnings-URL",
+        "email-title": "Email",
+        "email-confirmed": "Denna e-postadress är bekräftad",
+        "email-label": "Nytt mail",
+        "current-password-label": "Nuvarande lösenord",
+        "email-not-confirmed": "Denna e-postadress är inte bekräftad",
+        "email-updated-title": "E-postadress uppdaterad",
+        "setup-user-account": "Konfigurera användarens konto",
+        "email-updated-description": "Du kan använda länken nedan för att bekräfta e-postadressen för ditt konto. Om e-postinställningarna har konfigurerats kommer ett e-postmeddelande att ha skickats, och länken kan användas för att bekräfta e-postadressen.",
+        "permission-error": "Du har inte behörighet att ändra din e-postadress. Kontakta serveradministratören."
     },
     "change-age-restriction": {
         "reset": "{{common.reset}}",
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "unknowns": "Okända",
+        "age-restriction-label": "Åldersbegränsning"
     },
     "scrobbling-providers": {
-        "instructions": "First time users should click on \"{{scrobbling-providers.generate}}\" below to allow Kavita+ to talk with {{service}}. Once you authorize the program, copy and paste the token in the input below. You can regenerate your token at any time.",
+        "instructions": "Nya användare bör klicka på \"{{scrobbling-providers.generate}}\" nedan för att tillåta Kavita+ att prata med {{service}}. Efter att du gett programmet åtkomst, kopiera och klistra in token i rutan nedanför. Du kan generera nytt token när som helst.",
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
-        "loading": "{{common.loading}}"
+        "loading": "{{common.loading}}",
+        "mal-token-input-label": "MAL-klient-ID",
+        "mal-username-input-label": "MAL-användarnamn",
+        "anilist-first-now": "Nu",
+        "scrobbling-applicable-label": "Scrobbling tillämplig",
+        "token-input-label": "{{service}}-tokenen anges här",
+        "anilist-first-description": "Din AniList-token är nu konfigurerad. Denna token är giltig i ett år och Kavita kommer att informera dig innan den går ut så att du kan förnya den här. Med detta kommer Kavita att skapa scrobble-händelser (synkronisering) baserat på din läshistorik, \"vill läsa\"-status och betyg. Du kan starta detta nu eller senare. \nOm du har serier som du inte vill ska scrobblas, välj 'Senare' och sätt en scrobble-spärr på dem. \nDu behöver bara köra denna uppgift en gång – därefter sköter Kavita synkroniseringen automatiskt åt dig.
          Om du väljer 'Senare', hittar du knappen på sidan för 'Scrobbling'.",
+        "title": "Scrobbling-leverantörer",
+        "requires": "Denna funktion kräver en aktiv {{product}}-licens",
+        "token-valid": "Token giltig",
+        "token-expired": "Token har löpt ut",
+        "no-token-set": "Ingen token angiven",
+        "generic-instructions": "Fyll i information om olika externa tjänster du har för att tillåta Kavita+ att interagera med dem.",
+        "mal-instructions": "Kavita använder ett MAL Client ID för autentisering. Skapa en ny klient för Kavita och, när den har godkänts, ange klient-ID:t och ditt användarnamn.",
+        "anilist-used-for": "AniList används för scrobbling (synkronisering av data) och synkronisering av \"vill läsa\"-status.",
+        "mal-used-for": "MyAnimeList används för smarta samlingar och synkronisering av \"vill läsa\"-status.",
+        "anilist-first-header": "AniList-token sparad",
+        "anilist-first-later": "Senare",
+        "token-set": "Token angiven",
+        "generate": "Generera"
     },
     "typeahead": {
         "close": "{{common.close}}",
-        "loading": "{{common.loading}}"
+        "loading": "{{common.loading}}",
+        "add-item": "Lägg till {{item}}…",
+        "no-data": "{{common.no-data}}",
+        "locked-field": "Fältet är låst",
+        "add-custom-item": ", skriv för att lägga till ett anpassat objekt"
     },
     "generic-list-modal": {
         "close": "{{common.close}}",
         "clear": "{{common.clear}}",
-        "filter": "{{common.filter}}"
+        "filter": "{{common.filter}}",
+        "open-filtered-search": "Öppna en filtrerad sökning för {{item}}"
     },
     "user-stats-info-cards": {
         "total-pages-read-tooltip": "{{user-stats-info-cards.total-pages-read-label}}: {{value}}",
         "total-words-read-tooltip": "{{user-stats-info-cards.total-words-read-label}}: {{value}}",
         "time-spent-reading-tooltip": "{{user-stats-info-cards.time-spent-reading-label}}: {{value}}",
-        "chapters-read-tooltip": "{{user-stats-info-cards.chapters-read-label}}: {{value}}"
+        "chapters-read-tooltip": "{{user-stats-info-cards.chapters-read-label}}: {{value}}",
+        "last-active-label": "Senast aktiv",
+        "chapters": "{{value}} kapitel",
+        "chapters-read-label": "Lästa kapitel",
+        "words-count": "{{num}} ord",
+        "pages-count": "{{num}} sidor",
+        "total-pages-read-label": "Totalt antal lästa sidor",
+        "total-words-read-label": "Totalt antal lästa ord",
+        "time-spent-reading-label": "Tid spenderad på läsning",
+        "avg-reading-per-week-label": "Genomsnittlig läsning / vecka",
+        "pages-read-by-year-title": "Lästa sidor per år",
+        "words-read-by-year-title": "Lästa ord per år"
     },
     "top-readers": {
         "this-week": "{{time-periods.this-week}}",
@@ -170,16 +271,29 @@
         "last-30-days": "{{time-periods.last-30-days}}",
         "last-90-days": "{{time-periods.last-90-days}}",
         "last-year": "{{time-periods.last-year}}",
-        "all-time": "{{time-periods.all-time}}"
+        "all-time": "{{time-periods.all-time}}",
+        "title": "Toppläsare",
+        "time-selection-label": "Tidsperiod",
+        "comics-label": "Serier: {{value}} tim",
+        "manga-label": "Manga: {{value}} tim",
+        "books-label": "Böcker: {{value}} tim"
     },
     "role-selector": {
         "deselect-all": "{{common.deselect-all}}",
-        "select-all": "{{common.select-all}}"
+        "select-all": "{{common.select-all}}",
+        "title": "Roller"
     },
     "directory-picker": {
         "close": "{{common.close}}",
         "cancel": "{{common.cancel}}",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "type-header": "Typ",
+        "name-header": "Namn",
+        "title": "Välj en mapp",
+        "path-label": "Sökväg",
+        "share": "Dela",
+        "path-placeholder": "Börja skriva eller välj sökväg",
+        "instructions": "Välj en mapp för att öppna den. Ser du ingen mapp? Försök / först."
     },
     "library-access-modal": {
         "select-all": "{{common.select-all}}",
@@ -187,32 +301,59 @@
         "close": "{{common.close}}",
         "reset": "{{common.reset}}",
         "cancel": "{{common.cancel}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "no-data": "Det finns inga bibliotek konfigurerat ännu.",
+        "title": "Bibliotek-åtkomst"
     },
     "person-role-pipe": {
         "team": "{{filter-field-pipe.team}}",
-        "location": "{{filter-field-pipe.location}}"
+        "location": "{{filter-field-pipe.location}}",
+        "artist": "Artist",
+        "character": "Karaktär",
+        "colorist": "Färgspecialist",
+        "cover-artist": "{{artist}}",
+        "editor": "Redigerare",
+        "inker": "Inker",
+        "imprint": "Avtryck",
+        "publisher": "Utgivare",
+        "writer": "Författare",
+        "translator": "Översättare",
+        "penciller": "Penntecknare",
+        "other": "Annat",
+        "letterer": "Textare"
     },
     "reset-password": {
         "email-label": "{{common.email}}",
         "required-field": "{{validation.required-field}}",
         "valid-email": "{{validation.valid-email}}",
-        "submit": "{{common.submit}}"
+        "submit": "{{common.submit}}",
+        "description": "Ange e-postadressen för ditt konto. Kavita kommer att skicka ett e-postmeddelande om en giltig adress finns registrerad, annars be administratören att återställa ditt lösenord.",
+        "title": "Lösenordsåterställning"
     },
     "reset-password-modal": {
         "close": "{{common.close}}",
         "cancel": "{{common.cancel}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "title": "Återställ {{username}}'s lösenord",
+        "new-password-label": "Nytt lösenord",
+        "error-label": "Error: "
     },
     "all-series": {
-        "series-count": "{{common.series-count}}"
+        "series-count": "{{common.series-count}}",
+        "title": "Alla serier"
     },
     "all-filters": {
         "count": "{{count}} {{customize-dashboard-modal.title-smart-filters}}",
-        "create": "{{common.create}}"
+        "create": "{{common.create}}",
+        "title": "Alla smarta-filter"
     },
     "out-of-date-modal": {
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "description-3": "Om det finns en specifik anledning till att du ännu inte har uppdaterat, vill vi gärna veta vad som håller dig kvar på en äldre version! Titta gärna in på vår Discord och berätta vad som hindrar dig från att uppgradera.",
+        "description-2": "Ta en titt på våran wiki för instruktioner om hur du uppdaterar.",
+        "title": "Hamna inte efter!",
+        "subtitle": "Det verkar som att din installation är mer än {{count}} versioner efter!",
+        "description-1": "Överväg att uppgradera så att du kör den senaste versionen av Kavita."
     },
     "invite-user": {
         "close": "{{common.close}}",
@@ -220,11 +361,22 @@
         "required-field": "{{common.required-field}}",
         "cancel": "{{common.cancel}}",
         "email-not-sent": "{{toasts.email-not-sent}}",
-        "notice": "{{manage-settings.notice}}"
+        "notice": "{{manage-settings.notice}}",
+        "invite-url-label": "Inbjudnings-URL",
+        "description": "Bjud in en användare till din server genom att ange deras e-postadress. De kommer att få ett e-postmeddelande för att skapa ett konto. För att detta ska fungera måste fälten för värdnamn och e-post vara ifyllda under fliken E-post. Annars kommer en länk att visas för att du själv ska kunna slutföra inställningen åt användaren.

          E-postadressen behöver inte vara giltig.",
+        "setup-user-description": "Du kan använda länken nedan för att ställa in kontot åt din användare, eller använda kopieringsknappen. Du kan behöva logga ut innan du använder länken för att registrera en ny användare.",
+        "setup-user-account": "Ställ in användarens konto",
+        "title": "Bjud in användare",
+        "invite": "Bjud in",
+        "setup-user-title": "Användare inbjuden",
+        "inviting": "Bjuder in…",
+        "setup-user-account-tooltip": "Kopiera detta och klistra in det i en ny flik. Du kan behöva logga ut."
     },
     "library-selector": {
         "select-all": "{{common.select-all}}",
-        "deselect-all": "{{common.deselect-all}}"
+        "deselect-all": "{{common.deselect-all}}",
+        "title": "Bibliotek",
+        "no-data": "Det finns inga bibliotek konfigurerade ännu."
     },
     "license": {
         "cancel": "{{common.cancel}}",
@@ -232,16 +384,83 @@
         "loading": "{{common.loading}}",
         "activate-email-label": "{{common.email}}",
         "activate-delete": "{{common.delete}}",
-        "activate-reset": "{{common.reset}}",
-        "activate-save": "{{common.save}}"
+        "activate-reset": "Återställ licens",
+        "activate-save": "{{common.save}}",
+        "license-active-label": "Licens-aktiv",
+        "supported-version-label": "På stödd Kavita-version",
+        "expiration-label": "Upphör",
+        "check": "Kontrollera",
+        "license-valid": "Licensen är giltig",
+        "valid-tooltip": "Giltig",
+        "invalid-tooltip": "Ogiltig",
+        "delete-tooltip": "Detta kommer att ta bort licensen från Kavita för att stoppa Kavita från att kommunicera med Kavita+. Det avslutar inte din prenumeration. Använd 'hantera' först för att avbryta prenumerationen.",
+        "manage-tooltip": "Uppdatera betalningsinformation, avbryt/pausa prenumeration, etc",
+        "activate-discordId-label": "Discord Användar-Id",
+        "activate-reset-tooltip": "Ogiltigförklara en tidigare registrering med din licens. Kräver både licensnyckel och e-postadress",
+        "title": "Kavita+ Licens",
+        "manage": "Hantera",
+        "buy": "Köp",
+        "activate": "Aktivera",
+        "renew": "Förnya",
+        "reset-label": "Återställ",
+        "invalid-license-tooltip": "Om din prenumeration har löpt ut måste du skicka ett e-postmeddelande till supporten för att skapa en ny prenumeration",
+        "k+-unlocked-description": "Välkommen till Kavita+! Kavita kommer att generera scrobble-händelser utifrån din läsprogress, betyg och önskelista när du registrerar dina scrobbling-leverantörer under ditt konto. Ta dig tid att säkerställa att du placerar scrobbling-holds för de serier du inte vill scrobble.",
+        "activate-discordId-tooltip": "Länka ditt Discord-konto med Kavita+. Detta tillåter dig att komma åt dolda kanaler som hjälper till att forma Kavita.",
+        "help-label": "{{common.help}}",
+        "license-mismatch": "Licensen kan vara registrerad på en annan Kavita-instans. Återregistrera för att åtgärda.",
+        "discord-validation": "Detta är inte ett giltigt Discord Användar-Id. Ditt Användar-Id är inte ditt Discrod användarnamn.",
+        "info-title": "Licens-info",
+        "actions-title": "Åtgärder",
+        "reset-tooltip": "Detta kommer att återställa serverinstansen som Kavita+ licens är kopplad till. Kräver e-postadress och licensnyckel",
+        "delete-label": "Ta bort licens",
+        "faq-title": "FAQ",
+        "total-subbed-months-label": "Totalt antal månader prenumererad",
+        "email-label": "Registrerad epostadress",
+        "license-not-valid": "Licensen är inte giltig",
+        "activate-description": "Ange licensnyckeln och e-postadressen som användes för att registrera dig hos Stripe",
+        "activate-license-label": "Licensnyckel",
+        "k+-license-overwrite": "Licensen är registrerad på en annan Kavita-instans. Detta kan hända vid ominstallation och sällan på grund av systemuppdateringar. Välj 'skriv över' för att tvinga denna instans att registrera sig med Kavita+.",
+        "overwrite": "Skriv över",
+        "k+-unlocked": "Kavita+ upplåst!",
+        "kavita+-desc-part-2": "premium förmåner",
+        "kavita+-desc-part-1": "Kavita+ är en premium prenumerationstjänst som låser upp funktioner för alla användare på denna Kavita-instans. Köp en prenumeration för att låsa upp ",
+        "kavita+-desc-part-3": "idag!",
+        "kavita+-requirement": "Kavita+ är utformat för att fungera endast med de senaste tre versionerna. Allt utanför detta kan riskera att inte fungera.",
+        "no-license-key": "Ingen licens-nyckel",
+        "k+-already-registered-header": "Licens redan registrerad"
     },
     "book-line-overlay": {
         "close": "{{common.close}}",
         "required-field": "{{common.required-field}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "bookmark-label": "Bokmärkesnamn",
+        "copy": "Kopiera",
+        "bookmark": "Bokmärk"
     },
     "book-reader": {
-        "bookmarks-header": "{{side-nav.bookmarks}}"
+        "bookmarks-header": "{{side-nav.bookmarks}}",
+        "go-back": "Gå tillbaka",
+        "previous": "Förra",
+        "incognito-mode-label": "Inkognitoläge",
+        "next": "Nästa",
+        "next-chapter": "Nästa Kapitel/Volym",
+        "close-reader": "Stäng Läsare",
+        "go-to-page": "Gå till sida",
+        "go-to-last-page": "Gå till sista sidan",
+        "prev-chapter": "Förra Kapitel/Volym",
+        "page-label": "Sida",
+        "pagination-header": "Sektion",
+        "next-page": "Nästa sida",
+        "settings-header": "Inställningar",
+        "go-to-page-prompt": "Det finns {{totalPages}} sidor. Vilken sida vill du gå till?",
+        "prev-page": "Förra sidan",
+        "skip-header": "Skippa till huvudinnehållet",
+        "virtual-pages": "Virtuella sidor",
+        "toc-header": "Innehållsförteckning",
+        "incognito-mode-alt": "Inkognitoläge är aktiverat. Växla för att stänga av det.",
+        "loading-book": "Laddar bok…",
+        "title": "Bokinställning",
+        "table-of-contents-header": "Innehållsförteckning"
     },
     "confirm-email": {
         "username-label": "{{common.username}}",
@@ -249,13 +468,19 @@
         "email-label": "{{common.email}}",
         "required-field": "{{common.required-field}}",
         "valid-email": "{{common.valid-email}}",
-        "password-validation": "{{validation.password-validation}}"
+        "password-validation": "{{validation.password-validation}}",
+        "description": "Fyll i formuläret för att slutföra din registrering",
+        "error-label": "Error:",
+        "title": "Registrera",
+        "register": "Registrera"
     },
     "confirm-reset-password": {
         "password-label": "{{common.password}}",
         "required-field": "{{validation.required-field}}",
         "submit": "{{common.submit}}",
-        "password-validation": "{{validation.password-validation}}"
+        "password-validation": "{{validation.password-validation}}",
+        "title": "Lösenordsåterställning",
+        "description": "Skriv in nytt lösenord"
     },
     "register": {
         "username-label": "{{common.username}}",
@@ -263,7 +488,11 @@
         "password-label": "{{common.password}}",
         "required-field": "{{validation.required-field}}",
         "valid-email": "{{validation.valid-email}}",
-        "password-validation": "{{validation.password-validation}}"
+        "password-validation": "{{validation.password-validation}}",
+        "description": "Fyll i formuläret för att registrera ett administratörskonto",
+        "register": "Registrera",
+        "title": "Registrera",
+        "email-tooltip": "E-postadressen behöver inte vara en giltig adress, men den ger åtkomst till glömt lösenord. Den skickas inte utanför servern om inte Kavita skickar ett e-postmeddelande till dig."
     },
     "series-detail": {
         "close": "{{common.close}}",
@@ -300,25 +529,87 @@
         "volume-num": "{{common.volume-num}}",
         "reading-lists-title": "{{side-nav.reading-lists}}",
         "time-to-read-alt": "{{sort-field-pipe.time-to-read}}",
-        "scrobbling-tooltip": "{{settings.scrobbling}}"
+        "scrobbling-tooltip": "{{settings.scrobbling}}: {{value}}",
+        "release-date-title": "Släppt",
+        "time-left-alt": "Tid kvar",
+        "send-to": "Fil mailad till {{deviceName}}",
+        "weblinks-title": "Länkar",
+        "edit-series-alt": "Ändra information",
+        "on": "{{reader-settings.on}}",
+        "off": "{{reader-settings.off}}",
+        "read-options-alt": "Läsinställningar",
+        "cover-change": "Det kan ta upp till en minut för att din webbläsare ska uppdatera bilden. Under tiden kan den gamla bilden visas på vissa sidor.",
+        "layout-mode-option-list": "Lista",
+        "read-incognito": "Läs inkognito",
+        "continue-incognito": "Fortsätt inkognito",
+        "incognito": "Inkognito",
+        "continue-from": "Fortsätt {{title}}",
+        "more-alt": "Mer",
+        "publication-status-title": "Publikation",
+        "publication-status-tooltip": "Publikationsstatus",
+        "pages-count": "{{num}} Sidor",
+        "page-settings-title": "Sidinställningar",
+        "layout-mode-option-card": "Kort",
+        "continue": "Fortsätt",
+        "no-chapters": "Det finns inga kapitel i denna volym. Kan inte läsa.",
+        "words-count": "{{num}} Ord"
     },
     "metadata-fields": {
         "collections-title": "{{side-nav.collections}}",
-        "reading-lists-title": "{{side-nav.reading-lists}}"
+        "reading-lists-title": "{{side-nav.reading-lists}}",
+        "teams-title": "Team",
+        "locations-title": "Platser",
+        "language-title": "Språk",
+        "age-rating-title": "Åldersgräns",
+        "links-title": "Webblänkar",
+        "genres-title": "Genrer",
+        "translators-title": "Översättare",
+        "tags-title": "Taggar",
+        "writers-title": "Författare",
+        "publishers-title": "Förläggare",
+        "pencillers-title": "Tecknare",
+        "imprints-title": "Underförlag",
+        "cover-artists-title": "Artister",
+        "characters-title": "Karaktärer",
+        "editors-title": "Redaktörer",
+        "colorists-title": "Färgläggare",
+        "letterers-title": "Bokstavsättare",
+        "inkers-title": "Inkers"
     },
     "external-rating": {
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "kavita-tooltip": "Ditt betyg + Sammanlagt",
+        "kavita-rating-title": "Ditt betyg",
+        "entry-label": "Se detaljer"
     },
     "update-notification-modal": {
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "title": "Ny Uppdatering Tillgänglig!",
+        "help": "Hur du uppdaterar",
+        "download": "Ladda ner"
     },
     "side-nav-companion-bar": {
-        "page-settings-title": "{{series-detail.page-settings-title}}"
+        "page-settings-title": "{{series-detail.page-settings-title}}",
+        "filter-and-sort-alt": "Sortera / Filtrera",
+        "open-filter-and-sort": "Öppna Filtrering och Sortering",
+        "close-filter-and-sort": "Stäng Filtrering och Sortering"
     },
     "side-nav": {
         "filter-label": "{{common.filter}}",
         "clear": "{{common.clear}}",
-        "customize": "{{settings.customize}}"
+        "customize": "{{settings.customize}}",
+        "bookmarks": "Bokmärken",
+        "back": "Bakåt",
+        "more": "Mer",
+        "cancel-edit": "Stäng omordning",
+        "edit": "{{common.edit}}",
+        "collections": "Samlingar",
+        "reading-lists": "Läslistor",
+        "donate-tooltip": "Du kan ta bort detta genom att prenumerera på Kavita+",
+        "home": "Hem",
+        "all-series": "Alla Serier",
+        "want-to-read": "Vill läsa",
+        "donate": "Donera"
     },
     "library-settings-modal": {
         "close": "{{common.close}}",
@@ -331,7 +622,47 @@
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
         "required-field": "{{validation.required-field}}",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "edit-title": "Ändra {{name}}",
+        "name-label": "Namn",
+        "last-scanned-label": "Senast Skannad:",
+        "type-tooltip": "Bibliotekstypen avgör hur filnamn tolkas och om användargränssnittet visar Kapitlar (Manga) eller Nummer (Serier). Kolla wiki-sidan för mer information om skillnaderna mellan bibliotekstyperna.",
+        "naming-conventions-part-3": "Kolla denna länk för att säkerställa att du följer rätt riktlinjer, annars kanske inte filer visas vid genomsökning.",
+        "manage-reading-list-tooltip": "Ska Kavita skapa läslistor från StoryArc/StoryArcNumber och AlternativeSeries/AlternativeCount-taggar som finns i ComicInfo.xml/opf-filer?",
+        "force-scan-tooltip": "Detta kommer att tvinga en genomsökning av biblioteket, som om det vore en ny skanning",
+        "type-label": "Typ",
+        "naming-conventions-part-1": "Kavita har ",
+        "folder-watching-tooltip": "Åsidosätt serverns mappövervakning för detta bibliotek. Om avstängt kommer mappövervakning inte att köras på de mappar som detta bibliotek innehåller. Om bibliotek delar mappar kan de ändå genomsökas. Skanning kommer alltid att vänta 10 minuter innan den triggas.",
+        "add-title": "Lägg till Bibliotek",
+        "folder-description": "Lägg till mappar till ditt bibliotek",
+        "browse": "Bläddra efter Mediamappar",
+        "file-type-group-label": "Filtyper",
+        "manage-reading-list-label": "Hantera läslistor",
+        "manage-collection-label": "Hantera Samlingar",
+        "help-us-part-2": "vår guide",
+        "exclude-patterns-tooltip": "Konfigurera ett mönsteruppsättning (Global-syntax) som Kavita kommer att matcha när den genomsöker kataloger och utesluta från skanningsresultaten.",
+        "next": "Nästa",
+        "help-us-part-1": "Hjälp oss genom att följa ",
+        "naming-conventions-part-2": "mapp-krav.",
+        "manage-collection-tooltip": "Ska Kavita skapa samlingar från SeriesGroup-taggar som finns i ComicInfo.xml/opf-filer?",
+        "library-name-unique": "Biblioteksnamn måste vara unika",
+        "kavitaplus-eligible-tooltip": "Stöder Kavita+ metadatafunktioner eller Scrobbling",
+        "allow-scrobbling-label": "Tillåt Scrobbling",
+        "cover-description": "Anpassade biblioteksbilder och ikoner är valfria",
+        "cover-description-extra": "Biblioteksbilden bör inte vara för stor. Sikta på en liten fil, 32x32 pixlar i storlek. Kavita utför ingen validering av storleken.",
+        "allow-metadata-matching-tooltip": "Ska Kavita ladda ner metadata för Serier inom detta bibliotek? Detta kommer endast att ske om servern har en aktiv Kavita+ prenumeration.",
+        "file-type-group-tooltip": "Vilka filtyper ska Kavita genomsöka? Till exempel, 'Arkiv' kommer att inkludera alla cb*, zip, rar, etc. filer.",
+        "exclude-patterns-label": "Exkludera Mönster",
+        "kavitaplus-eligible-label": "Kavita+ berättigad",
+        "allow-metadata-matching-label": "Tillåt Metadata Matchning",
+        "allow-scrobbling-tooltip": "Ska Kavita scrobbla läshändelser, 'vill läsa'-status, betyg och recensioner till konfigurerade leverantörer? Detta kommer endast att ske om servern har en aktiv Kavita+ prenumeration.",
+        "include-in-search-label": "Inkludera i Sök",
+        "include-in-search-tooltip": "Ska serier och all härledd information (genrer, personer, filer) från biblioteket inkluderas i sökresultaten?",
+        "include-in-dashboard-tooltip": "Ska serier från biblioteket inkluderas på instrumentpanelen? Detta påverkar alla flöden, som 'På Hyllan', 'Nyligen Uppdaterad', 'Nyligen Tillagd' eller andra anpassade tillägg.",
+        "folder-watching-label": "Mapp-bevakning",
+        "include-in-dashboard-label": "Inkludera i instrumentpanelen",
+        "force-scan": "Tvinga Skanning",
+        "help-us-part-3": "för att namnge och organisera din media."
     },
     "reader-settings": {
         "font-family-label": "{{user-preferences.font-family-label}}",
@@ -341,14 +672,50 @@
         "reading-direction-label": "{{user-preferences.reading-direction-book-label}}",
         "writing-style-label": "{{user-preferences.writing-style-label}}",
         "immersive-mode-label": "{{user-preferences.immersive-mode-label}}",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}"
+        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "tap-to-paginate-label": "Peka Sidorisering",
+        "enter": "Enter",
+        "horizontal": "Horisontellt",
+        "vertical": "Vertikalt",
+        "immersive-mode-tooltip": "Detta kommer att dölja menyn bakom ett klick på läsardokumentet och aktivera 'peka för sidorisering'",
+        "layout-mode-tooltip": "Rulla: Speglar epub-filen (vanligtvis en lång rullande sida per kapitel).
          1 Kolumn: Skapar en virtuell sida åt gången.
          2 Kolumner: Skapar två virtuella sidor åt gången, sida vid sida.",
+        "tap-to-paginate-tooltip": "Klicka på kanten av skärmen för sidorisering",
+        "writing-style-tooltip": "Ändrar textens riktning. Horisontell är vänster till höger, vertikal är uppifrån och ner.",
+        "reader-settings-title": "Läsar-inställningar",
+        "right-to-left": "Höger till Vänster",
+        "general-settings-title": "Generella Inställningar",
+        "fullscreen-label": "Fullskärm",
+        "left-to-right": "Vänster till Höger",
+        "on": "På",
+        "exit": "Exit",
+        "off": "Av",
+        "theme-dark": "Mörk",
+        "layout-mode-option-2col": "2 Kolumner",
+        "color-theme-title": "Färgtema",
+        "theme-black": "Svart",
+        "theme-white": "Vit",
+        "theme-paper": "Papper",
+        "layout-mode-option-scroll": "Rulla",
+        "reset-to-defaults": "Återställ till standardinställningar",
+        "fullscreen-tooltip": "Sätt läsaren i helskärmsläge",
+        "layout-mode-option-1col": "1 Kolumn"
     },
     "bookmarks": {
         "title": "{{side-nav.bookmarks}}",
-        "series-count": "{{common.series-count}}"
+        "series-count": "{{common.series-count}}",
+        "delete-single-success": "{{seriesName}}'s bokmärken har tagits bort",
+        "no-data": "Det finns inga bokmärken. Prova skapa en",
+        "confirm-delete": "Är du säker på att du vill rensa alla bokmärken för flera serier? Detta kan inte ångras.",
+        "confirm-single-delete": "Är du säker på att du vill rensa alla bokmärken för {{seriesName}}? Detta kan inte ångras.",
+        "no-data-2": "en.",
+        "delete-success": "Bokmärken har tagits bort"
     },
     "bulk-operations": {
-        "deselect-all": "{{common.deselect-all}}"
+        "deselect-all": "{{common.deselect-all}}",
+        "items-selected": "{{num}} valda objekt",
+        "title": "Massåtgärder",
+        "mark-as-read": "Markera som Läst",
+        "mark-as-unread": "Markera som Oläst"
     },
     "details-tab": {
         "writers-title": "{{metadata-fields.writers-title}}",
@@ -366,21 +733,43 @@
         "imprints-title": "{{metadata-fields.imprints-title}}",
         "genres-title": "{{metadata-fields.genres-title}}",
         "tags-title": "{{metadata-fields.tags-title}}",
-        "weblinks-title": "{{tabs.weblink-tab}}"
+        "weblinks-title": "{{tabs.weblink-tab}}",
+        "read-time-title": "{{edit-chapter-modal.reading-time-label}}",
+        "release-title": "{{sort-field-pipe.release-year}}",
+        "length-title": "{{edit-chapter-modal.words-label}}",
+        "age-rating-title": "{{metadata-fields.age-rating-title}}",
+        "format-title": "{{metadata-filter.format-label}}",
+        "language-title": "{{edit-chapter-modal.language-label}}"
     },
     "related-tab": {
         "reading-lists-title": "{{reading-lists.title}}",
         "collections-title": "{{side-nav.collections}}",
-        "relations-title": "{{tabs.related-tab}}"
+        "relations-title": "{{tabs.related-tab}}",
+        "bookmarks-title": "{{side-nav.bookmarks}}"
     },
     "cover-image-chooser": {
         "reset": "{{common.reset}}",
         "apply": "{{common.apply}}",
-        "applied": "{{theme-manager.applied}}"
+        "applied": "{{theme-manager.applied}}",
+        "url-label": "URL",
+        "back": "Bakåt",
+        "enter-an-url-pre-title": "Skriv in en {{url}}",
+        "reset-cover-tooltip": "Återställ Omslagsbild",
+        "drag-n-drop": "Dra och släpp",
+        "image-num": "Bild {{num}}",
+        "upload": "Ladda upp",
+        "load": "Ladda",
+        "url": "URL",
+        "upload-continued": "en bild"
     },
     "edit-series-relation": {
         "remove": "{{common.remove}}",
-        "parent": "{{relationship-pipe.parent}}"
+        "parent": "{{relationship-pipe.parent}}",
+        "relationship": "Relation",
+        "add-relationship": "Lägg till Relation",
+        "description-part-1": "Är du osäker på vilken relation du ska lägga till? Se vår",
+        "description-part-2": "wiki för tips.",
+        "target-series": "Målserie"
     },
     "bulk-add-to-collection": {
         "promoted": "{{common.promoted}}",
@@ -388,20 +777,61 @@
         "filter-label": "{{common.filter}}",
         "clear": "{{common.clear}}",
         "loading": "{{common.loading}}",
-        "create": "{{common.create}}"
+        "create": "{{common.create}}",
+        "title": "Lägg till i Samling",
+        "no-data": "Inga samlingar skapat ännu",
+        "collection-label": "Samling"
     },
     "entity-title": {
         "issue-num": "{{common.issue-hash-num}}",
         "chapter": "{{common.chapter-num}}",
-        "book-num": "{{common.book-num-shorthand}}"
+        "book-num": "{{common.book-num-shorthand}}",
+        "single-volume": "Enkel Volym",
+        "special": "Special",
+        "vol-num": "{{user-scrobble-history.volume-num}}"
     },
     "manage-media-issues": {
-        "filter-label": "{{common.filter}}"
+        "filter-label": "{{common.filter}}",
+        "file-header": "Fil",
+        "no-data": "{{common.no-data}}",
+        "clear-alerts": "Rensa Varningar",
+        "description-part-1": "Denna tabell innehåller problem som upptäckts under genomsökning eller läsning av din media. Du kan rensa den när som helst och använda '(Tvinga) Skanna Bibliotek' för att utföra en analys. En lista över vanliga fel och vad de betyder kan hittas på ",
+        "description-part-2": "wiki.",
+        "created-header": "Skapad",
+        "comment-header": "Kommentar"
     },
     "manage-email-settings": {
         "reset": "{{common.reset}}",
         "reset-to-default": "{{common.reset-to-default}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "host-name-label": "Värdnamn",
+        "host-name-tooltip": "Domännamnet för din reverse proxy, som krävs för e-postfunktionalitet. Om du inte använder en reverse proxy kan du använda vilken URL som helst, inklusive http://externalip:port/",
+        "sender-address-label": "Avsändaradress",
+        "password-label": "Lösenord",
+        "enable-ssl-label": "Använd SSL på e-postservern",
+        "gmail-label": "Gmail",
+        "customized-templates-label": "Anpassade mallar",
+        "username-label": "Användarnamn",
+        "test": "Test",
+        "email-url-tooltip": "Använd den fullständiga URL:en för e-posttjänsten. Inkludera inte slutslashen.",
+        "send-to-warning": "Om du vill att 'Skicka till enhet' ska fungera måste du ställa in epostinställningar",
+        "description": "För att använda vissa funktioner i Kavita, som 'Skicka till enhet', måste en e-postleverantör vara inställd. Andra funktioner som 'Glömt Lösenord' kräver administratörsåtgärder utan e-postinställning.",
+        "setting-description": "Du måste fylla i både Värdnamn och SMTP-inställningar för att använda e-postbaserade funktioner inom Kavita.",
+        "test-warning": "Du måste ha giltiga inställningar innan du kan trycka på Test.",
+        "email-settings-title": "Epostinställningar",
+        "customized-templates-tooltip": "Ska Kavita använda katalogen config/templates för mallar istället för standardmallen? Du ansvarar för att hålla mallarna uppdaterade.",
+        "size-limit-label": "Storleksgräns",
+        "host-name-validation": "Värdnamnet måste börja med http(s) och inte sluta med /",
+        "sender-address-tooltip": "Detta är e-postadressen som mottagaren kommer att se när de tar emot e-postmeddelandet. Vanligtvis är det den e-postadress som är kopplad till kontot.",
+        "sender-displayname-label": "Visningsnamn",
+        "host-label": "Värd",
+        "sender-displayname-tooltip": "Namnet som mottagaren kommer se när de tar emot e-postmeddelandet",
+        "port-label": "Port",
+        "username-tooltip": "Användarnamnet som används för att autentisera mot värden",
+        "email-url-label": "Eposttjänst URL",
+        "size-limit-tooltip": "Hur många bytes kan e-postservern hantera i bilagor",
+        "outlook-label": "Outlook",
+        "host-tooltip": "Utgående/SMTP adress från din e-postserver"
     },
     "manage-library": {
         "loading": "{{common.loading}}",
@@ -410,18 +840,61 @@
         "deselect-all": "{{common.deselect-all}}",
         "select-all": "{{common.select-all}}",
         "cancel": "{{common.cancel}}",
-        "apply": "{{common.apply}}"
+        "apply": "{{common.apply}}",
+        "last-scanned-title": "Senast Skannad",
+        "include-type-label": "Inkludera kopiering av bibliotekstyp",
+        "folder-count": "{{num}} mappar",
+        "bulk-copy-to": "Välj vilket bibliotek att kopiera inställningar från {{libraryName}} till",
+        "include-type-tooltip": "Detta kommer inte att genomsökas automatiskt. Vid nästa genomsökning kan serier förskjutas på grund av skillnader i tolkning",
+        "edit-library-by-name": "Ta bort {{name}}",
+        "delete-library": "Ta bort bibliotek",
+        "bulk-action-label": "Massåtgärder",
+        "delete-library-by-name": "Ta bort {{name}}",
+        "shared-folders-title": "Mappar",
+        "add-library": "Lägg till bibliotek",
+        "scan-library": "Skanna Bibliotek",
+        "title": "Bibliotek",
+        "no-data": "Det finns inga bibliotek. Prova lägg till en.",
+        "type-title": "Typ",
+        "edit-library": "Ändra"
     },
     "copy-settings-from-library-modal": {
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "select-option": "Välj ett bibliotek",
+        "description": "Välj ett bibliotek att kopiera inställningar från och på nästa skärm välj de bibliotek som inställningarna ska appliceras på.",
+        "select": "Välj",
+        "title": "Kopiera inställningarna från ett bibliotek till flera andra"
     },
     "manage-media-settings": {
         "reset-to-default": "{{common.reset-to-default}}",
         "reset": "{{common.reset}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "encode-as-description-part-3": "Kan jag använda AVIF?",
+        "encode-as-description-part-1": "WebP/AVIF kan drastiskt minska utrymmeskraven för filer. WebP/AVIF stöds inte på alla webbläsare eller versioner. För att ta reda på om dessa inställningar är lämpliga för din installation, besök ",
+        "media-warning": "Du måste aktivera mediekonverteringsuppgiften i fliken 'Uppgifter' efter att du har sparat.",
+        "change": "Ändra",
+        "encode-as-label": "Spara Media Som",
+        "encode-as-warning": "Du kan inte konvertera tillbaka till PNG när du har gått över till WebP/AVIF. Du måste uppdatera omslagsbilderna på dina bibliotek för att regenerera alla omslag. Bokmärken och favicons kan inte konverteras.",
+        "encode-as-tooltip": "All media som Kavita hanterar (omslag, bokmärken, favicons) kommer bli omkodad till denna typ.",
+        "cover-image-size-tooltip": "Hur stora bör omslagsbilder genereras? Observera: Allt som är större än standard kommer att medföra längre laddningstider på sidan.",
+        "bookmark-dir-label": "Bokmärkeskatalog",
+        "bookmark-dir-tooltip": "Plats där bokmärken kommer att lagras. Bokmärken är källfiler och kan vara stora. Välj en plats med tillräckligt med lagring. Katalogen hanteras; andra filer inom katalogen kommer att raderas. Om du använder Docker, montera en extra volym och använd den.",
+        "encode-as-description-part-2": "Kan jag använda WebP?",
+        "media-issue-title": "Medieproblem",
+        "scrobble-issue-title": "Scrobble Nummer",
+        "cover-image-size-label": "Omslagsbildsstorlek"
     },
     "manage-scrobble-errors": {
-        "filter-label": "{{common.filter}}"
+        "filter-label": "{{common.filter}}",
+        "title": "Scrobble-problem",
+        "comment-header": "Kommentar",
+        "description": "Denna tabell innehåller problem som har uppstått under scrobbling. Du kan rensa den när som helst och vänta på nästa scrobble-uppladdning för att se. Om det finns en okänd serie är det bäst att korrigera serienamnet eller det lokaliserade serienamnet, eller att lägga till en webblänk för leverantörerna.",
+        "series-header": "Serier",
+        "clear-errors": "Rensa Errors",
+        "created-header": "Skapad",
+        "edit-item-alt": "Ändra {{seriesName}}",
+        "edit-header": "Ändra",
+        "no-data": "Inga problem"
     },
     "manage-settings": {
         "host-name-label": "{{manage-email-settings.host-name-label}}",
@@ -430,16 +903,135 @@
         "reset-to-default": "{{common.reset-to-default}}",
         "reset": "{{common.reset}}",
         "save": "{{common.save}}",
-        "field-required": "{{validation.field-required}}"
+        "field-required": "{{validation.field-required}}",
+        "system-settings-title": "System",
+        "ip-address-label": "IP Adresser",
+        "ip-address-tooltip": "Komma-separerad lista av IP-adresser som servern lyssnar på. Dessa är fasta om du kör på Docker. Ändringar kräver omstart.",
+        "log-tooltip": "Antal loggar att lagra. Standard är 30, minimum är 1, maximum är 30.",
+        "min-days-validation": "Måste vara minst 1 dag",
+        "min-cache-validation": "Måste vara 50 MB.",
+        "max-backup-validation": "Du kan inte lagra mer än {{num}} backuper",
+        "logging-level-label": "Loggnivå",
+        "on-deck-last-progress-tooltip": "Antal dagar sedan senaste framsteg innan något tas bort från hyllan.",
+        "allow-stats-label": "Tillåt anonym användningsinsamling",
+        "opds-label": "OPDS",
+        "opds-tooltip": "OPDS-stöd tillåter användare att använda OPDS att läsa och ladda ner innehåll från servern.",
+        "enable-opds": "Aktivera OPDS",
+        "log-label": "Dagar av loggar",
+        "customization-settings-title": "Anpassning",
+        "on-deck-last-chapter-add-label": "Senaste kapitlet tillagt på Hyllan (dagar)",
+        "on-deck-last-chapter-add-tooltip": "Antal dagar sedan det senaste kapitlet lades till för att inkludera något på Hyllan.",
+        "enable-folder-watching": "Aktivera Mappövervakning",
+        "cache-size-validation": "Du behöver minst 50 MB.",
+        "backup-label": "Dagar av Backuper",
+        "backup-tooltip": "Antal backuper att lagra. Standard är 30, minimum är 1, maximum är 30.",
+        "on-deck-last-progress-label": "Senaste framsteg på hyllan (dagar)",
+        "send-data": "Skicka data",
+        "folder-watching-tooltip": "Tillåter Kavita att övervaka biblioteksmappar för att upptäcka ändringar och initiera skanning av dessa ändringar. Detta gör det möjligt att uppdatera innehåll utan att manuellt initiera skanningar eller vänta på nattliga skanningar. Kommer alltid att vänta 10 minuter innan en skanning utlöses.",
+        "base-url-validation": "Bas-URL måste starta och sluta med /",
+        "logging-level-tooltip": "Använd debug för att hjälpa till att identifiera problem. Debug kan ta upp mycket diskutrymme.",
+        "folder-watching-label": "Mappövervakning",
+        "cache-size-tooltip": "Mängden minne som tillåts för cachelagring av tunga API:er. Standardvärdet är 75 MB.",
+        "max-logs-validation": "Du kan inte ha mer än {{num}} loggar",
+        "port-tooltip": "Port som servern lyssnar på. Dessa är fasta om du kör på Docker. Ändringar kräver omstart.",
+        "allow-stats-tooltip-part-1": "Skicka anonym användningsdata till Kavita's servrar. Detta inkluderar information om vissa använda funktioner, antal filer, OS-version, Kavita-installationsversion, CPU och minne. Vi kommer att använda denna information för att prioritera funktioner, buggfixar och prestandaoptimering. Kräver omstart för att träda i kraft. Se ",
+        "base-url-label": "Bas-URL",
+        "restart-required": "Ändra Port, Bas URL, Cache Storlek eller IP's kräver manuell omstart av Kavita för att ha effekt.",
+        "min-logs-validation": "Du måste ha minst 1 logg",
+        "min-backup-validation": "Du måste lagra minst 1 backup",
+        "ip-address-validation": "IP adresser kan bara innehålla giltiga IPv4 eller IPv6 adresser",
+        "base-url-tooltip": "Använd detta om du vill hosta Kavita på en bas-URL, t.ex. yourdomain.com/kavita. Stöder inte Docker med en icke-root användare.",
+        "port-label": "Port",
+        "cache-size-label": "Cache-storlek",
+        "networking-settings-title": "Nätverk",
+        "notice": "Meddelande:",
+        "allow-stats-tooltip-part-2": "för vad som samlas."
     },
     "manage-tasks-settings": {
         "reset-to-default": "{{common.reset-to-default}}",
         "reset": "{{common.reset}}",
         "save": "{{common.save}}",
-        "required": "{{validation.required-field}}"
+        "required": "{{validation.required-field}}",
+        "library-database-backup-tooltip": "Hur ofta Kavita tar backup av databasen och relaterade filer.",
+        "bust-locale-task-desc": "Rensar Språk Cache. Detta kan fixa problem med stringar som inte dyker upp korrekt efter en uppdatering. Du behöver uppdatera webläsaren.",
+        "title": "Återkommande Uppgifter",
+        "library-scan-label": "Biblioteksskanning",
+        "library-database-backup-label": "Kavita Backup",
+        "cleanup-label": "Rensa",
+        "cleanup-tooltip": "Hur ofta Kavita kör Rensning. Detta brukar vara tungt och bör oftast köras på natten",
+        "adhoc-tasks-title": "Ad-hoc Uppgifter",
+        "job-title-header": "Jobbtitel",
+        "cron-notation": "Detta är inte en giltig Cron Notation",
+        "description-header": "Beskrivning",
+        "recurring-tasks-title": "{{title}}",
+        "last-executed-header": "Senast körd",
+        "cron-header": "Cron",
+        "disabled": "Avaktiverad",
+        "bust-cache-task": "Rensa Cache",
+        "bust-cache-task-success": "Kavita+ Cache rensad",
+        "convert-media-task": "Konvertera Media till Mål-omkodning",
+        "library-scan-tooltip": "Hur ofta Kavita kommer skanna och uppdatera metadata omkring biblioteksfiler.",
+        "bust-cache-task-desc": "Rensa Kavita+ Cache - bör bara användas när debugging av dåliga matchningar sker.",
+        "custom-label": "Anpassat Schema (Cron Notation)",
+        "daily": "Dagligen",
+        "bust-locale-task": "Rensa Språk Cache",
+        "weekly": "Veckovis",
+        "custom": "Anpassad",
+        "convert-media-task-desc": "Kör ett tidskrävande uppdrag som kommer konvertera all Kavita-hanterad media till den valda omkodningen. Dertta är långsamt (speciellt på ARM enheter).",
+        "action-header": "Åtgärd",
+        "convert-media-task-success": "Konvertering av Media till den valda omkodningen har lagts i kö",
+        "clean-up-want-to-read-task": "Rensa Vill läsa",
+        "sync-themes-success": "Synkronisering av teman har köats",
+        "check-for-updates-task": "Leta efter Uppdateringar",
+        "backup-database-task-desc": "Tar en backup av databasen, bokmärken, teman, manuellt uppladdade omslag och konfig-filer.",
+        "download-logs-task-desc": "Kompilerar all loggar till zipfil och laddar ner det.",
+        "check-for-updates-task-desc": "Kontrollera om det finns några stabila versioner som är nyare än din version.",
+        "backup-database-task-success": "Ett backupjobb av databasen har köats",
+        "download-logs-task": "Ladda ner Loggar",
+        "clean-up-task": "Allmän Rensning",
+        "clean-up-want-to-read-task-success": "Vill Läsa har rensats",
+        "bust-locale-task-success": "Språk Cache rensad",
+        "clear-reading-cache-task-success": "Cache har rensats",
+        "clean-up-task-success": "Rensning färdig",
+        "clear-reading-cache-task-desc": "Rensar cachade filer för läsning. Hjälpsamt när du precis har uppdaterat en fil som du läst inom det senaste dygnet.",
+        "clean-up-task-desc": "Utför nattlig rensning på servern. Kan vara krävande, bör inte köras med aktiva användare eller skanningar. Körs varje 24'e timme.",
+        "clean-up-want-to-read-task-desc": "Tar bort serier som användare har läst klart som är i Vill Läsa och har publikationsstatus Färdig. Körs varje 24'e timme.",
+        "backup-database-task": "Backup Databas",
+        "clear-reading-cache-task": "Rensa Läsar Cache",
+        "sync-themes-task": "Synka Teman",
+        "sync-themes-task-desc": "Synkronisera nedladdade teman med uppströms-ändringar om versionen matchas."
     },
     "manage-users": {
-        "loading": "{{common.loading}}"
+        "loading": "{{common.loading}}",
+        "you-alt": "(Du)",
+        "delete-user-alt": "Ta bort Användare {{user}}",
+        "edit-user-tooltip": "Redigera",
+        "all-libraries": "Alla Bibliotek",
+        "too-many-libraries": "Många",
+        "sharing-header": "Delning",
+        "pending-tooltip": "Denna användare har inte validerat sin e-postadress",
+        "roles-header": "Roller",
+        "never": "Aldrig",
+        "name-header": "Namn",
+        "none": "Ingen",
+        "invite": "Bjud in",
+        "change-password-alt": "Ändra Lösenord {{user}}",
+        "last-active-header": "Senast Aktiv",
+        "actions-header": "Åtgärder",
+        "username-pattern": "Användarnamn can bara bestå av följande tecken: {{characters}}",
+        "edit-user-alt": "Redigera Användare {{user}}",
+        "resend-invite-tooltip": "Skicka Inbjudan igen",
+        "resend-invite-alt": "Skicka Inbjudan igen {{user}}",
+        "setup-user-tooltip": "Konfigurera Användare",
+        "change-password-tooltip": "Ändra Lösenord",
+        "online-now-tooltip": "Online nu",
+        "resend": "Skicka igen",
+        "no-data": "Det finns inga andra användare.",
+        "pending-title": "Väntande",
+        "setup": "Konfigurera",
+        "title": "Aktiva Användare",
+        "delete-user-tooltip": "Ta bort Användare",
+        "setup-user-alt": "Konfigurera Användare {{user}}"
     },
     "edit-collection-tags": {
         "required-field": "{{validation.required-field}}",
@@ -452,50 +1044,174 @@
         "series-tab": "{{tabs.series-tab}}",
         "deselect-all": "{{common.deselect-all}}",
         "select-all": "{{common.select-all}}",
-        "filter-label": "{{common.filter}}"
+        "filter-label": "{{common.filter}}",
+        "promote-tooltip": "Marknadsför betyder att taggen kan ses over hela servern, inte bara för admin-användare. Alla serier som har denna tagg kommer fortfarande att ha användarbegränsningar placerade på sig.",
+        "title": "Redigera {{collectionName}} Samling",
+        "summary-label": "Handling",
+        "missing-series-title": "Saknade Serier:",
+        "name-validation": "Namn måste vara unikt",
+        "name-label": "Namn",
+        "promote-label": "Marknadsför",
+        "last-sync-title": "Senast Synkad:",
+        "last-sync-tooltip": "Kavita synkar dagligen mot uppström samlingsutgivare.",
+        "source-url-title": "Käll-URL:",
+        "total-series-title": "Totalt antal Serier:"
     },
     "library-recommended": {
-        "on-deck": "{{dashboard.on-deck-title}}"
+        "on-deck": "{{dashboard.on-deck-title}}",
+        "quick-catchups": "Snabb uppdatering",
+        "quick-reads": "Snabba läsningar",
+        "no-data": "Inget att visas här. Lägg till metadata till ditt bibliotek, läs något eller betygsätta något. Detta bibliotek kan också ha rekommendationer avstängd.",
+        "rediscover": "Återupptäck",
+        "highly-rated": "Högt betygsatt",
+        "more-in-genre": "Mer i {{genre}}"
     },
     "settings": {
-        "kavitaplus-section-title": "{{settings.admin-kavitaplus}}"
+        "kavitaplus-section-title": "Kavita+",
+        "admin-tasks": "Uppgifter",
+        "scrobble-holds": "Scrobbla Holds",
+        "account-section-title": "Konto",
+        "server-section-title": "Server",
+        "info-section-title": "Info",
+        "admin-system": "System",
+        "mal-stack-import": "MAL Stack",
+        "preferences": "Preferenser",
+        "clients": "API-Nyckel / OPDS",
+        "user-stats": "Stats",
+        "scrobbling": "Scrobbling",
+        "customize": "Anpassa",
+        "theme": "Tema",
+        "admin-general": "Generella",
+        "admin-statistics": "Statistik",
+        "admin-libraries": "Bibliotek",
+        "admin-users": "Användare",
+        "admin-kavitaplus": "Licens",
+        "admin-email": "E-post",
+        "account": "Konto",
+        "admin-email-history": "E-posthistorik",
+        "admin-matched-metadata": "Matchad Metadata",
+        "admin-manage-tokens": "Hantera Användartokens",
+        "admin-logs": "Loggar",
+        "admin-metadata": "Hantera Metadata",
+        "devices": "Enheter",
+        "cbl-import": "CBL Läslista",
+        "import-section-title": "Importera",
+        "admin-media": "Media",
+        "admin-media-issues": "Medieproblem"
     },
     "collection-detail": {
-        "item-count": "{{common.item-count}}"
+        "item-count": "{{common.item-count}}",
+        "title-alt": "Kavita - {{collectionName}} Samling",
+        "no-data": "Det finns inga filer. Prova lägga till en serie.",
+        "no-data-filtered": "Inga filer matchar ditt nuvarande filter.",
+        "sync-progress": "Serier Samlat: {{title}}",
+        "last-sync": "Senast Synkad: {{date}}",
+        "series-header": "Serier"
     },
     "all-collections": {
-        "item-count": "{{common.item-count}}"
+        "item-count": "{{common.item-count}}",
+        "no-data": "Det finns inga samlingar.",
+        "create-one-part-2": "en",
+        "create-one-part-1": "Prova skapa",
+        "title": "Samlingar"
     },
     "reading-lists": {
-        "item-count": "{{common.item-count}}"
+        "item-count": "{{common.item-count}}",
+        "title": "Läslistor",
+        "no-data": "Det finns inga läslistor.",
+        "create-one-part-2": "en",
+        "create-one-part-1": "Prova skapa"
     },
     "reading-list-item": {
         "remove": "{{common.remove}}",
-        "read": "{{common.read}}"
+        "read": "{{common.read}}",
+        "released-label": "Släppt: {{date}}"
     },
     "stream-list-item": {
-        "remove": "{{common.remove}}"
+        "remove": "{{common.remove}}",
+        "delete": "{{common.delete}}",
+        "provided": "Tillhandahållen",
+        "smart-filter": "Smarta Filter",
+        "external-source": "Extern Källa",
+        "load-filter": "Ladda Filter",
+        "library": "Bibliotek"
     },
     "reading-list-detail": {
         "item-count": "{{common.item-count}}",
         "read": "{{common.read}}",
-        "characters-title": "{{metadata-fields.characters-title}}"
+        "characters-title": "{{metadata-fields.characters-title}}",
+        "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
+        "items-title": "Objekt",
+        "storyline-tab": "{{series-detail.storyline-tab}}",
+        "details-tab": "{{series-detail.details-tab}}",
+        "edit-alt": "{{common.edit}}",
+        "reorder-alt": "Omordna Objekt",
+        "dnd-warning": "Drag-och-släpp är inte tillgängligt på mobila enheter eller när läslistan har fler än 100 objekt.",
+        "order-numbers-label": "Ordernummer",
+        "read-options-alt": "Läsinställningar",
+        "writers-title": "{{metadata-fields.writers-title}}",
+        "publishers-title": "{{metadata-fields.publishers-title}}",
+        "edit-label": "Ändra läge",
+        "more-alt": "{{series-detail.more-alt}}",
+        "date-range-title": "Datumintervall",
+        "remove-read": "Ta bort läst",
+        "page-settings-title": "Sidinställningar",
+        "continue": "Fortsätt",
+        "no-data": "Inget tillagt",
+        "incognito-alt": "(Inkognito)"
     },
     "events-widget": {
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "users-online-count": "{{num}} Användare online",
+        "active-events-title": "Aktiva Händelser:",
+        "update-available": "Uppdatering tillgänglig",
+        "title-alt": "Aktivitet",
+        "downloading-item": "Laddar ner {{item}}",
+        "dismiss-all": "Avvisa alla",
+        "more-info": "Klicka för mer information",
+        "download-in-queue": "{{num}} nedladdningar i Kö",
+        "no-data": "Här händer inte mycket",
+        "left-to-process": "Kvar att processera: {{leftToProcess}}"
     },
     "shortcuts-modal": {
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "double-click": "dubbelklicka",
+        "next-page": "Gå till nästa sida",
+        "prev-page": "Gå till föregående sida",
+        "go-to": "Öppna Gå till Sida dialog",
+        "bookmark": "Bokmärk nuvarande sida",
+        "close-reader": "Stäng läsare",
+        "toggle-menu": "Växla meny",
+        "title": "Tangentbordsgenvägar"
     },
     "grouped-typeahead": {
         "genres": "{{metadata-fields.genres-title}}",
         "bookmarks": "{{side-nav.bookmarks}}",
         "close": "{{common.close}}",
-        "loading": "{{common.loading}}"
+        "loading": "{{common.loading}}",
+        "chapters": "Kapitel",
+        "files": "Filer",
+        "include-extras": "Inkludera Kapitel & Filer",
+        "libraries": "Bibliotek",
+        "reading-lists": "Läslistor",
+        "collections": "Samlingar",
+        "people": "Personer",
+        "tags": "Taggar"
     },
     "nav-header": {
         "help": "{{common.help}}",
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "nav-link-header": "Navigeringsinställningar",
+        "announcements": "Meddelanden",
+        "search-series-alt": "Sök serier",
+        "search-alt": "Sök…",
+        "skip-alt": "Skippa till huvudinnehållet",
+        "server-settings": "Serverinställningar",
+        "no-data": "Inga resultat funna",
+        "settings": "Inställningar",
+        "all-filters": "Smarta Filter",
+        "scroll-to-top-alt": "Skrolla till Toppen",
+        "logout": "Logga ut"
     },
     "promoted-icon": {
         "promoted": "{{common.promoted}}"
@@ -505,30 +1221,105 @@
         "filter-label": "{{common.filter}}",
         "promoted-alt": "{{common.promoted}}",
         "loading": "{{common.loading}}",
-        "create": "{{common.create}}"
+        "create": "{{common.create}}",
+        "reading-list-label": "Läslista",
+        "title": "Lägg till i Läslista",
+        "no-data": "Inga listor är ännu skapade"
     },
     "edit-reading-list-modal": {
         "general-tab": "{{tabs.general-tab}}",
         "cover-image-tab": "{{tabs.cover-tab}}",
         "close": "{{common.close}}",
         "save": "{{common.save}}",
-        "required-field": "{{validation.required-field}}"
+        "required-field": "{{validation.required-field}}",
+        "summary-label": "Handling",
+        "promote-label": "Tipsa",
+        "promote-tooltip": "Tipsa betyder att samlingen kan ses över hela servern, inte bara av dig. Alla serier inom denna samling kommer fortfarande att ha användarbegränsningar som gäller för dem.",
+        "starting-title": "Startar",
+        "name-unique-validation": "Namn måste vara unikt",
+        "year-label": "År",
+        "month-label": "Månad",
+        "month-validation": "Måsta vara mellan 1 och 12 eller tom",
+        "ending-title": "Slut",
+        "title": "Redigera Läslista: {{name}}",
+        "year-validation": "Måste vara högre än 1000, 0 eller tom"
     },
     "import-mal-collection-modal": {
         "close": "{{common.close}}",
-        "series-count": "{{common.series-count}}"
+        "series-count": "{{common.series-count}}",
+        "description": "Importera dina MAL Interest Stacks och skapa samlingar inom Kavita",
+        "track": "Spår",
+        "restack-count": "{{num}} Omstaplingar",
+        "title": "Importera intressestapeln från MAL",
+        "nothing-found": "Inget hittat"
     },
     "edit-chapter-progress": {
         "action-header": "{{common.edit}}",
         "edit-alt": "{{common.edit}}",
-        "no-data": "{{user-scrobble-history.no-data}}"
+        "no-data": "{{user-scrobble-history.no-data}}",
+        "page-read-header": "Sidor lästa",
+        "user-header": "Användare",
+        "date-created-header": "Skapad (UTC)",
+        "date-updated-header": "Senast Uppdaterad (UTC)"
     },
     "import-cbl-modal": {
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "title": "CBL Import",
+        "help-label": "{{common.help}}",
+        "import-description": "För att komma igång, importera en .cbl-fil. Kavita kommer att utföra flera kontroller innan importen. Vissa steg kan hindra vidare framsteg på grund av problem med filen.",
+        "dry-run-step": "Testkörning",
+        "comicvine-parsing-label": "Använd Comic Vine Series-matchning",
+        "validate-description": "Alla filer har validerats för att kontrollera om det finns några operationer som behöver göras på listan. Alla listor som har misslyckats kommer inte att gå vidare till nästa steg. Åtgärda CBL-filerna och försök igen.",
+        "next": "Nästa",
+        "validate-warning": "Det finns problem med CBL-filen som kommer att förhindra en import. Rätta dessa problem och försök igen.",
+        "prev": "Föreg",
+        "dry-run-description": "Detta är ett testkörning och visar vad som kommer att hända om du trycker på 'Nästa' och genomför importen. Alla misslyckade objekt kommer inte att importeras.",
+        "validate-no-issue-description": "Inga problem hittades med CBL-filen, tryck på 'Nästa'.",
+        "import": "Import",
+        "restart": "Omstart",
+        "import-step": "Importera CBLs",
+        "validate-cbl-step": "Validera CBL",
+        "final-import-step": "Sista Steget",
+        "cbl-repo": "Du hittar många läslistor i communityn repository."
     },
     "manga-reader": {
         "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}",
-        "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}"
+        "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}",
+        "image-splitting-label": "Bilduppdelning",
+        "prev-page-tooltip": "Föregående Sida",
+        "next-page-tooltip": "Nästa Sida",
+        "unbookmark-page-tooltip": "Ta bort Bokmärning av Sida",
+        "brightness-label": "Ljusstyrka",
+        "bookmarks-title": "Bokmärken",
+        "no-next-chapter": "Inget Nästa Kapitel",
+        "left-to-right-alt": "Vänster till Höger",
+        "settings-tooltip": "Inställningar",
+        "shortcuts-menu-alt": "Snabbtangentfönster",
+        "fullscreen": "Fullskärm",
+        "image-scaling-label": "Bildskalning",
+        "width": "Bredd",
+        "width-override-label": "Tvingad Bredd",
+        "original": "Original",
+        "enable-comic-book-label": "Emulera serietidning",
+        "prev-chapter-tooltip": "Föreg Kapitel/Volym",
+        "no-prev-chapter": "Inget Föregående Kapitel",
+        "incognito-title": "Inkognitoläge:",
+        "collapse": "Dölj",
+        "next-chapter-tooltip": "Nästa Kapitel/Volym",
+        "right-to-left-alt": "Höger till Vänster",
+        "reading-direction-tooltip": "Läsriktning: ",
+        "incognito-alt": "Inkognitoläge är på. Växla för att stänga av.",
+        "height": "Höjd",
+        "first-page-tooltip": "Första Sidan",
+        "last-page-tooltip": "Sista Sidan",
+        "series-progress": "Seriens Framsteg: {{percentage}}",
+        "back": "Bakåt",
+        "swipe-enabled-label": "Svep Aktiverat",
+        "bookmark-page-tooltip": "Bokmärk Sida",
+        "reading-mode-tooltip": "Läsläge",
+        "off": "Av",
+        "first-time-reading-manga": "Tryck på bilden när som helst för att öppna menyn. Du kan konfigurera olika inställningar eller gå till en sida genom att klicka på progressbaren. Tryck på sidorna av bilden för att gå till nästa eller föregående sida.",
+        "layout-mode-switched": "Layoutläget har bytts till Enkelsida på grund av otillräckligt utrymme för att visa dubbelsidig layout"
     },
     "metadata-filter": {
         "filter-title": "{{common.filter}}",
@@ -538,10 +1329,43 @@
         "genres-label": "{{metadata-fields.genres-title}}",
         "tags-label": "{{metadata-fields.tags-title}}",
         "age-rating-label": "{{metadata-fields.age-rating-title}}",
-        "language-label": "{{metadata-fields.language-title}}"
+        "language-label": "{{metadata-fields.language-title}}",
+        "min": "Min",
+        "read-progress-label": "Läsframsteg",
+        "read": "Läst",
+        "in-progress": "Pågående",
+        "editor-label": "Redaktör",
+        "colorist-label": "Färgläggare",
+        "character-label": "Karaktär",
+        "letterer-label": "Textare",
+        "cover-artist-label": "Omslagskonstnär",
+        "filter-name-label": "Filternamn",
+        "ascending-alt": "Stigande",
+        "series-name-tooltip": "Seriens namn kommer filtrera mot Namn, Sortera Namn, eller Lokaliserat Namn",
+        "publisher-label": "Utgivare",
+        "penciller-label": "Tecknare",
+        "max": "Max",
+        "limit-label": "Gräns",
+        "format-label": "Format",
+        "inker-label": "Inker",
+        "libraries-label": "Bibliotek",
+        "rating-label": "Betyg",
+        "writer-label": "Författare",
+        "collections-label": "Samlingar",
+        "release-label": "Släppt",
+        "translator-label": "Översättare",
+        "publication-status-label": "Publikationsstatus",
+        "series-name-label": "Seriens Namn",
+        "sort-by-label": "Sortera Efter",
+        "descending-alt": "Fallande",
+        "unread": "Oläst"
     },
     "metadata-filter-row": {
-        "unit-user-rating": "{{metadata-filter-row.unit-reading-progress}}"
+        "unit-user-rating": "0.0 - 5.0 Stjärnor",
+        "unit-average-rating": "Kavita+ externt betyg, procent",
+        "unit-read-last": "Dagar från IDAG",
+        "unit-reading-date": "Datum",
+        "unit-reading-progress": "Procent"
     },
     "edit-series-modal": {
         "general-tab": "{{tabs.general-tab}}",
@@ -579,7 +1403,43 @@
         "pages-title": "{{edit-chapter-modal.pages-label}}",
         "volume-num": "{{common.volume-num}}",
         "release-year-validation": "{{validation.year-validation}}",
-        "volumes-title": "{{tab.volumes-tab}}"
+        "volumes-title": "{{tab.volumes-tab}}",
+        "cover-image-description": "Ladda upp och välj en ny omslagsbild. Tryck på Spara för att ladda upp och skriv över omslaget.",
+        "last-added-title": "Senast Tillagda Objektet",
+        "added-title": "Tillagd",
+        "max-issue-tooltip": "Maximalt nummer eller volymfält från alla ComicInfo i serien",
+        "total-pages-title": "Totalt antal Sidor",
+        "last-modified-title": "Senast Ändrad",
+        "total-items-title": "Totalt antal Objekt",
+        "title": "{{seriesName}} Detaljer",
+        "library-title": "Bibliotek",
+        "created-title": "Skapad",
+        "max-items-title": "Max Objekt",
+        "force-refresh": "Tvinga uppdatering",
+        "publication-status-title": "Publikationsstatus",
+        "chapter-title": "Kapitel",
+        "field-locked-alt": "Fältet är låst",
+        "publication-status-label": "Publikationsstatus",
+        "web-link-description": "Här kan du lägga till många olika länkar till externa tjänster.",
+        "force-refresh-tooltip": "Tvinga uppdatering av extern metadata från Kavita+",
+        "localized-name-label": "Lokaliserat Namn",
+        "lowest-folder-path-title": "Lägsta Sökväg",
+        "lowest-folder-path-tooltip": "Lägsta sökväg från bibliotekets rot som innehåller alla serie filer",
+        "view-files": "Visa Filer",
+        "highest-count-tooltip": "Högsta Antal funnet i alla ComicInfo i serien",
+        "name-label": "Namn",
+        "sort-name-label": "Sortera Namn",
+        "summary-label": "Handling",
+        "total-words-title": "Totalt antal Ord",
+        "size-title": "Storlek",
+        "specials-volume": "Specials",
+        "words-title": "Ord",
+        "loose-leaf-volume": "Lösa Blad Kapitel",
+        "last-scanned-title": "Senast Skannad",
+        "format-title": "Format",
+        "folder-path-title": "Mappsökväg",
+        "folder-path-tooltip": "Högsta sökväg från bibliotekets rot som innehåller alla serie filer",
+        "info-title": "Information"
     },
     "edit-chapter-modal": {
         "close": "{{common.close}}",
@@ -616,7 +1476,23 @@
         "tags-tab": "{{tabs.tags-tab}}",
         "size-label": "{{edit-series-modal.size-title}}",
         "links-label": "{{metadata-fields.links-title}}",
-        "last-read-label": "{{sort-field-pipe.read-progress}}"
+        "last-read-label": "{{sort-field-pipe.read-progress}}",
+        "sort-order-tooltip": "Läsordningen i vilken detta kapitel är ordnat inom volymen",
+        "pages-count": "{{num}} Sidor",
+        "isbn-label": "ISBN",
+        "title-label": "Titel",
+        "pages-label": "Sidor",
+        "words-label": "Längd",
+        "range-hours": "{{value}} {{hourWord}}",
+        "read-time-label": "Lästid",
+        "id-label": "ID",
+        "words-count": "{{num}} Ord",
+        "reading-time-label": "Lästid",
+        "date-added-label": "Datum Tillagd",
+        "title": "Ändra",
+        "sort-order-label": "Sorteringsordning",
+        "release-date-label": "Släppt",
+        "files-label": "Filer"
     },
     "edit-volume-modal": {
         "close": "{{common.close}}",
@@ -637,7 +1513,9 @@
         "last-read-label": "{{edit-chapter-modal.last-read-label}}",
         "read-time-label": "{{edit-chapter-modal.read-time-label}}",
         "files-label": "{{edit-chapter-modal.files-label}}",
-        "cover-image-description": "{{edit-series-modal.cover-image-description}}"
+        "cover-image-description": "{{edit-series-modal.cover-image-description}}",
+        "range-hours": "{{value}} {{hourWord}}",
+        "title": "Ändra"
     },
     "reading-activity": {
         "this-week": "{{time-periods.this-week}}",
@@ -645,27 +1523,78 @@
         "last-30-days": "{{time-periods.last-30-days}}",
         "last-90-days": "{{time-periods.last-90-days}}",
         "last-year": "{{time-periods.last-year}}",
-        "all-time": "{{time-periods.all-time}}"
+        "all-time": "{{time-periods.all-time}}",
+        "legend-label": "Format",
+        "time-frame-label": "Tidsram",
+        "title": "Läsaktivitet",
+        "all-users": "Alla Användare",
+        "x-axis-label": "Tid",
+        "no-data": "Inga Läsframsteg",
+        "y-axis-label": "Timmar Lästa"
     },
     "series-preview-drawer": {
         "tags-label": "{{filter-field-pipe.tags}}",
         "genres-label": "{{filter-field-pipe.genres}}",
         "remove-from-want-to-read": "{{actionable.remove-from-want-to-read}}",
-        "add-to-want-to-read": "{{actionable.add-to-want-to-read}}"
+        "add-to-want-to-read": "{{actionable.add-to-want-to-read}}",
+        "vols-and-chapters": "{{volCount}} Volymer / {{chpCount}} Kapitel",
+        "staff-label": "Personal",
+        "provided-by-label": "Tillhandahålls av",
+        "view-series": "Visa Serier"
     },
     "server-stats": {
         "tags": "{{metadata-fields.tags-title}}",
-        "genres": "{{metadata-fields.genres-title}}"
+        "genres": "{{metadata-fields.genres-title}}",
+        "total-genres-tooltip": "Totalt antal Genres: {{count}}",
+        "total-files-label": "Totalt antal Filer",
+        "total-size-label": "Total Storlek",
+        "total-volumes-tooltip": "Totalt antal Volymer: {{count}}",
+        "volume-count": "{{num}} Volymer",
+        "people": "Personer",
+        "total-series-label": "Totalt antal Serier",
+        "total-volumes-label": "Totalt antal Volymer",
+        "total-tags-label": "Totalt antal Taggar",
+        "total-tags-tooltip": "Totalt antal Taggar: {{count}}",
+        "total-genres-label": "Totalt antal Genres",
+        "most-active-users-title": "Mest Aktiva Användare",
+        "series-count": "{{num}} Serier",
+        "file-count": "{{num}} Filer",
+        "reads": "läst",
+        "total-people-tooltip": "Totalt antal Personer: {{count}}",
+        "total-read-time-label": "Total Lästid",
+        "tag-count": "{{num}} Taggar",
+        "popular-libraries-title": "Populära Bibliotek",
+        "total-people-label": "Totalt antal Personer",
+        "release-years-title": "Släppt År",
+        "people-count": "{{num}} Personer",
+        "genre-count": "{{num}} Genres",
+        "total-series-tooltip": "Totalt antal Serier: {{count}}",
+        "total-files-tooltip": "Totalt antal Filer: {{count}}",
+        "popular-series-title": "Populära Serier",
+        "recently-read-title": "Nyligen Läst",
+        "series": "serier",
+        "total-read-time-tooltip": "Total Lästid: {{count}}"
     },
     "customize-dashboard-modal": {
         "close": "{{common.close}}",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "title-sidenav": "Anpassa Sido Nav",
+        "sidenav": "Sido Nav",
+        "smart-filters": "Smarta Filter",
+        "title-external-sources": "Externa Tjänster",
+        "external-sources": "Externa Källor",
+        "description": "Du kan anpassa olika aspekter av Kavita genom att ändra ordning, växla synlighet och binda smarta filter/externa källor till din startsida eller sidonavigering.",
+        "title-dashboard": "Anpassa instrumentpanelen",
+        "dashboard": "Instrumentpanel",
+        "title-smart-filters": "Smarta Filter"
     },
     "customize-dashboard-streams": {
         "save": "{{common.save}}",
         "add": "{{common.add}}",
         "filter": "{{common.filter}}",
-        "clear": "{{common.clear}}"
+        "clear": "{{common.clear}}",
+        "smart-filter-title": "{{customize-dashboard-modal.title-smart-filters}}",
+        "no-data": "Alla smarta filter har lagts till på instrumentpanelen, eller så har inga skapats ännu."
     },
     "customize-sidenav-streams": {
         "save": "{{common.save}}",
@@ -673,24 +1602,48 @@
         "filter": "{{common.filter}}",
         "clear": "{{common.clear}}",
         "external-sources-title": "{{customize-dashboard-modal.external-sources}}",
-        "reorder-when-filter-present": "You cannot reorder items via drag & drop while a filter is present. Use {{customize-sidenav-streams.order-numbers-label}}",
-        "order-numbers-label": "{{reading-list-detail.order-numbers-label}}"
+        "reorder-when-filter-present": "Du kan inte ordna om objekt via drag & släpp medan ett filter används. Använd {{customize-sidenav-streams.order-numbers-label}}",
+        "order-numbers-label": "{{reading-list-detail.order-numbers-label}}",
+        "bulk-mode-label": "Massläge",
+        "no-data-external-source": "Alla Externa Källor har lagts till i Sido Nav eller så har inga skapats än.",
+        "smart-filters-title": "Smarta FIlter",
+        "no-data": "Alla smarta filter har lagts till på Sido Nav, eller så har inga skapats ännu."
     },
     "manage-external-sources": {
         "clear": "{{common.clear}}",
-        "filter": "{{common.filter}}"
+        "filter": "{{common.filter}}",
+        "no-data": "Externa Källor saknas",
+        "description": "Förbättra din upplevelse genom att lägga till externa servrar och smidigt inkludera dem i din sidonavigering för snabb åtkomst till både din server och din väns server.",
+        "help-link": "Mer information",
+        "add-source": "Lägg till"
     },
     "manage-smart-filters": {
         "delete": "{{common.delete}}",
         "filter": "{{common.filter}}",
-        "clear": "{{common.clear}}"
+        "clear": "{{common.clear}}",
+        "edit-smart-filter": "Ändra {{name}}",
+        "edit": "{{common.edit}}",
+        "no-data": "Inga Smarta Filter skapat",
+        "required-field": "Smarta Filter behöver ett namn",
+        "errored": "Det finns ett kodningsfel i filtret. Du måste återskapa det.",
+        "cancel": "{{common.cancel}}",
+        "close": "{{common.close}}",
+        "save": "{{common.save}}",
+        "name-label": "Namn",
+        "filter-name-unique": "Smart Filternamn måste vara unika"
     },
     "edit-external-source-item": {
         "save": "{{common.save}}",
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
         "delete": "{{common.delete}}",
-        "required": "{{validation.required-field}}"
+        "required": "{{validation.required-field}}",
+        "host-label": "Värd",
+        "name-label": "Namn",
+        "api-key-label": "API-Nyckel",
+        "not-unique": "En extern källa finns redan med den här värden. Se till att du inte har några dubbletter",
+        "pattern": "Värd måste vara en giltig http(s):// url",
+        "title": "Ny Extern Källa"
     },
     "stream-pipe": {
         "on-deck": "{{dashboard.on-deck-title}}",
@@ -701,25 +1654,119 @@
         "collections": "{{side-nav.collections}}",
         "reading-lists": "{{side-nav.reading-lists}}",
         "bookmarks": "{{side-nav.bookmarks}}",
-        "all-series": "{{side-nav.all-series}}"
+        "all-series": "{{side-nav.all-series}}",
+        "browse-authors": "{{side-nav.browse-authors}}"
     },
     "filter-field-pipe": {
         "age-rating": "{{metadata-fields.age-rating-title}}",
         "characters": "{{metadata-fields.characters-title}}",
-        "cover-artist": "{{person-role-pipe.cover-artist}}",
+        "cover-artist": "{{person-role-pipe.artist}}",
         "genres": "{{metadata-fields.genres-title}}",
         "release-year": "{{sort-field-pipe.release-year}}",
         "tags": "{{metadata-fields.tags-title}}",
-        "writers": "{{metadata-fields.writers-title}}"
+        "writers": "{{metadata-fields.writers-title}}",
+        "read-time": "Läs tid",
+        "libraries": "Bibliotek",
+        "team": "Team",
+        "collection-tags": "Samlingstaggar",
+        "inker": "Inker",
+        "location": "Plats",
+        "publisher": "Utgivare",
+        "read-progress": "Läsarframsteg",
+        "languages": "Språk",
+        "letterer": "Textare",
+        "user-rating": "Användarbetyg",
+        "path": "Sökväg",
+        "file-path": "Filsökväg",
+        "read-last": "Senast Läst",
+        "translators": "Översättare",
+        "colorist": "Färgläggare",
+        "editor": "Redaktör",
+        "formats": "Format",
+        "penciller": "Tecknare",
+        "imprint": "Förlag",
+        "average-rating": "Genomsnittligt betyg",
+        "series-name": "Serie Namn",
+        "summary": "Handling",
+        "read-date": "Läsdatum",
+        "want-to-read": "Vill Läsa",
+        "publication-status": "Publikationsstatus"
     },
     "actionable": {
-        "clear": "{{common.clear}}"
+        "clear": "{{common.clear}}",
+        "add-to-reading-list-tooltip": "Lägg till i en Läslista",
+        "read": "Läst",
+        "scan-library": "Skanna Bibliotek",
+        "mark-as-read-tooltip": "Markera framsteg som färdigläst",
+        "scan-series-tooltip": "Skanna Serier efter ändringar",
+        "remove-from-want-to-read": "Radera från Vill Läsa",
+        "refresh-covers-tooltip": "Regenerera alla omslag",
+        "details": "Detaljer",
+        "customize-tooltip": "ATT GÖRA",
+        "reorder": "Omordna",
+        "analyze-files": "Analysera Filer",
+        "edit-tooltip": "Redigera inställningar eller detaljer",
+        "add-to-collection": "Lägg till i Samling",
+        "remove-from-want-to-read-tooltip": "Radera serier från Vill Läsa",
+        "download-tooltip": "Ladda ner till enhet",
+        "details-tooltip": "ATT GÖRA",
+        "view-series": "Visa Serier",
+        "clear-tooltip": "Radera alla bokmärken för denna serie",
+        "unpromote-tooltip": "Begränsa synligheten till endast ditt konto",
+        "mark-visible": "Markera som Synlig",
+        "mark-visible-tooltip": "ATT GÖRA",
+        "mark-invisible": "Markera som Osynlig",
+        "mark-invisible-tooltip": "ATT GÖRA",
+        "promote": "Rekommendera",
+        "new-collection": "Ny Samling",
+        "import-cbl-tooltip": "Skapar en Läslist från en CBL-fil",
+        "unpromote": "Ta bort från rekommendationer",
+        "scan-series": "Skanna Serier",
+        "add-to-want-to-read": "Lägg till i Vill Läsa",
+        "edit": "Redigera",
+        "promote-tooltip": "Gör detta objekt synligt för alla användare",
+        "mark-as-unread": "Markera som Oläst",
+        "read-incognito-tooltip": "Läs utan att spara framsteg",
+        "refresh-covers": "Uppdatera Omslag",
+        "mark-as-read": "Markera som Läst",
+        "scan-library-tooltip": "Skanna bibliotek efter ändringar. Använd tvingad skanning för att tvinga sökning i alla mappar",
+        "generate-colorscape": "Generera färgskala",
+        "generate-colorscape-tooltip": "Generera färgskala och saknade omslag",
+        "analyze-files-tooltip": "Analysera Filer efter tilläggstyp och storlek",
+        "view-series-tooltip": "ATT GÖRA",
+        "import-cbl": "Importera CBL",
+        "multiple-selections": "Flera val",
+        "copy-settings": "Kopiera Inställningar Från",
+        "title": "Åtgärder",
+        "match": "Matcha",
+        "match-tooltip": "Matcha Serier med Kavita+ manuellt",
+        "settings": "Inställningar",
+        "settings-tooltip": "Visa inställningar eller detaljer",
+        "mark-as-unread-tooltip": "Markera framsteg som oläst",
+        "remove-from-on-deck": "Radera från Hyllan",
+        "add-to-reading-list": "Lägg till i Läslista",
+        "read-incognito": "Läs Inkognito",
+        "import-mal-stack": "Importera MAL Stack",
+        "import-mal-stack-tooltip": "Skapar en Smart Samling från dina MAL Intresse Stackar",
+        "add-to": "Lägg till i",
+        "others": "Andra",
+        "send-to": "Skicka till",
+        "delete": "Radera",
+        "download": "Ladda ner",
+        "customize": "Anpassa",
+        "add-to-want-to-read-tooltip": "Lägg till serier i Vill Läsa",
+        "remove-from-on-deck-tooltip": "Radera serier från att visas på Hyllan",
+        "add-to-collection-tooltip": "Lägg till serier i en samling",
+        "delete-tooltip": "Det finns inget sätt att ångra detta beslut",
+        "back-to": "Tillbaka till {{action}}",
+        "rename": "Byt namn",
+        "rename-tooltip": "Byt namn på Smart Filter"
     },
     "dashboard": {
         "recently-added-title": "Nyligen tillagda serier",
         "more-in-genre-title": "Mer inom {{genre}}",
         "server-settings-link": "Serverinställningar",
-        "no-libraries": "Det är inga bibliotek skapade än. Skapa några i",
+        "no-libraries": "Det finns inga bibliotek skapade än. Skapa några i",
         "not-granted": "Du har inte fått rättigheter till något bibliotek.",
         "on-deck-title": "På hyllan",
         "recently-updated-title": "Nyligen uppdaterade serier"
@@ -739,5 +1786,816 @@
         "external-review": "Extern recension",
         "local-review": "Lokal recension",
         "rating-percentage": "Betyg {{r}}%"
+    },
+    "new-version-modal": {
+        "changed": "{{changelog.changed}}",
+        "known-issues": "{{changelog.known-issues}}",
+        "api": "{{changelog.api}}",
+        "close": "{{common.close}}",
+        "title": "Kavita blev uppdaterad!",
+        "refresh": "Uppdatera",
+        "fixed": "{{changelog.fixed}}",
+        "description": "En ny version av Kavita finns tillgänglig. Uppdatera för att applicera.",
+        "added": "{{changelog.added}}",
+        "removed": "{{changelog.removed}}",
+        "developer": "{{changelog.developer}}",
+        "theme": "{{changelog.theme}}"
+    },
+    "manage-metadata-settings": {
+        "enabled-tooltip": "Tillåt Kavita att ladda ner metadata och skriva till sin databas.",
+        "summary-label": "Handling",
+        "enable-people-label": "Personer",
+        "enable-start-date-tooltip": "Tillåt Seriens startdatum att bli skriven till serien",
+        "enable-genres-label": "Genres",
+        "enable-tags-tooltip": "Tillåt serie-taggar att skrivas.",
+        "blacklist-label": "Svartlista genrer/taggar",
+        "blacklist-tooltip": "Allt som finns i denna lista kommer att tas bort från både genre- och taggbehandling. Detta är en plats för att lägga till genrer/taggar som du inte vill ha skrivna. Se till att de är kommaseparerade.",
+        "add-field-mapping-label": "Lägg till Fält Mappning",
+        "first-last-name-tooltip": "Se till att personers namn skrivs med Förnamn först och Efternamn sist",
+        "person-roles-label": "Roller",
+        "enable-start-date-label": "Startdatum",
+        "first-last-name-label": "Första Sista Namning",
+        "whitelist-tooltip": "Tillåt endast en sträng i denna lista att skrivas för taggar. Se till att de är kommaseparerade.",
+        "age-rating-mapping-description": "Eventuella strängar på vänster sida som finns i antingen Genre eller Taggar kommer att ställa in åldersbetyget på serien.",
+        "remove-source-tag-label": "Ta bort käll-tagg",
+        "overrides-description": "Tillåt Kavita att skriva över låsta fält.",
+        "whitelist-label": "Vitlista taggar",
+        "tag": "Tagg",
+        "enable-genres-tooltip": "Tillåt serie-genrer att skrivas.",
+        "description": "Kavita+ har möjlighet att ladda ner och skriva viss begränsad metadata till databasen. Denna sida gör det möjligt för dig att växla vad som ingår.",
+        "enable-people-tooltip": "Tillåt personer (karaktärer, författare, osv.) att läggas till. Alla personer inkluderar bilder.",
+        "summary-tooltip": "Tillåt Handling att skrivas när fältet är upplåst.",
+        "derive-publication-status-tooltip": "Tillåt publiceringsstatus att härledas från totala kapitel-/volymantal.",
+        "derive-publication-status-label": "Publiceringsstatus",
+        "enable-relations-label": "Förhållanden",
+        "enable-relations-tooltip": "Tillåt serie-relaterade förhållanden att läggas till.",
+        "enable-cover-image-tooltip": "Tillåt Kavita att skriva omslagsbild till serien",
+        "enable-cover-image-label": "Omslagsbild",
+        "genre": "Genre",
+        "localized-name-label": "Lokaliserad Serie-namn",
+        "localized-name-tooltip": "Tillåt Lokaliserat-namn att bli skrivet när fältet är upplåst. Kavita kommer att försöka gissa sig fram.",
+        "field-mapping-description": "Ställ in regler för vissa strängar som finns i fälten Genre/Tag och mappa dem till en ny sträng i Genre/Tag och ta eventuellt bort dem från källistan. Gäller endast när Genre/Tag kan skrivas.",
+        "overrides-label": "Åsidosätter",
+        "enabled-label": "Aktivera Metadata-nedladdning",
+        "enable-tags-label": "Taggar",
+        "age-rating-mapping-title": "Åldersgruppsbedömning",
+        "add-age-rating-mapping-label": "Lägg till Åldersgruppsbedömning",
+        "field-mapping-title": "Fältmappning",
+        "enable-chapter-title-label": "Titel",
+        "enable-chapter-summary-label": "{{manage-metadata-settings.summary-label}}",
+        "enable-chapter-title-tooltip": "Tillåt Titeln för Kapitel/Nummer att skrivas",
+        "enable-chapter-cover-tooltip": "Tillåt Omslag för Kapitel/Nummer att ställas in",
+        "enable-chapter-cover-label": "Kapitelomslag",
+        "enable-chapter-summary-tooltip": "{{manage-metadata-settings.summary-tooltip}}",
+        "enable-chapter-release-date-label": "Släppdatum",
+        "enable-chapter-release-date-tooltip": "Tillåt Släppdatum för Kapitel/Nummer att skrivas",
+        "enable-chapter-publisher-tooltip": "Tillåt Utgivare för Kapitel/Nummer att skrivas",
+        "enable-chapter-publisher-label": "Utgivare",
+        "chapter-header": "Kapitelfält"
+    },
+    "match-series-result-item": {
+        "releasing": "Släpper",
+        "chapter-count": "{{common.chapter-count}}",
+        "details": "Visa sida",
+        "volume-count": "{{server-stats.volume-count}}",
+        "updating-metadata-status": "Uppdaterar Metadata"
+    },
+    "person-detail": {
+        "individual-role-title": "Som {{role}}",
+        "browse-person-title": "Alla titlar av {{name}}",
+        "anilist-url": "{{edit-person-modal.anilist-tooltip}}",
+        "known-for-title": "Känd för",
+        "all-roles": "Roller",
+        "browse-person-by-role-title": "Alla titlar av {{name}} som {{role}}"
+    },
+    "manage-matched-metadata": {
+        "dont-match-status-label": "{{dont-match-label}}",
+        "title": "Matchad Metadata",
+        "valid-until-header": "Nästa uppdatering",
+        "matched-status-label": "Matchad",
+        "blacklist-status-label": "Behöver manuell matchning",
+        "series-name-header": "Serier",
+        "dont-match-label": "Matcha inte",
+        "all-status-label": "Alla",
+        "description": "Alla tillämpliga serier som kan matchas med extern metadata finns här. Kavita kommer att hämta eller uppdatera serien metadata, 50 serier per 24 timmar dagligen.",
+        "unmatched-status-label": "Inte matchad",
+        "no-data": "{{common.no-data}}",
+        "library-name-header": "Bibliotek",
+        "actions-header": "Åtgärder",
+        "match-alt": "Matcha {{seriesName}}",
+        "status-header": "Status"
+    },
+    "manage-user-tokens": {
+        "mal-header": "MAL",
+        "no-data": "{{common.no-data}}",
+        "expires-label": "Går ut: {{date}}",
+        "anilist-header": "AniList",
+        "token-set-label": "Token inställd",
+        "username-header": "Användarnamn",
+        "description": "Användare som har skrobblingtoken kan behöva förnyas då och då. Kavita kommer automatiskt att skicka ett e-postmeddelande till dem om e-post är inställt och de har en giltig e-postadress."
+    },
+    "match-series-modal": {
+        "close": "{{common.close}}",
+        "query-tooltip": "Skriv seriens namn, AniList/MyAnimeList URL. URL:er kommer att använda en direkt uppslagning.",
+        "description": "Välj en matchning för att omkoppla Kavita+ metadata och regenerera scrobble-händelser. 'Matcha Inte' kan användas för att förhindra att Kavita matchar metadata och scrobblar.",
+        "save": "{{common.save}}",
+        "dont-match-label": "Matcha Inte",
+        "dont-match-tooltip": "Välj att inte matcha och scrobbla denna serie",
+        "search": "Sök",
+        "title": "Matcha {{seriesName}}",
+        "no-results": "Kunde inte hitta en matchning. Försök att lägga till URL:en från en stödjad leverantör och försök igen.",
+        "query-label": "Fråga"
+    },
+    "download-button": {
+        "downloading-status": "Laddar ner…",
+        "download-tooltip": "Ladda ner"
+    },
+    "file-type-group-pipe": {
+        "archive": "Arkiv",
+        "epub": "Epub",
+        "pdf": "Pdf",
+        "image": "Bild"
+    },
+    "card-detail-layout": {
+        "no-data": "{{common.no-data}}",
+        "total-items": "{{count}} antal objekt",
+        "jumpkey-count": "{{count}} Serier"
+    },
+    "email-history": {
+        "template-header": "Mall",
+        "user-header": "Sänt till",
+        "sent-tooltip": "Skickat",
+        "no-data": "{{common.no-data}}",
+        "sent-header": "Framgångsrikt",
+        "not-sent-tooltip": "Inte skickat",
+        "description": "Här kan du hitta alla e-postmeddelanden som skickats från Kavita och till vilken användare.",
+        "date-header": "Datum Sänt"
+    },
+    "time-periods": {
+        "this-week": "Denna vecka",
+        "last-90-days": "Senaste 90 dagarna",
+        "last-year": "Senaste året",
+        "last-7-days": "Senaste 7 dagarna",
+        "last-30-days": "Senaste 30 dagarna",
+        "all-time": "Genom tiderna"
+    },
+    "relationship-pipe": {
+        "alternative-version": "Alternativ version",
+        "spin-off": "Spin Off",
+        "parent": "Föregående",
+        "annual": "Årligen",
+        "character": "Karaktär",
+        "sequel": "Uppföljare",
+        "side-story": "Sidoberättelse",
+        "contains": "Innehåller",
+        "alternative-setting": "Alternativ inställning",
+        "edition": "Utgåva",
+        "adaptation": "Adaptation",
+        "doujinshi": "Doujinshi",
+        "prequel": "Föregångare",
+        "other": "Annat"
+    },
+    "publication-status-pipe": {
+        "ongoing": "Pågår",
+        "hiatus": "Paus",
+        "ended": "Avslutad",
+        "completed": "Färdig",
+        "cancelled": "Inställd"
+    },
+    "manga-format-pipe": {
+        "unknown": "Okänd",
+        "image": "Bild",
+        "pdf": "PDF",
+        "epub": "EPUB",
+        "archive": "Arkiv"
+    },
+    "age-rating-pipe": {
+        "g": "G",
+        "mature": "Mature",
+        "ma15-plus": "MA15+",
+        "mature-17-plus": "Mature 17+",
+        "not-applicable": "Ej tillämpligt",
+        "teen": "Tonåring",
+        "x18-plus": "X18+",
+        "kids-to-adults": "Barn till vuxna",
+        "unknown": "Okänd",
+        "early-childhood": "Småbarnsålder",
+        "everyone-10-plus": "Alla 10+",
+        "rating-pending": "Åldergräns inväntar",
+        "pg": "PG",
+        "r18-plus": "R18+",
+        "everyone": "Alla",
+        "adults-only": "Endast vuxna 18+"
+    },
+    "changelog-update-item": {
+        "added": "Tillagd",
+        "changed": "Ändrad",
+        "developer": "Utvecklare",
+        "theme": "Tema",
+        "installed": "{{changelog.installed}}",
+        "fixed": "Fixad",
+        "known-issues": "Kända fel",
+        "feature-requests": "Funktionsförslag",
+        "download": "Ladda ner",
+        "removed": "Borttagen",
+        "api": "API",
+        "published-label": "Utgiven: "
+    },
+    "confirm-email-change": {
+        "non-confirm-description": "Vänligen vänta medan din e-postuppdatering valideras.",
+        "confirm-description": "Din e-postadress har validerats och har nu ändrats inom Kavita. Du kommer att omdirigeras till inloggningssidan.",
+        "success": "Lyckats!",
+        "title": "Validera e-poständring"
+    },
+    "read-more": {
+        "read-more": "Läs vidare",
+        "read-less": "Läs mindre"
+    },
+    "download-indicator": {
+        "progress": "{{percentage}}% nedladdat"
+    },
+    "cbl-conflict-reason-pipe": {
+        "chapter-missing": "{{series}}: Kapitel {{chapter}} saknas från Kavita. Denna post kommer att hoppas över.",
+        "empty-file": "CBL-filen är tom, inget att göra.",
+        "all-series-missing": "Ditt konto saknar åtkomst till alla serier i listan, eller så har Kavita inget som finns i listan.",
+        "all-chapter-missing": "Alla kapitel kan inte matchas med kapitel i Kavita.",
+        "name-conflict": "En läslista ({{readingListName}}) finns redan på ditt konto som matchar CBL-filen.",
+        "series-collision": "Serien, {{seriesLink}}, krockar med en annan serie med samma namn i ett annat bibliotek.",
+        "series-missing": "Serien, {{series}}, saknas från Kavita eller ditt konto saknar behörighet. Alla objekt med denna serie kommer att hoppas över vid import.",
+        "invalid-file": "Filen är skadad eller matchar inte de förväntade taggarna/specifikationerna.",
+        "success": "{{series}} volym {{volume}} kapitel {{chapter}} har mappats framgångsrikt.",
+        "volume-missing": "{{series}}: Volym {{volume}} saknas från Kavita eller ditt konto saknar behörighet. Alla objekt med detta volymsnummer kommer att hoppas över."
+    },
+    "time-duration-pipe": {
+        "hours": "{{value}} timmar",
+        "days": "{{value}} dagar",
+        "months": "{{value}} månader",
+        "minutes": "{{value}} minuter",
+        "years": "{{value}} år"
+    },
+    "time-ago-pipe": {
+        "months-ago": "{{value}} månader sen",
+        "year-ago": "ett år sen",
+        "min-ago": "en minut sen",
+        "hour-ago": "en timme sen",
+        "month-ago": "en månad sen",
+        "mins-ago": "{{value}} minuter sen",
+        "days-ago": "{{value}} dagar sen",
+        "never": "Aldrig",
+        "just-now": "precis nu",
+        "hours-ago": "{{value}} timmar sen",
+        "day-ago": "en dag sen",
+        "years-ago": "{{value}} år sen"
+    },
+    "library-type-pipe": {
+        "comicVine": "Serier",
+        "book": "Bok",
+        "comic": "Serie (Legacy)",
+        "manga": "Manga",
+        "image": "Bild",
+        "lightNovel": "Lättroman"
+    },
+    "announcements": {
+        "title": "Meddelanden"
+    },
+    "table-of-contents": {
+        "no-data": "Denna bok har ingen innehållsförteckning i metadatan"
+    },
+    "cover-image-size": {
+        "medium": "Medium (640x909)",
+        "large": "Stor (900x1277)",
+        "xlarge": "Extra stor (1265x1795)",
+        "default": "Standard (320x455)"
+    },
+    "api-key": {
+        "reset": "Återställ",
+        "show": "Visa",
+        "hide": "Göm",
+        "regen-warning": "Att regenerera din API-nyckel kommer att ogiltigförklara alla befintliga klienter.",
+        "no-key": "ERROR – NYCKEL HAR EJ ANGETTS",
+        "confirm-reset": "Detta kommer att ogiltigförklara alla OPDS-konfigurationer du har ställt in. Är du säker på att du vill fortsätta?",
+        "key-reset": "Återställ API-nyckel",
+        "copy": "Kopiera"
+    },
+    "changelog": {
+        "available": "Tillgänglig",
+        "download": "Ladda ner",
+        "nightly": "Nightly: {{version}}",
+        "installed": "Installerad"
+    },
+    "card-item": {
+        "cannot-read": "Kan inte läsa"
+    },
+    "personal-table-of-contents": {
+        "delete": "Ta bort {{bookmarkName}}",
+        "page": "Sida {{value}}",
+        "no-data": "Inget bokmärkt ännu"
+    },
+    "theme": {
+        "theme-dark": "Mörk",
+        "theme-black": "Svart",
+        "theme-paper": "Papper",
+        "theme-white": "Vit"
+    },
+    "user-stats": {
+        "library-read-progress-title": "Bibliotekets läsframsteg",
+        "read-percentage": "% Läst"
+    },
+    "day-of-week-pipe": {
+        "tuesday": "Tisdag",
+        "monday": "Måndag",
+        "wednesday": "Onsdag",
+        "thursday": "Torsdag",
+        "friday": "Fredag",
+        "saturday": "Lördag",
+        "sunday": "Söndag"
+    },
+    "device-platform-pipe": {
+        "custom": "Anpassad"
+    },
+    "cbl-import-result-pipe": {
+        "success": "Lyckats",
+        "partial": "Delvis",
+        "failure": "Misslyckats"
+    },
+    "external-series-card": {
+        "open-external": "Öppna Externt"
+    },
+    "badge-expander": {
+        "more-items": "och {{count}} fler"
+    },
+    "manage-system": {
+        "home-page-title": "Hemsida:",
+        "title": "Om Sytemet",
+        "version-title": "Version",
+        "more-info-title": "Mer Info",
+        "first-install-version-title": "Första Installationsversionen",
+        "first-install-date-title": "Första Installationsdatum",
+        "updates-title": "Uppdateringshistorik",
+        "wiki-title": "Wiki:",
+        "localization-title": "Lokaliseringar:",
+        "source-title": "Källa:",
+        "feature-request-title": "Funktionsförfrågning:",
+        "discord-title": "Discord:",
+        "donations-title": "Donationer:",
+        "installId-title": "Installations-ID"
+    },
+    "default-date-pipe": {
+        "never": "Aldrig"
+    },
+    "entity-type": {
+        "bookmark": "bokmärk",
+        "series": "serier",
+        "chapter": "kapitel",
+        "logs": "loggar",
+        "volume": "volym"
+    },
+    "tabs": {
+        "folder-tab": "Mapp",
+        "tasks-tab": "Uppgifter",
+        "metadata-tab": "Metadata",
+        "preferences-tab": "Preferenser",
+        "theme-tab": "Tema",
+        "devices-tab": "Enheter",
+        "stats-tab": "Stats",
+        "related-tab": "Relaterad",
+        "account-tab": "Konto",
+        "reviews-tab": "Recensioner",
+        "details-tab": "Detaljer",
+        "volumes-tab": "Volymer",
+        "recommendations-tab": "Rekommendationer",
+        "info-tab": "Info",
+        "tags-tab": "Taggar",
+        "cover-tab": "Omslagsbild",
+        "scrobbling-tab": "Scrobbling",
+        "books-tab": "Böcker",
+        "advanced-tab": "Avancerad",
+        "people-tab": "Personer",
+        "series-tab": "Serier",
+        "weblink-tab": "Weblänkar",
+        "smart-filters-tab": "Smarta Filter",
+        "progress-tab": "Framsteg",
+        "storyline-tab": "Handlingsförlopp",
+        "specials-tab": "Specialer",
+        "general-tab": "Generellt"
+    },
+    "common": {
+        "delete": "Radera",
+        "remove": "Radera",
+        "cancel": "Avbryt",
+        "create": "Skapa",
+        "edit": "Redigera",
+        "help": "Hjälp",
+        "read": "Läs",
+        "reset-to-default": "Återställ till Standard",
+        "select-all": "Markera Alla",
+        "book-nums": "Böcker",
+        "save": "Spara",
+        "reset": "Återställ",
+        "chapter-count": "{{num}} Kapitel",
+        "close": "Stäng",
+        "clear": "Rensa",
+        "apply": "Applicera",
+        "promoted": "Rekommenderad",
+        "book-num": "Bok",
+        "issue-hash-num": "Nummer #",
+        "issue-num": "Nummer",
+        "chapter-num": "Kapitel",
+        "issue-num-shorthand": "#{{num}}",
+        "volume-num-shorthand": "Vol {{num}}",
+        "loading": "Laddar…",
+        "username": "Användarnamn",
+        "password": "Lösenord",
+        "book-num-shorthand": "Bok {{num}}",
+        "volume-nums": "Volymer",
+        "add": "Lägg till",
+        "issue-nums": "Nummer",
+        "chapter-nums": "Kapitel",
+        "chapter-num-shorthand": "Kap {{num}}",
+        "volume-num": "Volym",
+        "email": "E-post",
+        "series-count": "{{num}} Serier",
+        "deselect-all": "Avmarkera Alla",
+        "no-data": "Ingen Data",
+        "submit": "Skicka",
+        "author-count": "{{num}} Författare",
+        "item-count": "{{num}} Objekt",
+        "filter": "Filter"
+    },
+    "carousel-reel": {
+        "next-items": "Nästa objekt",
+        "prev-items": "Tidigare objekt"
+    },
+    "file-breakdown-stats": {
+        "visualisation-label": "Visualisering",
+        "data-table-label": "Datatabell",
+        "not-classified": "Inte Klassificerad",
+        "download-file-for-extension-header": "Nedladdningsrapport",
+        "total-files-header": "Totalt antal Filer",
+        "total-size-header": "Total Storlek",
+        "total-file-size-title": "Total Filstorlek:",
+        "format-header": "Format",
+        "format-title": "Format",
+        "extension-header": "Tillägg",
+        "format-tooltip": "Inte Klassificerad betyder att Kavita inte har skannat vissa filer. Detta händer med gamla filer som fanns innan version v0.7. Du kan behöva köra en tvingad skanning via bibliotekets inställningsfönster.",
+        "download-file-for-extension-alt": "Ladda ner filrapport för {{extension}}"
+    },
+    "errors": {
+        "theme-already-in-use": "Temat finns redan med det namnet",
+        "user-not-auth": "Användaren är inte autentiserad",
+        "series-doesnt-exist": "Denna serie finns inte längre",
+        "unknown-crit": "Det blev ett okänt kritiskt fel",
+        "download": "Det uppstod ett fel vid nedladdningen av denna fel eller så saknar du behörighet",
+        "not-found": "Den URL'en finns inte",
+        "generic": "Något oväntat fel uppstod",
+        "invalid-confirmation-email": "Ogiltigt bekräfteslemail",
+        "invalid-confirmation-url": "Ogiltig bekräftelse-URL",
+        "delete-theme-in-use": "Temat används för nuvarande av minst en användare, kan inte tas bort",
+        "collection-invalid-access": "Du har inte åtkomst till något bibliotek dit denna tagg tillhör eller så är denna samling ogiltig",
+        "rejected-cover-upload": "Bilden kunde inte hämtas via URL'en. Vänligen ladda ned och ladda upp från fil istället.",
+        "invalid-password-reset-url": "Ogiltig lösenordåterställnings url",
+        "error-code": "{{num}} Error",
+        "theme-manual-upload": "Det uppstod ett fel vid skapande av Tema från manuell uppladdning"
+    },
+    "toasts": {
+        "scan-queued": "Skanning köad för {{name}}",
+        "k+-delete-key": "Detta kommer endast att ta bort Kavitas licensnyckel och visa en köp-länk. Detta kommer inte att avbryta din prenumeration! Använd Hantera för att avbryta din prenumeration först.",
+        "reading-lists-promoted": "Läslistor rekommenderat",
+        "reading-list-updated": "Läslista uppdaterad",
+        "user-deleted": "{{user}} har blivit raderad",
+        "confirm-delete-reading-lists": "Är du säker på att du vill radera läslistorna? Kan ej ångras.",
+        "book-settings-info": "Du kan ändra bokinställningar, spara dessa inställningar för alla böcker och visa innehållsförteckningen från lådan.",
+        "confirm-delete-multiple-chapters": "Är du säker att du vill radera {{count}} kapitel/volymer? Filer på disken kommer inte påverkas.",
+        "confirm-delete-smart-filter": "Är du säker att du vill radera detta Smarta Filter?",
+        "external-source-already-exists": "En Extern Källa finns redan med samma Namn/Värd/API-Nyckel",
+        "bulk-covers": "Uppdatera omslag för flera bibliotek är krävande och kan ta lång tid. Är du säker att du vill fortsätta?",
+        "webtoon-override": "Byter till Webtoon-läge eftersom bilderna representerar en webtoon.",
+        "confirm-reset-server-settings": "Detta kommer att återställa dina inställningar till standard inställningar. Är du säker att du vill fortsätta?",
+        "person-image-downloaded": "Personomslag har nedladdats och applicerats.",
+        "k+-error": "Det uppstod ett fel under aktiveringen av din licens. Vänligen försök igen.",
+        "k+-reset-key": "Detta kommer att ogiltigförklara en tidigare registrering av din licens och låta dig registrera om en Kavita-instans.",
+        "email-sent-to-no-existing": "Den befintliga e-postadressen är inte giltig. En länk har sparats i loggarna. Be administratören om länken för att slutföra e-poständringen.",
+        "confirm-delete-series": "Är du säker att du vill radera denna serie? Filer på disken kommer inte påverkas.",
+        "server-settings-updated": "Serverinställningar uppdaterat",
+        "series-added-to-collection": "Serier tillagd i {{collectionName}} samling",
+        "chapter-deleted": "Kapitel raderat",
+        "regen-cover": "Ett jobb har lagts i kö för att regenerera omslagsbilden",
+        "no-updates": "Inga tillgängliga uppdateringar",
+        "reading-list-deleted": "Läslista raderad",
+        "collection-updated": "Samling uppdaterad",
+        "confirm-delete-reading-list": "Är du säker på att du vill radera läslistan? Kan ej ångras.",
+        "click-email-link": "Vänligen klicka på denna länk för att bekräfta din e-postadress. Du måste bekräfta för att kunna logga in.",
+        "series-added-to-reading-list": "Serier tillagda i läslista",
+        "chapter-added-to-reading-list": "Kapitel tillagd i läslista",
+        "multiple-added-to-reading-list": "Kapitel och Volymer tillagda i läslista",
+        "incognito-off": "Inkognitoläge är av. Framsteg kommer nu lagras.",
+        "series-deleted": "Serier raderat",
+        "email-sent": "E-post skickat till {{email}}",
+        "k+-license-saved": "Licensnyckel sparad, men är inte giltig. Klicka på kontrollera för att återvalidera prenumerationen. Första gångs registreringar kan ta en minut att bekräftas.",
+        "library-deleted": "Bibliotek {{name}} har raderats",
+        "no-next-chapter": "Kunde inte hitta nästa {{entity}}",
+        "no-prev-chapter": "Kunde inte hitta föregående {{entity}}",
+        "alert-long-running": "Detta är en tidskrävande process. Vänligen ge den tid att slutföras innan du startar processen igen.",
+        "confirm-delete-multiple-series": "Är du säker att du vill radera {{count}} serier? Filer på disken kommer inte påverkas.",
+        "confirm-delete-volume": "Är du säker att du vill radera denna volym? Filer på disken kommer inte påverkas.",
+        "anilist-token-expired": "Din AniList token har utgått. Scrobbling kommer inte längre fungera tills du återskapar den under Användarinställningar > Konto",
+        "must-select-library": "Minst ett bibliotek måste väljas",
+        "bulk-delete-libraries": "Är du säker att du vill radera {{count}} bibliotek?",
+        "bulk-scan": "Skanning av flera bibliotek sker linjärt. Det kan ta lång tid och kan i vissa fall inte slutföras beroende på bibliotekets storlek.",
+        "match-success": "Serier matchat korrekt",
+        "refresh-covers-queued": "Uppdatera omslag köad för {{name}}",
+        "library-file-analysis-queued": "Biblioteksfilanalys ställd i kö för {{name}}",
+        "load-next-chapter": "Nästa {{entity}} laddad",
+        "password-reset": "Återställ Lösenord",
+        "reset-base-url": "Återställ Bas URL",
+        "unauthorized-2": "Obehörig",
+        "unauthorized-1": "Du är inte behörig att visa denna sida.",
+        "confirm-delete-user": "Är du säker att du vill radera denna användare?",
+        "item-removed": "Objekt raderat",
+        "nothing-to-remove": "Inget att radera",
+        "select-files-warning": "Du måste välja filer för att kunna fortsätta",
+        "email-service-reset": "Återställ E-post Service",
+        "mark-read": "Markerad som Läst",
+        "email-not-sent": "E-postadressen som finns i filen är inte giltig och kan inte användas för att skicka. En länk har sparats i loggarna. Administratören kan tillhandahålla denna länk för att slutföra processen.",
+        "account-registration-complete": "Kontoregistrering slutförd",
+        "account-migration-complete": "Kontomigrering slutförd",
+        "collection-tag-deleted": "Samlingstagg raderat",
+        "reading-list-promoted": "Läslista rekommenderat",
+        "confirm-delete-collections": "Är du säker att du vill radera flera samlingar?",
+        "volume-deleted": "Volym raderat",
+        "volumes-added-to-reading-list": "Volym tillagd i läslista",
+        "reading-list-imported": "Läslista importerad",
+        "load-prev-chapter": "Föregående {{entity}} laddad",
+        "collections-deleted": "Samlingar raderat",
+        "stack-imported": "Stack Importerad",
+        "mark-unread": "Markerad som Oläst",
+        "confirm-delete-multiple-volumes": "Är du säker att du vill radera {{count}} volymer? Filer på disken kommer inte påverkas.",
+        "reading-lists-deleted": "Läslistor raderade",
+        "download-in-progress": "Nedladdningen är pågående. Vänligen vänta.",
+        "collection-not-owned": "Du äger inte denna samling",
+        "collections-promoted": "Samlingar rekommenderat",
+        "scrobble-gen-init": "Ett jobb har ställts i kö för att generera scrobble-händelser från tidigare läshistorik och betyg, och synkronisera dem med anslutna tjänster.",
+        "no-series-collection-warning": "Varning! Inga serier är valda, spara kommer radera Samling. Vill du fortsätta?",
+        "file-send-to": "Fil(er) e-postad till {{name}}",
+        "review-deleted": "Recension raderad",
+        "confirm-download-size": "{{entityType}} är {{size}}. Är du säker att du vill fortsätta?",
+        "k+-reset-key-success": "Din licens har avregistrerats. Använd knappen 'Redigera' för att registrera om din instans och återaktivera Kavita+",
+        "copied-to-clipboard": "Kopierat till urklipp",
+        "series-removed-want-to-read": "Serier raderat från Vill Läsa-listan",
+        "theme-missing": "Det aktiva temat finns inte längre. Vänligen uppdatera sidan.",
+        "confirm-library-type-change": "Att ändra bibliotekstypen kommer att trigga en ny skanning med olika parseregler och kan leda till att serier återskapas, vilket kan resultera i att du förlorar framsteg och bokmärken. Du bör göra en säkerhetskopia innan du gör detta. Är du säker på att du vill fortsätta?",
+        "confirm-regen-covers": "Uppdatera omslag kommer tvinga alla omslagsbilder att bli omkalkylerade. Detta är en krävande operation. Är du säker att du vill inte utföra en skanning istället?",
+        "confirm-download-size-ios": "iOS har problem med nedladdningar av filer som är större än 200MB, denna nedladdning kanske inte slutförs.",
+        "reading-lists-unpromoted": "Läslistor borttaget från rekommenderat",
+        "confirm-delete-theme": "Att ta bort detta tema kommer att radera det från disken. Du kan hämta det från temp-mappen innan borttagningen",
+        "smart-filter-deleted": "Smart Filter raderat",
+        "force-kavita+-refresh-success": "Kavita+ extern metadata har blivit ogiltigt",
+        "mal-token-required": "MAL Token krävs, ställ in under aAnvändarinställningar",
+        "delete-review": "Är du säker att du vill radera din recension?",
+        "alert-bad-theme": "Det finns en ogiltig eller osäker css-fil i temat. Vänligen lyft fram detta till din administratör. Återgår till mörkt tema.",
+        "library-created": "Bibliotek har skapats framgångsrikt. En skanning har startats.",
+        "anilist-token-updated": "AniList Token har uppdaterats",
+        "confirm-library-delete": "Är du säker att du vill radera {{name}} biblioteket? Denna åtgärd kan ej ångras.",
+        "confirm-delete-chapter": "Är du säker att du vill radera detta kapitel? Filer på disken kommer inte påverkas.",
+        "entity-read": "{{name}} är nu läst",
+        "email-service-reachable": "Kavita E-postanslutning Ansluten Framgångsrikt",
+        "entity-unread": "{{name}} är nu oläst",
+        "email-service-unresponsive": "E-post Service URL svarade inte.",
+        "generate-colorscape-queued": "Generera färgskala ställd i kö för {{name}}",
+        "password-updated": "Lösenordet har uppdaterats",
+        "forced-scan-queued": "En tvingad skanning har startats för {{name}}",
+        "age-restriction-updated": "Åldergräns har uppdaterats",
+        "email-sent-to": "Ett e-postmeddelande har skickats till din gamla e-postadress för bekräftelse.",
+        "change-email-no-email": "E-postadress har uppdaterats",
+        "reset-ip-address": "Återställ IP Adresser",
+        "no-pages": "Det finns inga sidor. Kavita kunde inte läsa detta arkiv.",
+        "list-doesnt-exist": "Denna lista finns inte",
+        "smart-filter-updated": "Skapat/Uppdaterat smart filter",
+        "reading-list-unpromoted": "Läslista borttaget från rekommenderat",
+        "collections-unpromoted": "Samlingar borttagen från rekommenderat",
+        "device-updated": "Enhet uppdaterad",
+        "device-created": "Enhet skapad",
+        "delete-device": "Är du säker att du vill radera denna enhet?",
+        "pdf-book-mode-screen-size": "Skärmen är för liten för Bokläge"
+    },
+    "pdf-layout-mode-pipe": {
+        "book": "Bokläge",
+        "single": "Enkel Sida",
+        "infinite-scroll": "Oändlig Skrollning",
+        "multiple": "Standard"
+    },
+    "read-time-pipe": {
+        "hours": "Timmar",
+        "hour": "Timme",
+        "less-than-hour": "<1 Timme"
+    },
+    "role-localized-pipe": {
+        "admin": "Admin",
+        "download": "Ladda ner",
+        "change-password": "Ändra Lösenord",
+        "bookmark": "Bokmärk",
+        "change-restriction": "Ändra begränsning",
+        "login": "Logga in",
+        "read-only": "Läsbehörighet",
+        "promote": "Marknadsföra"
+    },
+    "draggable-ordered-list": {
+        "instructions-alt": "När du anger ett nummer i omordningsinmatningen, kommer objektet att infogas på den platsen och alla andra objekt kommer att få sin ordning uppdaterad.",
+        "reorder-label": "Omordna",
+        "bulk-select-label": "Välj flera objekt",
+        "remove-item-alt": "Ta bort objekt"
+    },
+    "sort-field-pipe": {
+        "release-year": "Säppt År",
+        "time-to-read": "Tid att Läsa",
+        "random": "Slumpmässig",
+        "last-chapter-added": "Objekt Tillagt",
+        "read-progress": "Senast Läst",
+        "sort-name": "Sortera Namn",
+        "created": "Skapad",
+        "last-modified": "Senast Ändrad",
+        "average-rating": "Genomsnittligt Betyg"
+    },
+    "edit-person-modal": {
+        "general-tab": "{{edit-series-modal.general-tab}}",
+        "cover-image-tab": "{{edit-series-modal.cover-image-tab}}",
+        "loading": "{{common.loading}}",
+        "close": "{{common.close}}",
+        "mal-tooltip": "https://myanimelist.net/people/{MalId}/",
+        "anilist-tooltip": "https://anilist.co/staff/{AniListId}/",
+        "asin-tooltip": "https://www.amazon.com/stores/J.K.-Rowling/author/{ASIN}",
+        "description-label": "Beskrivning",
+        "required-field": "{{validations.required-field}}",
+        "download-coversdb": "Ladda ner från CoversDB",
+        "mal-id-label": "MAL Id",
+        "anilist-id-label": "AniList Id",
+        "hardcover-id-label": "Inbunden Id",
+        "name-label": "{{edit-series-modal.name-label}}",
+        "cover-image-description": "{{edit-series-modal.cover-image-description}}",
+        "cover-image-description-extra": "Alternativt kan du ladda ner omslag från CoversDB om tillgängligt.",
+        "save": "{{common.save}}",
+        "asin-label": "ASIN",
+        "role-label": "Roll",
+        "hardcover-tooltip": "https://hardcover.app/authors/{HardcoverId}",
+        "title": "{{personName}} Detaljer"
+    },
+    "day-breakdown": {
+        "title": "Dagsuppdelning",
+        "x-axis-label": "Veckodag",
+        "y-axis-label": "Läshändelser",
+        "no-data": "Inget framsteg, börja läsa"
+    },
+    "preferences": {
+        "vertical": "Vertikal",
+        "single": "Singel",
+        "pdf-page": "Klicka för sidvisning",
+        "fit-to-screen": "Anpassa till Skärmen",
+        "split-right-to-left": "Splitta Höger till Vänster",
+        "no-split": "Splitta inte",
+        "webtoon": "Webtoon",
+        "cards": "Kort",
+        "2-column": "2 Kolumner",
+        "list": "Lista",
+        "pdf-odd": "Ojämn",
+        "pdf-horizontal": "Skrolla Horisontellt",
+        "pdf-dark": "Mörk",
+        "left-to-right": "Vänster till Höger",
+        "pdf-light": "Ljus",
+        "original": "Original",
+        "double": "Dubbel",
+        "automatic": "Automatisk",
+        "double-manga": "Dubbel (Manga)",
+        "right-to-left": "Höger till Vänster",
+        "fit-to-height": "Passa in på Höjden",
+        "fit-to-width": "Passa in på Bredden",
+        "scroll": "Skrolla",
+        "horizontal": "Horisontell",
+        "pdf-multiple": "Standard",
+        "1-column": "1 Kolumn",
+        "pdf-vertical": "Skrolla Vertikalt",
+        "pdf-book": "Bok",
+        "up-to-down": "Upp till Ned",
+        "pdf-none": "Ingen",
+        "pdf-even": "Jämn",
+        "split-left-to-right": "Splitta Vänster till Höger"
+    },
+    "manga-format-stats": {
+        "format-header": "Format",
+        "data-table-label": "Datatabell",
+        "visualisation-label": "Visualisering",
+        "count-header": "Antal",
+        "title": "Format"
+    },
+    "publication-status-stats": {
+        "data-table-label": "Datatabell",
+        "year-header": "År",
+        "visualisation-label": "Visualisering",
+        "count-header": "Antal",
+        "title": "Publikationsstatus"
+    },
+    "validation": {
+        "required-field": "Detta fält krävs",
+        "valid-email": "Detta måste vara en giltig e-postadress",
+        "year-validation": "Detta måste vara ett giltigt år högre än 1000 och 4 tecken långt",
+        "password-validation": "Lösenord måste innehålla mellan 6 och 256 tecken"
+    },
+    "pdf-spread-mode-pipe": {
+        "odd": "Udda Spridningar",
+        "off": "Inga Spridningar",
+        "even": "Jämna Spridningar"
+    },
+    "browse-themes-modal": {
+        "title": "Bläddra Teman"
+    },
+    "infinite-scroller": {
+        "continuous-reading-next-chapter": "Nästa Kapitel",
+        "continuous-reading-prev-chapter-alt": "Skrolla upp för att hoppa till föregående kaptiel",
+        "continuous-reading-prev-chapter": "Föregående Kapitel",
+        "continuous-reading-next-chapter-alt": "Skrolla upp för att hoppa till nästa kapitel"
+    },
+    "kavitaplus-metadata-breakdown-stats": {
+        "description": "Kavita hämtar metadata (betyg, recensioner, rekommendationer, etc) långsamt över tid för kvalificerade serier.",
+        "completed-series-label": "Färdiga Serier",
+        "title": "Kavita+ Metadata Uppdelning",
+        "complete": "Alla Serier har metadata",
+        "errored-series-label": "Serier med Fel",
+        "no-data": "{{common.no-data}}"
+    },
+    "filter-comparison-pipe": {
+        "is-before": "Är före",
+        "equal": "Lika med",
+        "is-after": "Är efter",
+        "is-in-last": "Är i sista",
+        "contains": "Innehåller",
+        "ends-with": "Slutar med",
+        "matches": "Matchar",
+        "begins-with": "Börjar med",
+        "greater-than-or-equal": "Högre än eller lika med",
+        "not-equal": "Inte samma",
+        "is-not-in-last": "Är inte i sista",
+        "must-contains": "Måste Innehålla",
+        "is-empty": "Är Tom",
+        "greater-than": "Högre än",
+        "less-than": "Mindre än",
+        "less-than-or-equal": "Mindre än eller lika med",
+        "does-not-contain": "Innehåller inte"
+    },
+    "confirm": {
+        "cancel": "{{common.cancel}}",
+        "ok": "Ok",
+        "info": "Info",
+        "confirm": "Bekräfta",
+        "alert": "Varningsmeddelande"
+    },
+    "pdf-scroll-mode-pipe": {
+        "horizontal": "Horisontell",
+        "vertical": "Vertikal",
+        "page": "Tryck för att bläddra",
+        "wrapped": "Omslagen"
+    },
+    "next-expected-card": {
+        "title": "~{{date}}",
+        "upcoming-title": "Uppkommande"
+    },
+    "metadata-builder": {
+        "and": "Matcha allt av följande",
+        "add-rule": "Lägg till Regel",
+        "or": "Matcha något av följande",
+        "remove-rule": "Ta bort Rad"
+    },
+    "pdf-reader": {
+        "close-reader-alt": "Stäng Läsaren",
+        "light-theme-alt": "Ljust Tema",
+        "dark-theme-alt": "Mörkt Tema",
+        "toggle-incognito": "Stäng av Inkognitoläge",
+        "loading-message": "Laddar……PDFs kan ta längre än väntat",
+        "incognito-mode": "Inkognitoläge"
+    },
+    "log-level-pipe": {
+        "information": "Information",
+        "trace": "Spåra",
+        "warning": "Varning",
+        "debug": "Debug",
+        "critical": "Kritisk"
+    },
+    "collection-owner": {
+        "collection-created-label": "Skapad av: {{owner}}",
+        "collection-via-label": "via {{source}}"
+    },
+    "metadata-setting-field-pipe": {
+        "covers": "Omslag",
+        "age-rating": "{{metadata-fields.age-rating-title}}",
+        "people": "{{tabs.people-tab}}",
+        "summary": "{{filter-field-pipe.summary}}",
+        "publication-status": "{{edit-series-modal.publication-status-title}}",
+        "start-date": "{{manage-metadata-settings.enable-start-date-label}}",
+        "genres": "{{metadata-fields.genres-title}}",
+        "tags": "{{metadata-fields.tags-title}}",
+        "localized-name": "{{edit-series-modal.localized-name-label}}",
+        "chapter-summary": "Handling (Kapitel)",
+        "chapter-publisher": "{{person-role-pipe.publisher}} (Kapitel)",
+        "chapter-title": "Titel (Kapitel)",
+        "chapter-release-date": "Släppdatum (Kapitel)",
+        "chapter-covers": "Omslag (Kapitel)"
     }
 }
diff --git a/UI/Web/src/assets/langs/ta.json b/UI/Web/src/assets/langs/ta.json
new file mode 100644
index 000000000..73df4f370
--- /dev/null
+++ b/UI/Web/src/assets/langs/ta.json
@@ -0,0 +1,2339 @@
+{
+    "change-email": {
+        "cancel": "{{common.cancel}}",
+        "save": "{{common.save}}",
+        "valid-email": "{{சரிபார்ப்பு. வாலிட்-எமெயில்}}",
+        "reset": "{{common.reset}}}",
+        "edit": "{{common.edit}}}",
+        "email-title": "மின்னஞ்சல்",
+        "email-label": "புதிய மின்னஞ்சல்",
+        "current-password-label": "தற்போதைய கடவுச்சொல்",
+        "email-not-confirmed": "இந்த மின்னஞ்சல் உறுதிப்படுத்தப்படவில்லை",
+        "email-confirmed": "இந்த மின்னஞ்சல் உறுதிப்படுத்தப்பட்டுள்ளது",
+        "email-updated-title": "மின்னஞ்சல் புதுப்பிக்கப்பட்டது",
+        "email-updated-description": "உங்கள் கணக்கிற்கான மின்னஞ்சலை உறுதிப்படுத்த கீழே உள்ள பின்வரும் இணைப்பைப் பயன்படுத்தலாம். மின்னஞ்சல் அமைப்புகள் கட்டமைக்கப்பட்டிருந்தால், ஒரு மின்னஞ்சல் அனுப்பப்பட்டிருக்கும் மற்றும் மின்னஞ்சலை உறுதிப்படுத்த இணைப்பு பயன்படுத்தப்படலாம்.",
+        "setup-user-account": "பயனரின் கணக்கை அமைக்கவும்",
+        "invite-url-label": "முகவரி ஐ அழைக்கவும்",
+        "invite-url-tooltip": "இதை நகலெடுத்து புதிய தாவலில் ஒட்டவும்",
+        "has-invalid-email": "உங்களிடம் சரியான மின்னஞ்சல் தொகுப்பு இல்லை என்று தெரிகிறது. இந்த செயலை முடிக்க நிர்வாகி உங்களுக்கு ஒரு இணைப்பை அனுப்ப நிர்வாகம் தேவைப்படும்.",
+        "permission-error": "உங்கள் மின்னஞ்சலை மாற்ற உங்களுக்கு இசைவு இல்லை. சேவையகத்தின் நிர்வாகியை அணுகவும்.",
+        "required-field": "{{validation.required-field}}"
+    },
+    "change-age-restriction": {
+        "age-restriction-label": "அகவை கட்டுப்பாடு",
+        "unknowns": "தெரியாதவர்கள்",
+        "reset": "{{common.reset}}}",
+        "edit": "{{common.edit}}}",
+        "cancel": "{{common.cancel}}",
+        "save": "{{common.save}}"
+    },
+    "api-key": {
+        "copy": "நகலெடு",
+        "show": "காட்டு",
+        "hide": "மறை",
+        "regen-warning": "உங்கள் பநிஇ விசையை மீண்டும் உருவாக்குவது ஏற்கனவே இருக்கும் எந்த வாடிக்கையாளர்களையும் செல்லாது.",
+        "no-key": "பிழை - விசை அமைக்கப்படவில்லை",
+        "confirm-reset": "நீங்கள் அமைக்கும் எந்த OPDS உள்ளமைவுகளையும் இது செல்லாது. நீங்கள் தொடர விரும்புகிறீர்களா?",
+        "key-reset": "பநிஇ விசை மீட்டமைப்பு"
+    },
+    "login": {
+        "title": "உங்கள் கணக்கில் உள்நுழைக",
+        "username": "{{common.username}}}",
+        "forgot-password": "கடவுச்சொல்லை மறந்துவிட்டீர்களா?",
+        "submit": "விடுபதிகை",
+        "password": "{{common.password}}}",
+        "password-validation": "{{சரிபார்ப்பு.போச்வேர்ட்-சரிபார்ப்பு}}"
+    },
+    "user-scrobble-history": {
+        "not-applicable": "பொருந்தாது",
+        "processed": "செயலாக்கப்பட்டது",
+        "not-processed": "செயலாக்கப்படவில்லை",
+        "special": "{{entity-title.special}}",
+        "data-header": "தகவல்கள்",
+        "title": "ச்க்ரோபல் வரலாறு",
+        "description": "உங்கள் கணக்குடன் இணைக்கப்பட்ட எந்தவொரு மோசமான நிகழ்வுகளையும் இங்கே காணலாம். நிகழ்வுகள் இருக்க, நீங்கள் ஒரு செயலில் உள்ள ச்க்ரோபில் வழங்குநரைக் கொண்டிருக்க வேண்டும். செயலாக்கப்பட்ட அனைத்து நிகழ்வுகளும் ஒரு மாதத்திற்குப் பிறகு அழிக்கப்படும். பதப்படுத்தப்படாத நிகழ்வுகள் இருந்தால், இவை அப்ச்ட்ரீமில் போட்டிகளை உருவாக்க முடியாது. அவற்றை சரிசெய்ய உங்கள் நிர்வாகியை அணுகவும்.",
+        "not-read-warning": "மேலோடை வழங்குநர்கள் எப்போதும் அதிக எண்ணிக்கையை வைத்திருப்பார்கள்",
+        "filter-label": "{{common.filter}}}",
+        "created-header": "உருவாக்கப்பட்டது",
+        "last-modified-header": "கடைசியாக மாற்றப்பட்டது",
+        "type-header": "வகை",
+        "series-header": "தொடர்",
+        "is-processed-header": "செயலாக்கப்படுகிறது",
+        "no-data": "தரவு இல்லை",
+        "volume-and-chapter-num": "தொகுதி {{v}} அத்தியாயம் {{n}}",
+        "volume-num": "தொகுதி {{}}",
+        "chapter-num": "அத்தியாயம் {{num}}",
+        "rating": "மதிப்பீடு {{r}}}"
+    },
+    "scrobble-event-type-pipe": {
+        "score-updated": "மதிப்பீட்டு புதுப்பிப்பு",
+        "want-to-read-add": "படிக்க விரும்புகிறேன்: சேர்",
+        "want-to-read-remove": "படிக்க விரும்புகிறேன்: அகற்று",
+        "review": "புதுப்பிப்பு மதிப்பாய்வு",
+        "chapter-read": "முன்னேற்றம் வாசிப்பு"
+    },
+    "spoiler": {
+        "click-to-show": "ச்பாய்லர், காட்ட சொடுக்கு செய்க"
+    },
+    "theme-manager": {
+        "set-default": "இயல்புநிலையை அமைக்கவும்",
+        "default-theme": "இயல்புநிலை",
+        "download": "{{changelog.download}}}",
+        "downloaded": "பதிவிறக்கம்",
+        "downloadable": "பதிவிறக்கம் செய்யக்கூடியது",
+        "apply": "{{common.apply}}}",
+        "applied": "பயன்படுத்தப்பட்டது",
+        "active-theme": "செயலில்",
+        "site-themes": "தள கருப்பொருள்கள்",
+        "title": "கருப்பொருள் மேலாளர்",
+        "description": "கவிதா எனது வண்ணங்களில் வருகிறார், உங்கள் தேவைகளைப் நிறைவு செய்யும் வண்ணத் திட்டத்தைக் கண்டுபிடி அல்லது ஒன்றை நீங்களே உருவாக்கி பகிர்ந்து கொள்ளுங்கள். உங்கள் கணக்கிற்கு கருப்பொருள்கள் பயன்படுத்தப்படலாம் அல்லது எல்லா கணக்குகளுக்கும் பயன்படுத்தப்படலாம்.",
+        "updated-toastr": "தள இயல்புநிலை {{name}} க்கு புதுப்பிக்கப்பட்டுள்ளது",
+        "scan-queued": "ஒரு தள கருப்பொருள் ச்கேன் வரிசையில் உள்ளது",
+        "delete": "{{common.delete}}",
+        "drag-n-drop": "{{கவர்-இமேச்-சாய்சர்.ராக்-அண்ட்-டிராப்}}",
+        "upload": "{{கவர்-இமேச்-சாய்சர்.ப்லோட்}}}",
+        "upload-continued": "ஒரு சிஎச்எச் கோப்பு",
+        "preview-default": "முதலில் ஒரு கருப்பொருளைத் தேர்ந்தெடுக்கவும்",
+        "preview-default-admin": "முதலில் ஒரு கருப்பொருளைத் தேர்ந்தெடுக்கவும் அல்லது கைமுறையாக பதிவேற்றவும்",
+        "preview-title": "முன்னோட்டம்",
+        "add": "{{common.add}}}"
+    },
+    "user-stats": {
+        "library-read-progress-title": "நூலகம் முன்னேற்றத்தைப் படியுங்கள்",
+        "read-percentage": "% படிக்க"
+    },
+    "top-readers": {
+        "title": "சிறந்த வாசகர்கள்",
+        "time-selection-label": "காலக்கெடு",
+        "comics-label": "காமிக்ச்: {{value}} hrs",
+        "manga-label": "மங்கா: {{value}} மணி",
+        "books-label": "புத்தகங்கள்: {{value}} hrs",
+        "this-week": "{{நேர-காலங்கள். இந்த வார}}",
+        "last-7-days": "{{நேர-காலங்கள். லாச்ட் -7 நாட்கள்}}",
+        "last-30-days": "{{நேர-காலங்கள். லாச்ட் -30 நாட்கள்}}",
+        "last-90-days": "{{நேர-காலங்கள். லாச்ட் -90 நாட்கள்}}",
+        "last-year": "{{நேர-காலங்கள். லாச்ட் ஆண்டு}}",
+        "all-time": "{{time-phetiods.all-time}}"
+    },
+    "role-selector": {
+        "title": "பாத்திரங்கள்",
+        "deselect-all": "{{common.deselect-all}}",
+        "select-all": "{{common.select-all}}"
+    },
+    "directory-picker": {
+        "title": "ஒரு கோப்புறையைத் தேர்வுசெய்க",
+        "close": "{{common.close}}",
+        "path-label": "பாதை",
+        "path-placeholder": "தட்டச்சு செய்யத் தொடங்குங்கள் அல்லது பாதையைத் தேர்ந்தெடுக்கவும்",
+        "instructions": "அதை உள்ளிட ஒரு கோப்புறையைத் தேர்ந்தெடுக்கவும். உங்கள் கோப்புறையைப் பார்க்கவில்லையா? சரிபார்க்க / முதலில் முயற்சிக்கவும்.",
+        "type-header": "வகை",
+        "name-header": "பெயர்",
+        "cancel": "{{common.cancel}}",
+        "share": "பங்கு",
+        "help": "{{common.help}}}"
+    },
+    "publication-status-pipe": {
+        "ongoing": "நடந்து கொண்டிருக்கிறது",
+        "hiatus": "இடைவெளி",
+        "completed": "முடிந்தது",
+        "cancelled": "ரத்து செய்யப்பட்டது",
+        "ended": "முடிந்தது"
+    },
+    "person-role-pipe": {
+        "artist": "கலைஞர்",
+        "character": "எழுத்து",
+        "colorist": "வண்ணமயமான",
+        "cover-artist": "{{artist}}",
+        "editor": "திருத்தி",
+        "inker": "ஈட்டி",
+        "letterer": "லெட்டர்",
+        "penciller": "பென்சில்லர்",
+        "publisher": "வெளியீட்டாளர்",
+        "writer": "எழுத்தாளர்",
+        "other": "மற்றொன்று",
+        "imprint": "முத்திரை",
+        "translator": "மொழிபெயர்",
+        "team": "{{வடிகட்டி-புலம்-பைப்.டீம்}}}",
+        "location": "{{வடிகட்டி-புலம்-பைப்.லேசன்}}"
+    },
+    "manga-format-pipe": {
+        "epub": "எபப்",
+        "archive": "காப்பகம்",
+        "image": "படம்",
+        "pdf": "பி.டி.எஃப்",
+        "unknown": "தெரியவில்லை"
+    },
+    "library-type-pipe": {
+        "book": "நூல்",
+        "comic": "காமிக்",
+        "manga": "மங்கா",
+        "comicVine": "காமிக் கொடியின்",
+        "image": "படம்",
+        "lightNovel": "ஒளி நாவல்"
+    },
+    "age-rating-pipe": {
+        "unknown": "தெரியவில்லை",
+        "early-childhood": "ஆரம்பகால குழந்தை பருவ",
+        "adults-only": "பெரியவர்கள் 18+ மட்டுமே",
+        "everyone": "எல்லோரும்",
+        "everyone-10-plus": "எல்லோரும் 10+",
+        "g": "G",
+        "kids-to-adults": "பெரியவர்களுக்கு குழந்தைகள்",
+        "mature": "முதிர்ந்த",
+        "ma15-plus": "MA15 +",
+        "mature-17-plus": "முதிர்ந்த 17+",
+        "rating-pending": "மதிப்பீடு நிலுவையில் உள்ளது",
+        "teen": "டீன் ஏச்",
+        "x18-plus": "X18+",
+        "not-applicable": "பொருந்தாது",
+        "pg": "பக்",
+        "r18-plus": "R18+"
+    },
+    "reset-password": {
+        "title": "கடவுச்சொல் மீட்டமைப்பு",
+        "description": "உங்கள் கணக்கின் மின்னஞ்சலை உள்ளிடவும். செல்லுபடியாகும் கோப்பில் இருந்தால் கவிதா உங்களுக்கு ஒரு மின்னஞ்சல் அனுப்புவார், இல்லையெனில் உங்கள் கடவுச்சொல்லை மீட்டமைக்க நிர்வாகியிடம் கேளுங்கள்.",
+        "email-label": "{{common.email}}}",
+        "required-field": "{{validation.required-field}}",
+        "valid-email": "{{சரிபார்ப்பு. வாலிட்-எமெயில்}}",
+        "submit": "{{common.submit}}}"
+    },
+    "license": {
+        "activate": "செயல்படுத்து",
+        "renew": "புதுப்பித்தல்",
+        "no-license-key": "உரிமம் இல்லை",
+        "license-valid": "உரிமம் செல்லுபடியாகும்",
+        "license-not-valid": "உரிமம் செல்லுபடியாகாது",
+        "loading": "{{common.loading}}}",
+        "help-label": "{{common.help}}}",
+        "activate-save": "{{common.save}}",
+        "edit": "{{common.edit}}}",
+        "buy": "வாங்க",
+        "title": "கவிதா+ உரிமம்",
+        "manage": "நிர்வகிக்கவும்",
+        "invalid-license-tooltip": "உங்கள் சந்தா முடிந்திருந்தால், புதிய சந்தாவை உருவாக்க நீங்கள் ஆதரவை மின்னஞ்சல் செய்ய வேண்டும்",
+        "check": "சரிபார்",
+        "cancel": "{{common.cancel}}",
+        "activate-description": "ச்ட்ரைப் மூலம் பதிவு செய்யப் பயன்படுத்தப்படும் உரிம விசை மற்றும் மின்னஞ்சலை உள்ளிடவும்",
+        "activate-license-label": "உரிம விசை",
+        "activate-email-label": "{{common.email}}}",
+        "activate-discordId-label": "டிச்கார்ட் பயனர் ஐடி",
+        "activate-discordId-tooltip": "உங்கள் முரண்பாட்டுக் கணக்கை கவிதா+உடன் இணைக்கவும். கவிதாவை வடிவமைக்க உதவும் மறைக்கப்பட்ட சேனல்களை அணுக இது வழங்குகிறது.",
+        "discord-validation": "இது செல்லுபடியாகும் முரண்பாடு பயனர் ஐடி அல்ல. உங்கள் பயனர் ஐடி உங்கள் முரண்பாடான பயனர்பெயர் அல்ல.",
+        "activate-delete": "{{common.delete}}",
+        "activate-reset": "{{common.reset}}}",
+        "activate-reset-tooltip": "உங்கள் உரிமத்தைப் பயன்படுத்தி முந்தைய பதிவை செல்லாது. உரிமம் மற்றும் மின்னஞ்சல் இரண்டுமே தேவை",
+        "kavita+-desc-part-1": "கவிதா+ என்பது காப்பீடு சந்தா சேவையாகும், இது இந்த கவிதா நிகழ்வில் உள்ள அனைத்து பயனர்களுக்கும் அம்சங்களைத் திறக்கும். திறக்க சந்தா வாங்கவும் ",
+        "kavita+-desc-part-2": "காப்பீடு நன்மைகள்",
+        "kavita+-desc-part-3": "இன்று!",
+        "kavita+-requirement": "கவிதா+ அண்மைக் கால வெளியீடு - 2 பதிப்புகளுடன் மட்டுமே வேலை செய்ய வடிவமைக்கப்பட்டுள்ளது. அதற்கு வெளியே எதுவும் வேலை செய்யாததற்கு உட்பட்டது."
+    },
+    "series-detail": {
+        "writers-title": "{{metadata-fields.writers-title}}}",
+        "cover-artists-title": "{{metadata-fields.cover-artists-title}}}",
+        "characters-title": "{{metadata-fields.Characters-title}}}",
+        "colorists-title": "{{metadata-fields.colorists-title}}}",
+        "editors-title": "{{metadata-fields.editors-title}}",
+        "inkers-title": "{{metadata-fields.inkers-title}}}",
+        "letterers-title": "{{metadata-fields.letterers-title}}",
+        "no-pages": "{{doasts.no-பக்கங்கள்}}",
+        "locations-title": "{{metadata-fields.locations-title}}}",
+        "genres-title": "{{metadata-fields.genres-title}}",
+        "tags-title": "{{metadata-fields.tags-title}}}",
+        "ongoing": "{{வெளியீட்டு-நிலை-பைப்.ங்கோயிங்}}",
+        "release-date-title": "வெளியீடு",
+        "page-settings-title": "பக்க அமைப்புகள்",
+        "close": "{{common.close}}",
+        "layout-mode-label": "{{பயனர்-முன்னுரிமைகள்.லேவுட்-மோட்-புக்-லேபிள்}}}",
+        "layout-mode-option-card": "அட்டை",
+        "layout-mode-option-list": "பட்டியல்",
+        "continue-from": "{{title}} தொடரவும்",
+        "read": "{{common.read}}}",
+        "continue": "தொடரவும்",
+        "read-incognito": "மறைமுகத்தைப் படியுங்கள்",
+        "continue-incognito": "மறைமுகத்தைத் தொடரவும்",
+        "read-options-alt": "விருப்பங்களைப் படியுங்கள்",
+        "incognito": "மறைநிலை",
+        "remove-from-want-to-read": "{{actionable.remove-from-want-to-read}}",
+        "add-to-want-to-read": "{{actionable.add-to-want-to-read}}",
+        "edit-series-alt": "தகவலைத் திருத்தவும்",
+        "reviews-tab": "{{tabs.reviews-tab}}}",
+        "storyline-tab": "{{tabs.storyline-tab}}}",
+        "books-tab": "{{tabs.books-tab}}",
+        "volumes-tab": "{{tabs.volumes-tab}}}",
+        "specials-tab": "{{tabs.specials-tab}}}",
+        "related-tab": "{{tabs.-related-tab}}}",
+        "details-tab": "{{tabs.details-tab}}}",
+        "info-tab": "{{tabs.info தாவல்}}}",
+        "recommendations-tab": "{{tabs.recommentations-tab}}",
+        "send-to": "கோப்பு {{deviceName}} க்கு மின்னஞ்சல் செய்யப்பட்டது",
+        "no-chapters": "இந்த தொகுதிக்கு அத்தியாயங்கள் எதுவும் இல்லை. படிக்க முடியாது.",
+        "cover-change": "உங்கள் உலாவி படத்தைப் புதுப்பிக்க ஒரு மணித்துளி வரை ஆகலாம். அதுவரை, பழைய படம் சில பக்கங்களில் காட்டப்படலாம்.",
+        "translators-title": "{{மெட்டாடேட்டா-ஃபீல்ட்ச். டிரான்ச்லேட்டர்கள்-தலைப்பு}}",
+        "pencillers-title": "{{மெட்டாடேட்டா-ஃபீல்ட்ச்.பென்சில்லர்ச்-தலைப்பு}}}",
+        "publishers-title": "{{metadata-fields.publishers-title}}",
+        "imprints-title": "{{metadata-fields.imprints-title}}}",
+        "teams-title": "{{metadata-fields.Teams-title}}",
+        "volume-num": "{{comman.volume-number}}",
+        "reading-lists-title": "{{side-nav.reading-lists}}",
+        "pages-count": "{{num}} பக்கங்கள்",
+        "words-count": "{{num}} சொற்கள்",
+        "weblinks-title": "இணைப்புகள்",
+        "more-alt": "மேலும்",
+        "time-left-alt": "நேரம் மீதமுள்ளது",
+        "time-to-read-alt": "{{sort-field-pipe.time-to-read}}",
+        "scrobbling-tooltip": "{{settings.scrobbling}}}",
+        "publication-status-title": "வெளியீடு",
+        "publication-status-tooltip": "வெளியீட்டு நிலை"
+    },
+    "external-rating": {
+        "close": "{{common.close}}",
+        "entry-label": "விவரங்களைக் காண்க",
+        "kavita-tooltip": "உங்கள் மதிப்பீடு + ஒட்டுமொத்தமாக",
+        "kavita-rating-title": "உங்கள் மதிப்பீடு"
+    },
+    "badge-expander": {
+        "more-items": "மேலும் {{count}} மேலும்"
+    },
+    "update-notification-modal": {
+        "title": "புதிய புதுப்பிப்பு கிடைக்கிறது!",
+        "close": "{{common.close}}",
+        "help": "புதுப்பிப்பது எப்படி",
+        "download": "பதிவிறக்கம்"
+    },
+    "side-nav-companion-bar": {
+        "page-settings-title": "{{தொடர்-detail.page-settings-title}}",
+        "open-filter-and-sort": "திறந்த வடிகட்டுதல் மற்றும் வரிசையாக்கம்",
+        "close-filter-and-sort": "வடிகட்டுதல் மற்றும் வரிசையாக்கத்தை மூடு",
+        "filter-and-sort-alt": "வரிசைப்படுத்துதல் / வடிகட்டி"
+    },
+    "reader-settings": {
+        "theme-dark": "இருண்ட",
+        "theme-black": "கருப்பு",
+        "theme-white": "வெள்ளை",
+        "theme-paper": "காகிதம்",
+        "general-settings-title": "பொது அமைப்புகள்",
+        "font-family-label": "{{பயனர்-முன்னுரிமைகள்.பொன்ட்-குடும்ப-லேபிள்}}",
+        "font-size-label": "{{பயனர்-முன்னுரிமைகள்.பொன்ட்-அளவு-புத்தக-லேபிள்}}",
+        "line-spacing-label": "{{பயனர்-முன்னுரிமை. லைன்-உயரம்-புத்தக-லேபிள்}}",
+        "margin-label": "{{பயனர்-முன்னுரிமைகள்.மார்சின்-புத்தக-லேபிள்}}",
+        "reset-to-defaults": "இயல்புநிலைகளுக்கு மீட்டமைக்கவும்",
+        "reader-settings-title": "வாசகர் அமைப்புகள்",
+        "reading-direction-label": "{{பயனர்-முன்னுரிமைகள். வாசிப்பு-திசை-புத்தக-லேபிள்}}",
+        "right-to-left": "வலமிருந்து இடமாக",
+        "left-to-right": "இடமிருந்து வலமாக",
+        "horizontal": "கிடைமட்டமாக",
+        "vertical": "செங்குத்து",
+        "writing-style-label": "{{பயனர்-முன்னுரிமைகள்.ரிட்டிங்-ச்டைல்-லேபிள்}}",
+        "writing-style-tooltip": "உரையின் திசையை மாற்றுகிறது. கிடைமட்டமானது இடமிருந்து வலமாக உள்ளது, செங்குத்து மேலிருந்து கீழாக உள்ளது.",
+        "tap-to-paginate-label": "மண்பாண்டத்தைத் தட்டவும்",
+        "tap-to-paginate-tooltip": "பாகினேட் செய்ய திரையின் விளிம்புகளைக் சொடுக்கு செய்க",
+        "on": "ஆன்",
+        "off": "அணை",
+        "immersive-mode-label": "{{பயனர்-முன்னுரிமைகள்.இமர்சைவ்-மோட்-லேபிள்}}}",
+        "immersive-mode-tooltip": "இது ரீடர் ஆவணத்தில் ஒரு கிளிக்கின் பின்னால் உள்ள மெனுவை மறைத்து, தட்டுதல்",
+        "fullscreen-label": "முழு திரை",
+        "fullscreen-tooltip": "முழுத்திரை பயன்முறையில் வாசகரை வைக்கவும்",
+        "exit": "வெளியேறு",
+        "enter": "உள்ளிடவும்",
+        "layout-mode-label": "{{பயனர்-முன்னுரிமைகள்.லேவுட்-மோட்-புக்-லேபிள்}}}",
+        "layout-mode-tooltip": "சுருள்: எபப் கோப்பு (பொதுவாக ஒரு அத்தியாயத்திற்கு ஒரு நீண்ட ச்க்ரோலிங் பக்கம்). 
           1 நெடுவரிசை: ஒரு நேரத்தில் ஒற்றை மெய்நிகர் பக்கத்தை உருவாக்குகிறது. -SIDE.",
+        "layout-mode-option-scroll": "சுருள்",
+        "layout-mode-option-1col": "1 நெடுவரிசை",
+        "layout-mode-option-2col": "2 நெடுவரிசை",
+        "color-theme-title": "வண்ண கருப்பொருள்"
+    },
+    "entity-title": {
+        "chapter": "{{பொதுவான. அத்தியாயம்-நம்}}",
+        "book-num": "{{common.book-num-sorthand}}}",
+        "vol-num": "{{பயனர்-ச்கிராப்-இச்டரி.வோலூம்-நம்}}",
+        "single-volume": "ஒற்றை தொகுதி",
+        "issue-num": "{{comman.issue-hash-num}}",
+        "special": "சிறப்பு"
+    },
+    "external-series-card": {
+        "open-external": "வெளிப்புற திறந்த"
+    },
+    "manage-system": {
+        "discord-title": "முரண்பாடு:",
+        "donations-title": "நன்கொடைகள்:",
+        "source-title": "ஆதாரம்:",
+        "feature-request-title": "அம்ச கோரிக்கைகள்:",
+        "localization-title": "உள்ளூர்மயமாக்கல்கள்:",
+        "updates-title": "வரலாற்றைப் புதுப்பிக்கவும்",
+        "wiki-title": "விக்கி:",
+        "title": "கணினி பற்றி",
+        "version-title": "பதிப்பு",
+        "installId-title": "ஐடியை நிறுவவும்",
+        "more-info-title": "மேலும் செய்தி",
+        "first-install-version-title": "முதல் நிறுவல் பதிப்பு",
+        "first-install-date-title": "முதலில் தேதி நிறுவவும்",
+        "home-page-title": "முகப்பு பக்கம்:"
+    },
+    "manage-tasks-settings": {
+        "title": "தொடர்ச்சியான பணிகள்",
+        "library-scan-label": "நூலக ச்கேன்",
+        "bust-locale-task": "மார்பளவு லோகேல் கேச்",
+        "clean-up-want-to-read-task-desc": "பயனர்கள் முழுமையாகப் படித்த எந்தவொரு தொடரையும் நீக்குகிறது, அவை படிக்க விரும்புகின்றன மற்றும் நிறைவு செய்யப்பட்ட வெளியீட்டு நிலையைக் கொண்டுள்ளன. ஒவ்வொரு 24 மணி நேரத்திற்கும் இயங்கும்.",
+        "backup-database-task-success": "தரவுத்தளத்தை காப்புப் பிரதி எடுப்பதற்கான வேலை வரிசையில் உள்ளது",
+        "download-logs-task": "பதிவுகள் பதிவிறக்கவும்",
+        "download-logs-task-desc": "எல்லா பதிவு கோப்புகளையும் ஒரு சிப்பில் தொகுத்து பதிவிறக்கவும்.",
+        "library-scan-tooltip": "நூலகக் கோப்புகளைச் சுற்றி கவிதா மெட்டாடேட்டாவை எத்தனை முறை ச்கேன் செய்து புதுப்பிப்பார்.",
+        "library-database-backup-label": "கவிதா காப்புப்பிரதி",
+        "library-database-backup-tooltip": "கவிதா தரவுத்தளம் மற்றும் பிற தொடர்புடைய கோப்புகளை எவ்வளவு அடிக்கடி காப்புப் பிரதி எடுப்பார்.",
+        "cleanup-label": "தூய்மைப்படுத்துதல்",
+        "cleanup-tooltip": "கவிதா தூய்மைப்படுத்தும் பணிகளை எத்தனை முறை இயக்குவார். இது கனமாக இருக்கலாம் மற்றும் பெரும்பாலான சந்தர்ப்பங்களில் நள்ளிரவில் செய்யப்பட வேண்டும்",
+        "adhoc-tasks-title": "தற்காலிக பணிகள்",
+        "job-title-header": "வேலை தலைப்பு",
+        "description-header": "விவரம்",
+        "action-header": "செயல்",
+        "reset-to-default": "{{பொதுவான.",
+        "reset": "{{common.reset}}}",
+        "save": "{{common.save}}",
+        "required": "{{சரிபார்ப்பு.",
+        "custom-label": "தனிப்பயன் அட்டவணை (CRON குறியீடு)",
+        "cron-notation": "இது செல்லுபடியாகும் கிரான் குறியீடு அல்ல",
+        "recurring-tasks-title": "{{title}}",
+        "last-executed-header": "கடைசியாக செயல்படுத்தப்பட்டது",
+        "cron-header": "க்ரோன்",
+        "disabled": "முடக்கப்பட்டது",
+        "daily": "நாள்தோறும்",
+        "weekly": "வாராந்திர",
+        "custom": "தனிப்பயன்",
+        "convert-media-task": "குறியாக்கத்தை குறிவைக்க ஊடகத்தை மாற்றவும்",
+        "convert-media-task-desc": "கவிதா நிர்வகிக்கப்பட்ட அனைத்து ஊடகங்களையும் இலக்கு குறியாக்கத்திற்கு மாற்றும் நீண்டகால பணியை இயக்குகிறது. இது மெதுவாக உள்ளது (குறிப்பாக கை சாதனங்களில்).",
+        "convert-media-task-success": "மீடியாவை இலக்கு குறியாக்கத்திற்கு மாற்றுவது வரிசையில் உள்ளது",
+        "bust-cache-task": "மார்பளவு கேச்",
+        "bust-cache-task-desc": "கவிதா+ கேச் - மோசமான போட்டிகளை பிழைத்திருத்தும்போது மட்டுமே பயன்படுத்தப்பட வேண்டும்.",
+        "bust-cache-task-success": "கவிதா+ கேச் சிதைந்தது",
+        "bust-locale-task-desc": "லோகேல் தற்காலிக சேமிப்பை உடைக்கிறது. இது புதுப்பிப்புக்குப் பிறகு சரியாகக் காட்டாத சரங்களுக்கான சிக்கல்களை சரிசெய்ய முடியும். உலாவி புதுப்பிப்பு தேவை.",
+        "bust-locale-task-success": "லோகேல் கேச் சிதைந்தது",
+        "clear-reading-cache-task": "தெளிவான வாசிப்பு தற்காலிக சேமிப்பு",
+        "clear-reading-cache-task-desc": "வாசிப்புக்கு கேச் கோப்புகளை அழிக்கவும். கடந்த 24 மணி நேரத்திற்குள் நீங்கள் முன்பு படித்துக்கொண்டிருந்த ஒரு கோப்பை நீங்கள் புதுப்பித்தபோது பயனுள்ளதாக இருக்கும்.",
+        "clear-reading-cache-task-success": "கேச் அழிக்கப்பட்டது",
+        "clean-up-want-to-read-task": "தூய்மை படிக்க விரும்புகிறேன்",
+        "clean-up-want-to-read-task-success": "படிக்க விரும்புவது தூய்மை செய்யப்பட்டுள்ளது",
+        "clean-up-task": "பொது தூய்மைப்படுத்துதல்",
+        "clean-up-task-desc": "சேவையகத்தில் இரவு தூய்மைப்படுத்தும் செயல்பாடுகளைச் செய்கிறது. கனமாக இருக்க முடியும், செயலில் உள்ள பயனர்களுடன் அல்லது ச்கேன் செய்ய வேண்டாம் என்று அறிவுறுத்தலாம். ஒவ்வொரு 24 மணி நேரத்திற்கும் இயங்கும்.",
+        "clean-up-task-success": "தூய்மைப்படுத்தல் முடிந்தது",
+        "backup-database-task": "காப்பு தரவுத்தளம்",
+        "backup-database-task-desc": "தரவுத்தளம், புக்மார்க்குகள், கருப்பொருள்கள், கைமுறையாக பதிவேற்றப்பட்ட கவர்கள் மற்றும் கட்டமைப்பு கோப்புகளின் காப்புப்பிரதியை எடுக்கிறது.",
+        "sync-themes-task": "கருப்பொருள்களை ஒத்திசைக்கவும்",
+        "sync-themes-task-desc": "பதிப்பு பொருந்தினால் மேலோடை மாற்றங்களுடன் பதிவிறக்கம் செய்யப்பட்ட கருப்பொருள்களை ஒத்திசைக்கவும்.",
+        "sync-themes-success": "கருப்பொருள்களின் ஒத்திசைவு வரிசையில் உள்ளது",
+        "check-for-updates-task": "புதுப்பிப்புகளை சரிபார்க்கவும்",
+        "check-for-updates-task-desc": "உங்கள் பதிப்பிற்கு முன்னதாக ஏதேனும் நிலையான வெளியீடுகள் உள்ளதா என்று பாருங்கள்."
+    },
+    "metadata-filter": {
+        "age-rating-label": "{{metadata-fields.age- மதிப்பீட்டு-தலைப்பு}}",
+        "language-label": "{{metadata-fields.language-title}}}",
+        "publication-status-label": "வெளியீட்டு நிலை",
+        "series-name-label": "தொடர் பெயர்",
+        "series-name-tooltip": "தொடர் பெயர் பெயர், வரிசை பெயர் அல்லது உள்ளூர்மயமாக்கப்பட்ட பெயருக்கு எதிராக வடிகட்டப்படும்",
+        "release-label": "வெளியீடு",
+        "min": "மணித்துளி",
+        "max": "அதிகபட்சம்",
+        "in-progress": "முன்னேற்றத்தில் உள்ளது",
+        "rating-label": "செயல்வரம்பு",
+        "filter-title": "{{common.filter}}}",
+        "sort-by-label": "வரிசைப்படுத்தவும்",
+        "filter-name-label": "வடிகட்டி பெயர்",
+        "ascending-alt": "ஏறுதல்",
+        "descending-alt": "இறங்கு",
+        "reset": "{{common.reset}}}",
+        "apply": "{{common.apply}}}",
+        "save": "{{common.save}}",
+        "limit-label": "வரம்பு",
+        "format-label": "வடிவம்",
+        "libraries-label": "நூலகங்கள்",
+        "collections-label": "சேகரிப்புகள்",
+        "genres-label": "{{metadata-fields.genres-title}}",
+        "tags-label": "{{metadata-fields.tags-title}}}",
+        "cover-artist-label": "கவர் கலைஞர்",
+        "writer-label": "எழுத்தாளர்",
+        "publisher-label": "வெளியீட்டாளர்",
+        "penciller-label": "பென்சில்லர்",
+        "letterer-label": "லெட்டர்",
+        "inker-label": "ஈட்டி",
+        "editor-label": "திருத்தி",
+        "colorist-label": "வண்ணமயமான",
+        "character-label": "எழுத்து",
+        "translator-label": "மொழிபெயர்",
+        "read-progress-label": "முன்னேற்றத்தைப் படியுங்கள்",
+        "unread": "படிக்காதது",
+        "read": "படிக்க"
+    },
+    "edit-series-modal": {
+        "penciller-label": "{{மெட்டாடேட்டா-ஃபீல்ட்ச்.பென்சில்லர்ச்-தலைப்பு}}}",
+        "letterer-label": "{{metadata-fields.letterers-title}}",
+        "inker-label": "{{metadata-fields.inkers-title}}}",
+        "editor-label": "{{metadata-fields.editors-title}}",
+        "colorist-label": "{{metadata-fields.colorists-title}}}",
+        "character-label": "{{metadata-fields.Characters-title}}}",
+        "translator-label": "{{மெட்டாடேட்டா-ஃபீல்ட்ச். டிரான்ச்லேட்டர்கள்-தலைப்பு}}",
+        "team-label": "{{metadata-fields.Teams-title}}",
+        "location-label": "{{metadata-fields.locations-title}}}",
+        "language-label": "{{metadata-fields.language-title}}}",
+        "age-rating-label": "{{metadata-fields.age- மதிப்பீட்டு-தலைப்பு}}",
+        "publication-status-label": "வெளியீட்டு நிலை",
+        "required-field": "{{சரிபார்ப்பு.",
+        "close": "{{common.close}}",
+        "name-label": "பெயர்",
+        "sort-name-label": "பெயரை வரிசைப்படுத்துங்கள்",
+        "localized-name-label": "உள்ளூர்மயமாக்கப்பட்ட பெயர்",
+        "summary-label": "சுருக்கம்",
+        "release-year-label": "{{sort-field-pipe.release- ஆண்டு}}",
+        "web-link-description": "இங்கே நீங்கள் வெளிப்புற சேவைகளுக்கு பல வேறுபட்ட இணைப்புகளைச் சேர்க்கலாம்.",
+        "web-link-label": "{{tabs.weblink-tab}}}",
+        "title": "{{seriesName}} விவரங்கள்",
+        "general-tab": "{{tabs.jenoral-tab}}}",
+        "metadata-tab": "{{tabs.metadata-tab}}}",
+        "people-tab": "{{tabs.people-tab}}}",
+        "web-links-tab": "{{tabs.weblink-tab}}}",
+        "cover-image-tab": "{{tabs.cover-tab}}}",
+        "related-tab": "{{tabs.-related-tab}}}",
+        "info-tab": "{{tabs.info தாவல்}}}",
+        "tasks-tab": "{{tabs.tasks-tab}}",
+        "genres-label": "{{metadata-fields.genres-title}}",
+        "tags-label": "{{metadata-fields.tags-title}}}",
+        "cover-artist-label": "{{metadata-fields.cover-artists-title}}}",
+        "writer-label": "{{metadata-fields.writers-title}}}",
+        "publisher-label": "{{metadata-fields.publishers-title}}",
+        "imprint-label": "{{metadata-fields.imprints-title}}}",
+        "view-files": "கோப்புகளைக் காண்க",
+        "pages-title": "{{திருத்து-அத்தியாயம்-மோடல்.பேச்கள்-லேபல்}}",
+        "volume-num": "{{comman.volume-number}}",
+        "volumes-title": "{{tab.Volumes-tab}}}",
+        "cover-image-description": "பதிவேற்றி புதிய கவர் படத்தைத் தேர்வுசெய்க. பதிவேற்றுவதற்கு சேமி என்பதை அழுத்தவும், அட்டையை மேலெழுதவும்.",
+        "save": "{{common.save}}",
+        "field-locked-alt": "புலம் பூட்டப்பட்டுள்ளது",
+        "info-title": "தகவல்",
+        "library-title": "நூலகம்",
+        "format-title": "வடிவம்",
+        "created-title": "உருவாக்கப்பட்டது",
+        "last-read-title": "{{sort-field-pipe.read- முன்னேற்றம்}}",
+        "last-added-title": "கடைசி உருப்படி சேர்க்கப்பட்டது",
+        "last-scanned-title": "கடைசியாக ச்கேன்",
+        "folder-path-title": "கோப்புறை பாதை",
+        "folder-path-tooltip": "அனைத்து தொடர் கோப்புகளையும் கொண்ட நூலக ரூட்டிலிருந்து மிக உயர்ந்த பாதை",
+        "lowest-folder-path-title": "மிகக் குறைந்த கோப்புறை பாதை",
+        "lowest-folder-path-tooltip": "அனைத்து தொடர் கோப்புகளையும் கொண்ட நூலக ரூட்டிலிருந்து மிகக் குறைந்த பாதை",
+        "publication-status-title": "வெளியீட்டு நிலை",
+        "total-pages-title": "மொத்த பக்கங்கள்",
+        "total-words-title": "மொத்த சொற்கள்",
+        "total-items-title": "மொத்த உருப்படிகள்",
+        "max-items-title": "அதிகபட்ச உருப்படிகள்",
+        "size-title": "அளவு",
+        "loading": "{{common.loading}}}",
+        "added-title": "சேர்க்கப்பட்டது",
+        "last-modified-title": "கடைசியாக மாற்றப்பட்டது",
+        "words-title": "சொற்கள்",
+        "chapter-title": "பாடங்கள்",
+        "highest-count-tooltip": "தொடரில் அனைத்து காமிசின்ஃபோவிலும் மிக உயர்ந்த எண்ணிக்கை காணப்படுகிறது",
+        "max-issue-tooltip": "தொடரின் அனைத்து காமிசின்ஃபோவிலிருந்தும் அதிகபட்ச வெளியீடு அல்லது தொகுதி புலம்",
+        "force-refresh": "கட்டாய புதுப்பிப்பு",
+        "force-refresh-tooltip": "கவிதா+ இலிருந்து வெளிப்புற மெட்டாடேட்டாவை புதுப்பிக்கவும்",
+        "loose-leaf-volume": "தளர்வான இலை அத்தியாயங்கள்",
+        "specials-volume": "சிறப்பு",
+        "release-year-validation": "{{சரிபார்ப்பு.இயர்-சரிபார்ப்பு}}"
+    },
+    "manage-users": {
+        "pending-tooltip": "இந்த பயனர் தங்கள் மின்னஞ்சலை சரிபார்க்கவில்லை",
+        "title": "செயலில் உள்ள பயனர்கள்",
+        "pending-title": "நிலுவையில் உள்ளது",
+        "delete-user-tooltip": "பயனரை நீக்கு",
+        "edit-user-tooltip": "தொகு",
+        "edit-user-alt": "பயனரைத் திருத்து {{user}}",
+        "username-pattern": "பயனர்பெயர் பின்வரும் எழுத்துக்களையும் இடைவெளிகளையும் மட்டுமே கொண்டிருக்க முடியும்: {{characters}}",
+        "delete-user-alt": "பயனரை நீக்கு {{user}}",
+        "resend-invite-tooltip": "அழைப்பிதழ் மீண்டும்",
+        "resend-invite-alt": "{{user}} ஐ அழைக்கவும்",
+        "setup-user-tooltip": "அமைவு பயனர்",
+        "setup-user-alt": "பயனர் {{user}} அமைக்கவும்",
+        "change-password-tooltip": "கடவுச்சொல்லை மாற்றவும்",
+        "change-password-alt": "கடவுச்சொல்லை மாற்றவும் {{user}}",
+        "resend": "மீண்டும்",
+        "setup": "அமைவு",
+        "last-active-header": "கடைசியாக செயலில்",
+        "roles-header": "பாத்திரங்கள்",
+        "name-header": "பெயர்",
+        "none": "எதுவுமில்லை",
+        "never": "ஒருபோதும்",
+        "online-now-tooltip": "இப்போது ஆன்லைனில்",
+        "too-many-libraries": "நிறைய",
+        "sharing-header": "பகிர்வு",
+        "no-data": "வேறு பயனர்கள் இல்லை.",
+        "loading": "{{common.loading}}}",
+        "actions-header": "செயல்கள்",
+        "invite": "அழைக்கவும்",
+        "you-alt": "(நீங்கள்)"
+    },
+    "edit-collection-tags": {
+        "title": "திருத்து {{collectionName}} சேகரிப்பு",
+        "required-field": "{{சரிபார்ப்பு.",
+        "save": "{{common.save}}",
+        "close": "{{common.close}}",
+        "cancel": "{{common.cancel}}",
+        "general-tab": "{{tabs.jenoral-tab}}}",
+        "cover-image-tab": "{{tabs.cover-tab}}}",
+        "info-tab": "{{tabs.info தாவல்}}}",
+        "series-tab": "{{tabs.series-tab}}}",
+        "name-label": "பெயர்",
+        "deselect-all": "{{பொதுவான.",
+        "name-validation": "பெயர் தனித்துவமாக இருக்க வேண்டும்",
+        "select-all": "{{common.select-all}}",
+        "promote-label": "ஊக்குவிக்கவும்",
+        "filter-label": "{{common.filter}}}",
+        "promote-tooltip": "பதவி உயர்வு என்பது நிர்வாக பயனர்களுக்கு மட்டுமல்லாமல், குறிச்சொல்லைக் காண முடியும். இந்த குறிச்சொல்லைக் கொண்ட அனைத்து தொடர்களும் அவற்றில் பயனர் அணுகல் கட்டுப்பாடுகள் இருக்கும்.",
+        "summary-label": "சுருக்கம்",
+        "last-sync-title": "கடைசி ஒத்திசைவு:",
+        "last-sync-tooltip": "மேலோடை சேகரிப்பு வழங்குநருக்கு எதிராக கவிதா தினமும் ஒத்திசைக்கிறார்.",
+        "source-url-title": "மூல URL:",
+        "total-series-title": "மொத்த தொடர்:",
+        "missing-series-title": "காணாமல் போன தொடர்:"
+    },
+    "series-preview-drawer": {
+        "genres-label": "{{வடிகட்டி-ஃபீல்ட்-பைப்.சென்ரெச்}}",
+        "view-series": "தொடர்",
+        "staff-label": "பணியாளர்",
+        "tags-label": "{{வடிகட்டி-புலம்-பைப்.டேக்ச்}}",
+        "vols-and-chapters": "{{volCount}} தொகுதிகள் / {{chpCount}} அத்தியாயங்கள்",
+        "remove-from-want-to-read": "{{actionable.remove-from-want-to-read}}",
+        "add-to-want-to-read": "{{actionable.add-to-want-to-read}}",
+        "provided-by-label": "வழங்கியவர்"
+    },
+    "edit-chapter-modal": {
+        "summary-label": "{{edit-series-modal.summary-label}}",
+        "genres-label": "{{திருத்து-SERIES-MODAL.GENRES-LABEL}}",
+        "save": "{{common.save}}",
+        "title-label": "தலைப்பு",
+        "sort-order-label": "வரிசைப்படுத்தும் முறை",
+        "sort-order-tooltip": "இந்த அத்தியாயம் தொகுதிக்குள் ஆர்டர் செய்யப்பட்ட வாசிப்பு வரிசை",
+        "isbn-label": "ISBN",
+        "release-date-label": "வெளியீடு",
+        "tags-label": "{{edit-series-modal.tags-label}}}",
+        "writer-label": "{{edit-series-modal.writer-label}}",
+        "cover-artist-label": "{{edit-series-modal.cover-artist-label}}}",
+        "publisher-label": "{{edit-series-modal.publisher-label}}",
+        "imprint-label": "{{edit-series-modal.imprint-label}}",
+        "penciller-label": "{{edit-series-modal.penciller-label}}}",
+        "letterer-label": "{{edit-series-modal.letterer-label}}}",
+        "location-label": "{{வடிகட்டி-புலம்-பைப்.லேசன்}}",
+        "language-label": "{{edit-series-modal.language-lable}}",
+        "age-rating-label": "{{திருத்து-சீரிச்-மோடல்.சேச்-ரேட்டிங்-லேபிள்}}",
+        "general-tab": "{{tabs.jenoral-tab}}}",
+        "people-tab": "{{tabs.people-tab}}}",
+        "inker-label": "{{edit-series-modal.inker-label}}",
+        "editor-label": "{{edit-series-modal.editor-label}}",
+        "colorist-label": "{{edit-series-modal.colorist-label}}}",
+        "character-label": "{{edit-series-modal.charter-label}}",
+        "translator-label": "{{திருத்து-series-modal.translator-label}}}",
+        "team-label": "{{வடிகட்டி-புலம்-பைப்.டீம்}}}",
+        "weblink-tab": "{{tabs.weblink-tab}}}",
+        "field-locked-alt": "{{edit-series-modal.field-locked-alt}}}",
+        "cover-image-tab": "{{tabs.cover-tab}}}",
+        "tasks-tab": "{{tabs.tasks-tab}}",
+        "progress-tab": "{{tabs.progress-tab}}}",
+        "info-tab": "{{tabs.info தாவல்}}}",
+        "cover-image-description": "{{edit-series-modal.cover-image-description}}",
+        "tags-tab": "{{tabs.tags-tab}}}",
+        "pages-label": "பக்கங்கள்",
+        "words-label": "நீளம்",
+        "pages-count": "{{num}} பக்கங்கள்",
+        "words-count": "{{num}} சொற்கள்",
+        "reading-time-label": "நேரம் படிக்கவும்",
+        "date-added-label": "தேதி சேர்க்கப்பட்டது",
+        "size-label": "{{edit-series-modal.size-title}}",
+        "id-label": "ஐடி",
+        "close": "{{common.close}}",
+        "web-link-description": "{{edit-series-modal.web-link- விளக்கப்படம்}}",
+        "web-link-label": "{{edit-series-modal.web-link-label}}}",
+        "links-label": "{{metadata-fields.links-title}}",
+        "last-read-label": "{{sort-field-pipe.read- முன்னேற்றம்}}",
+        "range-hours": "{{value}} {{hourWord}}}",
+        "read-time-label": "நேரம் படிக்கவும்",
+        "files-label": "கோப்புகள்",
+        "title": "தொகு"
+    },
+    "edit-volume-modal": {
+        "save": "{{common.save}}",
+        "progress-tab": "{{tabs.progress-tab}}}",
+        "cover-image-tab": "{{tabs.cover-tab}}}",
+        "tasks-tab": "{{tabs.tasks-tab}}",
+        "words-label": "{{திருத்து-அத்தியாயம்-மோடல். நீட்சி-தலைப்பு}}",
+        "pages-count": "{{திருத்து-அத்தியாயம்-மோடல்.பேச்கள்-கவுண்ட்}}",
+        "words-count": "{{திருத்து-அத்தியாயம்-modal.words-count}}",
+        "reading-time-label": "{{திருத்து-அத்தியாயம்-மோடல். ரீடிங்-டைம்-லேபிள்}}",
+        "date-added-label": "{{திருத்து-அத்தியாயம்-மோடல்.டேட்-சேர்க்கப்பட்ட-லேபிள்}}",
+        "info-tab": "{{tabs.info தாவல்}}}",
+        "pages-label": "{{திருத்து-அத்தியாயம்-மாடல்.பேச்-கவுண்ட்}}",
+        "size-label": "{{திருத்து-அத்தியாயம்-மோடல்.சைச்-லேபிள்}}",
+        "id-label": "{{திருத்து-அத்தியாயம்-modal.id-label}}",
+        "links-label": "{{தொடர்-மெட்டாடேட்டா-டிடெயில்.லின்க்ச்-லேபல்}}",
+        "title": "தொகு",
+        "close": "{{common.close}}",
+        "last-read-label": "{{திருத்து-அத்தியாயம்-மோடல்.லச்ட்-ரீட்-லேபல்}}",
+        "range-hours": "{{value}} {{hourWord}}}",
+        "read-time-label": "{{திருத்து-அத்தியாயம்-மோடல்.ரெட்-டைம்-லேபிள்}}",
+        "files-label": "{{திருத்து-அத்தியாயம்-மோடல்.ஃபைல்கள்-லேபல்}}",
+        "cover-image-description": "{{edit-series-modal.cover-image-description}}"
+    },
+    "collection-detail": {
+        "last-sync": "கடைசி ஒத்திசைவு: {{date}}",
+        "item-count": "{{common.item-count}}}",
+        "no-data": "உருப்படிகள் இல்லை. ஒரு தொடரைச் சேர்க்க முயற்சிக்கவும்.",
+        "no-data-filtered": "எந்த உருப்படிகளும் உங்கள் தற்போதைய வடிப்பானுடன் பொருந்தவில்லை.",
+        "title-alt": "கவிதா - {{collectionName}} சேகரிப்பு",
+        "series-header": "தொடர்",
+        "sync-progress": "சேகரிக்கப்பட்ட தொடர்: {{title}}"
+    },
+    "all-collections": {
+        "title": "சேகரிப்புகள்",
+        "item-count": "{{common.item-count}}}",
+        "no-data": "வசூல் இல்லை.",
+        "create-one-part-1": "உருவாக்க முயற்சிக்கவும்",
+        "create-one-part-2": "ஒன்று"
+    },
+    "carousel-reel": {
+        "next-items": "அடுத்த உருப்படிகள்",
+        "prev-items": "முந்தைய உருப்படிகள்"
+    },
+    "draggable-ordered-list": {
+        "instructions-alt": "மறுவரிசை உள்ளீட்டில் நீங்கள் ஒரு எண்ணை வைக்கும்போது, அந்த இடத்தில் உருப்படி செருகப்படும், மற்ற எல்லா பொருட்களும் அவற்றின் ஆர்டரைப் புதுப்பிக்கும்.",
+        "bulk-select-label": "மொத்தமாக தேர்ந்தெடுக்கவும்",
+        "remove-item-alt": "உருப்படியை அகற்று",
+        "reorder-label": "மறுவரிசை"
+    },
+    "reading-lists": {
+        "title": "பட்டியல்களைப் படித்தல்",
+        "item-count": "{{common.item-count}}}",
+        "no-data": "வாசிப்பு பட்டியல்கள் எதுவும் இல்லை.",
+        "create-one-part-1": "உருவாக்க முயற்சிக்கவும்",
+        "create-one-part-2": "ஒன்று"
+    },
+    "reading-list-item": {
+        "remove": "{{common.remove}}",
+        "read": "{{common.read}}}"
+    },
+    "stream-list-item": {
+        "remove": "{{common.remove}}",
+        "load-filter": "சுமை வடிகட்டி",
+        "provided": "வழங்கப்பட்டது",
+        "smart-filter": "அறிவுள்ள வடிகட்டி",
+        "library": "நூலகம்",
+        "external-source": "வெளிப்புற மூல"
+    },
+    "reading-list-detail": {
+        "item-count": "{{common.item-count}}}",
+        "page-settings-title": "பக்க அமைப்புகள்",
+        "remove-read": "வாசிப்பை அகற்று",
+        "order-numbers-label": "ஆர்டர் எண்கள்",
+        "continue": "தொடரவும்",
+        "read": "{{common.read}}}",
+        "read-options-alt": "விருப்பங்களைப் படியுங்கள்",
+        "incognito-alt": "(மறைநிலை)",
+        "no-data": "எதுவும் சேர்க்கப்படவில்லை",
+        "characters-title": "{{metadata-fields.Characters-title}}}"
+    },
+    "events-widget": {
+        "title-alt": "செய்கைப்பாடு",
+        "dismiss-all": "அனைத்தையும் நிராகரிக்கவும்",
+        "more-info": "மேலும் தகவலுக்கு சொடுக்கு செய்க",
+        "update-available": "புதுப்பிப்பு கிடைக்கிறது",
+        "downloading-item": "பதிவிறக்கம் {{item}}",
+        "close": "{{common.close}}",
+        "users-online-count": "{{num}} பயனர்கள் ஆன்லைனில்",
+        "active-events-title": "செயலில் நிகழ்வுகள்:",
+        "no-data": "இங்கே அதிகம் நடக்கவில்லை",
+        "left-to-process": "செயலாக்க இடது: {{leftToProcess}}}",
+        "download-in-queue": "{{num}} வரிசையில் பதிவிறக்குகிறது"
+    },
+    "shortcuts-modal": {
+        "title": "விசைப்பலகை குறுக்குவழிகள்",
+        "close": "{{common.close}}",
+        "prev-page": "முந்தைய பக்கத்திற்கு நகர்த்தவும்",
+        "next-page": "அடுத்த பக்கத்திற்கு செல்லுங்கள்",
+        "go-to": "பக்க உரையாடலுக்குச் செல்லுங்கள்",
+        "bookmark": "தற்போதைய பக்கம் புக்மார்க்கு",
+        "double-click": "இரட்டை சொடுக்கு",
+        "close-reader": "மூடு வாசகர்",
+        "toggle-menu": "மெனுவை மாற்றவும்"
+    },
+    "grouped-typeahead": {
+        "files": "கோப்புகள்",
+        "chapters": "பாடங்கள்",
+        "people": "மக்கள்",
+        "tags": "குறிச்சொற்கள்",
+        "genres": "{{metadata-fields.genres-title}}",
+        "bookmarks": "{{side-nav.bookmarks}}",
+        "reading-lists": "பட்டியல்களைப் படித்தல்",
+        "libraries": "நூலகங்கள்",
+        "collections": "சேகரிப்புகள்",
+        "close": "{{common.close}}",
+        "loading": "{{common.loading}}}",
+        "include-extras": "அத்தியாயங்கள் மற்றும் கோப்புகளைச் சேர்க்கவும்"
+    },
+    "edit-reading-list-modal": {
+        "starting-title": "தொடங்குகிறது",
+        "promote-label": "ஊக்குவிக்கவும்",
+        "title": "படித்தல் பட்டியலைத் திருத்து: {{name}}",
+        "general-tab": "{{tabs.jenoral-tab}}}",
+        "cover-image-tab": "{{tabs.cover-tab}}}",
+        "close": "{{common.close}}",
+        "save": "{{common.save}}",
+        "year-validation": "1000, 0 அல்லது காலியாக இருக்க வேண்டும்",
+        "month-validation": "1 முதல் 12 அல்லது காலியாக இருக்க வேண்டும்",
+        "name-unique-validation": "பெயர் தனித்துவமாக இருக்க வேண்டும்",
+        "required-field": "{{சரிபார்ப்பு.",
+        "summary-label": "சுருக்கம்",
+        "year-label": "ஆண்டு",
+        "month-label": "மாதம்",
+        "ending-title": "முடிவு",
+        "promote-tooltip": "பதவி உயர்வு என்பது உங்களுக்காக மட்டுமல்லாமல், சேகரிப்பை சேவையக அளவில் காணலாம். இந்தத் தொகுப்பில் உள்ள அனைத்து தொடர்களும் அவற்றில் பயனர் அணுகல் கட்டுப்பாடுகளைக் கொண்டிருக்கும்."
+    },
+    "manga-reader": {
+        "incognito-title": "மறைநிலை பயன்முறை:",
+        "shortcuts-menu-alt": "விசைப்பலகை குறுக்குவழிகள் மோடல்",
+        "prev-page-tooltip": "முந்தைய பக்கம்",
+        "next-page-tooltip": "அடுத்த பக்கம்",
+        "prev-chapter-tooltip": "முந்தைய அத்தியாயம்/தொகுதி",
+        "next-chapter-tooltip": "அடுத்த அத்தியாயம்/தொகுதி",
+        "first-page-tooltip": "முதல் பக்கம்",
+        "last-page-tooltip": "கடைசி பக்கம்",
+        "left-to-right-alt": "இடமிருந்து வலமாக",
+        "right-to-left-alt": "வலமிருந்து இடமாக",
+        "reading-direction-tooltip": "வாசிப்பு திசை: ",
+        "reading-mode-tooltip": "படித்தல் பயன்முறை",
+        "fullscreen": "முழு திரை",
+        "settings-tooltip": "அமைப்புகள்",
+        "image-splitting-label": "பட பிரித்தல்",
+        "image-scaling-label": "பட அளவிடுதல்",
+        "height": "உயரம்",
+        "width": "அகலம்",
+        "width-override-label": "அகலம் மேலெழுதல்",
+        "off": "அணை",
+        "original": "அசல்",
+        "auto-close-menu-label": "{{பயனர்-முன்னுரிமைகள்.ஆட்டோ-க்ளோச்-மெனு-லேபல்}}",
+        "swipe-enabled-label": "ச்வைப் இயக்கப்பட்டது",
+        "enable-comic-book-label": "காமிக் புத்தகத்தைப் பின்பற்றுங்கள்",
+        "brightness-label": "ஒளி",
+        "bookmark-page-tooltip": "புக்மார்க்கு பக்கம்",
+        "unbookmark-page-tooltip": "புத்தகமன் பக்கம்",
+        "bookmarks-title": "புக்மார்க்குகள்",
+        "collapse": "சரிவு",
+        "incognito-alt": "மறைநிலை பயன்முறை இயக்கத்தில் உள்ளது. அணைக்க மாற்று.",
+        "back": "பின்",
+        "first-time-reading-manga": "மெனுவைத் திறக்க எந்த நேரத்திலும் படத்தைத் தட்டவும். முன்னேற்றப் பட்டியைக் சொடுக்கு செய்வதன் மூலம் நீங்கள் வெவ்வேறு அமைப்புகளை உள்ளமைக்கலாம் அல்லது பக்கத்திற்குச் செல்லலாம். படத்தின் பக்கங்களைத் தட்டவும் அடுத்த/முந்தைய பக்கத்திற்கு நகர்த்தவும்.",
+        "layout-mode-switched": "இரட்டை தளவமைப்பை வழங்க போதுமான இடம் இல்லாததால் தளவமைப்பு பயன்முறை ஒற்றைக்கு மாறியது",
+        "no-next-chapter": "அடுத்த அத்தியாயம் இல்லை",
+        "no-prev-chapter": "முந்தைய அத்தியாயம் இல்லை",
+        "emulate-comic-book-label": "{{பயனர்-முன்னுரிமைகள்.இமுலேட்-காமிக்-புத்தக-லேபிள்}}",
+        "series-progress": "தொடர் முன்னேற்றம்: {{percentage}}}"
+    },
+    "metadata-filter-row": {
+        "unit-reading-date": "திகதி",
+        "unit-average-rating": "கவிதா+ வெளிப்புற மதிப்பீடு, விழுக்காடு",
+        "unit-reading-progress": "விழுக்காடு",
+        "unit-user-rating": "0.0 - 5.0 நட்சத்திரங்கள்",
+        "unit-read-last": "இன்று முதல் நாட்கள்"
+    },
+    "sort-field-pipe": {
+        "sort-name": "பெயரை வரிசைப்படுத்துங்கள்",
+        "created": "உருவாக்கப்பட்டது",
+        "last-modified": "கடைசியாக மாற்றப்பட்டது",
+        "last-chapter-added": "உருப்படி சேர்க்கப்பட்டது",
+        "time-to-read": "படிக்க நேரம்",
+        "release-year": "வெளியீட்டு ஆண்டு",
+        "read-progress": "கடைசியாக படியுங்கள்",
+        "average-rating": "சராசரி மதிப்பீடு",
+        "random": "சீரற்ற"
+    },
+    "kavitaplus-metadata-breakdown-stats": {
+        "errored-series-label": "பிழை தொடர்",
+        "completed-series-label": "முடிக்கப்பட்ட தொடர்",
+        "complete": "அனைத்து தொடர்களிலும் மேனிலை தரவு உள்ளது",
+        "title": "கவிதா+ மேனிலை தரவு முறிவு",
+        "description": "காவிதா மெட்டாடேட்டாவைப் பெறுகிறார் (மதிப்பீடுகள், மதிப்புரைகள், பரிந்துரைகள் போன்றவை) தகுதியான தொடர்களுக்கு மெதுவாக.",
+        "no-data": "தரவு இல்லை"
+    },
+    "file-breakdown-stats": {
+        "format-title": "வடிவம்",
+        "format-tooltip": "வகைப்படுத்தப்படவில்லை என்றால் கவிதா சில கோப்புகளை ச்கேன் செய்யவில்லை. இது V0.7 க்கு முன்னர் இருக்கும் பழைய கோப்புகளில் நிகழ்கிறது. நீங்கள் நூலக அமைப்புகள் மோடல் வழியாக கட்டாய ச்கேன் இயக்க வேண்டியிருக்கலாம்.",
+        "visualisation-label": "காட்சிப்படுத்தல்",
+        "data-table-label": "தரவு அட்டவணை",
+        "extension-header": "நீட்டிப்பு",
+        "format-header": "வடிவம்",
+        "total-size-header": "மொத்த அளவு",
+        "total-files-header": "மொத்த கோப்புகள்",
+        "not-classified": "வகைப்படுத்தப்படவில்லை",
+        "total-file-size-title": "மொத்த கோப்பு அளவு:",
+        "download-file-for-extension-header": "அறிக்கையைப் பதிவிறக்கவும்",
+        "download-file-for-extension-alt": "{{extension} க்கு க்கான கோப்புகளைப் பதிவிறக்கவும்"
+    },
+    "filter-comparison-pipe": {
+        "equal": "சமமான",
+        "does-not-contain": "இல்லை",
+        "not-equal": "சமமாக இல்லை",
+        "ends-with": "உடன் முடிவடைகிறது",
+        "is-before": "முன்",
+        "is-after": "பிறகு",
+        "is-in-last": "கடைசியாக உள்ளது",
+        "is-not-in-last": "கடைசியாக இல்லை",
+        "must-contains": "இருக்க வேண்டும்",
+        "is-empty": "காலியாக உள்ளது",
+        "greater-than": "விட பெரியது",
+        "greater-than-or-equal": "பெரிய அல்லது சமமான",
+        "less-than": "குறைவாக",
+        "less-than-or-equal": "குறைவான அல்லது சமமான",
+        "matches": "போட்டிகள்",
+        "contains": "கொண்டுள்ளது",
+        "begins-with": "உடன் தொடங்குகிறது"
+    },
+    "confirm": {
+        "alert": "எச்சரிக்கை",
+        "confirm": "உறுதிப்படுத்தவும்"
+    },
+    "toasts": {
+        "regen-cover": "கவர் படத்தை மீண்டும் உருவாக்க ஒரு வேலை சூழப்பட்டுள்ளது",
+        "reading-list-imported": "படித்தல் பட்டியல் இறக்குமதி செய்யப்பட்டது",
+        "reset-base-url": "அடிப்படை முகவரி மீட்டமைப்பு",
+        "unauthorized-2": "அங்கீகரிக்கப்படாதது",
+        "volume-deleted": "தொகுதி நீக்கப்பட்டது",
+        "no-pages": "பக்கங்கள் இல்லை. கவிதாவால் இந்த காப்பகத்தைப் படிக்க முடியவில்லை.",
+        "download-in-progress": "பதிவிறக்கம் ஏற்கனவே நடந்து வருகிறது. தயவுசெய்து காத்திருங்கள்.",
+        "scan-queued": "{{name} க்கு க்கு வரிசைப்படுத்தப்பட்ட ச்கேன்",
+        "server-settings-updated": "சேவையக அமைப்புகள் புதுப்பிக்கப்பட்டன",
+        "reset-ip-address": "ஐபி முகவரிகள் மீட்டமைக்கின்றன",
+        "unauthorized-1": "இந்தப் பக்கத்தைக் காண உங்களுக்கு ஏற்பு இல்லை.",
+        "no-updates": "புதுப்பிப்புகள் எதுவும் கிடைக்கவில்லை",
+        "confirm-delete-user": "இந்த பயனரை நீக்க விரும்புகிறீர்களா?",
+        "user-deleted": "{{user}} நீக்கப்பட்டது",
+        "click-email-link": "உங்கள் மின்னஞ்சலை உறுதிப்படுத்த இந்த இணைப்பைக் சொடுக்கு செய்க. உள்நுழைய முடியும் என்பதை நீங்கள் உறுதிப்படுத்த வேண்டும்.",
+        "series-added-to-collection": "தொடர் {{collectionName}} சேகரிப்பில் சேர்க்கப்பட்டது",
+        "no-series-collection-warning": "எச்சரிக்கை! எந்தத் தொடரும் தேர்ந்தெடுக்கப்படவில்லை, சேமிப்பு சேகரிப்பை நீக்கும். நீங்கள் தொடர விரும்புகிறீர்களா?",
+        "collection-updated": "சேகரிப்பு புதுப்பிக்கப்பட்டது",
+        "reading-list-deleted": "படித்தல் பட்டியல் நீக்கப்பட்டது",
+        "reading-lists-deleted": "வாசிப்பு பட்டியல்கள் நீக்கப்பட்டன",
+        "reading-list-updated": "படித்தல் பட்டியல் புதுப்பிக்கப்பட்டது",
+        "confirm-delete-reading-list": "வாசிப்பு பட்டியலை நீக்க விரும்புகிறீர்களா? இதை செயல்தவிர்க்க முடியாது.",
+        "confirm-delete-reading-lists": "வாசிப்பு பட்டியல்களை நீக்க விரும்புகிறீர்களா? இதை செயல்தவிர்க்க முடியாது.",
+        "item-removed": "உருப்படி அகற்றப்பட்டது",
+        "nothing-to-remove": "அகற்ற எதுவும் இல்லை",
+        "series-added-to-reading-list": "வாசிப்பு பட்டியலில் தொடர் சேர்க்கப்பட்டது",
+        "volumes-added-to-reading-list": "வாசிப்பு பட்டியலில் தொகுதி சேர்க்கப்பட்டது",
+        "chapter-added-to-reading-list": "அத்தியாயம் வாசிப்பு பட்டியலில் சேர்க்கப்பட்டது",
+        "multiple-added-to-reading-list": "வாசிப்பு பட்டியலில் அத்தியாயங்கள் மற்றும் தொகுதிகள் சேர்க்கப்பட்டன",
+        "select-files-warning": "முன்னேற நீங்கள் கோப்புகளைத் தேர்ந்தெடுக்க வேண்டும்",
+        "incognito-off": "மறைநிலை பயன்முறை முடக்கப்பட்டுள்ளது. முன்னேற்றம் இப்போது கண்காணிக்கப்படத் தொடங்கும்.",
+        "email-service-reset": "மின்னஞ்சல் பணி மீட்டமைப்பு",
+        "email-service-reachable": "கவிதா மின்னஞ்சல் இணைப்பு வெற்றிகரமாக",
+        "email-service-unresponsive": "மின்னஞ்சல் பணி முகவரி பதிலளிக்கவில்லை.",
+        "refresh-covers-queued": "{{name} க்கு க்கு வரிசையில் நிற்கும் கவர்கள் புதுப்பிக்கவும்",
+        "generate-colorscape-queued": "{{name} க்கு க்கு வரிசையில் நிற்கும் வண்ணங்களை உருவாக்குங்கள்",
+        "library-file-analysis-queued": "நூலக கோப்பு பகுப்பாய்வு {{name}} க்கு வரிசையில் உள்ளது",
+        "entity-read": "{{name}} இப்போது படிக்கப்படுகிறது",
+        "entity-unread": "{{name}} இப்போது படிக்கவில்லை",
+        "mark-read": "வாசிப்பு என குறிக்கப்பட்டுள்ளது",
+        "mark-unread": "படிக்காததாக குறிக்கப்பட்டுள்ளது",
+        "series-removed-want-to-read": "பட்டியலில் இருந்து அகற்றப்பட்ட தொடர் பட்டியலைப் படிக்க வேண்டும்",
+        "series-deleted": "தொடர் நீக்கப்பட்டது",
+        "delete-review": "உங்கள் மதிப்பாய்வை நீக்க விரும்புகிறீர்களா?",
+        "review-deleted": "மதிப்பாய்வு நீக்கப்பட்டது",
+        "file-send-to": "கோப்பு (கள்) {{name}} க்கு மின்னஞ்சல் செய்யப்பட்டது",
+        "theme-missing": "செயலில் உள்ள கருப்பொருள் இனி இல்லை. பக்கத்தைப் புதுப்பிக்கவும்.",
+        "email-sent": "மின்னஞ்சல் {{email}} க்கு அனுப்பப்பட்டது",
+        "email-not-sent": "கோப்பில் உள்ள மின்னஞ்சல் சரியான மின்னஞ்சல் அல்ல, அனுப்ப முடியாது. பதிவுகளில் ஒரு இணைப்பு கொட்டப்பட்டுள்ளது. நிர்வாகி இந்த இணைப்பை முழுமையான ஓட்டத்திற்கு வழங்க முடியும்.",
+        "k+-license-saved": "உரிமம் சேமிக்கப்பட்டது, ஆனால் அது செல்லுபடியாகாது. சந்தாவை புதுப்பிக்க சரிபார்க்கவும் என்பதைக் சொடுக்கு செய்க. முதல் முறையாக பதிவு பிரச்சாரம் செய்ய ஒரு மணித்துளி ஆகலாம்.",
+        "k+-error": "உங்கள் உரிமத்தை செயல்படுத்தும்போது பிழை ஏற்பட்டது. மீண்டும் முயற்சிக்கவும்.",
+        "device-created": "சாதனம் உருவாக்கப்பட்டது",
+        "delete-device": "இந்த சாதனத்தை நீக்க விரும்புகிறீர்களா?",
+        "k+-delete-key": "இது கவிதாவின் உரிம விசையை நீக்கி, காண்பிக்க வாங்க இணைப்பை அனுமதிக்கும். இது உங்கள் சந்தாவை ரத்து செய்யாது! ஆதரவால் இயக்கப்பட்டால் மட்டுமே இதைப் பயன்படுத்தவும்!",
+        "k+-reset-key": "இது உங்கள் உரிமத்தைப் பயன்படுத்தி முந்தைய பதிவை செல்லாது மற்றும் கவிதா நிகழ்வை மீண்டும் பதிவு செய்ய உங்களை அனுமதிக்கும்.",
+        "k+-reset-key-success": "உங்கள் உரிமம் பதிவு செய்யப்படவில்லை. உங்கள் நிகழ்வை மீண்டும் பதிவு செய்ய திருத்து பொத்தானைப் பயன்படுத்தவும் மற்றும் கவிதாவை மீண்டும் செயல்படுத்தவும்+",
+        "library-deleted": "நூலகம் {{name}} அகற்றப்பட்டது",
+        "copied-to-clipboard": "இடைநிலைப்பலகைக்கு நகலெடுக்கப்பட்டது",
+        "book-settings-info": "நீங்கள் புத்தக அமைப்புகளை மாற்றியமைக்கலாம், எல்லா புத்தகங்களுக்கும் அந்த அமைப்புகளைச் சேமிக்கலாம் மற்றும் டிராயரில் இருந்து உள்ளடக்க அட்டவணையைக் காணலாம்.",
+        "no-next-chapter": "அடுத்து {{entity}} கண்டுபிடிக்க முடியவில்லை",
+        "no-prev-chapter": "முந்தைய {{entity}} ஐக் கண்டுபிடிக்க முடியவில்லை",
+        "load-next-chapter": "அடுத்து {{entity}} ஏற்றப்பட்டது",
+        "load-prev-chapter": "முந்தைய {{entity}} ஏற்றப்பட்டது",
+        "account-registration-complete": "கணக்கு பதிவு முடிந்தது",
+        "account-migration-complete": "கணக்கு இடம்பெயர்வு முடிந்தது",
+        "password-reset": "கடவுச்சொல் மீட்டமைப்பு",
+        "password-updated": "கடவுச்சொல் புதுப்பிக்கப்பட்டுள்ளது",
+        "forced-scan-queued": "{{name} க்கு க்கு கட்டாய ச்கேன் தொடங்கப்பட்டுள்ளது",
+        "library-created": "நூலகம் வெற்றிகரமாக உருவாக்கப்பட்டது. ஒரு ச்கேன் தொடங்கப்பட்டுள்ளது.",
+        "anilist-token-updated": "அனிலிச்ட் கிள்ளாக்கு புதுப்பிக்கப்பட்டுள்ளது",
+        "age-restriction-updated": "அகவை கட்டுப்பாடு புதுப்பிக்கப்பட்டுள்ளது",
+        "email-sent-to-no-existing": "இருக்கும் மின்னஞ்சல் செல்லுபடியாகாது. பதிவுகளுக்கு ஒரு இணைப்பு கொட்டப்பட்டுள்ளது. மின்னஞ்சல் மாற்றத்தை முழுமையான இணைப்பைக் கேளுங்கள்.",
+        "email-sent-to": "உறுதிப்படுத்த உங்கள் பழைய மின்னஞ்சல் முகவரிக்கு மின்னஞ்சல் அனுப்பப்பட்டுள்ளது.",
+        "change-email-no-email": "மின்னஞ்சல் புதுப்பிக்கப்பட்டுள்ளது",
+        "device-updated": "சாதனம் புதுப்பிக்கப்பட்டது",
+        "confirm-regen-covers": "புதுப்பிப்பு கவர்கள் அனைத்து கவர் படங்களையும் மீண்டும் கணக்கிட கட்டாயப்படுத்தும். இது ஒரு கனமான அறுவை மருத்தீடு. அதற்கு பதிலாக நீங்கள் ச்கேன் செய்ய விரும்பவில்லை என்பதில் உறுதியாக இருக்கிறீர்களா?",
+        "alert-long-running": "இது நீண்டகால செயல்முறை. மீண்டும் செயல்படுத்துவதற்கு முன் முடிக்க நேரம் கொடுங்கள்.",
+        "confirm-delete-multiple-series": "{{count}} தொடரை நீக்க விரும்புகிறீர்களா? இது வட்டில் கோப்புகளை மாற்றாது.",
+        "confirm-delete-multiple-chapters": "நீங்கள் {{count}} அத்தியாயம்/தொகுதிகளை நீக்க விரும்புகிறீர்களா? இது வட்டில் கோப்புகளை மாற்றாது.",
+        "confirm-delete-series": "இந்தத் தொடரை நீக்க விரும்புகிறீர்களா? இது வட்டில் கோப்புகளை மாற்றாது.",
+        "confirm-delete-chapter": "இந்த அத்தியாயத்தை நீக்க விரும்புகிறீர்களா? இது வட்டில் கோப்புகளை மாற்றாது.",
+        "confirm-delete-volume": "இந்த தொகுதியை நீக்க விரும்புகிறீர்களா? இது வட்டில் கோப்புகளை மாற்றாது.",
+        "alert-bad-theme": "கருப்பொருளில் தவறான அல்லது பாதுகாப்பற்ற சிஎச்எச் உள்ளது. இதை சரிசெய்ய உங்கள் நிர்வாகியை அணுகவும். இருண்ட கருப்பொருளுக்கு இயல்புநிலை.",
+        "confirm-library-delete": "{{name}} நூலகத்தை நீக்க விரும்புகிறீர்களா? இந்த செயலை நீங்கள் செயல்தவிர்க்க முடியாது.",
+        "confirm-library-type-change": "நூலக வகையை மாற்றுவது வெவ்வேறு பாகுபடுத்தல் விதிகளுடன் ஒரு புதிய ச்கேன் தூண்டும் மற்றும் தொடர் மீண்டும் உருவாக்கப்படுவதற்கு வழிவகுக்கும், எனவே நீங்கள் முன்னேற்றம் மற்றும் புக்மார்க்குகளை இழக்க நேரிடும். இதைச் செய்வதற்கு முன் காப்புப்பிரதி எடுக்க வேண்டும். நீங்கள் தொடர விரும்புகிறீர்களா?",
+        "confirm-download-size": "{{entityType}} என்பது {{size}}. நீங்கள் தொடர விரும்புகிறீர்களா?",
+        "confirm-download-size-ios": "ஐஇமு க்கு 200MB ஐ விட பெரிய கோப்புகளைப் பதிவிறக்குவதில் சிக்கல்கள் உள்ளன, இந்த பதிவிறக்கம் முடிவடையாது.",
+        "list-doesnt-exist": "இந்த பட்டியல் இல்லை",
+        "confirm-delete-smart-filter": "இந்த அறிவுள்ள வடிப்பானை நீக்க விரும்புகிறீர்களா?",
+        "smart-filter-deleted": "அறிவுள்ள வடிகட்டி நீக்கப்பட்டது",
+        "smart-filter-updated": "உருவாக்கப்பட்டது/புதுப்பிக்கப்பட்டது அறிவுள்ள வடிகட்டி",
+        "external-source-already-exists": "ஒரு வெளிப்புற மூலமானது ஏற்கனவே அதே பெயர்/ஓச்ட்/ஏபிஐ விசையுடன் உள்ளது",
+        "anilist-token-expired": "உங்கள் அனிலிச்ட் கிள்ளாக்கு காலாவதியானது. பயனர் அமைப்புகள்> கணக்கில் அதை மீண்டும் உருவாக்கும் வரை ச்க்ரோப்ளிங் இனி செயலாக்காது",
+        "collection-tag-deleted": "சேகரிப்பு குறிச்சொல் நீக்கப்பட்டது",
+        "force-kavita+-refresh-success": "கவிதா+ வெளிப்புற மேனிலை தரவு செல்லாதது",
+        "collection-not-owned": "இந்தத் தொகுப்பை நீங்கள் சொந்தமாக்கவில்லை",
+        "collections-promoted": "வசூல் ஊக்குவிக்கப்பட்டது",
+        "collections-unpromoted": "வசூல் ஆதரிக்கப்படாதது",
+        "reading-lists-promoted": "படித்தல் பட்டியல்கள் விளம்பரப்படுத்தப்பட்டவை",
+        "reading-lists-unpromoted": "வாசிப்பு பட்டியலிடப்படாத பட்டியல்கள்",
+        "reading-list-promoted": "படித்தல் பட்டியல் விளம்பரப்படுத்தப்பட்டது",
+        "reading-list-unpromoted": "படித்தல் பட்டியல் un- முன்மாதிரியானது",
+        "confirm-delete-collections": "பல சேகரிப்புகளை நீக்க விரும்புகிறீர்களா?",
+        "collections-deleted": "சேகரிப்புகள் நீக்கப்பட்டன",
+        "chapter-deleted": "அத்தியாயம் நீக்கப்பட்டது",
+        "pdf-book-mode-screen-size": "புத்தக பயன்முறையில் திரை மிகச் சிறியது",
+        "stack-imported": "இறக்குமதி செய்யப்பட்டது",
+        "confirm-delete-theme": "இந்த கருப்பொருளை அகற்றுவது வட்டில் இருந்து நீக்கப்படும். அகற்றுவதற்கு முன் அதை தற்காலிக கோப்பகத்திலிருந்து பிடிக்கலாம்",
+        "mal-token-required": "மால் கிள்ளாக்கு தேவை, பயனர் அமைப்புகளில் அமைக்கப்பட்டது",
+        "confirm-reset-server-settings": "முதலில் மதிப்புகளை நிறுவ இது உங்கள் அமைப்புகளை மீட்டமைக்கும். நீங்கள் தொடர விரும்புகிறீர்களா?",
+        "must-select-library": "குறைந்தது ஒரு நூலகம் தேர்ந்தெடுக்கப்பட வேண்டும்",
+        "bulk-scan": "பல நூலகங்களை ச்கேன் செய்வது நேர்கோட்டுடன் செய்யப்படும். இது நீண்ட நேரம் ஆகலாம், நூலக அளவைப் பொறுத்து முழுமையடையாது.",
+        "bulk-covers": "பல நூலகங்களில் புத்துணர்ச்சியூட்டும் கவர்கள் தீவிரமானவை மற்றும் நீண்ட நேரம் ஆகலாம். நீங்கள் தொடர விரும்புகிறீர்களா?",
+        "person-image-downloaded": "நபர் கவர் பதிவிறக்கம் செய்யப்பட்டு பயன்படுத்தப்பட்டது.",
+        "bulk-delete-libraries": "நீங்கள் நிச்சயமாக {{count} நூலகங்களை நீக்க விரும்புகிறீர்களா?"
+    },
+    "actionable": {
+        "download-tooltip": "சாதனத்திற்கு பதிவிறக்கவும்",
+        "read-incognito": "மறைமுகத்தைப் படியுங்கள்",
+        "read-incognito-tooltip": "முன்னேற்றத்தைக் கண்காணிக்காமல் படியுங்கள்",
+        "details": "விவரங்கள்",
+        "details-tooltip": "அனைத்தும்",
+        "add-to-collection": "சேகரிப்பில் சேர்க்கவும்",
+        "add-to-collection-tooltip": "ஒரு தொகுப்பில் தொடரைச் சேர்க்கவும்",
+        "send-to": "அனுப்பவும்",
+        "delete": "நீக்கு",
+        "delete-tooltip": "இந்த முடிவை மாற்ற வழி இல்லை",
+        "download": "பதிவிறக்கம்",
+        "view-series": "தொடர்",
+        "view-series-tooltip": "அனைத்தும்",
+        "clear": "{{common.clear}}}",
+        "add-to-reading-list-tooltip": "வாசிப்பு பட்டியலில் சேர்க்கவும்",
+        "scan-library": "ச்கேன் நூலகம்",
+        "scan-library-tooltip": "மாற்றங்களுக்கு நூலகத்தை ச்கேன் செய்யுங்கள். ஒவ்வொரு கோப்புறையையும் சரிபார்க்க கட்டாயப்படுத்த படை ச்கேன் பயன்படுத்தவும்",
+        "refresh-covers": "கவர்களைப் புதுப்பிக்கவும்",
+        "refresh-covers-tooltip": "அனைத்து அட்டைகளையும் மீண்டும் உருவாக்கவும்",
+        "generate-colorscape": "கலர்ச்கேப்பை உருவாக்குங்கள்",
+        "generate-colorscape-tooltip": "கலர்ச்கேப்ச் மற்றும் காணாமல் போன அட்டைகளை உருவாக்கவும்",
+        "analyze-files": "கோப்புகளை பகுப்பாய்வு செய்யுங்கள்",
+        "analyze-files-tooltip": "நீட்டிப்பு வகை மற்றும் அளவிற்கான கோப்புகளை பகுப்பாய்வு செய்யுங்கள்",
+        "settings": "அமைப்புகள்",
+        "settings-tooltip": "அமைப்புகள் அல்லது விவரங்களைக் காண்க",
+        "edit": "தொகு",
+        "edit-tooltip": "அமைப்புகள் அல்லது விவரங்களைத் திருத்தவும்",
+        "mark-as-read": "படித்தபடி குறி",
+        "mark-as-read-tooltip": "முழுமையாகப் படித்தபடி முன்னேற்றத்தைக் குறிக்கவும்",
+        "mark-as-unread": "படிக்காத எனக் குறிக்கவும்",
+        "mark-as-unread-tooltip": "படிக்காதபடி முன்னேற்றத்தைக் குறிக்கவும்",
+        "scan-series": "ச்கேன் தொடர்",
+        "scan-series-tooltip": "மாற்றங்களுக்கான தொடரை ச்கேன்",
+        "add-to": "சேர்க்கவும்",
+        "add-to-want-to-read": "படிக்க விரும்புவதைச் சேர்க்கவும்",
+        "add-to-want-to-read-tooltip": "படிக்க விரும்பும் தொடரைச் சேர்க்கவும்",
+        "remove-from-want-to-read": "படிக்க விரும்புவதிலிருந்து அகற்று",
+        "remove-from-want-to-read-tooltip": "படிக்க விரும்புவதிலிருந்து தொடரை அகற்று",
+        "remove-from-on-deck": "டெக்கிலிருந்து அகற்றவும்",
+        "remove-from-on-deck-tooltip": "ஆன் டெக்கிலிருந்து காண்பிப்பதில் இருந்து தொடரை அகற்று",
+        "others": "மற்றவர்கள்",
+        "add-to-reading-list": "வாசிப்பு பட்டியலில் சேர்க்கவும்",
+        "clear-tooltip": "இந்த தொடருக்கான அனைத்து புக்மார்க்குகளையும் அகற்று",
+        "import-cbl": "சிபிஎல் இறக்குமதி",
+        "import-cbl-tooltip": "சிபிஎல் கோப்பிலிருந்து வாசிப்பு பட்டியலை உருவாக்குகிறது",
+        "import-mal-stack": "மால் அடுக்கை இறக்குமதி செய்யுங்கள்",
+        "import-mal-stack-tooltip": "உங்கள் தவறான வட்டி அடுக்குகளிலிருந்து அறிவுள்ள சேகரிப்பை உருவாக்குகிறது",
+        "read": "படிக்க",
+        "customize": "தனிப்பயனாக்கு",
+        "customize-tooltip": "அனைத்தும்",
+        "mark-visible": "தெரியும் எனக் குறிக்கவும்",
+        "mark-visible-tooltip": "அனைத்தும்",
+        "mark-invisible": "கண்ணுக்கு தெரியாததாகக் குறிக்கவும்",
+        "mark-invisible-tooltip": "அனைத்தும்",
+        "unpromote": "ஒரு பதவி உயர்வு",
+        "unpromote-tooltip": "உங்கள் கணக்கிற்கு மட்டுமே தெரிவுநிலையை கட்டுப்படுத்துங்கள்",
+        "promote": "ஊக்குவிக்கவும்",
+        "promote-tooltip": "உருப்படியை அனைத்து பயனர்களுக்கும் காணச் செய்யுங்கள்",
+        "new-collection": "புதிய சேகரிப்பு",
+        "multiple-selections": "பல தேர்வுகள்",
+        "back-to": "மீண்டும் {{action}}",
+        "title": "செயல்கள்",
+        "copy-settings": "அமைப்புகளை நகலெடுக்கவும்"
+    },
+    "preferences": {
+        "double-manga": "இரட்டை (மங்கா)",
+        "scroll": "சுருள்",
+        "1-column": "1 நெடுவரிசை",
+        "2-column": "2 நெடுவரிசை",
+        "cards": "அட்டைகள்",
+        "list": "பட்டியல்",
+        "up-to-down": "அப்டோடவுன்",
+        "pdf-multiple": "இயல்புநிலை",
+        "pdf-book": "நூல்",
+        "pdf-vertical": "செங்குத்து உருள்",
+        "pdf-horizontal": "கிடைமட்ட உருட்டல்",
+        "pdf-page": "புறக்கணிக்க தட்டவும்",
+        "pdf-none": "எதுவுமில்லை",
+        "pdf-odd": "ஒற்றைப் படை",
+        "pdf-even": "இரட்டை",
+        "pdf-light": "ஒளி",
+        "pdf-dark": "இருண்ட",
+        "left-to-right": "இடமிருந்து வலமாக",
+        "right-to-left": "வலமிருந்து இடமாக",
+        "horizontal": "கிடைமட்டமாக",
+        "vertical": "செங்குத்து",
+        "automatic": "தானியங்கி",
+        "fit-to-height": "உயரத்திற்கு ஏற்றது",
+        "fit-to-width": "அகலத்திற்கு ஏற்றது",
+        "original": "அசல்",
+        "fit-to-screen": "திரைக்கு பொருந்தும்",
+        "split-right-to-left": "வலமிருந்து இடமாக பிரிக்கவும்",
+        "split-left-to-right": "இடமிருந்து வலமாக பிரிக்கவும்",
+        "no-split": "பிளவு இல்லை",
+        "webtoon": "வெப்டூன்",
+        "single": "ஒற்றை",
+        "double": "இரட்டை"
+    },
+    "validation": {
+        "required-field": "இந்த புலம் தேவை",
+        "valid-email": "இது சரியான மின்னஞ்சலாக இருக்க வேண்டும்",
+        "password-validation": "கடவுச்சொல் 6 முதல் 256 எழுத்துக்கள் வரை இருக்க வேண்டும்",
+        "year-validation": "இது 1000 மற்றும் 4 எழுத்துக்களை விட அதிகமான செல்லுபடியாகும் ஆண்டாக இருக்க வேண்டும்"
+    },
+    "entity-type": {
+        "volume": "தொகுதி",
+        "chapter": "பாடங்கள்",
+        "series": "தொடர்",
+        "bookmark": "புத்தககுறி",
+        "logs": "பதிவுகள்"
+    },
+    "tabs": {
+        "details-tab": "விவரங்கள்",
+        "reviews-tab": "மதிப்புரைகள்",
+        "storyline-tab": "கதைக்களம்",
+        "books-tab": "புத்தகங்கள்",
+        "volumes-tab": "தொகுதிகள்",
+        "specials-tab": "சிறப்பு",
+        "related-tab": "தொடர்புடைய",
+        "general-tab": "பொது",
+        "folder-tab": "கோப்புறை",
+        "cover-tab": "கவர் படம்",
+        "advanced-tab": "மேம்பட்ட",
+        "tasks-tab": "பணிகள்",
+        "recommendations-tab": "பரிந்துரைகள்",
+        "info-tab": "தகவல்",
+        "tags-tab": "குறிச்சொற்கள்",
+        "weblink-tab": "வலை இணைப்புகள்",
+        "people-tab": "மக்கள்",
+        "metadata-tab": "மேனிலை தரவு",
+        "series-tab": "தொடர்",
+        "account-tab": "கணக்கு",
+        "preferences-tab": "விருப்பத்தேர்வுகள்",
+        "theme-tab": "கருப்பொருள்",
+        "devices-tab": "சாதனங்கள்",
+        "stats-tab": "புள்ளிவிவரங்கள்",
+        "scrobbling-tab": "ச்க்ராப்லிங்",
+        "smart-filters-tab": "அறிவுள்ள வடிப்பான்கள்",
+        "progress-tab": "முன்னேற்றம்"
+    },
+    "common": {
+        "reset-to-default": "இயல்புநிலைக்கு மீட்டமைக்கவும்",
+        "close": "மூடு",
+        "clear": "தெளிவான",
+        "filter": "வடிப்பி",
+        "cancel": "ரத்துசெய்",
+        "create": "உருவாக்கு",
+        "save": "சேமி",
+        "reset": "மீட்டமை",
+        "apply": "இடு",
+        "delete": "நீக்கு",
+        "add": "கூட்டு",
+        "remove": "அகற்று",
+        "edit": "தொகு",
+        "help": "உதவி",
+        "submit": "சமர்ப்பிக்கவும்",
+        "email": "மின்னஞ்சல்",
+        "read": "படிக்க",
+        "loading": "ஏற்றுகிறது…",
+        "username": "பயனர்பெயர்",
+        "password": "கடவுச்சொல்",
+        "promoted": "ஊக்குவிக்கப்பட்டது",
+        "select-all": "அனைத்தையும் தெரிவுசெய்",
+        "deselect-all": "அனைத்தையும் தேர்வு செய்யுங்கள்",
+        "series-count": "{{num}} தொடர்",
+        "author-count": "{{num}} ஆசிரியர்கள்",
+        "item-count": "{{num}} உருப்படிகள்",
+        "book-num": "நூல்",
+        "issue-hash-num": "வெளியீடு #",
+        "issue-num": "சிக்கல்",
+        "chapter-num": "பாடங்கள்",
+        "volume-num": "தொகுதி",
+        "chapter-num-shorthand": "Ch {{num}}",
+        "book-num-shorthand": "நூல் {{num}}",
+        "issue-num-shorthand": "#{{num}}",
+        "volume-num-shorthand": "Vol {{num}}",
+        "book-nums": "புத்தகங்கள்",
+        "issue-nums": "சிக்கல்கள்",
+        "chapter-nums": "பாடங்கள்",
+        "volume-nums": "தொகுதிகள்"
+    },
+    "relationship-pipe": {
+        "doujinshi": "டசின்சி",
+        "other": "மற்றொன்று",
+        "prequel": "முன்னுரை",
+        "sequel": "அதன் தொடர்ச்சி",
+        "side-story": "பக்க கதை",
+        "spin-off": "சுழலும்",
+        "parent": "பெற்றோர்",
+        "edition": "பதிப்பு",
+        "annual": "ஆண்டு",
+        "contains": "கொண்டுள்ளது",
+        "adaptation": "தழுவல்",
+        "alternative-setting": "மாற்று அமைப்பு",
+        "alternative-version": "மாற்று பதிப்பு",
+        "character": "எழுத்து"
+    },
+    "all-filters": {
+        "count": "{{count}} {{customize-dashboard-modal.title-smart-filters}}",
+        "title": "அனைத்து அறிவுள்ள வடிப்பான்களும்",
+        "create": "{{common.create}}"
+    },
+    "user-preferences": {
+        "title": "பயனர் டாச்போர்டு",
+        "pref-description": "இவை உங்கள் கணக்கிற்கு கட்டுப்பட்ட உலகளாவிய அமைப்புகள்.",
+        "account-tab": "{{tabs.account-tab}}}",
+        "preferences-tab": "{{tabs.preferences-tab}}}",
+        "theme-tab": "{{tabs.theme-tab}}",
+        "devices-tab": "{{tabs.devices-tab}}}",
+        "stats-tab": "{{tabs.stats-tab}}}",
+        "scrobbling-tab": "{{tabs.scrobbling-tab}}",
+        "smart-filters-tab": "{{tabs.smart-filters-tab}}",
+        "success-toast": "பயனர் விருப்பத்தேர்வுகள் புதுப்பிக்கப்பட்டன",
+        "global-settings-title": "உலகளாவிய அமைப்புகள்",
+        "page-layout-mode-label": "பக்க தளவமைப்பு பயன்முறை",
+        "page-layout-mode-tooltip": "உருப்படிகளை அட்டைகளாகக் காண்பி அல்லது தொடர் விவரம் பக்கத்தில் பட்டியல் பார்வை.",
+        "locale-label": "மொழி",
+        "locale-tooltip": "கவிதா பயன்படுத்த வேண்டிய மொழி",
+        "blur-unread-summaries-label": "படிக்காத சுருக்கங்கள்",
+        "blur-unread-summaries-tooltip": "வாசிப்பு முன்னேற்றம் இல்லாத தொகுதிகள் அல்லது அத்தியாயங்களில் சுருக்கமான உரையை மழுங்கடிக்கிறது (ச்பாய்லர்களைத் தவிர்க்க)",
+        "prompt-on-download-label": "பதிவிறக்கத்தில் வரியில்",
+        "prompt-on-download-tooltip": "ஒரு பதிவிறக்கம் {{size}} mb அளவை விட அதிகமாக இருக்கும்போது வரியில்",
+        "disable-animations-label": "அனிமேசன்களை முடக்கு",
+        "disable-animations-tooltip": "தளத்தில் அனிமேசன்களை முடக்குகிறது. ஈ-மை வாசகர்களுக்கு பயனுள்ளதாக இருக்கும்.",
+        "collapse-series-relationships-label": "தொடர் உறவுகளை சரிவு",
+        "collapse-series-relationships-tooltip": "உறவுகள் இல்லாத அல்லது பெற்றோர்/முன்னுரை இல்லாத கவிதா நிகழ்ச்சிகளைக் காட்ட வேண்டுமா",
+        "share-series-reviews-label": "பங்கு தொடர் மதிப்புரைகளைப் பகிரவும்",
+        "share-series-reviews-tooltip": "கவிதா மற்ற பயனர்களுக்கான தொடரின் உங்கள் மதிப்புரைகளை சேர்க்க வேண்டுமா",
+        "clients-opds-alert": "இந்த சேவையகத்தில் OPDS இயக்கப்படவில்லை. இது டச்சியோமி பயனர்களை பாதிக்காது.",
+        "clients-opds-description": "அனைத்து 3 வது தரப்பு வாடிக்கையாளர்களும் பநிஇ விசை அல்லது கீழே உள்ள இணைப்பு முகவரி ஐப் பயன்படுத்துவார்கள். இவை கடவுச்சொற்கள் போன்றவை, அதை தனிப்பட்டதாக வைத்திருங்கள்.",
+        "clients-api-key-tooltip": "பநிஇ விசை கடவுச்சொல் போன்றது. அதை மீட்டமைப்பது தற்போதுள்ள எந்த வாடிக்கையாளர்களையும் செல்லாது.",
+        "clients-opds-url-label": "OPDS முகவரி",
+        "clients-api-key-label": "பநிஇ விசை",
+        "clients-opds-url-tooltip": "ஆதரிக்கப்பட்ட OPDS வாடிக்கையாளர்களின் பட்டியலைக் காண்க: ",
+        "reset": "{{common.reset}}}",
+        "save": "{{common.save}}"
+    },
+    "manage-email-settings": {
+        "size-limit-tooltip": "இணைப்புகளுக்கு மின்னஞ்சல் சேவையகம் எத்தனை பைட்டுகள் கையாள முடியும்",
+        "email-url-label": "மின்னஞ்சல் பணி முகவரி",
+        "reset": "{{common.reset}}}",
+        "description": "சாதனத்திற்கு அனுப்புவது போன்ற கவிதாவின் சில செயல்பாடுகளைப் பயன்படுத்த மின்னஞ்சல் வழங்குநர் அமைக்கப்பட வேண்டும். கடவுச்சொல்லை மறந்துவிட்டது போன்ற பிற அம்சங்களுக்கு மின்னஞ்சல் அமைவு இல்லாமல் நிர்வாக தலையீடு தேவை.",
+        "setting-description": "கவிதாவுக்குள் மின்னஞ்சல் அடிப்படையிலான செயல்பாட்டைப் பயன்படுத்த புரவலன் பெயர் மற்றும் SMTP அமைப்புகள் இரண்டையும் நீங்கள் நிரப்ப வேண்டும்.",
+        "test-warning": "சோதனையைத் தாக்கும் முன் உங்களிடம் சரியான அமைப்புகள் இருக்க வேண்டும்.",
+        "send-to-warning": "வேலை செய்ய சாதனத்திற்கு அனுப்ப விரும்பினால், உங்கள் மின்னஞ்சல் அமைப்புகளை அமைக்க வேண்டும்",
+        "email-url-tooltip": "மின்னஞ்சல் சேவையின் முழு தகுதி வாய்ந்த முகவரி ஐப் பயன்படுத்தவும். முடிவடையும் குறைப்பு சேர்க்க வேண்டாம்.",
+        "email-settings-title": "மின்னஞ்சல் அமைப்புகள்",
+        "test": "தேர்வு",
+        "host-name-label": "புரவலன் பெயர்",
+        "host-name-tooltip": "டொமைன் பெயர் (தலைகீழ் ப்ராக்சி). மின்னஞ்சல் செயல்பாட்டிற்கு தேவை. தலைகீழ் பதிலாள் இல்லை என்றால், எந்த முகவரி ஐப் பயன்படுத்தவும்.",
+        "host-name-validation": "புரவலன் பெயர் HTTP (கள்) உடன் தொடங்க வேண்டும் மற்றும் / இல் முடிவடையக்கூடாது",
+        "sender-address-label": "அனுப்புநர் முகவரி",
+        "sender-address-tooltip": "மின்னஞ்சலைப் பெறும்போது பெறுநர் பார்க்கும் மின்னஞ்சல் முகவரி இது. பொதுவாக கணக்குடன் தொடர்புடைய மின்னஞ்சல் முகவரி.",
+        "sender-displayname-label": "காட்சி பெயர்",
+        "sender-displayname-tooltip": "மின்னஞ்சலைப் பெறும்போது ரிசீவர் பார்க்கும் பெயர்",
+        "host-label": "விருந்தோம்பி",
+        "host-tooltip": "உங்கள் மின்னஞ்சல் சேவையகத்தின் வெளிச்செல்லும்/SMTP முகவரி",
+        "port-label": "துறைமுகம்",
+        "username-label": "பயனர்பெயர்",
+        "username-tooltip": "பயனர்பெயர் ஓச்டுக்கு எதிராக அங்கீகரிக்கப் பயன்படுகிறது",
+        "password-label": "கடவுச்சொல்",
+        "enable-ssl-label": "மின்னஞ்சல் சேவையகத்தில் SSL ஐப் பயன்படுத்தவும்",
+        "size-limit-label": "அளவு வரம்பு",
+        "customized-templates-label": "தனிப்பயனாக்கப்பட்ட வார்ப்புருக்கள்",
+        "customized-templates-tooltip": "இயல்புநிலையை விட வார்ப்புருக்களுக்கான கட்டமைப்பு/வார்ப்புருக்கள் கோப்பகத்தை கவிதா பயன்படுத்த வேண்டுமா? வார்ப்புரு மாற்றங்களுடன் புதுப்பித்த நிலையில் இருக்க நீங்கள் பொறுப்பு.",
+        "gmail-label": "சிமெயில்",
+        "outlook-label": "அவுட்லுக்",
+        "reset-to-default": "{{பொதுவான.",
+        "save": "{{common.save}}"
+    },
+    "book-reader": {
+        "prev-page": "முந்தைய பக்கம்",
+        "prev-chapter": "முந்தைய அத்தியாயம்/தொகுதி",
+        "next-page": "அடுத்த பக்கம்",
+        "next-chapter": "அடுத்த அத்தியாயம்/தொகுதி",
+        "skip-header": "முக்கிய உள்ளடக்கத்திற்கு செல்லவும்",
+        "settings-header": "அமைப்புகள்",
+        "bookmarks-header": "{{side-nav.bookmarks}}",
+        "toc-header": "TOC",
+        "title": "புத்தக அமைப்புகள்",
+        "page-label": "பக்கம்",
+        "pagination-header": "பிரிவு",
+        "go-to-page": "பக்கத்திற்குச் செல்லுங்கள்",
+        "go-to-last-page": "கடைசி பக்கத்திற்குச் செல்லுங்கள்",
+        "virtual-pages": "மெய்நிகர் பக்கங்கள்",
+        "table-of-contents-header": "உள்ளடக்க அட்டவணை",
+        "loading-book": "புத்தகத்தை ஏற்றுகிறது…",
+        "go-back": "திரும்பிச் செல்லுங்கள்",
+        "close-reader": "மூடு வாசகர்",
+        "incognito-mode-alt": "மறைநிலை பயன்முறை இயக்கத்தில் உள்ளது. அணைக்க மாற்று.",
+        "incognito-mode-label": "மறைநிலை பயன்முறை",
+        "next": "அடுத்தது",
+        "previous": "முந்தைய",
+        "go-to-page-prompt": "{{totalPages}} பக்கங்கள் உள்ளன. நீங்கள் எந்த பக்கத்திற்கு செல்ல விரும்புகிறீர்கள்?"
+    },
+    "metadata-fields": {
+        "characters-title": "எழுத்துக்கள்",
+        "colorists-title": "வண்ணமயமானவர்கள்",
+        "collections-title": "{{side-nav.collections}}",
+        "reading-lists-title": "{{side-nav.reading-lists}}",
+        "genres-title": "வகைகள்",
+        "tags-title": "குறிச்சொற்கள்",
+        "writers-title": "எழுத்தாளர்கள்",
+        "cover-artists-title": "கலைஞர்கள்",
+        "editors-title": "ஆசிரியர்கள்",
+        "inkers-title": "இன்க்ச்",
+        "letterers-title": "லெட்டர்ச்",
+        "translators-title": "மொழிபெயர்ப்பாளர்கள்",
+        "pencillers-title": "பென்சில்லர்கள்",
+        "publishers-title": "வெளியீட்டாளர்கள்",
+        "imprints-title": "முத்திரைகள்",
+        "teams-title": "அணிகள்",
+        "locations-title": "இருப்பிடங்கள்",
+        "language-title": "மொழி",
+        "age-rating-title": "அகவை மதிப்பீடு",
+        "links-title": "வெப்லிங்க்ச்"
+    },
+    "read-more": {
+        "read-more": "மேலும் வாசிக்க",
+        "read-less": "குறைவாகப் படியுங்கள்"
+    },
+    "details-tab": {
+        "tags-title": "{{metadata-fields.tags-title}}}",
+        "weblinks-title": "{{tabs.weblink-tab}}}",
+        "read-time-title": "{{திருத்து-அத்தியாயம்-மோடல். ரீடிங்-டைம்-லேபிள்}}",
+        "writers-title": "{{metadata-fields.writers-title}}}",
+        "publishers-title": "{{metadata-fields.publishers-title}}",
+        "characters-title": "{{metadata-fields.Characters-title}}}",
+        "translators-title": "{{மெட்டாடேட்டா-ஃபீல்ட்ச். டிரான்ச்லேட்டர்கள்-தலைப்பு}}",
+        "letterers-title": "{{metadata-fields.letterers-title}}",
+        "colorists-title": "{{metadata-fields.colorists-title}}}",
+        "inkers-title": "{{metadata-fields.inkers-title}}}",
+        "pencillers-title": "{{மெட்டாடேட்டா-ஃபீல்ட்ச்.பென்சில்லர்ச்-தலைப்பு}}}",
+        "cover-artists-title": "{{metadata-fields.cover-artists-title}}}",
+        "editors-title": "{{metadata-fields.editors-title}}",
+        "teams-title": "{{metadata-fields.Teams-title}}",
+        "locations-title": "{{metadata-fields.locations-title}}}",
+        "imprints-title": "{{metadata-fields.imprints-title}}}",
+        "genres-title": "{{metadata-fields.genres-title}}",
+        "language-title": "{{திருத்து-அத்தியாயம்-மோடல்.லாங்காச்-லேபிள்}}",
+        "release-title": "{{sort-field-pipe.release- ஆண்டு}}",
+        "format-title": "{{metadata.filter.format-label}}",
+        "length-title": "{{திருத்து-அத்தியாயம்-மோடல்.வேர்ட்ச்-லேபல்}}"
+    },
+    "manage-media-issues": {
+        "filter-label": "{{common.filter}}}",
+        "description-part-1": "இந்த அட்டவணையில் உங்கள் ஊடகத்தின் ச்கேன் அல்லது வாசிப்பின் போது காணப்படும் சிக்கல்கள் உள்ளன. நீங்கள் அதை எந்த நேரத்திலும் அழிக்கலாம் மற்றும் பகுப்பாய்வு செய்ய நூலகம் (படை) ச்கேன் பயன்படுத்தலாம். சில பொதுவான பிழைகளின் பட்டியல் மற்றும் அவை என்ன பொருள் என்பதைக் காணலாம் ",
+        "description-part-2": "விக்கி.",
+        "clear-alerts": "தெளிவான விழிப்பூட்டல்கள்",
+        "file-header": "கோப்பு",
+        "comment-header": "கருத்து",
+        "created-header": "உருவாக்கப்பட்டது",
+        "no-data": "தரவு இல்லை"
+    },
+    "manage-library": {
+        "select-all": "{{common.select-all}}",
+        "apply": "{{common.apply}}}",
+        "bulk-copy-to": "{{libraryName}} க்கு இலிருந்து அமைப்புகளை நகலெடுக்க எந்த நூலகங்களைத் தேர்ந்தெடுக்கவும்",
+        "include-type-label": "நூலக வகையை நகலெடுப்பது",
+        "bulk-action-label": "மொத்த நடவடிக்கை",
+        "title": "நூலகங்கள்",
+        "add-library": "நூலகத்தைச் சேர்க்கவும்",
+        "no-data": "நூலகங்கள் எதுவும் இல்லை. ஒன்றை உருவாக்க முயற்சிக்கவும்.",
+        "loading": "{{common.loading}}}",
+        "last-scanned-title": "கடைசியாக ச்கேன்",
+        "shared-folders-title": "கோப்புறைகள்",
+        "type-title": "வகை",
+        "scan-library": "ச்கேன் நூலகம்",
+        "delete-library": "நூலகத்தை நீக்கு",
+        "delete-library-by-name": "{{name}} ஐ நீக்கு",
+        "edit-library": "தொகு",
+        "edit-library-by-name": "{{name}} ஐ நீக்கு",
+        "folder-count": "{{num}} கோப்புறைகள்",
+        "actions-header": "{{நிர்வகி-பயனர்கள்.",
+        "name-header": "{{நிர்வகி-பயனர்கள்.பெயர்-எடர்}}",
+        "deselect-all": "{{பொதுவான.",
+        "cancel": "{{common.cancel}}",
+        "include-type-tooltip": "இது தானாக ச்கேன் செய்யாது. அடுத்த ச்கேனில், பாகுபடுத்தும் வேறுபாடுகள் காரணமாக நீங்கள் தொடர் மாற்றத்தைக் கொண்டிருக்கலாம்"
+    },
+    "copy-settings-from-library-modal": {
+        "close": "{{common.close}}",
+        "select-option": "ஒரு நூலகத்தைத் தேர்ந்தெடுக்கவும்",
+        "select": "தேர்ந்தெடு",
+        "title": "அமைப்புகளை ஒரு நூலகத்திலிருந்து பலவற்றிற்கு நகலெடுக்கவும்",
+        "description": "அடுத்த திரையில் இருந்து அமைப்புகளை நகலெடுக்க ஒரு நூலகத்தைத் தேர்ந்தெடுக்கவும், விண்ணப்பிக்க நூலகங்களைத் தேர்ந்தெடுக்கவும்."
+    },
+    "manage-media-settings": {
+        "encode-as-description-part-2": "நான் Webp ஐப் பயன்படுத்தலாமா?",
+        "encode-as-description-part-3": "நான் AVIF ஐப் பயன்படுத்தலாமா?",
+        "encode-as-description-part-1": "WEBP/AVIF கோப்புகளுக்கான இட தேவைகளை வெகுவாகக் குறைக்க முடியும். அனைத்து உலாவிகள் அல்லது பதிப்புகளிலும் WEBP/AVIF ஆதரிக்கப்படவில்லை. உங்கள் அமைப்பிற்கு இந்த அமைப்புகள் பொருத்தமானதா என்பதை அறிய, பார்வையிடவும் ",
+        "encode-as-warning": "நீங்கள் WebP/AVIF க்குச் சென்றவுடன் நீங்கள் மீண்டும் PNG க்கு மாற்ற முடியாது. எல்லா அட்டைகளையும் மீண்டும் உருவாக்க உங்கள் நூலகங்களில் அட்டைகளைப் புதுப்பிக்க வேண்டும். புக்மார்க்குகள் மற்றும் ஃபாவிகான்களை மாற்ற முடியாது.",
+        "media-warning": "சேமித்த பிறகு பணிகள் தாவலில் மீடியா மாற்றும் பணியை நீங்கள் தூண்ட வேண்டும்.",
+        "encode-as-label": "மீடியாவை சேமிக்கவும்",
+        "encode-as-tooltip": "அனைத்து மீடியா கவிதா நிர்வகிக்கிறது (கவர்கள், புக்மார்க்குகள், ஃபேவிகான்கள்) இந்த வகையாக குறியாக்கம் செய்யப்படும்.",
+        "bookmark-dir-label": "புக்மார்க்ச் அடைவு",
+        "bookmark-dir-tooltip": "புக்மார்க்குகள் சேமிக்கப்படும் இடம். புக்மார்க்குகள் மூல கோப்புகள் மற்றும் பெரியதாக இருக்கலாம். போதுமான சேமிப்பிடத்துடன் இருப்பிடத்தைத் தேர்வுசெய்க. அடைவு நிர்வகிக்கப்படுகிறது; கோப்பகத்திற்குள் உள்ள பிற கோப்புகள் நீக்கப்படும். கப்பல்துறை என்றால், கூடுதல் அளவை ஏற்றி அதைப் பயன்படுத்தவும்.",
+        "change": "மாற்றம்",
+        "reset-to-default": "{{பொதுவான.",
+        "reset": "{{common.reset}}}",
+        "save": "{{common.save}}",
+        "media-issue-title": "ஊடக சிக்கல்கள்",
+        "scrobble-issue-title": "துருவல் சிக்கல்கள்",
+        "cover-image-size-label": "பட அளவை கவர்",
+        "cover-image-size-tooltip": "படங்களை உருவாக்க எவ்வளவு பெரியது. குறிப்பு: இயல்புநிலையை விட பெரிய எதுவும் நீண்ட பக்க சுமை நேரங்களை ஏற்படுத்தும்."
+    },
+    "reading-activity": {
+        "no-data": "வாசிப்பு முன்னேற்றம் இல்லை",
+        "title": "வாசிப்பு செயல்பாடு",
+        "legend-label": "வடிவங்கள்",
+        "x-axis-label": "நேரம்",
+        "y-axis-label": "நேரம் படித்தது",
+        "time-frame-label": "கால அளவு",
+        "all-users": "அனைத்து பயனர்களும்",
+        "this-week": "{{நேர-காலங்கள். இந்த வார}}",
+        "last-7-days": "{{நேர-காலங்கள். லாச்ட் -7 நாட்கள்}}",
+        "last-30-days": "{{நேர-காலங்கள். லாச்ட் -30 நாட்கள்}}",
+        "last-90-days": "{{நேர-காலங்கள். லாச்ட் -90 நாட்கள்}}",
+        "last-year": "{{நேர-காலங்கள். லாச்ட் ஆண்டு}}",
+        "all-time": "{{time-phetiods.all-time}}"
+    },
+    "publication-status-stats": {
+        "count-header": "எண்ணுங்கள்",
+        "title": "வெளியீட்டு நிலை",
+        "visualisation-label": "காட்சிப்படுத்தல்",
+        "data-table-label": "தரவு அட்டவணை",
+        "year-header": "ஆண்டு"
+    },
+    "settings": {
+        "admin-users": "பயனர்கள்",
+        "account-section-title": "கணக்கு",
+        "server-section-title": "சேவையகம்",
+        "info-section-title": "தகவல்",
+        "import-section-title": "இறக்குமதி",
+        "kavitaplus-section-title": "{{sentings.admin-kavitaplus}}",
+        "admin-general": "பொது",
+        "admin-libraries": "நூலகங்கள்",
+        "admin-media": "ஊடகம்",
+        "admin-media-issues": "ஊடக சிக்கல்கள்",
+        "admin-logs": "பதிவுகள்",
+        "admin-email": "மின்னஞ்சல்",
+        "admin-tasks": "பணிகள்",
+        "admin-statistics": "புள்ளிவிவரங்கள்",
+        "admin-system": "மண்டலம்",
+        "admin-kavitaplus": "கவிதா+",
+        "account": "கணக்கு",
+        "preferences": "விருப்பத்தேர்வுகள்",
+        "clients": "பநிஇ விசை / OPDS",
+        "devices": "சாதனங்கள்",
+        "user-stats": "புள்ளிவிவரங்கள்",
+        "scrobbling": "ச்க்ராப்லிங்",
+        "theme": "கருப்பொருள்",
+        "customize": "தனிப்பயனாக்கு",
+        "cbl-import": "சிபிஎல் வாசிப்பு பட்டியல்",
+        "mal-stack-import": "மால் அடுக்கு"
+    },
+    "stream-pipe": {
+        "want-to-read": "{{side-nav.want-to-read}}",
+        "on-deck": "{{dashboard.on-deck-title}}",
+        "recently-updated": "{{டாச்போர்டு.",
+        "newly-added": "{{டாச்போர்டு.",
+        "more-in-genre": "{{dashboard.more-in-genre-title}}",
+        "collections": "{{side-nav.collections}}",
+        "reading-lists": "{{side-nav.reading-lists}}",
+        "bookmarks": "{{side-nav.bookmarks}}",
+        "all-series": "{{side-nav.all-series}}",
+        "browse-authors": "{{side-nav.browse- ஆசிரியர்கள்}}"
+    },
+    "filter-field-pipe": {
+        "location": "இடம்",
+        "languages": "மொழிகள்",
+        "libraries": "நூலகங்கள்",
+        "letterer": "லெட்டர்",
+        "publication-status": "வெளியீட்டு நிலை",
+        "penciller": "பென்சில்லர்",
+        "age-rating": "{{metadata-fields.age- மதிப்பீட்டு-தலைப்பு}}",
+        "characters": "{{metadata-fields.Characters-title}}}",
+        "collection-tags": "சேகரிப்பு குறிச்சொற்கள்",
+        "colorist": "வண்ணமயமான",
+        "cover-artist": "{{நபர்-ரோல்-பைப்.ஆர்ட்டிச்ட்}}}",
+        "editor": "திருத்தி",
+        "formats": "வடிவங்கள்",
+        "genres": "{{metadata-fields.genres-title}}",
+        "inker": "ஈட்டி",
+        "team": "அணி",
+        "imprint": "முத்திரை",
+        "publisher": "வெளியீட்டாளர்",
+        "read-progress": "முன்னேற்றத்தைப் படியுங்கள்",
+        "read-time": "நேரம் படிக்கவும்",
+        "release-year": "{{sort-field-pipe.release- ஆண்டு}}",
+        "series-name": "தொடர் பெயர்",
+        "summary": "சுருக்கம்",
+        "tags": "{{metadata-fields.tags-title}}}",
+        "translators": "மொழிபெயர்ப்பாளர்கள்",
+        "user-rating": "பயனர் மதிப்பீடு",
+        "writers": "{{metadata-fields.writers-title}}}",
+        "path": "பாதை",
+        "file-path": "கோப்பு பாதை",
+        "want-to-read": "படிக்க விரும்புகிறேன்",
+        "read-date": "வாசிப்பு தேதி",
+        "read-last": "கடைசியாக படியுங்கள்",
+        "average-rating": "சராசரி மதிப்பீடு"
+    },
+    "manage-devices": {
+        "email-label": "மின்னஞ்சல்",
+        "name-label": "பெயர்",
+        "title": "சாதன மேலாளர்",
+        "description": "இந்த பிரிவு நீங்கள் ஒரு வலை உலாவி வழியாக கவிதாவுடன் இணைக்க முடியாத சாதனங்களை அமைப்பதற்கும் அதற்கு பதிலாக கோப்புகளை ஏற்றுக்கொள்ளும் மின்னஞ்சல் முகவரியைக் கொண்டிருப்பதற்கும் ஆகும்.",
+        "devices-title": "சாதனங்கள்",
+        "no-devices": "இதுவரை சாதனங்கள் அமைப்பு இல்லை",
+        "platform-label": "இயங்குதளம்",
+        "email-setup-alert": "உங்கள் சாதனங்களுக்கு கோப்புகளை அனுப்ப விரும்புகிறீர்களா? உங்கள் நிர்வாக அமைவு மின்னஞ்சல் அமைப்புகளை முதலில் வைத்திருங்கள்!",
+        "add": "{{common.add}}}",
+        "delete": "{{common.delete}}",
+        "edit": "{{common.edit}}}",
+        "no-data": "{{typeahead.no-data}}}",
+        "actions-header": "{{நிர்வகி-பயனர்கள்.அக்சன்ச்-ஈடர்}}"
+    },
+    "dashboard": {
+        "no-libraries": "இதுவரை நூலகங்கள் அமைக்கப்படவில்லை. சிலவற்றை உருவாக்கவும்",
+        "server-settings-link": "சேவையக அமைப்புகள்",
+        "not-granted": "எந்த நூலகங்களுக்கும் உங்களுக்கு அணுகல் வழங்கப்படவில்லை.",
+        "on-deck-title": "டெக்கில்",
+        "recently-updated-title": "அண்மைக் காலத்தில் புதுப்பிக்கப்பட்ட தொடர்",
+        "recently-added-title": "புதிதாக சேர்க்கப்பட்ட தொடர்",
+        "more-in-genre-title": "{{genre}} இல் மேலும்"
+    },
+    "edit-user": {
+        "edit": "{{common.edit}}}",
+        "close": "{{common.close}}",
+        "username": "{{common.username}}}",
+        "required": "{{validation.required-field}}",
+        "email": "{{common.email}}}",
+        "cancel": "{{common.cancel}}",
+        "saving": "சேமிப்பு…",
+        "update": "புதுப்பிப்பு",
+        "account-detail-title": "கணக்கு விவரங்கள்"
+    },
+    "review-card-modal": {
+        "close": "{{common.close}}",
+        "user-review": "{{username}} இன் மதிப்பாய்வு",
+        "external-mod": "(வெளிப்புற)",
+        "go-to-review": "மதிப்பாய்வு செய்யச் செல்லுங்கள்"
+    },
+    "review-card": {
+        "your-review": "இது உங்கள் மதிப்பாய்வு",
+        "external-review": "வெளிப்புற ஆய்வு",
+        "local-review": "உள்ளக ஆய்வு",
+        "rating-percentage": "மதிப்பீடு {{r}}%"
+    },
+    "want-to-read": {
+        "title": "படிக்க விரும்புகிறேன்",
+        "series-count": "{{common.series-count}}}",
+        "no-items": "உருப்படிகள் இல்லை. ஒரு தொடரைச் சேர்க்க முயற்சிக்கவும்.",
+        "no-items-filtered": "எந்த உருப்படிகளும் உங்கள் தற்போதைய வடிப்பானுடன் பொருந்தவில்லை."
+    },
+    "user-holds": {
+        "title": "ச்க்ரோபில் வைத்திருக்கிறது",
+        "description": "இது மேலோடை வழங்குநர்களுக்கு அழிக்கப்படாத தொடர்களின் பயனர் நிர்வகிக்கப்பட்ட பட்டியல். நீங்கள் எந்த நேரத்திலும் ஒரு தொடரை அகற்றலாம் மற்றும் அடுத்த ச்க்ரோபல்-திறன் கொண்ட நிகழ்வு (படித்தல் முன்னேற்றம், மதிப்பீடு, நிலையைப் படிக்க விரும்புகிறது) நிகழ்வுகளைத் தூண்டும்.",
+        "no-data": "{{typeahead.no-data}}}"
+    },
+    "theme": {
+        "theme-dark": "இருண்ட",
+        "theme-black": "கருப்பு",
+        "theme-paper": "காகிதம்",
+        "theme-white": "வெள்ளை"
+    },
+    "restriction-selector": {
+        "title": "அகவை மதிப்பீட்டு கட்டுப்பாடு",
+        "description": "தேர்ந்தெடுக்கப்பட்டால், தேர்ந்தெடுக்கப்பட்ட கட்டுப்பாட்டை விட குறைந்தது ஒரு பொருளைக் கொண்ட அனைத்து தொடர்களும் வாசிப்பு பட்டியல்களும் முடிவுகளிலிருந்து கத்தரிக்கப்படும்.",
+        "not-applicable-for-admins": "இது நிர்வாகிகளுக்கு பொருந்தாது.",
+        "age-rating-label": "{{metadata-fields.age- மதிப்பீட்டு-தலைப்பு}}",
+        "no-restriction": "கட்டுப்பாடு இல்லை",
+        "include-unknowns-label": "தெரியாதவர்களைச் சேர்க்கவும்",
+        "include-unknowns-tooltip": "உண்மை என்றால், தெரியாதவர்கள் அகவை கட்டுப்பாட்டுடன் அனுமதிக்கப்படுவார்கள். இது அகவை கட்டுப்பாடுகள் உள்ள பயனர்களுக்கு கூறப்படாத ஊடகங்கள் கசியும்."
+    },
+    "site-theme-provider-pipe": {
+        "system": "மண்டலம்",
+        "custom": "{{சாதனம்-பிளாட்ஃபார்ம்-பைப்.கச்டம்}}"
+    },
+    "edit-device-modal": {
+        "title": "சாதனத்தைத் திருத்து",
+        "device-name-label": "{{நிர்வகி-DEVICES.NAME-LABEL}}",
+        "platform-label": "{{நிர்வகி-devices.platform-label}}",
+        "email-label": "{{common.email}}}",
+        "email-tooltip": "இந்த மின்னஞ்சல் அனுப்புதல் வழியாக கோப்பை ஏற்க பயன்படுத்தப்படும்",
+        "device-platform-label": "சாதன தளம்",
+        "save": "{{common.save}}",
+        "close": "{{common.close}}",
+        "cancel": "{{common.cancel}}",
+        "required-field": "{{validation.required-field}}",
+        "valid-email": "{{சரிபார்ப்பு. வாலிட்-எமெயில்}}"
+    },
+    "change-password": {
+        "password-label": "{{common.password}}}",
+        "current-password-label": "தற்போதைய கடவுச்சொல்",
+        "new-password-label": "புதிய கடவுச்சொல்",
+        "confirm-password-label": "கடவுச்சொல்லை உறுதிப்படுத்தவும்",
+        "reset": "{{common.reset}}}",
+        "edit": "{{common.edit}}}",
+        "cancel": "{{common.cancel}}",
+        "save": "{{common.save}}",
+        "required-field": "{{validation.required-field}}",
+        "passwords-must-match": "கடவுச்சொற்கள் பொருந்த வேண்டும்",
+        "permission-error": "உங்கள் கடவுச்சொல்லை மாற்ற உங்களுக்கு இசைவு இல்லை. சேவையகத்தின் நிர்வாகியை அணுகவும்."
+    },
+    "user-stats-info-cards": {
+        "chapters": "{{value}} அத்தியாயங்கள்",
+        "total-pages-read-label": "மொத்த பக்கங்கள் படித்தன",
+        "total-pages-read-tooltip": "{{user-stats-info-cards.total-pages-read-label}}: {{value}}",
+        "total-words-read-label": "மொத்த சொற்கள் படித்தன",
+        "total-words-read-tooltip": "{{user-stats-info-cards.total-words-read-label}}: {{value}}",
+        "time-spent-reading-label": "படிக்க செலவழித்த நேரம்",
+        "pages-read-by-year-title": "ஆண்டுக்குள் படித்த பக்கங்கள்",
+        "time-spent-reading-tooltip": "{{பயனர்-ச்டாட்ச்-இன்ஃபோ-கார்டுகள். நேர-ச்பென்ட்-ரீடிங்-லேபிள்}}: {{value}}",
+        "chapters-read-label": "அத்தியாயங்கள் படித்தன",
+        "words-read-by-year-title": "ஆண்டுக்குள் படித்த சொற்கள்",
+        "words-count": "{{num}} சொற்கள்",
+        "pages-count": "{{num}} பக்கங்கள்",
+        "chapters-read-tooltip": "{{{பயனர்-ச்டாட்ச்-இன்ஃபோ-கார்டுகள்.சாப்டர்ச்-ரீட்-லேபல்}}: {{value}}",
+        "avg-reading-per-week-label": "சராசரி வாசிப்பு / வாரம்",
+        "last-active-label": "கடைசியாக செயலில்"
+    },
+    "typeahead": {
+        "no-data": "தரவு இல்லை",
+        "add-custom-item": ", தனிப்பயன் உருப்படியைச் சேர்க்க தட்டச்சு செய்க",
+        "locked-field": "புலம் பூட்டப்பட்டுள்ளது",
+        "close": "{{common.close}}",
+        "loading": "{{common.loading}}}",
+        "add-item": "{{item}}…"
+    },
+    "generic-list-modal": {
+        "close": "{{common.close}}",
+        "clear": "{{common.clear}}}",
+        "filter": "{{common.filter}}}",
+        "open-filtered-search": "{{item} க்கு க்கான வடிகட்டப்பட்ட தேடலைத் திறக்கவும்"
+    },
+    "scrobbling-providers": {
+        "title": "ச்க்ரோபிளிங் வழங்குநர்கள்",
+        "requires": "இந்த அம்சத்திற்கு செயலில் {{product}} உரிமம் தேவைப்படுகிறது",
+        "token-valid": "கிள்ளாக்கு செல்லுபடியாகும்",
+        "token-expired": "கிள்ளாக்கு காலாவதியானது",
+        "no-token-set": "கிள்ளாக்கு செட் இல்லை",
+        "token-set": "கிள்ளாக்கு செட்",
+        "generate": "உருவாக்கு",
+        "generic-instructions": "கவிதா+ அவர்களுடன் தொடர்பு கொள்ள நீங்கள் அனுமதிக்க வேண்டிய வெவ்வேறு வெளிப்புற சேவைகள் பற்றிய தகவல்களை நிரப்பவும்.",
+        "instructions": "முதல் முறையாக பயனர்கள் {{service} with உடன் பேசுவதை அனுமதிக்க கீழே உள்ள \"{{schrobling-providers.genate}}\" ஐ கீழே சொடுக்கு செய்ய வேண்டும். நீங்கள் நிரலை அங்கீகரித்தவுடன், கீழேயுள்ள உள்ளீட்டில் கிள்ளாக்கை நகலெடுத்து ஒட்டவும். எந்த நேரத்திலும் உங்கள் கிள்ளாக்கை மீண்டும் உருவாக்கலாம்.",
+        "mal-instructions": "கவிதா அங்கீகாரத்திற்காக ஒரு மால் கிளையன்ட் ஐடியைப் பயன்படுத்துகிறார். கவிதாவுக்கு ஒரு புதிய கிளையண்டை உருவாக்கி, ஒப்புதல் அளிக்கப்பட்டதும், கிளையன்ட் ஐடி மற்றும் உங்கள் பயனர்பெயரை வழங்கவும்.",
+        "scrobbling-applicable-label": "பொருந்தும்",
+        "token-input-label": "{{service}} கிள்ளாக்கு இங்கே செல்கிறது",
+        "mal-token-input-label": "மால் வாங்கி ஐடி",
+        "mal-username-input-label": "மால் பயனர்பெயர்",
+        "edit": "{{common.edit}}}",
+        "cancel": "{{common.cancel}}",
+        "save": "{{common.save}}",
+        "loading": "{{common.loading}}}"
+    },
+    "library-access-modal": {
+        "select-all": "{{common.select-all}}",
+        "deselect-all": "{{common.deselect-all}}",
+        "title": "நூலக அணுகல்",
+        "close": "{{common.close}}",
+        "reset": "{{common.reset}}}",
+        "cancel": "{{common.cancel}}",
+        "save": "{{common.save}}",
+        "no-data": "இதுவரை நூலகங்கள் அமைக்கப்படவில்லை."
+    },
+    "time-periods": {
+        "this-week": "இந்த வாரம்",
+        "last-7-days": "கடந்த 7 நாட்கள்",
+        "last-30-days": "கடந்த 30 நாட்கள்",
+        "last-90-days": "கடந்த 90 நாட்கள்",
+        "last-year": "கடந்த ஆண்டு",
+        "all-time": "எல்லா நேரமும்"
+    },
+    "device-platform-pipe": {
+        "custom": "தனிப்பயன்"
+    },
+    "day-of-week-pipe": {
+        "monday": "திங்கள்",
+        "tuesday": "செவ்வாய்க்கிழமை",
+        "wednesday": "புதன்கிழமை",
+        "thursday": "வியாழக்கிழமை",
+        "friday": "வெள்ளிக்கிழமை",
+        "saturday": "காரிக்கிழமை",
+        "sunday": "ஞாயிற்றுக்கிழமை"
+    },
+    "cbl-import-result-pipe": {
+        "success": "செய்",
+        "partial": "பகுதி",
+        "failure": "தோல்வி"
+    },
+    "cbl-conflict-reason-pipe": {
+        "all-series-missing": "உங்கள் கணக்கில் பட்டியலில் உள்ள அனைத்து தொடர்களுக்கும் அணுகல் இல்லை அல்லது கவிதா பட்டியலில் எதுவும் இல்லை.",
+        "chapter-missing": "{{series}}: அத்தியாயம் {{chapter}} கவிதாவிலிருந்து காணவில்லை. இந்த உருப்படி தவிர்க்கப்படும்.",
+        "empty-file": "சிபிஎல் கோப்பு காலியாக உள்ளது, எதுவும் செய்ய முடியாது.",
+        "name-conflict": "சிபிஎல் கோப்புடன் பொருந்தக்கூடிய உங்கள் கணக்கில் ஏற்கனவே ஒரு வாசிப்பு பட்டியல் ({{readingListName}}) உள்ளது.",
+        "series-collision": "{{seriesLink}}, தொடர் மற்றொரு நூலகத்தில் அதே பெயரின் மற்றொரு தொடருடன் மோதுகிறது.",
+        "series-missing": "தொடர், {{series}}, கவிதாவிடமிருந்து இல்லை அல்லது உங்கள் கணக்கில் இசைவு இல்லை. இந்தத் தொடருடன் கூடிய அனைத்து பொருட்களும் இறக்குமதியிலிருந்து தவிர்க்கப்படும்.",
+        "volume-missing": "{{series}}: தொகுதி {{volume}} கவிதாவிடமிருந்து இல்லை அல்லது உங்கள் கணக்கில் இசைவு இல்லை. இந்த தொகுதி எண்ணைக் கொண்ட அனைத்து உருப்படிகளும் தவிர்க்கப்படும்.",
+        "all-chapter-missing": "அனைத்து அத்தியாயங்களையும் கவிதாவில் உள்ள அத்தியாயங்களுடன் பொருத்த முடியாது.",
+        "invalid-file": "கோப்பு சிதைந்துள்ளது அல்லது எதிர்பார்க்கப்படும் குறிச்சொற்கள்/விவரக்குறிப்புடன் பொருந்தாது.",
+        "success": "{{series}} தொகுதி {{volume}} அத்தியாயம் {{chapter}} வெற்றிகரமாக வரைபடமாக்கப்பட்டது."
+    },
+    "time-duration-pipe": {
+        "hours": "{{value}} மணிநேரம்",
+        "minutes": "{{value}} நிமிடங்கள்",
+        "days": "{{value}} நாட்கள்",
+        "months": "{{value}} மாதங்கள்",
+        "years": "{{value}} ஆண்டுகள்"
+    },
+    "time-ago-pipe": {
+        "never": "ஒருபோதும்",
+        "just-now": "இப்போது",
+        "min-ago": "ஒரு மணித்துளி முன்பு",
+        "mins-ago": "{{value}} நிமிடங்களுக்கு முன்பு",
+        "hour-ago": "ஒரு மணி நேரத்திற்கு முன்பு",
+        "hours-ago": "{{value}} மணிநேரங்களுக்கு முன்பு",
+        "day-ago": "ஒரு நாள் முன்பு",
+        "days-ago": "{{value}} சில நாட்களுக்கு முன்பு",
+        "month-ago": "ஒரு மாதத்திற்கு முன்பு",
+        "months-ago": "{{value}} மாதங்களுக்கு முன்பு",
+        "year-ago": "ஒரு வருடம் முன்பு",
+        "years-ago": "{{value}}} ஆண்டுகளுக்கு முன்பு"
+    },
+    "reset-password-modal": {
+        "title": "{{பயனர்பெயர் கடவுச்சொல்லை மீட்டமைக்கவும்",
+        "new-password-label": "புதிய கடவுச்சொல்",
+        "error-label": "பிழை: ",
+        "close": "{{common.close}}",
+        "cancel": "{{common.cancel}}",
+        "save": "{{common.save}}"
+    },
+    "all-series": {
+        "title": "அனைத்து தொடர்களும்",
+        "series-count": "{{common.series-count}}}"
+    },
+    "announcements": {
+        "title": "அறிவிப்புகள்"
+    },
+    "out-of-date-modal": {
+        "title": "பின்னால் விழ வேண்டாம்!",
+        "close": "{{common.close}}",
+        "subtitle": "உங்கள் நிறுவல் பின்னால் {{count}} பதிப்புகளை விட அதிகம் என்று தெரிகிறது!",
+        "description-1": "தயவுசெய்து மேம்படுத்துவதைக் கவனியுங்கள், இதனால் நீங்கள் கவிதாவின் அண்மைக் கால பதிப்பை இயக்குகிறீர்கள்.",
+        "description-2": "எங்கள்  விக்கி  ஐப் பாருங்கள்.",
+        "description-3": "நீங்கள் புதுப்பிக்காத ஒரு குறிப்பிட்ட காரணம் இருந்தால், காலாவதியான பதிப்பில் உங்களை வைத்திருப்பது என்ன என்பதை அறிய விரும்புகிறோம்! எங்கள் முரண்பாட்டால் நிறுத்தி, உங்கள் மேம்படுத்தல் பாதையைத் தடுப்பதை எங்களுக்குத் தெரியப்படுத்துங்கள்."
+    },
+    "changelog": {
+        "installed": "நிறுவப்பட்டது",
+        "download": "பதிவிறக்கம்",
+        "nightly": "இரவு: {{version}}",
+        "available": "கிடைக்கிறது"
+    },
+    "invite-user": {
+        "title": "பயனரை அழைக்கவும்",
+        "close": "{{common.close}}",
+        "description": "ஒரு பயனரின் மின்னஞ்சலை உள்ளிட்டு உங்கள் சேவையகத்திற்கு அழைக்கவும். கணக்கை உருவாக்க அவர்கள் ஒரு மின்னஞ்சலைப் பெறுவார்கள். இது வேலை செய்ய உங்களுக்குப் புரவலன் பெயர் மற்றும் மின்னஞ்சல் அமைக்கும் புலங்கள்  மின்னஞ்சல்  தாவலில் அமைக்கப்பட்டிருக்க வேண்டும், இல்லையெனில் ஒரு இணைப்பு பயனரின் சார்பாக அமைக்க உங்களுக்கு வழங்கப்படும். 
           
           மின்னஞ்சல் செல்லுபடியாகாது.",
+        "email": "{{common.email}}}",
+        "required-field": "{{common.required-field}}",
+        "setup-user-title": "பயனர் அழைக்கப்பட்டார்",
+        "setup-user-description": "உங்கள் பயனருக்கான கணக்கை அமைக்க அல்லது நகல் பொத்தானைப் பயன்படுத்த கீழே பின்வரும் இணைப்பைப் பயன்படுத்தலாம். புதிய பயனரை பதிவு செய்ய இணைப்பைப் பயன்படுத்துவதற்கு முன்பு நீங்கள் வெளியேற வேண்டியிருக்கலாம்.",
+        "setup-user-account": "பயனரின் கணக்கை அமைக்கவும்",
+        "setup-user-account-tooltip": "இதை நகலெடுத்து புதிய தாவலில் ஒட்டவும். நீங்கள் வெளியேற வேண்டியிருக்கலாம்.",
+        "invite-url-label": "முகவரி ஐ அழைக்கவும்",
+        "invite": "அழைக்கவும்",
+        "inviting": "அழைக்கும்…",
+        "cancel": "{{common.cancel}}",
+        "email-not-sent": "{{doast.email-not-sent}}",
+        "notice": "{{நிர்வகி-SETTINGS.NOTICE}}"
+    },
+    "library-selector": {
+        "title": "நூலகங்கள்",
+        "select-all": "{{common.select-all}}",
+        "deselect-all": "{{common.deselect-all}}",
+        "no-data": "இதுவரை நூலகங்கள் அமைக்கப்படவில்லை."
+    },
+    "book-line-overlay": {
+        "copy": "நகலெடு",
+        "bookmark": "புத்தககுறி",
+        "close": "{{common.close}}",
+        "required-field": "{{common.required-field}}",
+        "bookmark-label": "புக்மார்க்கு பெயர்",
+        "save": "{{common.save}}"
+    },
+    "personal-table-of-contents": {
+        "no-data": "இதுவரை எதுவும் புக்மார்க்கு செய்யப்படவில்லை",
+        "page": "பக்கம் {{value}}",
+        "delete": "{{bookmarkName}}} ஐ நீக்கு"
+    },
+    "confirm-email": {
+        "title": "பதிவு செய்யுங்கள்",
+        "description": "உங்கள் பதிவை முடிக்க படிவத்தை நிறைவு செய்யுங்கள்",
+        "username-label": "{{common.username}}}",
+        "password-label": "{{common.password}}}",
+        "email-label": "{{common.email}}}",
+        "required-field": "{{common.required-field}}",
+        "valid-email": "{{common.valid-email}}",
+        "password-validation": "{{சரிபார்ப்பு.போச்வேர்ட்-சரிபார்ப்பு}}",
+        "register": "பதிவு செய்யுங்கள்",
+        "error-label": "பிழை:"
+    },
+    "confirm-email-change": {
+        "title": "மின்னஞ்சல் மாற்றத்தை சரிபார்க்கவும்",
+        "non-confirm-description": "உங்கள் மின்னஞ்சல் புதுப்பிப்பு சரிபார்க்கப்படும்போது காத்திருங்கள்.",
+        "confirm-description": "உங்கள் மின்னஞ்சல் சரிபார்க்கப்பட்டு இப்போது கவிதாவுக்குள் மாற்றப்பட்டுள்ளது. நீங்கள் உள்நுழைய திருப்பி விடப்படுவீர்கள்.",
+        "success": "வெற்றி!"
+    },
+    "confirm-reset-password": {
+        "title": "கடவுச்சொல் மீட்டமைப்பு",
+        "description": "புதிய கடவுச்சொல்லை உள்ளிடவும்",
+        "password-label": "{{common.password}}}",
+        "required-field": "{{validation.required-field}}",
+        "submit": "{{common.submit}}}",
+        "password-validation": "{{சரிபார்ப்பு.போச்வேர்ட்-சரிபார்ப்பு}}"
+    },
+    "register": {
+        "title": "பதிவு செய்யுங்கள்",
+        "description": "நிர்வாகி கணக்கை பதிவு செய்ய படிவத்தை நிறைவு செய்யுங்கள்",
+        "username-label": "{{common.username}}}",
+        "email-label": "{{common.email}}}",
+        "email-tooltip": "மின்னஞ்சல் உண்மையான முகவரியாக இருக்க தேவையில்லை, ஆனால் கடவுச்சொல்லை மறந்துவிட்டதற்கான அணுகலை வழங்குகிறது. கவிதா உங்களுக்கு மின்னஞ்சல் அனுப்பாவிட்டால் அது சேவையகத்திற்கு வெளியே அனுப்பப்படாது.",
+        "password-label": "{{common.password}}}",
+        "required-field": "{{validation.required-field}}",
+        "valid-email": "{{சரிபார்ப்பு. வாலிட்-எமெயில்}}",
+        "password-validation": "{{சரிபார்ப்பு.போச்வேர்ட்-சரிபார்ப்பு}}",
+        "register": "பதிவு செய்யுங்கள்"
+    },
+    "download-button": {
+        "download-tooltip": "பதிவிறக்கம்",
+        "downloading-status": "பதிவிறக்கம்…"
+    },
+    "side-nav": {
+        "home": "வீடு",
+        "want-to-read": "படிக்க விரும்புகிறேன்",
+        "collections": "சேகரிப்புகள்",
+        "reading-lists": "பட்டியல்களைப் படித்தல்",
+        "bookmarks": "புக்மார்க்குகள்",
+        "filter-label": "{{common.filter}}}",
+        "all-series": "அனைத்து தொடர்களும்",
+        "clear": "{{common.clear}}}",
+        "donate": "நன்கொடை",
+        "donate-tooltip": "கவிதா+ க்கு சந்தா செலுத்துவதன் மூலம் இதை அகற்றலாம்",
+        "back": "பின்",
+        "more": "மேலும்",
+        "customize": "{{settings.customize}}"
+    },
+    "person-detail": {
+        "known-for-title": "அறியப்படுகிறது",
+        "individual-role-title": "ஒரு {{role}}",
+        "browse-person-title": "{{name} of இன் அனைத்து படைப்புகளும்",
+        "browse-person-by-role-title": "{{role} of இன் அனைத்து படைப்புகளும் {{name}}",
+        "all-roles": "பாத்திரங்கள்"
+    },
+    "library-settings-modal": {
+        "close": "{{common.close}}",
+        "edit-title": "திருத்து {{name}}",
+        "add-title": "நூலகத்தைச் சேர்க்கவும்",
+        "general-tab": "{{tabs.jenoral-tab}}}",
+        "folder-tab": "{{tabs.folder-tab}}}",
+        "cover-tab": "{{tabs.cover-tab}}}",
+        "advanced-tab": "{{tabs.advanced-tab}}",
+        "tasks-tab": "{{tabs.tasks-tab}}",
+        "name-label": "பெயர்",
+        "library-name-unique": "நூலக பெயர் தனித்துவமாக இருக்க வேண்டும்",
+        "last-scanned-label": "கடைசியாக ச்கேன்:",
+        "type-label": "வகை",
+        "type-tooltip": "கோப்பு பெயர்கள் எவ்வாறு பாகுபடுத்தப்படுகின்றன என்பதை நூலக வகை தீர்மானிக்கிறது மற்றும் இடைமுகம் அத்தியாயங்கள் (மங்கா) Vs சிக்கல்கள் (காமிக்ச்) காட்டினால். நூலக வகைகளுக்கு இடையிலான வேறுபாடுகள் குறித்த கூடுதல் விவரங்களுக்கு விக்கியைச் சரிபார்க்கவும்.",
+        "kavitaplus-eligible-label": "கவிதா+ தகுதியானவர்",
+        "kavitaplus-eligible-tooltip": "கவிதா+ தகவல்களை இழுப்பார் அல்லது ஆதரவளிக்கும்",
+        "folder-description": "உங்கள் நூலகத்தில் கோப்புறைகளைச் சேர்க்கவும்",
+        "browse": "ஊடக கோப்புறைகளுக்கு உலாவுக",
+        "help-us-part-1": "பின்பற்றுவதன் மூலம் எங்களுக்கு உதவுங்கள் ",
+        "help-us-part-2": "எங்கள் வழிகாட்டி",
+        "help-us-part-3": "உங்கள் ஊடகத்திற்கு பெயரிடுவதற்கும் ஒழுங்கமைப்பதற்கும்.",
+        "naming-conventions-part-1": "கவிதா உள்ளது ",
+        "naming-conventions-part-2": "கோப்புறை தேவைகள்.",
+        "naming-conventions-part-3": "நீங்கள் பின்தொடர்கிறீர்கள் என்பதை உறுதிப்படுத்த இந்த இணைப்பைச் சரிபார்க்கவும், இல்லையெனில் ச்கேன் இல் நான் காண்பிக்கப்படவில்லை.",
+        "cover-description": "தனிப்பயன் நூலக பட சின்னங்கள் விருப்பமானவை",
+        "cover-description-extra": "நூலக படம் பெரியதாக இருக்கக்கூடாது. ஒரு சிறிய கோப்பை நோக்கமாகக் கொள்ளுங்கள், 32x32 படப்புள்ளிகள் அளவு. கவிதா அளவு மீது சரிபார்ப்பு செய்யாது.",
+        "manage-collection-label": "சேகரிப்புகளை நிர்வகிக்கவும்",
+        "manage-collection-tooltip": "Comicinfo.xml/OPF கோப்புகளில் காணப்படும் தொடர் குழு குறிச்சொற்களிலிருந்து கவிதா சேகரிப்புகளை உருவாக்க வேண்டுமா",
+        "manage-reading-list-label": "வாசிப்பு பட்டியல்களை நிர்வகிக்கவும்",
+        "manage-reading-list-tooltip": "ComicInfo.xml/OPF கோப்புகளில் காணப்படும் ச்டோரிக்/ச்டோரார்க்நம்பர் மற்றும் மாற்றீடுகள்/மாற்று நிர்ணயிக்கப்பட்ட குறிச்சொற்களிலிருந்து கவிதா வாசிப்பு பட்டியல்களை உருவாக்க வேண்டுமா",
+        "allow-scrobbling-label": "ச்க்ரோபிளிங்கை அனுமதிக்கவும்",
+        "allow-scrobbling-tooltip": "கவிதா ச்க்ரோபில் வாசிப்பு நிகழ்வுகள், கட்டமைக்கப்பட்ட வழங்குநர்களுக்கு நிலை, மதிப்பீடுகள் மற்றும் மதிப்புரைகளைப் படிக்க விரும்பினால். சேவையகத்தில் செயலில் உள்ள கவிதா+ சந்தா இருந்தால் மட்டுமே இது நிகழும்.",
+        "folder-watching-label": "கோப்புறை பார்க்கிறது",
+        "folder-watching-tooltip": "இந்த நூலகத்தைப் பார்க்கும் சேவையக கோப்புறையை மேலெழுதவும். இந்த நூலகத்தில் உள்ள கோப்புறையில் கோப்புறையைப் பார்ப்பது கோப்புறைகளில் இயங்காது. நூலகங்கள் கோப்புறைகளைப் பகிர்ந்து கொண்டால், கோப்புறைகள் இன்னும் எதிராக இயங்கக்கூடும். ச்கேன் தூண்டுவதற்கு 10 நிமிடங்களுக்கு முன்பு எப்போதும் காத்திருக்கும்.",
+        "include-in-dashboard-label": "டாச்போர்டில் சேர்க்கவும்",
+        "include-in-dashboard-tooltip": "நூலகத்திலிருந்து தொடர் டாச்போர்டில் சேர்க்கப்பட வேண்டுமா? இது ஆன் டெக், அண்மைக் காலத்தில் புதுப்பிக்கப்பட்ட, அண்மைக் காலத்தில் சேர்க்கப்பட்ட அல்லது ஏதேனும் தனிப்பயன் சேர்த்தல் போன்ற அனைத்து ச்ட்ரீம்களையும் பாதிக்கிறது.",
+        "include-in-search-label": "தேடலில் சேர்க்கவும்",
+        "include-in-search-tooltip": "தொடர் மற்றும் நூலகத்திலிருந்து பெறப்பட்ட எந்தவொரு தகவலும் (வகைகள், நபர்கள், கோப்புகள்) தேடல் முடிவுகளில் சேர்க்கப்பட வேண்டுமா",
+        "force-scan": "படை ச்கேன்",
+        "force-scan-tooltip": "இது நூலகத்தில் ஒரு ச்கேன் கட்டாயப்படுத்தும், இது புதிய ச்கேன் போல சிகிச்சையளிக்கும்",
+        "reset": "{{common.reset}}}",
+        "cancel": "{{common.cancel}}",
+        "next": "அடுத்தது",
+        "save": "{{common.save}}",
+        "required-field": "{{validation.required-field}}",
+        "file-type-group-label": "கோப்பு வகைகள்",
+        "file-type-group-tooltip": "கவிதா ச்கேன் எந்த வகையான கோப்புகளை ச்கேன் செய்ய வேண்டும். எடுத்துக்காட்டாக, காப்பகத்தில் அனைத்து சிபி*, சிப், ரார் போன்ற கோப்புகள் இருக்கும்.",
+        "exclude-patterns-label": "வடிவங்களை விலக்கு",
+        "exclude-patterns-tooltip": "கோப்பகங்களை ச்கேன் செய்யும் போது கவிதா பொருந்தும் மற்றும் ச்கேனர் முடிவுகளிலிருந்து விலக்கும் போது கவிதா பொருந்தக்கூடிய வடிவங்களின் தொகுப்பை (குளோப் தொடரியல்) உள்ளமைக்கவும்.",
+        "help": "{{common.help}}}"
+    },
+    "file-type-group-pipe": {
+        "archive": "காப்பகம்",
+        "epub": "எபப்",
+        "pdf": "பி.டி.எஃப்",
+        "image": "படம்"
+    },
+    "table-of-contents": {
+        "no-data": "இந்த புத்தகத்தில் மேனிலை தரவு அல்லது ஒரு TOC கோப்பில் அமைக்கப்பட்ட உள்ளடக்க அட்டவணை இல்லை"
+    },
+    "bookmarks": {
+        "title": "{{side-nav.bookmarks}}",
+        "series-count": "{{common.series-count}}}",
+        "no-data": "புக்மார்க்குகள் இல்லை. உருவாக்க முயற்சிக்கவும்",
+        "no-data-2": "ஒன்று.",
+        "confirm-delete": "பல தொடர்களுக்கான அனைத்து புக்மார்க்குகளையும் அழிக்க விரும்புகிறீர்களா? இதை செயல்தவிர்க்க முடியாது.",
+        "confirm-single-delete": "{{seriesName} க்கு க்கான அனைத்து புக்மார்க்குகளையும் அழிக்க விரும்புகிறீர்களா? இதை செயல்தவிர்க்க முடியாது.",
+        "delete-success": "புக்மார்க்குகள் அகற்றப்பட்டுள்ளன",
+        "delete-single-success": "{{seriesName}} இன் புக்மார்க்குகள் அகற்றப்பட்டுள்ளன"
+    },
+    "bulk-operations": {
+        "title": "மொத்த செயல்கள்",
+        "items-selected": "{{num}} தேர்ந்தெடுக்கப்பட்ட உருப்படிகள்",
+        "mark-as-unread": "படிக்காத எனக் குறிக்கவும்",
+        "mark-as-read": "படித்தபடி குறி",
+        "deselect-all": "{{பொதுவான."
+    },
+    "card-detail-layout": {
+        "total-items": "{{count}} மொத்த உருப்படிகள்",
+        "jumpkey-count": "{{count}} தொடர்"
+    },
+    "card-item": {
+        "cannot-read": "படிக்க முடியாது"
+    },
+    "related-tab": {
+        "reading-lists-title": "{{reading-lists.title}}}",
+        "collections-title": "{{side-nav.collections}}",
+        "relations-title": "{{tabs.-related-tab}}}"
+    },
+    "cover-image-chooser": {
+        "enter-an-url-pre-title": "ஒரு {{url}}} ஐ உள்ளிடவும்",
+        "url": "முகவரி",
+        "drag-n-drop": "இழுத்து விடுங்கள்",
+        "upload": "பதிவேற்றும்",
+        "upload-continued": "ஒரு படம்",
+        "url-label": "முகவரி",
+        "load": "சுமை",
+        "back": "பின்",
+        "reset-cover-tooltip": "கவர் படத்தை மீட்டமைக்கவும்",
+        "reset": "{{common.reset}}}",
+        "image-num": "படம் {{num}}",
+        "apply": "{{common.apply}}}",
+        "applied": "{{தீம்-மேனேசர்."
+    },
+    "download-indicator": {
+        "progress": "{{percentage}}% பதிவிறக்கம் செய்யப்பட்டது"
+    },
+    "edit-series-relation": {
+        "description-part-1": "என்ன உறவு சேர்க்க வேண்டும் என்று உறுதியாக தெரியவில்லையா? எங்கள் பார்க்கவும்",
+        "description-part-2": "குறிப்புகளுக்கு விக்கி.",
+        "target-series": "இலக்கு தொடர்",
+        "relationship": "உறவு",
+        "remove": "{{common.remove}}",
+        "add-relationship": "உறவைச் சேர்க்கவும்",
+        "parent": "{{உறவு-பிப். பெற்றோர்}}}"
+    },
+    "bulk-add-to-collection": {
+        "title": "சேகரிப்பில் சேர்க்கவும்",
+        "promoted": "{{common.promoted}}}",
+        "close": "{{common.close}}",
+        "filter-label": "{{common.filter}}}",
+        "clear": "{{common.clear}}}",
+        "no-data": "இதுவரை எந்த சேகரிப்பும் உருவாக்கப்படவில்லை",
+        "loading": "{{common.loading}}}",
+        "collection-label": "சேகரிப்பு",
+        "create": "{{common.create}}"
+    },
+    "manage-settings": {
+        "port-label": "துறைமுகம்",
+        "folder-watching-label": "கோப்புறை பார்க்கிறது",
+        "networking-settings-title": "நெட்வொர்க்கிங்",
+        "system-settings-title": "மண்டலம்",
+        "customization-settings-title": "தனிப்பயனாக்கம்",
+        "notice": "அறிவிப்பு:",
+        "restart-required": "துறைமுகம், அடிப்படை முகவரி, கேச் அளவு அல்லது ஐ.பி.எச்சை மாற்றுவதற்கு கவிதாவின் கையேடு மறுதொடக்கம் நடைமுறைக்கு வர வேண்டும்.",
+        "base-url-label": "அடிப்படை முகவரி",
+        "base-url-tooltip": "நீங்கள் கவிதாவை ஒரு அடிப்படை முகவரி இல் புரவலன் செய்ய விரும்பினால் இதைப் பயன்படுத்தவும், அதாவது உங்கள் டொமெய்ன்.காம்/கேவிட்டா. ரூட் அல்லாத பயனரைப் பயன்படுத்தி டோக்கரில் ஆதரிக்கப்படவில்லை.",
+        "ip-address-label": "ஐபி முகவரிகள்",
+        "ip-address-tooltip": "கமா பிரிக்கப்பட்ட ஐபி முகவரிகளின் பட்டியல் சேவையகம் கேட்கிறது. நீங்கள் டோக்கரில் இயங்கினால் இது சரி செய்யப்படுகிறது. நடைமுறைக்கு வர மறுதொடக்கம் தேவை.",
+        "port-tooltip": "துறைமுகம் சேவையகம் கேட்கிறது. நீங்கள் டோக்கரில் இயங்கினால் இது சரி செய்யப்படுகிறது. நடைமுறைக்கு வர மறுதொடக்கம் தேவை.",
+        "backup-label": "காப்புப்பிரதிகளின் நாட்கள்",
+        "backup-tooltip": "பராமரிக்க காப்புப்பிரதிகளின் எண்ணிக்கை. இயல்புநிலை 30, குறைந்தபட்சம் 1, அதிகபட்சம் 30 ஆகும்.",
+        "log-label": "பதிவுகளின் நாட்கள்",
+        "log-tooltip": "பராமரிக்க வேண்டிய பதிவுகளின் எண்ணிக்கை. இயல்புநிலை 30, குறைந்தபட்சம் 1, அதிகபட்சம் 30 ஆகும்.",
+        "logging-level-label": "பதிவு நிலை",
+        "logging-level-tooltip": "சிக்கல்களை அடையாளம் காண பிழைத்திருத்தத்தைப் பயன்படுத்தவும். பிழைத்திருத்தம் நிறைய வட்டு இடத்தை சாப்பிடலாம்.",
+        "cache-size-label": "கேச் அளவு",
+        "cache-size-tooltip": "கனரக பநிஇ களைத் தேக்க அனுமதிக்கப்பட்ட நினைவகத்தின் அளவு. இயல்புநிலை 75MB.",
+        "on-deck-last-progress-label": "டெக் கடைசி முன்னேற்றத்தில் (நாட்கள்)",
+        "on-deck-last-progress-tooltip": "டெக்கில் எதையாவது உதைப்பதற்கு முன் கடைசி முன்னேற்றத்திலிருந்து நாட்களின் எண்ணிக்கை.",
+        "on-deck-last-chapter-add-label": "டெக்கில் கடைசி அத்தியாயத்தைச் சேர் (நாட்கள்)",
+        "on-deck-last-chapter-add-tooltip": "கடந்த அத்தியாயத்திலிருந்து நாட்களின் எண்ணிக்கை சேர்க்கப்பட்டது.",
+        "allow-stats-label": "அநாமதேய பயன்பாட்டு சேகரிப்பை அனுமதிக்கவும்",
+        "allow-stats-tooltip-part-1": "கவிதாவின் சேவையகங்களுக்கு அநாமதேய பயன்பாட்டு தரவை அனுப்பவும். பயன்படுத்தப்பட்ட சில நற்பொருத்தங்கள், கோப்புகளின் எண்ணிக்கை, OS பதிப்பு, கவிதா நிறுவல் பதிப்பு, சிபியு மற்றும் நினைவகம் பற்றிய தகவல்கள் இதில் அடங்கும். நற்பொருத்தங்கள், பிழை திருத்தங்கள் மற்றும் செயல்திறன் சரிப்படுத்தும் முன்னுரிமை அளிக்க இந்த தகவலைப் பயன்படுத்துவோம். நடைமுறைக்கு வர மறுதொடக்கம் தேவை. பார்க்க ",
+        "allow-stats-tooltip-part-2": "சேகரிக்கப்பட்டவற்றிற்காக.",
+        "send-data": "தரவை அனுப்பவும்",
+        "opds-label": "விருப்பங்கள்",
+        "opds-tooltip": "OPDS உதவி அனைத்து பயனர்களையும் சேவையகத்திலிருந்து உள்ளடக்கத்தைப் படிக்கவும் பதிவிறக்கவும் OPDS ஐப் பயன்படுத்த அனுமதிக்கும்.",
+        "enable-opds": "OPDS ஐ இயக்கவும்",
+        "folder-watching-tooltip": "மாற்றங்களைக் கண்டறிந்து அந்த மாற்றங்களை ச்கேனிங் செய்ய நூலக கோப்புறைகளை கண்காணிக்க கவிதாவை அனுமதிக்கிறது. இது ச்கேன் செய்யாமல் அல்லது இரவு ச்கேன்களுக்காக காத்திருக்காமல் உள்ளடக்கத்தை புதுப்பிக்க அனுமதிக்கிறது. ச்கேன் தூண்டுவதற்கு 10 நிமிடங்களுக்கு முன்பு எப்போதும் காத்திருக்கும்.",
+        "enable-folder-watching": "கோப்புறை பார்ப்பதை இயக்கவும்",
+        "host-name-label": "{{நிர்வகி-எமெயில்-செட்டிங்ச்.ஓச்ட்-பெயர்-லேபிள்}}",
+        "host-name-tooltip": "{{நிர்வகி-எமெயில்-செட்டிங்ச்.ஓச்ட்-நேம்-டூல்டிப்}}}",
+        "host-name-validation": "{{நிர்வகி-எமெயில்-அமைப்புகள்.ஓச்ட்-பெயர்-சரிபார்ப்பு}}",
+        "reset-to-default": "{{பொதுவான.",
+        "reset": "{{common.reset}}}",
+        "save": "{{common.save}}",
+        "cache-size-validation": "உங்களிடம் குறைந்தது 50 எம்பி இருக்க வேண்டும்.",
+        "field-required": "{{சரிபார்ப்பு.ஃபீல்ட்-தேவை}}",
+        "max-logs-validation": "உங்களிடம் {{num}} பதிவுகளை விட அதிகமாக இருக்க முடியாது",
+        "min-logs-validation": "உங்களிடம் குறைந்தது 1 பதிவு இருக்க வேண்டும்",
+        "min-days-validation": "குறைந்தது 1 நாள் இருக்க வேண்டும்",
+        "min-cache-validation": "50 எம்பி இருக்க வேண்டும்.",
+        "max-backup-validation": "உங்களிடம் {{num}} காப்புப்பிரதியை விட அதிகமாக இருக்க முடியாது",
+        "min-backup-validation": "உங்களிடம் குறைந்தது 1 காப்புப்பிரதி இருக்க வேண்டும்",
+        "ip-address-validation": "ஐபி முகவரிகளில் செல்லுபடியாகும் ஐபிவி 4 அல்லது ஐபிவி 6 முகவரிகள் மட்டுமே இருக்க முடியும்",
+        "base-url-validation": "அடிப்படை முகவரி / உடன் தொடங்க வேண்டும் /"
+    },
+    "cover-image-size": {
+        "default": "இயல்புநிலை (320x455)",
+        "medium": "நடுத்தர (640x909)",
+        "large": "பெரிய (900x1277)",
+        "xlarge": "கூடுதல் பெரிய (1265x1795)"
+    },
+    "manage-scrobble-errors": {
+        "title": "பிழைகள்",
+        "description": "இந்த அட்டவணையில் ச்க்ரோப்ளிங்கின் போது காணப்படும் சிக்கல்கள் உள்ளன. நீங்கள் அதை எந்த நேரத்திலும் அழிக்கலாம் மற்றும் அடுத்த ச்க்ரோபல் பதிவேற்றத்தைப் பார்க்க காத்திருக்கலாம். அறியப்படாத தொடர் இருந்தால், நீங்கள் தொடர் பெயர் அல்லது உள்ளூர்மயமாக்கப்பட்ட தொடர் பெயரை சிறப்பாக சரிசெய்கிறீர்கள் அல்லது வழங்குநர்களுக்கு ஒரு வெப்லிங்கைச் சேர்க்கிறீர்கள்.",
+        "filter-label": "{{common.filter}}}",
+        "clear-errors": "பிழைகளை அழிக்கவும்",
+        "series-header": "தொடர்",
+        "created-header": "உருவாக்கப்பட்டது",
+        "comment-header": "கருத்து",
+        "edit-header": "தொகு",
+        "edit-item-alt": "திருத்து {{seriesName}}}",
+        "no-data": "சிக்கல்கள் இல்லை"
+    },
+    "default-date-pipe": {
+        "never": "ஒருபோதும்"
+    },
+    "library-recommended": {
+        "no-data": "இங்கே காட்ட எதுவும் இல்லை. உங்கள் நூலகத்தில் சில மெட்டாடேட்டாவைச் சேர்க்கவும், ஏதாவது படிக்கவும் அல்லது ஏதாவது மதிப்பிடவும். இந்த நூலகத்தில் பரிந்துரைகள் அணைக்கப்பட்டிருக்கலாம்.",
+        "more-in-genre": "{{genre}} இல் மேலும்",
+        "rediscover": "மீண்டும் கண்டுபிடி",
+        "highly-rated": "மிகவும் மதிப்பிடப்பட்டது",
+        "quick-catchups": "விரைவான பிடிப்புகள்",
+        "quick-reads": "விரைவான வாசிப்புகள்",
+        "on-deck": "{{dashboard.on-deck-title}}"
+    },
+    "nav-header": {
+        "skip-alt": "முக்கிய உள்ளடக்கத்திற்கு செல்லவும்",
+        "search-series-alt": "தேடல் தொடர்",
+        "search-alt": "தேடுங்கள்…",
+        "no-data": "முடிவுகள் எதுவும் கிடைக்கவில்லை",
+        "scroll-to-top-alt": "மேலே உருட்டவும்",
+        "server-settings": "சேவையக அமைப்புகள்",
+        "settings": "அமைப்புகள்",
+        "help": "{{common.help}}}",
+        "announcements": "அறிவிப்புகள்",
+        "logout": "வெளியேற்றம்",
+        "all-filters": "அறிவுள்ள வடிப்பான்கள்",
+        "nav-link-header": "வழிசெலுத்தல் விருப்பங்கள்",
+        "close": "{{common.close}}"
+    },
+    "promoted-icon": {
+        "promoted": "{{common.promoted}}}"
+    },
+    "collection-owner": {
+        "collection-created-label": "உருவாக்கியவர்: {{owner}}",
+        "collection-via-label": "{{source}} வழியாக"
+    },
+    "add-to-list-modal": {
+        "title": "வாசிப்பு பட்டியலில் சேர்க்கவும்",
+        "close": "{{common.close}}",
+        "filter-label": "{{common.filter}}}",
+        "promoted-alt": "{{common.promoted}}}",
+        "no-data": "இதுவரை எந்த பட்டியலும் உருவாக்கப்படவில்லை",
+        "loading": "{{common.loading}}}",
+        "reading-list-label": "படித்தல் பட்டியல்",
+        "create": "{{common.create}}"
+    },
+    "browse-themes-modal": {
+        "title": "கருப்பொருள்களை உலாவுக"
+    },
+    "import-mal-collection-modal": {
+        "close": "{{common.close}}",
+        "title": "மால் வட்டி அடுக்கு இறக்குமதி",
+        "description": "உங்கள் தவறான வட்டி அடுக்குகளை இறக்குமதி செய்து, கவிதாவுக்குள் வசூலை உருவாக்கவும்",
+        "series-count": "{{common.series-count}}}",
+        "restack-count": "{{num}} Restacks",
+        "nothing-found": "எதுவும் கிடைக்கவில்லை",
+        "track": "மின்தடம்"
+    },
+    "edit-chapter-progress": {
+        "user-header": "பயனர்",
+        "page-read-header": "பக்கங்கள் படித்தன",
+        "date-created-header": "உருவாக்கப்பட்டது (UTC)",
+        "date-updated-header": "கடைசியாக புதுப்பிக்கப்பட்டது (UTC)",
+        "action-header": "{{common.edit}}}",
+        "edit-alt": "{{common.edit}}}",
+        "no-data": "{{பயனர்-ச்க்ரொப்-இச்டரி.னோ-டேட்டா}}"
+    },
+    "import-cbl-modal": {
+        "close": "{{common.close}}",
+        "title": "சிபிஎல் இறக்குமதி",
+        "help-label": "{{common.help}}}",
+        "import-description": "தொடங்க, .cbl கோப்பை இறக்குமதி செய்யுங்கள். இறக்குமதி செய்வதற்கு முன் கவிதா பல காசோலைகளைச் செய்வார். கோப்பில் உள்ள சிக்கல்கள் காரணமாக சில படிகள் முன்னோக்கி செல்வதைத் தடுக்கும்.",
+        "validate-description": "பட்டியலில் செய்ய ஏதேனும் செயல்பாடுகள் உள்ளதா என்பதைப் பார்க்க எல்லா கோப்புகளும் சரிபார்க்கப்பட்டுள்ளன. தோல்வியுற்ற எந்த பட்டியலும் அடுத்த கட்டத்திற்கு செல்லாது. சிபிஎல் கோப்புகளை சரிசெய்து மீண்டும் முயற்சிக்கவும்.",
+        "validate-warning": "சிபிஎல் உடன் சிக்கல்கள் உள்ளன, அவை இறக்குமதியைத் தடுக்கும். இந்த சிக்கல்களை சரிசெய்யவும், பின்னர் மீண்டும் முயற்சிக்கவும்.",
+        "validate-no-issue-description": "சிபிஎல், அடுத்து அழுத்தவும் இல்லை.",
+        "dry-run-description": "இது உலர்ந்த ரன் மற்றும் நீங்கள் அடுத்ததாக அழுத்தி இறக்குமதியைச் செய்தால் என்ன நடக்கும் என்பதைக் காட்டுகிறது. அனைத்து தோல்விகளும் இறக்குமதி செய்யப்படாது.",
+        "prev": "முந்தைய",
+        "import": "இறக்குமதி",
+        "restart": "மறுதொடக்கம்",
+        "next": "அடுத்தது",
+        "import-step": "CBL களை இறக்குமதி செய்யுங்கள்",
+        "validate-cbl-step": "சிபிஎல் சரிபார்க்கவும்",
+        "dry-run-step": "உலர் ரன்",
+        "final-import-step": "இறுதி படி",
+        "comicvine-parsing-label": "காமிக் வைன் சீரிச் பொருத்தத்தைப் பயன்படுத்தவும்",
+        "cbl-repo": "சமூகத்தில் பல வாசிப்பு பட்டியல்களை நீங்கள் காணலாம்  களஞ்சி ."
+    },
+    "pdf-reader": {
+        "loading-message": "ஏற்றுதல் …… PDF கள் எதிர்பார்த்ததை விட அதிக நேரம் ஆகலாம்",
+        "incognito-mode": "மறைநிலை பயன்முறை",
+        "light-theme-alt": "ஒளி கருப்பொருள்",
+        "dark-theme-alt": "இருண்ட கருப்பொருள்",
+        "close-reader-alt": "மூடு வாசகர்",
+        "toggle-incognito": "மறைநிலை பயன்முறையை அணைக்கவும்"
+    },
+    "pdf-layout-mode-pipe": {
+        "single": "ஒற்றை பக்கம்",
+        "book": "புத்தக முறை",
+        "multiple": "இயல்புநிலை",
+        "infinite-scroll": "எல்லையற்ற சுருள்"
+    },
+    "pdf-scroll-mode-pipe": {
+        "vertical": "செங்குத்து",
+        "horizontal": "கிடைமட்டமாக",
+        "wrapped": "போர்த்தப்பட்டது",
+        "page": "புறக்கணிக்க தட்டவும்"
+    },
+    "pdf-spread-mode-pipe": {
+        "off": "பரவல்கள் இல்லை",
+        "odd": "ஒற்றைப்படை பரவுகிறது",
+        "even": "கூட பரவுகிறது"
+    },
+    "infinite-scroller": {
+        "continuous-reading-prev-chapter-alt": "முந்தைய அத்தியாயத்திற்கு செல்ல மேலே உருட்டவும்",
+        "continuous-reading-prev-chapter": "முந்தைய அத்தியாயம்",
+        "continuous-reading-next-chapter-alt": "அடுத்த அத்தியாயத்திற்கு செல்ல மேலே உருட்டவும்",
+        "continuous-reading-next-chapter": "அடுத்த அத்தியாயம்"
+    },
+    "edit-person-modal": {
+        "title": "{{personName}} விவரங்கள்",
+        "general-tab": "{{edit-series-modal.general-tab}}}",
+        "cover-image-tab": "{{edit-series-modal.cover-image-tab}}}",
+        "loading": "{{common.loading}}}",
+        "close": "{{common.close}}",
+        "name-label": "{{edit-series-modal.name-label}}",
+        "role-label": "பங்கு",
+        "mal-id-label": "ஐடியுடன்",
+        "mal-tooltip": "https://myanimelist.net/people/{MalId}/",
+        "anilist-id-label": "ஒரு அனானிக் ஐடி",
+        "anilist-tooltip": "https://anilist.co/staff/{AniListId}/",
+        "hardcover-id-label": "ஆர்ட்கவர் ஐடி",
+        "hardcover-tooltip": "https://hardcover.app/authors/{HardcoverId}",
+        "asin-label": "அசின்",
+        "asin-tooltip": "https://www.amazon.com/stores/J.K.-Rowling/author/{ASIN}",
+        "description-label": "விவரம்",
+        "required-field": "{{சரிபார்ப்புகள்.",
+        "cover-image-description": "{{edit-series-modal.cover-image-description}}",
+        "cover-image-description-extra": "மாற்றாக நீங்கள் கிடைத்தால் கவர்ச்டிபியிலிருந்து ஒரு அட்டையை பதிவிறக்கம் செய்யலாம்.",
+        "save": "{{common.save}}",
+        "download-coversdb": "CoverSDB இலிருந்து பதிவிறக்கவும்"
+    },
+    "day-breakdown": {
+        "title": "நாள் முறிவு",
+        "no-data": "முன்னேற்றம் இல்லை, படிக்க",
+        "x-axis-label": "வாரத்தின் நாள்",
+        "y-axis-label": "நிகழ்வுகள் படித்தல்"
+    },
+    "manga-format-stats": {
+        "title": "வடிவம்",
+        "visualisation-label": "காட்சிப்படுத்தல்",
+        "data-table-label": "தரவு அட்டவணை",
+        "format-header": "வடிவம்",
+        "count-header": "எண்ணுங்கள்"
+    },
+    "next-expected-card": {
+        "title": "~ {{date}}",
+        "upcoming-title": "வரவிருக்கும்"
+    },
+    "server-stats": {
+        "total-series-label": "மொத்த தொடர்",
+        "total-series-tooltip": "மொத்த தொடர்: {{count}}",
+        "total-volumes-label": "மொத்த தொகுதிகள்",
+        "total-volumes-tooltip": "மொத்த தொகுதிகள்: {{count}}",
+        "total-files-label": "மொத்த கோப்புகள்",
+        "total-files-tooltip": "மொத்த கோப்புகள்: {{count}}",
+        "total-size-label": "மொத்த அளவு",
+        "total-genres-label": "மொத்த வகைகள்",
+        "total-genres-tooltip": "மொத்த வகைகள்: {{count}}",
+        "total-tags-label": "மொத்த குறிச்சொற்கள்",
+        "total-tags-tooltip": "மொத்த குறிச்சொற்கள்: {{count}}",
+        "total-people-label": "மொத்த மக்கள்",
+        "total-people-tooltip": "மொத்த நபர்கள்: {{count}}",
+        "total-read-time-label": "மொத்த வாசிப்பு நேரம்",
+        "total-read-time-tooltip": "மொத்த வாசிப்பு நேரம்: {{count}}",
+        "series": "தொடர்",
+        "reads": "படிக்கிறது",
+        "release-years-title": "வெளியீட்டு ஆண்டுகள்",
+        "most-active-users-title": "மிகவும் செயலில் உள்ள பயனர்கள்",
+        "popular-libraries-title": "பிரபலமான நூலகங்கள்",
+        "popular-series-title": "பிரபலமான தொடர்",
+        "recently-read-title": "அண்மைக் காலத்தில் படியுங்கள்",
+        "series-count": "{{num}} தொடர்",
+        "volume-count": "{{num}} தொகுதிகள்",
+        "file-count": "{{num}} கோப்புகள்",
+        "genre-count": "{{num}} வகைகள்",
+        "tag-count": "{{num}} குறிச்சொற்கள்",
+        "people-count": "{{num}} மக்கள்",
+        "tags": "{{metadata-fields.tags-title}}}",
+        "people": "மக்கள்",
+        "genres": "{{metadata-fields.genres-title}}"
+    },
+    "errors": {
+        "series-doesnt-exist": "இந்த தொடர் இனி இல்லை",
+        "collection-invalid-access": "இந்த குறிச்சொல் சொந்தமான எந்த நூலகங்களுக்கும் உங்களுக்கு அணுகல் இல்லை அல்லது இந்த சேகரிப்பு தவறானது",
+        "unknown-crit": "அறியப்படாத முக்கியமான பிழை இருந்தது",
+        "user-not-auth": "பயனர் அங்கீகரிக்கப்படவில்லை",
+        "error-code": "{{}} பிழை",
+        "download": "இந்த கோப்பைப் பதிவிறக்குவதில் சிக்கல் இருந்தது அல்லது உங்களுக்கு இசைவு இல்லை",
+        "not-found": "அந்த முகவரி இல்லை",
+        "generic": "எதிர்பாராத ஒன்று தவறு",
+        "rejected-cover-upload": "படத்தை முகவரி வழியாக பெற முடியவில்லை. அதற்கு பதிலாக கோப்பிலிருந்து பதிவிறக்கம் செய்து பதிவேற்றவும்.",
+        "invalid-confirmation-url": "தவறான உறுதிப்படுத்தல் முகவரி",
+        "invalid-confirmation-email": "தவறான உறுதிப்படுத்தல் மின்னஞ்சல்",
+        "invalid-password-reset-url": "கடவுச்சொல் முகவரி ஐ மீட்டமை",
+        "delete-theme-in-use": "கருப்பொருள் தற்போது குறைந்தது ஒரு பயனரால் பயன்பாட்டில் உள்ளது, நீக்க முடியாது",
+        "theme-manual-upload": "கையேடு பதிவேற்றத்திலிருந்து கருப்பொருள் உருவாக்கும் சிக்கல் இருந்தது",
+        "theme-already-in-use": "கருப்பொருள் ஏற்கனவே அந்த பெயரால் உள்ளது"
+    },
+    "metadata-builder": {
+        "or": "பின்வருவனவற்றில் ஏதேனும் பொருந்தவும்",
+        "and": "பின்வரும் அனைத்தையும் பொருத்துங்கள்",
+        "add-rule": "விதியைச் சேர்க்கவும்",
+        "remove-rule": "வரிசையை அகற்று"
+    },
+    "customize-dashboard-modal": {
+        "title-dashboard": "டாச்போர்டைத் தனிப்பயனாக்குங்கள்",
+        "title-sidenav": "பக்க நாவ் தனிப்பயனாக்கவும்",
+        "title-external-sources": "வெளிப்புற ஆதாரங்கள்",
+        "title-smart-filters": "அறிவுள்ள வடிப்பான்கள்",
+        "close": "{{common.close}}",
+        "dashboard": "முகப்புப்பெட்டி",
+        "sidenav": "பக்க நடுவண்",
+        "external-sources": "வெளிப்புற ஆதாரங்கள்",
+        "smart-filters": "அறிவுள்ள வடிப்பான்கள்",
+        "help": "{{common.help}}}"
+    },
+    "customize-dashboard-streams": {
+        "no-data": "அனைத்து அறிவுள்ள வடிப்பான்களும் டாச்போர்டில் சேர்க்கப்பட்டுள்ளன அல்லது எதுவும் இதுவரை உருவாக்கப்படவில்லை.",
+        "save": "{{common.save}}",
+        "add": "{{common.add}}}",
+        "filter": "{{common.filter}}}",
+        "clear": "{{common.clear}}}"
+    },
+    "customize-sidenav-streams": {
+        "no-data": "அனைத்து அறிவுள்ள வடிப்பான்களும் பக்க NAV இல் சேர்க்கப்பட்டுள்ளன அல்லது இதுவரை உருவாக்கப்படவில்லை.",
+        "no-data-external-source": "அனைத்து வெளிப்புற ஆதாரங்களும் பக்க NAV இல் சேர்க்கப்பட்டுள்ளன அல்லது இதுவரை உருவாக்கப்படவில்லை.",
+        "save": "{{common.save}}",
+        "add": "{{common.add}}}",
+        "filter": "{{common.filter}}}",
+        "clear": "{{common.clear}}}",
+        "smart-filters-title": "அறிவுள்ள வடிப்பான்கள்",
+        "external-sources-title": "{{தனிப்பயனாக்கு-டாச்போர்டு-மோடல். எக்ச்டெர்னல்-மூலங்கள்}}}",
+        "reorder-when-filter-present": "வடிகட்டி இருக்கும்போது இழுவை மற்றும் துளி வழியாக உருப்படிகளை மறுவடிவமைக்க முடியாது. {{தனிப்பயனாக்கு-SIDENAV-TREAMS.ORDER-NUMBERS-LABEL} bed ஐப் பயன்படுத்தவும்",
+        "order-numbers-label": "{{வாசிப்பு-பட்டியல்-டி-ஆர்டர்-எண்கள்-லேபல்}}",
+        "bulk-mode-label": "மொத்த பயன்முறை"
+    },
+    "manage-external-sources": {
+        "add-source": "கூட்டு",
+        "help-link": "மேலும் செய்தி",
+        "description": "வெளிப்புற சேவையகங்களைச் சேர்ப்பதன் மூலம் உங்கள் அனுபவத்தை மேம்படுத்தவும், உங்கள் சேவையகத்திற்கும் உங்கள் நண்பரின் சேவையகத்திற்கும் விரைவான அணுகலுக்காக அவற்றை உங்கள் பக்க NAV இல் வசதியாக சேர்க்கவும்.",
+        "clear": "{{common.clear}}}",
+        "filter": "{{common.filter}}}",
+        "no-data": "வெளிப்புற ஆதாரங்கள் எதுவும் இல்லை"
+    },
+    "manage-smart-filters": {
+        "delete": "{{common.delete}}",
+        "no-data": "அறிவுள்ள வடிப்பான்கள் எதுவும் உருவாக்கப்படவில்லை",
+        "filter": "{{common.filter}}}",
+        "clear": "{{common.clear}}}",
+        "errored": "வடிகட்டியில் ஒரு குறியாக்க பிழை உள்ளது. நீங்கள் அதை மீண்டும் உருவாக்க வேண்டும்."
+    },
+    "edit-external-source-item": {
+        "not-unique": "இந்த ஓச்டுடன் வெளிப்புற மூலங்கள் உள்ளன. உங்களிடம் நகல்கள் இல்லை என்பதை உறுதிப்படுத்தவும்",
+        "title": "புதிய வெளிப்புற மூல",
+        "host-label": "விருந்தோம்பி",
+        "name-label": "பெயர்",
+        "api-key-label": "பநிஇ விசை",
+        "save": "{{common.save}}",
+        "edit": "{{common.edit}}}",
+        "cancel": "{{common.cancel}}",
+        "delete": "{{common.delete}}",
+        "pattern": "புரவலன் செல்லுபடியாகும் HTTP (கள்): // முகவரி ஆக இருக்க வேண்டும்",
+        "required": "{{சரிபார்ப்பு."
+    },
+    "read-time-pipe": {
+        "less-than-hour": "<1 மணி நேரம்",
+        "hour": "மணி",
+        "hours": "மணி"
+    }
+}
diff --git a/UI/Web/src/assets/langs/th.json b/UI/Web/src/assets/langs/th.json
index 47042819d..0f1ab1ca8 100644
--- a/UI/Web/src/assets/langs/th.json
+++ b/UI/Web/src/assets/langs/th.json
@@ -5,15 +5,16 @@
         "password": "{{common.password}}",
         "password-validation": "{{validation.password-validation}}",
         "forgot-password": "ลืมรหัสผ่าน?",
-        "submit": "ตกลง"
+        "submit": "เข้าสู่ระบบ"
     },
     "dashboard": {
-        "no-libraries": "ยังไม่ได้ตั้งค่ารายการหนังสือ กรุณาตั้งค่าใน",
-        "server-settings-link": "ตั้งค่าเซิฟเวอร์",
-        "not-granted": "คุณไม่ได้มีสิทธิ์ในการเข้าถึงรายการหนังสือ",
+        "no-libraries": "ยังไม่ได้ตั้งค่าห้องสมุด สร้างใหม่เพิ่มใน",
+        "server-settings-link": "ตั้งค่าเซิร์ฟเวอร์",
+        "not-granted": "คุณไม่ได้มีสิทธิ์ในการเข้าถึงห้องสมุด",
         "on-deck-title": "กำลังอ่าน",
-        "recently-updated-title": "ซีรี่ย์ที่เพิ่งอัพเดท",
-        "recently-added-title": "ซีรี่ย์ใหม่"
+        "recently-updated-title": "เรื่องที่อัพเดทล่าสุด",
+        "recently-added-title": "เรื่องที่เพิ่มใหม่",
+        "more-in-genre-title": "ดูเพิ่มใน {{genre}}"
     },
     "edit-user": {
         "edit": "{{common.edit}}",
@@ -21,34 +22,37 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
-        "saving": "กำลังบันทึก…",
-        "update": "อัปเดท"
+        "saving": "กำลังจัดเก็บ…",
+        "update": "อัพเดท",
+        "invalid-email-warning": "อีเมล์ที่ไม่ถูกต้องจะปิดกั้นบางฟังก์ชั่นของ Kavita",
+        "account-detail-title": "รายละเอียดบัญชี"
     },
     "user-scrobble-history": {
         "title": "ประวัติการทำ Scrobble",
         "description": "ที่นี่คุณสามารถดูรายการ Scrobble ที่เกิดขึ้นภายใต้บัญชีคุณได้ โดยรายการจะเกิดขึ้นก็ต่อเมื่อคุณได้ตั้งค่า Scrobble เรียบร้อยแล้ว รายการต่างๆ จะถูกลบเมื่อผ่านไปหนึ่งเดือน ถ้ามีรายการที่ยังไม่ถูกประมวลผล นั่นหมายความว่าอาจเกิดปัญหาที่ต้นทาง กรุณาติดต่อผู้ดูแลระบบเพื่อแก้ไขปัญหานี้",
         "filter-label": "{{common.filter}}",
-        "created-header": "สร้างแล้ว",
+        "created-header": "สร้างเมื่อ",
         "last-modified-header": "แก้ไขล่าสุด",
-        "type-header": "ชนิด",
-        "series-header": "ซีรีส์",
+        "type-header": "ประเภท",
+        "series-header": "เรื่อง",
         "data-header": "ข้อมูล",
         "is-processed-header": "กำลังดำเนินการ",
-        "no-data": "ไม่มีข้อมูล",
-        "volume-and-chapter-num": "เล่มที่ {{v}} บทที่ {{n}}",
+        "no-data": "{{common.no-data}}",
+        "volume-and-chapter-num": "เล่มที่ {{v}} ตอนที่ {{n}}",
         "volume-num": "เล่มที่ {{num}}",
-        "chapter-num": "บทที่ {{num}}",
-        "rating": "เรตติ้ง {{r}}",
+        "chapter-num": "ตอนที่ {{num}}",
+        "rating": "คะแนน {{r}}",
         "not-applicable": "ไม่สามารถใช้ได้",
         "processed": "ดำเนินการ",
         "not-processed": "ยังไม่ได้ประมวลผล",
-        "special": "{{entity-title.special}}"
+        "special": "{{entity-title.special}}",
+        "select-all-label": "เลือกทั้งหมด",
+        "delete-selected-label": "ลบที่เลือก"
     },
     "scrobble-event-type-pipe": {
         "chapter-read": "ความคืบหน้าการอ่าน",
-        "score-updated": "อัปเดทเรตติ้ง",
+        "score-updated": "อัพเดทคะแนน",
         "want-to-read-add": "ต้องการอ่าน: เพิ่ม",
         "want-to-read-remove": "ต้องการอ่าน: นำออก",
         "review": "อัปเดทรีวิว"
@@ -56,14 +60,6 @@
     "spoiler": {
         "click-to-show": "คลิกเพื่อแสดง"
     },
-    "review-series-modal": {
-        "title": "แก้ไขรีวิว",
-        "review-label": "รีวิว",
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}",
         "user-review": "รีวิวของ {{username}}",
@@ -108,42 +104,6 @@
         "collapse-series-relationships-tooltip": "Kavita ควรแสดงซีรีส์ที่ไม่มีความสัมพันธ์หรือเป็นพาเรนต์/พรีเควล",
         "share-series-reviews-label": "แบ่งปันบทวิจารณ์ซีรีส์",
         "share-series-reviews-tooltip": "Kavita ควรรวมบทวิจารณ์ซีรี่ส์ของคุณสำหรับผู้ใช้รายอื่นหรือไม่",
-        "image-reader-settings-title": "โปรแกรมอ่านรูปภาพ",
-        "reading-direction-label": "ทิศทางการอ่าน",
-        "reading-direction-tooltip": "ทิศทางการคลิกเพื่อไปยังหน้าถัดไป ขวาไปซ้าย หมายถึงคุณคลิกที่ด้านซ้ายของหน้าจอเพื่อไปยังหน้าถัดไป",
-        "scaling-option-label": "ตัวเลือกการปรับขนาด",
-        "scaling-option-tooltip": "วิธีปรับขนาดภาพให้พอดีกับหน้าจอของคุณ",
-        "page-splitting-label": "การแยกหน้า",
-        "page-splitting-tooltip": "วิธีแยกภาพเต็มความกว้าง (เช่น รวมภาพซ้ายและขวาเข้าด้วยกัน)",
-        "reading-mode-label": "โหมดการอ่าน",
-        "layout-mode-label": "โหมดเค้าโครง",
-        "layout-mode-tooltip": "เรนเดอร์ภาพเดียวไปที่หน้าจอหรือสองภาพเคียงข้างกัน",
-        "background-color-label": "สีพื้นหลัง",
-        "auto-close-menu-label": "ปิดเมนูอัตโนมัติ",
-        "show-screen-hints-label": "แสดงคำแนะนำบนหน้าจอ",
-        "emulate-comic-book-label": "เลียนแบบหนังสือการ์ตูน",
-        "swipe-to-paginate-label": "ปัดเพื่อเปลี่ยนหน้า",
-        "book-reader-settings-title": "เครื่องอ่านหนังสือ",
-        "tap-to-paginate-label": "แตะเพื่อเปลี่ยนหน้า",
-        "tap-to-paginate-tooltip": "อนุญาตให้แตะมุมหนังสือเพื่อเลื่อนไปยังหน้าก่อนหน้า/ถัดไป",
-        "immersive-mode-label": "โหมดดื่มด่ำ",
-        "immersive-mode-tooltip": "วิธีนี้จะซ่อนเมนูหลังการคลิกบนเอกสารของผู้อ่านและเปิดการแตะเพื่อแบ่งหน้า",
-        "reading-direction-book-label": "ทิศทางการอ่าน",
-        "reading-direction-book-tooltip": "ทิศทางการคลิกเพื่อไปยังหน้าถัดไป ขวาไปซ้าย หมายถึงคุณคลิกที่ด้านซ้ายของหน้าจอเพื่อไปยังหน้าถัดไป",
-        "font-family-label": "ตระกูลฟอนต์",
-        "font-family-tooltip": "ตระกูลฟอนต์เริ่มต้น ค่าเริ่มต้นจะโหลดแบบอักษรเริ่มต้นของหนังสือ",
-        "writing-style-label": "สไตล์การเขียน",
-        "writing-style-tooltip": "เปลี่ยนทิศทางของข้อความ แนวนอนคือซ้ายไปขวา แนวตั้งคือบนลงล่าง",
-        "layout-mode-book-label": "โหมดเค้าโครง",
-        "layout-mode-book-tooltip": "ควรจัดวางเนื้อหาอย่างไร เลื่อนเป็นไปตามที่หนังสือบรรจุไว้ 1 หรือ 2 คอลัมน์พอดีกับความสูงของอุปกรณ์ และพอดีกับ 1 หรือ 2 คอลัมน์ของข้อความต่อหน้า",
-        "color-theme-book-label": "ธีมสี",
-        "color-theme-book-tooltip": "ธีมสีใดที่จะใช้กับเนื้อหาและเมนูของผู้อ่านหนังสือ",
-        "font-size-book-label": "ขนาดตัวอักษร",
-        "line-height-book-label": "ระยะห่างบรรทัด",
-        "line-height-book-tooltip": "ระยะห่างระหว่างบรรทัดของหนังสือมากน้อยเพียงใด",
-        "margin-book-label": "ระยะขอบ",
-        "margin-book-tooltip": "ระยะห่างแต่ละด้านของหน้าจอเท่าใด ค่านี้จะแทนที่เป็น 0 บนอุปกรณ์เคลื่อนที่โดยไม่คำนึงถึงการตั้งค่านี้",
-        "pdf-reader-settings-title": "โปรแกรมอ่าน PDF",
         "clients-opds-alert": "OPDS ไม่ได้เปิดใช้งานบนเซิร์ฟเวอร์นี้ สิ่งนี้จะไม่ส่งผลกระทบต่อผู้ใช้ Tachiyomi",
         "clients-opds-description": "ไคลแอนบุคคลที่สามทั้งหมดจะใช้คีย์ API หรือ URL การเชื่อมต่อด้านล่าง สิ่งเหล่านี้เป็นเหมือนรหัสผ่าน โปรดเก็บไว้เป็นส่วนตัว",
         "clients-api-key-tooltip": "คีย์ API เป็นเหมือนรหัสผ่าน เก็บเป็นความลับ เก็บไว้ให้ปลอดภัย",
@@ -796,7 +756,6 @@
         "close": "{{common.close}}"
     },
     "manga-reader": {
-        "save-globally": "บันทึก",
         "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}",
         "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}"
     },
diff --git a/UI/Web/src/assets/langs/tr.json b/UI/Web/src/assets/langs/tr.json
index d6627e812..31de092a6 100644
--- a/UI/Web/src/assets/langs/tr.json
+++ b/UI/Web/src/assets/langs/tr.json
@@ -1,14 +1,14 @@
 {
     "login": {
-        "title": "Giriş",
+        "title": "Hesabınızla oturum açın",
         "username": "{{common.username}}",
         "password": "{{common.password}}",
         "password-validation": "{{validation.password-validation}}",
         "forgot-password": "Şifremi Unuttum?",
-        "submit": "{{common.submit}}"
+        "submit": "Oturum aç"
     },
     "dashboard": {
-        "no-libraries": "Kurulmuş kütüphane yok. Lütfen kütüphane ayarlayın",
+        "no-libraries": "Kurulmuş kütüphane yok. Bir tane oluştur",
         "server-settings-link": "Sunucu ayarları",
         "not-granted": "Herhangi bir kütüphaneye erişim izniniz yok.",
         "recently-updated-title": "Yakın zamanda güncellenmiş Seriler",
@@ -20,10 +20,11 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "saving": "Kaydediliyor…",
-        "update": "Güncelle"
+        "update": "Güncelle",
+        "account-detail-title": "Hesap ayrıntıları",
+        "invalid-email-warning": "Doğru olmayan bir e-posta, Kavita'nın bazı işlevlerini engelleyecektir"
     },
     "user-scrobble-history": {
         "title": "Arşiv geçmişi",
@@ -33,7 +34,7 @@
         "type-header": "Tür",
         "series-header": "Seriler",
         "data-header": "Veri",
-        "no-data": "Bilgi yok",
+        "no-data": "{{common.no-data}}",
         "not-applicable": "Uygulanamaz",
         "processed": "İşlendi",
         "not-processed": "İşlenmemiş",
@@ -47,15 +48,7 @@
         "review": "İnceleme güncellemesi"
     },
     "spoiler": {
-        "click-to-show": "Spoiler, açmak için tıklayın"
-    },
-    "review-series-modal": {
-        "title": "İncelemeyi düzenle",
-        "review-label": "İnceleme",
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "required": "{{validation.required-field}}"
+        "click-to-show": "Spoiler, görmek için tıklayın"
     },
     "review-card-modal": {
         "close": "{{common.close}}",
@@ -66,7 +59,7 @@
     "review-card": {
         "your-review": "Sizin incelemeniz",
         "external-review": "Diğer İncelemeler",
-        "local-review": "İnceleme"
+        "local-review": "Yerel inceleme"
     },
     "want-to-read": {
         "title": "Okuyacaklarım",
@@ -98,31 +91,13 @@
         "disable-animations-tooltip": "Sitedeki animasyonları kapat. E-kitap okuyucular için ideal.",
         "share-series-reviews-label": "Seri incelemelerini paylaş",
         "share-series-reviews-tooltip": "Kavita, Seriler hakkındaki yorumlarınızı diğer kullanıcılar için eklemeli mi?",
-        "image-reader-settings-title": "Resim okuyucu",
-        "reading-direction-label": "Okuma yönü",
-        "scaling-option-label": "Ölçekleme Ayarları",
-        "page-splitting-label": "Sayfa bölmesi",
-        "reading-mode-label": "Okuma Modu",
-        "layout-mode-label": "Düzen modu",
-        "background-color-label": "Arka plan rengi",
-        "auto-close-menu-label": "Otomatik Kapatma Menüsü",
-        "show-screen-hints-label": "Ekran ipuçlarını göster",
-        "emulate-comic-book-label": "Çizgi romanı emüle et",
-        "book-reader-settings-title": "Kitap okuyucu",
-        "reading-direction-book-label": "Okuma yönü",
-        "font-family-label": "Font ailesi",
-        "writing-style-label": "Yazı stili",
-        "color-theme-book-label": "Renk teması",
-        "font-size-book-label": "Font Boyutu",
-        "line-height-book-label": "Satır Aralığı",
-        "line-height-book-tooltip": "Kitapta satır aralıları ne kadar olmalıdır",
-        "margin-book-label": "Birleştir",
         "clients-opds-alert": "OPDS bu sunucuda aktif değil. Bu Tachiyomi kullanıcıları etkilemeyecek.",
         "clients-opds-description": "Tüm 3. Parti istemciler API key ya da alttaki bağlantı linkini kullanmak zorundadır. Bunlar şifre gibidir, başkalarıyla paylaşmayın.",
-        "clients-api-key-tooltip": "API key şifre gibidir. Gizli tutun, başkalarıyla paylaşmayın.",
-        "clients-opds-url-tooltip": "OPDS linki",
+        "clients-api-key-tooltip": "API anahtarı bir şifre gibidir. Sıfırlamak mevcut istemcileri geçersiz kılar.",
+        "clients-opds-url-tooltip": "Desteklenen OPDS istemcilerinin listesine bakın: ",
         "reset": "{{common.reset}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "kavitaplus-settings-title": "Kavita+"
     },
     "user-holds": {
         "no-data": "{{typeahead.no-data}}"
@@ -138,7 +113,9 @@
         "delete": "{{common.delete}}",
         "drag-n-drop": "{{cover-image-chooser.drag-n-drop}}",
         "upload": "{{cover-image-chooser.upload}}",
-        "add": "{{common.add}}"
+        "add": "{{common.add}}",
+        "downloadable": "İndirilebilir",
+        "downloaded": "İndirildi"
     },
     "theme": {
         "theme-dark": "Karanlık",
@@ -151,7 +128,9 @@
         "not-applicable-for-admins": "Bu yöneticiler için uygullanamaz.",
         "age-rating-label": "{{metadata-fields.age-rating-title}}",
         "no-restriction": "Hiçbir sınırlama yok",
-        "include-unknowns-label": "Bilinmeyenleri ekle"
+        "include-unknowns-label": "Bilinmeyenleri ekle",
+        "description": "Seçildiğinde, seçilen kısıtlamadan daha büyük olan en az bir ögeye sahip tüm seri ve okuma listeleri sonuçlardan kaldırılır.",
+        "include-unknowns-tooltip": "Eğer doğruysa, bilinmeyenlere yaş kısıtlaması ile izin verilecektir. Bu, yaş kısıtlamaları olan kullanıcılara atılmayan medyanın sızmasına yol açabilir."
     },
     "site-theme-provider-pipe": {
         "system": "Sistem",
@@ -165,7 +144,9 @@
         "delete": "{{common.delete}}",
         "edit": "{{common.edit}}",
         "no-data": "{{typeahead.no-data}}",
-        "actions-header": "{{manage-users.actions-header}}"
+        "actions-header": "{{manage-users.actions-header}}",
+        "email-setup-alert": "Cihazlarınıza dosya göndermek ister misiniz? Önce yönetici kurulum e-posta ayarlarınızı alın!",
+        "email-label": "E-posta"
     },
     "edit-device-modal": {
         "device-name-label": "{{manage-devices.name-label}}",
@@ -175,7 +156,8 @@
         "close": "{{common.close}}",
         "cancel": "{{common.cancel}}",
         "required-field": "{{validation.required-field}}",
-        "valid-email": "{{validation.valid-email}}"
+        "valid-email": "{{validation.valid-email}}",
+        "email-tooltip": "Bu e-posta, dosya göndermeyi kabul etmek için kullanılacaktır"
     },
     "change-password": {
         "password-label": "{{common.password}}",
@@ -183,7 +165,10 @@
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
-        "required-field": "{{validation.required-field}}"
+        "required-field": "{{validation.required-field}}",
+        "confirm-password-label": "Parola onayı",
+        "current-password-label": "Geçerli parola",
+        "new-password-label": "Yeni parola"
     },
     "change-email": {
         "required-field": "{{validation.required-field}}",
@@ -191,24 +176,37 @@
         "reset": "{{common.reset}}",
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "setup-user-account": "Kullanıcının hesabını kur",
+        "email-title": "E-posta",
+        "email-label": "Yeni e-posta",
+        "current-password-label": "Geçerli parola",
+        "email-updated-title": "E-posta güncellendi",
+        "email-not-confirmed": "Bu e-posta onaylanmadı",
+        "email-confirmed": "Bu e-posta onaylandı"
     },
     "change-age-restriction": {
         "reset": "{{common.reset}}",
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "age-restriction-label": "Yaş kısıtlaması",
+        "unknowns": "Bilinmeyenler"
     },
     "scrobbling-providers": {
-        "instructions": "First time users should click on \"{{scrobbling-providers.generate}}\" below to allow Kavita+ to talk with {{service}}. Once you authorize the program, copy and paste the token in the input below. You can regenerate your token at any time.",
+        "instructions": "Kullanıcılar ilk kez Kavita+'nın {{service}} ile iletişimine izin vermek için aşağıdaki \"{{scrobbling-providers.generate}}\" üzerine tıklamalıdır. Uygulamaya yetki verdikten sonra, jetonu kopyalayıp aşağıdaki girişe yapıştırın. Jetonunuzu istediğiniz zaman yenileyebilirsiniz.",
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
-        "loading": "{{common.loading}}"
+        "loading": "{{common.loading}}",
+        "anilist-first-later": "Sonra",
+        "anilist-first-now": "Şimdi",
+        "generate": "Üret"
     },
     "typeahead": {
         "close": "{{common.close}}",
-        "loading": "{{common.loading}}"
+        "loading": "{{common.loading}}",
+        "no-data": "{{common.no-data}}"
     },
     "generic-list-modal": {
         "close": "{{common.close}}",
@@ -219,7 +217,9 @@
         "total-pages-read-tooltip": "{{user-stats-info-cards.total-pages-read-label}}: {{value}}",
         "total-words-read-tooltip": "{{user-stats-info-cards.total-words-read-label}}: {{value}}",
         "time-spent-reading-tooltip": "{{user-stats-info-cards.time-spent-reading-label}}: {{value}}",
-        "chapters-read-tooltip": "{{user-stats-info-cards.chapters-read-label}}: {{value}}"
+        "chapters-read-tooltip": "{{user-stats-info-cards.chapters-read-label}}: {{value}}",
+        "total-words-read-label": "Toplam okunan sözcük",
+        "total-pages-read-label": "Toplam okunan sayfa"
     },
     "top-readers": {
         "this-week": "{{time-periods.this-week}}",
@@ -231,12 +231,17 @@
     },
     "role-selector": {
         "deselect-all": "{{common.deselect-all}}",
-        "select-all": "{{common.select-all}}"
+        "select-all": "{{common.select-all}}",
+        "title": "Roller"
     },
     "directory-picker": {
         "close": "{{common.close}}",
         "cancel": "{{common.cancel}}",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "path-label": "Yol",
+        "type-header": "Tür",
+        "name-header": "Ad",
+        "share": "Paylaş"
     },
     "library-access-modal": {
         "select-all": "{{common.select-all}}",
@@ -254,12 +259,16 @@
         "email-label": "{{common.email}}",
         "required-field": "{{validation.required-field}}",
         "valid-email": "{{validation.valid-email}}",
-        "submit": "{{common.submit}}"
+        "submit": "{{common.submit}}",
+        "title": "Parolayı sıfırla"
     },
     "reset-password-modal": {
         "close": "{{common.close}}",
         "cancel": "{{common.cancel}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "title": "{{username}}'ın parolasını sıfırla",
+        "new-password-label": "Yeni parola",
+        "error-label": "Hata: "
     },
     "all-series": {
         "series-count": "{{common.series-count}}"
@@ -277,7 +286,8 @@
         "required-field": "{{common.required-field}}",
         "cancel": "{{common.cancel}}",
         "email-not-sent": "{{toasts.email-not-sent}}",
-        "notice": "{{manage-settings.notice}}"
+        "notice": "{{manage-settings.notice}}",
+        "setup-user-account": "Kullanıcının hesabını kur"
     },
     "library-selector": {
         "select-all": "{{common.select-all}}",
@@ -289,8 +299,9 @@
         "loading": "{{common.loading}}",
         "activate-email-label": "{{common.email}}",
         "activate-delete": "{{common.delete}}",
-        "activate-reset": "{{common.reset}}",
-        "activate-save": "{{common.save}}"
+        "activate-reset": "Lisansı Sıfırla",
+        "activate-save": "{{common.save}}",
+        "reset-label": "Sıfırla"
     },
     "book-line-overlay": {
         "close": "{{common.close}}",
@@ -298,7 +309,8 @@
         "save": "{{common.save}}"
     },
     "book-reader": {
-        "bookmarks-header": "{{side-nav.bookmarks}}"
+        "bookmarks-header": "{{side-nav.bookmarks}}",
+        "go-to-page-prompt": "{{totalPages}} sayfa vardır. Hangi sayfaya gitmek istiyorsunuz?"
     },
     "confirm-email": {
         "username-label": "{{common.username}}",
@@ -312,7 +324,9 @@
         "password-label": "{{common.password}}",
         "required-field": "{{validation.required-field}}",
         "submit": "{{common.submit}}",
-        "password-validation": "{{validation.password-validation}}"
+        "password-validation": "{{validation.password-validation}}",
+        "description": "Yeni parola girin",
+        "title": "Parolayı sıfırla"
     },
     "register": {
         "username-label": "{{common.username}}",
@@ -357,7 +371,7 @@
         "volume-num": "{{common.volume-num}}",
         "reading-lists-title": "{{side-nav.reading-lists}}",
         "time-to-read-alt": "{{sort-field-pipe.time-to-read}}",
-        "scrobbling-tooltip": "{{settings.scrobbling}}"
+        "scrobbling-tooltip": "{{settings.scrobbling}}: {{value}}"
     },
     "metadata-fields": {
         "collections-title": "{{side-nav.collections}}",
@@ -388,7 +402,8 @@
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
         "required-field": "{{validation.required-field}}",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "force-scan": "Taramaya zorla"
     },
     "reader-settings": {
         "font-family-label": "{{user-preferences.font-family-label}}",
@@ -398,7 +413,8 @@
         "reading-direction-label": "{{user-preferences.reading-direction-book-label}}",
         "writing-style-label": "{{user-preferences.writing-style-label}}",
         "immersive-mode-label": "{{user-preferences.immersive-mode-label}}",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}"
+        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "reset-to-defaults": "Varsayılanlara sıfırla"
     },
     "bookmarks": {
         "title": "{{side-nav.bookmarks}}",
@@ -433,7 +449,8 @@
     "cover-image-chooser": {
         "reset": "{{common.reset}}",
         "apply": "{{common.apply}}",
-        "applied": "{{theme-manager.applied}}"
+        "applied": "{{theme-manager.applied}}",
+        "reset-cover-tooltip": "Kapak görselini sıfırla"
     },
     "edit-series-relation": {
         "remove": "{{common.remove}}",
@@ -450,7 +467,8 @@
     "entity-title": {
         "issue-num": "{{common.issue-hash-num}}",
         "chapter": "{{common.chapter-num}}",
-        "book-num": "{{common.book-num-shorthand}}"
+        "book-num": "{{common.book-num-shorthand}}",
+        "single-volume": "Tek cilt"
     },
     "manage-media-issues": {
         "filter-label": "{{common.filter}}"
@@ -515,7 +533,9 @@
         "on-deck": "{{dashboard.on-deck-title}}"
     },
     "settings": {
-        "kavitaplus-section-title": "{{settings.admin-kavitaplus}}"
+        "kavitaplus-section-title": "Kavita+",
+        "account-section-title": "Hesap",
+        "account": "Hesap"
     },
     "collection-detail": {
         "item-count": "{{common.item-count}}"
@@ -542,7 +562,8 @@
         "close": "{{common.close}}"
     },
     "shortcuts-modal": {
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "double-click": "çift tık"
     },
     "grouped-typeahead": {
         "genres": "{{metadata-fields.genres-title}}",
@@ -585,7 +606,8 @@
     },
     "manga-reader": {
         "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}",
-        "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}"
+        "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}",
+        "layout-mode-switched": "Düzen modu, çift düzeni oluşturmak için yetersiz alan nedeniyle tek düzene geçti"
     },
     "metadata-filter": {
         "filter-title": "{{common.filter}}",
@@ -598,7 +620,7 @@
         "language-label": "{{metadata-fields.language-title}}"
     },
     "metadata-filter-row": {
-        "unit-user-rating": "{{metadata-filter-row.unit-reading-progress}}"
+        "unit-user-rating": "0.0 - 5.0 yıldız"
     },
     "edit-series-modal": {
         "general-tab": "{{tabs.general-tab}}",
@@ -712,7 +734,14 @@
     },
     "server-stats": {
         "tags": "{{metadata-fields.tags-title}}",
-        "genres": "{{metadata-fields.genres-title}}"
+        "genres": "{{metadata-fields.genres-title}}",
+        "total-genres-tooltip": "Toplam tür: {{count}}",
+        "total-read-time-tooltip": "Toplam okuma süresi: {{count}}",
+        "total-volumes-tooltip": "Toplam cilt: {{count}}",
+        "total-files-tooltip": "Toplam dosya: {{count}}",
+        "total-tags-tooltip": "Toplam etiket: {{count}}",
+        "total-people-tooltip": "Toplam kişi: {{count}}",
+        "total-read-time-label": "Toplam okuma süresi"
     },
     "customize-dashboard-modal": {
         "close": "{{common.close}}",
@@ -730,7 +759,7 @@
         "filter": "{{common.filter}}",
         "clear": "{{common.clear}}",
         "external-sources-title": "{{customize-dashboard-modal.external-sources}}",
-        "reorder-when-filter-present": "You cannot reorder items via drag & drop while a filter is present. Use {{customize-sidenav-streams.order-numbers-label}}",
+        "reorder-when-filter-present": "Bir süzgeç mevcutken ögeleri sürükle ve bırak yoluyla yeniden sıralayamazsınız. {{customize-sidenav-streams.order-numbers-label}} kullanın",
         "order-numbers-label": "{{reading-list-detail.order-numbers-label}}"
     },
     "manage-external-sources": {
@@ -740,7 +769,8 @@
     "manage-smart-filters": {
         "delete": "{{common.delete}}",
         "filter": "{{common.filter}}",
-        "clear": "{{common.clear}}"
+        "clear": "{{common.clear}}",
+        "cancel": "{{common.cancel}}"
     },
     "edit-external-source-item": {
         "save": "{{common.save}}",
@@ -763,20 +793,24 @@
     "filter-field-pipe": {
         "age-rating": "{{metadata-fields.age-rating-title}}",
         "characters": "{{metadata-fields.characters-title}}",
-        "cover-artist": "{{person-role-pipe.cover-artist}}",
+        "cover-artist": "{{person-role-pipe.artist}}",
         "genres": "{{metadata-fields.genres-title}}",
         "release-year": "{{sort-field-pipe.release-year}}",
         "tags": "{{metadata-fields.tags-title}}",
         "writers": "{{metadata-fields.writers-title}}"
     },
     "actionable": {
-        "clear": "{{common.clear}}"
+        "clear": "{{common.clear}}",
+        "scan-library-tooltip": "Değişiklikler için kütüphaneyi tarayın. Her klasörü kontrol etmek için taramayı zorla kullanın"
     },
     "preferences": {
         "1-column": "1 Sütun",
         "2-column": "2 Sütun",
         "cards": "Kartlar",
-        "up-to-down": "Yukarıdan Aşağıya"
+        "up-to-down": "Yukarıdan Aşağıya",
+        "double": "Çift",
+        "single": "Tek",
+        "double-manga": "Çift (Manga)"
     },
     "validation": {
         "required-field": "Bu alan gereklidir"
@@ -795,6 +829,66 @@
         "username": "Kullanıcı adı",
         "password": "Parola",
         "select-all": "Tümünü Seç",
-        "book-num": "Kitap"
+        "book-num": "Kitap",
+        "cancel": "İptal",
+        "reset-to-default": "Varsayılan olarak sıfırla"
+    },
+    "tabs": {
+        "account-tab": "Hesap"
+    },
+    "toasts": {
+        "account-registration-complete": "Hesap kaydı tamamlandı",
+        "account-migration-complete": "Hesap taşıma tamamlandı",
+        "reset-ip-address": "IP adresleri sıfırla",
+        "password-reset": "Parola sıfırla",
+        "email-service-reset": "E-posta hizmeti sıfırla",
+        "age-restriction-updated": "Yaş kısıtlaması güncellendi"
+    },
+    "api-key": {
+        "hide": "Gizle",
+        "show": "Göster",
+        "copy": "Kopyala",
+        "reset": "Sıfırla"
+    },
+    "confirm": {
+        "cancel": "{{common.cancel}}"
+    },
+    "publication-status-pipe": {
+        "cancelled": "İptal edildi"
+    },
+    "day-of-week-pipe": {
+        "monday": "Pazartesi",
+        "sunday": "Pazar",
+        "tuesday": "Salı",
+        "thursday": "Perşembe",
+        "friday": "Cuma",
+        "saturday": "Cumartesi",
+        "wednesday": "Çarşamba"
+    },
+    "role-localized-pipe": {
+        "change-restriction": "Kısıtlamayı değiştir"
+    },
+    "file-breakdown-stats": {
+        "total-file-size-title": "Toplam dosya boyutu:"
+    },
+    "cbl-import-result-pipe": {
+        "failure": "Başarısız",
+        "success": "Başarılı",
+        "partial": "Kısmi"
+    },
+    "relationship-pipe": {
+        "other": "Diğer",
+        "prequel": "Önsöz",
+        "character": "Karakter",
+        "parent": "Ebeveyn"
+    },
+    "manage-metadata-settings": {
+        "derive-publication-status-tooltip": "Yayın durumunun toplam bölüm/cilt sayılarından türetilmesine izin ver."
+    },
+    "card-detail-layout": {
+        "total-items": "Toplam {{count}} öge"
+    },
+    "pdf-layout-mode-pipe": {
+        "single": "Tek sayfa"
     }
 }
diff --git a/UI/Web/src/assets/langs/uk.json b/UI/Web/src/assets/langs/uk.json
index 28ba866ec..bef4f81cf 100644
--- a/UI/Web/src/assets/langs/uk.json
+++ b/UI/Web/src/assets/langs/uk.json
@@ -22,7 +22,6 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "saving": "Збереження…",
         "update": "Оновлення",
@@ -49,15 +48,6 @@
         "not-processed": "Не опрацьовано",
         "chapter-num": "Розділ"
     },
-    "review-series-modal": {
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "required": "{{validation.required-field}}",
-        "title": "Редагувати огляд",
-        "review-label": "Огляд",
-        "min-length": "Огляд мусить містити принаймні {{count}} знаків"
-    },
     "review-card-modal": {
         "close": "{{common.close}}",
         "user-review": "Огляд від {{username}}",
@@ -81,26 +71,11 @@
         "reset": "{{common.reset}}",
         "save": "{{common.save}}",
         "locale-label": "Мова",
-        "margin-book-label": "Поля",
-        "immersive-mode-tooltip": "Ховатиме меню по клацу на документ читалки й вмикатиме тапання для перегортання сторінок",
-        "image-reader-settings-title": "Читач зображень",
-        "layout-mode-label": "Вигляд макету",
-        "background-color-label": "Колір тла",
-        "color-theme-book-tooltip": "Який набір кольорів має бути застосовний до контенту та меню читалки",
         "blur-unread-summaries-tooltip": "Розмиває текст описів непрочитаних томів чи глав, аби не натрапити на спойлери",
         "disable-animations-tooltip": "Вимкнути анімації на сайті. Доречно для електронних читалок.",
         "collapse-series-relationships-tooltip": "Чи має Kavita показувати серії, у яких немає взаємозвʼязків чи які є найпершими або приквелами",
-        "reading-direction-tooltip": "Напрям, в якому треба клацати, щоб перейти на наступну сторінку. Ліворуч – треба клацнути на ліву частину екрана, щоб перейти на наступну сторінку.",
-        "auto-close-menu-label": "Меню автозакриття",
-        "show-screen-hints-label": "Показувати підказки екрана",
-        "emulate-comic-book-label": "Симулювати комікс",
-        "reading-direction-book-label": "Напрям читання",
-        "font-family-label": "Сімейство шрифтів",
-        "reading-direction-book-tooltip": "\"Ліворуч\" – клацання по лівій частині екрана перемикатиме на наступну сторінку.",
-        "writing-style-tooltip": "Змінює напрям тексту. Горизонтальний – зліва направо, вертикальний – зверху вниз.",
         "clients-opds-description": "Всі сторонні клієнти мають використовувати API-ключ або URL для звʼязку нижче. Це як паролі, зберігайте їх у таємниці.",
         "title": "Панель користувача",
-        "pdf-scroll-mode-label": "Режим прокрутки",
         "share-series-reviews-tooltip": "Чи має Kavita показувати ваші огляди серій іншим користувачам",
         "pref-description": "Це глобальні налаштування вашого облікового запису.",
         "success-toast": "Налаштування користувача оновлені",
@@ -113,43 +88,9 @@
         "disable-animations-label": "Відключити анімації",
         "collapse-series-relationships-label": "Згорнути взаємозвʼязки серій",
         "share-series-reviews-label": "Ділитися оглядами серій",
-        "reading-direction-label": "Напрям читання",
-        "scaling-option-label": "Налаштування масштабу",
-        "scaling-option-tooltip": "Як збільшувати зображення на вашому екрані.",
-        "page-splitting-label": "Розбивка сторінки",
-        "page-splitting-tooltip": "Як розбивати зображення на весь розворот",
-        "reading-mode-label": "Режим читання",
-        "layout-mode-tooltip": "Показувати зображення цілим на екрані чи як два зображення поруч одне з одним",
-        "swipe-to-paginate-label": "Свайпати для перегортання",
-        "book-reader-settings-title": "Читач книжок",
-        "tap-to-paginate-label": "Тапати для перегортання",
-        "tap-to-paginate-tooltip": "Чи тапання по боках екрана з текстом має перегортати сторінки",
-        "immersive-mode-label": "Режим занурення",
-        "font-family-tooltip": "Яке сімейство шрифтів має завантажуватись. За замовчуванням завантажується шрифт книги",
-        "writing-style-label": "Стиль письма",
-        "layout-mode-book-label": "Режим макету",
-        "layout-mode-book-tooltip": "Як має бути розташований контент. Прокрутка – стандартна реалізація книги. 1 чи 2 колонки – текст відповідає висоті пристрою й представляється 1 чи 2 колонками тексту на кожній сторінці",
-        "color-theme-book-label": "Кольорова тема",
         "clients-opds-alert": "OPDS не ввімкнуто на цьому сервері. Це не зачепить користувачів Tachiyomi.",
         "clients-api-key-tooltip": "API-ключ – як пароль. Його скидання унеможливить роботу усіх чинних клієнтів.",
-        "pdf-spread-mode-label": "Режим розподілу",
-        "reading-mode-tooltip": "Змінити розділення на сторінки на вертикальне, горизонтальне, чи нескінченну прокрутку",
-        "background-color-tooltip": "Колір тла у читача зображень",
-        "auto-close-menu-tooltip": "Чи має меню автоматично закриватися",
-        "show-screen-hints-tooltip": "Показувати підказки про область пагінації та напрям читання",
-        "emulate-comic-book-tooltip": "Застосовує ефект тіні, як при читанні з книги",
-        "swipe-to-paginate-tooltip": "Чи має проведення пальця по сторінці перегортати книгу на наступну чи попередню сторінку",
         "locale-tooltip": "Мова інтерфейсу Kavita",
-        "font-size-book-label": "Розмір шрифта",
-        "font-size-book-tooltip": "Розмір шрифту в книзі",
-        "line-height-book-label": "Міжрядковий інтервал",
-        "line-height-book-tooltip": "Скільки вільного місця має бути між рядками в книзі",
-        "margin-book-tooltip": "Скільки вільного місця має бути з кожного боку сторінки. На мобільних пристроях значення завжди 0.",
-        "pdf-reader-settings-title": "PDF-читалка",
-        "pdf-scroll-mode-tooltip": "Як відбувається прокрутка сторінок – вертикальна, горизонтальна, або перегортання сторінку по клацу",
-        "pdf-spread-mode-tooltip": "Як повинні бути розміщені сторінки – як одинарні чи подвійні (парні/непарні)",
-        "pdf-theme-label": "Тема",
-        "pdf-theme-tooltip": "Кольорова тема читалки",
         "clients-opds-url-label": "OPDS-посилання",
         "clients-api-key-label": "API-ключ",
         "clients-opds-url-tooltip": "Список підтримуваних OPDS-клієнтів: "
diff --git a/UI/Web/src/assets/langs/vi.json b/UI/Web/src/assets/langs/vi.json
index 8e550aabf..beb2a3353 100644
--- a/UI/Web/src/assets/langs/vi.json
+++ b/UI/Web/src/assets/langs/vi.json
@@ -13,7 +13,6 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "update": "Cập nhật",
         "saving": "Đang lưu…",
@@ -40,15 +39,6 @@
         "processed": "Đã Xử Lý",
         "not-processed": "Chưa Xử Lý"
     },
-    "review-series-modal": {
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "required": "{{validation.required-field}}",
-        "title": "Sửa Đánh Giá",
-        "review-label": "Đánh Giá",
-        "min-length": "Đánh giá phải dài ít nhất {{count}} ký tự"
-    },
     "review-card-modal": {
         "close": "{{common.close}}",
         "go-to-review": "Tới Phần Đánh giá",
@@ -71,20 +61,7 @@
         "smart-filters-tab": "{{tabs.smart-filters-tab}}",
         "reset": "{{common.reset}}",
         "save": "{{common.save}}",
-        "reading-mode-label": "Chế Độ Đọc",
-        "background-color-label": "Màu nền",
-        "show-screen-hints-tooltip": "Hiển thị lớp phủ để giúp hiểu khu vực phân trang và hướng",
-        "tap-to-paginate-label": "Chạm để Chuyển Trang",
-        "swipe-to-paginate-label": "Vuốt để chuyển trang",
-        "reading-direction-book-tooltip": "Hướng nhấp để chuyển sang trang tiếp theo. Từ phải sang trái có nghĩa là bạn nhấp vào bên trái màn hình để chuyển sang trang tiếp theo.",
-        "layout-mode-book-label": "Bố Cục",
-        "layout-mode-book-tooltip": "Nội dung nên được trình bày như thế nào. Cuộn là cách mà cuốn sách được đóng gói. 1 hoặc 2 cột phù hợp với chiều cao của thiết bị và phù hợp với 1 hoặc 2 cột văn bản trên mỗi trang",
         "clients-opds-description": "Tất cả các khách hàng của bên thứ 3 sẽ sử dụng khóa API hoặc URL kết nối bên dưới. Chúng giống như mật khẩu, hãy giữ bí mật.",
-        "pdf-theme-tooltip": "Màu chủ đề của trình đọc",
-        "layout-mode-label": "Bố Cục",
-        "margin-book-label": "Căn Lề",
-        "font-size-book-label": "Kích Thước Phông Chữ",
-        "background-color-tooltip": "Màu nền của Trình Đọc Truyện Tranh",
         "page-layout-mode-label": "Chế Độ Bố Trí Trang",
         "title": "Bảng điều khiển người dùng",
         "pref-description": "Đây là cài đặt chung được liên kết với tài khoản của bạn.",
@@ -103,42 +80,6 @@
         "collapse-series-relationships-tooltip": "Kavita có nên hiển thị mối quan hệ của các truyện không (phần phụ/phần tiền truyện)",
         "share-series-reviews-label": "Chia sẻ đánh giá của Truyện",
         "share-series-reviews-tooltip": "Kavita có nên đưa đánh giá của bạn về truyện này cho những người dùng khác không",
-        "reading-direction-label": "Hướng Đọc",
-        "reading-direction-tooltip": "Hướng nhấp để chuyển sang trang tiếp theo. Từ phải sang trái có nghĩa là bạn nhấp vào bên trái màn hình để chuyển sang trang tiếp theo.",
-        "scaling-option-label": "Cài Đặt Thu Phóng",
-        "scaling-option-tooltip": "Cách thu phóng hình ảnh theo màn hình của bạn.",
-        "page-splitting-label": "Phân Trang",
-        "page-splitting-tooltip": "Cách chia một hình ảnh có chiều rộng đầy đủ (tức là cả hình ảnh bên trái và bên phải được kết hợp)",
-        "reading-mode-tooltip": "Thay đổi trình đọc để phân trang theo chiều dọc, chiều ngang hoặc cuộn vô hạn",
-        "layout-mode-tooltip": "Hiển thị một hình ảnh duy nhất trên màn hình hoặc hai hình ảnh cạnh nhau",
-        "image-reader-settings-title": "Trình Đọc Truyện Tranh",
-        "auto-close-menu-label": "Tự Động Đóng Menu",
-        "auto-close-menu-tooltip": "Menu có nên tự động đóng",
-        "show-screen-hints-label": "Hiển Thị Gợi Ý Màn Hình",
-        "emulate-comic-book-label": "Giả Lập Truyện Tranh",
-        "emulate-comic-book-tooltip": "Áp dụng hiệu ứng đổ bóng để mô phỏng việc đọc sách",
-        "swipe-to-paginate-tooltip": "Vuốt trên màn hình có khiến trang tiếp theo hoặc trang trước đó được hiển thị không",
-        "book-reader-settings-title": "Trình Đọc Sách",
-        "tap-to-paginate-tooltip": "Các cạnh của màn hình đọc sách có cho phép chạm vào để chuyển sang trang trước/trang tiếp theo không",
-        "immersive-mode-label": "Chế Độ Sống Động",
-        "immersive-mode-tooltip": "Thao tác này sẽ ẩn menu sau khi nhấp vào tài liệu đọc và bật chạm để chuyển trang",
-        "reading-direction-book-label": "Hướng Đọc",
-        "font-family-label": "Phông chữ",
-        "font-family-tooltip": "Phông chữ để hiển thị trang sách. Mặc định sẽ tải phông chữ mặc định của sách",
-        "writing-style-label": "Phong Cách Viết",
-        "writing-style-tooltip": "Thay đổi hướng của văn bản. Ngang là từ trái sang phải, dọc là từ trên xuống dưới.",
-        "color-theme-book-label": "Màu Chủ Đề",
-        "color-theme-book-tooltip": "Áp dụng chủ đề màu nào cho nội dung và menu của trình đọc sách",
-        "font-size-book-tooltip": "Tỷ lệ phần trăm áp dụng cho phông chữ trong sách",
-        "line-height-book-label": "Khoảng Cách Dòng",
-        "line-height-book-tooltip": "Khoảng cách giữa các dòng trong sách là bao nhiêu",
-        "margin-book-tooltip": "Khoảng cách giữa mỗi bên màn hình là bao nhiêu. Cài đặt này sẽ tự động bị ghi đè bằng 0 trên thiết bị di động.",
-        "pdf-reader-settings-title": "Trình Đọc PDF",
-        "pdf-scroll-mode-label": "Chế Độ Cuộn",
-        "pdf-scroll-mode-tooltip": "Cách bạn cuộn qua các trang. Dọc/Ngang và Chạm để Chuyển trang (không cuộn)",
-        "pdf-spread-mode-tooltip": "Cách bố trí các trang. Đơn hoặc đôi (lẻ/chẵn)",
-        "pdf-spread-mode-label": "Chế Độ Mở Rộng",
-        "pdf-theme-label": "Chủ Đề",
         "clients-opds-alert": "OPDS không được bật trên máy chủ này. Điều này sẽ không ảnh hưởng đến người dùng Tachiyomi.",
         "clients-api-key-tooltip": "Khóa API giống như mật khẩu. Việc đặt lại khóa sẽ làm mất hiệu lực mọi ứng dụng khách hiện có.",
         "clients-opds-url-tooltip": "Xem danh sách các máy khách OPDS được hỗ trợ: ",
@@ -446,7 +387,6 @@
         "kavita+-desc-part-2": "lợi ích premium",
         "kavita+-desc-part-3": "hôm nay!",
         "kavita+-requirement": "Kavita+ được thiết kế để chỉ hoạt động với phiên bản mới nhất - 2 phiên bản. Bất kỳ phiên bản nào ngoài phiên bản đó đều không hoạt động.",
-        "kavita+-releases": "Xem bản phát hành",
         "activate-license-label": "License Key",
         "help-label": "{{common.help}}"
     },
@@ -564,8 +504,6 @@
         "read-options-alt": "Tùy Chọn Đọc",
         "edit-series-alt": "Chỉnh Sửa Thông Tin",
         "send-to": "Tệp được gửi qua email tới {{deviceName}}",
-        "user-reviews-local": "Đánh Giá Cục Bộ",
-        "user-reviews-plus": "Đánh Giá Bên Ngoài",
         "release-date-title": "Phát hành",
         "pages-count": "{{num}} Trang",
         "words-count": "{{num}} Từ",
@@ -619,7 +557,6 @@
         "filter-label": "{{common.filter}}",
         "clear": "{{common.clear}}",
         "customize": "{{settings.customize}}",
-        "browse-authors": "Duyệt Theo Tác Giả",
         "reading-lists": "Danh Sách Đọc",
         "bookmarks": "Dấu Trang",
         "all-series": "Tất Cả Series",
@@ -990,12 +927,9 @@
         "clean-up-task-desc": "Thực hiện các hoạt động dọn dẹp hàng đêm trên máy chủ. Tác vụ có thể sẽ nặng, khuyên không nên chạy với người dùng đang hoạt động hoặc đang quét. Chạy sau mỗi 24 giờ.",
         "clean-up-task-success": "Dọn dẹp hoàn tất",
         "backup-database-task-desc": "Sao lưu cơ sở dữ liệu, dấu trang, chủ đề, ảnh bìa được tải lên thủ công và tệp cấu hình.",
-        "analyze-files-task-desc": "Chạy một tác vụ chạy dài sẽ phân tích tệp để tạo phần mở rộng và kích thước. Chỉ nên chạy tác vụ này một lần cho phiên bản v0.7. Không cần thiết nếu bạn đã cài đặt phiên bản cao hơn v0.7.",
-        "analyze-files-task-success": "Tác vụ phân tích tệp đã được lên lịch",
         "check-for-updates-task": "Kiểm Tra Cập Nhật",
         "library-scan-tooltip": "Tần suất Kavita quét và làm mới metadata của các tệp trong thư viện.",
         "clean-up-want-to-read-task-success": "Mục muốn đọc đã được dọn dẹp",
-        "analyze-files-task": "Phân Tích Các Tệp",
         "download-logs-task": "Tải Xuống Log",
         "download-logs-task-desc": "Biên dịch tất cả các file log thành một tệp zip và tải xuống.",
         "convert-media-task-success": "Tác vụ chuyển đổi mã hóa của các tệp Media đã được lên lịch",
@@ -1034,7 +968,6 @@
         "resend-invite-tooltip": "Gửi Lại Lời Mời",
         "resend": "Gửi Lại",
         "setup": "Thiết Lập",
-        "admin": "Quản Trị Viên",
         "last-active-header": "Hoạt Động Cuối Cùng",
         "roles-header": "Vai Trò",
         "delete-user-alt": "Xóa Người Dùng {{user}}",
@@ -1286,7 +1219,6 @@
         "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}",
         "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}",
         "back": "Trở Về",
-        "save-globally": "Lưu Tất Cả",
         "reading-direction-tooltip": "Hướng Đọc: ",
         "reading-mode-tooltip": "Chế Độ Đọc",
         "fullscreen": "Toàn Màn Hình",
@@ -1296,7 +1228,6 @@
         "brightness-label": "Độ Sáng",
         "unbookmark-page-tooltip": "Bỏ Đánh Dấu Trang",
         "no-prev-chapter": "Không có chương trước đó",
-        "user-preferences-updated": "Tùy chọn người dùng đã được cập nhật",
         "width": "Chiều Rộng",
         "height": "Chiều Cao",
         "bookmarks-title": "Dấu Trang",
@@ -1830,11 +1761,8 @@
         "lightNovel": "Light Novel"
     },
     "changelog": {
-        "description": "Nếu bạn không thấy {{installed}}",
-        "description-continued": "tag, bạn đang ở phiên bản nightly. Chỉ có các phiên bản chính mới hiển thị là available. Tag nightly sẽ hiển thị khi ở phiên bản nightly.",
         "installed": "Đã cài đặt",
         "download": "Tải Xuống",
-        "published-label": "Xuất bản: ",
         "available": "Khả dụng",
         "nightly": "Nightly: {{version}}"
     },
@@ -1937,11 +1865,6 @@
         "browse-person-title": "Tất cả các tác phẩm của {{name}}",
         "browse-person-by-role-title": "Tất cả các tác phẩm của {{name}} với tư cách là {{role}}"
     },
-    "browse-authors": {
-        "title": "Duyệt Theo Tác Giả & Nhà Văn",
-        "author-count": "{{num}} Người",
-        "cover-image-description": "{{edit-series-modal.cover-image-description}}"
-    },
     "download-button": {
         "downloading-status": "Đang Tải Xuống.…",
         "download-tooltip": "Tải Xuống"
@@ -2196,7 +2119,6 @@
         "alert-bad-theme": "Có tệp CSS không hợp lệ hoặc không an toàn trong chủ đề. Vui lòng liên hệ với quản trị viên của bạn để sửa lỗi này. Chủ đề tối sẽ được đặt mặc định.",
         "confirm-download-size": "{{entityType}} là {{size}}. Bạn có chắc chắn muốn tiếp tục không?",
         "confirm-delete-theme": "Xóa chủ đề này sẽ xóa nó khỏi ổ đĩa. Bạn có thể lấy nó từ thư mục tạm thời trước khi xóa",
-        "k+-unlocked": "Kavita+ đã được mở khóa!",
         "k+-error": "Đã xảy ra lỗi khi kích hoạt giấy phép của bạn. Vui lòng thử lại.",
         "file-send-to": "Tệp đã được gửi qua Email đến {{name}}",
         "theme-missing": "Chủ đề đang hoạt động không còn tồn tại. Vui lòng làm mới trang.",
diff --git a/UI/Web/src/assets/langs/zh_Hans.json b/UI/Web/src/assets/langs/zh_Hans.json
index f0a6c7c13..9fbdc165d 100644
--- a/UI/Web/src/assets/langs/zh_Hans.json
+++ b/UI/Web/src/assets/langs/zh_Hans.json
@@ -22,14 +22,14 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "saving": "正在保存…",
         "update": "更新",
-        "account-detail-title": "帐户详细信息"
+        "account-detail-title": "帐户详细信息",
+        "invalid-email-warning": "无效的电子邮件将阻止 Kavita 的某些功能"
     },
     "user-scrobble-history": {
-        "title": "Scrobble历史",
+        "title": "Scrobble 历史",
         "description": "在这里您将找到与您的帐户关联的所有Scrobble事件。为了确保Scrobble事件存在，您必须配置一个可用的Scrobble服务器。所有已处理的事件将在 1 个月后清除。如果存在未处理的事件，很可能这些事件无法在上游进行匹配，请联系您的管理员进行修正。",
         "not-read-warning": "上游供应商将始终保持最高数量",
         "filter-label": "{{common.filter}}",
@@ -39,7 +39,7 @@
         "series-header": "系列",
         "data-header": "数据",
         "is-processed-header": "已处理",
-        "no-data": "没有数据",
+        "no-data": "{{common.no-data}}",
         "volume-and-chapter-num": "{{v}} 卷 {{n}} 章节",
         "volume-num": "卷 {{num}}",
         "chapter-num": "章节 {{num}}",
@@ -47,7 +47,12 @@
         "not-applicable": "不适用",
         "processed": "已处理",
         "not-processed": "尚未处理",
-        "special": "{{entity-title.special}}"
+        "special": "{{entity-title.special}}",
+        "token-expired": "您的 AniList 令牌已过期！除非您在“帐户”页面续订，否则不会处理 Scrobbling 事件。",
+        "generate-scrobble-events": "回填事件",
+        "scrobbling-disabled": "您的帐户设置中已禁用 Scrobbling。",
+        "select-all-label": "全选",
+        "delete-selected-label": "删除选定项"
     },
     "scrobble-event-type-pipe": {
         "chapter-read": "阅读进度",
@@ -59,15 +64,6 @@
     "spoiler": {
         "click-to-show": "剧透，点击显示"
     },
-    "review-series-modal": {
-        "title": "编辑评论",
-        "review-label": "评论",
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "min-length": "评论必须至少有 {{count}} 个字符",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}",
         "user-review": "{{username}}的评论",
@@ -78,7 +74,8 @@
         "your-review": "我的评论",
         "external-review": "外部评论",
         "local-review": "本地评论",
-        "rating-percentage": "评分 {{r}}%"
+        "rating-percentage": "评分 {{r}}%",
+        "critic": "评论家"
     },
     "want-to-read": {
         "title": "想读",
@@ -88,7 +85,7 @@
     },
     "user-preferences": {
         "title": "用户面板",
-        "pref-description": "这些是绑定到您帐户的全局设置",
+        "pref-description": "这些是与您的帐户绑定的全局设置。阅读器设置位于“阅读配置文件”中。",
         "account-tab": "{{tabs.account-tab}}",
         "preferences-tab": "{{tabs.preferences-tab}}",
         "theme-tab": "{{tabs.theme-tab}}",
@@ -103,64 +100,15 @@
         "locale-label": "本地语言",
         "locale-tooltip": "Kavita 当前语言",
         "blur-unread-summaries-label": "模糊未读摘要",
-        "blur-unread-summaries-tooltip": "模糊没有阅读进度的卷或章节的摘要文本（避免剧透）",
+        "blur-unread-summaries-tooltip": "模糊没有阅读进度的卷或章节的内容简介文本（避免剧透）",
         "prompt-on-download-label": "下载时提示",
         "prompt-on-download-tooltip": "当下载大小超过 {{size}}MB 时提示",
         "disable-animations-label": "关闭动画",
-        "disable-animations-tooltip": "关闭站点中的动画效果。适用于电子墨水阅读器",
+        "disable-animations-tooltip": "关闭网站中的动画。适用于电子墨水阅读器。",
         "collapse-series-relationships-label": "折叠系列的关联",
         "collapse-series-relationships-tooltip": "是否显示没有关联的系列或者前传",
         "share-series-reviews-label": "分享系列评论",
         "share-series-reviews-tooltip": "是否对其他用户显示你的评论",
-        "image-reader-settings-title": "图像阅读器",
-        "reading-direction-label": "阅读方向",
-        "reading-direction-tooltip": "单击方向移动到下一页。从右到左意味着您单击屏幕左侧以移至下一页。",
-        "scaling-option-label": "缩放选项",
-        "scaling-option-tooltip": "图片在屏幕上的缩放方式",
-        "page-splitting-label": "页面分割",
-        "page-splitting-tooltip": "如何分割全宽图像（即左右图像合并）",
-        "reading-mode-label": "阅读模式",
-        "reading-mode-tooltip": "将阅读器更改为垂直、水平分页或无限滚动",
-        "layout-mode-label": "布局模式",
-        "layout-mode-tooltip": "将单个图像或两个并排图像渲染到屏幕上",
-        "background-color-label": "背景色",
-        "background-color-tooltip": "图像阅读器的背景颜色",
-        "auto-close-menu-label": "自动关闭菜单",
-        "auto-close-menu-tooltip": "菜单应该自动关闭",
-        "show-screen-hints-label": "显示屏幕提示",
-        "show-screen-hints-tooltip": "显示一个覆盖图层以帮助了解分页区域和方向",
-        "emulate-comic-book-label": "模仿美漫",
-        "emulate-comic-book-tooltip": "应用阴影效果来模拟书籍",
-        "swipe-to-paginate-label": "滑动翻页",
-        "swipe-to-paginate-tooltip": "在屏幕上滑动是否应触发下一页或上一页",
-        "book-reader-settings-title": "书籍阅读器",
-        "tap-to-paginate-label": "点击翻页",
-        "tap-to-paginate-tooltip": "是否允许点击书籍阅读器屏幕的两侧翻页",
-        "immersive-mode-label": "沉浸模式",
-        "immersive-mode-tooltip": "点击阅读器的文档后隐藏菜单并打开“点击翻页”功能",
-        "reading-direction-book-label": "阅读方向",
-        "reading-direction-book-tooltip": "切换至下一页的点击位置。从右至左表示您需点击屏幕左侧以切换至下一页。",
-        "font-family-label": "字体",
-        "font-family-tooltip": "要加载的字体，默认加载书籍的默认字体",
-        "writing-style-label": "书籍排版",
-        "writing-style-tooltip": "更改文本排版方向。横向从左到右，竖向从上到下。",
-        "layout-mode-book-label": "布局模式",
-        "layout-mode-book-tooltip": "确定内容如何布局，滚屏就像把书塞满屏幕，单列或双列匹配设备屏幕的高度且每个页面容纳单列或双列文本",
-        "color-theme-book-label": "主题颜色",
-        "color-theme-book-tooltip": "书籍阅读器目录和菜单的主题颜色",
-        "font-size-book-label": "字体大小",
-        "font-size-book-tooltip": "书籍中字体的缩放百分比",
-        "line-height-book-label": "行间距",
-        "line-height-book-tooltip": "书籍中每行之间的间距",
-        "margin-book-label": "页边距",
-        "margin-book-tooltip": "屏幕两侧的间距，移动设备与此设置无关，间距固定为 0。",
-        "pdf-reader-settings-title": "PDF 阅读器",
-        "pdf-scroll-mode-label": "滚动模式",
-        "pdf-scroll-mode-tooltip": "您如何滚动页面。垂直/水平和点击翻页（无滚动）",
-        "pdf-spread-mode-label": "展开模式",
-        "pdf-spread-mode-tooltip": "页面应该如何布局。单页或双页（奇数/偶数）",
-        "pdf-theme-label": "主题",
-        "pdf-theme-tooltip": "阅读器的主题颜色",
         "clients-opds-alert": "此服务器未启用OPDS，不会影响Tachiyomi用户。",
         "clients-opds-description": "所有第三方客户端均使用下方的API密钥或链接。它们就像密码一样，请保密。",
         "clients-api-key-tooltip": "API 密钥等同于密码。重置密钥将导致所有客户端失效。",
@@ -168,12 +116,20 @@
         "clients-api-key-label": "API 密钥",
         "clients-opds-url-tooltip": "查看受支持的 OPDS 客户端列表： ",
         "reset": "{{common.reset}}",
-        "save": "{{common.save}}"
+        "save": "{{common.save}}",
+        "anilist-scrobbling-tooltip": "允许 Kavita 将阅读进度和评分 Scrobble（单向同步）到 AniList",
+        "kavitaplus-settings-title": "Kavita+",
+        "anilist-scrobbling-label": "AniList Scrobbling",
+        "want-to-read-sync-label": "想要阅读同步",
+        "want-to-read-sync-tooltip": "允许 Kavita 根据待读列表中的 AniList 和 MAL 系列将项目添加到您的想读列表中"
     },
     "user-holds": {
         "title": "刮削暂停",
         "description": "这是一个由用户自主管理的系列列表，这些系列的信息不会发送给Scrobble服务提供商。您可以随时移除某个系列，下一次Scrobble事件（阅读进度、评分、想读状态）将触发事件。",
-        "no-data": "{{typeahead.no-data}}"
+        "no-data": "{{typeahead.no-data}}",
+        "series-name-header": "{{manage-matched-metadata.series-name-header}}",
+        "delete-label": "{{common.remove}}",
+        "created-header": "{{manage-media-issues.created-header}}"
     },
     "theme-manager": {
         "title": "主题管理器",
@@ -186,7 +142,7 @@
         "downloadable": "可下载",
         "apply": "{{common.apply}}",
         "applied": "应用",
-        "active-theme": "活动",
+        "active-theme": "已激活",
         "updated-toastr": "网站默认值已更新为{{name}}",
         "scan-queued": "网站主题扫描已进入队列",
         "delete": "{{common.delete}}",
@@ -225,7 +181,7 @@
         "platform-label": "平台",
         "email-label": "电子邮件",
         "name-label": "名称",
-        "email-setup-alert": "想要将文件发送到您的设备？请先让您的管理员设置电子邮件设置！",
+        "email-setup-alert": "想要将文件发送到您的设备？请先联系管理员配置电子邮件设置！",
         "add": "{{common.add}}",
         "delete": "{{common.delete}}",
         "edit": "{{common.edit}}",
@@ -256,7 +212,7 @@
         "save": "{{common.save}}",
         "required-field": "{{validation.required-field}}",
         "passwords-must-match": "密码必须一致",
-        "permission-error": "您无权更改密码，请与服务器管理员联系。"
+        "permission-error": "您无权更改密码，请联系管理员。"
     },
     "change-email": {
         "email-title": "电子邮件",
@@ -270,7 +226,7 @@
         "invite-url-label": "邀请链接",
         "invite-url-tooltip": "将其复制并粘贴到一个新的标签页中",
         "has-invalid-email": "您似乎没有设置有效的电子邮件。更改电子邮件将要求管理员向您发送链接以完成此操作。",
-        "permission-error": "您无权更改电子邮件，请与服务器管理员联系。",
+        "permission-error": "您无权更改电子邮件，请联系管理员。",
         "required-field": "{{validation.required-field}}",
         "valid-email": "{{validation.valid-email}}",
         "reset": "{{common.reset}}",
@@ -293,34 +249,41 @@
         "regen-warning": "重新生成您的API密钥将使任何现有客户端失效。",
         "no-key": "错误-未设置密钥",
         "confirm-reset": "所有OPDS配置将会失效，您确定继续吗？",
-        "key-reset": "API密钥已重置"
+        "key-reset": "API密钥已重置",
+        "reset": "重置"
     },
     "scrobbling-providers": {
         "title": "Scrobbling服务提供商",
         "requires": "此功能需要一个有效的{{product}}许可证",
         "token-valid": "令牌有效",
-        "token-expired": "Token已过期",
-        "no-token-set": "未设置Token",
-        "token-set": "设置Token",
+        "token-expired": "令牌已过期",
+        "no-token-set": "未设置令牌",
+        "token-set": "设置令牌",
         "generate": "生成",
         "generic-instructions": "填写有关不同外部服务的信息，您必须允许 Kavita+ 与它们交互。",
-        "instructions": "First time users should click on \"{{scrobbling-providers.generate}}\" below to allow Kavita+ to talk with {{service}}. Once you authorize the program, copy and paste the token in the input below. You can regenerate your token at any time.",
+        "instructions": "首次使用的用户应点击下面的“{{scrobbling-providers.generate}}”以允许 Kavita+ 与 {{service}} 对话。授权程序后，请复制并粘贴令牌到下面的输入中。您可以随时重新生成令牌。",
         "mal-instructions": "Kavita 使用 MAL 客户端 ID 进行身份验证。为 Kavita 创建一个新客户，一旦获得批准，请提供客户 ID 和您的用户名。",
         "scrobbling-applicable-label": "Scrobbling 适用",
-        "token-input-label": "{{service}} Token在这里填写",
+        "token-input-label": "{{service}} 令牌在这里填写",
         "mal-token-input-label": "MAL 客户端 ID",
         "mal-username-input-label": "MAL 用户名",
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
-        "loading": "{{common.loading}}"
+        "loading": "{{common.loading}}",
+        "anilist-first-description": "您的 AniList 令牌现已设置完毕。此令牌有效期为一年，Kavita 会在令牌到期前通知您在此处刷新令牌。借助此令牌，Kavita 将从您的阅读历史、想要阅读的内容和评分中生成 scrobble（同步）事件。您可以立即或稍后开始此操作。如果您有任何不想被 scrobbled 的系列，请选择稍后并对其设置 Scrobble Hold。您只需运行此任务一次。之后，Kavita 将为您处理同步。
           如果您选择“稍后”，您可以在 Scrobbling 页面上找到该按钮。",
+        "anilist-used-for": "AniList 用于 scrobbling（同步数据）并想要读取同步。",
+        "mal-used-for": "MyAnimeList 用于智能收藏并希望读取同步。",
+        "anilist-first-header": "AniList 令牌已保存",
+        "anilist-first-later": "之后",
+        "anilist-first-now": "现在"
     },
     "typeahead": {
         "locked-field": "字段已锁定",
         "close": "{{common.close}}",
         "loading": "{{common.loading}}",
         "add-item": "添加 {{item}}…",
-        "no-data": "无数据",
+        "no-data": "{{common.no-data}}",
         "add-custom-item": ", 输入以添加自定义项目"
     },
     "generic-list-modal": {
@@ -353,7 +316,7 @@
     "top-readers": {
         "title": "热门读者",
         "time-selection-label": "时间范围",
-        "comics-label": "美漫：{{value}} 小时",
+        "comics-label": "漫画：{{value}} 小时",
         "manga-label": "漫画(日漫)：{{value}} 小时",
         "books-label": "书籍：{{value}} 小时",
         "this-week": "{{time-periods.this-week}}",
@@ -497,9 +460,9 @@
     },
     "library-type-pipe": {
         "book": "书籍",
-        "comic": "美漫",
+        "comic": "漫画 (Legacy)",
         "manga": "漫画(日漫)",
-        "comicVine": "Comic Vine",
+        "comicVine": "漫画",
         "image": "图片",
         "lightNovel": "轻小说"
     },
@@ -561,10 +524,7 @@
         "installed": "已安装",
         "download": "下载",
         "nightly": "每晚： {{version}}",
-        "published-label": "出版： ",
-        "available": "可用",
-        "description": "如果您没有看到{{installed}}",
-        "description-continued": "标签，您正在使用的是夜间版本。只有主要版本才会显示为可用。当您使用的是该稳定版的夜间版本时，将显示夜间标签。"
+        "available": "可用"
     },
     "invite-user": {
         "title": "邀请用户",
@@ -610,15 +570,35 @@
         "activate-discordId-tooltip": "将您的 Discord 帐户与 Kavita+ 关联。这使您可以访问隐藏的渠道来帮助塑造 Kavita。",
         "discord-validation": "这不是有效的 Discord 用户 ID。您的用户 ID 不是您的 Discord 用户名。",
         "activate-delete": "{{common.delete}}",
-        "activate-reset": "{{common.reset}}",
+        "activate-reset": "重置许可证",
         "activate-reset-tooltip": "使用您的许可证使之前的注册失效。需要许可证和电子邮件",
         "activate-save": "{{common.save}}",
         "kavita+-desc-part-1": "Kavita+ 是一项高级订阅服务，可为此 Kavita 实例上的所有用户解锁功能。购买订阅即可解锁 ",
         "kavita+-desc-part-2": "优质福利",
         "kavita+-desc-part-3": "今天！",
-        "kavita+-requirement": "Kavita+ 仅兼容Kavita最新的2个版本。其他任何版本均无法正常使用。",
-        "kavita+-releases": "查看发布",
-        "help-label": "{{common.help}}"
+        "kavita+-requirement": "Kavita+ 设计为仅适用于最新的 3 个版本。除此之外的任何东西都可能无法发挥作用。",
+        "help-label": "{{common.help}}",
+        "delete-tooltip": "这将删除 Kavita 的许可证，以阻止 Kavita 与 Kavita+ 对话。不会取消您的订阅。请先使用“管理”取消订阅。",
+        "k+-license-overwrite": "许可证已注册到另一个 Kavita 实例。这种情况可能发生在重新安装时，很少由于系统更新而发生。选择覆盖以强制此实例注册到 Kavita+。",
+        "info-title": "许可证信息",
+        "actions-title": "活动",
+        "license-active-label": "许可证有效",
+        "supported-version-label": "支持的 Kavita 版本",
+        "expiration-label": "到期",
+        "valid-tooltip": "有效的",
+        "invalid-tooltip": "无效的",
+        "reset-label": "重置",
+        "reset-tooltip": "这将重置与 Kavita+ 许可证绑定的服务器实例。需要电子邮件和许可证密钥",
+        "delete-label": "删除许可证",
+        "manage-tooltip": "更新付款信息、取消/暂停订阅等",
+        "faq-title": "常问问题",
+        "total-subbed-months-label": "订阅总月数",
+        "email-label": "注册邮箱",
+        "license-mismatch": "许可证可能已注册到另一个 Kavita 实例。请重新注册以解决问题。",
+        "k+-already-registered-header": "许可证已经注册",
+        "overwrite": "覆盖",
+        "k+-unlocked": "Kavita+ 已解锁！",
+        "k+-unlocked-description": "欢迎来到 Kavita+！一旦您在帐户下注册了 Scrobbling 提供商，Kavita 就会根据您的进度、评分和阅读意愿生成 scrobble 事件。花点时间确保您为不想 scrobble 的任何系列设置了 scrobbling 保留。"
     },
     "book-line-overlay": {
         "copy": "复制",
@@ -651,7 +631,10 @@
         "incognito-mode-label": "隐身模式",
         "next": "下一个",
         "previous": "上一个",
-        "go-to-page-prompt": "一共{{totalPages}}页，您想跳转至哪一页？"
+        "go-to-page-prompt": "共有 {{totalPages}} 页。您想转到哪一页？",
+        "go-to-section": "转到节",
+        "go-to-section-prompt": "共有 {{totalSections}} 节。您想转到哪一节？",
+        "go-to-first-page": "转到第一页"
     },
     "personal-table-of-contents": {
         "no-data": "尚未添加书签",
@@ -699,7 +682,7 @@
     "series-detail": {
         "page-settings-title": "页面设置",
         "close": "{{common.close}}",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
         "layout-mode-option-card": "卡片",
         "layout-mode-option-list": "列表",
         "continue-from": "继续{{title}}",
@@ -725,8 +708,6 @@
         "no-pages": "{{toasts.no-pages}}",
         "no-chapters": "本卷没有章节，无法读取。",
         "cover-change": "刷新图片需要一点时间。在此期间，可能某些页面仍显示旧图片。",
-        "user-reviews-local": "本地评论",
-        "user-reviews-plus": "外部评论",
         "writers-title": "{{metadata-fields.writers-title}}",
         "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
         "characters-title": "{{metadata-fields.characters-title}}",
@@ -752,9 +733,11 @@
         "more-alt": "更多",
         "time-left-alt": "剩余时间",
         "time-to-read-alt": "{{sort-field-pipe.time-to-read}}",
-        "scrobbling-tooltip": "{{settings.scrobbling}}",
+        "scrobbling-tooltip": "{{settings.scrobbling}}: {{value}}",
         "publication-status-title": "出版",
-        "publication-status-tooltip": "出版状态"
+        "publication-status-tooltip": "出版状态",
+        "on": "{{reader-settings.on}}",
+        "off": "{{reader-settings.off}}"
     },
     "metadata-fields": {
         "collections-title": "{{side-nav.collections}}",
@@ -786,7 +769,8 @@
         "entry-label": "查看详情",
         "kavita-tooltip": "您的评分 + 总体",
         "kavita-rating-title": "您的评分",
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "critic": "{{review-card.critic}}"
     },
     "badge-expander": {
         "more-items": "和{{count}}个更多"
@@ -821,7 +805,9 @@
         "back": "后退",
         "more": "更多",
         "customize": "{{settings.customize}}",
-        "browse-authors": "浏览作者"
+        "edit": "{{common.edit}}",
+        "cancel-edit": "取消重新排序",
+        "browse-people": "浏览人物"
     },
     "library-settings-modal": {
         "close": "{{common.close}}",
@@ -838,7 +824,7 @@
         "type-label": "类型",
         "type-tooltip": "资料库类型决定了文件名的解析方式以及 UI 是否显示章节 (日漫) 或期 (美漫)。查看 wiki 了解有关资料库类型之间差异的更多详细信息。",
         "kavitaplus-eligible-label": "Kavita+ 符合条件",
-        "kavitaplus-eligible-tooltip": "Kavita+ 会提取信息还是支持 Scrobbling",
+        "kavitaplus-eligible-tooltip": "支持 Kavita+ 元数据功能或 Scrobbling",
         "folder-description": "将文件夹添加到您的资料库中",
         "browse": "浏览媒体文件夹",
         "help-us-part-1": "通过遵循我们的 ",
@@ -872,7 +858,11 @@
         "file-type-group-tooltip": "Kavita 应该扫描哪些类型的文件。例如，档案将包含所有 cb*、zip、rar 等文件。",
         "exclude-patterns-label": "排除模式",
         "exclude-patterns-tooltip": "配置一组模式（Glob语法），Kavita 将在扫描目录时匹配这些模式，并将其从扫描程序结果中排除。",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "allow-metadata-matching-label": "允许元数据匹配",
+        "allow-metadata-matching-tooltip": "Kavita 是否应下载此库中系列的元数据。仅当服务器具有有效的 Kavita+ 订阅时才会发生这种情况。",
+        "enable-metadata-label": "启用元数据（ComicInfo/Epub/PDF）",
+        "enable-metadata-tooltip": "允许 Kavita 读取覆盖文件名解析的元数据文件。"
     },
     "file-type-group-pipe": {
         "archive": "档案",
@@ -882,30 +872,30 @@
     },
     "reader-settings": {
         "general-settings-title": "常规设置",
-        "font-family-label": "{{user-preferences.font-family-label}}",
-        "font-size-label": "{{user-preferences.font-size-book-label}}",
-        "line-spacing-label": "{{user-preferences.line-height-book-label}}",
-        "margin-label": "{{user-preferences.margin-book-label}}",
+        "font-family-label": "{{manage-reading-profiles.font-family-label}}",
+        "font-size-label": "{{manage-reading-profiles.font-size-book-label}}",
+        "line-spacing-label": "{{manage-reading-profiles.line-height-book-label}}",
+        "margin-label": "{{manage-reading-profiles.margin-book-label}}",
         "reset-to-defaults": "恢复默认设置",
         "reader-settings-title": "阅读器设置",
-        "reading-direction-label": "{{user-preferences.reading-direction-book-label}}",
+        "reading-direction-label": "{{manage-reading-profiles.reading-direction-book-label}}",
         "right-to-left": "从右到左",
         "left-to-right": "从左到右",
         "horizontal": "横向",
         "vertical": "竖向",
-        "writing-style-label": "{{user-preferences.writing-style-label}}",
+        "writing-style-label": "{{manage-reading-profiles.writing-style-label}}",
         "writing-style-tooltip": "更改文本排版方向。横向是从左到右，竖向是从上到下。",
         "tap-to-paginate-label": "点击翻页",
         "tap-to-paginate-tooltip": "点击屏幕边缘进行翻页",
         "on": "开",
         "off": "关",
-        "immersive-mode-label": "{{user-preferences.immersive-mode-label}}",
+        "immersive-mode-label": "{{manage-reading-profiles.immersive-mode-label}}",
         "immersive-mode-tooltip": "点击阅读器的文档后隐藏菜单并打开“点击翻页”功能",
         "fullscreen-label": "全屏",
         "fullscreen-tooltip": "将阅读器设置为全屏模式",
         "exit": "退出",
         "enter": "打开",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
         "layout-mode-tooltip": "滚屏：镜像epub文件（通常每章节一个滚屏页面）
          单列：每次创建一个单独的虚拟页面
          双列：每次创建两个并排布置的虚拟页面。",
         "layout-mode-option-scroll": "滚屏",
         "layout-mode-option-1col": "单列",
@@ -914,7 +904,15 @@
         "theme-dark": "黑暗",
         "theme-black": "黑色",
         "theme-white": "白色",
-        "theme-paper": "纸张"
+        "theme-paper": "纸张",
+        "create-new-tooltip": "从当前隐式配置文件创建新的可管理配置文件",
+        "loading": "加载中",
+        "create-new": "从隐式配置文件中新建配置文件",
+        "line-spacing-min-label": "1x",
+        "reading-profile-updated": "阅读配置文件已更新",
+        "reading-profile-promoted": "推广阅读配置文件",
+        "line-spacing-max-label": "2.5x",
+        "update-parent": "保存到 {{name}}"
     },
     "table-of-contents": {
         "no-data": "这本书没有在元数据或toc文件中设置目录"
@@ -938,7 +936,8 @@
     },
     "card-detail-layout": {
         "total-items": "总共{{count}}个条目",
-        "jumpkey-count": "{{count}} 系列"
+        "jumpkey-count": "{{count}} 系列",
+        "no-data": "{{common.no-data}}"
     },
     "card-item": {
         "cannot-read": "无法阅读"
@@ -964,12 +963,14 @@
         "read-time-title": "{{edit-chapter-modal.reading-time-label}}",
         "language-title": "{{edit-chapter-modal.language-label}}",
         "release-title": "{{sort-field-pipe.release-year}}",
-        "format-title": "{{metadata-filter.format-label}}"
+        "format-title": "{{metadata-filter.format-label}}",
+        "age-rating-title": "{{metadata-fields.age-rating-title}}"
     },
     "related-tab": {
         "reading-lists-title": "{{reading-lists.title}}",
         "collections-title": "{{side-nav.collections}}",
-        "relations-title": "{{tabs.related-tab}}"
+        "relations-title": "{{tabs.related-tab}}",
+        "bookmarks-title": "{{side-nav.bookmarks}}"
     },
     "cover-image-chooser": {
         "enter-an-url-pre-title": "输入 {{url}}",
@@ -991,7 +992,7 @@
     },
     "edit-series-relation": {
         "description-part-1": "不确定添加哪一种关联？请查看",
-        "description-part-2": "维基百科的提示。",
+        "description-part-2": "Wiki 提示。",
         "target-series": "目标系列",
         "relationship": "关联",
         "remove": "{{common.remove}}",
@@ -1022,13 +1023,13 @@
     },
     "manage-media-issues": {
         "description-part-1": "此列表包含在扫描或读取媒体期间发现的问题。您可以随时清除它并使用资料库（强制）扫描进行分析。一些常见错误及其含义的列表可在以下位置找到 ",
-        "description-part-2": "维基百科。",
+        "description-part-2": "wiki.",
         "filter-label": "{{common.filter}}",
         "clear-alerts": "清除警报",
         "file-header": "文件",
         "comment-header": "评论",
         "created-header": "创建",
-        "no-data": "无数据"
+        "no-data": "{{common.no-data}}"
     },
     "manage-email-settings": {
         "description": "为了使用 Kavita 的某些功能（例如“发送到设备”），必须设置电子邮件提供商。其他功能（例如“忘记密码”）需要管理员干预，无需设置电子邮件。",
@@ -1041,7 +1042,7 @@
         "reset": "{{common.reset}}",
         "test": "测试",
         "host-name-label": "主机名",
-        "host-name-tooltip": "域名（反向代理）。电子邮件功能所需。如果没有反向代理，则使用任意网址。",
+        "host-name-tooltip": "反向代理的域名，电子邮件功能所需。如果您不使用反向代理，则可以使用任何网址，包括 http://externalip:port/",
         "host-name-validation": "主机名必须以http(s)开头，不能以 / 结尾",
         "sender-address-label": "发件人地址",
         "sender-address-tooltip": "这是收件人收到电子邮件时将看到的电子邮件地址。通常是与帐户关联的电子邮件地址。",
@@ -1247,9 +1248,6 @@
         "backup-database-task-success": "已将备份数据库的任务加入队列",
         "download-logs-task": "下载日志文件",
         "download-logs-task-desc": "将所有日志文件编译成一个 zip 文件并下载。",
-        "analyze-files-task": "分析文件",
-        "analyze-files-task-desc": "运行一个长时间运行的任务，用于分析文件以生成扩展名和大小。这只需要在v0.7版本中运行一次。如果您是在v0.7之后安装的，则不需要运行此任务。",
-        "analyze-files-task-success": "文件分析已进入队列",
         "sync-themes-task": "同步主题",
         "sync-themes-task-desc": "如果版本匹配，则将下载的主题与上游更改同步。",
         "sync-themes-success": "主题同步已排队",
@@ -1277,7 +1275,6 @@
         "change-password-alt": "更改密码 {{user}}",
         "resend": "重新发送",
         "setup": "设置",
-        "admin": "管理员",
         "last-active-header": "最后活动",
         "roles-header": "角色",
         "name-header": "名称",
@@ -1289,7 +1286,8 @@
         "no-data": "没有其他用户。",
         "loading": "{{common.loading}}",
         "actions-header": "活动",
-        "pending-tooltip": "此用户尚未验证其电子邮件"
+        "pending-tooltip": "此用户尚未验证其电子邮件",
+        "all-libraries": "所有资料库"
     },
     "edit-collection-tags": {
         "title": "编辑 {{collectionName}} 收藏",
@@ -1329,7 +1327,7 @@
         "server-section-title": "服务器",
         "info-section-title": "信息",
         "import-section-title": "导入",
-        "kavitaplus-section-title": "{{settings.admin-kavitaplus}}",
+        "kavitaplus-section-title": "Kavita+",
         "admin-general": "常规",
         "admin-users": "用户",
         "admin-libraries": "资料库",
@@ -1340,7 +1338,7 @@
         "admin-tasks": "任务",
         "admin-statistics": "统计数据",
         "admin-system": "系统",
-        "admin-kavitaplus": "Kavita+",
+        "admin-kavitaplus": "许可证",
         "account": "账户",
         "preferences": "首选项",
         "clients": "API 密钥 / OPDS",
@@ -1350,7 +1348,13 @@
         "theme": "主题",
         "customize": "自定义",
         "cbl-import": "CBL 阅读列表",
-        "mal-stack-import": "MAL Stack"
+        "mal-stack-import": "MAL Stack",
+        "admin-manage-tokens": "管理用户令牌",
+        "admin-email-history": "电子邮件历史记录",
+        "admin-matched-metadata": "匹配的元数据",
+        "scrobble-holds": "Scrobble 持有",
+        "admin-metadata": "管理元数据",
+        "reading-profiles": "阅读配置文件"
     },
     "collection-detail": {
         "no-data": "暂无项目。请尝试添加一个系列。",
@@ -1387,7 +1391,8 @@
     },
     "reading-list-item": {
         "remove": "{{common.remove}}",
-        "read": "{{common.read}}"
+        "read": "{{common.read}}",
+        "released-label": "发布日期：{{date}}"
     },
     "stream-list-item": {
         "remove": "{{common.remove}}",
@@ -1395,7 +1400,8 @@
         "provided": "已提供的",
         "smart-filter": "智能筛选器",
         "library": "资料库",
-        "external-source": "外部源"
+        "external-source": "外部源",
+        "delete": "{{common.delete}}"
     },
     "reading-list-detail": {
         "item-count": "{{common.item-count}}",
@@ -1407,7 +1413,19 @@
         "read-options-alt": "阅读选项",
         "incognito-alt": "（隐身）",
         "no-data": "未添加任何内容",
-        "characters-title": "{{metadata-fields.characters-title}}"
+        "characters-title": "{{metadata-fields.characters-title}}",
+        "items-title": "项目",
+        "edit-alt": "{{common.edit}}",
+        "date-range-title": "日期范围",
+        "reorder-alt": "重新排序项目",
+        "details-tab": "{{series-detail.details-tab}}",
+        "publishers-title": "{{metadata-fields.publishers-title}}",
+        "edit-label": "编辑模式",
+        "more-alt": "{{series-detail.more-alt}}",
+        "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
+        "writers-title": "{{metadata-fields.writers-title}}",
+        "storyline-tab": "{{series-detail.storyline-tab}}",
+        "dnd-warning": "在移动设备上或阅读列表超过 100 个项目时，无法进行拖放操作。"
     },
     "events-widget": {
         "title-alt": "活动",
@@ -1460,7 +1478,10 @@
         "logout": "注销",
         "all-filters": "智能筛选",
         "nav-link-header": "导航选项",
-        "close": "{{common.close}}"
+        "close": "{{common.close}}",
+        "person-aka-status": "匹配别名",
+        "browse-genres": "浏览类型",
+        "browse-tags": "浏览标签"
     },
     "promoted-icon": {
         "promoted": "{{common.promoted}}"
@@ -1535,7 +1556,7 @@
         "dry-run-step": "模拟运行",
         "final-import-step": "最后一步",
         "comicvine-parsing-label": "使用 Comic Vine 系列搭配",
-        "cbl-repo": "您可以在社区repo中找到更多阅读列表。",
+        "cbl-repo": "您可以在社区 存储库.中找到更多阅读列表。",
         "help-label": "{{common.help}}"
     },
     "pdf-reader": {
@@ -1571,7 +1592,6 @@
     },
     "manga-reader": {
         "back": "返回",
-        "save-globally": "全局保存",
         "incognito-alt": "隐身模式已开启。切换以关闭。",
         "incognito-title": "隐身模式:",
         "shortcuts-menu-alt": "键盘快捷键模式",
@@ -1593,9 +1613,9 @@
         "height": "高度",
         "width": "宽度",
         "width-override-label": "宽度覆盖",
-        "off": "关",
+        "off": "{{reader-settings.off}}",
         "original": "原始尺寸",
-        "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}",
+        "auto-close-menu-label": "{{manage-reading-profiles.auto-close-menu-label}}",
         "swipe-enabled-label": "启用滑动手势",
         "enable-comic-book-label": "模拟漫画书",
         "brightness-label": "亮度",
@@ -1606,9 +1626,14 @@
         "layout-mode-switched": "由于空间不足以呈现双页布局，布局模式已切换为单页",
         "no-next-chapter": "没有下一章节",
         "no-prev-chapter": "没有上一章节",
-        "user-preferences-updated": "用户偏好已更新",
-        "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}",
-        "series-progress": "系列进度： {{percentage}}"
+        "emulate-comic-book-label": "{{manage-reading-profiles.emulate-comic-book-label}}",
+        "series-progress": "系列进度： {{percentage}}",
+        "reading-profile-promoted": "推广阅读配置文件",
+        "create-new": "{{reader-settings.create-new}}",
+        "loading": "{{reader-settings.loading}}",
+        "create-new-tooltip": "{{reader-settings.create-new-tooltip}}",
+        "reading-profile-updated": "阅读配置文件已更新",
+        "update-parent": "{{reader-settings.update-parent}}"
     },
     "metadata-filter": {
         "filter-title": "{{common.filter}}",
@@ -1651,7 +1676,7 @@
     },
     "metadata-filter-row": {
         "unit-reading-date": "日期",
-        "unit-average-rating": "Kavita+ 外部评级，百分比",
+        "unit-average-rating": "Kavita+ 外部评分，百分比",
         "unit-reading-progress": "百分比",
         "unit-user-rating": "0.0 - 5.0 星",
         "unit-read-last": "从今天起"
@@ -1665,7 +1690,10 @@
         "release-year": "发行年份",
         "read-progress": "上次阅读",
         "average-rating": "平均评分",
-        "random": "随机"
+        "random": "随机",
+        "person-series-count": "系列数",
+        "person-chapter-count": "章节数",
+        "person-name": "名称"
     },
     "edit-series-modal": {
         "title": "{{seriesName}} 详细信息",
@@ -1802,8 +1830,8 @@
         "cover-image-tab": "{{tabs.cover-tab}}",
         "tasks-tab": "{{tabs.tasks-tab}}",
         "info-tab": "{{tabs.info-tab}}",
-        "pages-label": "{{edit-chapter-modal.pages-count}}",
-        "words-label": "{{edit-chapter-modal.length-title}}",
+        "pages-label": "{{edit-chapter-modal.pages-label}}",
+        "words-label": "{{edit-chapter-modal.words-label}}",
         "pages-count": "{{edit-chapter-modal.pages-count}}",
         "words-count": "{{edit-chapter-modal.words-count}}",
         "reading-time-label": "{{edit-chapter-modal.reading-time-label}}",
@@ -1826,7 +1854,7 @@
     "kavitaplus-metadata-breakdown-stats": {
         "title": "Kavita+ 元数据分析",
         "description": "Kavita 会随着时间的推移，缓慢的获取符合条件的系列元数据（评分、评论、推荐等）。",
-        "no-data": "无数据",
+        "no-data": "{{common.no-data}}",
         "errored-series-label": "错误系列",
         "completed-series-label": "已完成系列",
         "complete": "所有系列都有元数据"
@@ -1954,14 +1982,16 @@
         "sidenav": "侧边栏",
         "external-sources": "外部源",
         "smart-filters": "智能筛选",
-        "help": "{{common.help}}"
+        "help": "{{common.help}}",
+        "description": "您可以通过重新排序、切换可见性以及将智能筛选器/外部源绑定到主页或侧边导航来定制 Kavita 的不同方面。"
     },
     "customize-dashboard-streams": {
         "no-data": "所有智能筛选已加入仪表板或尚未创建。",
         "save": "{{common.save}}",
         "add": "{{common.add}}",
         "filter": "{{common.filter}}",
-        "clear": "{{common.clear}}"
+        "clear": "{{common.clear}}",
+        "smart-filter-title": "{{customize-dashboard-modal.title-smart-filters}}"
     },
     "customize-sidenav-streams": {
         "no-data": "所有智能筛选已加入侧边栏或尚未创建。",
@@ -1972,7 +2002,7 @@
         "clear": "{{common.clear}}",
         "smart-filters-title": "智能筛选",
         "external-sources-title": "{{customize-dashboard-modal.external-sources}}",
-        "reorder-when-filter-present": "You cannot reorder items via drag & drop while a filter is present. Use {{customize-sidenav-streams.order-numbers-label}}",
+        "reorder-when-filter-present": "存在筛选器时，您无法通过拖放重新排序项目。使用 {{customize-sidenav-streams.order-numbers-label}}",
         "order-numbers-label": "{{reading-list-detail.order-numbers-label}}",
         "bulk-mode-label": "批量模式"
     },
@@ -1989,7 +2019,15 @@
         "no-data": "未创建智能筛选",
         "filter": "{{common.filter}}",
         "clear": "{{common.clear}}",
-        "errored": "筛选器中存在编码错误。您需要重新创建它。"
+        "errored": "筛选器中存在编码错误。您需要重新创建它。",
+        "cancel": "{{common.cancel}}",
+        "close": "{{common.close}}",
+        "edit": "{{common.edit}}",
+        "edit-smart-filter": "编辑 {{name}}",
+        "name-label": "名称",
+        "filter-name-unique": "智能筛选器名称必须是唯一的",
+        "save": "{{common.save}}",
+        "required-field": "智能筛选器需要一个名称"
     },
     "edit-external-source-item": {
         "not-unique": "此主机外部源已存在，请确保您没有重复记录",
@@ -2014,7 +2052,7 @@
         "reading-lists": "{{side-nav.reading-lists}}",
         "bookmarks": "{{side-nav.bookmarks}}",
         "all-series": "{{side-nav.all-series}}",
-        "browse-authors": "{{side-nav.browse-authors}}"
+        "browse-authors": "{{side-nav.browse-people}}"
     },
     "filter-field-pipe": {
         "age-rating": "{{metadata-fields.age-rating-title}}",
@@ -2120,9 +2158,8 @@
         "email-sent": "已发送邮件到{{email}}",
         "email-not-sent": "存档的电子邮件不是有效的电子邮件，无法发送。链接已转储到日志中。管理员可以提供此链接来完成流程。",
         "k+-license-saved": "许可密钥已保存，但不是有效的。点击检查以重新验证订阅。首次注册可能需要一分钟来传播。",
-        "k+-unlocked": "Kavita+已解锁！",
         "k+-error": "激活许可证时出现错误，请重试。",
-        "k+-delete-key": "这将只删除Kavita的许可密钥并显示购买链接。这不会取消您的订阅！请仅在得到支持团队指示时使用此选项！",
+        "k+-delete-key": "这只会删除 Kavita 的许可证密钥并允许显示购买链接。 这不会取消您的订阅！首先使用“管理”取消您的订阅。",
         "k+-reset-key": "这将使用您之前的许可证进行的注册无效，并允许您重新注册 Kavita 实例。",
         "k+-reset-key-success": "您的许可证尚未注册。使用“编辑”按钮重新注册您的实例并重新激活 Kavita+",
         "library-deleted": "已移除资料库 {{name}}",
@@ -2138,7 +2175,7 @@
         "password-updated": "密码已更新",
         "forced-scan-queued": "已开始强制扫描{{name}}",
         "library-created": "资料库创建成功。已开始扫描。",
-        "anilist-token-updated": "已更新AniList令牌",
+        "anilist-token-updated": "AniList 令牌已更新",
         "age-restriction-updated": "年龄限制已更新",
         "email-sent-to-no-existing": "现有电子邮件无效。链接已转储到日志中。向管理员询问链接以完成电子邮件更改。",
         "email-sent-to": "已向您的旧电子邮件地址发送确认邮件。",
@@ -2148,12 +2185,12 @@
         "delete-device": "您确定要删除该设备吗？",
         "confirm-regen-covers": "刷新封面将强制重新生成所有封面图片。这是一项繁重的运算。您确定执行，而不想使用扫描操作代替吗？",
         "alert-long-running": "这是一个长时间运行的任务。请等待其完成后再次进行操作。",
-        "confirm-delete-multiple-series": "您确定要删除{{count}}个系列吗？这不会修改磁盘上的文件。",
+        "confirm-delete-multiple-series": "您确定要删除这 {{count}} 个系列吗？这不会修改磁盘上的文件。",
         "confirm-delete-series": "您确定要删除此系列吗？这不会修改磁盘上的文件。",
         "confirm-delete-chapter": "您确定要删除此章节吗？它不会修改磁盘上的文件。",
         "confirm-delete-volume": "您确定要删除此卷吗？它不会修改磁盘上的文件。",
         "alert-bad-theme": "主题中存在无效或不安全的CSS。请联系管理员进行修正。将默认为暗色主题。",
-        "confirm-library-delete": "您确定要删除{{name}}资料库吗？此操作无法撤销。",
+        "confirm-library-delete": "您确定要删除 {{name}} 资料库吗？此操作无法撤销。",
         "confirm-library-type-change": "更改资料库类型将触发具有不同解析规则的新扫描，并可能导致重新创建系列，因此您可能会丢失进度和书签。您应该在执行此操作之前进行备份。您确定要继续吗？",
         "confirm-download-size": "{{entityType}}的大小为{{size}}。确定要继续吗？",
         "confirm-download-size-ios": "iOS 在下载大于 200MB 的文件时出现问题，此下载可能无法完成。",
@@ -2162,7 +2199,7 @@
         "smart-filter-deleted": "智能筛选器已删除",
         "smart-filter-updated": "已创建/已更新智能筛选器",
         "external-source-already-exists": "已经存在具有相同名称、主机、API密匙的外部源",
-        "anilist-token-expired": "您的 AniList 令牌已过期。在您在“用户设置”>“帐户”中重新生成之前，Scrobbling 将不再处理",
+        "anilist-token-expired": "您的 AniList 令牌已过期。Scrobbling 将不再处理，直到您在“用户设置”>“帐户”中重新生成它",
         "collection-tag-deleted": "收藏标签已删除",
         "force-kavita+-refresh-success": "Kavita+ 外部元数据已失效",
         "collection-not-owned": "您没有该收藏",
@@ -2185,7 +2222,16 @@
         "must-select-library": "必须至少选择一个资料库",
         "bulk-scan": "扫描多个资料库将以线性方式进行。这可能需要很长时间，并且根据资料库的大小可能无法完成。",
         "person-image-downloaded": "已下载并应用了人物封面。",
-        "confirm-delete-multiple-chapters": "您确定要删除 {{count}} 章节/卷吗？它不会修改磁盘上的文件。"
+        "confirm-delete-multiple-chapters": "您确定要删除 {{count}} 章节/卷吗？它不会修改磁盘上的文件。",
+        "bulk-delete-libraries": "您确定要删除 {{count}} 个资料库吗？",
+        "match-success": "系列匹配正确",
+        "webtoon-override": "由于图片代表网络漫画，因此切换到网络漫画模式。",
+        "scrobble-gen-init": "将一项任务加入队列，该任务将根据过去的阅读历史和评分生成 scrobble 事件，并将其与已连接的服务同步。",
+        "confirm-delete-multiple-volumes": "您确定要删除这 {{count}} 个卷吗？这不会修改磁盘上的文件。",
+        "series-added-want-to-read": "从“想读”列表中添加的系列",
+        "series-bound-to-reading-profile": "系列绑定到阅读配置文件 {{name}}",
+        "library-bound-to-reading-profile": "资料库绑定到阅读配置文件 {{name}}",
+        "external-match-rate-error": "Kavita 查找 {{seriesName}} 的速度已超出范围。请过 5 分钟再试。"
     },
     "read-time-pipe": {
         "less-than-hour": "<1 小时",
@@ -2255,7 +2301,19 @@
         "multiple-selections": "多项选择",
         "back-to": "返回到 {{action}}",
         "title": "活动",
-        "copy-settings": "复制设置"
+        "copy-settings": "复制设置",
+        "match": "匹配",
+        "match-tooltip": "使用 Kavita+ 手动匹配系列",
+        "reorder": "重新排序",
+        "rename-tooltip": "重命名智能筛选",
+        "rename": "重命名",
+        "merge": "合并",
+        "reading-profiles": "阅读配置文件",
+        "set-reading-profile": "设置阅读配置文件",
+        "set-reading-profile-tooltip": "将阅读配置文件绑定到此资料库",
+        "clear-reading-profile": "清除阅读配置文件",
+        "cleared-profile": "清除阅读配置文件",
+        "clear-reading-profile-tooltip": "清除此资料库的阅读配置文件"
     },
     "preferences": {
         "left-to-right": "从左到右",
@@ -2357,8 +2415,8 @@
         "promoted": "推广",
         "select-all": "全选",
         "deselect-all": "取消全选",
-        "series-count": "{{num}}系列",
-        "item-count": "{{num}}条目",
+        "series-count": "{{num}} 系列",
+        "item-count": "{{num}} 条目",
         "book-num": "书籍",
         "issue-hash-num": "期 #",
         "issue-num": "期",
@@ -2372,11 +2430,18 @@
         "issue-nums": "期",
         "chapter-nums": "章节",
         "volume-nums": "卷",
-        "author-count": "{{num}} 作者"
+        "author-count": "{{num}} 作者",
+        "chapter-count": "{{num}} 章",
+        "no-data": "无数据",
+        "issue-count": "{{num}} 期"
     },
     "confirm": {
         "confirm": "确认",
-        "alert": "警告"
+        "alert": "注意",
+        "info": "信息",
+        "cancel": "{{common.cancel}}",
+        "ok": "确定",
+        "prompt": "问题"
     },
     "edit-person-modal": {
         "mal-id-label": "MAL Id",
@@ -2399,18 +2464,354 @@
         "cover-image-description-extra": "或者，您可以从 CoversDB 下载封面（如果有）。",
         "download-coversdb": "从 CoversDB 下载",
         "mal-tooltip": "https://myanimelist.net/people/{MalId}/",
-        "hardcover-tooltip": "https://hardcover.app/authors/{HardcoverId}"
+        "hardcover-tooltip": "https://hardcover.app/authors/{HardcoverId}",
+        "aliases-tooltip": "当某个系列被标记为某个人的别名时，系统会分配该人，而不是创建新的人。删除别名后，您必须重新扫描该系列才能生效。",
+        "aliases-tab": "别名",
+        "aliases-label": "编辑别名",
+        "alias-overlap": "此别名已经指向另一个人或为该人的名字，请考虑合并它们。"
     },
     "person-detail": {
         "all-roles": "角色",
         "known-for-title": "代表作品",
         "individual-role-title": "作为 {{role}}",
         "browse-person-title": "{{name}} 的全部作品",
-        "browse-person-by-role-title": "{{name}} 作为 {{role}} 的所有作品"
+        "browse-person-by-role-title": "{{name}} 作为 {{role}} 的所有作品",
+        "anilist-url": "{{edit-person-modal.anilist-tooltip}}",
+        "no-info": "没有关于此人的信息",
+        "aka-title": "又名 "
     },
-    "browse-authors": {
+    "match-series-modal": {
+        "close": "{{common.close}}",
+        "save": "{{common.save}}",
+        "title": "匹配 {{seriesName}}",
+        "description": "选择一个匹配项来重新连接 Kavita+ 元数据并重新生成 scrobble 事件。 不匹配可用于限制 Kavita 匹配元数据和乱序。",
+        "no-results": "无法找到匹配项。尝试添加来自受支持的提供商的 URL，然后重试。",
+        "query-label": "询问",
+        "query-tooltip": "输入系列名称、AniList/MyAnimeList/ComicBookRoundup 网址。网址将使用直接查找。",
+        "dont-match-label": "不匹配",
+        "dont-match-tooltip": "从匹配和 scrobbling 中选择该系列",
+        "search": "搜索"
+    },
+    "manage-matched-metadata": {
+        "matched-status-label": "匹配的",
+        "title": "匹配的元数据",
+        "description": "所有可与外部元数据匹配的适用系列都驻留在此处。Kavita 将预取或刷新系列元数据，每天 24 小时 50 个系列。",
+        "status-header": "状态",
+        "series-name-header": "系列",
+        "unmatched-status-label": "不匹配",
+        "blacklist-status-label": "需要手动匹配",
+        "all-status-label": "全部",
+        "valid-until-header": "下次刷新",
+        "dont-match-label": "不匹配",
+        "no-data": "{{common.no-data}}",
+        "dont-match-status-label": "{{dont-match-label}}",
+        "library-name-header": "资料库",
+        "actions-header": "活动",
+        "match-alt": "匹配 {{seriesName}}",
+        "matched-state-label": "匹配状态",
+        "library-type": "资料库类型"
+    },
+    "changelog-update-item": {
+        "removed": "已移除",
+        "theme": "主题",
+        "installed": "{{changelog.installed}}",
+        "api": "API",
+        "published-label": "已发布: ",
+        "download": "下载",
+        "added": "添加时间",
+        "changed": "已更改",
+        "fixed": "固定",
+        "developer": "开发人员",
+        "feature-requests": "功能请求",
+        "known-issues": "已知问题"
+    },
+    "new-version-modal": {
+        "title": "Kavita 已更新！",
+        "description": "Kavita 有新版本可用。刷新即可更新。",
+        "added": "{{changelog.added}}",
+        "changed": "{{changelog.changed}}",
+        "fixed": "{{changelog.fixed}}",
+        "developer": "{{changelog.developer}}",
+        "theme": "{{changelog.theme}}",
+        "removed": "{{changelog.removed}}",
+        "api": "{{changelog.api}}",
+        "close": "{{common.close}}",
+        "refresh": "刷新",
+        "known-issues": "{{changelog.known-issues}}"
+    },
+    "manage-user-tokens": {
+        "description": "拥有 scrobbling 令牌的用户有时可能需要更新。如果设置了电子邮件并且他们有有效的电子邮件，Kavita 将自动向他们发送电子邮件。",
+        "username-header": "用户名",
+        "anilist-header": "AniList",
+        "mal-header": "MAL",
+        "token-set-label": "设置令牌",
+        "no-data": "{{common.no-data}}",
+        "expires-label": "到期时间：{{date}}"
+    },
+    "match-series-result-item": {
+        "volume-count": "{{server-stats.volume-count}}",
+        "chapter-count": "{{common.chapter-count}}",
+        "releasing": "释放",
+        "details": "查看页面",
+        "updating-metadata-status": "更新元数据",
+        "issue-count": "{{common.issue-count}}"
+    },
+    "email-history": {
+        "description": "在这里您可以找到从 Kavita 发送的所有电子邮件以及发送给哪个用户。",
+        "template-header": "模板",
+        "date-header": "发送日期",
+        "user-header": "发送到",
+        "sent-header": "成功",
+        "no-data": "{{common.no-data}}",
+        "sent-tooltip": "发送",
+        "not-sent-tooltip": "未发送"
+    },
+    "manage-metadata-settings": {
+        "remove-source-tag-label": "移除源标签",
+        "enable-tags-tooltip": "允许写入系列标签。",
+        "summary-tooltip": "允许在字段解锁时写入内容简介。",
+        "genre": "类型",
+        "derive-publication-status-label": "出版状态",
+        "blacklist-tooltip": "此列表中的所有内容都将从类型和标签处理中删除。这是添加您不想写入的类型/标签的地方。确保它们以逗号分隔。",
+        "tag": "标签",
+        "enable-tags-label": "标签",
+        "blacklist-label": "黑名单类型/标签",
+        "description": "Kavita+ 能够下载并将一些有限的元数据写入数据库。此页面允许您切换范围内的内容。",
+        "enabled-label": "启用元数据下载",
+        "enabled-tooltip": "允许 Kavita 下载元数据并写入其数据库。",
+        "summary-label": "内容简介",
+        "derive-publication-status-tooltip": "允许根据总章节/卷数得出出版状态。",
+        "enable-relations-tooltip": "允许添加系列关系。",
+        "enable-relations-label": "关系",
+        "enable-people-label": "创作人员",
+        "enable-people-tooltip": "允许添加人物（角色、作家等）。所有人物均包含图像。",
+        "enable-start-date-label": "开始日期",
+        "enable-start-date-tooltip": "允许将系列的开始日期写入系列",
+        "enable-genres-label": "类型",
+        "enable-genres-tooltip": "允许编写系列类型。",
+        "whitelist-label": "白名单标签",
+        "whitelist-tooltip": "仅允许为标签写入此列表中的字符串。确保它们以逗号分隔。",
+        "age-rating-mapping-title": "年龄分级映射",
+        "age-rating-mapping-description": "如果在类型或标签中找到左侧的任何字符串，则会设置该系列的年龄分级。",
+        "add-field-mapping-label": "添加字段映射",
+        "add-age-rating-mapping-label": "添加年龄分级映射",
+        "field-mapping-title": "字段映射",
+        "field-mapping-description": "为在类型/标签字段中找到的某些字符串设置规则，并将其映射到类型/标签中的新字符串，并可选择将其从源列表中删除。仅适用于类型/标签可写入的情况。",
+        "first-last-name-label": "首命名",
+        "first-last-name-tooltip": "确保人们的名字写在前面，然后是姓氏",
+        "person-roles-label": "角色",
+        "localized-name-label": "本地化系列名称",
+        "localized-name-tooltip": "允许在字段解锁时写入本地化名称。Kavita 将尝试做出最佳猜测。",
+        "enable-cover-image-label": "封面图片",
+        "enable-cover-image-tooltip": "允许 Kavita 为该系列撰写封面图片",
+        "overrides-label": "覆盖",
+        "overrides-description": "允许 Kavita 覆盖锁定的字段。",
+        "enable-chapter-summary-label": "{{manage-metadata-settings.summary-label}}",
+        "enable-chapter-summary-tooltip": "{{manage-metadata-settings.summary-tooltip}}",
+        "enable-chapter-release-date-label": "发布日期",
+        "enable-chapter-release-date-tooltip": "允许写入章节/期刊的发布日期",
+        "enable-chapter-cover-label": "章节封面",
+        "enable-chapter-cover-tooltip": "允许设置章节/期刊的封面",
+        "chapter-header": "章节字段",
+        "enable-chapter-publisher-label": "出版社",
+        "enable-chapter-title-label": "标题",
+        "enable-chapter-title-tooltip": "允许写入章节/期刊的标题",
+        "enable-chapter-publisher-tooltip": "允许写入章节/期刊的出版社"
+    },
+    "metadata-setting-field-pipe": {
+        "covers": "封面",
+        "age-rating": "{{metadata-fields.age-rating-title}}",
+        "people": "{{tabs.people-tab}}",
+        "summary": "{{filter-field-pipe.summary}}",
+        "start-date": "{{manage-metadata-settings.enable-start-date-label}}",
+        "genres": "{{metadata-fields.genres-title}}",
+        "tags": "{{metadata-fields.tags-title}}",
+        "localized-name": "{{edit-series-modal.localized-name-label}}",
+        "publication-status": "{{edit-series-modal.publication-status-title}}",
+        "chapter-summary": "内容简介（章节）",
+        "chapter-publisher": "{{person-role-pipe.publisher}} (章节)",
+        "chapter-title": "标题（章节）",
+        "chapter-covers": "封面（章节）",
+        "chapter-release-date": "发布日期（章节）"
+    },
+    "role-localized-pipe": {
+        "download": "下载",
+        "bookmark": "书签",
+        "change-restriction": "更改限制",
+        "login": "登录",
+        "read-only": "只读",
+        "promote": "推广",
+        "admin": "Admin",
+        "change-password": "更改密码"
+    },
+    "log-level-pipe": {
+        "debug": "调试",
+        "information": "信息",
+        "trace": "追踪",
+        "warning": "警告",
+        "critical": "严重"
+    },
+    "reviews": {
+        "user-reviews-plus": "外部评审",
+        "user-reviews-local": "本地评论"
+    },
+    "review-modal": {
+        "review-label": "评论",
+        "save": "{{common.save}}",
+        "delete": "{{common.delete}}",
+        "min-length": "评论必须至少包含 {{count}} 个字符",
+        "required": "{{validation.required-field}}",
+        "title": "编辑评论",
+        "close": "{{common.close}}"
+    },
+    "merge-person-modal": {
+        "close": "{{common.close}}",
+        "src": "合并人员",
+        "title": "{{personName}}",
+        "known-for-title": "代表作品",
+        "merge-warning": "如果继续，所选人员将被移除。所选人员的姓名将被添加为别名，并且其所有角色都将被转移。",
+        "alias-title": "新别名",
+        "save": "{{common.save}}"
+    },
+    "manage-reading-profiles": {
+        "description": "并非所有系列都以相同的方式阅读，请为每个资料库或系列设置不同的阅读配置文件，以尽可能无缝地回到您的系列中。",
+        "tap-to-paginate-tooltip": "电子书阅读器屏幕的侧面是否允许点击以移动到上一页/下一页",
+        "immersive-mode-tooltip": "这将隐藏阅读器文档上的菜单，并点击翻页",
+        "add": "{{common.add}}",
+        "layout-mode-book-tooltip": "内容布局方式。滚动方式与书籍内容大小一致。1 列或 2 列适合设备高度，每页可容纳 1 列或 2 列文本",
+        "profiles-title": "您的阅读配置文件",
+        "default-profile": "默认",
+        "make-default": "设为默认值",
+        "no-selected": "未选择配置文件",
+        "confirm": "您确定要删除阅读配置文件 {{name}} 吗？",
+        "image-reader-settings-title": "图像阅读器",
+        "reading-direction-label": "阅读方向",
+        "reading-direction-tooltip": "点击方向为移至下一页。从右到左表示点击屏幕左侧即可移至下一页。",
+        "scaling-option-label": "缩放选项",
+        "scaling-option-tooltip": "如何将图像缩放到适合您的屏幕。",
+        "page-splitting-label": "页面拆分",
+        "reading-mode-label": "阅读模式",
+        "reading-mode-tooltip": "将阅读器更改为垂直、水平分页或无限滚动",
+        "layout-mode-label": "布局模式",
+        "layout-mode-tooltip": "将单幅图像或两幅并排图像渲染到屏幕上",
+        "background-color-label": "背景颜色",
+        "background-color-tooltip": "图像阅读器的背景颜色",
+        "auto-close-menu-label": "自动关闭菜单",
+        "auto-close-menu-tooltip": "菜单是否自动关闭",
+        "show-screen-hints-label": "显示屏幕提示",
+        "show-screen-hints-tooltip": "显示覆盖层以帮助理解分页区域和方向",
+        "emulate-comic-book-label": "模拟漫画书",
+        "emulate-comic-book-tooltip": "应用阴影效果来模拟读书",
+        "swipe-to-paginate-label": "滑动即可分页",
+        "swipe-to-paginate-tooltip": "在屏幕上滑动是否应该触发下一页或上一页",
+        "allow-auto-webtoon-reader-label": "自动网络漫画阅读器模式",
+        "allow-auto-webtoon-reader-tooltip": "如果页面看起来像网络漫画，请切换到网络漫画阅读器模式。可能会出现一些误报。",
+        "width-override-label": "{{manga-reader.width-override-label}}",
+        "width-override-tooltip": "覆盖阅读器中的图像宽度",
+        "book-reader-settings-title": "图书阅读器",
+        "immersive-mode-label": "沉浸模式",
+        "reading-direction-book-label": "阅读方向",
+        "reading-direction-book-tooltip": "点击方向为移至下一页。从右到左表示点击屏幕左侧即可移至下一页。",
+        "font-family-label": "字体系列",
+        "font-family-tooltip": "要加载的字体系列。默认将加载本书的默认字体",
+        "writing-style-tooltip": "更改文本的方向。水平表示从左到右，垂直表示从上到下。",
+        "layout-mode-book-label": "布局模式",
+        "writing-style-label": "文章风格",
+        "color-theme-book-tooltip": "图书阅读器内容和菜单应采用什么颜色主题",
+        "font-size-book-label": "字体大小",
+        "font-size-book-tooltip": "应用于书中字体的缩放百分比",
+        "line-height-book-label": "行距",
+        "line-height-book-tooltip": "书的行距是多少",
+        "margin-book-label": "边距",
+        "margin-book-tooltip": "屏幕两侧的间距。无论此设置如何，在移动设备上都会覆盖为 0。",
+        "pdf-spread-mode-tooltip": "页面布局。单页还是双页（奇数/偶数）",
+        "pdf-spread-mode-label": "展开模式",
+        "pdf-theme-label": "主题",
+        "pdf-theme-tooltip": "阅读器的颜色主题",
+        "reading-profile-series-settings-title": "系列",
+        "reading-profile-library-settings-title": "资料库",
+        "delete": "{{common.delete}}",
+        "tap-to-paginate-label": "点击分页",
+        "page-splitting-tooltip": "如何分割全宽图像（即合并左右图像）",
+        "pdf-scroll-mode-tooltip": "如何滚动页面。垂直/水平滚动以及点击翻页（无滚动）",
+        "pdf-reader-settings-title": "PDF 阅读器",
+        "color-theme-book-label": "颜色主题",
+        "pdf-scroll-mode-label": "滚动模式",
+        "extra-tip": "通过系列和资料库的操作菜单或批量设置来分配阅读配置文件。更改阅读器中的设置时，会创建一个隐藏的配置文件，用于记住您对该系列的选择（PDF 除外）。当您为该系列分配您自己的阅读配置文件时，此配置文件会被移除。更多信息，请访问",
+        "reset": "{{common.reset}}",
+        "selection-tip": "从列表中选择一个配置文件，或在右上角创建一个新的配置文件",
+        "add-tooltip": "您的新配置文件将在更改后保存",
+        "wiki-title": "wiki",
+        "disable-width-override-label": "禁用宽度覆盖",
+        "disable-width-override-tooltip": "当屏幕尺寸至少等于或小于配置的断点时，防止宽度覆盖生效"
+    },
+    "bulk-set-reading-profile-modal": {
+        "title": "设置阅读配置文件",
+        "filter-label": "{{common.filter}}",
+        "clear": "{{common.clear}}",
+        "no-data": "尚未创建收藏",
+        "loading": "{{common.loading}}",
+        "create": "{{common.create}}",
+        "bound": "边界",
+        "close": "{{common.close}}"
+    },
+    "browse-people": {
+        "issue-count": "{{common.issue-count}}",
+        "title": "浏览人物",
         "author-count": "{{num}} 人",
         "cover-image-description": "{{edit-series-modal.cover-image-description}}",
-        "title": "浏览作者和作家"
+        "sort-label": "排序",
+        "name-label": "名称",
+        "issue-count-label": "期刊数",
+        "series-count-label": "系列数",
+        "series-count": "{{common.series-count}}",
+        "roles-label": "角色"
+    },
+    "browse-genres": {
+        "series-count": "{{common.series-count}}",
+        "title": "浏览类型",
+        "genre-count": "{{num}} 类型",
+        "issue-count": "{{common.issue-count}}"
+    },
+    "browse-title-pipe": {
+        "publication-status": "{{value}} 作品",
+        "age-rating": "评价 {{value}}",
+        "publisher": "由 {{value}} 发布",
+        "genre": "类型为 {{value}}",
+        "editor": "由 {{value}} 编辑",
+        "format": "{{value}} 的格式",
+        "imprint": "{{value}} 的压印",
+        "character": "有字符 {{value}}",
+        "artist": "由 {{value}} 绘制",
+        "letterer": "由 {{value}} 书写",
+        "colorist": "按 {{value}} 着色",
+        "writer": "由 {{value}} 撰写",
+        "library": "在 {{value}} 资料库中",
+        "release-year": "发布于 {{value}}",
+        "team": "团队 {{value}}",
+        "location": "在 {{value}} 位置",
+        "tag": "有标签 {{value}}",
+        "user-rating": "{{value}} 星级",
+        "penciller": "由 {{value}} 铅笔画",
+        "translator": "翻译者 {{value}}",
+        "inker": "由 {{value}} 执笔"
+    },
+    "browse-tags": {
+        "genre-count": "{{num}} 标签",
+        "series-count": "{{common.series-count}}",
+        "title": "浏览标签",
+        "issue-count": "{{common.issue-count}}"
+    },
+    "generic-filter-field-pipe": {
+        "person-chapter-count": "章节数",
+        "person-series-count": "系列数",
+        "person-role": "角色",
+        "person-name": "名称"
+    },
+    "breakpoint-pipe": {
+        "mobile": "手机",
+        "tablet": "平板",
+        "desktop": "桌面",
+        "never": "从不"
     }
 }
diff --git a/UI/Web/src/assets/langs/zh_Hant.json b/UI/Web/src/assets/langs/zh_Hant.json
index 6d00e1a60..dcda7d6f1 100644
--- a/UI/Web/src/assets/langs/zh_Hant.json
+++ b/UI/Web/src/assets/langs/zh_Hant.json
@@ -1,6 +1,6 @@
 {
     "login": {
-        "title": "登入您的賬戶",
+        "title": "登入您的帳戶",
         "username": "{{common.username}}",
         "password": "{{common.password}}",
         "password-validation": "{{validation.password-validation}}",
@@ -13,8 +13,8 @@
         "not-granted": "您沒有權限訪問書庫。",
         "on-deck-title": "繼續閱讀",
         "recently-updated-title": "最近更新系列",
-        "recently-added-title": "新增系列",
-        "more-in-genre-title": "{{genre}} 更多的內容分類"
+        "recently-added-title": "最近新增系列",
+        "more-in-genre-title": "更多{{genre}}作品"
     },
     "edit-user": {
         "edit": "{{common.edit}}",
@@ -22,11 +22,11 @@
         "username": "{{common.username}}",
         "required": "{{validation.required-field}}",
         "email": "{{common.email}}",
-        "not-valid-email": "{{validation.valid-email}}",
         "cancel": "{{common.cancel}}",
         "saving": "儲存…",
         "update": "更新",
-        "account-detail-title": "帳戶詳細資訊"
+        "account-detail-title": "帳戶詳細資訊",
+        "invalid-email-warning": "無效的電子郵件會使 Kavita 的某些功能無法運作"
     },
     "user-scrobble-history": {
         "title": "Scrobble歷史",
@@ -39,7 +39,7 @@
         "series-header": "系列",
         "data-header": "資料",
         "is-processed-header": "已處理",
-        "no-data": "沒有資料",
+        "no-data": "{{common.no-data}}",
         "volume-and-chapter-num": "第{{v}}卷 第{{n}}章",
         "volume-num": "{{num}} 卷",
         "chapter-num": "章節 {{num}}",
@@ -47,7 +47,12 @@
         "not-applicable": "不適用",
         "processed": "處理",
         "not-processed": "未處理",
-        "special": "{{entity-title.special}}"
+        "special": "{{entity-title.special}}",
+        "scrobbling-disabled": "你的帳戶設定中已停用Scrobbling。",
+        "generate-scrobble-events": "回填事件",
+        "token-expired": "您的 AniList 授權憑證已過期！在您於帳戶頁面更新之前，追蹤事件將無法處理。",
+        "select-all-label": "全選",
+        "delete-selected-label": "刪除所選項目"
     },
     "scrobble-event-type-pipe": {
         "chapter-read": "閱讀進度",
@@ -59,15 +64,6 @@
     "spoiler": {
         "click-to-show": "點擊查看據透"
     },
-    "review-series-modal": {
-        "title": "編輯評論",
-        "review-label": "評論",
-        "close": "{{common.close}}",
-        "save": "{{common.save}}",
-        "delete": "{{common.delete}}",
-        "min-length": "評論至少需有 {{count}} 個字元",
-        "required": "{{validation.required-field}}"
-    },
     "review-card-modal": {
         "close": "{{common.close}}",
         "user-review": "{{username}}的評論",
@@ -78,7 +74,8 @@
         "your-review": "這是您的評論",
         "external-review": "外部評論",
         "local-review": "本地評論",
-        "rating-percentage": "評分{{r}}%"
+        "rating-percentage": "評分{{r}}%",
+        "critic": "評論者"
     },
     "want-to-read": {
         "title": "想讀",
@@ -87,8 +84,8 @@
         "no-items-filtered": "沒有項目符合您當前的過濾條件。"
     },
     "user-preferences": {
-        "title": "用戶控制台",
-        "pref-description": "這些是綁定到您帳戶的全局設置。",
+        "title": "用戶儀表板",
+        "pref-description": "這些是與您帳號綁定的全域設定，閱讀器的相關設定請至「閱讀設定檔」中調整。",
         "account-tab": "{{tabs.account-tab}}",
         "preferences-tab": "{{tabs.preferences-tab}}",
         "theme-tab": "{{tabs.theme-tab}}",
@@ -96,7 +93,7 @@
         "stats-tab": "{{tabs.stats-tab}}",
         "scrobbling-tab": "{{tabs.scrobbling-tab}}",
         "smart-filters-tab": "{{tabs.smart-filters-tab}}",
-        "success-toast": "更新使用者偏好",
+        "success-toast": "更新用戶偏好",
         "global-settings-title": "全域設定",
         "page-layout-mode-label": "頁面佈局模式",
         "page-layout-mode-tooltip": "在系列詳細信息頁面上將項目顯示為卡片或列表視圖。",
@@ -108,72 +105,31 @@
         "prompt-on-download-tooltip": "下載大小超過{{size}}MB時提示",
         "disable-animations-label": "禁用動畫",
         "disable-animations-tooltip": "關閉網站中的動畫，對於電子書閱讀器很有用。",
-        "collapse-series-relationships-label": "摺疊系列",
-        "collapse-series-relationships-tooltip": "Kavita是否展示沒有關係的系列或前傳",
+        "collapse-series-relationships-label": "摺疊系列關聯",
+        "collapse-series-relationships-tooltip": "Kavita是否展示沒有關聯的系列或前傳",
         "share-series-reviews-label": "分享系列評論",
         "share-series-reviews-tooltip": "是否對其他用戶顯示您對系列的評論",
-        "image-reader-settings-title": "圖片閱讀器",
-        "reading-direction-label": "閱讀方向",
-        "reading-direction-tooltip": "單擊方向或滑動畫面移動到下一頁。",
-        "scaling-option-label": "縮放選項",
-        "scaling-option-tooltip": "如何將影像縮放到螢幕大小。",
-        "page-splitting-label": "頁面分割",
-        "page-splitting-tooltip": "如何分割全寬影像(擊左右影像合併)",
-        "reading-mode-label": "閱讀模式",
-        "layout-mode-label": "佈局模式",
-        "layout-mode-tooltip": "將單個影像或兩個並排影像顯示到螢幕上",
-        "background-color-label": "背景顏色",
-        "auto-close-menu-label": "自動關閉選單",
-        "show-screen-hints-label": "顯示螢幕提示",
-        "emulate-comic-book-label": "模擬漫畫書",
-        "swipe-to-paginate-label": "滑動到分頁",
-        "book-reader-settings-title": "書本閱讀器",
-        "tap-to-paginate-label": "點擊翻頁",
-        "tap-to-paginate-tooltip": "書本閱讀器的畫面兩側是否允許點擊以移到上一頁/下一頁",
-        "immersive-mode-label": "沉浸式模式",
-        "immersive-mode-tooltip": "這將隱藏點擊閱讀器文檔後的選單，然後打開“點擊翻頁”功能",
-        "reading-direction-book-label": "閱讀方向",
-        "reading-direction-book-tooltip": "單擊方向移動到下一頁。 從右到左意味著您單擊屏幕左側以移至下一頁。",
-        "font-family-label": "字體系列",
-        "font-family-tooltip": "要加載的字體系列。 默認將加載書籍的默認字體",
-        "writing-style-label": "文字排版",
-        "writing-style-tooltip": "更改文字方向。橫向從左到右，縱向從上到下。",
-        "layout-mode-book-label": "佈局模式",
-        "layout-mode-book-tooltip": "決定內容在設備螢幕上的呈現方式。“滾動”會按書本內容自然上下滾動，而“單欄”或“雙欄”會根據設備高度調整，一頁顯示一欄或兩欄文字",
-        "color-theme-book-label": "主題顏色",
-        "color-theme-book-tooltip": "閱讀器內容與選單的主題顏色",
-        "font-size-book-label": "字體大小",
-        "line-height-book-label": "單行間距",
-        "line-height-book-tooltip": "書的行距是多少",
-        "margin-book-label": "頁邊距",
-        "margin-book-tooltip": "與螢幕兩側的距離，在行動裝置上會忽略此設定，間距固定為0。",
-        "pdf-reader-settings-title": "PDF 閱讀器",
-        "pdf-scroll-mode-label": "全螢幕模式",
-        "pdf-scroll-mode-tooltip": "當您瀏覽頁面時，可以選擇垂直/水平滾動，或者點擊分頁(無需滾動)",
-        "pdf-spread-mode-label": "跨頁模式",
-        "pdf-spread-mode-tooltip": "頁面應該如何排列。第一頁為單頁或雙頁（奇數跨頁/偶數跨頁）",
-        "pdf-theme-label": "主題",
         "clients-opds-alert": "此伺服器上未啟用 OPDS。 這不會影響 Tachiyomi 用戶。",
         "clients-opds-description": "所有第三方客戶端都將使用 API 密鑰或下面的連接 URL。 這些就像密碼一樣，請保密。",
         "clients-api-key-tooltip": "API 金鑰就像密碼一樣。重置它會使任何現有的客戶端失效。",
         "clients-opds-url-tooltip": "查看支持的 OPDS 客户端列表： ",
         "reset": "{{common.reset}}",
         "save": "{{common.save}}",
-        "background-color-tooltip": "圖片閱讀器的背景顏色",
-        "auto-close-menu-tooltip": "菜單是否應自動關閉",
-        "show-screen-hints-tooltip": "顯示一個覆蓋層，以幫助理解翻頁區域和方向",
-        "swipe-to-paginate-tooltip": "在屏幕上滑動是否應移到上一頁/下一頁",
-        "font-size-book-tooltip": "書中字體的縮放比例",
         "clients-opds-url-label": "OPDS 網址",
         "clients-api-key-label": "API 密鑰",
-        "reading-mode-tooltip": "將閱讀器更改為縱向翻頁、橫向翻頁，或設置為無限滾動",
-        "emulate-comic-book-tooltip": "套用陰影以模擬書籍閱讀效果",
-        "pdf-theme-tooltip": "閱讀器的顏色主題"
+        "kavitaplus-settings-title": "Kavita+",
+        "anilist-scrobbling-tooltip": "允許 Kavita 單向同步閱讀進度與評分至 AniList",
+        "want-to-read-sync-label": "想讀清單同步",
+        "want-to-read-sync-tooltip": "允許 Kavita 根據 AniList 和 MAL 的待讀清單系列，新增項目到您的「想讀」中",
+        "anilist-scrobbling-label": "AniList Scrobbling"
     },
     "user-holds": {
-        "title": "記錄保留",
-        "description": "這是用戶自主管理的系列列表，不會發送給 Scrobble 服務提供商。 您可以隨時刪除系列，下一次 Scrobble 事件(閱讀進度、評分、想讀狀態)將觸發事件。",
-        "no-data": "{{typeahead.no-data}}"
+        "title": "暫停 Scrobble",
+        "description": "這個清單由用戶管理，其中包含不會同步到外部服務的系列。你可以隨時將任何系列從此清單中移除。一旦移除，下次該系列發生任何 Scrobble 事件（例如：閱讀進度、評分或想讀狀態變更），就會立即觸發同步功能。",
+        "no-data": "{{typeahead.no-data}}",
+        "series-name-header": "{{manage-matched-metadata.series-name-header}}",
+        "delete-label": "{{common.remove}}",
+        "created-header": "{{manage-media-issues.created-header}}"
     },
     "theme-manager": {
         "title": "主題管理器",
@@ -255,7 +211,7 @@
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
         "required-field": "{{validation.required-field}}",
-        "passwords-must-match": "密碼必須匹配",
+        "passwords-must-match": "密碼必須一致",
         "permission-error": "您無權更改您的密碼。聯繫服務器管理員。"
     },
     "change-email": {
@@ -293,34 +249,41 @@
         "regen-warning": "重新生成 API 密鑰將使現有使用端失效。",
         "no-key": "錯誤 - 未設置密鑰",
         "confirm-reset": "這將使您設置的任何 OPDS 配置無效。 你確定要繼續嗎？",
-        "key-reset": "API密鑰重置"
+        "key-reset": "API密鑰重置",
+        "reset": "重設"
     },
     "scrobbling-providers": {
         "title": "Scrobbling供應商",
         "requires": "此功能需要有效的{{product}}授權",
-        "token-valid": "Token 有效",
-        "token-expired": "Token已過期",
-        "no-token-set": "未設定Token",
-        "token-set": "設定Token",
+        "token-valid": "授權憑證有效",
+        "token-expired": "授權憑證已過期",
+        "no-token-set": "未設定授權憑證",
+        "token-set": "設定授權憑證",
         "generate": "產生",
         "generic-instructions": "填寫有關不同外部服務的信息，以便讓 Kavita+ 能夠與它們互動。",
-        "instructions": "First time users should click on \"{{scrobbling-providers.generate}}\" below to allow Kavita+ to talk with {{service}}. Once you authorize the program, copy and paste the token in the input below. You can regenerate your token at any time.",
+        "instructions": "初次使用的用戶請點擊下方的「{{scrobbling-providers.generate}}」，以允許 Kavita+ 和 {{service}} 進行通訊。授權程式後，請將取得的憑證複製並貼到下方的輸入框中。您可以隨時重新產生新的憑證。",
         "mal-instructions": "Kavita 使用 MAL 客戶端 ID 進行身份驗證。為 Kavita 創建一個新的客戶端，一旦批准，提供客戶端 ID 和您的用戶名稱。",
         "scrobbling-applicable-label": "可以進行 Scrobbling",
-        "token-input-label": "Token：{{service}}",
+        "token-input-label": "{{service}} 授權憑證填寫處",
         "mal-token-input-label": "MAL 客戶端 ID",
         "mal-username-input-label": "MAL 用戶名稱",
         "edit": "{{common.edit}}",
         "cancel": "{{common.cancel}}",
         "save": "{{common.save}}",
-        "loading": "{{common.loading}}"
+        "loading": "{{common.loading}}",
+        "mal-used-for": "MyAnimeList 用於智慧收藏和同步「想讀」清單。",
+        "anilist-used-for": "AniList 用於 scrobbling （同步資料）和同步「想讀」清單。",
+        "anilist-first-later": "稍後",
+        "anilist-first-now": "現在",
+        "anilist-first-header": "AniList 授權憑證已儲存",
+        "anilist-first-description": "您的 AniList 授權憑證現在已設定完成。這個憑證的有效期限為一年，Kavita 會在到期前通知您來這裡更新憑證。設定完成後，Kavita 將會根據您的閱讀歷史、想讀清單和評分，自動產生scrobble（同步）事件。您可以選擇現在就開始同步，或稍後再進行。如果您有任何系列不希望被同步，請選擇「稍後」，並在這些系列上設定 「暫停 Scrobble」功能。您只需要執行這個任務一次，之後 Kavita 便會自動為您處理同步事宜。
          如果您選擇「稍後」，可以在 Scrobbling 頁面找到相關按鈕。"
     },
     "typeahead": {
         "locked-field": "已鎖定",
         "close": "{{common.close}}",
         "loading": "{{common.loading}}",
         "add-item": "新增 {{item}}…",
-        "no-data": "沒有資料",
+        "no-data": "{{common.no-data}}",
         "add-custom-item": "，輸入以添加自定義項目"
     },
     "generic-list-modal": {
@@ -419,7 +382,7 @@
         "all-series-missing": "您的帳戶無法訪問列表中的所有系列，或者 Kavita 列表中沒有任何內容。",
         "chapter-missing": "{{series}}:Kavita缺少第{{chapter}}章，該項目將被跳過。",
         "empty-file": "cbl 檔案為空，無需執行任何操作。",
-        "name-conflict": "您的帳戶中已存在與 cbl 文件匹配的書單({{readingListName}})。",
+        "name-conflict": "您的帳戶中已存在與 cbl 文件相同的書單({{readingListName}})。",
         "series-collision": "該系列{{seriesLink}}與書庫中的系列名稱相同。",
         "series-missing": "Kavita中缺少系列{{series}}，或者您的帳戶沒有權限。 該系列的所有項目都將跳過導入。",
         "volume-missing": "{{series}}：卷 {{volume}} 在 Kavita 中缺失或您的帳戶沒有權限，所有具有此卷號的項目將被跳過。",
@@ -449,20 +412,20 @@
         "years-ago": "{{value}}年前"
     },
     "relationship-pipe": {
-        "adaptation": "適應",
-        "alternative-setting": "替代設定",
-        "alternative-version": "替代版本",
-        "character": "角色",
+        "adaptation": "改編",
+        "alternative-setting": "架空世界／平行設定",
+        "alternative-version": "不同版本／IF線",
+        "character": "客串角色",
         "contains": "包含",
         "doujinshi": "同人",
         "other": "其他",
         "prequel": "前傳",
         "sequel": "續集",
         "side-story": "番外",
-        "spin-off": "拆分",
-        "parent": "家長",
-        "edition": "編輯",
-        "annual": "年度"
+        "spin-off": "衍伸作",
+        "parent": "主系列",
+        "edition": "特別版",
+        "annual": "年度特刊"
     },
     "publication-status-pipe": {
         "ongoing": "連載中",
@@ -479,7 +442,7 @@
         "editor": "編輯",
         "inker": "勾線師",
         "letterer": "字體設計",
-        "penciller": "線稿師",
+        "penciller": "草稿師",
         "publisher": "出版社",
         "writer": "作者",
         "other": "其他",
@@ -497,9 +460,9 @@
     },
     "library-type-pipe": {
         "book": "書籍",
-        "comic": "美漫",
-        "manga": "漫畫",
-        "comicVine": "Comic Vine",
+        "comic": "漫畫（舊版）",
+        "manga": "漫畫（日漫）",
+        "comicVine": "漫畫",
         "image": "圖片",
         "lightNovel": "輕小說"
     },
@@ -544,7 +507,7 @@
     "all-filters": {
         "count": "{{count}} {{customize-dashboard-modal.title-smart-filters}}",
         "create": "{{common.create}}",
-        "title": "所有的智慧篩選"
+        "title": "所有的智慧篩選器"
     },
     "out-of-date-modal": {
         "close": "{{common.close}}",
@@ -583,11 +546,11 @@
         "loading": "{{common.loading}}",
         "activate-email-label": "{{common.email}}",
         "activate-delete": "{{common.delete}}",
-        "activate-reset": "{{common.reset}}",
+        "activate-reset": "重設授權",
         "activate-save": "{{common.save}}",
         "activate-reset-tooltip": "使用您的授權來使先前的註冊失效。需要提供授權金鑰和電子郵件",
         "invalid-license-tooltip": "如果您的訂閱已結束，您必須發送電子郵件給支援團隊以創建新的訂閱",
-        "title": "Kavita+ 許可證",
+        "title": "Kavita+ 授權",
         "license-not-valid": "授權無效",
         "license-valid": "授權有效",
         "buy": "購買",
@@ -601,12 +564,32 @@
         "activate-discordId-label": "Discord 用戶 ID",
         "activate-discordId-tooltip": "將您的 Discord 帳戶與 Kavita+ 連結。這將授予您訪問隱藏頻道的權限，以幫助塑造 Kavita。",
         "discord-validation": "這不是有效的 Discord 用戶 ID。您的用戶 ID 不是您的 Discord 用戶名。",
-        "kavita+-desc-part-2": "高級福利",
-        "kavita+-desc-part-3": "今天！",
-        "kavita+-releases": "查看版本",
-        "kavita+-desc-part-1": "Kavita+ 是一項高級訂閱服務，可為此 Kavita 實例上的所有用戶解鎖功能。購買訂閱以解鎖 ",
-        "kavita+-requirement": "Kavita+ 僅與最新版本（最近的兩個版本）配合使用。任何不在此範圍內的版本可能無法正常運作。",
-        "help-label": "{{common.help}}"
+        "kavita+-desc-part-2": "「進階福利」",
+        "kavita+-desc-part-3": "就在今天！",
+        "kavita+-desc-part-1": "Kavita+ 是一項加值訂閱服務，能為此 Kavita 實例上的所有使用者解鎖更多功能。立即購買訂閱，享受 ",
+        "kavita+-requirement": "Kavita+ 僅支援 Kavita 的最新三個版本。超出此範圍的版本，其功能可能無法正常運作。",
+        "help-label": "{{common.help}}",
+        "supported-version-label": "授權支援版本",
+        "faq-title": "常見問題",
+        "info-title": "授權資訊",
+        "k+-unlocked-description": "歡迎使用 Kavita+！Kavita 會根據您的閱讀進度、評分以及「想讀」清單產生 Scrobble 事件。一旦您在帳戶中註冊了 Scrobbling 提供者，即可啟用此功能。請花些時間為不想要進行 Scrobble 的書籍系列設定「暫停 Scrobble」，以確保不會同步這些內容。",
+        "license-active-label": "授權已啟用",
+        "reset-label": "重設",
+        "expiration-label": "到期",
+        "valid-tooltip": "有效",
+        "invalid-tooltip": "無效",
+        "manage-tooltip": "可以更新付款資訊、取消／暫停訂閱等操作",
+        "email-label": "註冊電子郵件",
+        "license-mismatch": "此授權可能已註冊到其他 Kavita 實例。請重新註冊以修正此問題。",
+        "k+-license-overwrite": "您的授權已註冊到另一個 Kavita 實例。這情況可能發生在您重新安裝 Kavita 時，或極少數情況下因系統更新而導致。請選擇「覆寫」以強制此實例註冊 Kavita+。",
+        "delete-label": "移除授權",
+        "actions-title": "操作",
+        "reset-tooltip": "這將重設 Kavita+ 授權綁定的伺服器實例。需要您的電子郵件和授權金鑰",
+        "delete-tooltip": "這會將授權從 Kavita 移除，停止 Kavita 與 Kavita+ 之間的通訊。此操作不會取消您的訂閱。 若要取消訂閱，請先使用「管理」功能。",
+        "total-subbed-months-label": "總訂閱月數",
+        "overwrite": "覆寫",
+        "k+-already-registered-header": "授權已被註冊",
+        "k+-unlocked": "Kavita+ 已解鎖！"
     },
     "book-line-overlay": {
         "copy": "複製",
@@ -639,7 +622,10 @@
         "go-to-page-prompt": "一共有 {{totalPages}} 頁，您想要跳轉到哪一頁？",
         "table-of-contents-header": "目錄",
         "close-reader": "關閉閱讀器",
-        "loading-book": "正在加載書籍…"
+        "loading-book": "正在加載書籍…",
+        "go-to-first-page": "前往第一頁",
+        "go-to-section-prompt": "共有 {{totalSections}} 個章節。您想前往？",
+        "go-to-section": "前往章節"
     },
     "confirm-email": {
         "username-label": "{{common.username}}",
@@ -675,7 +661,7 @@
     },
     "series-detail": {
         "close": "{{common.close}}",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
         "read": "{{common.read}}",
         "remove-from-want-to-read": "{{actionable.remove-from-want-to-read}}",
         "add-to-want-to-read": "{{actionable.add-to-want-to-read}}",
@@ -708,14 +694,12 @@
         "volume-num": "{{common.volume-num}}",
         "reading-lists-title": "{{side-nav.reading-lists}}",
         "time-to-read-alt": "{{sort-field-pipe.time-to-read}}",
-        "scrobbling-tooltip": "{{settings.scrobbling}}",
+        "scrobbling-tooltip": "{{settings.scrobbling}}: {{value}}",
         "layout-mode-option-card": "卡片",
         "read-options-alt": "閱讀選項",
         "page-settings-title": "頁面設定",
         "layout-mode-option-list": "清單",
         "incognito": "無痕模式",
-        "user-reviews-local": "本地評論",
-        "user-reviews-plus": "外部評論",
         "release-date-title": "發行",
         "publication-status-title": "出版",
         "continue-from": "繼續 {{title}}",
@@ -731,7 +715,9 @@
         "time-left-alt": "剩餘時間",
         "publication-status-tooltip": "出版狀態",
         "continue-incognito": "以無痕模式繼續",
-        "read-incognito": "無痕閱讀"
+        "read-incognito": "無痕閱讀",
+        "on": "{{reader-settings.on}}",
+        "off": "{{reader-settings.off}}"
     },
     "metadata-fields": {
         "collections-title": "{{side-nav.collections}}",
@@ -743,7 +729,7 @@
         "editors-title": "編輯",
         "letterers-title": "字體設計師",
         "translators-title": "翻譯",
-        "pencillers-title": "草圖",
+        "pencillers-title": "草稿師",
         "publishers-title": "出版社",
         "teams-title": "團隊",
         "locations-title": "地點",
@@ -759,7 +745,8 @@
         "close": "{{common.close}}",
         "kavita-tooltip": "您的評分 + 總體評價",
         "kavita-rating-title": "您的評分",
-        "entry-label": "查看詳情"
+        "entry-label": "查看詳情",
+        "critic": "{{review-card.critic}}"
     },
     "update-notification-modal": {
         "close": "{{common.close}}",
@@ -787,7 +774,9 @@
         "more": "更多",
         "donate-tooltip": "您可以通過訂閱 Kavita+ 來移除這個",
         "donate": "捐款",
-        "browse-authors": "瀏覽作者"
+        "browse-people": "瀏覽人物",
+        "edit": "{{common.edit}}",
+        "cancel-edit": "取消調整順序"
     },
     "library-settings-modal": {
         "close": "{{common.close}}",
@@ -824,39 +813,43 @@
         "edit-title": "編輯 {{name}}",
         "add-title": "添加書庫",
         "name-label": "名稱",
-        "type-tooltip": "書庫類型決定了檔案名的解析方式以及UI是否顯示章節（漫畫）或期刊（美漫），查看wiki了解有關書庫類型之間的更多差異。",
+        "type-tooltip": "書庫類型決定了檔案名的解析方式以及UI是否顯示章節（漫畫）或期數（美漫），查看wiki了解有關書庫類型之間的更多差異。",
         "folder-description": "將資料夾新增到您的書庫",
         "help-us-part-1": "請依照 ",
         "manage-reading-list-tooltip": "Kavita 可以用 ComicInfo.xml 或 opf 文件中的 StoryArc、StoryArcNumber 和 AlternativeSeries、AlternativeCount 標籤來創建書單",
         "allow-scrobbling-label": "允許Scrobbling",
         "allow-scrobbling-tooltip": "是否允許Kavita將閱讀事件、想讀狀態、評分和評論記錄至已配置的Scrobble服務提供商？這僅在伺服器具有有效的 Kavita+ 訂閱時才會生效。",
         "folder-watching-tooltip": "覆蓋此書庫的伺服器資料夾監控。如果關閉此功能，則不會監控此書庫包含的資料夾。如果多個書庫共享同一資料夾，那麼這些資料夾仍可能被監控。在每次觸發掃描之前，需等待10分鐘。",
-        "include-in-dashboard-tooltip": "是否應在控制台上包含來自此書庫的系列？這會影響所有清單，例如繼續閱讀、最近更新、最近添加或任何自訂添加。",
+        "include-in-dashboard-tooltip": "是否應將書庫中的系列包含在儀表板上？ 這會影響所有串流，例如「繼續閱讀」、「最近更新」、「最近新增」或任何自訂新增的內容。",
         "force-scan": "強制掃描",
         "next": "下一步",
         "file-type-group-label": "檔案類型",
         "file-type-group-tooltip": "Kavita 應掃描哪些類型的檔案。例如，“壓縮檔”會包含所有 cb*、zip、rar 等檔案。",
         "kavitaplus-eligible-label": "Kavita+資格符合",
-        "kavitaplus-eligible-tooltip": "Kavita+ 是否會拉取資訊或支援 Scrobbling",
-        "include-in-dashboard-label": "顯示在控制台上"
+        "kavitaplus-eligible-tooltip": "支援 Kavita+ 的元資料功能或 Scrobbling",
+        "include-in-dashboard-label": "顯示在儀表板上",
+        "allow-metadata-matching-label": "允許元資料匹配",
+        "allow-metadata-matching-tooltip": "是否允許 Kavita 為此資料庫中的書籍系列下載元資料？此功能僅在伺服器擁有有效的 Kavita+ 訂閱時才會啟用。",
+        "enable-metadata-tooltip": "允許 Kavita 讀取元資料檔案，以覆蓋檔名解析結果。",
+        "enable-metadata-label": "啟用元資料（ComicInfo／EPUB／PDF）"
     },
     "reader-settings": {
-        "font-family-label": "{{user-preferences.font-family-label}}",
-        "font-size-label": "{{user-preferences.font-size-book-label}}",
-        "line-spacing-label": "{{user-preferences.line-height-book-label}}",
-        "margin-label": "{{user-preferences.margin-book-label}}",
-        "reading-direction-label": "{{user-preferences.reading-direction-book-label}}",
-        "writing-style-label": "{{user-preferences.writing-style-label}}",
-        "immersive-mode-label": "{{user-preferences.immersive-mode-label}}",
-        "layout-mode-label": "{{user-preferences.layout-mode-book-label}}",
+        "font-family-label": "{{manage-reading-profiles.font-family-label}}",
+        "font-size-label": "{{manage-reading-profiles.font-size-book-label}}",
+        "line-spacing-label": "{{manage-reading-profiles.line-height-book-label}}",
+        "margin-label": "{{manage-reading-profiles.margin-book-label}}",
+        "reading-direction-label": "{{manage-reading-profiles.reading-direction-book-label}}",
+        "writing-style-label": "{{manage-reading-profiles.writing-style-label}}",
+        "immersive-mode-label": "{{manage-reading-profiles.immersive-mode-label}}",
+        "layout-mode-label": "{{manage-reading-profiles.layout-mode-book-label}}",
         "on": "開",
         "vertical": "縱向",
         "off": "關",
         "right-to-left": "從右到左",
-        "immersive-mode-tooltip": "這將隱藏點擊閱讀器文檔後的選單，然後打開“點擊翻頁”功能",
+        "immersive-mode-tooltip": "這將隱藏點擊閱讀器文檔後的選單，然後打開「點擊翻頁」功能",
         "fullscreen-label": "全螢幕",
         "exit": "退出",
-        "writing-style-tooltip": "更改文字方向。橫向從左到右，縱向從上到下。",
+        "writing-style-tooltip": "變更文字的書寫方向。橫排為由左至右，直排為由上至下。",
         "general-settings-title": "一般設定",
         "reset-to-defaults": "恢復默認",
         "reader-settings-title": "閱讀器設定",
@@ -874,7 +867,15 @@
         "theme-white": "白",
         "theme-paper": "紙",
         "enter": "打開",
-        "layout-mode-option-scroll": "滾動"
+        "layout-mode-option-scroll": "滾動",
+        "update-parent": "儲存到 {{name}}",
+        "create-new-tooltip": "從您目前的隱含設定建立一個可管理的新設定檔",
+        "reading-profile-updated": "閱讀設定已更新",
+        "reading-profile-promoted": "閱讀設定已設為主要",
+        "loading": "載入中",
+        "create-new": "從隱含設定建立新設定檔",
+        "line-spacing-min-label": "1x",
+        "line-spacing-max-label": "2.5x"
     },
     "bookmarks": {
         "title": "{{side-nav.bookmarks}}",
@@ -914,12 +915,14 @@
         "language-title": "{{edit-chapter-modal.language-label}}",
         "format-title": "{{metadata-filter.format-label}}",
         "release-title": "{{sort-field-pipe.release-year}}",
-        "length-title": "{{edit-chapter-modal.words-label}}"
+        "length-title": "{{edit-chapter-modal.words-label}}",
+        "age-rating-title": "{{metadata-fields.age-rating-title}}"
     },
     "related-tab": {
         "reading-lists-title": "{{reading-lists.title}}",
         "collections-title": "{{side-nav.collections}}",
-        "relations-title": "{{tabs.related-tab}}"
+        "relations-title": "{{tabs.related-tab}}",
+        "bookmarks-title": "{{side-nav.bookmarks}}"
     },
     "cover-image-chooser": {
         "reset": "{{common.reset}}",
@@ -941,9 +944,9 @@
         "parent": "{{relationship-pipe.parent}}",
         "description-part-2": "wiki 以獲取提示。",
         "target-series": "目標系列",
-        "description-part-1": "不確定要添加什麼關係？請參閱我們的",
-        "relationship": "關係",
-        "add-relationship": "添加關係"
+        "description-part-1": "不確定要添加什麼關聯？請參閱我們的",
+        "relationship": "關聯性",
+        "add-relationship": "添加關聯性"
     },
     "bulk-add-to-collection": {
         "promoted": "{{common.promoted}}",
@@ -969,10 +972,10 @@
         "description-part-2": "wiki 中找到。",
         "comment-header": "評論",
         "file-header": "檔案",
-        "clear-alerts": "清除警報",
+        "clear-alerts": "清除警示",
         "description-part-1": "這張表格包含了掃描或閱讀媒體時發現的問題。您可以隨時清除它，並使用書庫（強制）掃描來進行分析。有關一些常見錯誤及其含義的列表，可以在 ",
         "created-header": "創建",
-        "no-data": "沒有資料"
+        "no-data": "{{common.no-data}}"
     },
     "manage-email-settings": {
         "reset": "{{common.reset}}",
@@ -985,7 +988,7 @@
         "send-to-warning": "如果您希望“發送至裝置”功能正常運作，您必須完善電子郵件設定",
         "test": "測試",
         "host-name-label": "主機名稱",
-        "host-name-tooltip": "域名（使用反向代理的話）。此項為電子郵件功能所必需。如果沒有反向代理，請使用任意網址。",
+        "host-name-tooltip": "請輸入您反向代理的網域名稱，此項為郵件功能所必須。若未使用反向代理，也可填入任意 URL，如：http://externalip:port/",
         "host-name-validation": "主機名稱必須以 http(s) 開頭，且不能以 / 結尾",
         "host-tooltip": "您電子郵件伺服器的發送／SMTP地址",
         "host-label": "主機",
@@ -1043,7 +1046,7 @@
         "reset-to-default": "{{common.reset-to-default}}",
         "reset": "{{common.reset}}",
         "save": "{{common.save}}",
-        "media-issue-title": "媒體問題",
+        "media-issue-title": "檔案問題",
         "encode-as-description-part-2": "我可以使用WebP嗎？",
         "encode-as-warning": "一旦您將檔案轉換為 WebP/AVIF，將無法再轉換回 PNG。您需要重新整理您的書庫封面以重新生成所有封面。書籤和圖示無法被轉換。",
         "media-warning": "您必須在儲存後，從“任務”標籤中觸發媒體轉換任務。",
@@ -1092,8 +1095,8 @@
         "notice": "注意：",
         "base-url-label": "基礎網址",
         "cache-size-tooltip": "允許用於快取大型 API 的記憶體大小。默認為 75MB。",
-        "on-deck-last-chapter-add-label": "保留於“繼續閱讀”的“最近新增章節”天數",
-        "on-deck-last-progress-label": "保留於“繼續閱讀”的“最近閱讀”天數",
+        "on-deck-last-chapter-add-label": "「繼續閱讀」章節更新逾期（天數）",
+        "on-deck-last-progress-label": "「繼續閱讀」閱讀進度逾期（天數）",
         "send-data": "發送數據",
         "opds-label": "OPDS",
         "max-logs-validation": "您不能擁有超過{{num}}條日誌",
@@ -1104,7 +1107,7 @@
         "min-cache-validation": "至少得有50MB。",
         "max-backup-validation": "您不能擁有超過 {{num}} 個備份",
         "base-url-validation": "基礎網址必須以/開頭，以/收尾",
-        "on-deck-last-chapter-add-tooltip": "最近有新增章節的書籍將自動加入“繼續閱讀”，超過天數沒有新增章節將從“繼續閱讀”中移除。",
+        "on-deck-last-chapter-add-tooltip": "最近有新增章節的書籍將自動加入「繼續閱讀」，超過天數沒有新增章節將從「繼續閱讀」中移除。",
         "folder-watching-label": "資料夾監控",
         "enable-folder-watching": "啟用資料夾監控",
         "opds-tooltip": "若開啟此功能，將允許所有用戶使用 OPDS 從伺服器閱讀和下載內容。",
@@ -1115,9 +1118,9 @@
         "log-label": "日誌保留天數",
         "logging-level-label": "日誌級別",
         "cache-size-label": "快取大小",
-        "base-url-tooltip": "如果您希望在基礎網址上托管 Kavita，例如：yourdomain.com/kavita，請使用此選項。此功能在使用非root使用者的 Docker 環境中不支援。",
+        "base-url-tooltip": "如果您希望在基礎網址上托管 Kavita，例如：yourdomain.com/kavita，請使用此選項。此功能在使用非root用戶的 Docker 環境中不支援。",
         "backup-label": "備份保留天數",
-        "on-deck-last-progress-tooltip": "最近閱讀進度有變動的書籍將自動加入“繼續閱讀”，超過天數未閱讀將從“繼續閱讀”中移除。",
+        "on-deck-last-progress-tooltip": "最近閱讀進度有變動的書籍將自動加入「繼續閱讀」，超過天數未閱讀將從「繼續閱讀」中移除。",
         "folder-watching-tooltip": "允許 Kavita 監控書庫資料夾，以檢測變更，並在變更發生時自動觸發掃描。這使內容能在不手動觸發掃描或等待夜間掃描的情況下更新。掃描觸發前將始終等待 10 分鐘。",
         "min-logs-validation": "您必需至少有一條日誌"
     },
@@ -1133,7 +1136,6 @@
         "last-executed-header": "上次執行時間",
         "clean-up-want-to-read-task-desc": "移除用戶已閱讀完、在“想讀”清單中且出版狀態為“已完成”的系列。每 24 小時運行一次。",
         "check-for-updates-task": "檢查更新",
-        "analyze-files-task": "檔案分析",
         "library-scan-label": "書庫掃描",
         "library-scan-tooltip": "Kavita 要多久掃描並刷新一次書庫文件的元數據。",
         "library-database-backup-label": "Kavita 備份",
@@ -1148,8 +1150,6 @@
         "clear-reading-cache-task-success": "快取已被清除",
         "backup-database-task": "備份數據庫",
         "backup-database-task-desc": "備份數據庫、書籤、主題、手動上傳的封面和配置檔案。",
-        "analyze-files-task-desc": "執行一項長時間運行的任務，分析檔案以生成擴展名和大小。這項任務僅需在 v0.7 版本中執行一次。如果您安裝的版本大於 v0.7，則無需執行此任務。",
-        "analyze-files-task-success": "檔案分析已加入佇列",
         "backup-database-task-success": "備份數據庫的任務已排入佇列",
         "check-for-updates-task-desc": "查看是否有比您當前版本更高的穩定版本發佈。",
         "title": "週期性任務",
@@ -1182,7 +1182,6 @@
         "loading": "{{common.loading}}",
         "edit-user-tooltip": "編輯",
         "invite": "邀請",
-        "admin": "管理員",
         "resend-invite-alt": "重新發送邀請給 {{user}}",
         "username-pattern": "用戶名稱只能包含以下字符與空格：{{characters}}",
         "pending-title": "待處理",
@@ -1208,7 +1207,8 @@
         "name-header": "名稱",
         "roles-header": "權限",
         "too-many-libraries": "很多",
-        "delete-user-alt": "刪除用戶{{user}}"
+        "delete-user-alt": "刪除用戶{{user}}",
+        "all-libraries": "所有書庫"
     },
     "edit-collection-tags": {
         "required-field": "{{validation.required-field}}",
@@ -1229,10 +1229,10 @@
         "source-url-title": "來源網址：",
         "total-series-title": "全部系列：",
         "missing-series-title": "缺失系列：",
-        "promote-tooltip": "推廣意味著該標籤可以在伺服器範圍內被看到，而不僅限於管理員用戶。所有擁有此標籤的系列仍將受到用戶訪問限制。",
+        "promote-tooltip": "「推廣」 指的是該標籤將對伺服器上的所有使用者可見，而不僅限於管理員帳戶。即使標籤被推廣，所有帶有此標籤的系列仍然會受到使用者存取限制的約束。",
         "promote-label": "推廣",
         "title": "編輯 {{collectionName}} 收藏",
-        "last-sync-tooltip": "Kavita syncs 日复一日,反对上游收集者."
+        "last-sync-tooltip": "Kavita 每天都會與上游内容提供商同步資料。"
     },
     "library-recommended": {
         "on-deck": "{{dashboard.on-deck-title}}",
@@ -1244,9 +1244,9 @@
         "highly-rated": "高評價"
     },
     "settings": {
-        "kavitaplus-section-title": "{{settings.admin-kavitaplus}}",
+        "kavitaplus-section-title": "Kavita+",
         "admin-logs": "日誌",
-        "admin-media-issues": "媒體問題",
+        "admin-media-issues": "檔案問題",
         "admin-email": "電子郵件",
         "admin-tasks": "任務",
         "theme": "主題",
@@ -1257,7 +1257,7 @@
         "server-section-title": "伺服器",
         "admin-libraries": "書庫",
         "admin-system": "系統",
-        "admin-kavitaplus": "Kavita+",
+        "admin-kavitaplus": "授權",
         "mal-stack-import": "MAL Stack",
         "account-section-title": "帳戶",
         "admin-statistics": "統計",
@@ -1269,7 +1269,13 @@
         "scrobbling": "Scrobbling",
         "customize": "自訂",
         "cbl-import": "CBL 書單",
-        "info-section-title": "資訊"
+        "info-section-title": "資訊",
+        "reading-profiles": "閱讀設定檔",
+        "admin-manage-tokens": "管理用戶憑證",
+        "scrobble-holds": "暫停 Scrobble",
+        "admin-email-history": "電子郵件紀錄",
+        "admin-metadata": "管理元資料",
+        "admin-matched-metadata": "匹配的元資料"
     },
     "collection-detail": {
         "item-count": "{{common.item-count}}",
@@ -1296,15 +1302,17 @@
     },
     "reading-list-item": {
         "remove": "{{common.remove}}",
-        "read": "{{common.read}}"
+        "read": "{{common.read}}",
+        "released-label": "發布日期：{{date}}"
     },
     "stream-list-item": {
         "remove": "{{common.remove}}",
         "external-source": "外部來源",
         "provided": "已提供的",
-        "smart-filter": "智慧篩選",
+        "smart-filter": "智慧篩選器",
         "library": "書庫",
-        "load-filter": "載入篩選器"
+        "load-filter": "載入篩選器",
+        "delete": "{{common.delete}}"
     },
     "reading-list-detail": {
         "item-count": "{{common.item-count}}",
@@ -1316,7 +1324,19 @@
         "remove-read": "移除已閱讀",
         "continue": "繼續閱讀",
         "no-data": "未添加任何項目",
-        "incognito-alt": "（無痕模式）"
+        "incognito-alt": "（無痕模式）",
+        "cover-artists-title": "{{metadata-fields.cover-artists-title}}",
+        "details-tab": "{{series-detail.details-tab}}",
+        "publishers-title": "{{metadata-fields.publishers-title}}",
+        "storyline-tab": "{{series-detail.storyline-tab}}",
+        "more-alt": "{{series-detail.more-alt}}",
+        "writers-title": "{{metadata-fields.writers-title}}",
+        "edit-alt": "{{common.edit}}",
+        "items-title": "項目",
+        "date-range-title": "日期範圍",
+        "edit-label": "編輯模式",
+        "reorder-alt": "重新排序項目",
+        "dnd-warning": "在行動裝置上或當書單超過 100 項時，將無法使用拖放功能。"
     },
     "events-widget": {
         "close": "{{common.close}}",
@@ -1358,7 +1378,7 @@
     },
     "nav-header": {
         "help": "{{common.help}}",
-        "all-filters": "智慧篩選",
+        "all-filters": "智慧篩選器",
         "close": "{{common.close}}",
         "search-series-alt": "搜尋系列",
         "search-alt": "搜尋…",
@@ -1369,7 +1389,10 @@
         "skip-alt": "跳轉至主要內容",
         "no-data": "未找到結果",
         "announcements": "公告",
-        "nav-link-header": "導航選項"
+        "nav-link-header": "導航選項",
+        "browse-genres": "瀏覽類型",
+        "browse-tags": "瀏覽標籤",
+        "person-aka-status": "匹配到別名"
     },
     "promoted-icon": {
         "promoted": "{{common.promoted}}"
@@ -1422,7 +1445,7 @@
     },
     "import-cbl-modal": {
         "close": "{{common.close}}",
-        "cbl-repo": "您可以在社群repo中找到更多書單。",
+        "cbl-repo": "您可以在社群repository中找到更多書單。",
         "validate-warning": "CBL 檔案存在問題，匯入已停止。請修正這些問題後再試一次。",
         "import-description": "請先匯入一個 .cbl 檔案，Kavita 將在匯入之前進行多項檢查，某些步驟可能會因檔案問題而停止進行。",
         "validate-no-issue-description": "未發現 CBL 問題，請按“下一步”。",
@@ -1441,16 +1464,15 @@
         "help-label": "{{common.help}}"
     },
     "manga-reader": {
-        "auto-close-menu-label": "{{user-preferences.auto-close-menu-label}}",
-        "emulate-comic-book-label": "{{user-preferences.emulate-comic-book-label}}",
+        "auto-close-menu-label": "{{manage-reading-profiles.auto-close-menu-label}}",
+        "emulate-comic-book-label": "{{manage-reading-profiles.emulate-comic-book-label}}",
         "series-progress": "系列進度：{{percentage}}",
         "back": "返回",
-        "save-globally": "全域儲存",
         "left-to-right-alt": "從左到右",
-        "reading-direction-tooltip": "閱讀方向： ",
+        "reading-direction-tooltip": "翻頁方向： ",
         "reading-mode-tooltip": "閱讀模式",
         "width": "寬度",
-        "off": "關",
+        "off": "{{reader-settings.off}}",
         "original": "原始大小",
         "enable-comic-book-label": "模擬漫畫書",
         "width-override-label": "寬度控制",
@@ -1466,7 +1488,6 @@
         "next-page-tooltip": "下一頁",
         "unbookmark-page-tooltip": "移除書籤",
         "bookmarks-title": "書籤",
-        "user-preferences-updated": "使用者偏好更新",
         "height": "高度",
         "shortcuts-menu-alt": "鍵盤快捷鍵視窗",
         "incognito-title": "無痕模式：",
@@ -1479,7 +1500,13 @@
         "fullscreen": "全螢幕",
         "image-scaling-label": "圖片縮放",
         "no-next-chapter": "已經到最後了",
-        "incognito-alt": "無痕模式已開啟，點擊以關閉。"
+        "incognito-alt": "無痕模式已開啟，點擊以關閉。",
+        "update-parent": "{{reader-settings.update-parent}}",
+        "create-new-tooltip": "{{reader-settings.create-new-tooltip}}",
+        "loading": "{{reader-settings.loading}}",
+        "create-new": "{{reader-settings.create-new}}",
+        "reading-profile-updated": "閱讀設定已更新",
+        "reading-profile-promoted": "閱讀設定檔已推廣"
     },
     "metadata-filter": {
         "filter-title": "{{common.filter}}",
@@ -1500,7 +1527,7 @@
         "publisher-label": "出版社",
         "cover-artist-label": "封面藝術家",
         "writer-label": "作者",
-        "penciller-label": "線稿師",
+        "penciller-label": "草稿師",
         "inker-label": "勾線師",
         "read": "已讀",
         "series-name-tooltip": "系列名稱將依據名稱、排序名稱或本地化名稱進行篩選",
@@ -1661,8 +1688,8 @@
         "cover-image-tab": "{{tabs.cover-tab}}",
         "tasks-tab": "{{tabs.tasks-tab}}",
         "info-tab": "{{tabs.info-tab}}",
-        "pages-label": "{{edit-chapter-modal.pages-count}}",
-        "words-label": "{{edit-chapter-modal.length-title}}",
+        "pages-label": "{{edit-chapter-modal.pages-label}}",
+        "words-label": "{{edit-chapter-modal.words-label}}",
         "pages-count": "{{edit-chapter-modal.pages-count}}",
         "words-count": "{{edit-chapter-modal.words-count}}",
         "reading-time-label": "{{edit-chapter-modal.reading-time-label}}",
@@ -1781,36 +1808,38 @@
         "invalid-confirmation-url": "無效的確認網址"
     },
     "customize-dashboard-modal": {
-        "title-smart-filters": "智慧篩選",
+        "title-smart-filters": "智慧篩選器",
         "close": "{{common.close}}",
-        "smart-filters": "智慧篩選",
+        "smart-filters": "智慧篩選器",
         "help": "{{common.help}}",
         "external-sources": "外部來源",
         "title-external-sources": "外部來源",
-        "title-dashboard": "自訂控制台",
-        "title-sidenav": "自訂側邊欄",
-        "sidenav": "側邊欄",
-        "dashboard": "控制台"
+        "title-dashboard": "自訂儀表板",
+        "title-sidenav": "自訂側邊導覽列",
+        "sidenav": "側邊導覽列",
+        "dashboard": "儀表板",
+        "description": "您可以透過重新排序、切換可見性，以及將智慧篩選器／外部來源綁定到首頁或側邊導覽列，來自訂 Kavita 的各個方面。"
     },
     "customize-dashboard-streams": {
         "save": "{{common.save}}",
         "add": "{{common.add}}",
         "filter": "{{common.filter}}",
         "clear": "{{common.clear}}",
-        "no-data": "所有智慧篩選已添加到控制台，或尚未創建任何篩選。"
+        "no-data": "所有智慧篩選器都已新增至儀表板，或者尚未建立任何篩選器。",
+        "smart-filter-title": "{{customize-dashboard-modal.title-smart-filters}}"
     },
     "customize-sidenav-streams": {
         "save": "{{common.save}}",
         "add": "{{common.add}}",
         "filter": "{{common.filter}}",
         "clear": "{{common.clear}}",
-        "smart-filters-title": "智慧篩選",
+        "smart-filters-title": "智慧篩選器",
         "external-sources-title": "{{customize-dashboard-modal.external-sources}}",
-        "reorder-when-filter-present": "You cannot reorder items via drag & drop while a filter is present. Use {{customize-sidenav-streams.order-numbers-label}}",
+        "reorder-when-filter-present": "當有篩選器存在時，您無法透過拖曳來重新排序項目。請使用「{{customize-sidenav-streams.order-numbers-label}}」來排序",
         "order-numbers-label": "{{reading-list-detail.order-numbers-label}}",
         "bulk-mode-label": "批量選擇",
-        "no-data-external-source": "所有外部來源已添加到側邊欄，或尚未創建任何來源。",
-        "no-data": "所有智慧篩選已加入側邊欄，或尚未創建任何篩選。"
+        "no-data-external-source": "所有外部來源已添加到側邊導覽列，或尚未創建任何來源。",
+        "no-data": "所有智慧篩選器已加入側邊導覽列，或尚未創建任何篩選器。"
     },
     "manage-external-sources": {
         "clear": "{{common.clear}}",
@@ -1825,7 +1854,15 @@
         "filter": "{{common.filter}}",
         "clear": "{{common.clear}}",
         "errored": "篩選器中存在編碼錯誤的，您需要重新創建它。",
-        "no-data": "尚未建立智慧篩選"
+        "no-data": "尚未建立智慧篩選器",
+        "edit": "{{common.edit}}",
+        "save": "{{common.save}}",
+        "edit-smart-filter": "編輯 {{name}}",
+        "name-label": "名稱",
+        "cancel": "{{common.cancel}}",
+        "filter-name-unique": "智慧篩選器名稱必須唯一",
+        "close": "{{common.close}}",
+        "required-field": "智慧篩選器需要一個名稱"
     },
     "edit-external-source-item": {
         "save": "{{common.save}}",
@@ -1850,7 +1887,7 @@
         "reading-lists": "{{side-nav.reading-lists}}",
         "bookmarks": "{{side-nav.bookmarks}}",
         "all-series": "{{side-nav.all-series}}",
-        "browse-authors": "{{side-nav.browse-authors}}"
+        "browse-authors": "{{side-nav.browse-people}}"
     },
     "filter-field-pipe": {
         "age-rating": "{{metadata-fields.age-rating-title}}",
@@ -1880,7 +1917,7 @@
         "translators": "翻譯",
         "user-rating": "用戶評分",
         "file-path": "檔案路徑",
-        "penciller": "線稿師",
+        "penciller": "草稿師",
         "languages": "語言",
         "path": "路徑",
         "libraries": "書庫",
@@ -1898,8 +1935,8 @@
         "download-tooltip": "下載至裝置",
         "scan-library": "掃描書庫",
         "import-mal-stack": "匯入 MAL Stack",
-        "remove-from-on-deck-tooltip": "從“繼續閱讀”中移除系列",
-        "remove-from-on-deck": "從“繼續閱讀”中移除",
+        "remove-from-on-deck-tooltip": "從「繼續閱讀」中移除系列",
+        "remove-from-on-deck": "從「繼續閱讀」中移除",
         "customize": "自訂",
         "import-cbl-tooltip": "從 CBL 檔建立書單",
         "import-cbl": "匯入CBL",
@@ -1950,7 +1987,19 @@
         "details-tooltip": "TODO",
         "view-series": "查看系列",
         "read": "閱讀",
-        "view-series-tooltip": "TODO"
+        "view-series-tooltip": "TODO",
+        "reading-profiles": "閱讀設定檔",
+        "set-reading-profile": "設定閱讀偏好",
+        "set-reading-profile-tooltip": "將閱讀設定綁定到此書庫",
+        "reorder": "重新排序",
+        "merge": "合併",
+        "cleared-profile": "清除閱讀設定",
+        "match": "匹配",
+        "match-tooltip": "手動將系列與 Kavita+ 匹配",
+        "rename": "重新命名",
+        "clear-reading-profile-tooltip": "清除此書庫的閱讀設定",
+        "clear-reading-profile": "清除閱讀設定",
+        "rename-tooltip": "重新命名智能篩選器"
     },
     "common": {
         "volume-num": "卷",
@@ -1960,7 +2009,7 @@
         "issue-hash-num": "期＃",
         "book-nums": "書籍",
         "chapter-nums": "章節",
-        "issue-nums": "期刊",
+        "issue-nums": "期數",
         "read": "閱讀",
         "clear": "清空",
         "filter": "篩選",
@@ -1991,7 +2040,10 @@
         "add": "新增",
         "select-all": "全選",
         "chapter-num": "章",
-        "author-count": "{{num}}位作者"
+        "author-count": "{{num}}位作者",
+        "issue-count": "{{num}} 期",
+        "chapter-count": "{{num}} 章",
+        "no-data": "無資料"
     },
     "download-indicator": {
         "progress": "{{percentage}}%已下載"
@@ -2017,35 +2069,34 @@
         "delete-device": "您確定要刪除該裝置嗎？",
         "device-updated": "裝置已更新",
         "device-created": "裝置已創建",
-        "k+-delete-key": "這將僅刪除 Kavita 的授權金鑰並允許顯示購買連結。這不會取消您的訂閱！僅在支援指示下使用此功能！",
+        "k+-delete-key": "這將僅刪除 Kavita 的授權金鑰並允許顯示購買連結。 這不會取消您的訂閱！ 僅在支援指示下使用此功能！請先使用「管理」功能取消訂閱。",
         "stack-imported": "Stack 已匯入",
         "reading-list-imported": "書單已匯入",
         "list-doesnt-exist": "此列表不存在",
         "reading-list-updated": "已更新書單",
         "reset-base-url": "基礎網址重設",
         "file-send-to": "檔案已透過郵件發送給{{name}}",
-        "k+-license-saved": "授權密鑰已保存，但目前尚未生效。點擊檢查以重新驗證訂閱資訊，首次註冊可能需要一些時間。",
+        "k+-license-saved": "授權金鑰已保存，但目前尚未生效。點擊檢查以重新驗證訂閱資訊，首次註冊可能需要一些時間。",
         "theme-missing": "當前主題已不存在，請刷新頁面。",
         "email-not-sent": "記錄的電子郵件不是有效的電子郵件，無法發送。相關連結已記錄在日誌中。管理員可以提供此連結以完成流程。",
-        "k+-unlocked": "Kavita+ 已解鎖！",
         "k+-reset-key": "這會使之前您授權的註冊無效，並允許您重新註冊 Kavita。",
         "k+-reset-key-success": "您的授權已取消註冊。請使用編輯按鈕重新註冊您的實例並重新啟用 Kavita+",
         "forced-scan-queued": "已開始強制掃描{{name}}",
         "change-email-no-email": "電子郵件已更新",
         "confirm-library-type-change": "更改書庫類型將觸發新的掃描，並使用不同的解析規則，這可能導致系列重新創建，因此您可能會丟失進度和書籤。您應該在這之前備份資料。您確定要繼續嗎？",
-        "smart-filter-deleted": "智慧篩選已刪除",
+        "smart-filter-deleted": "智慧篩選器已刪除",
         "confirm-delete-volume": "您確定要刪除這卷嗎？這不會修改硬碟上的檔案。",
         "reading-list-promoted": "書單已推廣",
         "reading-list-unpromoted": "書單已取消推廣",
         "confirm-delete-theme": "移除此主題將從硬碟中刪除它。在移除之前，您可以從臨時目錄中獲取它",
-        "mal-token-required": "需要 MAL 令牌，請在用戶設定中配置",
+        "mal-token-required": "需要 MAL 授權憑證，請在用戶設定中配置",
         "chapter-deleted": "章節已刪除",
         "volume-deleted": "卷已刪除",
         "regen-cover": "已將重新生成封面圖片的任務加入佇列",
         "reading-list-deleted": "已刪除書單",
         "library-deleted": "已將書庫 {{name}}移除",
         "library-created": "書庫創建成功，已開始掃描。",
-        "smart-filter-updated": "已創建/更新智慧篩選",
+        "smart-filter-updated": "已創建/更新智慧篩選器",
         "no-next-chapter": "找不到下一個{{entity}}",
         "refresh-covers-queued": "{{name}}的封面更新正在佇列中",
         "account-migration-complete": "帳戶遷移完成",
@@ -2068,11 +2119,11 @@
         "load-prev-chapter": "上一個 {{entity}} 已加載",
         "confirm-delete-user": "您確定要刪除此用戶嗎？",
         "confirm-delete-multiple-series": "您確定要刪除{{count}}個系列嗎？這不會修改硬碟上的檔案。",
-        "anilist-token-updated": "已更新 AniList 令牌",
-        "confirm-delete-smart-filter": "您確定要刪除此智慧篩選？",
+        "anilist-token-updated": "已更新 AniList 授權憑證",
+        "confirm-delete-smart-filter": "您確定要刪除此智慧篩選器？",
         "copied-to-clipboard": "已複製到剪貼簿",
         "confirm-library-delete": "您確定要刪除“{{name}}”嗎？此操作無法撤銷。",
-        "anilist-token-expired": "您的 AniList 令牌已過期。在您於用戶設定 > 帳戶中重新生成之前，將無法處理紀錄功能",
+        "anilist-token-expired": "您的 AniList 授權憑證已過期。在您於「用戶設定」>「帳戶」中重新生成之前，將無法處理紀錄功能",
         "confirm-delete-reading-list": "您確定要刪除書單嗎？此操作無法撤銷。",
         "select-files-warning": "您需要先選擇文件才能繼續操作",
         "entity-read": "{{name}}已標記為已讀",
@@ -2102,7 +2153,7 @@
         "email-sent-to-no-existing": "現有的電子郵件無效。相關連結已記錄在日誌中。請向管理員索取該連結以完成電子郵件變更。",
         "age-restriction-updated": "年齡限制已更新",
         "alert-bad-theme": "主題中有無效或不安全的CSS。請聯繫管理員進行修正，系統將預設為深色主題。",
-        "confirm-regen-covers": "刷新封面將強制重新計算所有封面圖像。這是一個高負載的操作。您確定要執行此操作，而不是使用掃描代替嗎？",
+        "confirm-regen-covers": "刷新封面將強制重新計算所有封面圖片。這是一個高負載的操作。您確定要執行此操作，而不是使用掃描代替嗎？",
         "delete-review": "您確定要刪除您的評論嗎？",
         "generate-colorscape-queued": "為{{name}}生成色彩主題已加入佇列",
         "confirm-delete-chapter": "您確定要刪除這個章節嗎？這不會修改硬碟上的檔案。",
@@ -2110,16 +2161,22 @@
         "must-select-library": "必須至少選擇一個書庫",
         "bulk-scan": "掃描多個書庫將以線性方式進行，依照書庫的大小，這可能需要很長的時間也有可能無法完成。",
         "bulk-covers": "刷新多個書庫的封面，是一項繁重的工作，可能需要很長時間，您確定要繼續嗎？",
-        "person-image-downloaded": "个人资料被下载和应用.",
-        "confirm-delete-multiple-chapters": "您確定要刪除 {{count}} 章/卷嗎？它不會修改磁碟上的檔案。"
+        "person-image-downloaded": "已下載人物封面並套用。",
+        "confirm-delete-multiple-chapters": "您確定要刪除 {{count}} 章節／卷嗎？這不會修改硬碟上的檔案。",
+        "bulk-delete-libraries": "您確定要刪除 {{count}} 個書庫嗎？",
+        "confirm-delete-multiple-volumes": "您確定要刪除 {{count}} 個卷嗎？這不會修改磁碟上的檔案。",
+        "series-bound-to-reading-profile": "系列已綁定至閱讀設定 {{name}}",
+        "library-bound-to-reading-profile": "書庫已綁定至閱讀設定 {{name}}",
+        "scrobble-gen-init": "已將任務排入隊列，以根據過去的閱讀記錄和評分產生 scrobble 事件，並同步到已連接的服務。",
+        "series-added-want-to-read": "系列已加入「想讀」",
+        "webtoon-override": "偵測到圖片為條漫風格，正在切換到條漫模式。",
+        "external-match-rate-error": "Kavita 查詢 {{seriesName}} 時，已超出查詢頻率限制。請於 5 分鐘後再試。",
+        "match-success": "系列匹配正確"
     },
     "changelog": {
         "installed": "已安裝",
         "available": "可用",
-        "description": "如果您沒有看到 {{installed}}",
-        "description-continued": "標籤：您當前正在使用夜間版本。只有主要版本會顯示為可用。當您使用該穩定版本的夜間版本時，會顯示夜間標籤。",
         "download": "下載",
-        "published-label": "已發佈： ",
         "nightly": "夜間版本： {{version}}"
     },
     "table-of-contents": {
@@ -2130,7 +2187,7 @@
         "collection-created-label": "創建者：{{owner}}"
     },
     "tabs": {
-        "smart-filters-tab": "智慧篩選",
+        "smart-filters-tab": "智慧篩選器",
         "account-tab": "帳戶",
         "volumes-tab": "卷",
         "specials-tab": "特集",
@@ -2183,7 +2240,8 @@
     },
     "card-detail-layout": {
         "total-items": "共 {{count}} 項",
-        "jumpkey-count": "{{count}} 個系列"
+        "jumpkey-count": "{{count}} 個系列",
+        "no-data": "{{common.no-data}}"
     },
     "read-more": {
         "read-less": "收起",
@@ -2264,7 +2322,10 @@
         "release-year": "發行年份",
         "random": "隨機",
         "read-progress": "最近閱讀",
-        "average-rating": "平均評分"
+        "average-rating": "平均評分",
+        "person-name": "名稱",
+        "person-series-count": "系列數",
+        "person-chapter-count": "章數"
     },
     "manage-system": {
         "version-title": "版本",
@@ -2345,15 +2406,19 @@
         "title": "Kavita+ 元數據分析",
         "completed-series-label": "已完成的系列",
         "complete": "所有系列都有元數據",
-        "no-data": "沒有資料"
+        "no-data": "{{common.no-data}}"
     },
     "next-expected-card": {
         "title": "~{{date}}",
         "upcoming-title": "即將推出"
     },
     "confirm": {
-        "alert": "警報",
-        "confirm": "確認"
+        "alert": "警示",
+        "confirm": "確認",
+        "cancel": "{{common.cancel}}",
+        "ok": "確定",
+        "info": "訊息",
+        "prompt": "問題"
     },
     "day-breakdown": {
         "no-data": "尚未有進度，快來開始閱讀",
@@ -2383,7 +2448,10 @@
         "known-for-title": "代表作品",
         "individual-role-title": "作為{{role}}",
         "browse-person-title": "{{name}}的所有作品",
-        "browse-person-by-role-title": "{{name}}作為{{role}}的所有作品"
+        "browse-person-by-role-title": "{{name}}作為{{role}}的所有作品",
+        "anilist-url": "{{edit-person-modal.anilist-tooltip}}",
+        "no-info": "尚無此人物的相關資訊",
+        "aka-title": "又名 "
     },
     "edit-person-modal": {
         "save": "{{common.save}}",
@@ -2406,11 +2474,344 @@
         "hardcover-tooltip": "https://hardcover.app/authors/{HardcoverId}",
         "download-coversdb": "從 CoversDB 下載",
         "asin-tooltip": "https://www.amazon.com/stores/J.K.-Rowling/author/{ASIN}",
-        "cover-image-description-extra": "或者,你可以从覆盖面下载一个封面。 如果有的话,可资利用的亚洲开发银行."
+        "cover-image-description-extra": "或者，您可以從 CoversDB 下載封面（如果有）。",
+        "alias-overlap": "此別名已指向其他人物，或者與此人的姓名相同，建議考慮合併資料。",
+        "aliases-tooltip": "當一個系列被標記為某個人的別名時，系統會將該系列歸屬於現有的人物，而不是建立一個新人物。刪除別名後，您需要重新掃描該系列，變更才會生效。",
+        "aliases-label": "編輯別名",
+        "aliases-tab": "別名"
     },
-    "browse-authors": {
-        "title": "瀏覽作者／作家",
+    "reviews": {
+        "user-reviews-local": "本地評論",
+        "user-reviews-plus": "外部評論"
+    },
+    "review-modal": {
+        "title": "編輯評論",
+        "review-label": "評論",
+        "close": "{{common.close}}",
+        "save": "{{common.save}}",
+        "delete": "{{common.delete}}",
+        "min-length": "評論至少需要 {{count}} 個字元",
+        "required": "{{validation.required-field}}"
+    },
+    "manage-reading-profiles": {
+        "wiki-title": "wiki",
+        "no-selected": "未選擇設定檔",
+        "confirm": "您是否確定要刪除名為「{{name}}」的閱讀設定檔？",
+        "image-reader-settings-title": "圖片閱讀器",
+        "reading-direction-label": "翻頁方向",
+        "scaling-option-label": "縮放選項",
+        "scaling-option-tooltip": "如何將影像縮放到螢幕大小。",
+        "page-splitting-label": "頁面分割",
+        "reading-mode-label": "閱讀模式",
+        "reading-mode-tooltip": "將閱讀器更改為縱向翻頁、橫向翻頁，或設置為無限滾動",
+        "layout-mode-label": "排版模式",
+        "background-color-tooltip": "圖片閱讀器的背景顏色",
+        "layout-mode-tooltip": "將單個影像或兩個並排影像顯示到螢幕上",
+        "background-color-label": "背景顏色",
+        "auto-close-menu-label": "自動關閉選單",
+        "auto-close-menu-tooltip": "選單是否應自動關閉",
+        "show-screen-hints-label": "顯示螢幕提示",
+        "emulate-comic-book-label": "模擬書籍效果",
+        "swipe-to-paginate-tooltip": "是否允許透過滑動螢幕來翻到上一頁或下一頁",
+        "profiles-title": "您的閱讀設定檔",
+        "add-tooltip": "您的設定檔將在變更後儲存",
+        "make-default": "設為預設",
+        "default-profile": "預設",
+        "add": "{{common.add}}",
+        "swipe-to-paginate-label": "使用滑動手勢翻頁",
+        "width-override-tooltip": "覆寫閱讀器中圖片的寬度",
+        "reading-direction-tooltip": "點擊畫面哪個方向會翻到下一頁。「由右至左」意味著您單擊屏幕左側以移至下一頁。",
+        "page-splitting-tooltip": "如何拆分全寬圖片（即左右影像合併）",
+        "show-screen-hints-tooltip": "顯示一個覆蓋層，以幫助理解翻頁區域和方向",
+        "extra-tip": "您可以透過系列或書庫的操作選單，或是批次方式來指派閱讀設定檔。當您在閱讀器中變更設定時，系統會自動為該系列建立一個隱藏的設定檔，用來記住您的偏好（不適用於 PDF）。當您自行為該系列指派一個閱讀設定檔後，這個隱藏設定檔會被移除。更多資訊請參考",
+        "description": "由於不同系列可能需要不同的閱讀方式，建議您針對每個書庫或系列建立個別的閱讀設定檔，確保閱讀體驗一致且順暢。",
+        "selection-tip": "從清單中選擇，或點擊右上角建立新的設定檔",
+        "emulate-comic-book-tooltip": "套用陰影效果，以模擬實體書籍",
+        "width-override-label": "{{manga-reader.width-override-label}}",
+        "reset": "{{common.reset}}",
+        "delete": "{{common.delete}}",
+        "disable-width-override-label": "停用寬度覆寫",
+        "allow-auto-webtoon-reader-label": "自動條漫閱讀模式",
+        "tap-to-paginate-tooltip": "書籍閱讀器螢幕兩側是否允許點擊，以切換到上一頁或下一頁",
+        "tap-to-paginate-label": "點擊翻頁",
+        "color-theme-book-label": "顏色主題",
+        "layout-mode-book-label": "排版模式",
+        "layout-mode-book-tooltip": "選擇內容的顯示方式。「捲動」會依書籍原始排版顯示；「單欄」或「雙欄」會根據裝置高度調整，一頁顯示一或兩欄文字",
+        "line-height-book-label": "行距",
+        "line-height-book-tooltip": "書籍中行與行之間的間距大小",
+        "font-size-book-tooltip": "套用於書籍字體的縮放百分比",
+        "pdf-theme-label": "主題",
+        "pdf-scroll-mode-tooltip": "設定您瀏覽頁面的方式。可選擇垂直／水平捲動，或點擊翻頁（不捲動）",
+        "pdf-spread-mode-label": "跨頁模式",
+        "pdf-theme-tooltip": "閱讀器的顏色主題",
+        "allow-auto-webtoon-reader-tooltip": "如果頁面看起來像條漫，則會自動切換到條漫閱讀模式。可能會有誤判的情況發生。",
+        "immersive-mode-tooltip": "啟用後，點擊閱讀頁面時會隱藏選單，並開啟點擊翻頁功能",
+        "pdf-scroll-mode-label": "捲動模式",
+        "pdf-reader-settings-title": "PDF 閱讀器",
+        "pdf-spread-mode-tooltip": "選擇頁面顯示方式。可單頁顯示，或雙頁對開（奇數跨頁／偶數跨頁）",
+        "reading-profile-library-settings-title": "書庫",
+        "reading-profile-series-settings-title": "系列",
+        "disable-width-override-tooltip": "當您的螢幕寬度達到或小於所設定的中斷點時，防止寬度覆寫生效",
+        "book-reader-settings-title": "書籍閱讀器",
+        "immersive-mode-label": "沉浸模式",
+        "reading-direction-book-label": "翻頁方向",
+        "reading-direction-book-tooltip": "點擊畫面哪個方向會翻到下一頁。「由右至左」意味著您單擊屏幕左側以移至下一頁。",
+        "font-family-label": "字型",
+        "font-family-tooltip": "選擇要使用的字型。若選擇「Default」，將採用書籍內建字型",
+        "writing-style-label": "書寫方向",
+        "writing-style-tooltip": "變更文字的書寫方向。橫排為由左至右，直排為由上至下。",
+        "color-theme-book-tooltip": "設定要應用於書籍閱讀器內容和選單的顏色主題",
+        "font-size-book-label": "字體大小",
+        "margin-book-tooltip": "設定螢幕左右兩側的間距大小。但在行動裝置上，不管設定為多少，間距都會被強制設為 0。",
+        "margin-book-label": "邊距"
+    },
+    "manage-matched-metadata": {
+        "matched-state-label": "匹配狀態",
+        "library-type": "書庫類型",
+        "unmatched-status-label": "未匹配",
+        "blacklist-status-label": "需手動匹配",
+        "title": "已匹配的元資料",
+        "description": "這裡會列出所有可以匹配外部元資料的書籍系列。Kavita 每天會自動預取或更新系列資料，每 24 小時最多處理 50 個系列。",
+        "status-header": "狀態",
+        "dont-match-status-label": "{{dont-match-label}}",
+        "all-status-label": "全部狀態",
+        "dont-match-label": "不匹配",
+        "no-data": "{{common.no-data}}",
+        "match-alt": "匹配 {{seriesName}}",
+        "library-name-header": "書庫",
+        "actions-header": "操作",
+        "series-name-header": "系列",
+        "valid-until-header": "下次重新整理",
+        "matched-status-label": "已匹配"
+    },
+    "browse-people": {
+        "series-count": "{{common.series-count}}",
+        "roles-label": "角色",
+        "sort-label": "排序",
+        "issue-count-label": "作品數",
+        "series-count-label": "系列數",
+        "title": "瀏覽人物",
         "author-count": "{{num}} 人",
-        "cover-image-description": "{{edit-series-modal.cover-image-description}}"
+        "cover-image-description": "{{edit-series-modal.cover-image-description}}",
+        "issue-count": "{{common.issue-count}}",
+        "name-label": "名稱"
+    },
+    "browse-genres": {
+        "series-count": "{{common.series-count}}",
+        "issue-count": "{{common.issue-count}}",
+        "title": "瀏覽類型",
+        "genre-count": "{{num}} 種類型"
+    },
+    "browse-tags": {
+        "series-count": "{{common.series-count}}",
+        "issue-count": "{{common.issue-count}}",
+        "title": "瀏覽標籤",
+        "genre-count": "{{num}} 個標籤"
+    },
+    "bulk-set-reading-profile-modal": {
+        "loading": "{{common.loading}}",
+        "close": "{{common.close}}",
+        "clear": "{{common.clear}}",
+        "create": "{{common.create}}",
+        "filter-label": "{{common.filter}}",
+        "no-data": "尚未建立收藏",
+        "title": "閱讀設定",
+        "bound": "綁定"
+    },
+    "metadata-setting-field-pipe": {
+        "people": "{{tabs.people-tab}}",
+        "summary": "{{filter-field-pipe.summary}}",
+        "start-date": "{{manage-metadata-settings.enable-start-date-label}}",
+        "genres": "{{metadata-fields.genres-title}}",
+        "publication-status": "{{edit-series-modal.publication-status-title}}",
+        "tags": "{{metadata-fields.tags-title}}",
+        "localized-name": "{{edit-series-modal.localized-name-label}}",
+        "age-rating": "{{metadata-fields.age-rating-title}}",
+        "covers": "封面",
+        "chapter-title": "章節標題",
+        "chapter-covers": "章節封面",
+        "chapter-publisher": "章節{{person-role-pipe.publisher}}",
+        "chapter-release-date": "章節發行日期",
+        "chapter-summary": "章節摘要"
+    },
+    "manage-metadata-settings": {
+        "enable-start-date-tooltip": "允許將系列的開始日期寫入系列資訊",
+        "whitelist-label": "白名單標籤",
+        "age-rating-mapping-title": "年齡分級對應",
+        "blacklist-tooltip": "清單中的任何項目都將從類型和標籤處理中移除。您可以在此處新增不想寫入的類型／標籤。請確保它們以逗號分隔。",
+        "enable-chapter-summary-label": "{{manage-metadata-settings.summary-label}}",
+        "enable-chapter-title-label": "標題",
+        "localized-name-tooltip": "允許在欄位解鎖時寫入譯名。Kavita 會盡力做出最佳判斷。",
+        "enable-chapter-release-date-tooltip": "允許寫入章節／期數的發行日期",
+        "enable-chapter-publisher-tooltip": "允許寫入章節／期數的出版社",
+        "enable-chapter-summary-tooltip": "{{manage-metadata-settings.summary-tooltip}}",
+        "enable-chapter-publisher-label": "出版社",
+        "enable-chapter-cover-tooltip": "允許設定章節／期數的封面",
+        "enable-chapter-cover-label": "章節封面",
+        "description": "Kavita+ 具備下載並將部分元資料寫入資料庫的功能。此頁面可讓您切換哪些內容在啟用範圍內。",
+        "enabled-label": "啟用元資料下載",
+        "summary-label": "摘要",
+        "summary-tooltip": "允許在欄位解鎖時寫入摘要。",
+        "localized-name-label": "系列譯名",
+        "derive-publication-status-tooltip": "允許根據總章節／卷數來推斷出版狀態。",
+        "derive-publication-status-label": "出版狀態",
+        "enable-relations-label": "關聯性",
+        "enable-cover-image-label": "封面圖片",
+        "enable-cover-image-tooltip": "允許 Kavita 為系列寫入封面圖片",
+        "enable-genres-label": "類型",
+        "enable-genres-tooltip": "允許寫入系列類型。",
+        "enable-tags-tooltip": "允許寫入系列標籤。",
+        "enable-tags-label": "標籤",
+        "blacklist-label": "黑名單類型／標籤",
+        "first-last-name-tooltip": "確保人物的姓名寫法為名字在前，姓氏在後",
+        "enabled-tooltip": "允許 Kavita 下載元資料並寫入其資料庫。",
+        "enable-relations-tooltip": "允許 新增系列關聯性。",
+        "enable-people-label": "人物",
+        "enable-chapter-title-tooltip": "允許寫入章節／期數標題",
+        "enable-chapter-release-date-label": "發行日期",
+        "enable-start-date-label": "開始日期",
+        "enable-people-tooltip": "允許 新增.人物（角色、作者等）。所有人物都包含圖片。",
+        "whitelist-tooltip": "只允許寫入此清單中的特定字串作為標籤。 請確保這些字串以逗號分隔。",
+        "age-rating-mapping-description": "左側清單中的任何字串，如果存在於類型或標籤中，將設定該系列的年齡分級。",
+        "remove-source-tag-label": "移除來源標籤",
+        "genre": "類型",
+        "field-mapping-description": "設定規則，將在「類型 (Genre)」或「標籤 (Tag)」欄位中找到的特定字串，對應到新的「類型」或「標籤」，並可選擇是否從原始清單中移除。此功能僅在啟用「類型／標籤」寫入時才適用。",
+        "overrides-label": "覆寫",
+        "chapter-header": "章節欄位",
+        "field-mapping-title": "欄位對應",
+        "add-age-rating-mapping-label": "新增年齡分級對應",
+        "tag": "標籤",
+        "add-field-mapping-label": "新增欄位對應",
+        "first-last-name-label": "名／姓 命名方式",
+        "overrides-description": "允許 Kavita 寫入鎖定的欄位。",
+        "person-roles-label": "角色"
+    },
+    "merge-person-modal": {
+        "title": "{{personName}}",
+        "close": "{{common.close}}",
+        "save": "{{common.save}}",
+        "src": "合併人物",
+        "alias-title": "新別名",
+        "known-for-title": "代表作",
+        "merge-warning": "如果您繼續，選定的人物將被移除。該人物的姓名將被新增為別名，且其所有角色都將被轉移。"
+    },
+    "new-version-modal": {
+        "developer": "{{changelog.developer}}",
+        "theme": "{{changelog.theme}}",
+        "title": "Kavita 已更新！",
+        "added": "{{changelog.added}}",
+        "changed": "{{changelog.changed}}",
+        "description": "Kavita 有新版本囉！請重新整理以更新。",
+        "fixed": "{{changelog.fixed}}",
+        "known-issues": "{{changelog.known-issues}}",
+        "api": "{{changelog.api}}",
+        "close": "{{common.close}}",
+        "removed": "{{changelog.removed}}",
+        "refresh": "重新整理"
+    },
+    "changelog-update-item": {
+        "download": "下載",
+        "fixed": "修正",
+        "developer": "開發者",
+        "theme": "主題",
+        "removed": "已移除",
+        "published-label": "發佈時間： ",
+        "api": "API",
+        "installed": "{{changelog.installed}}",
+        "feature-requests": "功能請求",
+        "added": "新增",
+        "changed": "變更",
+        "known-issues": "已知問題"
+    },
+    "manage-user-tokens": {
+        "mal-header": "MAL",
+        "no-data": "{{common.no-data}}",
+        "token-set-label": "設定授權憑證",
+        "anilist-header": "AniList",
+        "description": "有設定同步憑證的用戶，可能需要不時地更新憑證。如果用戶有設定電子郵件，並且提供的是有效信箱，Kavita 會在憑證需要更新時自動發送電子郵件通知。",
+        "username-header": "用戶名",
+        "expires-label": "到期日： {{date}}"
+    },
+    "email-history": {
+        "no-data": "{{common.no-data}}",
+        "not-sent-tooltip": "未發送",
+        "sent-tooltip": "發送",
+        "date-header": "發送日期",
+        "description": "這裡可以查看 Kavita 寄出的所有電子郵件以及收件使用者。",
+        "user-header": "發送到",
+        "sent-header": "成功",
+        "template-header": "範本"
+    },
+    "match-series-modal": {
+        "save": "{{common.save}}",
+        "close": "{{common.close}}",
+        "query-label": "查詢",
+        "query-tooltip": "請輸入系列名稱，或是 AniList／MyAnimeList／ComicBookRoundup 的網址。若輸入網址，系統將會直接查詢對應資料。",
+        "dont-match-tooltip": "將此系列排除於匹配與 Scrobble 之外",
+        "no-results": "無法找到匹配項目。請嘗試新增支援的網址後再重試。",
+        "search": "搜尋",
+        "title": "匹配 {{seriesName}}",
+        "description": "選擇一個匹配項目以重新連結 Kavita+ 的元資料並重新產生 Scrobble 事件。若選擇 「不匹配」，則可禁止 Kavita 對該項目進行元資料匹配與 Scrobble 同步。",
+        "dont-match-label": "不匹配"
+    },
+    "match-series-result-item": {
+        "volume-count": "{{server-stats.volume-count}}",
+        "chapter-count": "{{common.chapter-count}}",
+        "issue-count": "{{common.issue-count}}",
+        "releasing": "發行中",
+        "details": "查看頁面",
+        "updating-metadata-status": "更新元資料"
+    },
+    "role-localized-pipe": {
+        "admin": "管理員",
+        "bookmark": "書籤",
+        "change-restriction": "更改限制條件",
+        "login": "登入",
+        "promote": "推廣",
+        "change-password": "更改密碼",
+        "download": "下載",
+        "read-only": "只讀"
+    },
+    "log-level-pipe": {
+        "critical": "Critical",
+        "debug": "Debug",
+        "information": "Information",
+        "trace": "Trace",
+        "warning": "Warning"
+    },
+    "browse-title-pipe": {
+        "age-rating": "分級為 {{value}}",
+        "publication-status": "{{value}} 部作品",
+        "tag": "含有標籤 {{value}}",
+        "user-rating": "{{value}} 星評分",
+        "translator": "由 {{value}} 翻譯",
+        "publisher": "由 {{value}} 出版",
+        "artist": "由 {{value}} 繪製",
+        "editor": "由 {{value}} 編輯",
+        "penciller": "由 {{value}} 繪製草稿",
+        "genre": "含有類型 {{value}}",
+        "format": "{{value}} 的格式",
+        "writer": "由 {{value}}編劇",
+        "team": "{{value}} 團隊",
+        "location": "位於 {{value}}",
+        "character": "含有角色 {{value}}",
+        "inker": "由 {{value}} 勾線",
+        "library": "於 {{value}} 書庫中",
+        "release-year": "於 {{value}} 發行",
+        "letterer": "由 {{value}} 設計字體",
+        "colorist": "由 {{value}} 上色",
+        "imprint": "{{value}} 出版品牌"
+    },
+    "generic-filter-field-pipe": {
+        "person-name": "名稱",
+        "person-role": "角色",
+        "person-chapter-count": "章數",
+        "person-series-count": "系列數"
+    },
+    "breakpoint-pipe": {
+        "desktop": "桌面版",
+        "never": "從不",
+        "mobile": "手機",
+        "tablet": "平板"
     }
 }
diff --git a/UI/Web/src/httpLoader.ts b/UI/Web/src/httpLoader.ts
index a8ed882a3..ff9ceea49 100644
--- a/UI/Web/src/httpLoader.ts
+++ b/UI/Web/src/httpLoader.ts
@@ -1,17 +1,50 @@
 import {Injectable} from "@angular/core";
-import { HttpClient } from "@angular/common/http";
+import {HttpClient} from "@angular/common/http";
 import {Translation, TranslocoLoader} from "@jsverse/transloco";
 import cacheBusting from 'i18n-cache-busting.json'; // allowSyntheticDefaultImports must be true
 
 @Injectable({ providedIn: 'root' })
 export class HttpLoader implements TranslocoLoader {
+  private loadedVersions: { [key: string]: string } = {};
   constructor(private http: HttpClient) {}
 
   getTranslation(langPath: string) {
     const tokens = langPath.split('/');
     const langCode = tokens[tokens.length - 1];
-    const url = `assets/langs/${langCode}.json?v=${(cacheBusting as { [key: string]: string })[langCode]}`;
-    console.log('loading locale: ', url);
-    return this.http.get(url);
+
+    const currentHash = (cacheBusting as { [key: string]: string })[langCode] || 'en';
+
+    // Check if we've loaded this version before
+    const cachedVersion = this.loadedVersions[langCode];
+
+    // If the hash has changed, force a new request and clear local storage cache
+    if (cachedVersion && cachedVersion !== currentHash) {
+      console.log(`Translation hash changed for ${langCode}. Clearing cache.`);
+      this.clearTranslocoCache(langCode);
+    }
+
+    // Store the version we're loading
+    this.loadedVersions[langCode] = currentHash;
+
+    const url = `assets/langs/${langCode}.json?v=${currentHash}`;
+    console.log('Loading locale:', url);
+
+    // Add cache control headers to prevent browser caching
+    return this.http.get(url, {
+      headers: {
+        'Cache-Control': 'no-cache, no-store, must-revalidate',
+        'Pragma': 'no-cache',
+        'Expires': '0'
+      }
+    });
+  }
+
+  /**
+   * Clears Transloco cache for a specific language
+   */
+  private clearTranslocoCache(langCode: string): void {
+    localStorage.removeItem('translocoLang');
+    localStorage.removeItem('@transloco/translations');
+    localStorage.removeItem('@transloco/translations/timestamp');
   }
 }
diff --git a/UI/Web/src/main.ts b/UI/Web/src/main.ts
index ca877b40c..3e5f86b57 100644
--- a/UI/Web/src/main.ts
+++ b/UI/Web/src/main.ts
@@ -1,35 +1,25 @@
 /// 
-import {
-  APP_INITIALIZER, ApplicationConfig,
-  importProvidersFrom,
-
-} from '@angular/core';
-import { AppComponent } from './app/app.component';
-import { NgCircleProgressModule } from 'ng-circle-progress';
-import { ToastrModule } from 'ngx-toastr';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { AppRoutingModule } from './app/app-routing.module';
-import { Title, BrowserModule, bootstrapApplication } from '@angular/platform-browser';
-import { JwtInterceptor } from './app/_interceptors/jwt.interceptor';
-import { ErrorInterceptor } from './app/_interceptors/error.interceptor';
-import { HTTP_INTERCEPTORS, withInterceptorsFromDi, provideHttpClient } from '@angular/common/http';
-import {
-    provideTransloco, TranslocoConfig,
-    TranslocoService
-} from "@jsverse/transloco";
+import {APP_INITIALIZER, ApplicationConfig, importProvidersFrom,} from '@angular/core';
+import {AppComponent} from './app/app.component';
+import {NgCircleProgressModule} from 'ng-circle-progress';
+import {ToastrModule} from 'ngx-toastr';
+import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
+import {AppRoutingModule} from './app/app-routing.module';
+import {bootstrapApplication, BrowserModule, Title} from '@angular/platform-browser';
+import {JwtInterceptor} from './app/_interceptors/jwt.interceptor';
+import {ErrorInterceptor} from './app/_interceptors/error.interceptor';
+import {HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi} from '@angular/common/http';
+import {provideTransloco, TranslocoConfig, TranslocoService} from "@jsverse/transloco";
 import {environment} from "./environments/environment";
-import {HttpLoader} from "./httpLoader";
-import {
-  provideTranslocoPersistLang,
-} from "@jsverse/transloco-persist-lang";
 import {AccountService} from "./app/_services/account.service";
 import {switchMap} from "rxjs";
 import {provideTranslocoLocale} from "@jsverse/transloco-locale";
-import {provideTranslocoPersistTranslations} from "@jsverse/transloco-persist-translations";
 import {LazyLoadImageModule} from "ng-lazyload-image";
 import {getSaver, SAVER} from "./app/_providers/saver.provider";
 import {distinctUntilChanged} from "rxjs/operators";
 import {APP_BASE_HREF, PlatformLocation} from "@angular/common";
+import {provideTranslocoPersistTranslations} from '@jsverse/transloco-persist-translations';
+import {HttpLoader} from "./httpLoader";
 
 const disableAnimations = !('animate' in document.documentElement);
 
@@ -112,7 +102,9 @@ const translocoOptions = {
     missingHandler: {
       useFallbackTranslation: true,
       allowEmpty: false,
+      logMissingKey: true
     },
+    failedRetries: 2,
   } as TranslocoConfig
 };
 
@@ -142,12 +134,7 @@ bootstrapApplication(AppComponent, {
         provideTranslocoPersistTranslations({
           loader: HttpLoader,
           storage: { useValue: localStorage },
-          ttl: 604800
-        }),
-        provideTranslocoPersistLang({
-          storage: {
-            useValue: localStorage,
-          },
+          ttl: environment.production ? 129600 : 0 // 1.5 days in seconds for prod
         }),
         { provide: HTTP_INTERCEPTORS, useClass: ErrorInterceptor, multi: true },
         { provide: HTTP_INTERCEPTORS, useClass: JwtInterceptor, multi: true },
diff --git a/UI/Web/src/styles.scss b/UI/Web/src/styles.scss
index 889a89642..eef1b565d 100644
--- a/UI/Web/src/styles.scss
+++ b/UI/Web/src/styles.scss
@@ -1,53 +1,59 @@
-@import '../node_modules/swiper/swiper';
+@use '../node_modules/swiper/swiper' as swiper;
 
-@import './theme/variables';
+@use './theme/variables' as theme;
 
 // Import themes which define the css variables we use to customize the app
-@import './theme/themes/dark';
+@use './theme/themes/dark';
 
 // Import colors for overrides of bootstrap theme
-@import './theme/toastr';
+@use './theme/toastr' as toastr;
 
 
 // Bootstrap must be after _colors since we define the colors there
-@import '../node_modules/bootstrap/scss/bootstrap';
+@use '../node_modules/bootstrap/scss/bootstrap';
 
-@import '../node_modules/charts.css/dist/charts.min';
+@use '../node_modules/charts.css/dist/charts.min' as charts;
 
+@use '../node_modules/@siemens/ngx-datatable/index.css' as ngxDatatable;
+@use '../node_modules/@siemens/ngx-datatable/themes/bootstrap.css' as ngxDatatableBootstrap;
+@use '../node_modules/@siemens/ngx-datatable/assets/icons.css' as ngxDatatableIcons;
 
 
 // Import all the customized theme overrides
-@import './theme/components/input';
-@import './theme/components/anchors';
-@import './theme/components/nav';
-@import './theme/components/buttons';
-@import './theme/components/toast';
-@import './theme/components/checkbox';
-@import './theme/components/list';
-@import './theme/components/navbar';
-@import './theme/components/popover';
-@import './theme/components/pagination';
-@import './theme/components/dropdown';
-@import './theme/components/accordion';
-@import './theme/components/breadcrumb';
-@import './theme/components/ratingstar';
-@import './theme/components/modal';
-@import './theme/components/card';
-@import './theme/components/slider';
-@import './theme/components/radios';
-@import './theme/components/selects';
-@import './theme/components/progress';
-@import './theme/components/sidenav';
-@import './theme/components/carousel';
-@import './theme/components/offcanvas';
-@import './theme/components/table';
-@import './theme/components/alerts';
-@import './theme/components/typeahead';
+@use './theme/components/input';
+@use './theme/components/anchors';
+@use './theme/components/nav';
+@use './theme/components/badge';
+@use './theme/components/buttons';
+@use './theme/components/toast';
+@use './theme/components/checkbox';
+@use './theme/components/list';
+@use './theme/components/navbar';
+@use './theme/components/popover';
+@use './theme/components/pagination';
+@use './theme/components/dropdown';
+@use './theme/components/accordion';
+@use './theme/components/breadcrumb';
+@use './theme/components/ratingstar';
+@use './theme/components/modal';
+@use './theme/components/card';
+@use './theme/components/slider';
+@use './theme/components/radios';
+@use './theme/components/selects';
+@use './theme/components/progress';
+@use './theme/components/sidenav';
+@use './theme/components/carousel';
+@use './theme/components/offcanvas';
+@use './theme/components/table';
+@use './theme/components/alerts';
+@use './theme/components/typeahead';
+@use './theme/components/tooltip';
 
-@import './theme/utilities/headings';
-@import './theme/utilities/utilities';
-@import './theme/utilities/animations';
-@import './theme/utilities/global';
+@use './theme/utilities/headings';
+@use './theme/utilities/utilities';
+@use './theme/utilities/animations';
+@use './theme/utilities/global';
+@use "./theme/utilities/spinners";
 
 
 // Global Styles
@@ -89,9 +95,6 @@ app-root {
   scrollbar-color: rgba(255,255,255,0.3);
 }
 
-::-webkit-scrollbar {
-  width: 10px !important;
-}
 
 ::-webkit-scrollbar-thumb {
   background-clip: padding-box;
@@ -108,7 +111,7 @@ body {
   padding: 0;
   margin: 0;
 
-  @media (max-width: $grid-breakpoints-lg) {
+  @media (max-width: theme.$grid-breakpoints-lg) {
     /* Setting this break the readers */
     //margin-top: var(--nav-mobile-offset) !important;
     //height: calc(var(--vh)* 100 - var(--nav-mobile-offset)) !important;
@@ -120,4 +123,4 @@ body {
   height: 1px;
   background-color: var(--setting-break-color);
   margin: 30px 0;
-}
\ No newline at end of file
+}
diff --git a/UI/Web/src/theme/_variables.scss b/UI/Web/src/theme/_variables.scss
index a8202989e..1ffbdeb54 100644
--- a/UI/Web/src/theme/_variables.scss
+++ b/UI/Web/src/theme/_variables.scss
@@ -1,9 +1,10 @@
 //Bootstrap Variables
-// NOTE: It currently isn't possible to swap out all bootstrap styles because of the scss generators. So we have some hardcoded stuff. (v5 has more css variables on the way to address this)
+// NOTE: It currently isn't possible to swap out all bootstrap styles because of the scss generators.
+// So we have some hardcoded stuff. (v5 has more css variables on the way to address this)
 
 $theme-colors: (
-  "primary": #4ac694,
-  "danger": #BD362F,
+  "primary": var(--primary-color, #4ac694),
+  "danger": var(--error-color, #BD362F),
   "secondary": #6c757d,
   "light": #f8f9fa
 );
diff --git a/UI/Web/src/theme/components/_badge.scss b/UI/Web/src/theme/components/_badge.scss
new file mode 100644
index 000000000..cbb377e99
--- /dev/null
+++ b/UI/Web/src/theme/components/_badge.scss
@@ -0,0 +1,7 @@
+.bg-primary {
+  background-color: var(--primary-color) !important;
+}
+
+.text-dark {
+  color: var(--body-text-color) !important;
+}
diff --git a/UI/Web/src/theme/components/_buttons.scss b/UI/Web/src/theme/components/_buttons.scss
index 74bd5a40e..82603e761 100644
--- a/UI/Web/src/theme/components/_buttons.scss
+++ b/UI/Web/src/theme/components/_buttons.scss
@@ -1,10 +1,19 @@
 // TODO: Clean this code up
 
+.btn {
+  --bs-btn-disabled-bg: var(--btn-disabled-bg-color);
+  --bs-btn-disabled-border-color: var(--btn-disabled-border-color);
+  --bs-btn-disabled-color: var(--btn-disabled-text-color);
+}
+
 .btn-primary {
   color: var(--btn-primary-text-color);
   background-color: var(--btn-primary-bg-color);
   border-color: var(--btn-primary-border-color);
 
+  --bs-btn-active-bg: var(--primary-color-dark-shade);
+  --bs-btn-active-border-color: var(--primary-color-dark-shade);
+
   &:hover {
     color: var(--btn-primary-hover-text-color);
     background-color: var(--btn-primary-hover-bg-color);
@@ -12,25 +21,73 @@
   }
 }
 
-.btn-primary-outline {
-  color: var(--btn-primary-outline-text-color);
-  background-color: var(--btn-primary-outline-bg-color);
-  border-color: var(--btn-primary-outline-border-color);
+.btn-outline-primary {
+
+  --bs-btn-active-bg: var(--btn-outline-primary-hover-bg-color);
+  --bs-btn-active-border-color: var(--btn-outline-primary-hover-border-color);
+
+  color: var(--btn-outline-primary-text-color);
+  background-color: var(--btn-outline-primary-bg-color);
+  border-color: var(--btn-outline-primary-border-color);
 
   &:hover {
-    color: var(--btn-primary-outline-hover-text-color);
-    background-color: var(--btn-primary-outline-hover-bg-color);
-    border-color: var(--btn-primary-outline-hover-border-color);
+    color: var(--btn-outline-primary-hover-text-color) !important;
+    background-color: var(--btn-outline-primary-hover-bg-color) !important;
+    border-color: var(--btn-outline-primary-hover-border-color) !important;
   }
 }
 
-.btn-secondary-outline {
+.btn-outline-secondary {
+  /**
+  --btn-secondary-text-color: white;
+    --btn-secondary-bg-color: #6c757d;
+    --btn-secondary-border-color: #6c757d;
+    --btn-secondary-hover-bg-color: var(--bs-btn-hover-bg);
+    --btn-secondary-hover-border-color: var(--bs-btn-hover-border-color);
+    --btn-secondary-hover-border-color: var(--bs-btn-hover-border-color);
+    --btn-secondary-font-weight: bold;
+    --btn-secondary-outline-text-color: white;
+    --btn-secondary-outline-bg-color: transparent;
+    --btn-secondary-outline-border-color: #6c757d;
+    --btn-secondary-outline-hover-bg-color: transparent;
+    --btn-secondary-outline-hover-border-color: transparent;
+    --btn-secondary-outline-font-weight: bold;
+
+    vs bootstrap
+      --bs-btn-color: var(--btn-secondary-bg-color);
+      --bs-btn-border-color: var(--btn-secondary-border-color);
+      --bs-btn-hover-color: var(--btn-secondary-hover-text-color);
+      --bs-btn-hover-bg: var(--btn-secondary-outline-hover-bg-color);
+      --bs-btn-hover-border-color: var(--btn-secondary-outline-hover-border-color);
+      --bs-btn-focus-shadow-rgb: 108, 117, 125;
+      --bs-btn-active-color: #fff;
+      --bs-btn-active-bg: #6c757d;
+      --bs-btn-active-border-color: #6c757d;
+      --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+      --bs-btn-disabled-color: #6c757d;
+      --bs-btn-disabled-bg: transparent;
+      --bs-btn-disabled-border-color: #6c757d;
+      --bs-gradient: none;
+   */
+
+  // Override bootstrap variables
+  --bs-btn-color: var(--btn-secondary-bg-color);
+  --bs-btn-border-color: var(--btn-secondary-border-color);
+  --bs-btn-hover-color: var(--btn-secondary-hover-text-color);
+  --bs-btn-hover-bg: var(--btn-secondary-outline-hover-bg-color);
+  --bs-btn-hover-border-color: var(--btn-secondary-outline-hover-border-color);
+
+
   color: var(--btn-secondary-outline-text-color);
   background-color: var(--btn-secondary-outline-bg-color);
   border-color: var(--btn-secondary-outline-border-color);
-  border-radius: 0;
 
   &:hover {
+    --bs-btn-color: var(--btn-secondary-outline-hover-text-color);
+    --bs-btn-hover-bg: var(-btn-secondary-outline-hover-bg-color);
+    --bs-btn-hover-border-color: var(--btn-secondary-outline-hover-border-color);
+    --btn-secondary-outline-text-color: var(--btn-secondary-outline-hover-bg-color);
+
     color: var(--btn-secondary-outline-hover-text-color);
     background-color: var(--btn-secondary-outline-hover-bg-color);
     border-color: var(--btn-secondary-outline-hover-border-color);
@@ -40,6 +97,7 @@
   }
 }
 
+
 .btn-danger-outline {
   color: var(--btn-danger-outline-text-color);
   background-color: var(--btn-danger-outline-bg-color);
@@ -91,17 +149,6 @@ button:disabled, .form-control:disabled, .form-control[readonly], .disabled, :di
     }
 }
 
-.btn-text {
-  color: var(--primary-color);
-  > i {
-    color: var(--primary-color) !important;
-  }
-
-  &:hover, &:focus {
-    color: var(--primary-color);
-  }
-}
-
 
 .btn:focus, .btn:active, .btn:active:focus {
   box-shadow: 0 0 0 0 var(---btn-focus-boxshadow-color) !important;
@@ -113,6 +160,10 @@ button:disabled, .form-control:disabled, .form-control[readonly], .disabled, :di
   color: var(--body-text-color);
   border: none;
 
+  &:disabled {
+    --bs-btn-disabled-bg: transparent;
+  }
+
   &:hover, &:focus {
     color: var(--body-text-color);
     border: none;
@@ -137,9 +188,7 @@ button:disabled, .form-control:disabled, .form-control[readonly], .disabled, :di
   color: var(--btn-danger-text-text-color);
 }
 
-.btn-outline-secondary {
-  color: var(--body-text-color);
-}
+
 
 .btn-secondary {
   color: var(--btn-secondary-text-color);
@@ -175,3 +224,11 @@ button i.fa {
 .btn-group.dropdown > button {
 
 }
+
+//
+//.btn-primary .btn-check:checked + .btn, :not(.btn-check) + .btn:active, .btn:first-child:active, .btn.active, .btn.show {
+//  --bs-btn-active-bg: var(--primary-color-dark-shade);
+//  --bs-btn-active-border-color: var(--primary-color-dark-shade);
+//}
+
+
diff --git a/UI/Web/src/theme/components/_card.scss b/UI/Web/src/theme/components/_card.scss
index 7176e52fa..5ec224564 100644
--- a/UI/Web/src/theme/components/_card.scss
+++ b/UI/Web/src/theme/components/_card.scss
@@ -1,8 +1,15 @@
-@include media-breakpoint-down(md) {
-    .card-actions {
-        visibility: visible !important;
-    }
-}
+//@use 'bootstrap/scss/functions' as functions;
+//@use 'bootstrap/scss/variables' as variables;
+//@use './theme/variables' as theme;
+//@use 'bootstrap/scss/mixins/breakpoints' as breakpoints;
+
+//
+//// TODO: Rewrite this because it's not working with breakpoints - doesn't seem to do anything either
+//@include breakpoints.media-breakpoint-down(md) {
+//    .card-actions {
+//        visibility: visible !important;
+//    }
+//}
 
 .card {
     background-color: var(--card-bg-color);
@@ -41,7 +48,7 @@ $image-width: 160px;
         position: relative;
         color: var(--card-text-color);
         border: 1px var(--card-border-color);
-
+        box-sizing: border-box;
     }
 
     .card-title {
diff --git a/UI/Web/src/theme/components/_navbar.scss b/UI/Web/src/theme/components/_navbar.scss
index 73244bdc7..d1650bd08 100644
--- a/UI/Web/src/theme/components/_navbar.scss
+++ b/UI/Web/src/theme/components/_navbar.scss
@@ -1,4 +1,4 @@
-@import '../variables';
+@use '../variables' as theme;
 
 .navbar {
   background-color: var(--navbar-bg-color);
@@ -20,7 +20,7 @@ i.fa.nav {
   transform: scaleY(0);
 }
 
-@media (max-width: $grid-breakpoints-lg) {
+@media (max-width: theme.$grid-breakpoints-lg) {
   .navbar {
     margin: var(--navbar-header-mobile-x-margin) var(--navbar-header-mobile-y-margin);
   }
diff --git a/UI/Web/src/theme/components/_progress.scss b/UI/Web/src/theme/components/_progress.scss
index 08184e2ae..60861c423 100644
--- a/UI/Web/src/theme/components/_progress.scss
+++ b/UI/Web/src/theme/components/_progress.scss
@@ -3,7 +3,7 @@
 }
 
 .progress-bar {
-  background-color: var(--progress-bar-color);
+  background-color: var(--progress-bar-color) !important;
 }
 
 .progress-bar.text-bg-success {
diff --git a/UI/Web/src/theme/components/_selects.scss b/UI/Web/src/theme/components/_selects.scss
index 3e1693ad2..6e6b1fe16 100644
--- a/UI/Web/src/theme/components/_selects.scss
+++ b/UI/Web/src/theme/components/_selects.scss
@@ -3,7 +3,11 @@
     color: var(--input-text-color);
     border-color: var(--input-border-color);
 
-    &:focus {
+    // Chevron
+    --bs-form-select-bg-img: url("data:image/svg+xml,%3csvg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='0%200%2016%2016'%3e%3cpath%20fill='none'%20stroke='currentColor'%20stroke-linecap='round'%20stroke-linejoin='round'%20stroke-width='2'%20d='m2%205%206%206%206-6'/%3e%3c/svg%3e");
+
+
+  &:focus {
         border-color: var(--input-focused-border-color);
         background-color: var(--input-bg-color);
         color: var(--input-text-color);
diff --git a/UI/Web/src/theme/components/_sidenav.scss b/UI/Web/src/theme/components/_sidenav.scss
index 7d4d7a140..33faf7d82 100644
--- a/UI/Web/src/theme/components/_sidenav.scss
+++ b/UI/Web/src/theme/components/_sidenav.scss
@@ -1,4 +1,4 @@
-@import "../variables";
+@use "../variables" as theme;
 
 //START sidebar container
 .side-nav-container {
@@ -28,7 +28,7 @@
   }
   //START closed state of the sidebar
   &.closed {
-    width: 2.825rem;
+    width: 3.125rem;
     overflow-x: hidden;
     overflow-y: hidden;
     background-color: var(--side-nav-closed-bg-color);
@@ -36,6 +36,11 @@
     height: calc((var(--vh) * 100) - 6.5rem);
     border-radius: unset;
 
+    // For Firefox
+    @supports (-moz-appearance: none) {
+      width: 2.5rem;
+    }
+
     .side-nav {
       .side-nav-item {
         color: var(--side-nav-item-closed-color);
@@ -46,6 +51,10 @@
           }
         }
 
+        .phone-hidden:first-of-type {
+          margin-left: unset;
+        }
+
         .active-highlight {
           opacity: 0;
         }
@@ -83,10 +92,10 @@
         display: flex;
 
         &:first-of-type {
-          text-align: center;
           width: 2.5rem;
           min-width: 2.5rem;
           margin-left: 0.3rem;
+          justify-content: center;
         }
 
         &:last-child {
@@ -95,9 +104,7 @@
         }
 
         div {
-          align-items: center;
           height: 100%;
-          justify-content: inherit;
           padding: 0 0.625rem;
 
           i {
@@ -193,10 +200,12 @@
     .side-nav {
       overflow-x: hidden;
       padding-bottom: 0.625rem;
+      padding-left: 1.125rem;
 
       .side-nav-header {
         color: #ffffff;
-        font-size: 0.9375rem;
+        font-size: 1rem;
+        margin-left: unset;
 
         &:first-of-type {
           margin-top: 0.7rem;
@@ -204,10 +213,9 @@
       }
 
       .side-nav-item {
-        font-size: 0.9rem;
+        font-size: 1rem;
         min-height: 1.875rem;
         justify-content: unset;
-        margin-left: 1.125rem;
 
         &.active {
           .side-nav-text {
@@ -218,8 +226,16 @@
         .side-nav-text {
           text-align: unset;
           margin-left: 0.75rem;
-          font-size: 0.8125rem;
+          font-size: 0.9rem;
           color: #999999;
+          
+          div {
+            display: flex;
+            
+            .badge {
+              align-self: center;
+            }
+          }
         }
 
         .card-actions {
@@ -278,9 +294,9 @@
       }
     }
   }
-  //START sidebar closed
+  //START sidebar bottom closed
   &.closed {
-    width: 3.4375rem;
+    width: 2.5rem;
     overflow-x: hidden;
     overflow-y: auto;
     background-color: unset;
@@ -295,11 +311,11 @@
       }
     }
   }
-  //END sidebar closed
+  //END sidebar bottom closed
 }
 //END kavita+ subscription bottom heart button
 
-@media (max-width: $grid-breakpoints-lg) {
+@media (max-width: theme.$grid-breakpoints-lg) {
   .side-nav-container {
     padding: 0.625rem 0;
     padding-left: 0.3125rem;
diff --git a/UI/Web/src/theme/components/_table.scss b/UI/Web/src/theme/components/_table.scss
index 72ede9819..201f9f43d 100644
--- a/UI/Web/src/theme/components/_table.scss
+++ b/UI/Web/src/theme/components/_table.scss
@@ -45,5 +45,29 @@ th[sortable].desc:after {
   --bs-table-bg: var(--table-body-striped-bg-color);
 }
 
+.ngx-datatable.bootstrap {
+
+  thead {
+    color: var(--table-header-text-color);
+    background-color: var(--table-header-bg-color);
+  }
+
+  .datatable-row-wrapper {
+    border-style: var(--table-body-border);
+  }
+}
+
+.datatable-body-row.datatable-row-even {
+  border-style: var(--table-body-border);
+  background-color: var(--table-body-striped-bg-color);
+}
+
+.datatable-footer .disabled {
+  .datatable-icon-left, .datatable-icon-right, .datatable-icon-skip, .datatable-icon-prev {
+    color: var(--table-header-text-color-disabled);
+  }
+}
+
+
 
 
diff --git a/UI/Web/src/theme/components/_tooltip.scss b/UI/Web/src/theme/components/_tooltip.scss
new file mode 100644
index 000000000..d351b6b3a
--- /dev/null
+++ b/UI/Web/src/theme/components/_tooltip.scss
@@ -0,0 +1,4 @@
+.tooltip {
+  --bs-tooltip-opacity: 1;
+  //--bs-tooltip-color:
+}
diff --git a/UI/Web/src/theme/themes/dark.scss b/UI/Web/src/theme/themes/dark.scss
index 4edab2dc4..7ec33d613 100644
--- a/UI/Web/src/theme/themes/dark.scss
+++ b/UI/Web/src/theme/themes/dark.scss
@@ -1,4 +1,4 @@
-@import '../variables';
+@use '../variables' as theme;
 
 :root, :root .default {
 
@@ -46,13 +46,19 @@
     --primary-color-darkest-shade: #25624A;
     --error-color: #BD362F;
     --warning-color: #FFECB5;
-    --bs-body-bg: #1f2020; //#343a40;
     --body-text-color: #efefef;
     --btn-icon-filter: invert(1) grayscale(100%) brightness(200%);
     --primary-color-scrollbar: rgba(255,255,255,0.3);
     --default-state-scrollbar: transparent;
     --text-muted-color: hsla(0,0%,100%,.45);
 
+    /* Override bootstrap css variables */
+    --bs-body-bg: #1f2020;
+    --bs-primary-rgb: var(--primary-color);
+    --select2-selection-text-color: var(--dropdown-item-hover-text-color);
+    --select2-option-highlighted-background: var(--dropdown-item-hover-bg-color);
+
+
     /* Theming colors that performs a gradient for background. Can be disabled else automatically applied based on cover image colors.
      * --colorscape-primary-color and the alpha variants will be updated in real time. the default variant is fixed and represents the default state and should
      * match the non-default/alpha on launch.
@@ -128,12 +134,12 @@
     --btn-primary-hover-text-color: white;
     --btn-primary-hover-bg-color: var(--primary-color-darker-shade);
     --btn-primary-hover-border-color: var(--primary-color-darker-shade);
-    --btn-primary-outline-text-color: white;
-    --btn-primary-outline-bg-color: transparent;
-    --btn-primary-outline-border-color: var(--primary-color);
-    --btn-primary-outline-hover-text-color: white;
-    --btn-primary-outline-hover-bg-color: var(--primary-color-darker-shade);
-    --btn-primary-outline-hover-border-color: var(--primary-color-darker-shade);
+    --btn-outline-primary-text-color: white;
+    --btn-outline-primary-bg-color: transparent;
+    --btn-outline-primary-border-color: var(--primary-color);
+    --btn-outline-primary-hover-text-color: white;
+    --btn-outline-primary-hover-bg-color: var(--primary-color-darker-shade);
+    --btn-outline-primary-hover-border-color: var(--primary-color-darker-shade);
     --btn-secondary-text-color: white;
     --btn-secondary-bg-color: #6c757d;
     --btn-secondary-border-color: #6c757d;
@@ -142,9 +148,10 @@
     --btn-secondary-font-weight: bold;
     --btn-secondary-outline-text-color: white;
     --btn-secondary-outline-bg-color: transparent;
-    --btn-secondary-outline-border-color: transparent;
-    --btn-secondary-outline-hover-bg-color: transparent;
-    --btn-secondary-outline-hover-border-color: transparent;
+    --btn-secondary-outline-border-color: #6c757d;
+    --btn-secondary-outline-hover-text-color: #fff;
+    --btn-secondary-outline-hover-bg-color: var(--btn-secondary-bg-color);
+    --btn-secondary-outline-hover-border-color: var(--btn-secondary-bg-color);
     --btn-secondary-outline-font-weight: bold;
     --btn-primary-text-text-color: white;
     --btn-secondary-text-text-color: lightgrey;
@@ -170,6 +177,7 @@
     --btn-actions-border-radius: 0.375rem;
     --btn-actions-hover-bg: rgb(255 255 255 / 18%);
 
+
     /* Nav (Tabs) */
     --nav-item-min-width: 150px;
     --nav-item-max-width: 150px;
@@ -325,11 +333,11 @@
     --hr-color: rgba(239, 239, 239, 0.125);
     --accent-bg-color: rgba(1, 4, 9, 0.5);
     --accent-text-color: lightgrey;
-    --grid-breakpoints-xs: $grid-breakpoints-xs;
-    --grid-breakpoints-sm: $grid-breakpoints-sm;
-    --grid-breakpoints-md: $grid-breakpoints-md;
-    --grid-breakpoints-lg: $grid-breakpoints-lg;
-    --grid-breakpoints-xl: $grid-breakpoints-xl;
+    --grid-breakpoints-xs: theme.$grid-breakpoints-xs;
+    --grid-breakpoints-sm: theme.$grid-breakpoints-sm;
+    --grid-breakpoints-md: theme.$grid-breakpoints-md;
+    --grid-breakpoints-lg: theme.$grid-breakpoints-lg;
+    --grid-breakpoints-xl: theme.$grid-breakpoints-xl;
     --body-font-family: "EBGaramond", "Helvetica Neue", sans-serif;
     --brand-font-family: "Spartan", sans-serif;
     --html-font-size: 16px;
@@ -427,4 +435,17 @@
     --login-input-font-family: 'League Spartan', sans-serif;
     --login-input-placeholder-opacity: 0.5;
     --login-input-placeholder-color: #fff;
+
+    /** Series Detail **/
+    --detail-subtitle-color: lightgrey;
+
+    /** Search **/
+    --input-hint-border-color: #aeaeae;
+    --input-hint-text-color: lightgrey;
+
+    /** Breakpoint **/
+    --setting-mobile-breakpoint: 768;
+    --setting-tablet-breakpoint: 1280;
+    --setting-desktop-breakpoint: 1440;
+
 }
diff --git a/UI/Web/src/theme/utilities/_global.scss b/UI/Web/src/theme/utilities/_global.scss
index 2a96114a6..f08705dcd 100644
--- a/UI/Web/src/theme/utilities/_global.scss
+++ b/UI/Web/src/theme/utilities/_global.scss
@@ -7,7 +7,7 @@ html {
 html, body { height: 100%; overflow: hidden; }
 body {
   margin: 0;
-  font-family: var(--body-font-family);
+  font-family: var(--body-font-family), serif;
   color: var(--body-text-color);
   color-scheme: var(--color-scheme);
   max-height: 100%;
@@ -21,13 +21,13 @@ body {
 
 hr {
     background-color: var(--hr-color);
-    border-top: 0px;
+    border-top: 0;
 }
 
 .accent {
     background-color: var(--accent-bg-color) !important;
     color: var(--accent-text-color) !important;
-    box-shadow: inset 0px 0px 8px 1px var(--accent-bg-color) !important;
+    box-shadow: inset 0 0 8px 1px var(--accent-bg-color) !important;
     font-size: var(--accent-text-size) !important;
     font-style: italic;
     padding: 10px;
@@ -38,6 +38,12 @@ hr {
     color: var(--text-muted-color) !important;
 }
 
+.form-check-input {
+  cursor: pointer !important;
+}
+
+
+
 .form-switch .form-check-input:checked {
     background-color: var(--primary-color);
 }
diff --git a/UI/Web/src/theme/utilities/_spinners.scss b/UI/Web/src/theme/utilities/_spinners.scss
new file mode 100644
index 000000000..19b9c4dea
--- /dev/null
+++ b/UI/Web/src/theme/utilities/_spinners.scss
@@ -0,0 +1,4 @@
+
+.text-primary {
+  color: var(--primary-color) !important;
+}
diff --git a/UI/Web/src/theme/utilities/_utilities.scss b/UI/Web/src/theme/utilities/_utilities.scss
index c28240e2c..a61d5e230 100644
--- a/UI/Web/src/theme/utilities/_utilities.scss
+++ b/UI/Web/src/theme/utilities/_utilities.scss
@@ -1,10 +1,12 @@
-@media(max-width: $grid-breakpoints-sm) {
+@use '../variables' as theme;
+
+@media(max-width: theme.$grid-breakpoints-sm) {
     .phone-hidden {
       display: none;
     }
 }
-  
-@media(min-width: $grid-breakpoints-sm) {
+
+@media(min-width: theme.$grid-breakpoints-sm) {
     .not-phone-hidden {
       display: none;
     }
@@ -13,4 +15,4 @@
 .redlines * {
     outline: 1px solid red;
     outline-offset: -1px;
-}
\ No newline at end of file
+}
diff --git a/UI/Web/tests-examples/demo-todo-app.spec.ts b/UI/Web/tests-examples/demo-todo-app.spec.ts
deleted file mode 100644
index 8641cb5f5..000000000
--- a/UI/Web/tests-examples/demo-todo-app.spec.ts
+++ /dev/null
@@ -1,437 +0,0 @@
-import { test, expect, type Page } from '@playwright/test';
-
-test.beforeEach(async ({ page }) => {
-  await page.goto('https://demo.playwright.dev/todomvc');
-});
-
-const TODO_ITEMS = [
-  'buy some cheese',
-  'feed the cat',
-  'book a doctors appointment'
-] as const;
-
-test.describe('New Todo', () => {
-  test('should allow me to add todo items', async ({ page }) => {
-    // create a new todo locator
-    const newTodo = page.getByPlaceholder('What needs to be done?');
-
-    // Create 1st todo.
-    await newTodo.fill(TODO_ITEMS[0]);
-    await newTodo.press('Enter');
-
-    // Make sure the list only has one todo item.
-    await expect(page.getByTestId('todo-title')).toHaveText([
-      TODO_ITEMS[0]
-    ]);
-
-    // Create 2nd todo.
-    await newTodo.fill(TODO_ITEMS[1]);
-    await newTodo.press('Enter');
-
-    // Make sure the list now has two todo items.
-    await expect(page.getByTestId('todo-title')).toHaveText([
-      TODO_ITEMS[0],
-      TODO_ITEMS[1]
-    ]);
-
-    await checkNumberOfTodosInLocalStorage(page, 2);
-  });
-
-  test('should clear text input field when an item is added', async ({ page }) => {
-    // create a new todo locator
-    const newTodo = page.getByPlaceholder('What needs to be done?');
-
-    // Create one todo item.
-    await newTodo.fill(TODO_ITEMS[0]);
-    await newTodo.press('Enter');
-
-    // Check that input is empty.
-    await expect(newTodo).toBeEmpty();
-    await checkNumberOfTodosInLocalStorage(page, 1);
-  });
-
-  test('should append new items to the bottom of the list', async ({ page }) => {
-    // Create 3 items.
-    await createDefaultTodos(page);
-
-    // create a todo count locator
-    const todoCount = page.getByTestId('todo-count')
-  
-    // Check test using different methods.
-    await expect(page.getByText('3 items left')).toBeVisible();
-    await expect(todoCount).toHaveText('3 items left');
-    await expect(todoCount).toContainText('3');
-    await expect(todoCount).toHaveText(/3/);
-
-    // Check all items in one call.
-    await expect(page.getByTestId('todo-title')).toHaveText(TODO_ITEMS);
-    await checkNumberOfTodosInLocalStorage(page, 3);
-  });
-});
-
-test.describe('Mark all as completed', () => {
-  test.beforeEach(async ({ page }) => {
-    await createDefaultTodos(page);
-    await checkNumberOfTodosInLocalStorage(page, 3);
-  });
-
-  test.afterEach(async ({ page }) => {
-    await checkNumberOfTodosInLocalStorage(page, 3);
-  });
-
-  test('should allow me to mark all items as completed', async ({ page }) => {
-    // Complete all todos.
-    await page.getByLabel('Mark all as complete').check();
-
-    // Ensure all todos have 'completed' class.
-    await expect(page.getByTestId('todo-item')).toHaveClass(['completed', 'completed', 'completed']);
-    await checkNumberOfCompletedTodosInLocalStorage(page, 3);
-  });
-
-  test('should allow me to clear the complete state of all items', async ({ page }) => {
-    const toggleAll = page.getByLabel('Mark all as complete');
-    // Check and then immediately uncheck.
-    await toggleAll.check();
-    await toggleAll.uncheck();
-
-    // Should be no completed classes.
-    await expect(page.getByTestId('todo-item')).toHaveClass(['', '', '']);
-  });
-
-  test('complete all checkbox should update state when items are completed / cleared', async ({ page }) => {
-    const toggleAll = page.getByLabel('Mark all as complete');
-    await toggleAll.check();
-    await expect(toggleAll).toBeChecked();
-    await checkNumberOfCompletedTodosInLocalStorage(page, 3);
-
-    // Uncheck first todo.
-    const firstTodo = page.getByTestId('todo-item').nth(0);
-    await firstTodo.getByRole('checkbox').uncheck();
-
-    // Reuse toggleAll locator and make sure its not checked.
-    await expect(toggleAll).not.toBeChecked();
-
-    await firstTodo.getByRole('checkbox').check();
-    await checkNumberOfCompletedTodosInLocalStorage(page, 3);
-
-    // Assert the toggle all is checked again.
-    await expect(toggleAll).toBeChecked();
-  });
-});
-
-test.describe('Item', () => {
-
-  test('should allow me to mark items as complete', async ({ page }) => {
-    // create a new todo locator
-    const newTodo = page.getByPlaceholder('What needs to be done?');
-
-    // Create two items.
-    for (const item of TODO_ITEMS.slice(0, 2)) {
-      await newTodo.fill(item);
-      await newTodo.press('Enter');
-    }
-
-    // Check first item.
-    const firstTodo = page.getByTestId('todo-item').nth(0);
-    await firstTodo.getByRole('checkbox').check();
-    await expect(firstTodo).toHaveClass('completed');
-
-    // Check second item.
-    const secondTodo = page.getByTestId('todo-item').nth(1);
-    await expect(secondTodo).not.toHaveClass('completed');
-    await secondTodo.getByRole('checkbox').check();
-
-    // Assert completed class.
-    await expect(firstTodo).toHaveClass('completed');
-    await expect(secondTodo).toHaveClass('completed');
-  });
-
-  test('should allow me to un-mark items as complete', async ({ page }) => {
-    // create a new todo locator
-    const newTodo = page.getByPlaceholder('What needs to be done?');
-
-    // Create two items.
-    for (const item of TODO_ITEMS.slice(0, 2)) {
-      await newTodo.fill(item);
-      await newTodo.press('Enter');
-    }
-
-    const firstTodo = page.getByTestId('todo-item').nth(0);
-    const secondTodo = page.getByTestId('todo-item').nth(1);
-    const firstTodoCheckbox = firstTodo.getByRole('checkbox');
-
-    await firstTodoCheckbox.check();
-    await expect(firstTodo).toHaveClass('completed');
-    await expect(secondTodo).not.toHaveClass('completed');
-    await checkNumberOfCompletedTodosInLocalStorage(page, 1);
-
-    await firstTodoCheckbox.uncheck();
-    await expect(firstTodo).not.toHaveClass('completed');
-    await expect(secondTodo).not.toHaveClass('completed');
-    await checkNumberOfCompletedTodosInLocalStorage(page, 0);
-  });
-
-  test('should allow me to edit an item', async ({ page }) => {
-    await createDefaultTodos(page);
-
-    const todoItems = page.getByTestId('todo-item');
-    const secondTodo = todoItems.nth(1);
-    await secondTodo.dblclick();
-    await expect(secondTodo.getByRole('textbox', { name: 'Edit' })).toHaveValue(TODO_ITEMS[1]);
-    await secondTodo.getByRole('textbox', { name: 'Edit' }).fill('buy some sausages');
-    await secondTodo.getByRole('textbox', { name: 'Edit' }).press('Enter');
-
-    // Explicitly assert the new text value.
-    await expect(todoItems).toHaveText([
-      TODO_ITEMS[0],
-      'buy some sausages',
-      TODO_ITEMS[2]
-    ]);
-    await checkTodosInLocalStorage(page, 'buy some sausages');
-  });
-});
-
-test.describe('Editing', () => {
-  test.beforeEach(async ({ page }) => {
-    await createDefaultTodos(page);
-    await checkNumberOfTodosInLocalStorage(page, 3);
-  });
-
-  test('should hide other controls when editing', async ({ page }) => {
-    const todoItem = page.getByTestId('todo-item').nth(1);
-    await todoItem.dblclick();
-    await expect(todoItem.getByRole('checkbox')).not.toBeVisible();
-    await expect(todoItem.locator('label', {
-      hasText: TODO_ITEMS[1],
-    })).not.toBeVisible();
-    await checkNumberOfTodosInLocalStorage(page, 3);
-  });
-
-  test('should save edits on blur', async ({ page }) => {
-    const todoItems = page.getByTestId('todo-item');
-    await todoItems.nth(1).dblclick();
-    await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).fill('buy some sausages');
-    await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).dispatchEvent('blur');
-
-    await expect(todoItems).toHaveText([
-      TODO_ITEMS[0],
-      'buy some sausages',
-      TODO_ITEMS[2],
-    ]);
-    await checkTodosInLocalStorage(page, 'buy some sausages');
-  });
-
-  test('should trim entered text', async ({ page }) => {
-    const todoItems = page.getByTestId('todo-item');
-    await todoItems.nth(1).dblclick();
-    await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).fill('    buy some sausages    ');
-    await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).press('Enter');
-
-    await expect(todoItems).toHaveText([
-      TODO_ITEMS[0],
-      'buy some sausages',
-      TODO_ITEMS[2],
-    ]);
-    await checkTodosInLocalStorage(page, 'buy some sausages');
-  });
-
-  test('should remove the item if an empty text string was entered', async ({ page }) => {
-    const todoItems = page.getByTestId('todo-item');
-    await todoItems.nth(1).dblclick();
-    await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).fill('');
-    await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).press('Enter');
-
-    await expect(todoItems).toHaveText([
-      TODO_ITEMS[0],
-      TODO_ITEMS[2],
-    ]);
-  });
-
-  test('should cancel edits on escape', async ({ page }) => {
-    const todoItems = page.getByTestId('todo-item');
-    await todoItems.nth(1).dblclick();
-    await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).fill('buy some sausages');
-    await todoItems.nth(1).getByRole('textbox', { name: 'Edit' }).press('Escape');
-    await expect(todoItems).toHaveText(TODO_ITEMS);
-  });
-});
-
-test.describe('Counter', () => {
-  test('should display the current number of todo items', async ({ page }) => {
-    // create a new todo locator
-    const newTodo = page.getByPlaceholder('What needs to be done?');
-    
-    // create a todo count locator
-    const todoCount = page.getByTestId('todo-count')
-
-    await newTodo.fill(TODO_ITEMS[0]);
-    await newTodo.press('Enter');
-
-    await expect(todoCount).toContainText('1');
-
-    await newTodo.fill(TODO_ITEMS[1]);
-    await newTodo.press('Enter');
-    await expect(todoCount).toContainText('2');
-
-    await checkNumberOfTodosInLocalStorage(page, 2);
-  });
-});
-
-test.describe('Clear completed button', () => {
-  test.beforeEach(async ({ page }) => {
-    await createDefaultTodos(page);
-  });
-
-  test('should display the correct text', async ({ page }) => {
-    await page.locator('.todo-list li .toggle').first().check();
-    await expect(page.getByRole('button', { name: 'Clear completed' })).toBeVisible();
-  });
-
-  test('should remove completed items when clicked', async ({ page }) => {
-    const todoItems = page.getByTestId('todo-item');
-    await todoItems.nth(1).getByRole('checkbox').check();
-    await page.getByRole('button', { name: 'Clear completed' }).click();
-    await expect(todoItems).toHaveCount(2);
-    await expect(todoItems).toHaveText([TODO_ITEMS[0], TODO_ITEMS[2]]);
-  });
-
-  test('should be hidden when there are no items that are completed', async ({ page }) => {
-    await page.locator('.todo-list li .toggle').first().check();
-    await page.getByRole('button', { name: 'Clear completed' }).click();
-    await expect(page.getByRole('button', { name: 'Clear completed' })).toBeHidden();
-  });
-});
-
-test.describe('Persistence', () => {
-  test('should persist its data', async ({ page }) => {
-    // create a new todo locator
-    const newTodo = page.getByPlaceholder('What needs to be done?');
-
-    for (const item of TODO_ITEMS.slice(0, 2)) {
-      await newTodo.fill(item);
-      await newTodo.press('Enter');
-    }
-
-    const todoItems = page.getByTestId('todo-item');
-    const firstTodoCheck = todoItems.nth(0).getByRole('checkbox');
-    await firstTodoCheck.check();
-    await expect(todoItems).toHaveText([TODO_ITEMS[0], TODO_ITEMS[1]]);
-    await expect(firstTodoCheck).toBeChecked();
-    await expect(todoItems).toHaveClass(['completed', '']);
-
-    // Ensure there is 1 completed item.
-    await checkNumberOfCompletedTodosInLocalStorage(page, 1);
-
-    // Now reload.
-    await page.reload();
-    await expect(todoItems).toHaveText([TODO_ITEMS[0], TODO_ITEMS[1]]);
-    await expect(firstTodoCheck).toBeChecked();
-    await expect(todoItems).toHaveClass(['completed', '']);
-  });
-});
-
-test.describe('Routing', () => {
-  test.beforeEach(async ({ page }) => {
-    await createDefaultTodos(page);
-    // make sure the app had a chance to save updated todos in storage
-    // before navigating to a new view, otherwise the items can get lost :(
-    // in some frameworks like Durandal
-    await checkTodosInLocalStorage(page, TODO_ITEMS[0]);
-  });
-
-  test('should allow me to display active items', async ({ page }) => {
-    const todoItem = page.getByTestId('todo-item');
-    await page.getByTestId('todo-item').nth(1).getByRole('checkbox').check();
-
-    await checkNumberOfCompletedTodosInLocalStorage(page, 1);
-    await page.getByRole('link', { name: 'Active' }).click();
-    await expect(todoItem).toHaveCount(2);
-    await expect(todoItem).toHaveText([TODO_ITEMS[0], TODO_ITEMS[2]]);
-  });
-
-  test('should respect the back button', async ({ page }) => {
-    const todoItem = page.getByTestId('todo-item'); 
-    await page.getByTestId('todo-item').nth(1).getByRole('checkbox').check();
-
-    await checkNumberOfCompletedTodosInLocalStorage(page, 1);
-
-    await test.step('Showing all items', async () => {
-      await page.getByRole('link', { name: 'All' }).click();
-      await expect(todoItem).toHaveCount(3);
-    });
-
-    await test.step('Showing active items', async () => {
-      await page.getByRole('link', { name: 'Active' }).click();
-    });
-
-    await test.step('Showing completed items', async () => {
-      await page.getByRole('link', { name: 'Completed' }).click();
-    });
-
-    await expect(todoItem).toHaveCount(1);
-    await page.goBack();
-    await expect(todoItem).toHaveCount(2);
-    await page.goBack();
-    await expect(todoItem).toHaveCount(3);
-  });
-
-  test('should allow me to display completed items', async ({ page }) => {
-    await page.getByTestId('todo-item').nth(1).getByRole('checkbox').check();
-    await checkNumberOfCompletedTodosInLocalStorage(page, 1);
-    await page.getByRole('link', { name: 'Completed' }).click();
-    await expect(page.getByTestId('todo-item')).toHaveCount(1);
-  });
-
-  test('should allow me to display all items', async ({ page }) => {
-    await page.getByTestId('todo-item').nth(1).getByRole('checkbox').check();
-    await checkNumberOfCompletedTodosInLocalStorage(page, 1);
-    await page.getByRole('link', { name: 'Active' }).click();
-    await page.getByRole('link', { name: 'Completed' }).click();
-    await page.getByRole('link', { name: 'All' }).click();
-    await expect(page.getByTestId('todo-item')).toHaveCount(3);
-  });
-
-  test('should highlight the currently applied filter', async ({ page }) => {
-    await expect(page.getByRole('link', { name: 'All' })).toHaveClass('selected');
-    
-    //create locators for active and completed links
-    const activeLink = page.getByRole('link', { name: 'Active' });
-    const completedLink = page.getByRole('link', { name: 'Completed' });
-    await activeLink.click();
-
-    // Page change - active items.
-    await expect(activeLink).toHaveClass('selected');
-    await completedLink.click();
-
-    // Page change - completed items.
-    await expect(completedLink).toHaveClass('selected');
-  });
-});
-
-async function createDefaultTodos(page: Page) {
-  // create a new todo locator
-  const newTodo = page.getByPlaceholder('What needs to be done?');
-
-  for (const item of TODO_ITEMS) {
-    await newTodo.fill(item);
-    await newTodo.press('Enter');
-  }
-}
-
-async function checkNumberOfTodosInLocalStorage(page: Page, expected: number) {
-  return await page.waitForFunction(e => {
-    return JSON.parse(localStorage['react-todos']).length === e;
-  }, expected);
-}
-
-async function checkNumberOfCompletedTodosInLocalStorage(page: Page, expected: number) {
-  return await page.waitForFunction(e => {
-    return JSON.parse(localStorage['react-todos']).filter((todo: any) => todo.completed).length === e;
-  }, expected);
-}
-
-async function checkTodosInLocalStorage(page: Page, title: string) {
-  return await page.waitForFunction(t => {
-    return JSON.parse(localStorage['react-todos']).map((todo: any) => todo.title).includes(t);
-  }, title);
-}
diff --git a/UI/Web/tsconfig.json b/UI/Web/tsconfig.json
index 967e87723..cf1f7a8c6 100644
--- a/UI/Web/tsconfig.json
+++ b/UI/Web/tsconfig.json
@@ -34,6 +34,9 @@
     "resolveJsonModule": true,
     "extendedDiagnostics": {
       "nullishCoalescingNotNullable": "warning",
+      "checks": {
+        "unusedStandaloneImports": "suppress"
+      }
     }
 
   }
diff --git a/build.sh b/build.sh
index 673620e3b..b1b739af4 100755
--- a/build.sh
+++ b/build.sh
@@ -94,9 +94,11 @@ Package()
     fi
 
     echo "Copying appsettings.json"
-    cp config/appsettings.json $lOutputFolder/config/appsettings.json
+    cp config/appsettings.json $lOutputFolder/config/appsettings-init.json
     echo "Removing appsettings.Development.json"
     rm $lOutputFolder/config/appsettings.Development.json
+    echo "Removing appsettings.json"
+    rm $lOutputFolder/config/appsettings.json
 
     echo "Creating tar"
     cd ../$outputFolder/"$runtime"/
diff --git a/global.json b/global.json
index b5b37b60d..a27a2b823 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.0",
+    "version": "9.0.0",
     "rollForward": "latestMajor",
     "allowPrerelease": false
   }
diff --git a/openapi.json b/openapi.json
index 7071cdaff..3e4b797cb 100644
--- a/openapi.json
+++ b/openapi.json
@@ -1,13 +1,13 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "Kavita",
-    "description": "Kavita provides a set of APIs that are authenticated by JWT. JWT token can be copied from local storage. Assume all fields of a payload are required. Built against v0.8.3.2",
+    "description": "Kavita provides a set of APIs that are authenticated by JWT. JWT token can be copied from local storage. Assume all fields of a payload are required. Built against v0.8.7.0",
     "license": {
       "name": "GPL-3.0",
       "url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE"
     },
-    "version": "3.1.0"
+    "version": "0.8.7.0"
   },
   "servers": [
     {
@@ -315,7 +315,7 @@
         "tags": [
           "Account"
         ],
-        "summary": "Initiates the flow to update a user's email address.\r\n            \r\nIf email is not setup, then the email address is not changed in this API. A confirmation link is sent/dumped which will\r\nvalidate the email. It must be confirmed for the email to update.",
+        "summary": "Initiates the flow to update a user's email address.\n            \nIf email is not setup, then the email address is not changed in this API. A confirmation link is sent/dumped which will\nvalidate the email. It must be confirmed for the email to update.",
         "requestBody": {
           "description": "",
           "content": {
@@ -338,7 +338,24 @@
         },
         "responses": {
           "200": {
-            "description": "OK"
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/InviteUserResponse"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InviteUserResponse"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/InviteUserResponse"
+                }
+              }
+            }
           }
         }
       }
@@ -412,7 +429,7 @@
         "tags": [
           "Account"
         ],
-        "summary": "Requests the Invite Url for the UserId. Will return error if user is already validated.",
+        "summary": "Requests the Invite Url for the AppUserId. Will return error if user is already validated.",
         "parameters": [
           {
             "name": "userId",
@@ -886,55 +903,6 @@
         }
       }
     },
-    "/api/Admin/update-chapter-progress": {
-      "post": {
-        "tags": [
-          "Admin"
-        ],
-        "summary": "Set the progress information for a particular user",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/UpdateUserProgressDto"
-              }
-            },
-            "text/json": {
-              "schema": {
-                "$ref": "#/components/schemas/UpdateUserProgressDto"
-              }
-            },
-            "application/*+json": {
-              "schema": {
-                "$ref": "#/components/schemas/UpdateUserProgressDto"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "type": "boolean"
-                }
-              },
-              "application/json": {
-                "schema": {
-                  "type": "boolean"
-                }
-              },
-              "text/json": {
-                "schema": {
-                  "type": "boolean"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
     "/api/Book/{chapterId}/book-info": {
       "get": {
         "tags": [
@@ -1016,7 +984,7 @@
         "tags": [
           "Book"
         ],
-        "summary": "This will return a list of mappings from ID -> page num. ID will be the xhtml key and page num will be the reading order\r\nthis is used to rewrite anchors in the book text so that we always load properly in our reader.",
+        "summary": "This will return a list of mappings from ID -> page num. ID will be the xhtml key and page num will be the reading order\nthis is used to rewrite anchors in the book text so that we always load properly in our reader.",
         "description": "This is essentially building the table of contents",
         "parameters": [
           {
@@ -1068,7 +1036,7 @@
         "tags": [
           "Book"
         ],
-        "summary": "This returns a single page within the epub book. All html will be rewritten to be scoped within our reader,\r\nall css is scoped, etc.",
+        "summary": "This returns a single page within the epub book. All html will be rewritten to be scoped within our reader,\nall css is scoped, etc.",
         "parameters": [
           {
             "name": "chapterId",
@@ -1194,6 +1162,67 @@
         }
       }
     },
+    "/api/Chapter/delete-multiple": {
+      "post": {
+        "tags": [
+          "Chapter"
+        ],
+        "summary": "Deletes multiple chapters and any volumes with no leftover chapters",
+        "parameters": [
+          {
+            "name": "seriesId",
+            "in": "query",
+            "description": "The ID of the series",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "The IDs of the chapters to be deleted",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DeleteChaptersDto"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DeleteChaptersDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/DeleteChaptersDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "boolean"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/Chapter/update": {
       "post": {
         "tags": [
@@ -1227,6 +1256,47 @@
         }
       }
     },
+    "/api/Chapter/chapter-detail-plus": {
+      "get": {
+        "tags": [
+          "Chapter"
+        ],
+        "summary": "Returns Ratings and Reviews for an individual Chapter",
+        "parameters": [
+          {
+            "name": "chapterId",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/ChapterDetailPlusDto"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ChapterDetailPlusDto"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ChapterDetailPlusDto"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/Collection": {
       "get": {
         "tags": [
@@ -1452,7 +1522,7 @@
         "tags": [
           "Collection"
         ],
-        "summary": "Updates an existing tag with a new title, promotion status, and summary.\r\nUI does not contain controls to update title",
+        "summary": "Updates an existing tag with a new title, promotion status, and summary.\nUI does not contain controls to update title",
         "requestBody": {
           "description": "",
           "content": {
@@ -1617,7 +1687,7 @@
         "tags": [
           "Collection"
         ],
-        "summary": "For the authenticated user, if they have an active Kavita+ subscription and a MAL username on record,\r\nfetch their Mal interest stacks (including restacks)",
+        "summary": "For the authenticated user, if they have an active Kavita+ subscription and a MAL username on record,\nfetch their Mal interest stacks (including restacks)",
         "responses": {
           "200": {
             "description": "OK",
@@ -2005,7 +2075,9 @@
         "tags": [
           "Device"
         ],
+        "summary": "Attempts to send a whole series to a device.",
         "requestBody": {
+          "description": "",
           "content": {
             "application/json": {
               "schema": {
@@ -2266,6 +2338,44 @@
         }
       }
     },
+    "/api/Email/all": {
+      "get": {
+        "tags": [
+          "Email"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/EmailHistoryDto"
+                  }
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/EmailHistoryDto"
+                  }
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/EmailHistoryDto"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/Filter/update": {
       "post": {
         "tags": [
@@ -2457,6 +2567,38 @@
         }
       }
     },
+    "/api/Filter/rename": {
+      "post": {
+        "tags": [
+          "Filter"
+        ],
+        "summary": "Rename a Smart Filter given the filterId and new name",
+        "parameters": [
+          {
+            "name": "filterId",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "name",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
     "/api/Health": {
       "get": {
         "tags": [
@@ -2758,6 +2900,67 @@
         }
       }
     },
+    "/api/Image/person-cover": {
+      "get": {
+        "tags": [
+          "Image"
+        ],
+        "summary": "Returns cover image for Person",
+        "parameters": [
+          {
+            "name": "personId",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "apiKey",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/Image/person-cover-by-name": {
+      "get": {
+        "tags": [
+          "Image"
+        ],
+        "summary": "Returns cover image for Person",
+        "parameters": [
+          {
+            "name": "name",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "apiKey",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
     "/api/Image/cover-upload": {
       "get": {
         "tags": [
@@ -2788,6 +2991,139 @@
         }
       }
     },
+    "/api/Koreader/{apiKey}/users/auth": {
+      "get": {
+        "tags": [
+          "Koreader"
+        ],
+        "parameters": [
+          {
+            "name": "apiKey",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/Koreader/{apiKey}/syncs/progress": {
+      "put": {
+        "tags": [
+          "Koreader"
+        ],
+        "summary": "Syncs book progress with Kavita. Will attempt to save the underlying reader position if possible.",
+        "parameters": [
+          {
+            "name": "apiKey",
+            "in": "path",
+            "description": "",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/KoreaderBookDto"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/KoreaderBookDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/KoreaderBookDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/KoreaderProgressUpdateDto"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/KoreaderProgressUpdateDto"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/KoreaderProgressUpdateDto"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/Koreader/{apiKey}/syncs/progress/{ebookHash}": {
+      "get": {
+        "tags": [
+          "Koreader"
+        ],
+        "summary": "Gets book progress from Kavita, if not found will return a 400",
+        "parameters": [
+          {
+            "name": "apiKey",
+            "in": "path",
+            "description": "",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "ebookHash",
+            "in": "path",
+            "description": "",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/KoreaderBookDto"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/KoreaderBookDto"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/KoreaderBookDto"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/Library/create": {
       "post": {
         "tags": [
@@ -3217,59 +3553,6 @@
         }
       }
     },
-    "/api/Library/analyze": {
-      "post": {
-        "tags": [
-          "Library"
-        ],
-        "parameters": [
-          {
-            "name": "libraryId",
-            "in": "query",
-            "schema": {
-              "type": "integer",
-              "format": "int32"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK"
-          }
-        }
-      }
-    },
-    "/api/Library/analyze-multiple": {
-      "post": {
-        "tags": [
-          "Library"
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/BulkActionDto"
-              }
-            },
-            "text/json": {
-              "schema": {
-                "$ref": "#/components/schemas/BulkActionDto"
-              }
-            },
-            "application/*+json": {
-              "schema": {
-                "$ref": "#/components/schemas/BulkActionDto"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "OK"
-          }
-        }
-      }
-    },
     "/api/Library/copy-settings-from": {
       "post": {
         "tags": [
@@ -3341,10 +3624,13 @@
         "tags": [
           "Library"
         ],
+        "summary": "Deletes the library and all series within it.",
+        "description": "This does not touch any files",
         "parameters": [
           {
             "name": "libraryId",
             "in": "query",
+            "description": "",
             "schema": {
               "type": "integer",
               "format": "int32"
@@ -3375,6 +3661,51 @@
         }
       }
     },
+    "/api/Library/delete-multiple": {
+      "delete": {
+        "tags": [
+          "Library"
+        ],
+        "summary": "Deletes multiple libraries and all series within it.",
+        "description": "This does not touch any files",
+        "parameters": [
+          {
+            "name": "libraryIds",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "integer",
+                "format": "int32"
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "boolean"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/Library/name-exists": {
       "get": {
         "tags": [
@@ -3562,7 +3893,7 @@
         "tags": [
           "License"
         ],
-        "summary": "Has any license",
+        "summary": "Has any license registered with the instance. Does not check Kavita+ API",
         "responses": {
           "200": {
             "description": "OK",
@@ -3587,11 +3918,53 @@
         }
       }
     },
+    "/api/License/info": {
+      "get": {
+        "tags": [
+          "License"
+        ],
+        "summary": "Asks Kavita+ for the latest license info",
+        "parameters": [
+          {
+            "name": "forceCheck",
+            "in": "query",
+            "description": "Force checking the API and skip the 8 hour cache",
+            "schema": {
+              "type": "boolean",
+              "default": false
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/LicenseInfoDto"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/LicenseInfoDto"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/LicenseInfoDto"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/License": {
       "delete": {
         "tags": [
           "License"
         ],
+        "summary": "Remove the Kavita+ License on the Server",
         "responses": {
           "200": {
             "description": "OK"
@@ -3666,6 +4039,8 @@
         "tags": [
           "Locale"
         ],
+        "summary": "Returns all applicable locales on the server",
+        "description": "This can be cached as it will not change per version.",
         "responses": {
           "200": {
             "description": "OK",
@@ -3674,7 +4049,7 @@
                 "schema": {
                   "type": "array",
                   "items": {
-                    "type": "string"
+                    "$ref": "#/components/schemas/KavitaLocale"
                   }
                 }
               },
@@ -3682,7 +4057,7 @@
                 "schema": {
                   "type": "array",
                   "items": {
-                    "type": "string"
+                    "$ref": "#/components/schemas/KavitaLocale"
                   }
                 }
               },
@@ -3690,7 +4065,65 @@
                 "schema": {
                   "type": "array",
                   "items": {
-                    "type": "string"
+                    "$ref": "#/components/schemas/KavitaLocale"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/Manage/series-metadata": {
+      "post": {
+        "tags": [
+          "Manage"
+        ],
+        "summary": "Returns a list of all Series that is Kavita+ applicable to metadata match and the status of it",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ManageMatchFilterDto"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ManageMatchFilterDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/ManageMatchFilterDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ManageMatchSeriesDto"
+                  }
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ManageMatchSeriesDto"
+                  }
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ManageMatchSeriesDto"
                   }
                 }
               }
@@ -3713,6 +4146,23 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "name": "context",
+            "in": "query",
+            "description": "Context from which this API was invoked",
+            "schema": {
+              "enum": [
+                1,
+                2,
+                3,
+                4
+              ],
+              "type": "integer",
+              "description": "For complex queries, Library has certain restrictions where the library should not be included in results.\nThis enum dictates which field to use for the lookup.",
+              "format": "int32",
+              "default": 1
+            }
           }
         ],
         "responses": {
@@ -3748,6 +4198,64 @@
         }
       }
     },
+    "/api/Metadata/genres-with-counts": {
+      "post": {
+        "tags": [
+          "Metadata"
+        ],
+        "summary": "Returns a list of Genres with counts for counts when Genre is on Series/Chapter",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UserParams"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UserParams"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/UserParams"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/BrowseGenreDto"
+                  }
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/BrowseGenreDto"
+                  }
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/BrowseGenreDto"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/Metadata/people-by-role": {
       "get": {
         "tags": [
@@ -3912,6 +4420,64 @@
         }
       }
     },
+    "/api/Metadata/tags-with-counts": {
+      "post": {
+        "tags": [
+          "Metadata"
+        ],
+        "summary": "Returns a list of Tags with counts for counts when Tag is on Series/Chapter",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UserParams"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UserParams"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/UserParams"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/BrowseTagDto"
+                  }
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/BrowseTagDto"
+                  }
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/BrowseTagDto"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/Metadata/age-ratings": {
       "get": {
         "tags": [
@@ -4101,20 +4667,19 @@
         }
       }
     },
-    "/api/Metadata/chapter-summary": {
+    "/api/Metadata/language-title": {
       "get": {
         "tags": [
           "Metadata"
         ],
-        "summary": "Returns summary for the chapter",
+        "summary": "Given a language code returns the display name",
         "parameters": [
           {
-            "name": "chapterId",
+            "name": "code",
             "in": "query",
             "description": "",
             "schema": {
-              "type": "integer",
-              "format": "int32"
+              "type": "string"
             }
           }
         ],
@@ -4142,30 +4707,6 @@
         }
       }
     },
-    "/api/Metadata/force-refresh": {
-      "post": {
-        "tags": [
-          "Metadata"
-        ],
-        "summary": "If this Series is on Kavita+ Blacklist, removes it. If already cached, invalidates it.\r\nThis then attempts to refresh data from Kavita+ for this series.",
-        "parameters": [
-          {
-            "name": "seriesId",
-            "in": "query",
-            "description": "",
-            "schema": {
-              "type": "integer",
-              "format": "int32"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK"
-          }
-        }
-      }
-    },
     "/api/Metadata/series-detail-plus": {
       "get": {
         "tags": [
@@ -4715,10 +5256,12 @@
         "tags": [
           "Opds"
         ],
+        "summary": "OPDS Search endpoint",
         "parameters": [
           {
             "name": "apiKey",
             "in": "path",
+            "description": "",
             "required": true,
             "schema": {
               "type": "string"
@@ -4727,6 +5270,7 @@
           {
             "name": "query",
             "in": "query",
+            "description": "",
             "schema": {
               "type": "string"
             }
@@ -5136,6 +5680,586 @@
         }
       }
     },
+    "/api/Person": {
+      "get": {
+        "tags": [
+          "Person"
+        ],
+        "parameters": [
+          {
+            "name": "name",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/PersonDto"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PersonDto"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PersonDto"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/Person/search": {
+      "get": {
+        "tags": [
+          "Person"
+        ],
+        "summary": "Find a person by name or alias against a query string",
+        "parameters": [
+          {
+            "name": "queryString",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/PersonDto"
+                  }
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/PersonDto"
+                  }
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/PersonDto"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/Person/roles": {
+      "get": {
+        "tags": [
+          "Person"
+        ],
+        "summary": "Returns all roles for a Person",
+        "parameters": [
+          {
+            "name": "personId",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "enum": [
+                      1,
+                      3,
+                      4,
+                      5,
+                      6,
+                      7,
+                      8,
+                      9,
+                      10,
+                      11,
+                      12,
+                      13,
+                      14,
+                      15
+                    ],
+                    "type": "integer",
+                    "format": "int32"
+                  }
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "enum": [
+                      1,
+                      3,
+                      4,
+                      5,
+                      6,
+                      7,
+                      8,
+                      9,
+                      10,
+                      11,
+                      12,
+                      13,
+                      14,
+                      15
+                    ],
+                    "type": "integer",
+                    "format": "int32"
+                  }
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "enum": [
+                      1,
+                      3,
+                      4,
+                      5,
+                      6,
+                      7,
+                      8,
+                      9,
+                      10,
+                      11,
+                      12,
+                      13,
+                      14,
+                      15
+                    ],
+                    "type": "integer",
+                    "format": "int32"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/Person/all": {
+      "post": {
+        "tags": [
+          "Person"
+        ],
+        "summary": "Returns a list of authors and artists for browsing",
+        "parameters": [
+          {
+            "name": "PageNumber",
+            "in": "query",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "PageSize",
+            "in": "query",
+            "description": "If set to 0, will set as MaxInt",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/BrowsePersonFilterDto"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/BrowsePersonFilterDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/BrowsePersonFilterDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/BrowsePersonDto"
+                  }
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/BrowsePersonDto"
+                  }
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/BrowsePersonDto"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/Person/update": {
+      "post": {
+        "tags": [
+          "Person"
+        ],
+        "summary": "Updates the Person",
+        "requestBody": {
+          "description": "",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdatePersonDto"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdatePersonDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdatePersonDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/PersonDto"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PersonDto"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PersonDto"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/Person/fetch-cover": {
+      "post": {
+        "tags": [
+          "Person"
+        ],
+        "summary": "Attempts to download the cover from CoversDB (Note: Not yet release in Kavita)",
+        "parameters": [
+          {
+            "name": "personId",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/Person/series-known-for": {
+      "get": {
+        "tags": [
+          "Person"
+        ],
+        "summary": "Returns the top 20 series that the \"person\" is known for. This will use Average Rating when applicable (Kavita+ field), else it's a random sort",
+        "parameters": [
+          {
+            "name": "personId",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/SeriesDto"
+                  }
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/SeriesDto"
+                  }
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/SeriesDto"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/Person/chapters-by-role": {
+      "get": {
+        "tags": [
+          "Person"
+        ],
+        "summary": "Returns all individual chapters by role. Limited to 20 results.",
+        "parameters": [
+          {
+            "name": "personId",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "role",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "enum": [
+                1,
+                3,
+                4,
+                5,
+                6,
+                7,
+                8,
+                9,
+                10,
+                11,
+                12,
+                13,
+                14,
+                15
+              ],
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/StandaloneChapterDto"
+                  }
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/StandaloneChapterDto"
+                  }
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/StandaloneChapterDto"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/Person/merge": {
+      "post": {
+        "tags": [
+          "Person"
+        ],
+        "summary": "Merges Persons into one, this action is irreversible",
+        "requestBody": {
+          "description": "",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PersonMergeDto"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PersonMergeDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/PersonMergeDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/PersonDto"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PersonDto"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PersonDto"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/Person/valid-alias": {
+      "get": {
+        "tags": [
+          "Person"
+        ],
+        "summary": "Ensure the alias is valid to be added. For example, the alias cannot be on another person or be the same as the current person name/alias.",
+        "parameters": [
+          {
+            "name": "personId",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "alias",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "boolean"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/Plugin/authenticate": {
       "post": {
         "tags": [
@@ -5229,15 +6353,124 @@
         }
       }
     },
-    "/api/Rating/overall": {
+    "/api/Rating/series": {
+      "post": {
+        "tags": [
+          "Rating"
+        ],
+        "summary": "Update the users' rating of the given series",
+        "requestBody": {
+          "description": "",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateRatingDto"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateRatingDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateRatingDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/Rating/chapter": {
+      "post": {
+        "tags": [
+          "Rating"
+        ],
+        "summary": "Update the users' rating of the given chapter",
+        "requestBody": {
+          "description": "chapterId must be set",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateRatingDto"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateRatingDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateRatingDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/Rating/overall-series": {
       "get": {
         "tags": [
           "Rating"
         ],
+        "summary": "Overall rating from all Kavita users for a given Series",
         "parameters": [
           {
             "name": "seriesId",
             "in": "query",
+            "description": "",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/RatingDto"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RatingDto"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RatingDto"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/Rating/overall-chapter": {
+      "get": {
+        "tags": [
+          "Rating"
+        ],
+        "summary": "Overall rating from all Kavita users for a given Chapter",
+        "parameters": [
+          {
+            "name": "chapterId",
+            "in": "query",
+            "description": "",
             "schema": {
               "type": "integer",
               "format": "int32"
@@ -5290,6 +6523,14 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "name": "extractPdf",
+            "in": "query",
+            "schema": {
+              "type": "boolean",
+              "default": false
+            }
           }
         ],
         "responses": {
@@ -5439,7 +6680,7 @@
           "Reader"
         ],
         "summary": "Returns the file dimensions for all pages in a chapter. If the underlying chapter is PDF, use extractPDF to unpack as images.",
-        "description": "This has a side effect of caching the images.\r\n            This will only be populated on archive filetypes and not in bookmark mode",
+        "description": "This has a side effect of caching the images.\n            This will only be populated on archive filetypes and not in bookmark mode",
         "parameters": [
           {
             "name": "chapterId",
@@ -5913,7 +7154,7 @@
         "tags": [
           "Reader"
         ],
-        "summary": "Save page against Chapter for logged in user",
+        "summary": "Save page against Chapter for authenticated user",
         "requestBody": {
           "description": "",
           "content": {
@@ -5946,7 +7187,7 @@
         "tags": [
           "Reader"
         ],
-        "summary": "Continue point is the chapter which you should start reading again from. If there is no progress on a series, then the first chapter will be returned (non-special unless only specials).\r\nOtherwise, loop through the chapters and volumes in order to find the next chapter which has progress.",
+        "summary": "Continue point is the chapter which you should start reading again from. If there is no progress on a series, then the first chapter will be returned (non-special unless only specials).\nOtherwise, loop through the chapters and volumes in order to find the next chapter which has progress.",
         "parameters": [
           {
             "name": "seriesId",
@@ -6726,26 +7967,17 @@
             "content": {
               "text/plain": {
                 "schema": {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/ReadingListDto"
-                  }
+                  "$ref": "#/components/schemas/ReadingListDto"
                 }
               },
               "application/json": {
                 "schema": {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/ReadingListDto"
-                  }
+                  "$ref": "#/components/schemas/ReadingListDto"
                 }
               },
               "text/json": {
                 "schema": {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/ReadingListDto"
-                  }
+                  "$ref": "#/components/schemas/ReadingListDto"
                 }
               }
             }
@@ -7040,7 +8272,7 @@
         "tags": [
           "ReadingList"
         ],
-        "summary": "Deletes a list item from the list. Will reorder all item positions afterwards",
+        "summary": "Deletes a list item from the list. Item orders will update as a result.",
         "requestBody": {
           "description": "",
           "content": {
@@ -7336,12 +8568,87 @@
         }
       }
     },
-    "/api/ReadingList/characters": {
+    "/api/ReadingList/people": {
       "get": {
         "tags": [
           "ReadingList"
         ],
-        "summary": "Returns a list of characters associated with the reading list",
+        "summary": "Returns a list of a given role associated with the reading list",
+        "parameters": [
+          {
+            "name": "readingListId",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "role",
+            "in": "query",
+            "description": "PersonRole",
+            "schema": {
+              "enum": [
+                1,
+                3,
+                4,
+                5,
+                6,
+                7,
+                8,
+                9,
+                10,
+                11,
+                12,
+                13,
+                14,
+                15
+              ],
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/PersonDto"
+                  }
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/PersonDto"
+                  }
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/PersonDto"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/ReadingList/all-people": {
+      "get": {
+        "tags": [
+          "ReadingList"
+        ],
+        "summary": "Returns all people in given roles for a reading list",
         "parameters": [
           {
             "name": "readingListId",
@@ -7598,6 +8905,634 @@
         }
       }
     },
+    "/api/ReadingList/info": {
+      "get": {
+        "tags": [
+          "ReadingList"
+        ],
+        "summary": "Returns random information about a Reading List",
+        "parameters": [
+          {
+            "name": "readingListId",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/ReadingListInfoDto"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ReadingListInfoDto"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ReadingListInfoDto"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/reading-profile/all": {
+      "get": {
+        "tags": [
+          "ReadingProfile"
+        ],
+        "summary": "Gets all non-implicit reading profiles for a user",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/UserReadingProfileDto"
+                  }
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/UserReadingProfileDto"
+                  }
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/UserReadingProfileDto"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/reading-profile/{seriesId}": {
+      "get": {
+        "tags": [
+          "ReadingProfile"
+        ],
+        "summary": "Returns the ReadingProfile that should be applied to the given series, walks up the tree.\nSeries -> Library -> Default",
+        "parameters": [
+          {
+            "name": "seriesId",
+            "in": "path",
+            "description": "",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "skipImplicit",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "boolean"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReadingProfileDto"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReadingProfileDto"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReadingProfileDto"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/reading-profile/library": {
+      "get": {
+        "tags": [
+          "ReadingProfile"
+        ],
+        "summary": "Returns the (potential) Reading Profile bound to the library",
+        "parameters": [
+          {
+            "name": "libraryId",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReadingProfileDto"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReadingProfileDto"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReadingProfileDto"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/reading-profile/create": {
+      "post": {
+        "tags": [
+          "ReadingProfile"
+        ],
+        "summary": "Creates a new reading profile for the current user",
+        "requestBody": {
+          "description": "",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UserReadingProfileDto"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UserReadingProfileDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/UserReadingProfileDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReadingProfileDto"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReadingProfileDto"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReadingProfileDto"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/reading-profile/promote": {
+      "post": {
+        "tags": [
+          "ReadingProfile"
+        ],
+        "summary": "Promotes the implicit profile to a user profile. Removes the series from other profiles",
+        "parameters": [
+          {
+            "name": "profileId",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReadingProfileDto"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReadingProfileDto"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReadingProfileDto"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/reading-profile/series": {
+      "post": {
+        "tags": [
+          "ReadingProfile"
+        ],
+        "summary": "Update the implicit reading profile for a series, creates one if none exists",
+        "description": "Any modification to the reader settings during reading will create an implicit profile. Use \"update-parent\" to save to the bound series profile.",
+        "parameters": [
+          {
+            "name": "seriesId",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UserReadingProfileDto"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UserReadingProfileDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/UserReadingProfileDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReadingProfileDto"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReadingProfileDto"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReadingProfileDto"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/reading-profile/update-parent": {
+      "post": {
+        "tags": [
+          "ReadingProfile"
+        ],
+        "summary": "Updates the non-implicit reading profile for the given series, and removes implicit profiles",
+        "parameters": [
+          {
+            "name": "seriesId",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UserReadingProfileDto"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UserReadingProfileDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/UserReadingProfileDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReadingProfileDto"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReadingProfileDto"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReadingProfileDto"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/reading-profile": {
+      "post": {
+        "tags": [
+          "ReadingProfile"
+        ],
+        "summary": "Updates the given reading profile, must belong to the current user",
+        "description": "This does not update connected series and libraries.",
+        "requestBody": {
+          "description": "",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UserReadingProfileDto"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UserReadingProfileDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/UserReadingProfileDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReadingProfileDto"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReadingProfileDto"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReadingProfileDto"
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ReadingProfile"
+        ],
+        "summary": "Deletes the given profile, requires the profile to belong to the logged-in user",
+        "parameters": [
+          {
+            "name": "profileId",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/reading-profile/series/{seriesId}": {
+      "post": {
+        "tags": [
+          "ReadingProfile"
+        ],
+        "summary": "Sets the reading profile for a given series, removes the old one",
+        "parameters": [
+          {
+            "name": "seriesId",
+            "in": "path",
+            "description": "",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "profileId",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ReadingProfile"
+        ],
+        "summary": "Clears the reading profile for the given series for the currently logged-in user",
+        "parameters": [
+          {
+            "name": "seriesId",
+            "in": "path",
+            "description": "",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/reading-profile/library/{libraryId}": {
+      "post": {
+        "tags": [
+          "ReadingProfile"
+        ],
+        "summary": "Sets the reading profile for a given library, removes the old one",
+        "parameters": [
+          {
+            "name": "libraryId",
+            "in": "path",
+            "description": "",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "profileId",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "ReadingProfile"
+        ],
+        "summary": "Clears the reading profile for the given library for the currently logged-in user",
+        "parameters": [
+          {
+            "name": "libraryId",
+            "in": "path",
+            "description": "",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/reading-profile/bulk": {
+      "post": {
+        "tags": [
+          "ReadingProfile"
+        ],
+        "summary": "Assigns the reading profile to all passes series, and deletes their implicit profiles",
+        "parameters": [
+          {
+            "name": "profileId",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "",
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            },
+            "text/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
     "/api/Recommended/quick-reads": {
       "get": {
         "tags": [
@@ -7942,12 +9877,12 @@
         }
       }
     },
-    "/api/Review": {
+    "/api/Review/series": {
       "post": {
         "tags": [
           "Review"
         ],
-        "summary": "Updates the review for a given series",
+        "summary": "Updates the user's review for a given series",
         "requestBody": {
           "description": "",
           "content": {
@@ -8013,6 +9948,77 @@
         }
       }
     },
+    "/api/Review/chapter": {
+      "post": {
+        "tags": [
+          "Review"
+        ],
+        "summary": "Update the user's review for a given chapter",
+        "requestBody": {
+          "description": "chapterId must be set",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateUserReviewDto"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateUserReviewDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateUserReviewDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReviewDto"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReviewDto"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserReviewDto"
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Review"
+        ],
+        "summary": "Deletes the user's review for the given chapter",
+        "parameters": [
+          {
+            "name": "chapterId",
+            "in": "query",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
     "/api/Scrobbling/anilist-token": {
       "get": {
         "tags": [
@@ -8048,6 +10054,7 @@
         "tags": [
           "Scrobbling"
         ],
+        "summary": "Get the current user's MAL token and username",
         "responses": {
           "200": {
             "description": "OK",
@@ -8100,7 +10107,24 @@
         },
         "responses": {
           "200": {
-            "description": "OK"
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "boolean"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
           }
         }
       }
@@ -8131,6 +10155,36 @@
             }
           }
         },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "boolean"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/Scrobbling/generate-scrobble-events": {
+      "post": {
+        "tags": [
+          "Scrobbling"
+        ],
+        "summary": "When a user request to generate scrobble events from history. Should only be ran once per user.",
         "responses": {
           "200": {
             "description": "OK"
@@ -8153,7 +10207,9 @@
               "enum": [
                 0,
                 1,
-                2
+                2,
+                3,
+                4
               ],
               "type": "integer",
               "description": "Misleading name but is the source of data (like a review coming from AniList)",
@@ -8466,7 +10522,7 @@
         "tags": [
           "Scrobbling"
         ],
-        "summary": "Adds a hold against the Series for user's scrobbling",
+        "summary": "Remove a hold against the Series for user's scrobbling",
         "parameters": [
           {
             "name": "seriesId",
@@ -8485,12 +10541,87 @@
         }
       }
     },
+    "/api/Scrobbling/has-ran-scrobble-gen": {
+      "get": {
+        "tags": [
+          "Scrobbling"
+        ],
+        "summary": "Has the logged in user ran scrobble generation",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "boolean"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/Scrobbling/bulk-remove-events": {
+      "post": {
+        "tags": [
+          "Scrobbling"
+        ],
+        "summary": "Delete the given scrobble events if they belong to that user",
+        "requestBody": {
+          "description": "",
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "integer",
+                  "format": "int64"
+                }
+              }
+            },
+            "text/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "integer",
+                  "format": "int64"
+                }
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "integer",
+                  "format": "int64"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
     "/api/Search/series-for-mangafile": {
       "get": {
         "tags": [
           "Search"
         ],
-        "summary": "Returns the series for the MangaFile id. If the user does not have access (shouldn't happen by the UI),\r\nthen null is returned",
+        "summary": "Returns the series for the MangaFile id. If the user does not have access (shouldn't happen by the UI),\nthen null is returned",
         "parameters": [
           {
             "name": "mangaFileId",
@@ -8531,7 +10662,7 @@
         "tags": [
           "Search"
         ],
-        "summary": "Returns the series for the Chapter id. If the user does not have access (shouldn't happen by the UI),\r\nthen null is returned",
+        "summary": "Returns the series for the Chapter id. If the user does not have access (shouldn't happen by the UI),\nthen null is returned",
         "parameters": [
           {
             "name": "chapterId",
@@ -8758,7 +10889,7 @@
                 "schema": {
                   "type": "array",
                   "items": {
-                    "$ref": "#/components/schemas/Series"
+                    "$ref": "#/components/schemas/SeriesDto"
                   }
                 }
               },
@@ -8766,7 +10897,7 @@
                 "schema": {
                   "type": "array",
                   "items": {
-                    "$ref": "#/components/schemas/Series"
+                    "$ref": "#/components/schemas/SeriesDto"
                   }
                 }
               },
@@ -8774,7 +10905,7 @@
                 "schema": {
                   "type": "array",
                   "items": {
-                    "$ref": "#/components/schemas/Series"
+                    "$ref": "#/components/schemas/SeriesDto"
                   }
                 }
               }
@@ -9064,39 +11195,6 @@
         "deprecated": true
       }
     },
-    "/api/Series/update-rating": {
-      "post": {
-        "tags": [
-          "Series"
-        ],
-        "summary": "Update the user rating for the given series",
-        "requestBody": {
-          "description": "",
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/UpdateSeriesRatingDto"
-              }
-            },
-            "text/json": {
-              "schema": {
-                "$ref": "#/components/schemas/UpdateSeriesRatingDto"
-              }
-            },
-            "application/*+json": {
-              "schema": {
-                "$ref": "#/components/schemas/UpdateSeriesRatingDto"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "OK"
-          }
-        }
-      }
-    },
     "/api/Series/update": {
       "post": {
         "tags": [
@@ -9363,7 +11461,7 @@
           {
             "name": "libraryId",
             "in": "query",
-            "description": "",
+            "description": "This is not in use",
             "schema": {
               "type": "integer",
               "format": "int32",
@@ -9373,7 +11471,7 @@
           {
             "name": "context",
             "in": "query",
-            "description": "For complex queries, Library has certain restrictions where the library should not be included in results.\r\nThis enum dictates which field to use for the lookup.",
+            "description": "For complex queries, Library has certain restrictions where the library should not be included in results.\nThis enum dictates which field to use for the lookup.",
             "schema": {
               "enum": [
                 1,
@@ -9382,7 +11480,7 @@
                 4
               ],
               "type": "integer",
-              "description": "For complex queries, Library has certain restrictions where the library should not be included in results.\r\nThis enum dictates which field to use for the lookup.",
+              "description": "For complex queries, Library has certain restrictions where the library should not be included in results.\nThis enum dictates which field to use for the lookup.",
               "format": "int32",
               "default": 1
             }
@@ -9865,7 +11963,7 @@
         "tags": [
           "Series"
         ],
-        "summary": "Fetches Series for a set of Ids. This will check User for permission access and filter out any Ids that don't exist or\r\nthe user does not have access to.",
+        "summary": "Fetches Series for a set of Ids. This will check User for permission access and filter out any Ids that don't exist or\nthe user does not have access to.",
         "requestBody": {
           "content": {
             "application/json": {
@@ -10212,7 +12310,7 @@
         "tags": [
           "Series"
         ],
-        "summary": "Based on the delta times between when chapters are added, for series that are not Completed/Cancelled/Hiatus, forecast the next\r\ndate when it will be available.",
+        "summary": "Based on the delta times between when chapters are added, for series that are not Completed/Cancelled/Hiatus, forecast the next\ndate when it will be available.",
         "parameters": [
           {
             "name": "seriesId",
@@ -10248,6 +12346,145 @@
         }
       }
     },
+    "/api/Series/match": {
+      "post": {
+        "tags": [
+          "Series"
+        ],
+        "summary": "Sends a request to Kavita+ API for all potential matches, sorted by relevance",
+        "requestBody": {
+          "description": "",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/MatchSeriesDto"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/MatchSeriesDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/MatchSeriesDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ExternalSeriesMatchDto"
+                  }
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ExternalSeriesMatchDto"
+                  }
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ExternalSeriesMatchDto"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/Series/update-match": {
+      "post": {
+        "tags": [
+          "Series"
+        ],
+        "summary": "This will perform the fix match",
+        "parameters": [
+          {
+            "name": "seriesId",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "aniListId",
+            "in": "query",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "malId",
+            "in": "query",
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          },
+          {
+            "name": "cbrId",
+            "in": "query",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/Series/dont-match": {
+      "post": {
+        "tags": [
+          "Series"
+        ],
+        "summary": "When true, will not perform a match and will prevent Kavita from attempting to match/scrobble against this series",
+        "parameters": [
+          {
+            "name": "seriesId",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "dontMatch",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "boolean"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
     "/api/Server/clear-cache": {
       "post": {
         "tags": [
@@ -10274,6 +12511,19 @@
         }
       }
     },
+    "/api/Server/cleanup": {
+      "post": {
+        "tags": [
+          "Server"
+        ],
+        "summary": "Performs the nightly maintenance work on the Server. Can be heavy.",
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
     "/api/Server/backup-db": {
       "post": {
         "tags": [
@@ -10300,36 +12550,6 @@
         }
       }
     },
-    "/api/Server/server-info": {
-      "get": {
-        "tags": [
-          "Server"
-        ],
-        "summary": "Returns non-sensitive information about the current system",
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "$ref": "#/components/schemas/ServerInfoDto"
-                }
-              },
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ServerInfoDto"
-                }
-              },
-              "text/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ServerInfoDto"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
     "/api/Server/server-info-slim": {
       "get": {
         "tags": [
@@ -10343,17 +12563,17 @@
             "content": {
               "text/plain": {
                 "schema": {
-                  "$ref": "#/components/schemas/ServerInfoDto"
+                  "$ref": "#/components/schemas/ServerInfoSlimDto"
                 }
               },
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/ServerInfoDto"
+                  "$ref": "#/components/schemas/ServerInfoSlimDto"
                 }
               },
               "text/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/ServerInfoDto"
+                  "$ref": "#/components/schemas/ServerInfoSlimDto"
                 }
               }
             }
@@ -10437,6 +12657,17 @@
           "Server"
         ],
         "summary": "Returns how many versions out of date this install is",
+        "parameters": [
+          {
+            "name": "stableOnly",
+            "in": "query",
+            "description": "Only count Stable releases",
+            "schema": {
+              "type": "boolean",
+              "default": true
+            }
+          }
+        ],
         "responses": {
           "200": {
             "description": "OK",
@@ -10470,6 +12701,18 @@
           "Server"
         ],
         "summary": "Pull the Changelog for Kavita from Github and display",
+        "parameters": [
+          {
+            "name": "count",
+            "in": "query",
+            "description": "How many releases from the latest to return",
+            "schema": {
+              "type": "integer",
+              "format": "int32",
+              "default": 0
+            }
+          }
+        ],
         "responses": {
           "200": {
             "description": "OK",
@@ -10625,6 +12868,7 @@
         "tags": [
           "Settings"
         ],
+        "summary": "Returns the base url for this instance (if set)",
         "responses": {
           "200": {
             "description": "OK",
@@ -10682,7 +12926,9 @@
         "tags": [
           "Settings"
         ],
+        "summary": "Update Server settings",
         "requestBody": {
+          "description": "",
           "content": {
             "application/json": {
               "schema": {
@@ -11058,6 +13304,84 @@
         }
       }
     },
+    "/api/Settings/metadata-settings": {
+      "get": {
+        "tags": [
+          "Settings"
+        ],
+        "summary": "Get the metadata settings for Kavita+ users.",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/MetadataSettingsDto"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MetadataSettingsDto"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MetadataSettingsDto"
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "Settings"
+        ],
+        "summary": "Update the metadata settings for Kavita+ Metadata feature",
+        "requestBody": {
+          "description": "",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/MetadataSettingsDto"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/MetadataSettingsDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/MetadataSettingsDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "$ref": "#/components/schemas/MetadataSettingsDto"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MetadataSettingsDto"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/MetadataSettingsDto"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/Stats/user/{userId}/read": {
       "get": {
         "tags": [
@@ -11651,45 +13975,6 @@
         }
       }
     },
-    "/api/Stats/kavitaplus-metadata-breakdown": {
-      "get": {
-        "tags": [
-          "Stats"
-        ],
-        "summary": "Returns for Kavita+ the number of Series that have been processed, errored, and not processed",
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "text/plain": {
-                "schema": {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/Int32StatCount"
-                  }
-                }
-              },
-              "application/json": {
-                "schema": {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/Int32StatCount"
-                  }
-                }
-              },
-              "text/json": {
-                "schema": {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/Int32StatCount"
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    },
     "/api/Stream/dashboard": {
       "get": {
         "tags": [
@@ -12291,6 +14576,54 @@
         }
       }
     },
+    "/api/Stream/smart-filter-side-nav-stream": {
+      "delete": {
+        "tags": [
+          "Stream"
+        ],
+        "summary": "Removes a Smart Filter from a user's SideNav Streams",
+        "parameters": [
+          {
+            "name": "sideNavStreamId",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/api/Stream/smart-filter-dashboard-stream": {
+      "delete": {
+        "tags": [
+          "Stream"
+        ],
+        "summary": "Removes a Smart Filter from a user's Dashboard Streams",
+        "parameters": [
+          {
+            "name": "dashboardStreamId",
+            "in": "query",
+            "description": "",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
     "/api/Tachiyomi/latest-chapter": {
       "get": {
         "tags": [
@@ -12634,7 +14967,6 @@
         ],
         "summary": "Uploads a new theme file",
         "requestBody": {
-          "description": "",
           "content": {
             "multipart/form-data": {
               "schema": {
@@ -12642,6 +14974,7 @@
                 "properties": {
                   "formFile": {
                     "type": "string",
+                    "description": "",
                     "format": "binary"
                   }
                 }
@@ -12683,7 +15016,7 @@
         "tags": [
           "Upload"
         ],
-        "summary": "This stores a file (image) in temp directory for use in a cover image replacement flow.\r\nThis is automatically cleaned up.",
+        "summary": "This stores a file (image) in temp directory for use in a cover image replacement flow.\nThis is automatically cleaned up.",
         "requestBody": {
           "description": "Escaped url to download from",
           "content": {
@@ -12962,6 +15295,39 @@
         "deprecated": true
       }
     },
+    "/api/Upload/person": {
+      "post": {
+        "tags": [
+          "Upload"
+        ],
+        "summary": "Replaces person tag cover image and locks it with a base64 encoded image",
+        "requestBody": {
+          "description": "",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UploadFileDto"
+              }
+            },
+            "text/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UploadFileDto"
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "$ref": "#/components/schemas/UploadFileDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
     "/api/Users/delete-user": {
       "delete": {
         "tags": [
@@ -13154,7 +15520,10 @@
         "tags": [
           "Users"
         ],
+        "summary": "Update the user preferences",
+        "description": "If the user has ReadOnly role, they will not be able to perform this action",
         "requestBody": {
+          "description": "",
           "content": {
             "application/json": {
               "schema": {
@@ -13266,15 +15635,57 @@
         }
       }
     },
+    "/api/Users/tokens": {
+      "get": {
+        "tags": [
+          "Users"
+        ],
+        "summary": "Returns all users with tokens registered and their token information. Does not send the tokens.",
+        "description": "Kavita+ only",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/UserTokenInfo"
+                  }
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/UserTokenInfo"
+                  }
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/UserTokenInfo"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/Volume": {
       "get": {
         "tags": [
           "Volume"
         ],
+        "summary": "Returns the appropriate Volume",
         "parameters": [
           {
             "name": "volumeId",
             "in": "query",
+            "description": "",
             "schema": {
               "type": "integer",
               "format": "int32"
@@ -13342,6 +15753,66 @@
         }
       }
     },
+    "/api/Volume/multiple": {
+      "post": {
+        "tags": [
+          "Volume"
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            },
+            "text/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            },
+            "application/*+json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "boolean"
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              },
+              "text/json": {
+                "schema": {
+                  "type": "boolean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/want-to-read": {
       "post": {
         "tags": [
@@ -13606,6 +16077,28 @@
   },
   "components": {
     "schemas": {
+      "ALMediaTitle": {
+        "type": "object",
+        "properties": {
+          "englishTitle": {
+            "type": "string",
+            "nullable": true
+          },
+          "romajiTitle": {
+            "type": "string",
+            "nullable": true
+          },
+          "nativeTitle": {
+            "type": "string",
+            "nullable": true
+          },
+          "preferredTitle": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
       "AgeRatingDto": {
         "required": [
           "title"
@@ -13822,9 +16315,23 @@
             },
             "nullable": true
           },
+          "chapterRatings": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AppUserChapterRating"
+            },
+            "nullable": true
+          },
           "userPreferences": {
             "$ref": "#/components/schemas/AppUserPreferences"
           },
+          "readingProfiles": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AppUserReadingProfile"
+            },
+            "nullable": true
+          },
           "bookmarks": {
             "type": "array",
             "items": {
@@ -13925,6 +16432,15 @@
             "description": "The Client ID for the user's MAL account. User should create a client on MAL for this.",
             "nullable": true
           },
+          "hasRunScrobbleEventGeneration": {
+            "type": "boolean",
+            "description": "Has the user ran Scrobble Event Generation"
+          },
+          "scrobbleEventGenerationRan": {
+            "type": "string",
+            "description": "The timestamp of when Scrobble Event Generation ran (Utc)",
+            "format": "date-time"
+          },
           "scrobbleHolds": {
             "type": "array",
             "items": {
@@ -14024,6 +16540,52 @@
         "additionalProperties": false,
         "description": "Represents a saved page in a Chapter entity for a given user."
       },
+      "AppUserChapterRating": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "rating": {
+            "type": "number",
+            "description": "A number between 0-5.0 that represents how good a series is.",
+            "format": "float"
+          },
+          "hasBeenRated": {
+            "type": "boolean",
+            "description": "If the rating has been explicitly set. Otherwise, the 0.0 rating should be ignored as it's not rated"
+          },
+          "review": {
+            "type": "string",
+            "description": "A short summary the user can write when giving their review.",
+            "nullable": true
+          },
+          "seriesId": {
+            "type": "integer",
+            "description": "An optional tagline for the review",
+            "format": "int32"
+          },
+          "series": {
+            "$ref": "#/components/schemas/Series"
+          },
+          "chapterId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "chapter": {
+            "$ref": "#/components/schemas/Chapter"
+          },
+          "appUserId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "appUser": {
+            "$ref": "#/components/schemas/AppUser"
+          }
+        },
+        "additionalProperties": false
+      },
       "AppUserCollection": {
         "required": [
           "ageRating",
@@ -14123,7 +16685,9 @@
             "enum": [
               0,
               1,
-              2
+              2,
+              3,
+              4
             ],
             "type": "integer",
             "description": "Who created/manages the list. Non-Kavita lists are not editable by the user, except to promote",
@@ -14141,7 +16705,7 @@
           },
           "missingSeriesFromSource": {
             "type": "string",
-            "description": "A \r\n separated string of all missing series",
+            "description": "A \n separated string of all missing series",
             "nullable": true
           },
           "appUser": {
@@ -14212,6 +16776,11 @@
           "coverImageLocked": {
             "type": "boolean"
           },
+          "itemCount": {
+            "type": "integer",
+            "description": "Number of Series in the Collection",
+            "format": "int32"
+          },
           "owner": {
             "type": "string",
             "description": "Owner of the Collection",
@@ -14226,7 +16795,9 @@
             "enum": [
               0,
               1,
-              2
+              2,
+              3,
+              4
             ],
             "type": "integer",
             "description": "Who created/manages the list. Non-Kavita lists are not editable by the user, except to promote",
@@ -14244,7 +16815,7 @@
           },
           "missingSeriesFromSource": {
             "type": "string",
-            "description": "A \r\n separated string of all missing series",
+            "description": "A \n separated string of all missing series",
             "nullable": true
           }
         },
@@ -14383,7 +16954,7 @@
               2
             ],
             "type": "integer",
-            "description": "Manga Reader Option: How the manga reader should perform paging or reading of the file\r\n\r\nWebtoon uses scrolling to page, MANGA_LR uses paging by clicking left/right side of reader, MANGA_UD uses paging\r\nby clicking top/bottom sides of reader.\r\n",
+            "description": "Manga Reader Option: How the manga reader should perform paging or reading of the file\n\nWebtoon uses scrolling to page, MANGA_LR uses paging by clicking left/right side of reader, MANGA_UD uses paging\nby clicking top/bottom sides of reader.\n",
             "format": "int32"
           },
           "autoCloseMenu": {
@@ -14417,6 +16988,10 @@
             "type": "boolean",
             "description": "Manga Reader Option: Should swiping trigger pagination"
           },
+          "allowAutomaticWebtoonReaderDetection": {
+            "type": "boolean",
+            "description": "Manga Reader Option: Allow Automatic Webtoon detection"
+          },
           "bookReaderMargin": {
             "type": "integer",
             "description": "Book Reader Option: Override extra Margin",
@@ -14471,7 +17046,7 @@
               2
             ],
             "type": "integer",
-            "description": "Book Reader Option: The way a page from a book is rendered. Default is as book dictates, 1 column is fit to height,\r\n2 column is fit to height, 2 columns",
+            "description": "Book Reader Option: The way a page from a book is rendered. Default is as book dictates, 1 column is fit to height,\n2 column is fit to height, 2 columns",
             "format": "int32"
           },
           "bookReaderImmersiveMode": {
@@ -14544,6 +17119,14 @@
             "description": "UI Site Global Setting: The language locale that should be used for the user",
             "nullable": true
           },
+          "aniListScrobblingEnabled": {
+            "type": "boolean",
+            "description": "Should this account have Scrobbling enabled for AniList"
+          },
+          "wantToReadSync": {
+            "type": "boolean",
+            "description": "Should this account have Want to Read Sync enabled"
+          },
           "appUser": {
             "$ref": "#/components/schemas/AppUser"
           },
@@ -14589,7 +17172,7 @@
           },
           "bookScrollId": {
             "type": "string",
-            "description": "For Book Reader, represents the nearest passed anchor on the screen that can be used to resume scroll point\r\non next load",
+            "description": "For Book Reader, represents the nearest passed anchor on the screen that can be used to resume scroll point\non next load",
             "nullable": true
           },
           "created": {
@@ -14666,6 +17249,239 @@
         },
         "additionalProperties": false
       },
+      "AppUserReadingProfile": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "normalizedName": {
+            "type": "string",
+            "nullable": true
+          },
+          "appUserId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "appUser": {
+            "$ref": "#/components/schemas/AppUser"
+          },
+          "kind": {
+            "enum": [
+              0,
+              1,
+              2
+            ],
+            "type": "integer",
+            "format": "int32"
+          },
+          "libraryIds": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true
+          },
+          "seriesIds": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true
+          },
+          "readingDirection": {
+            "enum": [
+              0,
+              1
+            ],
+            "type": "integer",
+            "description": "Manga Reader Option: What direction should the next/prev page buttons go",
+            "format": "int32"
+          },
+          "scalingOption": {
+            "enum": [
+              0,
+              1,
+              2,
+              3
+            ],
+            "type": "integer",
+            "description": "Manga Reader Option: How should the image be scaled to screen",
+            "format": "int32"
+          },
+          "pageSplitOption": {
+            "enum": [
+              0,
+              1,
+              2,
+              3
+            ],
+            "type": "integer",
+            "description": "Manga Reader Option: Which side of a split image should we show first",
+            "format": "int32"
+          },
+          "readerMode": {
+            "enum": [
+              0,
+              1,
+              2
+            ],
+            "type": "integer",
+            "description": "Manga Reader Option: How the manga reader should perform paging or reading of the file\n\nWebtoon uses scrolling to page, MANGA_LR uses paging by clicking left/right side of reader, MANGA_UD uses paging\nby clicking top/bottom sides of reader.\n",
+            "format": "int32"
+          },
+          "autoCloseMenu": {
+            "type": "boolean",
+            "description": "Manga Reader Option: Allow the menu to close after 6 seconds without interaction"
+          },
+          "showScreenHints": {
+            "type": "boolean",
+            "description": "Manga Reader Option: Show screen hints to the user on some actions, ie) pagination direction change"
+          },
+          "emulateBook": {
+            "type": "boolean",
+            "description": "Manga Reader Option: Emulate a book by applying a shadow effect on the pages"
+          },
+          "layoutMode": {
+            "enum": [
+              1,
+              2,
+              3
+            ],
+            "type": "integer",
+            "description": "Manga Reader Option: How many pages to display in the reader at once",
+            "format": "int32"
+          },
+          "backgroundColor": {
+            "type": "string",
+            "description": "Manga Reader Option: Background color of the reader",
+            "nullable": true
+          },
+          "swipeToPaginate": {
+            "type": "boolean",
+            "description": "Manga Reader Option: Should swiping trigger pagination"
+          },
+          "allowAutomaticWebtoonReaderDetection": {
+            "type": "boolean",
+            "description": "Manga Reader Option: Allow Automatic Webtoon detection"
+          },
+          "widthOverride": {
+            "type": "integer",
+            "description": "Manga Reader Option: Optional fixed width override",
+            "format": "int32",
+            "nullable": true
+          },
+          "disableWidthOverride": {
+            "enum": [
+              0,
+              1,
+              2,
+              3
+            ],
+            "type": "integer",
+            "description": "Manga Reader Option: Disable the width override if the screen is past the breakpoint",
+            "format": "int32"
+          },
+          "bookReaderMargin": {
+            "type": "integer",
+            "description": "Book Reader Option: Override extra Margin",
+            "format": "int32"
+          },
+          "bookReaderLineSpacing": {
+            "type": "integer",
+            "description": "Book Reader Option: Override line-height",
+            "format": "int32"
+          },
+          "bookReaderFontSize": {
+            "type": "integer",
+            "description": "Book Reader Option: Override font size",
+            "format": "int32"
+          },
+          "bookReaderFontFamily": {
+            "type": "string",
+            "description": "Book Reader Option: Maps to the default Kavita font-family (inherit) or an override",
+            "nullable": true
+          },
+          "bookReaderTapToPaginate": {
+            "type": "boolean",
+            "description": "Book Reader Option: Allows tapping on side of screens to paginate"
+          },
+          "bookReaderReadingDirection": {
+            "enum": [
+              0,
+              1
+            ],
+            "type": "integer",
+            "description": "Book Reader Option: What direction should the next/prev page buttons go",
+            "format": "int32"
+          },
+          "bookReaderWritingStyle": {
+            "enum": [
+              0,
+              1
+            ],
+            "type": "integer",
+            "description": "Book Reader Option: Defines the writing styles vertical/horizontal",
+            "format": "int32"
+          },
+          "bookThemeName": {
+            "type": "string",
+            "description": "Book Reader Option: The color theme to decorate the book contents",
+            "nullable": true
+          },
+          "bookReaderLayoutMode": {
+            "enum": [
+              0,
+              1,
+              2
+            ],
+            "type": "integer",
+            "description": "Book Reader Option: The way a page from a book is rendered. Default is as book dictates, 1 column is fit to height,\n2 column is fit to height, 2 columns",
+            "format": "int32"
+          },
+          "bookReaderImmersiveMode": {
+            "type": "boolean",
+            "description": "Book Reader Option: A flag that hides the menu-ing system behind a click on the screen. This should be used with tap to paginate, but the app doesn't enforce this."
+          },
+          "pdfTheme": {
+            "enum": [
+              0,
+              1
+            ],
+            "type": "integer",
+            "description": "PDF Reader: Theme of the Reader",
+            "format": "int32"
+          },
+          "pdfScrollMode": {
+            "enum": [
+              0,
+              1,
+              3
+            ],
+            "type": "integer",
+            "description": "PDF Reader: Scroll mode of the reader",
+            "format": "int32"
+          },
+          "pdfSpreadMode": {
+            "enum": [
+              0,
+              1,
+              2
+            ],
+            "type": "integer",
+            "description": "PDF Reader: Spread Mode of the reader",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
       "AppUserRole": {
         "type": "object",
         "properties": {
@@ -14730,7 +17546,8 @@
               5,
               6,
               7,
-              8
+              8,
+              9
             ],
             "type": "integer",
             "description": "For system provided",
@@ -15102,6 +17919,173 @@
         },
         "additionalProperties": false
       },
+      "BrowseGenreDto": {
+        "required": [
+          "title"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "title": {
+            "type": "string",
+            "nullable": true
+          },
+          "seriesCount": {
+            "type": "integer",
+            "description": "Number of Series this Entity is on",
+            "format": "int32"
+          },
+          "chapterCount": {
+            "type": "integer",
+            "description": "Number of Chapters this Entity is on",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "BrowsePersonDto": {
+        "required": [
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "coverImageLocked": {
+            "type": "boolean"
+          },
+          "primaryColor": {
+            "type": "string",
+            "nullable": true
+          },
+          "secondaryColor": {
+            "type": "string",
+            "nullable": true
+          },
+          "coverImage": {
+            "type": "string",
+            "nullable": true
+          },
+          "aliases": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "description": {
+            "type": "string",
+            "nullable": true
+          },
+          "asin": {
+            "type": "string",
+            "description": "ASIN for person",
+            "nullable": true
+          },
+          "aniListId": {
+            "type": "integer",
+            "description": "https://anilist.co/staff/{AniListId}/",
+            "format": "int32"
+          },
+          "malId": {
+            "type": "integer",
+            "description": "https://myanimelist.net/people/{MalId}/\nhttps://myanimelist.net/character/{MalId}/CharacterName",
+            "format": "int64"
+          },
+          "hardcoverId": {
+            "type": "string",
+            "description": "https://hardcover.app/authors/{HardcoverId}",
+            "nullable": true
+          },
+          "seriesCount": {
+            "type": "integer",
+            "description": "Number of Series this Person is the Writer for",
+            "format": "int32"
+          },
+          "chapterCount": {
+            "type": "integer",
+            "description": "Number of Issues this Person is the Writer for",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false,
+        "description": "Used to browse writers and click in to see their series"
+      },
+      "BrowsePersonFilterDto": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "description": "Not used - For parity with Series Filter",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "description": "Not used - For parity with Series Filter",
+            "nullable": true
+          },
+          "statements": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PersonFilterStatementDto"
+            },
+            "nullable": true
+          },
+          "combination": {
+            "enum": [
+              0,
+              1
+            ],
+            "type": "integer",
+            "format": "int32"
+          },
+          "sortOptions": {
+            "$ref": "#/components/schemas/PersonSortOptions"
+          },
+          "limitTo": {
+            "type": "integer",
+            "description": "Limit the number of rows returned. Defaults to not applying a limit (aka 0)",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "BrowseTagDto": {
+        "required": [
+          "title"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "title": {
+            "type": "string",
+            "nullable": true
+          },
+          "seriesCount": {
+            "type": "integer",
+            "description": "Number of Series this Entity is on",
+            "format": "int32"
+          },
+          "chapterCount": {
+            "type": "integer",
+            "description": "Number of Chapters this Entity is on",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
       "BulkActionDto": {
         "type": "object",
         "properties": {
@@ -15354,6 +18338,37 @@
             "type": "string",
             "nullable": true
           },
+          "kPlusOverrides": {
+            "type": "array",
+            "items": {
+              "enum": [
+                1,
+                2,
+                3,
+                4,
+                5,
+                6,
+                7,
+                8,
+                9,
+                10,
+                11,
+                12,
+                13,
+                14
+              ],
+              "type": "integer",
+              "description": "Represents which field that can be written to as an override when already locked",
+              "format": "int32"
+            },
+            "description": "Tracks which metadata has been set by K+",
+            "nullable": true
+          },
+          "averageExternalRating": {
+            "type": "number",
+            "description": "(Kavita+) Average rating from Kavita+ metadata",
+            "format": "float"
+          },
           "ageRatingLocked": {
             "type": "boolean"
           },
@@ -15420,7 +18435,7 @@
           "people": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/Person"
+              "$ref": "#/components/schemas/ChapterPeople"
             },
             "description": "All people attached at a Chapter level. Usually Comics will have different people per issue.",
             "nullable": true
@@ -15440,6 +18455,13 @@
             },
             "nullable": true
           },
+          "ratings": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/AppUserChapterRating"
+            },
+            "nullable": true
+          },
           "userProgress": {
             "type": "array",
             "items": {
@@ -15453,6 +18475,47 @@
           "volumeId": {
             "type": "integer",
             "format": "int32"
+          },
+          "externalReviews": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ExternalReview"
+            },
+            "nullable": true
+          },
+          "externalRatings": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ExternalRating"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ChapterDetailPlusDto": {
+        "type": "object",
+        "properties": {
+          "rating": {
+            "type": "number",
+            "format": "float"
+          },
+          "hasBeenRated": {
+            "type": "boolean"
+          },
+          "reviews": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/UserReviewDto"
+            },
+            "nullable": true
+          },
+          "ratings": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/RatingDto"
+            },
+            "nullable": true
           }
         },
         "additionalProperties": false
@@ -15466,18 +18529,15 @@
           },
           "range": {
             "type": "string",
-            "description": "Range of chapters. Chapter 2-4 -> \"2-4\". Chapter 2 -> \"2\". If special, will be special name.",
             "nullable": true
           },
           "number": {
             "type": "string",
-            "description": "Smallest number of the Range.",
             "nullable": true,
             "deprecated": true
           },
           "minNumber": {
             "type": "number",
-            "description": "This may be 0 under the circumstance that the Issue is \"Alpha\" or other non-standard numbers.",
             "format": "float"
           },
           "maxNumber": {
@@ -15486,21 +18546,17 @@
           },
           "sortOrder": {
             "type": "number",
-            "description": "The sorting order of the Chapter. Inherits from MinNumber, but can be overridden.",
             "format": "float"
           },
           "pages": {
             "type": "integer",
-            "description": "Total number of pages in all MangaFiles",
             "format": "int32"
           },
           "isSpecial": {
-            "type": "boolean",
-            "description": "If this Chapter contains files that could only be identified as Series or has Special Identifier from filename"
+            "type": "boolean"
           },
           "title": {
             "type": "string",
-            "description": "Used for books/specials to display custom title. For non-specials/books, will be set to API.DTOs.ChapterDto.Range",
             "nullable": true
           },
           "files": {
@@ -15527,17 +18583,14 @@
             "format": "date-time"
           },
           "coverImageLocked": {
-            "type": "boolean",
-            "description": "If the Cover Image is locked for this entity"
+            "type": "boolean"
           },
           "volumeId": {
             "type": "integer",
-            "description": "Volume Id this Chapter belongs to",
             "format": "int32"
           },
           "createdUtc": {
             "type": "string",
-            "description": "When chapter was created",
             "format": "date-time"
           },
           "lastModifiedUtc": {
@@ -15546,22 +18599,18 @@
           },
           "created": {
             "type": "string",
-            "description": "When chapter was created in local server time",
             "format": "date-time"
           },
           "releaseDate": {
             "type": "string",
-            "description": "When the chapter was released.",
             "format": "date-time"
           },
           "titleName": {
             "type": "string",
-            "description": "Title of the Chapter/Issue",
             "nullable": true
           },
           "summary": {
             "type": "string",
-            "description": "Summary of the Chapter",
             "nullable": true
           },
           "ageRating": {
@@ -15584,12 +18633,11 @@
               -1
             ],
             "type": "integer",
-            "description": "Age Rating for the issue/chapter",
+            "description": "Represents Age Rating for content.",
             "format": "int32"
           },
           "wordCount": {
             "type": "integer",
-            "description": "Total words in a Chapter (books only)",
             "format": "int64"
           },
           "volumeTitle": {
@@ -15611,12 +18659,10 @@
           },
           "webLinks": {
             "type": "string",
-            "description": "Comma-separated link of urls to external services that have some relation to the Chapter",
             "nullable": true
           },
           "isbn": {
             "type": "string",
-            "description": "ISBN-13 (usually) of the Chapter",
             "nullable": true
           },
           "writers": {
@@ -15738,17 +18784,14 @@
           },
           "language": {
             "type": "string",
-            "description": "Language for the Chapter/Issue",
             "nullable": true
           },
           "count": {
             "type": "integer",
-            "description": "Number in the TotalCount of issues",
             "format": "int32"
           },
           "totalCount": {
             "type": "integer",
-            "description": "Total number of issues for the series",
             "format": "int32"
           },
           "languageLocked": {
@@ -15758,12 +18801,10 @@
             "type": "boolean"
           },
           "ageRatingLocked": {
-            "type": "boolean",
-            "description": "Locked by user so metadata updates from scan loop will not override AgeRating"
+            "type": "boolean"
           },
           "publicationStatusLocked": {
-            "type": "boolean",
-            "description": "Locked by user so metadata updates from scan loop will not override PublicationStatus"
+            "type": "boolean"
           },
           "genresLocked": {
             "type": "boolean"
@@ -15827,7 +18868,7 @@
           }
         },
         "additionalProperties": false,
-        "description": "A Chapter is the lowest grouping of a reading medium. A Chapter contains a set of MangaFiles which represents the underlying\r\nfile (abstracted from type)."
+        "description": "A Chapter is the lowest grouping of a reading medium. A Chapter contains a set of MangaFiles which represents the underlying\nfile (abstracted from type)."
       },
       "ChapterInfoDto": {
         "type": "object",
@@ -16135,6 +19176,58 @@
         "additionalProperties": false,
         "description": "Exclusively metadata about a given chapter"
       },
+      "ChapterPeople": {
+        "required": [
+          "role"
+        ],
+        "type": "object",
+        "properties": {
+          "chapterId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "chapter": {
+            "$ref": "#/components/schemas/Chapter"
+          },
+          "personId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "person": {
+            "$ref": "#/components/schemas/Person"
+          },
+          "kavitaPlusConnection": {
+            "type": "boolean",
+            "description": "The source of this connection. If not Kavita, this implies Metadata Download linked this and it can be removed between matches"
+          },
+          "orderWeight": {
+            "type": "integer",
+            "description": "A weight that allows lower numbers to sort first",
+            "format": "int32"
+          },
+          "role": {
+            "enum": [
+              1,
+              3,
+              4,
+              5,
+              6,
+              7,
+              8,
+              9,
+              10,
+              11,
+              12,
+              13,
+              14,
+              15
+            ],
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
       "CollectionTag": {
         "required": [
           "normalizedTitle",
@@ -16532,6 +19625,20 @@
         "additionalProperties": false,
         "description": "For requesting an encoded filter to be decoded"
       },
+      "DeleteChaptersDto": {
+        "type": "object",
+        "properties": {
+          "chapterIds": {
+            "type": "array",
+            "items": {
+              "type": "integer",
+              "format": "int32"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
       "DeleteCollectionsDto": {
         "required": [
           "collectionIds"
@@ -16774,6 +19881,35 @@
         },
         "additionalProperties": false
       },
+      "EmailHistoryDto": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "sent": {
+            "type": "boolean"
+          },
+          "sendDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "emailTemplate": {
+            "type": "string",
+            "nullable": true
+          },
+          "errorMessage": {
+            "type": "string",
+            "nullable": true
+          },
+          "toUserName": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
       "EmailTestResultDto": {
         "type": "object",
         "properties": {
@@ -16792,6 +19928,80 @@
         "additionalProperties": false,
         "description": "Represents if Test Email Service URL was successful or not and if any error occured"
       },
+      "ExternalChapterDto": {
+        "type": "object",
+        "properties": {
+          "title": {
+            "type": "string",
+            "nullable": true
+          },
+          "issueNumber": {
+            "type": "string",
+            "nullable": true
+          },
+          "criticRating": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          },
+          "userRating": {
+            "type": "number",
+            "format": "double",
+            "nullable": true
+          },
+          "summary": {
+            "type": "string",
+            "nullable": true
+          },
+          "writers": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "artists": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "releaseDate": {
+            "type": "string",
+            "format": "date-time",
+            "nullable": true
+          },
+          "publisher": {
+            "type": "string",
+            "nullable": true
+          },
+          "coverImageUrl": {
+            "type": "string",
+            "nullable": true
+          },
+          "issueUrl": {
+            "type": "string",
+            "nullable": true
+          },
+          "criticReviews": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/UserReviewDto"
+            },
+            "nullable": true
+          },
+          "userReviews": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/UserReviewDto"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false,
+        "description": "Information about an individual issue/chapter/book from Kavita+"
+      },
       "ExternalRating": {
         "type": "object",
         "properties": {
@@ -16811,12 +20021,23 @@
             "enum": [
               0,
               1,
-              2
+              2,
+              3,
+              4
             ],
             "type": "integer",
             "description": "Misleading name but is the source of data (like a review coming from AniList)",
             "format": "int32"
           },
+          "authority": {
+            "enum": [
+              0,
+              1
+            ],
+            "type": "integer",
+            "description": "Where this rating comes from: Critic or User",
+            "format": "int32"
+          },
           "providerUrl": {
             "type": "string",
             "nullable": true
@@ -16825,6 +20046,12 @@
             "type": "integer",
             "format": "int32"
           },
+          "chapterId": {
+            "type": "integer",
+            "description": "This can be null when for a series-rating",
+            "format": "int32",
+            "nullable": true
+          },
           "externalSeriesMetadatas": {
             "type": "array",
             "items": {
@@ -16877,7 +20104,9 @@
             "enum": [
               0,
               1,
-              2
+              2,
+              3,
+              4
             ],
             "type": "integer",
             "description": "Misleading name but is the source of data (like a review coming from AniList)",
@@ -16933,12 +20162,22 @@
             "enum": [
               0,
               1,
-              2
+              2,
+              3,
+              4
             ],
             "type": "integer",
             "description": "Misleading name but is the source of data (like a review coming from AniList)",
             "format": "int32"
           },
+          "authority": {
+            "enum": [
+              0,
+              1
+            ],
+            "type": "integer",
+            "format": "int32"
+          },
           "siteUrl": {
             "type": "string",
             "nullable": true
@@ -16966,6 +20205,11 @@
             "type": "integer",
             "format": "int32"
           },
+          "chapterId": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
           "externalSeriesMetadatas": {
             "type": "array",
             "items": {
@@ -16977,6 +20221,144 @@
         "additionalProperties": false,
         "description": "Represents an Externally supplied Review for a given Series"
       },
+      "ExternalSeriesDetailDto": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "aniListId": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "malId": {
+            "type": "integer",
+            "format": "int64",
+            "nullable": true
+          },
+          "cbrId": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "synonyms": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "plusMediaFormat": {
+            "enum": [
+              1,
+              2,
+              3,
+              4,
+              5
+            ],
+            "type": "integer",
+            "description": "Represents PlusMediaFormat",
+            "format": "int32"
+          },
+          "siteUrl": {
+            "type": "string",
+            "nullable": true
+          },
+          "coverUrl": {
+            "type": "string",
+            "nullable": true
+          },
+          "genres": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "staff": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SeriesStaffDto"
+            },
+            "nullable": true
+          },
+          "tags": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/MetadataTagDto"
+            },
+            "nullable": true
+          },
+          "summary": {
+            "type": "string",
+            "nullable": true
+          },
+          "provider": {
+            "enum": [
+              0,
+              1,
+              2,
+              3,
+              4
+            ],
+            "type": "integer",
+            "description": "Misleading name but is the source of data (like a review coming from AniList)",
+            "format": "int32"
+          },
+          "startDate": {
+            "type": "string",
+            "format": "date-time",
+            "nullable": true
+          },
+          "endDate": {
+            "type": "string",
+            "format": "date-time",
+            "nullable": true
+          },
+          "averageScore": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "chapters": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "volumes": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "relations": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SeriesRelationship"
+            },
+            "nullable": true
+          },
+          "characters": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SeriesCharacter"
+            },
+            "nullable": true
+          },
+          "publisher": {
+            "type": "string",
+            "nullable": true
+          },
+          "chapterDtos": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ExternalChapterDto"
+            },
+            "description": "Only from CBR for API.Services.Plus.ScrobbleProvider.Cbr. Full metadata about issues",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false,
+        "description": "This is AniListSeries"
+      },
       "ExternalSeriesDto": {
         "required": [
           "coverUrl",
@@ -17015,7 +20397,9 @@
             "enum": [
               0,
               1,
-              2
+              2,
+              3,
+              4
             ],
             "type": "integer",
             "description": "Misleading name but is the source of data (like a review coming from AniList)",
@@ -17024,6 +20408,19 @@
         },
         "additionalProperties": false
       },
+      "ExternalSeriesMatchDto": {
+        "type": "object",
+        "properties": {
+          "series": {
+            "$ref": "#/components/schemas/ExternalSeriesDetailDto"
+          },
+          "matchRating": {
+            "type": "number",
+            "format": "float"
+          }
+        },
+        "additionalProperties": false
+      },
       "ExternalSeriesMetadata": {
         "type": "object",
         "properties": {
@@ -17056,13 +20453,17 @@
           },
           "averageExternalRating": {
             "type": "integer",
-            "description": "Average External Rating. -1 means not set",
+            "description": "Average External Rating. -1 means not set, 0 - 100",
             "format": "int32"
           },
           "aniListId": {
             "type": "integer",
             "format": "int32"
           },
+          "cbrId": {
+            "type": "integer",
+            "format": "int32"
+          },
           "malId": {
             "type": "integer",
             "format": "int64"
@@ -17190,33 +20591,6 @@
         },
         "additionalProperties": false
       },
-      "FileFormatDto": {
-        "required": [
-          "extension",
-          "format"
-        ],
-        "type": "object",
-        "properties": {
-          "extension": {
-            "type": "string",
-            "description": "The extension with the ., in lowercase",
-            "nullable": true
-          },
-          "format": {
-            "enum": [
-              0,
-              1,
-              2,
-              3,
-              4
-            ],
-            "type": "integer",
-            "description": "Format of extension",
-            "format": "int32"
-          }
-        },
-        "additionalProperties": false
-      },
       "FilterDto": {
         "type": "object",
         "properties": {
@@ -17368,7 +20742,7 @@
           },
           "rating": {
             "type": "integer",
-            "description": "Will return back everything with the rating and above\r\nAPI.Entities.AppUserRating.Rating",
+            "description": "Will return back everything with the rating and above\nAPI.Entities.AppUserRating.Rating",
             "format": "int32"
           },
           "sortOptions": {
@@ -17496,7 +20870,8 @@
               28,
               29,
               30,
-              31
+              31,
+              32
             ],
             "type": "integer",
             "description": "Represents the field which will dictate the value type and the Extension used for filtering",
@@ -17740,7 +21115,7 @@
             "items": {
               "type": "string"
             },
-            "description": "List of Roles to assign to user. If admin not present, Pleb will be applied.\r\nIf admin present, all libraries will be granted access and will ignore those from DTO.",
+            "description": "List of Roles to assign to user. If admin not present, Pleb will be applied.\nIf admin present, all libraries will be granted access and will ignore those from DTO.",
             "nullable": true
           },
           "libraries": {
@@ -17831,6 +21206,79 @@
         "additionalProperties": false,
         "description": "Represents an individual button in a Jump Bar"
       },
+      "KavitaLocale": {
+        "type": "object",
+        "properties": {
+          "fileName": {
+            "type": "string",
+            "nullable": true
+          },
+          "renderName": {
+            "type": "string",
+            "nullable": true
+          },
+          "translationCompletion": {
+            "type": "number",
+            "format": "float"
+          },
+          "isRtL": {
+            "type": "boolean"
+          },
+          "hash": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "KoreaderBookDto": {
+        "type": "object",
+        "properties": {
+          "document": {
+            "type": "string",
+            "description": "This is the Koreader hash of the book. It is used to identify the book.",
+            "nullable": true
+          },
+          "device_id": {
+            "type": "string",
+            "description": "A randomly generated id from the koreader device. Only used to maintain the Koreader interface.",
+            "nullable": true
+          },
+          "device": {
+            "type": "string",
+            "description": "The Koreader device name. Only used to maintain the Koreader interface.",
+            "nullable": true
+          },
+          "percentage": {
+            "type": "number",
+            "description": "Percent progress of the book. Only used to maintain the Koreader interface.",
+            "format": "float"
+          },
+          "progress": {
+            "type": "string",
+            "description": "An XPath string read by Koreader to determine the location within the epub.\nEssentially, it is Koreader's equivalent to ProgressDto.BookScrollId.",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false,
+        "description": "This is the interface for receiving and sending updates to Koreader. The only fields\nthat are actually used are the Document and Progress fields."
+      },
+      "KoreaderProgressUpdateDto": {
+        "type": "object",
+        "properties": {
+          "document": {
+            "type": "string",
+            "description": "This is the Koreader hash of the book. It is used to identify the book.",
+            "nullable": true
+          },
+          "timestamp": {
+            "type": "string",
+            "description": "UTC Timestamp to return to KOReader",
+            "format": "date-time"
+          }
+        },
+        "additionalProperties": false
+      },
       "LanguageDto": {
         "required": [
           "isoCode",
@@ -17915,6 +21363,18 @@
             "type": "boolean",
             "description": "Should this library allow Scrobble events to emit from it"
           },
+          "allowMetadataMatching": {
+            "type": "boolean",
+            "description": "Allow any series within this Library to download metadata."
+          },
+          "enableMetadata": {
+            "type": "boolean",
+            "description": "Should Kavita read metadata files from the library"
+          },
+          "removePrefixForSortName": {
+            "type": "boolean",
+            "description": "Should Kavita remove sort articles \"The\" for the sort name"
+          },
           "created": {
             "type": "string",
             "format": "date-time"
@@ -18069,6 +21529,18 @@
             },
             "description": "A set of globs that will exclude matching content from being scanned",
             "nullable": true
+          },
+          "allowMetadataMatching": {
+            "type": "boolean",
+            "description": "Allow any series within this Library to download metadata."
+          },
+          "enableMetadata": {
+            "type": "boolean",
+            "description": "Allow Kavita to read metadata (ComicInfo.xml, Epub, PDF)"
+          },
+          "removePrefixForSortName": {
+            "type": "boolean",
+            "description": "Should Kavita remove sort articles \"The\" for the sort name"
           }
         },
         "additionalProperties": false
@@ -18135,6 +21607,43 @@
         },
         "additionalProperties": false
       },
+      "LicenseInfoDto": {
+        "type": "object",
+        "properties": {
+          "expirationDate": {
+            "type": "string",
+            "description": "If cancelled, will represent cancellation date. If not, will represent repayment date",
+            "format": "date-time"
+          },
+          "isActive": {
+            "type": "boolean",
+            "description": "If cancelled or not"
+          },
+          "isCancelled": {
+            "type": "boolean",
+            "description": "If will be or is cancelled"
+          },
+          "isValidVersion": {
+            "type": "boolean",
+            "description": "Is the installed version valid for Kavita+ (aka within 3 releases)"
+          },
+          "registeredEmail": {
+            "type": "string",
+            "description": "The email on file",
+            "nullable": true
+          },
+          "totalMonthsSubbed": {
+            "type": "integer",
+            "description": "Number of months user has been subscribed",
+            "format": "int32"
+          },
+          "hasLicense": {
+            "type": "boolean",
+            "description": "A license is stored within Kavita"
+          }
+        },
+        "additionalProperties": false
+      },
       "LoginDto": {
         "type": "object",
         "properties": {
@@ -18218,6 +21727,49 @@
         "additionalProperties": false,
         "description": "Information about a User's MAL connection"
       },
+      "ManageMatchFilterDto": {
+        "type": "object",
+        "properties": {
+          "matchStateOption": {
+            "enum": [
+              0,
+              1,
+              2,
+              3,
+              4
+            ],
+            "type": "integer",
+            "description": "Represents an option in the UI layer for Filtering",
+            "format": "int32"
+          },
+          "libraryType": {
+            "type": "integer",
+            "description": "Library Type in int form. -1 indicates to ignore the field.",
+            "format": "int32"
+          },
+          "searchTerm": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ManageMatchSeriesDto": {
+        "type": "object",
+        "properties": {
+          "series": {
+            "$ref": "#/components/schemas/SeriesDto"
+          },
+          "isMatched": {
+            "type": "boolean"
+          },
+          "validUntilUtc": {
+            "type": "string",
+            "format": "date-time"
+          }
+        },
+        "additionalProperties": false
+      },
       "MangaFile": {
         "required": [
           "filePath"
@@ -18238,6 +21790,11 @@
             "description": "Absolute path to the archive file",
             "nullable": true
           },
+          "koreaderHash": {
+            "type": "string",
+            "description": "A hash of the document using Koreader's unique hashing algorithm",
+            "nullable": true
+          },
           "pages": {
             "type": "integer",
             "description": "Number of pages for the given file",
@@ -18437,6 +21994,27 @@
         "additionalProperties": false,
         "description": "This is used for bulk updating a set of volume and or chapters in one go"
       },
+      "MatchSeriesDto": {
+        "type": "object",
+        "properties": {
+          "dontMatch": {
+            "type": "boolean",
+            "description": "When set, Kavita will stop attempting to match this series and will not perform any scrobbling"
+          },
+          "seriesId": {
+            "type": "integer",
+            "description": "Series Id to pull internal metadata from to improve matching",
+            "format": "int32"
+          },
+          "query": {
+            "type": "string",
+            "description": "Free form text to query for. Can be a url and ids will be parsed from it",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false,
+        "description": "Used for matching a series with Kavita+ for metadata and scrobbling"
+      },
       "MediaErrorDto": {
         "required": [
           "extension",
@@ -18527,6 +22105,250 @@
         "additionalProperties": false,
         "description": "Represents a member of a Kavita server."
       },
+      "MetadataFieldMappingDto": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "sourceType": {
+            "enum": [
+              0,
+              1
+            ],
+            "type": "integer",
+            "format": "int32"
+          },
+          "destinationType": {
+            "enum": [
+              0,
+              1
+            ],
+            "type": "integer",
+            "format": "int32"
+          },
+          "sourceValue": {
+            "type": "string",
+            "description": "The string in the source",
+            "nullable": true
+          },
+          "destinationValue": {
+            "type": "string",
+            "description": "Write the string as this in the Destination (can also just be the Source)",
+            "nullable": true
+          },
+          "excludeFromSource": {
+            "type": "boolean",
+            "description": "If true, the tag will be Moved over vs Copied over"
+          }
+        },
+        "additionalProperties": false
+      },
+      "MetadataSettingsDto": {
+        "type": "object",
+        "properties": {
+          "enabled": {
+            "type": "boolean",
+            "description": "If writing any sort of metadata from upstream (AniList, Hardcover) source is allowed"
+          },
+          "enableSummary": {
+            "type": "boolean",
+            "description": "Allow the Summary to be written"
+          },
+          "enablePublicationStatus": {
+            "type": "boolean",
+            "description": "Allow Publication status to be derived and updated"
+          },
+          "enableRelationships": {
+            "type": "boolean",
+            "description": "Allow Relationships between series to be set"
+          },
+          "enablePeople": {
+            "type": "boolean",
+            "description": "Allow People to be created (including downloading images)"
+          },
+          "enableStartDate": {
+            "type": "boolean",
+            "description": "Allow Start date to be set within the Series"
+          },
+          "enableLocalizedName": {
+            "type": "boolean",
+            "description": "Allow setting the Localized name"
+          },
+          "enableCoverImage": {
+            "type": "boolean",
+            "description": "Allow setting the cover image"
+          },
+          "enableChapterSummary": {
+            "type": "boolean",
+            "description": "Allow Summary to be set within Chapter/Issue"
+          },
+          "enableChapterReleaseDate": {
+            "type": "boolean",
+            "description": "Allow Release Date to be set within Chapter/Issue"
+          },
+          "enableChapterTitle": {
+            "type": "boolean",
+            "description": "Allow Title to be set within Chapter/Issue"
+          },
+          "enableChapterPublisher": {
+            "type": "boolean",
+            "description": "Allow Publisher to be set within Chapter/Issue"
+          },
+          "enableChapterCoverImage": {
+            "type": "boolean",
+            "description": "Allow setting the cover image for the Chapter/Issue"
+          },
+          "enableGenres": {
+            "type": "boolean"
+          },
+          "enableTags": {
+            "type": "boolean"
+          },
+          "firstLastPeopleNaming": {
+            "type": "boolean",
+            "description": "For Authors and Writers, how should names be stored (Exclusively applied for AniList). This does not affect Character names."
+          },
+          "ageRatingMappings": {
+            "type": "object",
+            "additionalProperties": {
+              "enum": [
+                0,
+                1,
+                2,
+                3,
+                4,
+                5,
+                6,
+                7,
+                8,
+                9,
+                10,
+                11,
+                12,
+                13,
+                14,
+                -1
+              ],
+              "type": "integer",
+              "description": "Represents Age Rating for content.",
+              "format": "int32"
+            },
+            "description": "Any Genres or Tags that if present, will trigger an Age Rating Override. Highest rating will be prioritized for matching.",
+            "nullable": true
+          },
+          "fieldMappings": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/MetadataFieldMappingDto"
+            },
+            "description": "A list of rules that allow mapping a genre/tag to another genre/tag",
+            "nullable": true
+          },
+          "overrides": {
+            "type": "array",
+            "items": {
+              "enum": [
+                1,
+                2,
+                3,
+                4,
+                5,
+                6,
+                7,
+                8,
+                9,
+                10,
+                11,
+                12,
+                13,
+                14
+              ],
+              "type": "integer",
+              "description": "Represents which field that can be written to as an override when already locked",
+              "format": "int32"
+            },
+            "description": "A list of overrides that will enable writing to locked fields",
+            "nullable": true
+          },
+          "blacklist": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "Do not allow any Genre/Tag in this list to be written to Kavita",
+            "nullable": true
+          },
+          "whitelist": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "description": "Only allow these Tags to be written to Kavita",
+            "nullable": true
+          },
+          "personRoles": {
+            "type": "array",
+            "items": {
+              "enum": [
+                1,
+                3,
+                4,
+                5,
+                6,
+                7,
+                8,
+                9,
+                10,
+                11,
+                12,
+                13,
+                14,
+                15
+              ],
+              "type": "integer",
+              "format": "int32"
+            },
+            "description": "Which Roles to allow metadata downloading for",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "MetadataTagDto": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "description": {
+            "type": "string",
+            "nullable": true,
+            "readOnly": true
+          },
+          "rank": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true,
+            "readOnly": true
+          },
+          "isGeneralSpoiler": {
+            "type": "boolean",
+            "readOnly": true
+          },
+          "isMediaSpoiler": {
+            "type": "boolean",
+            "readOnly": true
+          },
+          "isAdult": {
+            "type": "boolean",
+            "readOnly": true
+          }
+        },
+        "additionalProperties": false
+      },
       "NextExpectedChapterDto": {
         "type": "object",
         "properties": {
@@ -18555,8 +22377,7 @@
       "Person": {
         "required": [
           "name",
-          "normalizedName",
-          "role"
+          "normalizedName"
         ],
         "type": "object",
         "properties": {
@@ -18572,39 +22393,95 @@
             "type": "string",
             "nullable": true
           },
-          "role": {
-            "enum": [
-              1,
-              3,
-              4,
-              5,
-              6,
-              7,
-              8,
-              9,
-              10,
-              11,
-              12,
-              13,
-              14,
-              15
-            ],
+          "aliases": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PersonAlias"
+            },
+            "nullable": true
+          },
+          "coverImage": {
+            "type": "string",
+            "nullable": true
+          },
+          "coverImageLocked": {
+            "type": "boolean"
+          },
+          "primaryColor": {
+            "type": "string",
+            "nullable": true
+          },
+          "secondaryColor": {
+            "type": "string",
+            "nullable": true
+          },
+          "description": {
+            "type": "string",
+            "nullable": true
+          },
+          "asin": {
+            "type": "string",
+            "description": "ASIN for person",
+            "nullable": true
+          },
+          "aniListId": {
+            "type": "integer",
+            "description": "https://anilist.co/staff/{AniListId}/",
+            "format": "int32"
+          },
+          "malId": {
+            "type": "integer",
+            "description": "https://myanimelist.net/people/{MalId}/\nhttps://myanimelist.net/character/{MalId}/CharacterName",
+            "format": "int64"
+          },
+          "hardcoverId": {
+            "type": "string",
+            "description": "https://hardcover.app/authors/{HardcoverId}",
+            "nullable": true
+          },
+          "chapterPeople": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ChapterPeople"
+            },
+            "description": "https://metron.cloud/creator/{slug}/",
+            "nullable": true
+          },
+          "seriesMetadataPeople": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SeriesMetadataPeople"
+            },
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "PersonAlias": {
+        "required": [
+          "alias",
+          "normalizedAlias"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
             "type": "integer",
             "format": "int32"
           },
-          "seriesMetadatas": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/SeriesMetadata"
-            },
+          "alias": {
+            "type": "string",
             "nullable": true
           },
-          "chapterMetadatas": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/Chapter"
-            },
+          "normalizedAlias": {
+            "type": "string",
             "nullable": true
+          },
+          "personId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "person": {
+            "$ref": "#/components/schemas/Person"
           }
         },
         "additionalProperties": false
@@ -18623,9 +22500,63 @@
             "type": "string",
             "nullable": true
           },
-          "role": {
+          "coverImageLocked": {
+            "type": "boolean"
+          },
+          "primaryColor": {
+            "type": "string",
+            "nullable": true
+          },
+          "secondaryColor": {
+            "type": "string",
+            "nullable": true
+          },
+          "coverImage": {
+            "type": "string",
+            "nullable": true
+          },
+          "aliases": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "description": {
+            "type": "string",
+            "nullable": true
+          },
+          "asin": {
+            "type": "string",
+            "description": "ASIN for person",
+            "nullable": true
+          },
+          "aniListId": {
+            "type": "integer",
+            "description": "https://anilist.co/staff/{AniListId}/",
+            "format": "int32"
+          },
+          "malId": {
+            "type": "integer",
+            "description": "https://myanimelist.net/people/{MalId}/\nhttps://myanimelist.net/character/{MalId}/CharacterName",
+            "format": "int64"
+          },
+          "hardcoverId": {
+            "type": "string",
+            "description": "https://hardcover.app/authors/{HardcoverId}",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "PersonFilterStatementDto": {
+        "type": "object",
+        "properties": {
+          "comparison": {
             "enum": [
+              0,
               1,
+              2,
               3,
               4,
               5,
@@ -18638,14 +22569,68 @@
               12,
               13,
               14,
-              15
+              15,
+              16
             ],
             "type": "integer",
             "format": "int32"
+          },
+          "field": {
+            "enum": [
+              1,
+              2,
+              3,
+              4
+            ],
+            "type": "integer",
+            "format": "int32"
+          },
+          "value": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "PersonMergeDto": {
+        "required": [
+          "destId",
+          "srcId"
+        ],
+        "type": "object",
+        "properties": {
+          "destId": {
+            "type": "integer",
+            "description": "The id of the person being merged into",
+            "format": "int32"
+          },
+          "srcId": {
+            "type": "integer",
+            "description": "The id of the person being merged. This person will be removed, and become an alias of API.DTOs.PersonMergeDto.DestId",
+            "format": "int32"
           }
         },
         "additionalProperties": false
       },
+      "PersonSortOptions": {
+        "type": "object",
+        "properties": {
+          "sortField": {
+            "enum": [
+              1,
+              2,
+              3
+            ],
+            "type": "integer",
+            "format": "int32"
+          },
+          "isAscending": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false,
+        "description": "All Sorting Options for a query related to Person Entity"
+      },
       "PersonalToCDto": {
         "required": [
           "chapterId",
@@ -18705,7 +22690,7 @@
           },
           "bookScrollId": {
             "type": "string",
-            "description": "For EPUB reader, this can be an optional string of the id of a part marker, to help resume reading position\r\non pages that combine multiple \"chapters\".",
+            "description": "For EPUB reader, this can be an optional string of the id of a part marker, to help resume reading position\non pages that combine multiple \"chapters\".",
             "nullable": true
           },
           "lastModifiedUtc": {
@@ -18785,12 +22770,22 @@
             "enum": [
               0,
               1,
-              2
+              2,
+              3,
+              4
             ],
             "type": "integer",
             "description": "Misleading name but is the source of data (like a review coming from AniList)",
             "format": "int32"
           },
+          "authority": {
+            "enum": [
+              0,
+              1
+            ],
+            "type": "integer",
+            "format": "int32"
+          },
           "providerUrl": {
             "type": "string",
             "nullable": true
@@ -18830,6 +22825,10 @@
             "type": "string",
             "format": "date-time"
           },
+          "readDateUtc": {
+            "type": "string",
+            "format": "date-time"
+          },
           "chapterId": {
             "type": "integer",
             "format": "int32"
@@ -18980,6 +22979,9 @@
         "description": "This is a collection of API.Entities.ReadingListItem which represent individual chapters and an order."
       },
       "ReadingListDto": {
+        "required": [
+          "ageRating"
+        ],
         "type": "object",
         "properties": {
           "id": {
@@ -19014,6 +23016,11 @@
             "type": "string",
             "nullable": true
           },
+          "itemCount": {
+            "type": "integer",
+            "description": "Number of Items in the Reading List",
+            "format": "int32"
+          },
           "startingYear": {
             "type": "integer",
             "description": "Minimum Year the Reading List starts",
@@ -19033,6 +23040,66 @@
             "type": "integer",
             "description": "Maximum Month the Reading List starts",
             "format": "int32"
+          },
+          "ageRating": {
+            "enum": [
+              0,
+              1,
+              2,
+              3,
+              4,
+              5,
+              6,
+              7,
+              8,
+              9,
+              10,
+              11,
+              12,
+              13,
+              14,
+              -1
+            ],
+            "type": "integer",
+            "description": "The highest age rating from all Series within the reading list",
+            "format": "int32"
+          },
+          "ownerUserName": {
+            "type": "string",
+            "description": "Username of the User that owns (in the case of a promoted list)",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ReadingListInfoDto": {
+        "type": "object",
+        "properties": {
+          "pages": {
+            "type": "integer",
+            "description": "Total Pages across all Reading List Items",
+            "format": "int32"
+          },
+          "wordCount": {
+            "type": "integer",
+            "description": "Total Word count across all Reading List Items",
+            "format": "int64"
+          },
+          "isAllEpub": {
+            "type": "boolean",
+            "description": "Are ALL Reading List Items epub"
+          },
+          "minHoursToRead": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "maxHoursToRead": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "avgHoursToRead": {
+            "type": "number",
+            "format": "float"
           }
         },
         "additionalProperties": false
@@ -19166,7 +23233,8 @@
           "releaseDate": {
             "type": "string",
             "description": "Release Date from Chapter",
-            "format": "date-time"
+            "format": "date-time",
+            "nullable": true
           },
           "readingListId": {
             "type": "integer",
@@ -19176,7 +23244,8 @@
           "lastReadingProgressUtc": {
             "type": "string",
             "description": "The last time a reading list item (underlying chapter) was read by current authenticated user",
-            "format": "date-time"
+            "format": "date-time",
+            "nullable": true
           },
           "fileSize": {
             "type": "integer",
@@ -19187,6 +23256,9 @@
             "type": "string",
             "description": "The chapter summary",
             "nullable": true
+          },
+          "isSpecial": {
+            "type": "boolean"
           }
         },
         "additionalProperties": false
@@ -19520,6 +23592,10 @@
       "ScrobbleEventDto": {
         "type": "object",
         "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
           "seriesName": {
             "type": "string",
             "nullable": true
@@ -19589,7 +23665,8 @@
               2,
               3,
               4,
-              5
+              5,
+              6
             ],
             "type": "integer",
             "description": "Which field to sort on",
@@ -19981,6 +24058,14 @@
             "type": "number",
             "format": "float"
           },
+          "dontMatch": {
+            "type": "boolean",
+            "description": "Do not match the series with any external Metadata service. This will automatically opt it out of scrobbling."
+          },
+          "isBlacklisted": {
+            "type": "boolean",
+            "description": "If the series was unable to match, it will be blacklisted until a manual metadata match overrides it"
+          },
           "metadata": {
             "$ref": "#/components/schemas/SeriesMetadata"
           },
@@ -20054,6 +24139,41 @@
         },
         "additionalProperties": false
       },
+      "SeriesCharacter": {
+        "required": [
+          "description",
+          "url"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "description": {
+            "type": "string",
+            "nullable": true
+          },
+          "url": {
+            "type": "string",
+            "nullable": true
+          },
+          "imageUrl": {
+            "type": "string",
+            "nullable": true
+          },
+          "role": {
+            "enum": [
+              0,
+              1,
+              2
+            ],
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
       "SeriesDetailDto": {
         "type": "object",
         "properties": {
@@ -20101,7 +24221,7 @@
           }
         },
         "additionalProperties": false,
-        "description": "This is a special DTO for a UI page in Kavita. This performs sorting and grouping and returns exactly what UI requires for layout.\r\nThis is subject to change, do not rely on this Data model."
+        "description": "This is a special DTO for a UI page in Kavita. This performs sorting and grouping and returns exactly what UI requires for layout.\nThis is subject to change, do not rely on this Data model."
       },
       "SeriesDetailPlusDto": {
         "type": "object",
@@ -20122,6 +24242,9 @@
               "$ref": "#/components/schemas/RatingDto"
             },
             "nullable": true
+          },
+          "series": {
+            "$ref": "#/components/schemas/ExternalSeriesDetailDto"
           }
         },
         "additionalProperties": false,
@@ -20169,7 +24292,6 @@
           },
           "lastChapterAdded": {
             "type": "string",
-            "description": "DateTime representing last time a chapter was added to the Series",
             "format": "date-time"
           },
           "userRating": {
@@ -20197,9 +24319,6 @@
             "type": "string",
             "format": "date-time"
           },
-          "nameLocked": {
-            "type": "boolean"
-          },
           "sortNameLocked": {
             "type": "boolean"
           },
@@ -20208,7 +24327,6 @@
           },
           "wordCount": {
             "type": "integer",
-            "description": "Total number of words for the series. Only applies to epubs.",
             "format": "int64"
           },
           "libraryId": {
@@ -20233,19 +24351,22 @@
           },
           "folderPath": {
             "type": "string",
-            "description": "The highest level folder for this Series",
             "nullable": true
           },
           "lowestFolderPath": {
             "type": "string",
-            "description": "Lowest path (that is under library root) that contains all files for the series.",
             "nullable": true
           },
           "lastFolderScanned": {
             "type": "string",
-            "description": "The last time the folder for this series was scanned",
             "format": "date-time"
           },
+          "dontMatch": {
+            "type": "boolean"
+          },
+          "isBlacklisted": {
+            "type": "boolean"
+          },
           "coverImage": {
             "type": "string",
             "nullable": true
@@ -20285,36 +24406,6 @@
             "type": "string",
             "nullable": true
           },
-          "collectionTags": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/CollectionTag"
-            },
-            "nullable": true,
-            "deprecated": true
-          },
-          "genres": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/Genre"
-            },
-            "nullable": true
-          },
-          "tags": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/Tag"
-            },
-            "nullable": true
-          },
-          "people": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/Person"
-            },
-            "description": "All people attached at a Series level.",
-            "nullable": true
-          },
           "ageRating": {
             "enum": [
               0,
@@ -20374,6 +24465,32 @@
             "description": "A Comma-separated list of strings representing links from the series",
             "nullable": true
           },
+          "kPlusOverrides": {
+            "type": "array",
+            "items": {
+              "enum": [
+                1,
+                2,
+                3,
+                4,
+                5,
+                6,
+                7,
+                8,
+                9,
+                10,
+                11,
+                12,
+                13,
+                14
+              ],
+              "type": "integer",
+              "description": "Represents which field that can be written to as an override when already locked",
+              "format": "int32"
+            },
+            "description": "Tracks which metadata has been set by K+",
+            "nullable": true
+          },
           "languageLocked": {
             "type": "boolean"
           },
@@ -20436,13 +24553,43 @@
           "releaseYearLocked": {
             "type": "boolean"
           },
-          "series": {
-            "$ref": "#/components/schemas/Series"
+          "collectionTags": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/CollectionTag"
+            },
+            "nullable": true,
+            "deprecated": true
+          },
+          "genres": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Genre"
+            },
+            "nullable": true
+          },
+          "tags": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Tag"
+            },
+            "nullable": true
+          },
+          "people": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/SeriesMetadataPeople"
+            },
+            "description": "All people attached at a Series level.",
+            "nullable": true
           },
           "seriesId": {
             "type": "integer",
             "format": "int32"
           },
+          "series": {
+            "$ref": "#/components/schemas/Series"
+          },
           "rowVersion": {
             "type": "integer",
             "format": "int32",
@@ -20698,6 +24845,58 @@
         },
         "additionalProperties": false
       },
+      "SeriesMetadataPeople": {
+        "required": [
+          "role"
+        ],
+        "type": "object",
+        "properties": {
+          "seriesMetadataId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "seriesMetadata": {
+            "$ref": "#/components/schemas/SeriesMetadata"
+          },
+          "personId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "person": {
+            "$ref": "#/components/schemas/Person"
+          },
+          "kavitaPlusConnection": {
+            "type": "boolean",
+            "description": "The source of this connection. If not Kavita, this implies Metadata Download linked this and it can be removed between matches"
+          },
+          "orderWeight": {
+            "type": "integer",
+            "description": "A weight that allows lower numbers to sort first",
+            "format": "int32"
+          },
+          "role": {
+            "enum": [
+              1,
+              3,
+              4,
+              5,
+              6,
+              7,
+              8,
+              9,
+              10,
+              11,
+              12,
+              13,
+              14,
+              15
+            ],
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
       "SeriesRelation": {
         "type": "object",
         "properties": {
@@ -20743,18 +24942,118 @@
           }
         },
         "additionalProperties": false,
-        "description": "A relation flows between one series and another.\r\nSeries ---kind---> target"
+        "description": "A relation flows between one series and another.\nSeries ---kind---> target"
       },
-      "ServerInfoDto": {
+      "SeriesRelationship": {
+        "type": "object",
+        "properties": {
+          "aniListId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "malId": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "seriesName": {
+            "$ref": "#/components/schemas/ALMediaTitle"
+          },
+          "relation": {
+            "enum": [
+              1,
+              2,
+              3,
+              4,
+              5,
+              6,
+              7,
+              8,
+              9,
+              10,
+              11,
+              12,
+              13,
+              14
+            ],
+            "type": "integer",
+            "description": "Represents a relationship between Series",
+            "format": "int32"
+          },
+          "provider": {
+            "enum": [
+              0,
+              1,
+              2,
+              3,
+              4
+            ],
+            "type": "integer",
+            "description": "Misleading name but is the source of data (like a review coming from AniList)",
+            "format": "int32"
+          },
+          "plusMediaFormat": {
+            "enum": [
+              1,
+              2,
+              3,
+              4,
+              5
+            ],
+            "type": "integer",
+            "description": "Represents PlusMediaFormat",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
+      "SeriesStaffDto": {
+        "required": [
+          "name",
+          "role",
+          "url"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "firstName": {
+            "type": "string",
+            "nullable": true
+          },
+          "lastName": {
+            "type": "string",
+            "nullable": true
+          },
+          "url": {
+            "type": "string",
+            "nullable": true
+          },
+          "role": {
+            "type": "string",
+            "nullable": true
+          },
+          "imageUrl": {
+            "type": "string",
+            "nullable": true
+          },
+          "gender": {
+            "type": "string",
+            "nullable": true
+          },
+          "description": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "ServerInfoSlimDto": {
         "required": [
-          "dotnetVersion",
-          "fileFormats",
           "installId",
-          "kavitaVersion",
-          "mangaReaderBackgroundColors",
-          "mangaReaderLayoutModes",
-          "mangaReaderPageSplittingModes",
-          "os"
+          "kavitaVersion"
         ],
         "type": "object",
         "properties": {
@@ -20763,213 +25062,29 @@
             "description": "Unique Id that represents a unique install",
             "nullable": true
           },
-          "os": {
-            "type": "string",
-            "nullable": true
-          },
           "isDocker": {
             "type": "boolean",
             "description": "If the Kavita install is using Docker"
           },
-          "dotnetVersion": {
-            "type": "string",
-            "description": "Version of .NET instance is running",
-            "nullable": true
-          },
           "kavitaVersion": {
             "type": "string",
             "description": "Version of Kavita",
             "nullable": true
           },
-          "numOfCores": {
-            "type": "integer",
-            "description": "Number of Cores on the instance",
-            "format": "int32"
-          },
-          "numberOfLibraries": {
-            "type": "integer",
-            "description": "The number of libraries on the instance",
-            "format": "int32"
-          },
-          "hasBookmarks": {
-            "type": "boolean",
-            "description": "Does any user have bookmarks"
-          },
-          "activeSiteTheme": {
+          "firstInstallDate": {
             "type": "string",
-            "description": "The site theme the install is using",
+            "description": "The Date Kavita was first installed",
+            "format": "date-time",
             "nullable": true
           },
-          "mangaReaderMode": {
-            "enum": [
-              0,
-              1,
-              2
-            ],
-            "type": "integer",
-            "description": "The reading mode the main user has as a preference",
-            "format": "int32"
-          },
-          "numberOfUsers": {
-            "type": "integer",
-            "description": "Number of users on the install",
-            "format": "int32"
-          },
-          "numberOfCollections": {
-            "type": "integer",
-            "description": "Number of collections on the install",
-            "format": "int32"
-          },
-          "numberOfReadingLists": {
-            "type": "integer",
-            "description": "Number of reading lists on the install (Sum of all users)",
-            "format": "int32"
-          },
-          "opdsEnabled": {
-            "type": "boolean",
-            "description": "Is OPDS enabled"
-          },
-          "totalFiles": {
-            "type": "integer",
-            "description": "Total number of files in the instance",
-            "format": "int32"
-          },
-          "totalGenres": {
-            "type": "integer",
-            "description": "Total number of Genres in the instance",
-            "format": "int32"
-          },
-          "totalPeople": {
-            "type": "integer",
-            "description": "Total number of People in the instance",
-            "format": "int32"
-          },
-          "usersOnCardLayout": {
-            "type": "integer",
-            "description": "Number of users on this instance using Card Layout",
-            "format": "int32"
-          },
-          "usersOnListLayout": {
-            "type": "integer",
-            "description": "Number of users on this instance using List Layout",
-            "format": "int32"
-          },
-          "maxSeriesInALibrary": {
-            "type": "integer",
-            "description": "Max number of Series for any library on the instance",
-            "format": "int32"
-          },
-          "maxVolumesInASeries": {
-            "type": "integer",
-            "description": "Max number of Volumes for any library on the instance",
-            "format": "int32"
-          },
-          "maxChaptersInASeries": {
-            "type": "integer",
-            "description": "Max number of Chapters for any library on the instance",
-            "format": "int32"
-          },
-          "usingSeriesRelationships": {
-            "type": "boolean",
-            "description": "Does this instance have relationships setup between series"
-          },
-          "mangaReaderBackgroundColors": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            },
-            "description": "A list of background colors set on the instance",
-            "nullable": true
-          },
-          "mangaReaderPageSplittingModes": {
-            "type": "array",
-            "items": {
-              "enum": [
-                0,
-                1,
-                2,
-                3
-              ],
-              "type": "integer",
-              "format": "int32"
-            },
-            "description": "A list of Page Split defaults being used on the instance",
-            "nullable": true
-          },
-          "mangaReaderLayoutModes": {
-            "type": "array",
-            "items": {
-              "enum": [
-                1,
-                2,
-                3
-              ],
-              "type": "integer",
-              "format": "int32"
-            },
-            "description": "A list of Layout Mode defaults being used on the instance",
-            "nullable": true
-          },
-          "fileFormats": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/FileFormatDto"
-            },
-            "description": "A list of file formats existing in the instance",
-            "nullable": true
-          },
-          "usingRestrictedProfiles": {
-            "type": "boolean",
-            "description": "If there is at least one user that is using an age restricted profile on the instance"
-          },
-          "usersWithEmulateComicBook": {
-            "type": "integer",
-            "description": "Number of users using the Emulate Comic Book setting",
-            "format": "int32"
-          },
-          "percentOfLibrariesWithFolderWatchingEnabled": {
-            "type": "number",
-            "description": "Percent (0.0-1.0) of libraries with folder watching enabled",
-            "format": "float"
-          },
-          "percentOfLibrariesIncludedInSearch": {
-            "type": "number",
-            "description": "Percent (0.0-1.0) of libraries included in Search",
-            "format": "float"
-          },
-          "percentOfLibrariesIncludedInRecommended": {
-            "type": "number",
-            "description": "Percent (0.0-1.0) of libraries included in Recommended",
-            "format": "float"
-          },
-          "percentOfLibrariesIncludedInDashboard": {
-            "type": "number",
-            "description": "Percent (0.0-1.0) of libraries included in Dashboard",
-            "format": "float"
-          },
-          "totalReadingHours": {
-            "type": "integer",
-            "description": "Total reading hours of all users",
-            "format": "int64"
-          },
-          "encodeMediaAs": {
-            "enum": [
-              0,
-              1,
-              2
-            ],
-            "type": "integer",
-            "description": "The encoding the server is using to save media",
-            "format": "int32"
-          },
-          "lastReadTime": {
+          "firstInstallVersion": {
             "type": "string",
-            "description": "The last user reading progress on the server (in UTC)",
-            "format": "date-time"
+            "description": "The Version of Kavita on the first run",
+            "nullable": true
           }
         },
         "additionalProperties": false,
-        "description": "Represents information about a Kavita Installation"
+        "description": "This is just for the Server tab on UI"
       },
       "ServerSettingDto": {
         "type": "object",
@@ -21233,7 +25348,8 @@
               5,
               6,
               7,
-              8
+              8,
+              9
             ],
             "type": "integer",
             "description": "For system provided",
@@ -21291,7 +25407,7 @@
           },
           "fileName": {
             "type": "string",
-            "description": "File path to the content. Stored under API.Services.DirectoryService.SiteThemeDirectory.\r\nMust be a .css file",
+            "description": "File path to the content. Stored under API.Services.DirectoryService.SiteThemeDirectory.\nMust be a .css file",
             "nullable": true
           },
           "isDefault": {
@@ -21378,7 +25494,7 @@
           },
           "fileName": {
             "type": "string",
-            "description": "File path to the content. Stored under API.Services.DirectoryService.SiteThemeDirectory.\r\nMust be a .css file",
+            "description": "File path to the content. Stored under API.Services.DirectoryService.SiteThemeDirectory.\nMust be a .css file",
             "nullable": true
           },
           "isDefault": {
@@ -21515,6 +25631,375 @@
         "additionalProperties": false,
         "description": "Sorting Options for a query"
       },
+      "StandaloneChapterDto": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "range": {
+            "type": "string",
+            "nullable": true
+          },
+          "number": {
+            "type": "string",
+            "nullable": true,
+            "deprecated": true
+          },
+          "minNumber": {
+            "type": "number",
+            "format": "float"
+          },
+          "maxNumber": {
+            "type": "number",
+            "format": "float"
+          },
+          "sortOrder": {
+            "type": "number",
+            "format": "float"
+          },
+          "pages": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "isSpecial": {
+            "type": "boolean"
+          },
+          "title": {
+            "type": "string",
+            "nullable": true
+          },
+          "files": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/MangaFileDto"
+            },
+            "description": "The files that represent this Chapter",
+            "nullable": true
+          },
+          "pagesRead": {
+            "type": "integer",
+            "description": "Calculated at API time. Number of pages read for this Chapter for logged in user.",
+            "format": "int32"
+          },
+          "lastReadingProgressUtc": {
+            "type": "string",
+            "description": "The last time a chapter was read by current authenticated user",
+            "format": "date-time"
+          },
+          "lastReadingProgress": {
+            "type": "string",
+            "description": "The last time a chapter was read by current authenticated user",
+            "format": "date-time"
+          },
+          "coverImageLocked": {
+            "type": "boolean"
+          },
+          "volumeId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "createdUtc": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "lastModifiedUtc": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "created": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "releaseDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "titleName": {
+            "type": "string",
+            "nullable": true
+          },
+          "summary": {
+            "type": "string",
+            "nullable": true
+          },
+          "ageRating": {
+            "enum": [
+              0,
+              1,
+              2,
+              3,
+              4,
+              5,
+              6,
+              7,
+              8,
+              9,
+              10,
+              11,
+              12,
+              13,
+              14,
+              -1
+            ],
+            "type": "integer",
+            "description": "Represents Age Rating for content.",
+            "format": "int32"
+          },
+          "wordCount": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "minHoursToRead": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "maxHoursToRead": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "avgHoursToRead": {
+            "type": "number",
+            "format": "float"
+          },
+          "webLinks": {
+            "type": "string",
+            "nullable": true
+          },
+          "isbn": {
+            "type": "string",
+            "nullable": true
+          },
+          "writers": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PersonDto"
+            },
+            "nullable": true
+          },
+          "coverArtists": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PersonDto"
+            },
+            "nullable": true
+          },
+          "publishers": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PersonDto"
+            },
+            "nullable": true
+          },
+          "characters": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PersonDto"
+            },
+            "nullable": true
+          },
+          "pencillers": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PersonDto"
+            },
+            "nullable": true
+          },
+          "inkers": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PersonDto"
+            },
+            "nullable": true
+          },
+          "imprints": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PersonDto"
+            },
+            "nullable": true
+          },
+          "colorists": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PersonDto"
+            },
+            "nullable": true
+          },
+          "letterers": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PersonDto"
+            },
+            "nullable": true
+          },
+          "editors": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PersonDto"
+            },
+            "nullable": true
+          },
+          "translators": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PersonDto"
+            },
+            "nullable": true
+          },
+          "teams": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PersonDto"
+            },
+            "nullable": true
+          },
+          "locations": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PersonDto"
+            },
+            "nullable": true
+          },
+          "genres": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/GenreTagDto"
+            },
+            "nullable": true
+          },
+          "tags": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/TagDto"
+            },
+            "description": "Collection of all Tags from underlying chapters for a Series",
+            "nullable": true
+          },
+          "publicationStatus": {
+            "enum": [
+              0,
+              1,
+              2,
+              3,
+              4
+            ],
+            "type": "integer",
+            "format": "int32"
+          },
+          "language": {
+            "type": "string",
+            "nullable": true
+          },
+          "count": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "totalCount": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "languageLocked": {
+            "type": "boolean"
+          },
+          "summaryLocked": {
+            "type": "boolean"
+          },
+          "ageRatingLocked": {
+            "type": "boolean"
+          },
+          "publicationStatusLocked": {
+            "type": "boolean"
+          },
+          "genresLocked": {
+            "type": "boolean"
+          },
+          "tagsLocked": {
+            "type": "boolean"
+          },
+          "writerLocked": {
+            "type": "boolean"
+          },
+          "characterLocked": {
+            "type": "boolean"
+          },
+          "coloristLocked": {
+            "type": "boolean"
+          },
+          "editorLocked": {
+            "type": "boolean"
+          },
+          "inkerLocked": {
+            "type": "boolean"
+          },
+          "imprintLocked": {
+            "type": "boolean"
+          },
+          "lettererLocked": {
+            "type": "boolean"
+          },
+          "pencillerLocked": {
+            "type": "boolean"
+          },
+          "publisherLocked": {
+            "type": "boolean"
+          },
+          "translatorLocked": {
+            "type": "boolean"
+          },
+          "teamLocked": {
+            "type": "boolean"
+          },
+          "locationLocked": {
+            "type": "boolean"
+          },
+          "coverArtistLocked": {
+            "type": "boolean"
+          },
+          "releaseYearLocked": {
+            "type": "boolean"
+          },
+          "coverImage": {
+            "type": "string",
+            "nullable": true
+          },
+          "primaryColor": {
+            "type": "string",
+            "nullable": true
+          },
+          "secondaryColor": {
+            "type": "string",
+            "nullable": true
+          },
+          "seriesId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "libraryId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "libraryType": {
+            "enum": [
+              0,
+              1,
+              2,
+              3,
+              4,
+              5
+            ],
+            "type": "integer",
+            "format": "int32"
+          },
+          "volumeTitle": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false,
+        "description": "Used on Person Profile page"
+      },
       "Tag": {
         "required": [
           "normalizedTitle",
@@ -21948,7 +26433,9 @@
       },
       "UpdateLibraryDto": {
         "required": [
+          "allowMetadataMatching",
           "allowScrobbling",
+          "enableMetadata",
           "excludePatterns",
           "fileGroupTypes",
           "folders",
@@ -21959,6 +26446,7 @@
           "manageCollections",
           "manageReadingLists",
           "name",
+          "removePrefixForSortName",
           "type"
         ],
         "type": "object",
@@ -22007,6 +26495,15 @@
           "allowScrobbling": {
             "type": "boolean"
           },
+          "allowMetadataMatching": {
+            "type": "boolean"
+          },
+          "enableMetadata": {
+            "type": "boolean"
+          },
+          "removePrefixForSortName": {
+            "type": "boolean"
+          },
           "fileGroupTypes": {
             "type": "array",
             "items": {
@@ -22096,7 +26593,7 @@
           },
           "updateVersion": {
             "type": "string",
-            "description": "Semver of the release version\r\n0.4.3",
+            "description": "Semver of the release version\n0.4.3",
             "nullable": true
           },
           "updateBody": {
@@ -22138,11 +26635,149 @@
           "isReleaseEqual": {
             "type": "boolean",
             "description": "Is the server on this version"
+          },
+          "added": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "removed": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "changed": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "fixed": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "theme": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "developer": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "api": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "featureRequests": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "knownIssues": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "blogPart": {
+            "type": "string",
+            "description": "The part above the changelog part",
+            "nullable": true
           }
         },
         "additionalProperties": false,
         "description": "Update Notification denoting a new release available for user to update to"
       },
+      "UpdatePersonDto": {
+        "required": [
+          "coverImageLocked",
+          "id",
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "coverImageLocked": {
+            "type": "boolean"
+          },
+          "name": {
+            "minLength": 1,
+            "type": "string"
+          },
+          "aliases": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            },
+            "nullable": true
+          },
+          "description": {
+            "type": "string",
+            "nullable": true
+          },
+          "aniListId": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "malId": {
+            "type": "integer",
+            "format": "int64",
+            "nullable": true
+          },
+          "hardcoverId": {
+            "type": "string",
+            "nullable": true
+          },
+          "asin": {
+            "type": "string",
+            "nullable": true
+          }
+        },
+        "additionalProperties": false
+      },
+      "UpdateRatingDto": {
+        "type": "object",
+        "properties": {
+          "seriesId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "chapterId": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "userRating": {
+            "type": "number",
+            "format": "float"
+          }
+        },
+        "additionalProperties": false
+      },
       "UpdateReadingListByChapterDto": {
         "type": "object",
         "properties": {
@@ -22479,20 +27114,6 @@
         },
         "additionalProperties": false
       },
-      "UpdateSeriesRatingDto": {
-        "type": "object",
-        "properties": {
-          "seriesId": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "userRating": {
-            "type": "number",
-            "format": "float"
-          }
-        },
-        "additionalProperties": false
-      },
       "UpdateStreamPositionDto": {
         "type": "object",
         "properties": {
@@ -22531,6 +27152,7 @@
             "items": {
               "type": "string"
             },
+            "description": "List of Roles to assign to user. If admin not present, Pleb will be applied.\nIf admin present, all libraries will be granted access and will ignore those from DTO.",
             "nullable": true
           },
           "libraries": {
@@ -22544,24 +27166,10 @@
           },
           "ageRestriction": {
             "$ref": "#/components/schemas/AgeRestrictionDto"
-          }
-        },
-        "additionalProperties": false
-      },
-      "UpdateUserProgressDto": {
-        "type": "object",
-        "properties": {
-          "pageNum": {
-            "type": "integer",
-            "format": "int32"
           },
-          "lastModifiedUtc": {
+          "email": {
             "type": "string",
-            "format": "date-time"
-          },
-          "createdUtc": {
-            "type": "string",
-            "format": "date-time"
+            "nullable": true
           }
         },
         "additionalProperties": false
@@ -22573,6 +27181,11 @@
             "type": "integer",
             "format": "int32"
           },
+          "chapterId": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
           "body": {
             "type": "string",
             "nullable": true
@@ -22683,248 +27296,68 @@
         },
         "additionalProperties": false
       },
+      "UserParams": {
+        "type": "object",
+        "properties": {
+          "pageNumber": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "pageSize": {
+            "type": "integer",
+            "description": "If set to 0, will set as MaxInt",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
       "UserPreferencesDto": {
         "required": [
-          "autoCloseMenu",
-          "backgroundColor",
           "blurUnreadSummaries",
-          "bookReaderFontFamily",
-          "bookReaderFontSize",
-          "bookReaderImmersiveMode",
-          "bookReaderLayoutMode",
-          "bookReaderLineSpacing",
-          "bookReaderMargin",
-          "bookReaderReadingDirection",
-          "bookReaderTapToPaginate",
-          "bookReaderThemeName",
-          "bookReaderWritingStyle",
           "collapseSeriesRelationships",
-          "emulateBook",
-          "globalPageLayoutMode",
-          "layoutMode",
           "locale",
           "noTransitions",
-          "pageSplitOption",
-          "pdfLayoutMode",
-          "pdfScrollMode",
-          "pdfSpreadMode",
-          "pdfTheme",
           "promptForDownloadSize",
-          "readerMode",
-          "readingDirection",
-          "scalingOption",
           "shareReviews",
-          "showScreenHints",
-          "swipeToPaginate",
           "theme"
         ],
         "type": "object",
         "properties": {
-          "readingDirection": {
-            "enum": [
-              0,
-              1
-            ],
-            "type": "integer",
-            "description": "Manga Reader Option: What direction should the next/prev page buttons go",
-            "format": "int32"
-          },
-          "scalingOption": {
-            "enum": [
-              0,
-              1,
-              2,
-              3
-            ],
-            "type": "integer",
-            "description": "Manga Reader Option: How should the image be scaled to screen",
-            "format": "int32"
-          },
-          "pageSplitOption": {
-            "enum": [
-              0,
-              1,
-              2,
-              3
-            ],
-            "type": "integer",
-            "description": "Manga Reader Option: Which side of a split image should we show first",
-            "format": "int32"
-          },
-          "readerMode": {
-            "enum": [
-              0,
-              1,
-              2
-            ],
-            "type": "integer",
-            "description": "Manga Reader Option: How the manga reader should perform paging or reading of the file\r\n\r\nWebtoon uses scrolling to page, LeftRight uses paging by clicking left/right side of reader, UpDown uses paging\r\nby clicking top/bottom sides of reader.\r\n",
-            "format": "int32"
-          },
-          "layoutMode": {
-            "enum": [
-              1,
-              2,
-              3
-            ],
-            "type": "integer",
-            "description": "Manga Reader Option: How many pages to display in the reader at once",
-            "format": "int32"
-          },
-          "emulateBook": {
-            "type": "boolean",
-            "description": "Manga Reader Option: Emulate a book by applying a shadow effect on the pages"
-          },
-          "backgroundColor": {
-            "minLength": 1,
-            "type": "string",
-            "description": "Manga Reader Option: Background color of the reader"
-          },
-          "swipeToPaginate": {
-            "type": "boolean",
-            "description": "Manga Reader Option: Should swiping trigger pagination"
-          },
-          "autoCloseMenu": {
-            "type": "boolean",
-            "description": "Manga Reader Option: Allow the menu to close after 6 seconds without interaction"
-          },
-          "showScreenHints": {
-            "type": "boolean",
-            "description": "Manga Reader Option: Show screen hints to the user on some actions, ie) pagination direction change"
-          },
-          "bookReaderMargin": {
-            "type": "integer",
-            "description": "Book Reader Option: Override extra Margin",
-            "format": "int32"
-          },
-          "bookReaderLineSpacing": {
-            "type": "integer",
-            "description": "Book Reader Option: Override line-height",
-            "format": "int32"
-          },
-          "bookReaderFontSize": {
-            "type": "integer",
-            "description": "Book Reader Option: Override font size",
-            "format": "int32"
-          },
-          "bookReaderFontFamily": {
-            "minLength": 1,
-            "type": "string",
-            "description": "Book Reader Option: Maps to the default Kavita font-family (inherit) or an override"
-          },
-          "bookReaderTapToPaginate": {
-            "type": "boolean",
-            "description": "Book Reader Option: Allows tapping on side of screens to paginate"
-          },
-          "bookReaderReadingDirection": {
-            "enum": [
-              0,
-              1
-            ],
-            "type": "integer",
-            "description": "Book Reader Option: What direction should the next/prev page buttons go",
-            "format": "int32"
-          },
-          "bookReaderWritingStyle": {
-            "enum": [
-              0,
-              1
-            ],
-            "type": "integer",
-            "description": "Book Reader Option: What writing style should be used, horizontal or vertical.",
-            "format": "int32"
-          },
           "theme": {
             "$ref": "#/components/schemas/SiteThemeDto"
           },
-          "bookReaderThemeName": {
-            "minLength": 1,
-            "type": "string"
-          },
-          "bookReaderLayoutMode": {
-            "enum": [
-              0,
-              1,
-              2
-            ],
-            "type": "integer",
-            "format": "int32"
-          },
-          "bookReaderImmersiveMode": {
-            "type": "boolean",
-            "description": "Book Reader Option: A flag that hides the menu-ing system behind a click on the screen. This should be used with tap to paginate, but the app doesn't enforce this."
-          },
           "globalPageLayoutMode": {
             "enum": [
               0,
               1
             ],
             "type": "integer",
-            "description": "Global Site Option: If the UI should layout items as Cards or List items",
             "format": "int32"
           },
           "blurUnreadSummaries": {
-            "type": "boolean",
-            "description": "UI Site Global Setting: If unread summaries should be blurred until expanded or unless user has read it already"
+            "type": "boolean"
           },
           "promptForDownloadSize": {
-            "type": "boolean",
-            "description": "UI Site Global Setting: Should Kavita prompt user to confirm downloads that are greater than 100 MB."
+            "type": "boolean"
           },
           "noTransitions": {
-            "type": "boolean",
-            "description": "UI Site Global Setting: Should Kavita disable CSS transitions"
+            "type": "boolean"
           },
           "collapseSeriesRelationships": {
-            "type": "boolean",
-            "description": "When showing series, only parent series or series with no relationships will be returned"
+            "type": "boolean"
           },
           "shareReviews": {
-            "type": "boolean",
-            "description": "UI Site Global Setting: Should series reviews be shared with all users in the server"
+            "type": "boolean"
           },
           "locale": {
             "minLength": 1,
-            "type": "string",
-            "description": "UI Site Global Setting: The language locale that should be used for the user"
+            "type": "string"
           },
-          "pdfTheme": {
-            "enum": [
-              0,
-              1
-            ],
-            "type": "integer",
-            "description": "PDF Reader: Theme of the Reader",
-            "format": "int32"
+          "aniListScrobblingEnabled": {
+            "type": "boolean"
           },
-          "pdfScrollMode": {
-            "enum": [
-              0,
-              1,
-              3
-            ],
-            "type": "integer",
-            "description": "PDF Reader: Scroll mode of the reader",
-            "format": "int32"
-          },
-          "pdfLayoutMode": {
-            "enum": [
-              0,
-              2
-            ],
-            "type": "integer",
-            "description": "PDF Reader: Layout Mode of the reader",
-            "format": "int32"
-          },
-          "pdfSpreadMode": {
-            "enum": [
-              0,
-              1,
-              2
-            ],
-            "type": "integer",
-            "description": "PDF Reader: Spread Mode of the reader",
-            "format": "int32"
+          "wantToReadSync": {
+            "type": "boolean"
           }
         },
         "additionalProperties": false
@@ -22969,6 +27402,218 @@
         },
         "additionalProperties": false
       },
+      "UserReadingProfileDto": {
+        "required": [
+          "allowAutomaticWebtoonReaderDetection",
+          "autoCloseMenu",
+          "backgroundColor",
+          "bookReaderFontFamily",
+          "bookReaderFontSize",
+          "bookReaderImmersiveMode",
+          "bookReaderLayoutMode",
+          "bookReaderLineSpacing",
+          "bookReaderMargin",
+          "bookReaderReadingDirection",
+          "bookReaderTapToPaginate",
+          "bookReaderThemeName",
+          "bookReaderWritingStyle",
+          "emulateBook",
+          "layoutMode",
+          "pageSplitOption",
+          "pdfScrollMode",
+          "pdfSpreadMode",
+          "pdfTheme",
+          "readerMode",
+          "readingDirection",
+          "scalingOption",
+          "showScreenHints",
+          "swipeToPaginate"
+        ],
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "userId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string",
+            "nullable": true
+          },
+          "kind": {
+            "enum": [
+              0,
+              1,
+              2
+            ],
+            "type": "integer",
+            "format": "int32"
+          },
+          "readingDirection": {
+            "enum": [
+              0,
+              1
+            ],
+            "type": "integer",
+            "format": "int32"
+          },
+          "scalingOption": {
+            "enum": [
+              0,
+              1,
+              2,
+              3
+            ],
+            "type": "integer",
+            "format": "int32"
+          },
+          "pageSplitOption": {
+            "enum": [
+              0,
+              1,
+              2,
+              3
+            ],
+            "type": "integer",
+            "format": "int32"
+          },
+          "readerMode": {
+            "enum": [
+              0,
+              1,
+              2
+            ],
+            "type": "integer",
+            "format": "int32"
+          },
+          "autoCloseMenu": {
+            "type": "boolean"
+          },
+          "showScreenHints": {
+            "type": "boolean"
+          },
+          "emulateBook": {
+            "type": "boolean"
+          },
+          "layoutMode": {
+            "enum": [
+              1,
+              2,
+              3
+            ],
+            "type": "integer",
+            "format": "int32"
+          },
+          "backgroundColor": {
+            "minLength": 1,
+            "type": "string"
+          },
+          "swipeToPaginate": {
+            "type": "boolean"
+          },
+          "allowAutomaticWebtoonReaderDetection": {
+            "type": "boolean"
+          },
+          "widthOverride": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
+          "disableWidthOverride": {
+            "enum": [
+              0,
+              1,
+              2,
+              3
+            ],
+            "type": "integer",
+            "format": "int32"
+          },
+          "bookReaderMargin": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "bookReaderLineSpacing": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "bookReaderFontSize": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "bookReaderFontFamily": {
+            "minLength": 1,
+            "type": "string"
+          },
+          "bookReaderTapToPaginate": {
+            "type": "boolean"
+          },
+          "bookReaderReadingDirection": {
+            "enum": [
+              0,
+              1
+            ],
+            "type": "integer",
+            "format": "int32"
+          },
+          "bookReaderWritingStyle": {
+            "enum": [
+              0,
+              1
+            ],
+            "type": "integer",
+            "description": "Represents the writing styles for the book-reader",
+            "format": "int32"
+          },
+          "bookReaderThemeName": {
+            "minLength": 1,
+            "type": "string"
+          },
+          "bookReaderLayoutMode": {
+            "enum": [
+              0,
+              1,
+              2
+            ],
+            "type": "integer",
+            "format": "int32"
+          },
+          "bookReaderImmersiveMode": {
+            "type": "boolean"
+          },
+          "pdfTheme": {
+            "enum": [
+              0,
+              1
+            ],
+            "type": "integer",
+            "format": "int32"
+          },
+          "pdfScrollMode": {
+            "enum": [
+              0,
+              1,
+              3
+            ],
+            "type": "integer",
+            "description": "Enum values match PdfViewer's enums",
+            "format": "int32"
+          },
+          "pdfSpreadMode": {
+            "enum": [
+              0,
+              1,
+              2
+            ],
+            "type": "integer",
+            "format": "int32"
+          }
+        },
+        "additionalProperties": false
+      },
       "UserReviewDto": {
         "type": "object",
         "properties": {
@@ -22992,6 +27637,11 @@
             "description": "The series this is for",
             "format": "int32"
           },
+          "chapterId": {
+            "type": "integer",
+            "format": "int32",
+            "nullable": true
+          },
           "libraryId": {
             "type": "integer",
             "description": "The library this series belongs in",
@@ -23032,16 +27682,55 @@
             "enum": [
               0,
               1,
-              2
+              2,
+              3,
+              4
             ],
             "type": "integer",
             "description": "If this review is External, which Provider did it come from",
             "format": "int32"
+          },
+          "authority": {
+            "enum": [
+              0,
+              1
+            ],
+            "type": "integer",
+            "description": "Source of the Rating",
+            "format": "int32"
           }
         },
         "additionalProperties": false,
         "description": "Represents a User Review for a given Series"
       },
+      "UserTokenInfo": {
+        "type": "object",
+        "properties": {
+          "userId": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "username": {
+            "type": "string",
+            "nullable": true
+          },
+          "isAniListTokenSet": {
+            "type": "boolean"
+          },
+          "isAniListTokenValid": {
+            "type": "boolean"
+          },
+          "aniListValidUntilUtc": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "isMalTokenSet": {
+            "type": "boolean"
+          }
+        },
+        "additionalProperties": false,
+        "description": "Represents information around a user's tokens and their status"
+      },
       "Volume": {
         "required": [
           "maxNumber",
@@ -23283,6 +27972,14 @@
       "name": "Image",
       "description": "Responsible for servicing up images stored in Kavita for entities"
     },
+    {
+      "name": "Koreader",
+      "description": "The endpoint to interface with Koreader's Progress Sync plugin."
+    },
+    {
+      "name": "Manage",
+      "description": "All things centered around Managing the Kavita instance, that isn't aligned with an entity"
+    },
     {
       "name": "Panels",
       "description": "For the Panels app explicitly"
@@ -23305,7 +28002,7 @@
     },
     {
       "name": "Tachiyomi",
-      "description": "All APIs are for Tachiyomi extension and app. They have hacks for our implementation and should not be used for any\r\nother purposes."
+      "description": "All APIs are for Tachiyomi extension and app. They have hacks for our implementation and should not be used for any\nother purposes."
     },
     {
       "name": "Upload",