diff --git a/API.Tests/API.Tests.csproj b/API.Tests/API.Tests.csproj index 22904ba4a..12cf2b444 100644 --- a/API.Tests/API.Tests.csproj +++ b/API.Tests/API.Tests.csproj @@ -11,8 +11,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/API/API.csproj b/API/API.csproj index cf6cf1664..9767a0ec3 100644 --- a/API/API.csproj +++ b/API/API.csproj @@ -53,7 +53,7 @@ - + all @@ -66,10 +66,10 @@ - + - + @@ -93,14 +93,14 @@ - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -194,6 +194,7 @@ Always + diff --git a/API/Controllers/AccountController.cs b/API/Controllers/AccountController.cs index 1a3a0376e..2276a5a83 100644 --- a/API/Controllers/AccountController.cs +++ b/API/Controllers/AccountController.cs @@ -898,8 +898,6 @@ public class AccountController : BaseApiController { var settings = await _unitOfWork.SettingsRepository.GetSettingsDtoAsync(); - if (!settings.IsEmailSetup()) return Ok(await _localizationService.Get("en", "email-not-enabled")); - var user = await _unitOfWork.UserRepository.GetUserByEmailAsync(email); if (user == null) { @@ -914,11 +912,7 @@ public class AccountController : BaseApiController if (string.IsNullOrEmpty(user.Email) || !user.EmailConfirmed) return BadRequest(await _localizationService.Translate(user.Id, "confirm-email")); - if (!_emailService.IsValidEmail(user.Email)) - { - _logger.LogCritical("[Forgot Password]: User is trying to do a forgot password flow, but their email ({Email}) isn't valid. No email will be send. Admin must change it in UI", user.Email); - return Ok(await _localizationService.Translate(user.Id, "invalid-email")); - } + var token = await _userManager.GeneratePasswordResetTokenAsync(user); var emailLink = await _emailService.GenerateEmailLink(Request, token, "confirm-reset-password", user.Email); @@ -927,6 +921,13 @@ public class AccountController : BaseApiController await _unitOfWork.CommitAsync(); _logger.LogCritical("[Forgot Password]: Email Link for {UserName}: {Link}", user.UserName, emailLink); + if (!settings.IsEmailSetup()) return Ok(await _localizationService.Get("en", "email-not-enabled")); + if (!_emailService.IsValidEmail(user.Email)) + { + _logger.LogCritical("[Forgot Password]: User is trying to do a forgot password flow, but their email ({Email}) isn't valid. No email will be send. Admin must change it in UI or from url above", user.Email); + return Ok(await _localizationService.Translate(user.Id, "invalid-email")); + } + var installId = (await _unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.InstallId)).Value; BackgroundJob.Enqueue(() => _emailService.SendForgotPasswordEmail(new PasswordResetEmailDto() { diff --git a/API/Controllers/CollectionController.cs b/API/Controllers/CollectionController.cs index bfc6849d6..b49d6aa40 100644 --- a/API/Controllers/CollectionController.cs +++ b/API/Controllers/CollectionController.cs @@ -12,8 +12,11 @@ using API.Extensions; using API.Helpers.Builders; using API.Services; using API.Services.Plus; +using API.SignalR; +using Hangfire; using Kavita.Common; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; namespace API.Controllers; @@ -28,15 +31,23 @@ public class CollectionController : BaseApiController private readonly ICollectionTagService _collectionService; private readonly ILocalizationService _localizationService; private readonly IExternalMetadataService _externalMetadataService; + private readonly ISmartCollectionSyncService _collectionSyncService; + private readonly ILogger _logger; + private readonly IEventHub _eventHub; /// public CollectionController(IUnitOfWork unitOfWork, ICollectionTagService collectionService, - ILocalizationService localizationService, IExternalMetadataService externalMetadataService) + ILocalizationService localizationService, IExternalMetadataService externalMetadataService, + ISmartCollectionSyncService collectionSyncService, ILogger logger, + IEventHub eventHub) { _unitOfWork = unitOfWork; _collectionService = collectionService; _localizationService = localizationService; _externalMetadataService = externalMetadataService; + _collectionSyncService = collectionSyncService; + _logger = logger; + _eventHub = eventHub; } /// @@ -49,6 +60,18 @@ public class CollectionController : BaseApiController return Ok(await _unitOfWork.CollectionTagRepository.GetCollectionDtosAsync(User.GetUserId(), !ownedOnly)); } + /// + /// Returns a single Collection tag by Id for a given user + /// + /// + /// + [HttpGet("single")] + public async Task>> GetTag(int collectionId) + { + var collections = await _unitOfWork.CollectionTagRepository.GetCollectionDtosAsync(User.GetUserId(), false); + return Ok(collections.FirstOrDefault(c => c.Id == collectionId)); + } + /// /// Returns all collections that contain the Series for the user with the option to allow for promoted collections (non-user owned) /// @@ -86,6 +109,8 @@ public class CollectionController : BaseApiController { if (await _collectionService.UpdateTag(updatedTag, User.GetUserId())) { + await _eventHub.SendMessageAsync(MessageFactory.CollectionUpdated, + MessageFactory.CollectionUpdatedEvent(updatedTag.Id), false); return Ok(await _localizationService.Translate(User.GetUserId(), "collection-updated-successfully")); } } @@ -129,12 +154,12 @@ public class CollectionController : BaseApiController /// - /// Promote/UnPromote multiple collections in one go + /// Delete multiple collections in one go /// /// /// [HttpPost("delete-multiple")] - public async Task DeleteMultipleCollections(PromoteCollectionsDto dto) + public async Task DeleteMultipleCollections(DeleteCollectionsDto dto) { // This needs to take into account owner as I can select other users cards var user = await _unitOfWork.UserRepository.GetUserByIdAsync(User.GetUserId(), AppUserIncludes.Collections); @@ -178,7 +203,7 @@ public class CollectionController : BaseApiController return BadRequest(_localizationService.Translate(User.GetUserId(), "collection-doesnt-exists")); } - var series = await _unitOfWork.SeriesRepository.GetSeriesByIdsAsync(dto.SeriesIds.ToList()); + var series = await _unitOfWork.SeriesRepository.GetSeriesByIdsAsync(dto.SeriesIds.ToList(), false); foreach (var s in series) { if (tag.Items.Contains(s)) continue; @@ -253,4 +278,45 @@ public class CollectionController : BaseApiController { return Ok(await _externalMetadataService.GetStacksForUser(User.GetUserId())); } + + /// + /// Imports a MAL Stack into Kavita + /// + /// + /// + [HttpPost("import-stack")] + public async Task ImportMalStack(MalStackDto dto) + { + var user = await _unitOfWork.UserRepository.GetUserByIdAsync(User.GetUserId(), AppUserIncludes.Collections); + if (user == null) return Unauthorized(); + + // Validation check to ensure stack doesn't exist already + if (await _unitOfWork.CollectionTagRepository.CollectionExists(dto.Title, user.Id)) + { + return BadRequest(_localizationService.Translate(user.Id, "collection-already-exists")); + } + + try + { + // Create new collection + var newCollection = new AppUserCollectionBuilder(dto.Title) + .WithSource(ScrobbleProvider.Mal) + .WithSourceUrl(dto.Url) + .Build(); + user.Collections.Add(newCollection); + + _unitOfWork.UserRepository.Update(user); + await _unitOfWork.CommitAsync(); + + // Trigger Stack Refresh for just one stack (not all) + BackgroundJob.Enqueue(() => _collectionSyncService.Sync(newCollection.Id)); + return Ok(); + } + catch (Exception ex) + { + _logger.LogError(ex, "There was an issue importing MAL Stack"); + } + + return BadRequest(_localizationService.Translate(user.Id, "error-import-stack")); + } } diff --git a/API/DTOs/Collection/AppUserCollectionDto.cs b/API/DTOs/Collection/AppUserCollectionDto.cs index 62d786ca2..f01cd492c 100644 --- a/API/DTOs/Collection/AppUserCollectionDto.cs +++ b/API/DTOs/Collection/AppUserCollectionDto.cs @@ -36,4 +36,12 @@ public class AppUserCollectionDto /// For Non-Kavita sourced collections, the url to sync from /// public string? SourceUrl { get; set; } + /// + /// Total number of items as of the last sync. Not applicable for Kavita managed collections. + /// + public int TotalSourceCount { get; set; } + /// + /// A
separated string of all missing series + /// + public string? MissingSeriesFromSource { get; set; } } diff --git a/API/DTOs/Collection/DeleteCollectionsDto.cs b/API/DTOs/Collection/DeleteCollectionsDto.cs index 66bf257ba..c0b94e9a1 100644 --- a/API/DTOs/Collection/DeleteCollectionsDto.cs +++ b/API/DTOs/Collection/DeleteCollectionsDto.cs @@ -1,8 +1,10 @@ using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; namespace API.DTOs.Collection; public class DeleteCollectionsDto { + [Required] public IList CollectionIds { get; set; } } diff --git a/API/DTOs/CollectionTags/CollectionTagDto.cs b/API/DTOs/CollectionTags/CollectionTagDto.cs index 2a1279a35..ec9939ebd 100644 --- a/API/DTOs/CollectionTags/CollectionTagDto.cs +++ b/API/DTOs/CollectionTags/CollectionTagDto.cs @@ -1,5 +1,8 @@ -namespace API.DTOs.CollectionTags; +using System; +namespace API.DTOs.CollectionTags; + +[Obsolete("Use AppUserCollectionDto")] public class CollectionTagDto { public int Id { get; set; } diff --git a/API/DTOs/CollectionTags/UpdateSeriesForTagDto.cs b/API/DTOs/CollectionTags/UpdateSeriesForTagDto.cs index 9d6f2a035..19e9a11e2 100644 --- a/API/DTOs/CollectionTags/UpdateSeriesForTagDto.cs +++ b/API/DTOs/CollectionTags/UpdateSeriesForTagDto.cs @@ -1,9 +1,11 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; +using API.DTOs.Collection; namespace API.DTOs.CollectionTags; public class UpdateSeriesForTagDto { - public CollectionTagDto Tag { get; init; } = default!; + public AppUserCollectionDto Tag { get; init; } = default!; public IEnumerable SeriesIdsToRemove { get; init; } = default!; } diff --git a/API/DTOs/UpdateLibraryDto.cs b/API/DTOs/UpdateLibraryDto.cs index b8e8e4953..2e2ab9aba 100644 --- a/API/DTOs/UpdateLibraryDto.cs +++ b/API/DTOs/UpdateLibraryDto.cs @@ -36,5 +36,6 @@ public class UpdateLibraryDto /// /// A set of Glob patterns that the scanner will exclude processing /// + [Required] public ICollection ExcludePatterns { get; init; } } diff --git a/API/Data/Migrations/20240503120147_SmartCollectionFields.Designer.cs b/API/Data/Migrations/20240503120147_SmartCollectionFields.Designer.cs new file mode 100644 index 000000000..1dff0c0e5 --- /dev/null +++ b/API/Data/Migrations/20240503120147_SmartCollectionFields.Designer.cs @@ -0,0 +1,3025 @@ +// +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("20240503120147_SmartCollectionFields")] + partial class SmartCollectionFields + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "8.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("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("Promoted") + .HasColumnType("INTEGER"); + + 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("AlternateCount") + .HasColumnType("INTEGER"); + + b.Property("AlternateNumber") + .HasColumnType("TEXT"); + + b.Property("AlternateSeries") + .HasColumnType("TEXT"); + + b.Property("AvgHoursToRead") + .HasColumnType("INTEGER"); + + b.Property("Count") + .HasColumnType("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("ISBN") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("IsSpecial") + .HasColumnType("INTEGER"); + + b.Property("Language") + .HasColumnType("TEXT"); + + b.Property("LastModified") + .HasColumnType("TEXT"); + + b.Property("LastModifiedUtc") + .HasColumnType("TEXT"); + + 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("Range") + .HasColumnType("TEXT"); + + b.Property("ReleaseDate") + .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("Title") + .HasColumnType("TEXT"); + + b.Property("TitleName") + .HasColumnType("TEXT"); + + b.Property("TotalCount") + .HasColumnType("INTEGER"); + + b.Property("VolumeId") + .HasColumnType("INTEGER"); + + b.Property("WebLinks") + .ValueGeneratedOnAdd() + .HasColumnType("TEXT") + .HasDefaultValue(""); + + b.Property("WordCount") + .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.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("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("Name") + .HasColumnType("TEXT"); + + b.Property("NormalizedName") + .HasColumnType("TEXT"); + + b.Property("Role") + .HasColumnType("INTEGER"); + + 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("Promoted") + .HasColumnType("INTEGER"); + + 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("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + b.Property("CoverImageLocked") + .HasColumnType("INTEGER"); + + b.Property("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FolderPath") + .HasColumnType("TEXT"); + + b.Property("Format") + .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("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("Created") + .HasColumnType("TEXT"); + + b.Property("CreatedUtc") + .HasColumnType("TEXT"); + + b.Property("FileName") + .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("Provider") + .HasColumnType("INTEGER"); + + 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("INTEGER"); + + b.Property("CoverImage") + .HasColumnType("TEXT"); + + 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("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("ChapterPerson", b => + { + b.Property("ChapterMetadatasId") + .HasColumnType("INTEGER"); + + b.Property("PeopleId") + .HasColumnType("INTEGER"); + + b.HasKey("ChapterMetadatasId", "PeopleId"); + + b.HasIndex("PeopleId"); + + b.ToTable("ChapterPerson"); + }); + + 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("PersonSeriesMetadata", b => + { + b.Property("PeopleId") + .HasColumnType("INTEGER"); + + b.Property("SeriesMetadatasId") + .HasColumnType("INTEGER"); + + b.HasKey("PeopleId", "SeriesMetadatasId"); + + b.HasIndex("SeriesMetadatasId"); + + b.ToTable("PersonSeriesMetadata"); + }); + + 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.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.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("ChapterPerson", b => + { + b.HasOne("API.Entities.Chapter", null) + .WithMany() + .HasForeignKey("ChapterMetadatasId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Person", null) + .WithMany() + .HasForeignKey("PeopleId") + .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("PersonSeriesMetadata", b => + { + b.HasOne("API.Entities.Person", null) + .WithMany() + .HasForeignKey("PeopleId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("API.Entities.Metadata.SeriesMetadata", null) + .WithMany() + .HasForeignKey("SeriesMetadatasId") + .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("UserProgress"); + }); + + modelBuilder.Entity("API.Entities.Library", b => + { + b.Navigation("Folders"); + + b.Navigation("LibraryExcludePatterns"); + + b.Navigation("LibraryFileTypes"); + + b.Navigation("Series"); + }); + + 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/20240503120147_SmartCollectionFields.cs b/API/Data/Migrations/20240503120147_SmartCollectionFields.cs new file mode 100644 index 000000000..f0b6ed693 --- /dev/null +++ b/API/Data/Migrations/20240503120147_SmartCollectionFields.cs @@ -0,0 +1,39 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace API.Data.Migrations +{ + /// + public partial class SmartCollectionFields : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "MissingSeriesFromSource", + table: "AppUserCollection", + type: "TEXT", + nullable: true); + + migrationBuilder.AddColumn( + name: "TotalSourceCount", + table: "AppUserCollection", + type: "INTEGER", + nullable: false, + defaultValue: 0); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "MissingSeriesFromSource", + table: "AppUserCollection"); + + migrationBuilder.DropColumn( + name: "TotalSourceCount", + table: "AppUserCollection"); + } + } +} diff --git a/API/Data/Migrations/DataContextModelSnapshot.cs b/API/Data/Migrations/DataContextModelSnapshot.cs index 52c35f095..5507db79a 100644 --- a/API/Data/Migrations/DataContextModelSnapshot.cs +++ b/API/Data/Migrations/DataContextModelSnapshot.cs @@ -224,6 +224,9 @@ namespace API.Data.Migrations b.Property("LastSyncUtc") .HasColumnType("TEXT"); + b.Property("MissingSeriesFromSource") + .HasColumnType("TEXT"); + b.Property("NormalizedTitle") .HasColumnType("TEXT"); @@ -242,6 +245,9 @@ namespace API.Data.Migrations b.Property("Title") .HasColumnType("TEXT"); + b.Property("TotalSourceCount") + .HasColumnType("INTEGER"); + b.HasKey("Id"); b.HasIndex("AppUserId"); diff --git a/API/Data/Repositories/CollectionTagRepository.cs b/API/Data/Repositories/CollectionTagRepository.cs index 5a45c117e..cbe62313a 100644 --- a/API/Data/Repositories/CollectionTagRepository.cs +++ b/API/Data/Repositories/CollectionTagRepository.cs @@ -9,6 +9,7 @@ using API.Entities.Enums; using API.Extensions; using API.Extensions.QueryExtensions; using API.Extensions.QueryExtensions.Filtering; +using API.Services.Plus; using AutoMapper; using AutoMapper.QueryableExtensions; using Microsoft.EntityFrameworkCore; @@ -57,6 +58,7 @@ public interface ICollectionTagRepository Task> GetCollectionsForUserAsync(int userId, CollectionIncludes includes = CollectionIncludes.None); Task UpdateCollectionAgeRating(AppUserCollection tag); Task> GetCollectionsByIds(IEnumerable tags, CollectionIncludes includes = CollectionIncludes.None); + Task> GetAllCollectionsForSyncing(DateTime expirationTime); } public class CollectionTagRepository : ICollectionTagRepository { @@ -207,6 +209,16 @@ public class CollectionTagRepository : ICollectionTagRepository .ToListAsync(); } + public async Task> GetAllCollectionsForSyncing(DateTime expirationTime) + { + return await _context.AppUserCollection + .Where(c => c.Source == ScrobbleProvider.Mal) + .Where(c => c.LastSyncUtc <= expirationTime) + .Include(c => c.Items) + .AsSplitQuery() + .ToListAsync(); + } + public async Task GetCollectionAsync(int tagId, CollectionIncludes includes = CollectionIncludes.None) { diff --git a/API/Data/Repositories/SeriesRepository.cs b/API/Data/Repositories/SeriesRepository.cs index 651a6c642..5c8b91b19 100644 --- a/API/Data/Repositories/SeriesRepository.cs +++ b/API/Data/Repositories/SeriesRepository.cs @@ -73,6 +73,7 @@ public interface ISeriesRepository void Update(Series series); void Remove(Series series); void Remove(IEnumerable series); + void Detach(Series series); Task DoesSeriesNameExistInLibrary(string name, int libraryId, MangaFormat format); /// /// Adds user information like progress, ratings, etc @@ -96,7 +97,7 @@ public interface ISeriesRepository Task GetSeriesDtoByIdAsync(int seriesId, int userId); Task GetSeriesByIdAsync(int seriesId, SeriesIncludes includes = SeriesIncludes.Volumes | SeriesIncludes.Metadata); Task> GetSeriesDtoByIdsAsync(IEnumerable seriesIds, AppUser user); - Task> GetSeriesByIdsAsync(IList seriesIds); + Task> GetSeriesByIdsAsync(IList seriesIds, bool fullSeries = true); Task GetChapterIdsForSeriesAsync(IList seriesIds); Task>> GetChapterIdWithSeriesIdForSeriesAsync(int[] seriesIds); /// @@ -138,6 +139,7 @@ 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); public Task> GetAllSeriesByAnyName(string seriesName, string localizedName, int libraryId, MangaFormat format); Task> RemoveSeriesNotInList(IList seenSeries, int libraryId); @@ -204,6 +206,11 @@ public class SeriesRepository : ISeriesRepository _context.Series.RemoveRange(series); } + public void Detach(Series series) + { + _context.Entry(series).State = EntityState.Detached; + } + /// /// Returns if a series name and format exists already in a library /// @@ -531,15 +538,19 @@ public class SeriesRepository : ISeriesRepository /// Returns Full Series including all external links /// /// + /// Include all the includes or just the Series /// - public async Task> GetSeriesByIdsAsync(IList seriesIds) + public async Task> GetSeriesByIdsAsync(IList seriesIds, bool fullSeries = true) { - return await _context.Series - .Include(s => s.Volumes) + var query = _context.Series + .Where(s => seriesIds.Contains(s.Id)) + .AsSplitQuery(); + + if (!fullSeries) return await query.ToListAsync(); + + return await query.Include(s => s.Volumes) .Include(s => s.Relations) .Include(s => s.Metadata) - .ThenInclude(m => m.CollectionTags) - .Include(s => s.ExternalSeriesMetadata) @@ -549,9 +560,6 @@ public class SeriesRepository : ISeriesRepository .ThenInclude(e => e.ExternalReviews) .Include(s => s.ExternalSeriesMetadata) .ThenInclude(e => e.ExternalRecommendations) - - .Where(s => seriesIds.Contains(s.Id)) - .AsSplitQuery() .ToListAsync(); } @@ -1670,6 +1678,26 @@ public class SeriesRepository : ISeriesRepository #nullable enable } + public async Task GetSeriesByAnyName(string seriesName, string localizedName, IList formats, int userId) + { + var libraryIds = GetLibraryIdsForUser(userId); + var normalizedSeries = seriesName.ToNormalized(); + var normalizedLocalized = localizedName.ToNormalized(); + return await _context.Series + .Where(s => libraryIds.Contains(s.LibraryId)) + .Where(s => formats.Contains(s.Format)) + .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)) + ) + .FirstOrDefaultAsync(); + } + public async Task> GetAllSeriesByAnyName(string seriesName, string localizedName, int libraryId, MangaFormat format) { diff --git a/API/Entities/AppUserCollection.cs b/API/Entities/AppUserCollection.cs index 6ae0bca1c..7ff60e0e8 100644 --- a/API/Entities/AppUserCollection.cs +++ b/API/Entities/AppUserCollection.cs @@ -52,7 +52,14 @@ public class AppUserCollection : IEntityDate /// For Non-Kavita sourced collections, the url to sync from /// public string? SourceUrl { get; set; } - + /// + /// Total number of items as of the last sync. Not applicable for Kavita managed collections. + /// + public int TotalSourceCount { get; set; } + /// + /// A
separated string of all missing series + /// + public string? MissingSeriesFromSource { get; set; } // Relationship public AppUser AppUser { get; set; } = null!; diff --git a/API/Extensions/ApplicationServiceExtensions.cs b/API/Extensions/ApplicationServiceExtensions.cs index cc3c9740b..f68b4461d 100644 --- a/API/Extensions/ApplicationServiceExtensions.cs +++ b/API/Extensions/ApplicationServiceExtensions.cs @@ -74,6 +74,7 @@ public static class ApplicationServiceExtensions services.AddScoped(); services.AddScoped(); services.AddScoped(); + services.AddScoped(); services.AddSqLite(); services.AddSignalR(opt => opt.EnableDetailedErrors = true); diff --git a/API/Helpers/Builders/AppUserCollectionBuilder.cs b/API/Helpers/Builders/AppUserCollectionBuilder.cs index 0fcdc0058..e9bdcf977 100644 --- a/API/Helpers/Builders/AppUserCollectionBuilder.cs +++ b/API/Helpers/Builders/AppUserCollectionBuilder.cs @@ -69,4 +69,10 @@ public class AppUserCollectionBuilder : IEntityBuilder _collection.CoverImage = cover; return this; } + + public AppUserCollectionBuilder WithSourceUrl(string url) + { + _collection.SourceUrl = url; + return this; + } } diff --git a/API/Helpers/LibraryTypeHelper.cs b/API/Helpers/LibraryTypeHelper.cs index b65c31512..423d93f0e 100644 --- a/API/Helpers/LibraryTypeHelper.cs +++ b/API/Helpers/LibraryTypeHelper.cs @@ -9,11 +9,16 @@ 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/I18N/en.json b/API/I18N/en.json index 802edb014..5094b0626 100644 --- a/API/I18N/en.json +++ b/API/I18N/en.json @@ -49,6 +49,8 @@ "collection-deleted": "Collection deleted", "generic-error": "Something went wrong, please try again", "collection-doesnt-exist": "Collection does not exist", + "collection-already-exists":"Collection already exists", + "error-import-stack": "There was an issue importing MAL stack", "device-doesnt-exist": "Device does not exist", "generic-device-create": "There was an error when creating the device", diff --git a/API/Services/Plus/ExternalMetadataService.cs b/API/Services/Plus/ExternalMetadataService.cs index f2478f68e..4bc55eb88 100644 --- a/API/Services/Plus/ExternalMetadataService.cs +++ b/API/Services/Plus/ExternalMetadataService.cs @@ -82,7 +82,7 @@ public class ExternalMetadataService : IExternalMetadataService Reviews = ArraySegment.Empty }; // Allow 50 requests per 24 hours - private static readonly RateLimiter RateLimiter = new RateLimiter(50, TimeSpan.FromHours(12), false); + private static readonly RateLimiter RateLimiter = new RateLimiter(50, TimeSpan.FromHours(24), false); public ExternalMetadataService(IUnitOfWork unitOfWork, ILogger logger, IMapper mapper, ILicenseService licenseService) { diff --git a/API/Services/Plus/SmartCollectionSyncService.cs b/API/Services/Plus/SmartCollectionSyncService.cs new file mode 100644 index 000000000..63cdb95b7 --- /dev/null +++ b/API/Services/Plus/SmartCollectionSyncService.cs @@ -0,0 +1,266 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using API.Data; +using API.Data.Repositories; +using API.DTOs.Scrobbling; +using API.Entities; +using API.Entities.Enums; +using API.Extensions; +using API.Helpers; +using API.SignalR; +using Flurl.Http; +using Kavita.Common; +using Kavita.Common.EnvironmentInfo; +using Microsoft.Extensions.Logging; + +namespace API.Services.Plus; +#nullable enable + +sealed class SeriesCollection +{ + public required IList Series { get; set; } + public required string Summary { get; set; } + public required string Title { get; set; } + /// + /// Total items in the source, not what was matched + /// + public int TotalItems { get; set; } +} + +/// +/// Responsible to synchronize Collection series from non-Kavita sources +/// +public interface ISmartCollectionSyncService +{ + /// + /// Synchronize all collections + /// + /// + Task Sync(); + /// + /// Synchronize a collection + /// + /// + /// + Task Sync(int collectionId); +} + +public class SmartCollectionSyncService : ISmartCollectionSyncService +{ + private readonly IUnitOfWork _unitOfWork; + private readonly ILogger _logger; + private readonly IEventHub _eventHub; + private readonly ILicenseService _licenseService; + + private const int SyncDelta = -2; + // Allow 50 requests per 24 hours + private static readonly RateLimiter RateLimiter = new RateLimiter(50, TimeSpan.FromHours(24), false); + + + public SmartCollectionSyncService(IUnitOfWork unitOfWork, ILogger logger, + IEventHub eventHub, ILicenseService licenseService) + { + _unitOfWork = unitOfWork; + _logger = logger; + _eventHub = eventHub; + _licenseService = licenseService; + } + + /// + /// For every Sync-eligible collection, synchronize with upstream + /// + /// + public async Task Sync() + { + if (!await _licenseService.HasActiveLicense()) return; + var expirationTime = DateTime.UtcNow.AddDays(SyncDelta).Truncate(TimeSpan.TicksPerHour); + var collections = (await _unitOfWork.CollectionTagRepository.GetAllCollectionsForSyncing(expirationTime)) + .Where(CanSync) + .ToList(); + + _logger.LogInformation("Found {Count} collections to synchronize", collections.Count); + foreach (var collection in collections) + { + try + { + await SyncCollection(collection); + } + catch (RateLimitException) + { + break; + } + } + + _logger.LogInformation("Synchronization complete"); + } + + public async Task Sync(int collectionId) + { + if (!await _licenseService.HasActiveLicense()) return; + var collection = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(collectionId, CollectionIncludes.Series); + if (!CanSync(collection)) + { + _logger.LogInformation("Requested to sync {CollectionName} but not applicable to sync", collection!.Title); + return; + } + + try + { + await SyncCollection(collection!); + } catch (RateLimitException) {/* Swallow */} + } + + private static bool CanSync(AppUserCollection? collection) + { + 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; + } + + private async Task SyncCollection(AppUserCollection collection) + { + if (!RateLimiter.TryAcquire(string.Empty)) + { + // Request not allowed due to rate limit + _logger.LogDebug("Rate Limit hit for Smart Collection Sync"); + throw new RateLimitException(); + } + + var info = await GetStackInfo(GetStackId(collection.SourceUrl!)); + if (info == null) + { + _logger.LogInformation("Unable to find collection through Kavita+"); + return; + } + + // Check each series in the collection against what's in the target + // For everything that's not there, link it up for this user. + _logger.LogInformation("Starting Sync on {CollectionName} with {SeriesCount} Series", info.Title, info.TotalItems); + + var missingCount = 0; + var missingSeries = new StringBuilder(); + foreach (var seriesInfo in info.Series.OrderBy(s => s.SeriesName)) + { + try + { + // Normalize series name and localized name + var normalizedSeriesName = seriesInfo.SeriesName?.ToNormalized(); + var normalizedLocalizedSeriesName = seriesInfo.LocalizedSeriesName?.ToNormalized(); + + // Search for existing series in the collection + var formats = GetMangaFormats(seriesInfo.PlusMediaFormat); + var existingSeries = collection.Items.FirstOrDefault(s => + (s.Name.ToNormalized() == normalizedSeriesName || + s.NormalizedName == normalizedSeriesName || + s.LocalizedName.ToNormalized() == normalizedLocalizedSeriesName || + s.NormalizedLocalizedName == normalizedLocalizedSeriesName || + + s.NormalizedName == normalizedLocalizedSeriesName || + s.NormalizedLocalizedName == normalizedSeriesName) + && formats.Contains(s.Format)); + + if (existingSeries != null) continue; + + // Series not found in the collection, try to find it in the server + var newSeries = await _unitOfWork.SeriesRepository.GetSeriesByAnyName(seriesInfo.SeriesName, + seriesInfo.LocalizedSeriesName, + formats, collection.AppUserId); + + collection.Items ??= new List(); + if (newSeries != null) + { + // Add the new series to the collection + collection.Items.Add(newSeries); + + } + else + { + _logger.LogDebug("{Series} not found in the server", seriesInfo.SeriesName); + missingCount++; + missingSeries.Append( + $"{seriesInfo.SeriesName}"); + missingSeries.Append("
"); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "An exception occured when linking up a series to the collection. Skipping"); + missingCount++; + missingSeries.Append( + $"{seriesInfo.SeriesName}"); + missingSeries.Append("
"); + } + + } + + // At this point, all series in the info have been checked and added if necessary + // You may want to commit changes to the database if needed + collection.LastSyncUtc = DateTime.UtcNow.Truncate(TimeSpan.TicksPerHour); + collection.TotalSourceCount = info.TotalItems; + collection.Summary = info.Summary; + collection.MissingSeriesFromSource = missingSeries.ToString(); + + _unitOfWork.CollectionTagRepository.Update(collection); + + try + { + await _unitOfWork.CommitAsync(); + + await _unitOfWork.CollectionTagRepository.UpdateCollectionAgeRating(collection); + + await _eventHub.SendMessageAsync(MessageFactory.CollectionUpdated, + MessageFactory.CollectionUpdatedEvent(collection.Id), false); + + _logger.LogInformation("Finished Syncing Collection {CollectionName} - Missing {MissingCount} series", + collection.Title, missingCount); + } + catch (Exception ex) + { + _logger.LogError(ex, "There was an error during saving the collection"); + } + } + + 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) + { + var tokens = url.Split("/"); + return long.Parse(tokens[^1], CultureInfo.InvariantCulture); + } + + private async Task GetStackInfo(long stackId) + { + _logger.LogDebug("Fetching Kavita+ for MAL Stack"); + + 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)) + .GetJsonAsync(); + + return seriesForStack; + } +} diff --git a/API/Services/TaskScheduler.cs b/API/Services/TaskScheduler.cs index e45bd03d7..015336ea7 100644 --- a/API/Services/TaskScheduler.cs +++ b/API/Services/TaskScheduler.cs @@ -57,6 +57,7 @@ public class TaskScheduler : ITaskScheduler private readonly IScrobblingService _scrobblingService; private readonly ILicenseService _licenseService; private readonly IExternalMetadataService _externalMetadataService; + private readonly ISmartCollectionSyncService _smartCollectionSyncService; public static BackgroundJobServer Client => new (); public const string ScanQueue = "scan"; @@ -74,6 +75,7 @@ public class TaskScheduler : ITaskScheduler public const string ProcessProcessedScrobblingEventsId = "process-processed-scrobbling-events"; public const string LicenseCheckId = "license-check"; public const string KavitaPlusDataRefreshId = "kavita+-data-refresh"; + public const string KavitaPlusStackSyncId = "kavita+-stack-sync"; private static readonly ImmutableArray ScanTasks = ["ScannerService", "ScanLibrary", "ScanLibraries", "ScanFolder", "ScanSeries"]; @@ -91,7 +93,7 @@ public class TaskScheduler : ITaskScheduler ICleanupService cleanupService, IStatsService statsService, IVersionUpdaterService versionUpdaterService, IThemeService themeService, IWordCountAnalyzerService wordCountAnalyzerService, IStatisticService statisticService, IMediaConversionService mediaConversionService, IScrobblingService scrobblingService, ILicenseService licenseService, - IExternalMetadataService externalMetadataService) + IExternalMetadataService externalMetadataService, ISmartCollectionSyncService smartCollectionSyncService) { _cacheService = cacheService; _logger = logger; @@ -109,6 +111,7 @@ public class TaskScheduler : ITaskScheduler _scrobblingService = scrobblingService; _licenseService = licenseService; _externalMetadataService = externalMetadataService; + _smartCollectionSyncService = smartCollectionSyncService; } public async Task ScheduleTasks() @@ -186,6 +189,10 @@ public class TaskScheduler : ITaskScheduler RecurringJob.AddOrUpdate(KavitaPlusDataRefreshId, () => _externalMetadataService.FetchExternalDataTask(), Cron.Daily(Rnd.Next(1, 4)), RecurringJobOptions); + + RecurringJob.AddOrUpdate(KavitaPlusStackSyncId, + () => _smartCollectionSyncService.Sync(), Cron.Daily(Rnd.Next(1, 4)), + RecurringJobOptions); } #region StatsTasks diff --git a/API/Services/Tasks/Scanner/ProcessSeries.cs b/API/Services/Tasks/Scanner/ProcessSeries.cs index 780426ad4..1b9d0bab6 100644 --- a/API/Services/Tasks/Scanner/ProcessSeries.cs +++ b/API/Services/Tasks/Scanner/ProcessSeries.cs @@ -32,7 +32,7 @@ public interface IProcessSeries Task Prime(); void Reset(); - Task ProcessSeriesAsync(IList parsedInfos, Library library, bool forceUpdate = false); + Task ProcessSeriesAsync(IList parsedInfos, Library library, int totalToProcess, bool forceUpdate = false); } /// @@ -99,7 +99,7 @@ public class ProcessSeries : IProcessSeries _tagManagerService.Reset(); } - public async Task ProcessSeriesAsync(IList parsedInfos, Library library, bool forceUpdate = false) + public async Task ProcessSeriesAsync(IList parsedInfos, Library library, int totalToProcess, bool forceUpdate = false) { if (!parsedInfos.Any()) return; @@ -107,7 +107,7 @@ public class ProcessSeries : IProcessSeries var scanWatch = Stopwatch.StartNew(); var seriesName = parsedInfos[0].Series; await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress, - MessageFactory.LibraryScanProgressEvent(library.Name, ProgressEventType.Updated, seriesName)); + MessageFactory.LibraryScanProgressEvent(library.Name, ProgressEventType.Updated, seriesName, totalToProcess)); _logger.LogInformation("[ScannerService] Beginning series update on {SeriesName}, Forced: {ForceUpdate}", seriesName, forceUpdate); // Check if there is a Series diff --git a/API/Services/Tasks/ScannerService.cs b/API/Services/Tasks/ScannerService.cs index ca71acd3f..6ec65793e 100644 --- a/API/Services/Tasks/ScannerService.cs +++ b/API/Services/Tasks/ScannerService.cs @@ -147,7 +147,7 @@ public class ScannerService : IScannerService { if (ex.Message.Equals("Sequence contains more than one element.")) { - _logger.LogCritical("[ScannerService] Multiple series map to this folder. Library scan will be used for ScanFolder"); + _logger.LogCritical(ex, "[ScannerService] Multiple series map to this folder. Library scan will be used for ScanFolder"); } } @@ -245,7 +245,7 @@ public class ScannerService : IScannerService var parsedSeries = new Dictionary>(); await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress, - MessageFactory.LibraryScanProgressEvent(library.Name, ProgressEventType.Started, series.Name)); + MessageFactory.LibraryScanProgressEvent(library.Name, ProgressEventType.Started, series.Name, 1)); _logger.LogInformation("Beginning file scan on {SeriesName}", series.Name); var (scanElapsedTime, processedSeries) = await ScanFiles(library, new []{ folderPath }, @@ -309,15 +309,18 @@ public class ScannerService : IScannerService await _processSeries.Prime(); } + var seriesLeftToProcess = toProcess.Count; foreach (var pSeries in toProcess) { // Process Series - await _processSeries.ProcessSeriesAsync(parsedSeries[pSeries], library, bypassFolderOptimizationChecks); + await _processSeries.ProcessSeriesAsync(parsedSeries[pSeries], library, seriesLeftToProcess, bypassFolderOptimizationChecks); + seriesLeftToProcess--; } _processSeries.Reset(); - await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress, MessageFactory.LibraryScanProgressEvent(library.Name, ProgressEventType.Ended, series.Name)); + await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress, + MessageFactory.LibraryScanProgressEvent(library.Name, ProgressEventType.Ended, series.Name, 0)); // Tell UI that this series is done await _eventHub.SendMessageAsync(MessageFactory.ScanSeries, MessageFactory.ScanSeriesEvent(library.Id, seriesId, series.Name)); @@ -543,7 +546,8 @@ public class ScannerService : IScannerService "[ScannerService] There was a critical error that resulted in a failed scan. Please check logs and rescan"); } - await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress, MessageFactory.LibraryScanProgressEvent(library.Name, ProgressEventType.Ended, string.Empty)); + await _eventHub.SendMessageAsync(MessageFactory.NotificationProgress, + MessageFactory.LibraryScanProgressEvent(library.Name, ProgressEventType.Ended, string.Empty)); await _metadataService.RemoveAbandonedMetadataKeys(); BackgroundJob.Enqueue(() => _directoryService.ClearDirectory(_directoryService.CacheDirectory)); @@ -589,12 +593,14 @@ public class ScannerService : IScannerService var totalFiles = 0; //var tasks = new List(); + var seriesLeftToProcess = toProcess.Count; foreach (var pSeries in toProcess) { totalFiles += parsedSeries[pSeries].Count; //tasks.Add(_processSeries.ProcessSeriesAsync(parsedSeries[pSeries], library, forceUpdate)); // We can't do Task.WhenAll because of concurrency issues. - await _processSeries.ProcessSeriesAsync(parsedSeries[pSeries], library, forceUpdate); + await _processSeries.ProcessSeriesAsync(parsedSeries[pSeries], library, seriesLeftToProcess, forceUpdate); + seriesLeftToProcess--; } //await Task.WhenAll(tasks); diff --git a/API/SignalR/MessageFactory.cs b/API/SignalR/MessageFactory.cs index 44767bd8a..2fded8ccc 100644 --- a/API/SignalR/MessageFactory.cs +++ b/API/SignalR/MessageFactory.cs @@ -41,9 +41,9 @@ public static class MessageFactory /// public const string OnlineUsers = "OnlineUsers"; /// - /// When a series is added to a collection + /// When a Collection has been updated /// - public const string SeriesAddedToCollection = "SeriesAddedToCollection"; + public const string CollectionUpdated = "CollectionUpdated"; /// /// Event sent out during backing up the database /// @@ -310,17 +310,17 @@ public static class MessageFactory }; } - public static SignalRMessage SeriesAddedToCollectionEvent(int tagId, int seriesId) + + public static SignalRMessage CollectionUpdatedEvent(int collectionId) { return new SignalRMessage { - Name = SeriesAddedToCollection, + Name = CollectionUpdated, Progress = ProgressType.None, EventType = ProgressEventType.Single, Body = new { - TagId = tagId, - SeriesId = seriesId + TagId = collectionId, } }; } @@ -428,7 +428,7 @@ public static class MessageFactory /// /// /// - public static SignalRMessage LibraryScanProgressEvent(string libraryName, string eventType, string seriesName = "") + public static SignalRMessage LibraryScanProgressEvent(string libraryName, string eventType, string seriesName = "", int? totalToProcess = null) { return new SignalRMessage() { @@ -437,7 +437,12 @@ public static class MessageFactory SubTitle = seriesName, EventType = eventType, Progress = ProgressType.Indeterminate, - Body = null + Body = new + { + SeriesName = seriesName, + LibraryName = libraryName, + LeftToProcess = totalToProcess + } }; } diff --git a/API/Startup.cs b/API/Startup.cs index 343dd7e9a..695506d53 100644 --- a/API/Startup.cs +++ b/API/Startup.cs @@ -139,7 +139,7 @@ public class Startup { 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.", + 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.", License = new OpenApiLicense { Name = "GPL-3.0", diff --git a/Kavita.Common/Kavita.Common.csproj b/Kavita.Common/Kavita.Common.csproj index 73f7fdb29..54b9f8eed 100644 --- a/Kavita.Common/Kavita.Common.csproj +++ b/Kavita.Common/Kavita.Common.csproj @@ -14,10 +14,10 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + \ No newline at end of file diff --git a/Kavita.Common/RateLimitException.cs b/Kavita.Common/RateLimitException.cs new file mode 100644 index 000000000..ecc0730f7 --- /dev/null +++ b/Kavita.Common/RateLimitException.cs @@ -0,0 +1,18 @@ +using System; + +namespace Kavita.Common; + +/// +/// When a rate limit is hit +/// +public class RateLimitException : Exception +{ + public RateLimitException() + { } + + public RateLimitException(string message) : base(message) + { } + + public RateLimitException(string message, Exception inner) + : base(message, inner) { } +} diff --git a/UI/Web/angular.json b/UI/Web/angular.json index 60fc909a9..3d634d72c 100644 --- a/UI/Web/angular.json +++ b/UI/Web/angular.json @@ -24,11 +24,11 @@ "prefix": "app", "architect": { "build": { - "builder": "@angular-devkit/build-angular:application", + "builder": "@angular-devkit/build-angular:browser-esbuild", "options": { "outputPath": "dist", "index": "src/index.html", - "browser": "src/main.ts", + "main": "src/main.ts", "polyfills": [ "zone.js" ], diff --git a/UI/Web/package-lock.json b/UI/Web/package-lock.json index e0dbe39de..b5d3a048d 100644 --- a/UI/Web/package-lock.json +++ b/UI/Web/package-lock.json @@ -21,7 +21,7 @@ "@fortawesome/fontawesome-free": "^6.5.2", "@iharbeck/ngx-virtual-scroller": "^17.0.2", "@iplab/ngx-file-upload": "^17.1.0", - "@microsoft/signalr": "^7.0.12", + "@microsoft/signalr": "^8.0.0", "@ng-bootstrap/ng-bootstrap": "^16.0.0", "@ngneat/transloco": "^6.0.4", "@ngneat/transloco-locale": "^5.1.2", @@ -504,7 +504,6 @@ "version": "17.3.4", "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-17.3.4.tgz", "integrity": "sha512-TVWjpZSI/GIXTYsmVgEKYjBckcW8Aj62DcxLNehRFR+c7UB95OY3ZFjU8U4jL0XvWPgTkkVWQVq+P6N4KCBsyw==", - "dev": true, "dependencies": { "@babel/core": "7.23.9", "@jridgewell/sourcemap-codec": "^1.4.14", @@ -532,7 +531,6 @@ "version": "7.23.9", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz", "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==", - "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.23.5", @@ -561,14 +559,12 @@ "node_modules/@angular/compiler-cli/node_modules/@babel/core/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 + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==" }, "node_modules/@angular/compiler-cli/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" } @@ -749,7 +745,6 @@ "version": "7.24.0", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.0.tgz", "integrity": "sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==", - "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.23.5", @@ -778,14 +773,12 @@ "node_modules/@babel/core/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 + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==" }, "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" } @@ -3284,9 +3277,9 @@ } }, "node_modules/@microsoft/signalr": { - "version": "7.0.14", - "resolved": "https://registry.npmjs.org/@microsoft/signalr/-/signalr-7.0.14.tgz", - "integrity": "sha512-dnS7gSJF5LxByZwJaj82+F1K755ya7ttPT+JnSeCBef3sL8p8FBkHePXphK8NSuOquIb7vsphXWa28A+L2SPpw==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@microsoft/signalr/-/signalr-8.0.0.tgz", + "integrity": "sha512-K/wS/VmzRWePCGqGh8MU8OWbS1Zvu7DG7LSJS62fBB8rJUXwwj4axQtqrAAwKGUZHQF6CuteuQR9xMsVpM2JNA==", "dependencies": { "abort-controller": "^3.0.0", "eventsource": "^2.0.2", @@ -5629,7 +5622,6 @@ "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" @@ -5642,7 +5634,6 @@ "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" }, @@ -5914,7 +5905,6 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", - "dev": true, "engines": { "node": ">=8" }, @@ -6226,7 +6216,6 @@ "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", @@ -6518,8 +6507,7 @@ "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==", - "dev": true + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" }, "node_modules/cookie": { "version": "0.6.0", @@ -7421,7 +7409,6 @@ "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" @@ -7431,7 +7418,6 @@ "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" @@ -8540,7 +8526,6 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, "hasInstallScript": true, "optional": true, "os": [ @@ -9222,7 +9207,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, "dependencies": { "binary-extensions": "^2.0.0" }, @@ -11063,7 +11047,6 @@ "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" } @@ -12453,7 +12436,6 @@ "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" }, @@ -12465,7 +12447,6 @@ "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" }, @@ -12476,8 +12457,7 @@ "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==", - "dev": true + "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==" }, "node_modules/regenerate": { "version": "1.4.2", @@ -12945,7 +12925,7 @@ "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true + "devOptional": true }, "node_modules/sass": { "version": "1.71.1", @@ -13064,7 +13044,6 @@ "version": "7.6.0", "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", - "dev": true, "dependencies": { "lru-cache": "^6.0.0" }, @@ -13079,7 +13058,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, "dependencies": { "yallist": "^4.0.0" }, @@ -13090,8 +13068,7 @@ "node_modules/semver/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 + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/send": { "version": "0.18.0", @@ -14222,7 +14199,6 @@ "version": "5.4.5", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", - "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" diff --git a/UI/Web/package.json b/UI/Web/package.json index ca5bc723a..cfe1905c2 100644 --- a/UI/Web/package.json +++ b/UI/Web/package.json @@ -28,7 +28,7 @@ "@fortawesome/fontawesome-free": "^6.5.2", "@iharbeck/ngx-virtual-scroller": "^17.0.2", "@iplab/ngx-file-upload": "^17.1.0", - "@microsoft/signalr": "^7.0.12", + "@microsoft/signalr": "^8.0.0", "@ng-bootstrap/ng-bootstrap": "^16.0.0", "@ngneat/transloco": "^6.0.4", "@ngneat/transloco-locale": "^5.1.2", diff --git a/UI/Web/src/app/_models/collection-tag.ts b/UI/Web/src/app/_models/collection-tag.ts index d3daa2d67..fb83c6aab 100644 --- a/UI/Web/src/app/_models/collection-tag.ts +++ b/UI/Web/src/app/_models/collection-tag.ts @@ -1,19 +1,6 @@ import {ScrobbleProvider} from "../_services/scrobbling.service"; import {AgeRating} from "./metadata/age-rating"; -// Deprecated in v0.8, replaced with UserCollection -// export interface CollectionTag { -// id: number; -// title: string; -// promoted: boolean; -// /** -// * This is used as a placeholder to store the coverImage url. The backend does not use this or send it. -// */ -// coverImage: string; -// coverImageLocked: boolean; -// summary: string; -// } - export interface UserCollection { id: number; title: string; @@ -28,6 +15,7 @@ export interface UserCollection { owner: string; source: ScrobbleProvider; sourceUrl: string | null; + totalSourceCount: number; + missingSeriesFromSource: string | null; ageRating: AgeRating; - } diff --git a/UI/Web/src/app/_pipes/safe-url.pipe.ts b/UI/Web/src/app/_pipes/safe-url.pipe.ts new file mode 100644 index 000000000..fed4ae2d8 --- /dev/null +++ b/UI/Web/src/app/_pipes/safe-url.pipe.ts @@ -0,0 +1,19 @@ +import { inject } from '@angular/core'; +import { Pipe, PipeTransform, SecurityContext } from '@angular/core'; +import { DomSanitizer } from '@angular/platform-browser'; + +@Pipe({ + name: 'safeUrl', + pure: true, + standalone: true +}) +export class SafeUrlPipe implements PipeTransform { + private readonly dom: DomSanitizer = inject(DomSanitizer); + constructor() {} + + transform(value: string | null | undefined): string | null { + if (value === null || value === undefined) return null; + return this.dom.sanitize(SecurityContext.URL, value); + } + +} diff --git a/UI/Web/src/app/_services/collection-tag.service.ts b/UI/Web/src/app/_services/collection-tag.service.ts index 876bd4cbb..a256c43e9 100644 --- a/UI/Web/src/app/_services/collection-tag.service.ts +++ b/UI/Web/src/app/_services/collection-tag.service.ts @@ -64,4 +64,8 @@ export class CollectionTagService { if (isPromotionAction) return canPromote; return true; } + + importStack(stack: MalStack) { + return this.httpClient.post(this.baseUrl + 'collection/import-stack', stack, TextResonse); + } } diff --git a/UI/Web/src/app/_services/message-hub.service.ts b/UI/Web/src/app/_services/message-hub.service.ts index 92fcfeeb6..da83acaae 100644 --- a/UI/Web/src/app/_services/message-hub.service.ts +++ b/UI/Web/src/app/_services/message-hub.service.ts @@ -17,7 +17,10 @@ export enum EVENTS { SeriesRemoved = 'SeriesRemoved', ScanLibraryProgress = 'ScanLibraryProgress', OnlineUsers = 'OnlineUsers', - SeriesAddedToCollection = 'SeriesAddedToCollection', + /** + * When a Collection has been updated + */ + CollectionUpdated = 'CollectionUpdated', /** * A generic error that occurs during operations on the server */ @@ -40,6 +43,10 @@ export enum EVENTS { * A subtype of NotificationProgress that represents the underlying file being processed during a scan */ FileScanProgress = 'FileScanProgress', + /** + * A subtype of NotificationProgress that represents a single series being processed (into the DB) + */ + ScanProgress = 'ScanProgress', /** * A custom user site theme is added or removed during a scan */ @@ -141,7 +148,7 @@ export class MessageHubService { accessTokenFactory: () => user.token }) .withAutomaticReconnect() - //.withStatefulReconnect() // Needs @microsoft/signalr@8 + .withStatefulReconnect() .build(); this.hubConnection @@ -214,9 +221,9 @@ export class MessageHubService { }); }); - this.hubConnection.on(EVENTS.SeriesAddedToCollection, resp => { + this.hubConnection.on(EVENTS.CollectionUpdated, resp => { this.messagesSource.next({ - event: EVENTS.SeriesAddedToCollection, + event: EVENTS.CollectionUpdated, payload: resp.body }); }); diff --git a/UI/Web/src/app/_single-module/series-preview-drawer/series-preview-drawer.component.html b/UI/Web/src/app/_single-module/series-preview-drawer/series-preview-drawer.component.html index 88b2a4747..72c743602 100644 --- a/UI/Web/src/app/_single-module/series-preview-drawer/series-preview-drawer.component.html +++ b/UI/Web/src/app/_single-module/series-preview-drawer/series-preview-drawer.component.html @@ -10,7 +10,7 @@
- +
@@ -55,7 +55,7 @@
- + diff --git a/UI/Web/src/app/admin/invite-user/invite-user.component.html b/UI/Web/src/app/admin/invite-user/invite-user.component.html index 7fff74fe6..db13ee3b3 100644 --- a/UI/Web/src/app/admin/invite-user/invite-user.component.html +++ b/UI/Web/src/app/admin/invite-user/invite-user.component.html @@ -5,37 +5,42 @@
-

+ @if (!invited) { +

+ } -
-
-
- - -
-
- {{t('required-field')}} + @if (emailLink === '') { + +
+
+ + +
+
+ {{t('required-field')}} +
-
-
-
- +
+
+ +
+ +
+ +
-
- +
+
+ +
-
+ + } -
-
- -
-
-

{{t('setup-user-title')}}

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 9391460e2..cfd717f06 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 @@ -48,51 +48,53 @@ -
  • - {{t(TabID.Series)}} - - @if (!isLoading) { -
    -
    -
    -
    - -
    - + @if (tag.source === ScrobbleProvider.Kavita) { +
  • + {{t(TabID.Series)}} + + @if (!isLoading) { +
    + +
    +
    + +
    + +
    + +
    + +
    - -
    - - -
    -
      - @for (item of series | filter: filterList; let i = $index; track item.id) { -
    • -
      - - -
      -
      • +
        + @for (item of series | filter: filterList; let i = $index; track item.id) { +
      • +
        + + +
        +
        • + } +
      + @if (pagination && series.length !== 0 && pagination.totalPages > 1) { +
      + +
      } -
    - @if (pagination && series.length !== 0 && pagination.totalPages > 1) { -
    - -
    - } -
    - } -     -
    • +
    + } + +
    • + }
  • {{t(TabID.CoverImage)}} @@ -102,6 +104,43 @@ (resetClicked)="handleReset()">
    • + + @if (tag.source !== ScrobbleProvider.Kavita) { +
  • + {{t(TabID.Info)}} + +
    +
    +
    {{t('last-sync-title')}}
    +
    {{tag.lastSyncUtc | date:'shortDate' | defaultDate}}
    +
    +
    +
    {{t('source-url-title')}}
    + {{tag.sourceUrl}} +
    +
    +
    +
    +
    {{t('total-series-title')}}
    +
    {{tag.totalSourceCount | number}}
    +
    +
    +
    {{t('missing-series-title')}}
    +
    {{tag.totalSourceCount - series.length}}
    +
    +
    + + + @if (tag.missingSeriesFromSource !== null && (tag.totalSourceCount - series.length) > 0) { +
    {{t('missing-series-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 b7621f78a..a1a7e99b9 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 @@ -24,26 +24,34 @@ 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 {CommonModule, NgTemplateOutlet} from "@angular/common"; +import {CommonModule, DatePipe, DecimalPipe, NgIf, NgTemplateOutlet} from "@angular/common"; import {CoverImageChooserComponent} from "../../cover-image-chooser/cover-image-chooser.component"; import {translate, TranslocoDirective} from "@ngneat/transloco"; import {ScrobbleProvider} from "../../../_services/scrobbling.service"; import {FilterPipe} from "../../../_pipes/filter.pipe"; import {ScrobbleError} from "../../../_models/scrobbling/scrobble-error"; 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"; enum TabID { General = 'general-tab', CoverImage = 'cover-image-tab', - Series = 'series-tab' + Series = 'series-tab', + Info = 'info-tab' } @Component({ selector: 'app-edit-collection-tags', standalone: true, imports: [NgbNav, NgbNavItem, NgbNavLink, NgbNavContent, ReactiveFormsModule, FormsModule, NgbPagination, - CoverImageChooserComponent, NgbNavOutlet, NgbTooltip, TranslocoDirective, NgTemplateOutlet, FilterPipe], + CoverImageChooserComponent, NgbNavOutlet, NgbTooltip, TranslocoDirective, NgTemplateOutlet, FilterPipe, DatePipe, DefaultDatePipe, ReadMoreComponent, SafeHtmlPipe, SafeUrlPipe, MangaFormatPipe, NgIf, SentenceCasePipe, TagBadgeComponent, DecimalPipe], templateUrl: './edit-collection-tags.component.html', styleUrls: ['./edit-collection-tags.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush diff --git a/UI/Web/src/app/cards/card-item/card-item.component.html b/UI/Web/src/app/cards/card-item/card-item.component.html index b53ca928d..6eff15d29 100644 --- a/UI/Web/src/app/cards/card-item/card-item.component.html +++ b/UI/Web/src/app/cards/card-item/card-item.component.html @@ -2,9 +2,9 @@
    @if (total > 0 || suppressArchiveWarning) { - + } @else if (total === 0 && !suppressArchiveWarning) { - + }
    diff --git a/UI/Web/src/app/cards/external-list-item/external-list-item.component.html b/UI/Web/src/app/cards/external-list-item/external-list-item.component.html index 271993b6d..d464fd6be 100644 --- a/UI/Web/src/app/cards/external-list-item/external-list-item.component.html +++ b/UI/Web/src/app/cards/external-list-item/external-list-item.component.html @@ -1,17 +1,17 @@
    - +
    - + @if (summary && summary.length > 0) {
    -     + }
    diff --git a/UI/Web/src/app/cards/external-series-card/external-series-card.component.html b/UI/Web/src/app/cards/external-series-card/external-series-card.component.html index 7878da1d9..3a5339337 100644 --- a/UI/Web/src/app/cards/external-series-card/external-series-card.component.html +++ b/UI/Web/src/app/cards/external-series-card/external-series-card.component.html @@ -3,7 +3,7 @@
    - + diff --git a/UI/Web/src/app/cards/list-item/list-item.component.html b/UI/Web/src/app/cards/list-item/list-item.component.html index 2c9439051..6cf7c201e 100644 --- a/UI/Web/src/app/cards/list-item/list-item.component.html +++ b/UI/Web/src/app/cards/list-item/list-item.component.html @@ -1,7 +1,7 @@
    - +
    diff --git a/UI/Web/src/app/cards/next-expected-card/next-expected-card.component.html b/UI/Web/src/app/cards/next-expected-card/next-expected-card.component.html index cd8c0f2f8..2459f7ae6 100644 --- a/UI/Web/src/app/cards/next-expected-card/next-expected-card.component.html +++ b/UI/Web/src/app/cards/next-expected-card/next-expected-card.component.html @@ -1,6 +1,6 @@
    - +
    diff --git a/UI/Web/src/app/collections/_components/collection-detail/collection-detail.component.html b/UI/Web/src/app/collections/_components/collection-detail/collection-detail.component.html index ccf5aa0d9..d58bf3035 100644 --- a/UI/Web/src/app/collections/_components/collection-detail/collection-detail.component.html +++ b/UI/Web/src/app/collections/_components/collection-detail/collection-detail.component.html @@ -11,15 +11,34 @@
    -
    -
    - + @if (summary.length > 0 || collectionTag.source !== ScrobbleProvider.Kavita) { +
    +
    + + @if (collectionTag.source !== ScrobbleProvider.Kavita && collectionTag.missingSeriesFromSource !== null + && series.length !== collectionTag.totalSourceCount && collectionTag.totalSourceCount > 0) { +
    + + {{t('sync-progress', {title: series.length + ' / ' + collectionTag.totalSourceCount})}} + +
    + } +
    +
    + @if (summary.length > 0) { +
    + +
    + } +
    +
    -
    - -
    -
    -
    + } + + + { - if (event.event == EVENTS.SeriesAddedToCollection) { + if (event.event == EVENTS.CollectionUpdated) { const collectionEvent = event.payload as SeriesAddedToCollectionEvent; if (collectionEvent.tagId === this.collectionTag.id) { this.loadPage(); @@ -326,4 +332,7 @@ export class CollectionDetailComponent implements OnInit, AfterContentChecked { this.loadPage(); }); } + + protected readonly ScrobbleProvider = ScrobbleProvider; + protected readonly Breakpoint = Breakpoint; } diff --git a/UI/Web/src/app/collections/_components/import-mal-collection-modal/import-mal-collection-modal.component.html b/UI/Web/src/app/collections/_components/import-mal-collection-modal/import-mal-collection-modal.component.html index cd8172f52..03a49535e 100644 --- a/UI/Web/src/app/collections/_components/import-mal-collection-modal/import-mal-collection-modal.component.html +++ b/UI/Web/src/app/collections/_components/import-mal-collection-modal/import-mal-collection-modal.component.html @@ -9,9 +9,12 @@
      @for(stack of stacks; track stack.url) { -
    • - -
      by {{stack.author}} • {{t('series-count', {num: stack.seriesCount})}} • {{t('restack-count', {num: stack.restackCount})}}
      +
    • +
      + {{stack.title}} + +
      +
      by {{stack.author}} • {{t('series-count', {num: stack.seriesCount | number})}} • {{t('restack-count', {num: stack.restackCount | number})}}
      • }
    @@ -31,6 +34,9 @@ +
    + +
    diff --git a/UI/Web/src/app/collections/_components/import-mal-collection-modal/import-mal-collection-modal.component.ts b/UI/Web/src/app/collections/_components/import-mal-collection-modal/import-mal-collection-modal.component.ts index 77b8b5809..041cb5a35 100644 --- a/UI/Web/src/app/collections/_components/import-mal-collection-modal/import-mal-collection-modal.component.ts +++ b/UI/Web/src/app/collections/_components/import-mal-collection-modal/import-mal-collection-modal.component.ts @@ -1,10 +1,15 @@ import {ChangeDetectionStrategy, ChangeDetectorRef, Component, inject} from '@angular/core'; -import {TranslocoDirective} from "@ngneat/transloco"; +import {translate, TranslocoDirective} from "@ngneat/transloco"; import {ReactiveFormsModule} from "@angular/forms"; import {Select2Module} from "ng-select2-component"; import {NgbActiveModal} from "@ng-bootstrap/ng-bootstrap"; import {CollectionTagService} from "../../../_services/collection-tag.service"; import {MalStack} from "../../../_models/collection/mal-stack"; +import {UserCollection} from "../../../_models/collection-tag"; +import {ScrobbleProvider} from "../../../_services/scrobbling.service"; +import {forkJoin} from "rxjs"; +import {ToastrService} from "ngx-toastr"; +import {DecimalPipe} from "@angular/common"; @Component({ selector: 'app-import-mal-collection-modal', @@ -12,7 +17,8 @@ import {MalStack} from "../../../_models/collection/mal-stack"; imports: [ TranslocoDirective, ReactiveFormsModule, - Select2Module + Select2Module, + DecimalPipe ], templateUrl: './import-mal-collection-modal.component.html', styleUrl: './import-mal-collection-modal.component.scss', @@ -21,19 +27,41 @@ import {MalStack} from "../../../_models/collection/mal-stack"; export class ImportMalCollectionModalComponent { protected readonly ngbModal = inject(NgbActiveModal); - protected readonly collectionService = inject(CollectionTagService); - protected readonly cdRef = inject(ChangeDetectorRef); + private readonly collectionService = inject(CollectionTagService); + private readonly cdRef = inject(ChangeDetectorRef); + private readonly toastr = inject(ToastrService); stacks: Array = []; isLoading = true; + collectionMap: {[key: string]: UserCollection | MalStack} = {}; constructor() { - this.collectionService.getMalStacks().subscribe(stacks => { - this.stacks = stacks; - this.isLoading = false; - this.cdRef.markForCheck(); - }) + forkJoin({ + allCollections: this.collectionService.allCollections(true), + malStacks: this.collectionService.getMalStacks() + }).subscribe(res => { + + // Create a map on sourceUrl from collections so that if there are non-null sourceUrl (and source is MAL) then we can disable buttons + const collects = res.allCollections.filter(c => c.source === ScrobbleProvider.Mal && c.sourceUrl); + for(let col of collects) { + if (col.sourceUrl === null) continue; + this.collectionMap[col.sourceUrl] = col; + } + + this.stacks = res.malStacks; + this.isLoading = false; + + this.cdRef.markForCheck(); + }); + } + + importStack(stack: MalStack) { + this.collectionService.importStack(stack).subscribe(() => { + this.collectionMap[stack.url] = stack; + this.cdRef.markForCheck(); + this.toastr.success(translate('toasts.stack-imported')); + }) } diff --git a/UI/Web/src/app/nav/_components/events-widget/events-widget.component.html b/UI/Web/src/app/nav/_components/events-widget/events-widget.component.html index 0d0a09b51..2525e5edd 100644 --- a/UI/Web/src/app/nav/_components/events-widget/events-widget.component.html +++ b/UI/Web/src/app/nav/_components/events-widget/events-widget.component.html @@ -23,71 +23,81 @@ - -
  • -
    Title goes here
    -
    Subtitle goes here
    -
    -
    -
    -
    -
    -
    • -
  • -
    Title goes here
    -
    Subtitle goes here
    -
    • -
  • -
    -
    Scanning Books
    -
    E:\\Books\\Demon King Daimaou\\Demon King Daimaou - Volume 11.epub
    + @if (debugMode) { + +
  • +
    Title goes here
    +
    Subtitle goes here
    -
    {{prettyPrintProgress(0.1)}}%
    -
    -
    +
    +
    +
    • +
  • +
    Title goes here
    +
    Subtitle goes here
    +
    • +
  • +
    +
    Scanning Books
    +
    E:\\Books\\Demon King Daimaou\\Demon King Daimaou - Volume 11.epub
    +
    +
    {{prettyPrintProgress(0.1)}}%
    +
    +
    +
    +
    -
    -
    • -
  • -
    -
    There was some library scan error
    -
    Click for more information
    -
    - -
    • -
  • -
    -
    Scan didn't run becasuse nothing to do
    -
    Click for more information
    -
    - -
    • -
  • -
    +
    +
    • +
  • +
    +
    There was some library scan error
    +
    Click for more information
    +
    + +
    • +
  • +
    +
    Scan didn't run becasuse nothing to do
    +
    Click for more information
    +
    + +
    • +
  • +
    - Downloading {{'series' | sentenceCase}} -
    -
    PDFs
    -
    • -     + Downloading {{'series' | sentenceCase}} +
    +
    PDFs
    + + + } +
  • {{message.title}}
    -
    {{message.subTitle}}
    + @if (message.subTitle !== '') { +
    {{message.subTitle}}
    + } + @if (message.name === EVENTS.ScanProgress && message.body.leftToProcess > 0) { +
    {{t('left-to-process', {leftToProcess: message.body.leftToProcess})}}
    + }
    -
    -
    -
    + @if(message.progress === 'indeterminate') { +
    +
    +
    + }
    • @@ -165,12 +175,17 @@     - -
  • -
    {{t('users-online-count', {num: onlineUsers.length})}}
    -
    • -
  • {{t('active-events-title')}} {{activeEvents}}
    • -     + @if (messageHub.onlineUsers$ | async; as onlineUsers) { + @if (onlineUsers.length > 1) { +
  • +
    {{t('users-online-count', {num: onlineUsers.length})}}
    +
    • + } + + @if (debugMode) { +
  • {{t('active-events-title')}} {{activeEvents}}
    • + } + }
  • {{t('no-data')}}
    • diff --git a/UI/Web/src/app/nav/_components/events-widget/events-widget.component.scss b/UI/Web/src/app/nav/_components/events-widget/events-widget.component.scss index acdbae134..cd8143905 100644 --- a/UI/Web/src/app/nav/_components/events-widget/events-widget.component.scss +++ b/UI/Web/src/app/nav/_components/events-widget/events-widget.component.scss @@ -15,10 +15,10 @@ } ::ng-deep .nav-events { - + .popover-body { - min-width: 250px; - max-width: 250px; + min-width: 300px; + max-width: 300px; padding: 0px; box-shadow: 0px 0px 12px rgb(0 0 0 / 75%); max-height: calc(100vh - 60px); @@ -42,7 +42,7 @@ width: 100%; text-overflow: ellipsis; overflow:hidden; - white-space:nowrap; + white-space:nowrap; } .btn:focus, .btn:hover { @@ -76,7 +76,7 @@ .update-available { cursor: pointer; - + i.fa { color: var(--primary-color) !important; } @@ -119,4 +119,4 @@ font-size: 11px; position: absolute; } -} \ No newline at end of file +} diff --git a/UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.html b/UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.html index 362e9b9b7..31a6a47de 100644 --- a/UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.html +++ b/UI/Web/src/app/reading-list/_components/reading-list-detail/reading-list-detail.component.html @@ -39,7 +39,7 @@
    - +
    diff --git a/UI/Web/src/app/reading-list/_components/reading-list-item/reading-list-item.component.html b/UI/Web/src/app/reading-list/_components/reading-list-item/reading-list-item.component.html index 80b6b567d..864b05220 100644 --- a/UI/Web/src/app/reading-list/_components/reading-list-item/reading-list-item.component.html +++ b/UI/Web/src/app/reading-list/_components/reading-list-item/reading-list-item.component.html @@ -1,7 +1,7 @@
    - + @if (item.pagesRead === 0 && item.pagesTotal > 0) {
    } diff --git a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html index 76fc69c00..399c641a5 100644 --- a/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html +++ b/UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.html @@ -58,7 +58,7 @@
    {{unreadCount}}
    - +
    diff --git a/UI/Web/src/app/shared/image/image.component.ts b/UI/Web/src/app/shared/image/image.component.ts index bfa45fbb2..d30d24214 100644 --- a/UI/Web/src/app/shared/image/image.component.ts +++ b/UI/Web/src/app/shared/image/image.component.ts @@ -1,18 +1,19 @@ import { - AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, - Component, DestroyRef, + Component, + DestroyRef, ElementRef, inject, Input, OnChanges, Renderer2, + RendererStyleFlags2, ViewChild } from '@angular/core'; -import { CoverUpdateEvent } from 'src/app/_models/events/cover-update-event'; -import { ImageService } from 'src/app/_services/image.service'; -import { EVENTS, MessageHubService } from 'src/app/_services/message-hub.service'; +import {CoverUpdateEvent} from 'src/app/_models/events/cover-update-event'; +import {ImageService} from 'src/app/_services/image.service'; +import {EVENTS, MessageHubService} from 'src/app/_services/message-hub.service'; import {takeUntilDestroyed} from "@angular/core/rxjs-interop"; import {CommonModule, NgOptimizedImage} from "@angular/common"; import {LazyLoadImageModule, StateChange} from "ng-lazyload-image"; @@ -48,26 +49,6 @@ export class ImageComponent implements OnChanges { * Height of the image. If not defined, will not be applied */ @Input() height: string = ''; - /** - * Max Width of the image. If not defined, will not be applied - */ - @Input() maxWidth: string = ''; - /** - * Max Height of the image. If not defined, will not be applied - */ - @Input() maxHeight: string = ''; - /** - * Border Radius of the image. If not defined, will not be applied - */ - @Input() borderRadius: string = ''; - /** - * Object fit of the image. If not defined, will not be applied - */ - @Input() objectFit: string = ''; - /** - * Background of the image. If not defined, will not be applied - */ - @Input() background: string = ''; /** * If the image component should respond to cover updates */ @@ -79,7 +60,7 @@ export class ImageComponent implements OnChanges { /** * A collection of styles to apply. This is useful if the parent component doesn't want to use no view encapsulation */ - @Input() styles: string = ''; + @Input() styles: {[key: string]: string} = {}; @Input() errorImage: string = this.imageService.errorImage; @ViewChild('img', {static: true}) imgElem!: ElementRef; @@ -110,41 +91,25 @@ export class ImageComponent implements OnChanges { } ngOnChanges(): void { - if (this.width != '') { + if (this.width !== '') { this.renderer.setStyle(this.imgElem.nativeElement, 'width', this.width); } - if (this.height != '') { + if (this.height !== '') { this.renderer.setStyle(this.imgElem.nativeElement, 'height', this.height); } - if (this.maxWidth != '') { - this.renderer.setStyle(this.imgElem.nativeElement, 'max-width', this.maxWidth); - } - - if (this.maxHeight != '') { - this.renderer.setStyle(this.imgElem.nativeElement, 'max-height', this.maxHeight); - } - - if (this.borderRadius != '') { - this.renderer.setStyle(this.imgElem.nativeElement, 'border-radius', this.borderRadius); - } - - if (this.objectFit != '') { - this.renderer.setStyle(this.imgElem.nativeElement, 'object-fit', this.objectFit); - } - - if (this.background != '') { - this.renderer.setStyle(this.imgElem.nativeElement, 'background', this.background); - } - - if (this.styles != '') { - this.renderer.setStyle(this.imgElem.nativeElement, 'styles', this.styles); + const styleKeys = Object.keys(this.styles); + if (styleKeys.length !== 0) { + styleKeys.forEach(key => { + this.renderer.setStyle(this.imgElem.nativeElement, key, this.styles[key], RendererStyleFlags2.Important); + }); } if (this.classes != '') { this.renderer.addClass(this.imgElem.nativeElement, this.classes); } + this.cdRef.markForCheck(); } diff --git a/UI/Web/src/app/shared/person-badge/person-badge.component.html b/UI/Web/src/app/shared/person-badge/person-badge.component.html index 1289b1da9..d7b7feffe 100644 --- a/UI/Web/src/app/shared/person-badge/person-badge.component.html +++ b/UI/Web/src/app/shared/person-badge/person-badge.component.html @@ -1,7 +1,7 @@
    - + diff --git a/UI/Web/src/app/sidenav/_components/side-nav/side-nav.component.ts b/UI/Web/src/app/sidenav/_components/side-nav/side-nav.component.ts index c1051f5e4..4efab4e07 100644 --- a/UI/Web/src/app/sidenav/_components/side-nav/side-nav.component.ts +++ b/UI/Web/src/app/sidenav/_components/side-nav/side-nav.component.ts @@ -65,7 +65,7 @@ export class SideNavComponent implements OnInit { homeActions = [ {action: Action.Edit, title: 'customize', children: [], requiresAdmin: false, callback: this.openCustomize.bind(this)}, {action: Action.Import, title: 'import-cbl', children: [], requiresAdmin: true, callback: this.importCbl.bind(this)}, - //{action: Action.Import, title: 'import-mal-stack', children: [], requiresAdmin: true, callback: this.importMalCollection.bind(this)}, // This requires the Collection Rework (https://github.com/Kareadita/Kavita/issues/2810) + {action: Action.Import, title: 'import-mal-stack', children: [], requiresAdmin: true, callback: this.importMalCollection.bind(this)}, // This requires the Collection Rework (https://github.com/Kareadita/Kavita/issues/2810) ]; filterQuery: string = ''; diff --git a/UI/Web/src/app/statistics/_components/stat-list/stat-list.component.html b/UI/Web/src/app/statistics/_components/stat-list/stat-list.component.html index ef059e186..8d2d4f942 100644 --- a/UI/Web/src/app/statistics/_components/stat-list/stat-list.component.html +++ b/UI/Web/src/app/statistics/_components/stat-list/stat-list.component.html @@ -1,17 +1,27 @@ - +@if (data$ | async; as data) {
    {{title}} - + @if (description && description.length > 0) { + + }
      -
    • - - - - {{item.name}} {{item.value | compactNumber}} {{label}} -
      • + @for(item of data; track item) { +
    • + @if (image && image(item); as url) { + @if (url && url.length > 0) { + + } + } + {{item.name}} + @if (item.value >= 0) { + {{item.value | compactNumber}} {{label}} + } +
      • + }
    -     - +} + +{{description}} diff --git a/UI/Web/src/app/statistics/_components/stat-list/stat-list.component.ts b/UI/Web/src/app/statistics/_components/stat-list/stat-list.component.ts index e91adeb49..1857b9cd7 100644 --- a/UI/Web/src/app/statistics/_components/stat-list/stat-list.component.ts +++ b/UI/Web/src/app/statistics/_components/stat-list/stat-list.component.ts @@ -4,7 +4,7 @@ import { PieDataItem } from '../../_models/pie-data-item'; import { CompactNumberPipe } from '../../../_pipes/compact-number.pipe'; import { ImageComponent } from '../../../shared/image/image.component'; import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'; -import { NgIf, NgFor, NgClass, AsyncPipe } from '@angular/common'; +import { NgClass, AsyncPipe } from '@angular/common'; import {TranslocoDirective} from "@ngneat/transloco"; @Component({ @@ -13,7 +13,7 @@ import {TranslocoDirective} from "@ngneat/transloco"; styleUrls: ['./stat-list.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, - imports: [NgIf, NgbTooltip, NgFor, NgClass, ImageComponent, AsyncPipe, CompactNumberPipe, TranslocoDirective] + imports: [NgbTooltip, NgClass, ImageComponent, AsyncPipe, CompactNumberPipe, TranslocoDirective] }) export class StatListComponent { diff --git a/UI/Web/src/assets/langs/en.json b/UI/Web/src/assets/langs/en.json index 32e57bd14..78a055278 100644 --- a/UI/Web/src/assets/langs/en.json +++ b/UI/Web/src/assets/langs/en.json @@ -949,7 +949,7 @@ "general-tab": "General", "metadata-tab": "Metadata", "cover-tab": "Cover", - "info-tab": "Info", + "info-tab": "{{edit-series-modal.info-tab}}", "progress-tab": "Progress", "no-summary": "No Summary available.", "writers-title": "{{series-metadata-detail.writers-title}}", @@ -1167,7 +1167,7 @@ "encode-as-description-part-2": "Can I Use WebP?", "encode-as-description-part-3": "Can I Use AVIF?", "encode-as-warning": "You cannot convert back to PNG once you've gone to WebP/AVIF. You would need to refresh covers on your libraries to regenerate all covers. Bookmarks and favicons cannot be converted.", - "media-warning": "You must trigger the media conversion task in Tasks Tab.,", + "media-warning": "You must trigger the media conversion task in Tasks Tab.", "encode-as-label": "Save Media As", "encode-as-tooltip": "All media Kavita manages (covers, bookmarks, favicons) will be encoded as this type.", "bookmark-dir-label": "Bookmarks Directory", @@ -1373,6 +1373,7 @@ "cancel": "{{common.cancel}}", "general-tab": "General", "cover-image-tab": "Cover Image", + "info-tab": "{{edit-series-modal.info-tab}}", "series-tab": "Series", "name-label": "Name", "name-validation": "Name must be unique", @@ -1381,7 +1382,11 @@ "summary-label": "Summary", "deselect-all": "{{common.deselect-all}}", "select-all": "{{common.select-all}}", - "filter-label": "{{common.filter}}" + "filter-label": "{{common.filter}}", + "last-sync-title": "Last Sync:", + "source-url-title": "Source Url:", + "total-series-title": "Total Series:", + "missing-series-title": "Missing Series:" }, "library-detail": { @@ -1423,7 +1428,9 @@ "no-data": "There are no items. Try adding a series.", "no-data-filtered": "No items match your current filter.", "title-alt": "Kavita - {{collectionName}} Collection", - "series-header": "Series" + "series-header": "Series", + "sync-progress": "Series Collected: {{title}}", + "last-sync": "Last Sync: {{date}}" }, "all-collections": { @@ -1490,7 +1497,8 @@ "close": "{{common.close}}", "users-online-count": "{{num}} Users online", "active-events-title": "Active Events:", - "no-data": "Not much going on here" + "no-data": "Not much going on here", + "left-to-process": "Left to Process: {{leftToProcess}}" }, "shortcuts-modal": { @@ -2176,7 +2184,8 @@ "collections-unpromoted": "Collections un-promoted", "confirm-delete-collections": "Are you sure you want to delete multiple collections?", "collections-deleted": "Collections deleted", - "pdf-book-mode-screen-size": "Screen too small for Book mode" + "pdf-book-mode-screen-size": "Screen too small for Book mode", + "stack-imported": "Stack Imported" }, diff --git a/openapi.json b/openapi.json index 5e24c21a0..7c21d4a6d 100644 --- a/openapi.json +++ b/openapi.json @@ -2,12 +2,12 @@ "openapi": "3.0.1", "info": { "title": "Kavita", - "description": "Kavita provides a set of APIs that are authenticated by JWT. JWT token can be copied from local storage.", + "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.", "license": { "name": "GPL-3.0", "url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE" }, - "version": "0.8.0.9" + "version": "0.8.1.0" }, "servers": [ { @@ -1378,6 +1378,56 @@ } } }, + "/api/Collection/single": { + "get": { + "tags": [ + "Collection" + ], + "summary": "Returns a single Collection tag by Id for a given user", + "parameters": [ + { + "name": "collectionId", + "in": "query", + "description": "", + "schema": { + "type": "integer", + "format": "int32" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AppUserCollectionDto" + } + } + }, + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AppUserCollectionDto" + } + } + }, + "text/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AppUserCollectionDto" + } + } + } + } + } + } + } + }, "/api/Collection/all-series": { "get": { "tags": [ @@ -1548,23 +1598,23 @@ "tags": [ "Collection" ], - "summary": "Promote/UnPromote multiple collections in one go", + "summary": "Delete multiple collections in one go", "requestBody": { "description": "", "content": { "application/json": { "schema": { - "$ref": "#/components/schemas/PromoteCollectionsDto" + "$ref": "#/components/schemas/DeleteCollectionsDto" } }, "text/json": { "schema": { - "$ref": "#/components/schemas/PromoteCollectionsDto" + "$ref": "#/components/schemas/DeleteCollectionsDto" } }, "application/*+json": { "schema": { - "$ref": "#/components/schemas/PromoteCollectionsDto" + "$ref": "#/components/schemas/DeleteCollectionsDto" } } } @@ -1681,6 +1731,39 @@ } } }, + "/api/Collection/import-stack": { + "post": { + "tags": [ + "Collection" + ], + "summary": "Imports a MAL Stack into Kavita", + "requestBody": { + "description": "", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/MalStackDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/MalStackDto" + } + }, + "application/*+json": { + "schema": { + "$ref": "#/components/schemas/MalStackDto" + } + } + } + }, + "responses": { + "200": { + "description": "Success" + } + } + } + }, "/api/Device/create": { "post": { "tags": [ @@ -13296,6 +13379,16 @@ "description": "For Non-Kavita sourced collections, the url to sync from", "nullable": true }, + "totalSourceCount": { + "type": "integer", + "description": "Total number of items as of the last sync. Not applicable for Kavita managed collections.", + "format": "int32" + }, + "missingSeriesFromSource": { + "type": "string", + "description": "A
    separated string of all missing series", + "nullable": true + }, "appUser": { "$ref": "#/components/schemas/AppUser" }, @@ -13380,6 +13473,16 @@ "type": "string", "description": "For Non-Kavita sourced collections, the url to sync from", "nullable": true + }, + "totalSourceCount": { + "type": "integer", + "description": "Total number of items as of the last sync. Not applicable for Kavita managed collections.", + "format": "int32" + }, + "missingSeriesFromSource": { + "type": "string", + "description": "A
    separated string of all missing series", + "nullable": true } }, "additionalProperties": false @@ -15240,35 +15343,6 @@ }, "additionalProperties": false }, - "CollectionTagDto": { - "type": "object", - "properties": { - "id": { - "type": "integer", - "format": "int32" - }, - "title": { - "type": "string", - "nullable": true - }, - "summary": { - "type": "string", - "nullable": true - }, - "promoted": { - "type": "boolean" - }, - "coverImage": { - "type": "string", - "description": "The cover image string. This is used on Frontend to show or hide the Cover Image", - "nullable": true - }, - "coverImageLocked": { - "type": "boolean" - } - }, - "additionalProperties": false - }, "ConfirmEmailDto": { "required": [ "email", @@ -15538,6 +15612,22 @@ "additionalProperties": false, "description": "For requesting an encoded filter to be decoded" }, + "DeleteCollectionsDto": { + "required": [ + "collectionIds" + ], + "type": "object", + "properties": { + "collectionIds": { + "type": "array", + "items": { + "type": "integer", + "format": "int32" + } + } + }, + "additionalProperties": false + }, "DeleteSeriesDto": { "type": "object", "properties": { @@ -20347,6 +20437,7 @@ "UpdateLibraryDto": { "required": [ "allowScrobbling", + "excludePatterns", "fileGroupTypes", "folders", "folderWatching", @@ -20428,8 +20519,7 @@ "items": { "type": "string" }, - "description": "A set of Glob patterns that the scanner will exclude processing", - "nullable": true + "description": "A set of Glob patterns that the scanner will exclude processing" } }, "additionalProperties": false @@ -20843,7 +20933,7 @@ "type": "object", "properties": { "tag": { - "$ref": "#/components/schemas/CollectionTagDto" + "$ref": "#/components/schemas/AppUserCollectionDto" }, "seriesIdsToRemove": { "type": "array",